diff --git a/Data/Config/Regions.xml b/Data/Config/Regions.xml
index b561665..0dafc4b 100644
--- a/Data/Config/Regions.xml
+++ b/Data/Config/Regions.xml
@@ -158,73 +158,76 @@
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/Data/Config/inndoors.cfg b/Data/Config/inndoors.cfg
index ffefe82..40256d4 100644
--- a/Data/Config/inndoors.cfg
+++ b/Data/Config/inndoors.cfg
@@ -1,9 +1,8 @@
-# TownMap DoorX Y Z RoomMap RoomX Y Z Price ItemID StartX StartY Width Height
-#Vaelen 835 666 0 Vaelen 7157 4081 0 5000 1779 7152 4076 10 10
-Vaelen 835 666 0 Vaelen 7157 4081 0 2000 1779 7152 4079 5 6
-Vaelen 835 661 0 Vaelen 7154 4076 0 2000 1779 7152 4074 5 6
-Vaelen 835 656 0 Vaelen 7154 4071 0 2000 1779 7152 4069 5 6
+# TownMap DoorX Y Z RoomMap RoomX Y Z Price ItemID StartX StartY Width Height
+Vaelen 835 666 0 Vaelen 7156 4081 0 2000 1779 7152 4079 6 5
+Vaelen 835 661 0 Vaelen 7156 4076 0 2000 1779 7152 4074 6 5
+Vaelen 835 656 0 Vaelen 7156 4071 0 2000 1779 7152 4069 6 5
Vaelen 829 671 0 Vaelen 7146 4084 0 5000 1779 7143 4081 9 8
-Vaelen 836 666 20 Vaelen 7155 4013 20 2000 1779 7153 4011 5 6
-Vaelen 836 661 20 Vaelen 7155 4008 20 2000 1779 7153 4006 5 6
-Vaelen 836 656 20 Vaelen 7155 4003 20 2000 1779 7153 4001 5 6
+Vaelen 836 666 20 Vaelen 7158 4013 20 2000 1779 7153 4011 6 5
+Vaelen 836 661 20 Vaelen 7158 4008 20 2000 1779 7153 4006 6 5
+Vaelen 836 656 20 Vaelen 7158 4003 20 2000 1779 7153 4001 6 5
diff --git a/Data/Config/statichouses.cfg b/Data/Config/statichouses.cfg
index 4b7b80a..c6a66ef 100644
--- a/Data/Config/statichouses.cfg
+++ b/Data/Config/statichouses.cfg
@@ -1,4 +1,4 @@
# Map SignX SignY SignZ MinZ MaxZ Price Locks Secs ItemID Area1X Area1Y Area1W Area1H Area2X Area2Y Area2W Area2H
-Vaelen 863 595 5 0 55 5000 500 500 0xC0C 861 583 11 13
+Vaelen 863 595 0 0 55 5000 500 500 0xC0C 861 583 11 13
Vaelen 779 675 0 0 55 5000 500 500 0xC0B 769 672 11 10
-Vaelen 842 619 0 0 55 5000 500 500 0xC0B 834 614 8 16 826 620 9 10
+Vaelen 843 619 10 0 55 5000 500 500 0xC0B 834 614 8 16 826 620 9 10
diff --git a/Scripts/Commands/BuildWorld.cs b/Scripts/Commands/BuildWorld.cs
index 7ad5d98..835f416 100644
--- a/Scripts/Commands/BuildWorld.cs
+++ b/Scripts/Commands/BuildWorld.cs
@@ -79,13 +79,14 @@ namespace Server.Scripts.Commands
public static void DoDecorate( Mobile m )
{
- m.SendMessage( "Generating World Decorations, Signs & Teleporters, Inn Room Doors..." );
+ m.SendMessage( "Generating World Decorations, Signs & Teleporters, Inn Room Doors, and Static Houses..." );
Console.WriteLine( "Decorating the world...");
CommandSystem.Handle(m, String.Format("{0}Decorate", CommandSystem.Prefix));
CommandSystem.Handle(m, String.Format("{0}SignGen", CommandSystem.Prefix));
CommandSystem.Handle(m, String.Format("{0}TelGen", CommandSystem.Prefix));
CommandSystem.Handle(m, String.Format("{0}InnGen", CommandSystem.Prefix));
+ CommandSystem.Handle(m, String.Format("{0}GenStaticHouses", CommandSystem.Prefix));
m.SendMessage( "Decorations, Signs, Inn Room Doors, and Teleporters generated!" );
}
@@ -158,7 +159,7 @@ namespace Server.Scripts.Commands
// Button 3: Decorate Only
AddButton(35, 195, 4005, 4007, 3, GumpButtonType.Reply, 0);
- AddLabel(75, 196, 63, "Generate World Decor & Teleporters");
+ AddLabel(75, 196, 63, "Generate World Decor, Teleporters, Housing & Inns");
// Button 4: Map Spawns Only
AddButton(35, 235, 4005, 4007, 4, GumpButtonType.Reply, 0);
diff --git a/Scripts/Items/Houses/StaticHouses/GenStaticHouses.cs b/Scripts/Commands/GenStaticHouses.cs
similarity index 100%
rename from Scripts/Items/Houses/StaticHouses/GenStaticHouses.cs
rename to Scripts/Commands/GenStaticHouses.cs
diff --git a/Scripts/Items/Houses/InnRooms/InnDoor.cs b/Scripts/Items/Houses/InnRooms/InnDoor.cs
index e809f87..fb70385 100644
--- a/Scripts/Items/Houses/InnRooms/InnDoor.cs
+++ b/Scripts/Items/Houses/InnRooms/InnDoor.cs
@@ -158,13 +158,16 @@ namespace Server.Custom.InnRooms
if (RoomMap != null)
{
- IPooledEnumerable eable = RoomMap.GetItemsInRange(RoomLocation, 12);
+ IPooledEnumerable eable = RoomMap.GetItemsInRange(RoomLocation, 8);
foreach (Item item in eable)
{
if (item is InnExitDoor)
{
- dest = item.Location;
- break;
+ if (m_RoomArea.Contains(new Point2D(item.X, item.Y)))
+ {
+ dest = item.Location;
+ break;
+ }
}
}
eable.Free();