C# 9 Cleanup (#325)

- [X] Removes EventArgs - not needed
- [X] Merges sequential checks
- [X] Removes redundant type declarations
This commit is contained in:
Kamron Batman 2020-11-27 00:29:21 -08:00 committed by GitHub
parent 351611a23a
commit 3551d962f7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
417 changed files with 2209 additions and 2213 deletions

View file

@ -24,7 +24,7 @@ namespace Server.Multis
public const int MaximumBarkeepCount = 2;
private static readonly Dictionary<Mobile, List<BaseHouse>> m_Table = new Dictionary<Mobile, List<BaseHouse>>();
private static readonly Dictionary<Mobile, List<BaseHouse>> m_Table = new();
private DecayLevel m_CurrentStage;
@ -300,7 +300,7 @@ namespace Server.Multis
}
}
public static List<BaseHouse> AllHouses { get; } = new List<BaseHouse>();
public static List<BaseHouse> AllHouses { get; } = new();
public abstract Rectangle2D[] Area { get; }
public abstract Point3D BaseBanLocation { get; }
@ -482,15 +482,15 @@ namespace Server.Multis
public HouseSign Sign { get; set; }
public List<PlayerVendor> PlayerVendors { get; } = new List<PlayerVendor>();
public List<PlayerVendor> PlayerVendors { get; } = new();
public List<PlayerBarkeeper> PlayerBarkeepers { get; } = new List<PlayerBarkeeper>();
public List<PlayerBarkeeper> PlayerBarkeepers { get; } = new();
public List<VendorRentalContract> VendorRentalContracts { get; private set; }
public List<VendorInventory> VendorInventories { get; } = new List<VendorInventory>();
public List<VendorInventory> VendorInventories { get; } = new();
public List<RelocatedEntity> RelocatedEntities { get; } = new List<RelocatedEntity>();
public List<RelocatedEntity> RelocatedEntities { get; } = new();
public MovingCrate MovingCrate { get; set; }
@ -1942,7 +1942,7 @@ namespace Server.Multis
return;
}
for (var i = 0; Doors != null && i < Doors.Count; ++i)
for (var i = 0; i < Doors?.Count; ++i)
{
var door = Doors[i];
var p = door.Location;
@ -2404,7 +2404,7 @@ namespace Server.Multis
public virtual bool IsCombatRestricted(Mobile m)
{
if (m?.Player != true || m.AccessLevel >= AccessLevel.GameMaster || !IsAosRules ||
m_Owner != null && m_Owner.AccessLevel >= AccessLevel.GameMaster)
m_Owner?.AccessLevel >= AccessLevel.GameMaster)
{
return false;
}
@ -2513,7 +2513,7 @@ namespace Server.Multis
}
}
for (var i = 0; Doors != null && i < Doors.Count; ++i)
for (var i = 0; i < Doors?.Count; ++i)
{
var door = Doors[i];
var p = door.Location;
@ -4276,7 +4276,7 @@ namespace Server.Multis
{
var list = house.Secures;
for (var i = 0; sec == null && list != null && i < list.Count; ++i)
for (var i = 0; sec == null && i < list?.Count; ++i)
{
var si = list[i];

View file

@ -29,10 +29,10 @@ namespace Server.Multis
}
private static readonly Rectangle2D[] m_BritWrap =
{ new Rectangle2D(16, 16, 5120 - 32, 4096 - 32), new Rectangle2D(5136, 2320, 992, 1760) };
{ new(16, 16, 5120 - 32, 4096 - 32), new(5136, 2320, 992, 1760) };
private static readonly Rectangle2D[] m_IlshWrap = { new Rectangle2D(16, 16, 2304 - 32, 1600 - 32) };
private static readonly Rectangle2D[] m_TokunoWrap = { new Rectangle2D(16, 16, 1448 - 32, 1448 - 32) };
private static readonly Rectangle2D[] m_IlshWrap = { new(16, 16, 2304 - 32, 1600 - 32) };
private static readonly Rectangle2D[] m_TokunoWrap = { new(16, 16, 1448 - 32, 1448 - 32) };
private static readonly TimeSpan BoatDecayDelay = TimeSpan.FromDays(9.0);
@ -211,7 +211,7 @@ namespace Server.Multis
public virtual BaseDockedBoat DockedBoat => null;
public static List<BaseBoat> Boats { get; } = new List<BaseBoat>();
public static List<BaseBoat> Boats { get; } = new();
/*
* Intervals:
@ -723,7 +723,7 @@ namespace Server.Multis
return DryDockResult.NotAnchored;
}
if (Hold != null && Hold.Items.Count > 0)
if (Hold?.Items.Count > 0)
{
return DryDockResult.Hold;
}

View file

@ -19,10 +19,10 @@ namespace Server.Multis
public override int HoldDistance => 5;
public override int TillerManDistance => -5;
public override Point2D StarboardOffset => new Point2D(2, -1);
public override Point2D PortOffset => new Point2D(-2, -1);
public override Point2D StarboardOffset => new(2, -1);
public override Point2D PortOffset => new(-2, -1);
public override Point3D MarkOffset => new Point3D(0, 0, 3);
public override Point3D MarkOffset => new(0, 0, 3);
public override BaseDockedBoat DockedBoat => new LargeDockedBoat(this);

View file

@ -19,10 +19,10 @@ namespace Server.Multis
public override int HoldDistance => 5;
public override int TillerManDistance => -5;
public override Point2D StarboardOffset => new Point2D(2, -1);
public override Point2D PortOffset => new Point2D(-2, -1);
public override Point2D StarboardOffset => new(2, -1);
public override Point2D PortOffset => new(-2, -1);
public override Point3D MarkOffset => new Point3D(0, 0, 3);
public override Point3D MarkOffset => new(0, 0, 3);
public override BaseDockedBoat DockedBoat => new LargeDockedDragonBoat(this);

View file

@ -19,10 +19,10 @@ namespace Server.Multis
public override int HoldDistance => 4;
public override int TillerManDistance => -5;
public override Point2D StarboardOffset => new Point2D(2, 0);
public override Point2D PortOffset => new Point2D(-2, 0);
public override Point2D StarboardOffset => new(2, 0);
public override Point2D PortOffset => new(-2, 0);
public override Point3D MarkOffset => new Point3D(0, 1, 3);
public override Point3D MarkOffset => new(0, 1, 3);
public override BaseDockedBoat DockedBoat => new MediumDockedBoat(this);

View file

@ -19,10 +19,10 @@ namespace Server.Multis
public override int HoldDistance => 4;
public override int TillerManDistance => -5;
public override Point2D StarboardOffset => new Point2D(2, 0);
public override Point2D PortOffset => new Point2D(-2, 0);
public override Point2D StarboardOffset => new(2, 0);
public override Point2D PortOffset => new(-2, 0);
public override Point3D MarkOffset => new Point3D(0, 1, 3);
public override Point3D MarkOffset => new(0, 1, 3);
public override BaseDockedBoat DockedBoat => new MediumDockedDragonBoat(this);

View file

@ -19,10 +19,10 @@ namespace Server.Multis
public override int HoldDistance => 4;
public override int TillerManDistance => -4;
public override Point2D StarboardOffset => new Point2D(2, 0);
public override Point2D PortOffset => new Point2D(-2, 0);
public override Point2D StarboardOffset => new(2, 0);
public override Point2D PortOffset => new(-2, 0);
public override Point3D MarkOffset => new Point3D(0, 1, 3);
public override Point3D MarkOffset => new(0, 1, 3);
public override BaseDockedBoat DockedBoat => new SmallDockedBoat(this);

View file

@ -19,10 +19,10 @@ namespace Server.Multis
public override int HoldDistance => 4;
public override int TillerManDistance => -4;
public override Point2D StarboardOffset => new Point2D(2, 0);
public override Point2D PortOffset => new Point2D(-2, 0);
public override Point2D StarboardOffset => new(2, 0);
public override Point2D PortOffset => new(-2, 0);
public override Point3D MarkOffset => new Point3D(0, 1, 3);
public override Point3D MarkOffset => new(0, 1, 3);
public override BaseDockedBoat DockedBoat => new SmallDockedDragonBoat(this);

View file

@ -4,83 +4,83 @@ namespace Server.Misc
{
private static readonly Point2D[] m_Felucca =
{
new Point2D(2528, 3568), new Point2D(2376, 3400), new Point2D(2528, 3896),
new Point2D(2168, 3904), new Point2D(1136, 3416), new Point2D(1432, 3648),
new Point2D(1416, 4000), new Point2D(4512, 3936), new Point2D(4440, 3120),
new Point2D(4192, 3672), new Point2D(4720, 3472), new Point2D(3744, 2768),
new Point2D(3480, 2432), new Point2D(3560, 2136), new Point2D(3792, 2112),
new Point2D(2800, 2296), new Point2D(2736, 2016), new Point2D(4576, 1456),
new Point2D(4680, 1152), new Point2D(4304, 1104), new Point2D(4496, 984),
new Point2D(4248, 696), new Point2D(4040, 616), new Point2D(3896, 248),
new Point2D(4176, 384), new Point2D(3672, 1104), new Point2D(3520, 1152),
new Point2D(3720, 1360), new Point2D(2184, 2152), new Point2D(1952, 2088),
new Point2D(2056, 1936), new Point2D(1720, 1992), new Point2D(472, 2064),
new Point2D(656, 2096), new Point2D(3008, 3592), new Point2D(2784, 3472),
new Point2D(5456, 2400), new Point2D(5976, 2424), new Point2D(5328, 3112),
new Point2D(5792, 3152), new Point2D(2120, 3616), new Point2D(2136, 3128),
new Point2D(1632, 3528), new Point2D(1328, 3160), new Point2D(1072, 3136),
new Point2D(1128, 2976), new Point2D(960, 2576), new Point2D(752, 1832),
new Point2D(184, 1488), new Point2D(592, 1440), new Point2D(368, 1216),
new Point2D(232, 752), new Point2D(696, 744), new Point2D(304, 1000),
new Point2D(840, 376), new Point2D(1192, 624), new Point2D(1200, 192),
new Point2D(1512, 240), new Point2D(1336, 456), new Point2D(1536, 648),
new Point2D(1104, 952), new Point2D(1864, 264), new Point2D(2136, 200),
new Point2D(2160, 528), new Point2D(1904, 512), new Point2D(2240, 784),
new Point2D(2536, 776), new Point2D(2488, 216), new Point2D(2336, 72),
new Point2D(2648, 288), new Point2D(2680, 576), new Point2D(2896, 88),
new Point2D(2840, 344), new Point2D(3136, 72), new Point2D(2968, 520),
new Point2D(3192, 328), new Point2D(3448, 208), new Point2D(3432, 608),
new Point2D(3184, 752), new Point2D(2800, 704), new Point2D(2768, 1016),
new Point2D(2448, 1232), new Point2D(2272, 920), new Point2D(2072, 1080),
new Point2D(2048, 1264), new Point2D(1808, 1528), new Point2D(1496, 1880),
new Point2D(1656, 2168), new Point2D(2096, 2320), new Point2D(1816, 2528),
new Point2D(1840, 2640), new Point2D(1928, 2952), new Point2D(2120, 2712)
new(2528, 3568), new(2376, 3400), new(2528, 3896),
new(2168, 3904), new(1136, 3416), new(1432, 3648),
new(1416, 4000), new(4512, 3936), new(4440, 3120),
new(4192, 3672), new(4720, 3472), new(3744, 2768),
new(3480, 2432), new(3560, 2136), new(3792, 2112),
new(2800, 2296), new(2736, 2016), new(4576, 1456),
new(4680, 1152), new(4304, 1104), new(4496, 984),
new(4248, 696), new(4040, 616), new(3896, 248),
new(4176, 384), new(3672, 1104), new(3520, 1152),
new(3720, 1360), new(2184, 2152), new(1952, 2088),
new(2056, 1936), new(1720, 1992), new(472, 2064),
new(656, 2096), new(3008, 3592), new(2784, 3472),
new(5456, 2400), new(5976, 2424), new(5328, 3112),
new(5792, 3152), new(2120, 3616), new(2136, 3128),
new(1632, 3528), new(1328, 3160), new(1072, 3136),
new(1128, 2976), new(960, 2576), new(752, 1832),
new(184, 1488), new(592, 1440), new(368, 1216),
new(232, 752), new(696, 744), new(304, 1000),
new(840, 376), new(1192, 624), new(1200, 192),
new(1512, 240), new(1336, 456), new(1536, 648),
new(1104, 952), new(1864, 264), new(2136, 200),
new(2160, 528), new(1904, 512), new(2240, 784),
new(2536, 776), new(2488, 216), new(2336, 72),
new(2648, 288), new(2680, 576), new(2896, 88),
new(2840, 344), new(3136, 72), new(2968, 520),
new(3192, 328), new(3448, 208), new(3432, 608),
new(3184, 752), new(2800, 704), new(2768, 1016),
new(2448, 1232), new(2272, 920), new(2072, 1080),
new(2048, 1264), new(1808, 1528), new(1496, 1880),
new(1656, 2168), new(2096, 2320), new(1816, 2528),
new(1840, 2640), new(1928, 2952), new(2120, 2712)
};
private static readonly Point2D[] m_Trammel = m_Felucca;
private static readonly Point2D[] m_Ilshenar =
{
new Point2D(1252, 1180), new Point2D(1562, 1090), new Point2D(1444, 1016),
new Point2D(1324, 968), new Point2D(1418, 806), new Point2D(1722, 874),
new Point2D(1456, 684), new Point2D(1036, 866), new Point2D(612, 476),
new Point2D(1476, 372), new Point2D(762, 472), new Point2D(812, 1162),
new Point2D(1422, 1144), new Point2D(1254, 1066), new Point2D(1598, 870),
new Point2D(1358, 866), new Point2D(510, 302), new Point2D(510, 392)
new(1252, 1180), new(1562, 1090), new(1444, 1016),
new(1324, 968), new(1418, 806), new(1722, 874),
new(1456, 684), new(1036, 866), new(612, 476),
new(1476, 372), new(762, 472), new(812, 1162),
new(1422, 1144), new(1254, 1066), new(1598, 870),
new(1358, 866), new(510, 302), new(510, 392)
};
private static readonly Point2D[] m_Tokuno =
{
// Makoto-Jima
new Point2D(837, 1351), new Point2D(941, 1241), new Point2D(959, 1185),
new Point2D(923, 1091), new Point2D(904, 983), new Point2D(845, 944),
new Point2D(829, 896), new Point2D(794, 852), new Point2D(766, 821),
new Point2D(695, 814), new Point2D(576, 835), new Point2D(518, 840),
new Point2D(519, 902), new Point2D(502, 950), new Point2D(503, 1045),
new Point2D(547, 1131), new Point2D(518, 1204), new Point2D(506, 1243),
new Point2D(526, 1271), new Point2D(562, 1295), new Point2D(616, 1335),
new Point2D(789, 1347), new Point2D(712, 1359),
new(837, 1351), new(941, 1241), new(959, 1185),
new(923, 1091), new(904, 983), new(845, 944),
new(829, 896), new(794, 852), new(766, 821),
new(695, 814), new(576, 835), new(518, 840),
new(519, 902), new(502, 950), new(503, 1045),
new(547, 1131), new(518, 1204), new(506, 1243),
new(526, 1271), new(562, 1295), new(616, 1335),
new(789, 1347), new(712, 1359),
// Homare-Jima
new Point2D(202, 498), new Point2D(116, 600), new Point2D(107, 699),
new Point2D(162, 799), new Point2D(158, 889), new Point2D(169, 989),
new Point2D(194, 1101), new Point2D(250, 1163), new Point2D(295, 1176),
new Point2D(280, 1194), new Point2D(286, 1102), new Point2D(250, 1000),
new Point2D(260, 906), new Point2D(360, 838), new Point2D(389, 763),
new Point2D(415, 662), new Point2D(500, 597), new Point2D(570, 572),
new Point2D(631, 577), new Point2D(692, 500), new Point2D(723, 445),
new Point2D(672, 379), new Point2D(626, 332), new Point2D(494, 291),
new Point2D(371, 336), new Point2D(324, 334), new Point2D(270, 362),
new(202, 498), new(116, 600), new(107, 699),
new(162, 799), new(158, 889), new(169, 989),
new(194, 1101), new(250, 1163), new(295, 1176),
new(280, 1194), new(286, 1102), new(250, 1000),
new(260, 906), new(360, 838), new(389, 763),
new(415, 662), new(500, 597), new(570, 572),
new(631, 577), new(692, 500), new(723, 445),
new(672, 379), new(626, 332), new(494, 291),
new(371, 336), new(324, 334), new(270, 362),
// Isamu-Jima
new Point2D(1240, 1076), new Point2D(1189, 1115), new Point2D(1046, 1039),
new Point2D(1025, 885), new Point2D(907, 809), new Point2D(840, 506),
new Point2D(799, 396), new Point2D(720, 258), new Point2D(744, 158),
new Point2D(904, 37), new Point2D(974, 91), new Point2D(1020, 187),
new Point2D(1035, 288), new Point2D(1104, 395), new Point2D(1215, 462),
new Point2D(1275, 488), new Point2D(1348, 611), new Point2D(1363, 739),
new Point2D(1364, 765), new Point2D(1364, 876), new Point2D(1300, 936),
new Point2D(1240, 1003)
new(1240, 1076), new(1189, 1115), new(1046, 1039),
new(1025, 885), new(907, 809), new(840, 506),
new(799, 396), new(720, 258), new(744, 158),
new(904, 37), new(974, 91), new(1020, 187),
new(1035, 288), new(1104, 395), new(1215, 462),
new(1275, 488), new(1348, 611), new(1363, 739),
new(1364, 765), new(1364, 876), new(1300, 936),
new(1240, 1003)
};
public static void Initialize()

View file

@ -31,7 +31,7 @@ namespace Server.Multis
public virtual int SignPostID => 9;
public override Point3D BaseBanLocation => new Point3D(
public override Point3D BaseBanLocation => new(
Components.Min.X,
Components.Height - 1 - Components.Center.Y,
0
@ -249,8 +249,8 @@ namespace Server.Multis
{
public static Rectangle2D[] AreaArray =
{
new Rectangle2D(-11, -11, 23, 23), new Rectangle2D(-10, 13, 6, 1),
new Rectangle2D(-2, 13, 6, 1), new Rectangle2D(6, 13, 7, 1)
new(-11, -11, 23, 23), new(-10, 13, 6, 1),
new(-2, 13, 6, 1), new(6, 13, 7, 1)
};
public TrinsicKeep(Mobile owner)
@ -282,10 +282,10 @@ namespace Server.Multis
{
public static Rectangle2D[] AreaArray =
{
new Rectangle2D(-15, -15, 31, 31),
new Rectangle2D(-14, 16, 11, 1),
new Rectangle2D(-2, 16, 6, 1),
new Rectangle2D(5, 16, 11, 1)
new(-15, -15, 31, 31),
new(-14, 16, 11, 1),
new(-2, 16, 6, 1),
new(5, 16, 11, 1)
};
public GothicRoseCastle(Mobile owner)
@ -390,10 +390,10 @@ namespace Server.Multis
{
public static Rectangle2D[] AreaArray =
{
new Rectangle2D(-15, -15, 31, 31),
new Rectangle2D(5, 16, 1, 1),
new Rectangle2D(7, 16, 4, 1),
new Rectangle2D(12, 16, 1, 1)
new(-15, -15, 31, 31),
new(5, 16, 1, 1),
new(7, 16, 4, 1),
new(12, 16, 1, 1)
};
public FeudalCastle(Mobile owner)
@ -450,10 +450,10 @@ namespace Server.Multis
{
public static Rectangle2D[] AreaArray =
{
new Rectangle2D(-11, -11, 23, 23),
new Rectangle2D(-10, 13, 6, 1),
new Rectangle2D(-2, 13, 6, 1),
new Rectangle2D(6, 13, 7, 1)
new(-11, -11, 23, 23),
new(-10, 13, 6, 1),
new(-2, 13, 6, 1),
new(6, 13, 7, 1)
};
public TraditionalKeep(Mobile owner)
@ -662,10 +662,10 @@ namespace Server.Multis
{
public static Rectangle2D[] AreaArray =
{
new Rectangle2D(-15, -15, 31, 31),
new Rectangle2D(-14, 16, 6, 1),
new Rectangle2D(-7, 16, 8, 1),
new Rectangle2D(10, 16, 5, 1)
new(-15, -15, 31, 31),
new(-14, 16, 6, 1),
new(-7, 16, 8, 1),
new(10, 16, 5, 1)
};
public OkinawaSweetDreamCastle(Mobile owner)
@ -722,10 +722,10 @@ namespace Server.Multis
{
public static Rectangle2D[] AreaArray =
{
new Rectangle2D(-15, -15, 31, 31),
new Rectangle2D(-14, 16, 9, 1),
new Rectangle2D(-3, 16, 8, 1),
new Rectangle2D(7, 16, 9, 1)
new(-15, -15, 31, 31),
new(-14, 16, 9, 1),
new(-3, 16, 8, 1),
new(7, 16, 9, 1)
};
public GrimswindSisters(Mobile owner)

View file

@ -183,7 +183,7 @@ namespace Server.Multis
}
public override Point3D BaseBanLocation =>
new Point3D(Components.Min.X, Components.Height - 1 - Components.Center.Y, 0);
new(Components.Min.X, Components.Height - 1 - Components.Center.Y, 0);
public override int DefaultPrice => m_DefaultPrice;
@ -2262,7 +2262,7 @@ namespace Server.Multis
public int MaxLevels => Foundation.MaxLevels;
public static Dictionary<Mobile, DesignContext> Table { get; } = new Dictionary<Mobile, DesignContext>();
public static Dictionary<Mobile, DesignContext> Table { get; } = new();
public static DesignContext Find(Mobile from)
{
@ -2317,7 +2317,7 @@ namespace Server.Multis
var fixtures = foundation.Fixtures;
for (var i = 0; fixtures != null && i < fixtures.Count; ++i)
for (var i = 0; i < fixtures?.Count; ++i)
{
var item = fixtures[i];
@ -2367,7 +2367,7 @@ namespace Server.Multis
var fixtures = context.Foundation.Fixtures;
for (var i = 0; fixtures != null && i < fixtures.Count; ++i)
for (var i = 0; i < fixtures?.Count; ++i)
{
var item = fixtures[i];

View file

@ -84,7 +84,7 @@ namespace Server.Multis
var mobiles = new List<Mobile>();
// These are also storage lists. They hold location values indicating the yard and border locations.
List<Point2D> yard = new List<Point2D>(), borders = new List<Point2D>();
List<Point2D> yard = new(), borders = new();
/* RULES:
*

View file

@ -359,53 +359,53 @@ namespace Server.Items
public static HousePlacementEntry[] ClassicHouses { get; } =
{
new HousePlacementEntry(typeof(SmallOldHouse), 1011303, 425, 212, 489, 244, 10, 37000, 0, 4, 0, 0x0064),
new HousePlacementEntry(typeof(SmallOldHouse), 1011304, 425, 212, 489, 244, 10, 37000, 0, 4, 0, 0x0066),
new HousePlacementEntry(typeof(SmallOldHouse), 1011305, 425, 212, 489, 244, 10, 36750, 0, 4, 0, 0x0068),
new HousePlacementEntry(typeof(SmallOldHouse), 1011306, 425, 212, 489, 244, 10, 35250, 0, 4, 0, 0x006A),
new HousePlacementEntry(typeof(SmallOldHouse), 1011307, 425, 212, 489, 244, 10, 36750, 0, 4, 0, 0x006C),
new HousePlacementEntry(typeof(SmallOldHouse), 1011308, 425, 212, 489, 244, 10, 36750, 0, 4, 0, 0x006E),
new HousePlacementEntry(typeof(SmallShop), 1011321, 425, 212, 489, 244, 10, 50500, -1, 4, 0, 0x00A0),
new HousePlacementEntry(typeof(SmallShop), 1011322, 425, 212, 489, 244, 10, 52500, 0, 4, 0, 0x00A2),
new HousePlacementEntry(typeof(SmallTower), 1011317, 580, 290, 667, 333, 14, 73500, 3, 4, 0, 0x0098),
new HousePlacementEntry(typeof(TwoStoryVilla), 1011319, 1100, 550, 1265, 632, 24, 113750, 3, 6, 0, 0x009E),
new HousePlacementEntry(typeof(SandStonePatio), 1011320, 850, 425, 1265, 632, 24, 76500, -1, 4, 0, 0x009C),
new HousePlacementEntry(typeof(LogCabin), 1011318, 1100, 550, 1265, 632, 24, 81750, 1, 6, 0, 0x009A),
new HousePlacementEntry(typeof(GuildHouse), 1011309, 1370, 685, 1576, 788, 28, 131500, -1, 7, 0, 0x0074),
new HousePlacementEntry(typeof(TwoStoryHouse), 1011310, 1370, 685, 1576, 788, 28, 162750, -3, 7, 0, 0x0076),
new HousePlacementEntry(typeof(TwoStoryHouse), 1011311, 1370, 685, 1576, 788, 28, 162000, -3, 7, 0, 0x0078),
new HousePlacementEntry(typeof(LargePatioHouse), 1011315, 1370, 685, 1576, 788, 28, 129250, -4, 7, 0, 0x008C),
new HousePlacementEntry(typeof(LargeMarbleHouse), 1011316, 1370, 685, 1576, 788, 28, 160500, -4, 7, 0, 0x0096),
new HousePlacementEntry(typeof(Tower), 1011312, 2119, 1059, 2437, 1218, 42, 366500, 0, 7, 0, 0x007A),
new HousePlacementEntry(typeof(Keep), 1011313, 2625, 1312, 3019, 1509, 52, 572750, 0, 11, 0, 0x007C),
new HousePlacementEntry(typeof(Castle), 1011314, 4076, 2038, 4688, 2344, 78, 865250, 0, 16, 0, 0x007E)
new(typeof(SmallOldHouse), 1011303, 425, 212, 489, 244, 10, 37000, 0, 4, 0, 0x0064),
new(typeof(SmallOldHouse), 1011304, 425, 212, 489, 244, 10, 37000, 0, 4, 0, 0x0066),
new(typeof(SmallOldHouse), 1011305, 425, 212, 489, 244, 10, 36750, 0, 4, 0, 0x0068),
new(typeof(SmallOldHouse), 1011306, 425, 212, 489, 244, 10, 35250, 0, 4, 0, 0x006A),
new(typeof(SmallOldHouse), 1011307, 425, 212, 489, 244, 10, 36750, 0, 4, 0, 0x006C),
new(typeof(SmallOldHouse), 1011308, 425, 212, 489, 244, 10, 36750, 0, 4, 0, 0x006E),
new(typeof(SmallShop), 1011321, 425, 212, 489, 244, 10, 50500, -1, 4, 0, 0x00A0),
new(typeof(SmallShop), 1011322, 425, 212, 489, 244, 10, 52500, 0, 4, 0, 0x00A2),
new(typeof(SmallTower), 1011317, 580, 290, 667, 333, 14, 73500, 3, 4, 0, 0x0098),
new(typeof(TwoStoryVilla), 1011319, 1100, 550, 1265, 632, 24, 113750, 3, 6, 0, 0x009E),
new(typeof(SandStonePatio), 1011320, 850, 425, 1265, 632, 24, 76500, -1, 4, 0, 0x009C),
new(typeof(LogCabin), 1011318, 1100, 550, 1265, 632, 24, 81750, 1, 6, 0, 0x009A),
new(typeof(GuildHouse), 1011309, 1370, 685, 1576, 788, 28, 131500, -1, 7, 0, 0x0074),
new(typeof(TwoStoryHouse), 1011310, 1370, 685, 1576, 788, 28, 162750, -3, 7, 0, 0x0076),
new(typeof(TwoStoryHouse), 1011311, 1370, 685, 1576, 788, 28, 162000, -3, 7, 0, 0x0078),
new(typeof(LargePatioHouse), 1011315, 1370, 685, 1576, 788, 28, 129250, -4, 7, 0, 0x008C),
new(typeof(LargeMarbleHouse), 1011316, 1370, 685, 1576, 788, 28, 160500, -4, 7, 0, 0x0096),
new(typeof(Tower), 1011312, 2119, 1059, 2437, 1218, 42, 366500, 0, 7, 0, 0x007A),
new(typeof(Keep), 1011313, 2625, 1312, 3019, 1509, 52, 572750, 0, 11, 0, 0x007C),
new(typeof(Castle), 1011314, 4076, 2038, 4688, 2344, 78, 865250, 0, 16, 0, 0x007E)
};
public static HousePlacementEntry[] HousesEJ { get; } =
{
new HousePlacementEntry(typeof(SmallOldHouse), 1011303, 425, 212, 489, 244, 10, 36750, 0, 4, 0, 0x0064),
new HousePlacementEntry(typeof(SmallOldHouse), 1011304, 425, 212, 489, 244, 10, 36750, 0, 4, 0, 0x0066),
new HousePlacementEntry(typeof(SmallOldHouse), 1011305, 425, 212, 489, 244, 10, 36500, 0, 4, 0, 0x0068),
new HousePlacementEntry(typeof(SmallOldHouse), 1011306, 425, 212, 489, 244, 10, 35000, 0, 4, 0, 0x006A),
new HousePlacementEntry(typeof(SmallOldHouse), 1011307, 425, 212, 489, 244, 10, 36500, 0, 4, 0, 0x006C),
new HousePlacementEntry(typeof(SmallOldHouse), 1011308, 425, 212, 489, 244, 10, 36500, 0, 4, 0, 0x006E),
new HousePlacementEntry(typeof(SmallShop), 1011321, 425, 212, 489, 244, 10, 50250, -1, 4, 0, 0x00A0),
new HousePlacementEntry(typeof(SmallShop), 1011322, 425, 212, 489, 244, 10, 52250, 0, 4, 0, 0x00A2),
new HousePlacementEntry(typeof(SmallTower), 1011317, 580, 290, 667, 333, 14, 73250, 3, 4, 0, 0x0098),
new HousePlacementEntry(typeof(TwoStoryVilla), 1011319, 1100, 550, 1265, 632, 24, 113500, 3, 6, 0, 0x009E),
new HousePlacementEntry(typeof(SandStonePatio), 1011320, 850, 425, 1265, 632, 24, 76250, -1, 4, 0, 0x009C),
new HousePlacementEntry(typeof(LogCabin), 1011318, 1100, 550, 1265, 632, 24, 81250, 1, 6, 0, 0x009A),
new HousePlacementEntry(typeof(GuildHouse), 1011309, 1370, 685, 1576, 788, 28, 131250, -1, 7, 0, 0x0074),
new HousePlacementEntry(typeof(TwoStoryHouse), 1011310, 1370, 685, 1576, 788, 28, 162500, -3, 7, 0, 0x0076),
new HousePlacementEntry(typeof(TwoStoryHouse), 1011311, 1370, 685, 1576, 788, 28, 162750, -3, 7, 0, 0x0078),
new HousePlacementEntry(typeof(LargePatioHouse), 1011315, 1370, 685, 1576, 788, 28, 129000, -4, 7, 0, 0x008C),
new HousePlacementEntry(typeof(LargeMarbleHouse), 1011316, 1370, 685, 1576, 788, 28, 160250, -4, 7, 0, 0x0096),
new HousePlacementEntry(typeof(Tower), 1011312, 2119, 1059, 2437, 1218, 42, 366250, 0, 7, 0, 0x007A),
new HousePlacementEntry(typeof(Keep), 1011313, 2625, 1312, 3019, 1509, 52, 562500, 0, 11, 0, 0x007C),
new HousePlacementEntry(typeof(Castle), 1011314, 4076, 2038, 4688, 2344, 78, 865000, 0, 16, 0, 0x007E),
new(typeof(SmallOldHouse), 1011303, 425, 212, 489, 244, 10, 36750, 0, 4, 0, 0x0064),
new(typeof(SmallOldHouse), 1011304, 425, 212, 489, 244, 10, 36750, 0, 4, 0, 0x0066),
new(typeof(SmallOldHouse), 1011305, 425, 212, 489, 244, 10, 36500, 0, 4, 0, 0x0068),
new(typeof(SmallOldHouse), 1011306, 425, 212, 489, 244, 10, 35000, 0, 4, 0, 0x006A),
new(typeof(SmallOldHouse), 1011307, 425, 212, 489, 244, 10, 36500, 0, 4, 0, 0x006C),
new(typeof(SmallOldHouse), 1011308, 425, 212, 489, 244, 10, 36500, 0, 4, 0, 0x006E),
new(typeof(SmallShop), 1011321, 425, 212, 489, 244, 10, 50250, -1, 4, 0, 0x00A0),
new(typeof(SmallShop), 1011322, 425, 212, 489, 244, 10, 52250, 0, 4, 0, 0x00A2),
new(typeof(SmallTower), 1011317, 580, 290, 667, 333, 14, 73250, 3, 4, 0, 0x0098),
new(typeof(TwoStoryVilla), 1011319, 1100, 550, 1265, 632, 24, 113500, 3, 6, 0, 0x009E),
new(typeof(SandStonePatio), 1011320, 850, 425, 1265, 632, 24, 76250, -1, 4, 0, 0x009C),
new(typeof(LogCabin), 1011318, 1100, 550, 1265, 632, 24, 81250, 1, 6, 0, 0x009A),
new(typeof(GuildHouse), 1011309, 1370, 685, 1576, 788, 28, 131250, -1, 7, 0, 0x0074),
new(typeof(TwoStoryHouse), 1011310, 1370, 685, 1576, 788, 28, 162500, -3, 7, 0, 0x0076),
new(typeof(TwoStoryHouse), 1011311, 1370, 685, 1576, 788, 28, 162750, -3, 7, 0, 0x0078),
new(typeof(LargePatioHouse), 1011315, 1370, 685, 1576, 788, 28, 129000, -4, 7, 0, 0x008C),
new(typeof(LargeMarbleHouse), 1011316, 1370, 685, 1576, 788, 28, 160250, -4, 7, 0, 0x0096),
new(typeof(Tower), 1011312, 2119, 1059, 2437, 1218, 42, 366250, 0, 7, 0, 0x007A),
new(typeof(Keep), 1011313, 2625, 1312, 3019, 1509, 52, 562500, 0, 11, 0, 0x007C),
new(typeof(Castle), 1011314, 4076, 2038, 4688, 2344, 78, 865000, 0, 16, 0, 0x007E),
new HousePlacementEntry(typeof(TrinsicKeep), 1158748, 2625, 1312, 3019, 1509, 52, 29643750, 0, 11, 0, 0x147E),
new HousePlacementEntry(
new(typeof(TrinsicKeep), 1158748, 2625, 1312, 3019, 1509, 52, 29643750, 0, 11, 0, 0x147E),
new(
typeof(GothicRoseCastle),
1158749,
4076,
@ -419,9 +419,9 @@ namespace Server.Items
0,
0x147F
),
new HousePlacementEntry(typeof(ElsaCastle), 1158750, 4076, 2038, 4688, 2344, 78, 45450000, 0, 16, 0, 0x1480),
new HousePlacementEntry(typeof(Spires), 1158761, 4076, 2038, 4688, 2344, 78, 47025000, 0, 16, 0, 0x1481),
new HousePlacementEntry(
new(typeof(ElsaCastle), 1158750, 4076, 2038, 4688, 2344, 78, 45450000, 0, 16, 0, 0x1480),
new(typeof(Spires), 1158761, 4076, 2038, 4688, 2344, 78, 47025000, 0, 16, 0, 0x1481),
new(
typeof(CastleOfOceania),
1158760,
4076,
@ -435,9 +435,9 @@ namespace Server.Items
0,
0x1482
),
new HousePlacementEntry(typeof(FeudalCastle), 1158762, 4076, 2038, 4688, 2344, 78, 27337500, 0, 16, 0, 0x1483),
new HousePlacementEntry(typeof(RobinsNest), 1158850, 2625, 1312, 3019, 1509, 52, 25301250, 0, 11, 0, 0x1484),
new HousePlacementEntry(
new(typeof(FeudalCastle), 1158762, 4076, 2038, 4688, 2344, 78, 27337500, 0, 16, 0, 0x1483),
new(typeof(RobinsNest), 1158850, 2625, 1312, 3019, 1509, 52, 25301250, 0, 11, 0, 0x1484),
new(
typeof(TraditionalKeep),
1158851,
2625,
@ -451,14 +451,14 @@ namespace Server.Items
0,
0x1485
),
new HousePlacementEntry(typeof(VillaCrowley), 1158852, 2625, 1312, 3019, 1509, 52, 21813750, 0, 11, 0, 0x1486),
new HousePlacementEntry(typeof(DarkthornKeep), 1158853, 2625, 1312, 3019, 1509, 52, 27990000, 0, 11, 0, 0x1487),
new HousePlacementEntry(typeof(SandalwoodKeep), 1158854, 2625, 1312, 3019, 1509, 52, 23456250, 0, 11, 0, 0x1488),
new HousePlacementEntry(typeof(CasaMoga), 1158855, 2625, 1312, 3019, 1509, 52, 26313750, 0, 11, 0, 0x1489),
new(typeof(VillaCrowley), 1158852, 2625, 1312, 3019, 1509, 52, 21813750, 0, 11, 0, 0x1486),
new(typeof(DarkthornKeep), 1158853, 2625, 1312, 3019, 1509, 52, 27990000, 0, 11, 0, 0x1487),
new(typeof(SandalwoodKeep), 1158854, 2625, 1312, 3019, 1509, 52, 23456250, 0, 11, 0, 0x1488),
new(typeof(CasaMoga), 1158855, 2625, 1312, 3019, 1509, 52, 26313750, 0, 11, 0, 0x1489),
new HousePlacementEntry(typeof(RobinsRoost), 1158960, 4076, 2038, 4688, 2344, 78, 43863750, 0, 16, 0, 0x148A),
new HousePlacementEntry(typeof(Camelot), 1158961, 4076, 2038, 4688, 2344, 78, 47092500, 0, 16, 0, 0x148B),
new HousePlacementEntry(
new(typeof(RobinsRoost), 1158960, 4076, 2038, 4688, 2344, 78, 43863750, 0, 16, 0, 0x148A),
new(typeof(Camelot), 1158961, 4076, 2038, 4688, 2344, 78, 47092500, 0, 16, 0, 0x148B),
new(
typeof(LacrimaeInCaelo),
1158962,
4076,
@ -472,7 +472,7 @@ namespace Server.Items
0,
0x148C
),
new HousePlacementEntry(
new(
typeof(OkinawaSweetDreamCastle),
1158963,
4076,
@ -486,7 +486,7 @@ namespace Server.Items
0,
0x148D
),
new HousePlacementEntry(
new(
typeof(TheSandstoneCastle),
1158964,
4076,
@ -500,7 +500,7 @@ namespace Server.Items
0,
0x148E
),
new HousePlacementEntry(
new(
typeof(GrimswindSisters),
1158965,
4076,
@ -518,7 +518,7 @@ namespace Server.Items
public static HousePlacementEntry[] TwoStoryFoundations { get; } =
{
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060241,
425,
@ -532,7 +532,7 @@ namespace Server.Items
0,
0x13EC
), // 7x7 2-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060242,
580,
@ -546,7 +546,7 @@ namespace Server.Items
0,
0x13ED
), // 7x8 2-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060243,
650,
@ -560,7 +560,7 @@ namespace Server.Items
0,
0x13EE
), // 7x9 2-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060244,
700,
@ -574,7 +574,7 @@ namespace Server.Items
0,
0x13EF
), // 7x10 2-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060245,
750,
@ -588,7 +588,7 @@ namespace Server.Items
0,
0x13F0
), // 7x11 2-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060246,
800,
@ -602,7 +602,7 @@ namespace Server.Items
0,
0x13F1
), // 7x12 2-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060253,
580,
@ -616,7 +616,7 @@ namespace Server.Items
0,
0x13F8
), // 8x7 2-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060254,
650,
@ -630,7 +630,7 @@ namespace Server.Items
0,
0x13F9
), // 8x8 2-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060255,
700,
@ -644,7 +644,7 @@ namespace Server.Items
0,
0x13FA
), // 8x9 2-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060256,
750,
@ -658,7 +658,7 @@ namespace Server.Items
0,
0x13FB
), // 8x10 2-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060257,
800,
@ -672,7 +672,7 @@ namespace Server.Items
0,
0x13FC
), // 8x11 2-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060258,
850,
@ -686,7 +686,7 @@ namespace Server.Items
0,
0x13FD
), // 8x12 2-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060259,
1100,
@ -700,7 +700,7 @@ namespace Server.Items
0,
0x13FE
), // 8x13 2-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060265,
650,
@ -714,7 +714,7 @@ namespace Server.Items
0,
0x1404
), // 9x7 2-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060266,
700,
@ -728,7 +728,7 @@ namespace Server.Items
0,
0x1405
), // 9x8 2-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060267,
750,
@ -742,7 +742,7 @@ namespace Server.Items
0,
0x1406
), // 9x9 2-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060268,
800,
@ -756,7 +756,7 @@ namespace Server.Items
0,
0x1407
), // 9x10 2-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060269,
850,
@ -770,7 +770,7 @@ namespace Server.Items
0,
0x1408
), // 9x11 2-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060270,
1100,
@ -784,7 +784,7 @@ namespace Server.Items
0,
0x1409
), // 9x12 2-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060271,
1100,
@ -798,7 +798,7 @@ namespace Server.Items
0,
0x140A
), // 9x13 2-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060277,
700,
@ -812,7 +812,7 @@ namespace Server.Items
0,
0x1410
), // 10x7 2-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060278,
750,
@ -826,7 +826,7 @@ namespace Server.Items
0,
0x1411
), // 10x8 2-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060279,
800,
@ -840,7 +840,7 @@ namespace Server.Items
0,
0x1412
), // 10x9 2-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060280,
850,
@ -854,7 +854,7 @@ namespace Server.Items
0,
0x1413
), // 10x10 2-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060281,
1100,
@ -868,7 +868,7 @@ namespace Server.Items
0,
0x1414
), // 10x11 2-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060282,
1100,
@ -882,7 +882,7 @@ namespace Server.Items
0,
0x1415
), // 10x12 2-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060283,
1150,
@ -896,7 +896,7 @@ namespace Server.Items
0,
0x1416
), // 10x13 2-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060289,
750,
@ -910,7 +910,7 @@ namespace Server.Items
0,
0x141C
), // 11x7 2-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060290,
800,
@ -924,7 +924,7 @@ namespace Server.Items
0,
0x141D
), // 11x8 2-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060291,
850,
@ -938,7 +938,7 @@ namespace Server.Items
0,
0x141E
), // 11x9 2-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060292,
1100,
@ -952,7 +952,7 @@ namespace Server.Items
0,
0x141F
), // 11x10 2-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060293,
1100,
@ -966,7 +966,7 @@ namespace Server.Items
0,
0x1420
), // 11x11 2-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060294,
1150,
@ -980,7 +980,7 @@ namespace Server.Items
0,
0x1421
), // 11x12 2-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060295,
1200,
@ -994,7 +994,7 @@ namespace Server.Items
0,
0x1422
), // 11x13 2-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060301,
800,
@ -1008,7 +1008,7 @@ namespace Server.Items
0,
0x1428
), // 12x7 2-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060302,
850,
@ -1022,7 +1022,7 @@ namespace Server.Items
0,
0x1429
), // 12x8 2-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060303,
1100,
@ -1036,7 +1036,7 @@ namespace Server.Items
0,
0x142A
), // 12x9 2-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060304,
1100,
@ -1050,7 +1050,7 @@ namespace Server.Items
0,
0x142B
), // 12x10 2-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060305,
1150,
@ -1064,7 +1064,7 @@ namespace Server.Items
0,
0x142C
), // 12x11 2-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060306,
1200,
@ -1078,7 +1078,7 @@ namespace Server.Items
0,
0x142D
), // 12x12 2-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060307,
1250,
@ -1092,7 +1092,7 @@ namespace Server.Items
0,
0x142E
), // 12x13 2-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060314,
1100,
@ -1106,7 +1106,7 @@ namespace Server.Items
0,
0x1435
), // 13x8 2-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060315,
1100,
@ -1120,7 +1120,7 @@ namespace Server.Items
0,
0x1436
), // 13x9 2-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060316,
1150,
@ -1134,7 +1134,7 @@ namespace Server.Items
0,
0x1437
), // 13x10 2-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060317,
1200,
@ -1148,7 +1148,7 @@ namespace Server.Items
0,
0x1438
), // 13x11 2-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060318,
1250,
@ -1162,7 +1162,7 @@ namespace Server.Items
0,
0x1439
), // 13x12 2-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060319,
1300,
@ -1180,7 +1180,7 @@ namespace Server.Items
public static HousePlacementEntry[] ThreeStoryFoundations { get; } =
{
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060272,
1150,
@ -1194,7 +1194,7 @@ namespace Server.Items
0,
0x140B
), // 9x14 3-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060284,
1200,
@ -1208,7 +1208,7 @@ namespace Server.Items
0,
0x1417
), // 10x14 3-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060285,
1250,
@ -1222,7 +1222,7 @@ namespace Server.Items
0,
0x1418
), // 10x15 3-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060296,
1250,
@ -1236,7 +1236,7 @@ namespace Server.Items
0,
0x1423
), // 11x14 3-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060297,
1300,
@ -1250,7 +1250,7 @@ namespace Server.Items
0,
0x1424
), // 11x15 3-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060298,
1350,
@ -1264,7 +1264,7 @@ namespace Server.Items
0,
0x1425
), // 11x16 3-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060308,
1300,
@ -1278,7 +1278,7 @@ namespace Server.Items
0,
0x142F
), // 12x14 3-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060309,
1350,
@ -1292,7 +1292,7 @@ namespace Server.Items
0,
0x1430
), // 12x15 3-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060310,
1370,
@ -1306,7 +1306,7 @@ namespace Server.Items
0,
0x1431
), // 12x16 3-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060311,
1370,
@ -1320,7 +1320,7 @@ namespace Server.Items
0,
0x1432
), // 12x17 3-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060320,
1350,
@ -1334,7 +1334,7 @@ namespace Server.Items
0,
0x143B
), // 13x14 3-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060321,
1370,
@ -1348,7 +1348,7 @@ namespace Server.Items
0,
0x143C
), // 13x15 3-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060322,
1370,
@ -1362,7 +1362,7 @@ namespace Server.Items
0,
0x143D
), // 13x16 3-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060323,
2119,
@ -1376,7 +1376,7 @@ namespace Server.Items
0,
0x143E
), // 13x17 3-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060324,
2119,
@ -1390,7 +1390,7 @@ namespace Server.Items
0,
0x143F
), // 13x18 3-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060327,
1150,
@ -1404,7 +1404,7 @@ namespace Server.Items
0,
0x1442
), // 14x9 3-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060328,
1200,
@ -1418,7 +1418,7 @@ namespace Server.Items
0,
0x1443
), // 14x10 3-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060329,
1250,
@ -1432,7 +1432,7 @@ namespace Server.Items
0,
0x1444
), // 14x11 3-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060330,
1300,
@ -1446,7 +1446,7 @@ namespace Server.Items
0,
0x1445
), // 14x12 3-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060331,
1350,
@ -1460,7 +1460,7 @@ namespace Server.Items
0,
0x1446
), // 14x13 3-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060332,
1370,
@ -1474,7 +1474,7 @@ namespace Server.Items
0,
0x1447
), // 14x14 3-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060333,
1370,
@ -1488,7 +1488,7 @@ namespace Server.Items
0,
0x1448
), // 14x15 3-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060334,
2119,
@ -1502,7 +1502,7 @@ namespace Server.Items
0,
0x1449
), // 14x16 3-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060335,
2119,
@ -1516,7 +1516,7 @@ namespace Server.Items
0,
0x144A
), // 14x17 3-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060336,
2119,
@ -1530,7 +1530,7 @@ namespace Server.Items
0,
0x144B
), // 14x18 3-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060340,
1250,
@ -1544,7 +1544,7 @@ namespace Server.Items
0,
0x144F
), // 15x10 3-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060341,
1300,
@ -1558,7 +1558,7 @@ namespace Server.Items
0,
0x1450
), // 15x11 3-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060342,
1350,
@ -1572,7 +1572,7 @@ namespace Server.Items
0,
0x1451
), // 15x12 3-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060343,
1370,
@ -1586,7 +1586,7 @@ namespace Server.Items
0,
0x1452
), // 15x13 3-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060344,
1370,
@ -1600,7 +1600,7 @@ namespace Server.Items
0,
0x1453
), // 15x14 3-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060345,
2119,
@ -1614,7 +1614,7 @@ namespace Server.Items
0,
0x1454
), // 15x15 3-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060346,
2119,
@ -1628,7 +1628,7 @@ namespace Server.Items
0,
0x1455
), // 15x16 3-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060347,
2119,
@ -1642,7 +1642,7 @@ namespace Server.Items
0,
0x1456
), // 15x17 3-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060348,
2119,
@ -1656,7 +1656,7 @@ namespace Server.Items
0,
0x1457
), // 15x18 3-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060353,
1350,
@ -1670,7 +1670,7 @@ namespace Server.Items
0,
0x145C
), // 16x11 3-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060354,
1370,
@ -1684,7 +1684,7 @@ namespace Server.Items
0,
0x145D
), // 16x12 3-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060355,
1370,
@ -1698,7 +1698,7 @@ namespace Server.Items
0,
0x145E
), // 16x13 3-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060356,
2119,
@ -1712,7 +1712,7 @@ namespace Server.Items
0,
0x145F
), // 16x14 3-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060357,
2119,
@ -1726,7 +1726,7 @@ namespace Server.Items
0,
0x1460
), // 16x15 3-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060358,
2119,
@ -1740,7 +1740,7 @@ namespace Server.Items
0,
0x1461
), // 16x16 3-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060359,
2119,
@ -1754,7 +1754,7 @@ namespace Server.Items
0,
0x1462
), // 16x17 3-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060360,
2119,
@ -1768,7 +1768,7 @@ namespace Server.Items
0,
0x1463
), // 16x18 3-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060366,
1370,
@ -1782,7 +1782,7 @@ namespace Server.Items
0,
0x1469
), // 17x12 3-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060367,
2119,
@ -1796,7 +1796,7 @@ namespace Server.Items
0,
0x146A
), // 17x13 3-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060368,
2119,
@ -1810,7 +1810,7 @@ namespace Server.Items
0,
0x146B
), // 17x14 3-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060369,
2119,
@ -1824,7 +1824,7 @@ namespace Server.Items
0,
0x146C
), // 17x15 3-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060370,
2119,
@ -1838,7 +1838,7 @@ namespace Server.Items
0,
0x146D
), // 17x16 3-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060371,
2119,
@ -1852,7 +1852,7 @@ namespace Server.Items
0,
0x146E
), // 17x17 3-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060372,
2119,
@ -1866,7 +1866,7 @@ namespace Server.Items
0,
0x146F
), // 17x18 3-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060379,
2119,
@ -1880,7 +1880,7 @@ namespace Server.Items
0,
0x1476
), // 18x13 3-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060380,
2119,
@ -1894,7 +1894,7 @@ namespace Server.Items
0,
0x1477
), // 18x14 3-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060381,
2119,
@ -1908,7 +1908,7 @@ namespace Server.Items
0,
0x1478
), // 18x15 3-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060382,
2119,
@ -1922,7 +1922,7 @@ namespace Server.Items
0,
0x1479
), // 18x16 3-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060383,
2119,
@ -1936,7 +1936,7 @@ namespace Server.Items
0,
0x147A
), // 18x17 3-Story Customizable House
new HousePlacementEntry(
new(
typeof(HouseFoundation),
1060384,
2119,

View file

@ -5,7 +5,7 @@ namespace Server.Multis
{
public class SmallOldHouse : BaseHouse
{
public static Rectangle2D[] AreaArray = { new Rectangle2D(-3, -3, 7, 7), new Rectangle2D(-1, 4, 3, 1) };
public static Rectangle2D[] AreaArray = { new(-3, -3, 7, 7), new(-1, 4, 3, 1) };
public SmallOldHouse(Mobile owner, int id) : base(id, owner, 425, 3)
{
@ -21,7 +21,7 @@ namespace Server.Multis
}
public override Rectangle2D[] Area => AreaArray;
public override Point3D BaseBanLocation => new Point3D(2, 4, 0);
public override Point3D BaseBanLocation => new(2, 4, 0);
public override int DefaultPrice => 43800;
@ -56,7 +56,7 @@ namespace Server.Multis
public class GuildHouse : BaseHouse
{
public static Rectangle2D[] AreaArray = { new Rectangle2D(-7, -7, 14, 14), new Rectangle2D(-2, 7, 4, 1) };
public static Rectangle2D[] AreaArray = { new(-7, -7, 14, 14), new(-2, 7, 4, 1) };
public GuildHouse(Mobile owner) : base(0x74, owner, 1100, 8)
{
@ -81,7 +81,7 @@ namespace Server.Multis
public override int ConvertOffsetY => -1;
public override Rectangle2D[] Area => AreaArray;
public override Point3D BaseBanLocation => new Point3D(4, 8, 0);
public override Point3D BaseBanLocation => new(4, 8, 0);
public override HouseDeed GetDeed() => new BrickHouseDeed();
@ -101,7 +101,7 @@ namespace Server.Multis
public class TwoStoryHouse : BaseHouse
{
public static Rectangle2D[] AreaArray =
{ new Rectangle2D(-7, 0, 14, 7), new Rectangle2D(-7, -7, 9, 7), new Rectangle2D(-4, 7, 4, 1) };
{ new(-7, 0, 14, 7), new(-7, -7, 9, 7), new(-4, 7, 4, 1) };
public TwoStoryHouse(Mobile owner, int id) : base(id, owner, 1370, 10)
{
@ -120,7 +120,7 @@ namespace Server.Multis
}
public override Rectangle2D[] Area => AreaArray;
public override Point3D BaseBanLocation => new Point3D(2, 8, 0);
public override Point3D BaseBanLocation => new(2, 8, 0);
public override int DefaultPrice => 192400;
@ -151,8 +151,8 @@ namespace Server.Multis
{
public static Rectangle2D[] AreaArray =
{
new Rectangle2D(-7, -7, 16, 14), new Rectangle2D(-1, 7, 4, 2), new Rectangle2D(-11, 0, 4, 7),
new Rectangle2D(9, 0, 4, 7)
new(-7, -7, 16, 14), new(-1, 7, 4, 2), new(-11, 0, 4, 7),
new(9, 0, 4, 7)
};
public Tower(Mobile owner) : base(0x7A, owner, 2119, 15)
@ -178,7 +178,7 @@ namespace Server.Multis
public override int ConvertOffsetY => -1;
public override Rectangle2D[] Area => AreaArray;
public override Point3D BaseBanLocation => new Point3D(5, 8, 0);
public override Point3D BaseBanLocation => new(5, 8, 0);
public override HouseDeed GetDeed() => new TowerDeed();
@ -199,9 +199,9 @@ namespace Server.Multis
{
public static Rectangle2D[] AreaArray =
{
new Rectangle2D(-11, -11, 7, 8), new Rectangle2D(-11, 5, 7, 8), new Rectangle2D(6, -11, 7, 8),
new Rectangle2D(6, 5, 7, 8), new Rectangle2D(-9, -3, 5, 8), new Rectangle2D(6, -3, 5, 8),
new Rectangle2D(-4, -9, 10, 20), new Rectangle2D(-1, 11, 4, 1)
new(-11, -11, 7, 8), new(-11, 5, 7, 8), new(6, -11, 7, 8),
new(6, 5, 7, 8), new(-9, -3, 5, 8), new(6, -3, 5, 8),
new(-4, -9, 10, 20), new(-1, 11, 4, 1)
};
public Keep(Mobile owner) : base(0x7C, owner, 2625, 18)
@ -220,7 +220,7 @@ namespace Server.Multis
public override int DefaultPrice => 665200;
public override Rectangle2D[] Area => AreaArray;
public override Point3D BaseBanLocation => new Point3D(5, 13, 0);
public override Point3D BaseBanLocation => new(5, 13, 0);
public override HouseDeed GetDeed() => new KeepDeed();
@ -239,7 +239,7 @@ namespace Server.Multis
public class Castle : BaseHouse
{
public static Rectangle2D[] AreaArray = { new Rectangle2D(-15, -15, 31, 31), new Rectangle2D(-1, 16, 4, 1) };
public static Rectangle2D[] AreaArray = { new(-15, -15, 31, 31), new(-1, 16, 4, 1) };
public Castle(Mobile owner) : base(0x7E, owner, 4076, 28)
{
@ -261,7 +261,7 @@ namespace Server.Multis
public override int DefaultPrice => 1022800;
public override Rectangle2D[] Area => AreaArray;
public override Point3D BaseBanLocation => new Point3D(5, 17, 0);
public override Point3D BaseBanLocation => new(5, 17, 0);
public override HouseDeed GetDeed() => new CastleDeed();
@ -280,7 +280,7 @@ namespace Server.Multis
public class LargePatioHouse : BaseHouse
{
public static Rectangle2D[] AreaArray = { new Rectangle2D(-7, -7, 15, 14), new Rectangle2D(-5, 7, 4, 1) };
public static Rectangle2D[] AreaArray = { new(-7, -7, 15, 14), new(-5, 7, 4, 1) };
public LargePatioHouse(Mobile owner) : base(0x8C, owner, 1100, 8)
{
@ -305,7 +305,7 @@ namespace Server.Multis
public override int ConvertOffsetY => -1;
public override Rectangle2D[] Area => AreaArray;
public override Point3D BaseBanLocation => new Point3D(1, 8, 0);
public override Point3D BaseBanLocation => new(1, 8, 0);
public override HouseDeed GetDeed() => new LargePatioDeed();
@ -324,7 +324,7 @@ namespace Server.Multis
public class LargeMarbleHouse : BaseHouse
{
public static Rectangle2D[] AreaArray = { new Rectangle2D(-7, -7, 15, 14), new Rectangle2D(-6, 7, 6, 1) };
public static Rectangle2D[] AreaArray = { new(-7, -7, 15, 14), new(-6, 7, 6, 1) };
public LargeMarbleHouse(Mobile owner) : base(0x96, owner, 1370, 10)
{
@ -345,7 +345,7 @@ namespace Server.Multis
public override int ConvertOffsetY => -1;
public override Rectangle2D[] Area => AreaArray;
public override Point3D BaseBanLocation => new Point3D(1, 8, 0);
public override Point3D BaseBanLocation => new(1, 8, 0);
public override HouseDeed GetDeed() => new LargeMarbleDeed();
@ -364,7 +364,7 @@ namespace Server.Multis
public class SmallTower : BaseHouse
{
public static Rectangle2D[] AreaArray = { new Rectangle2D(-3, -3, 8, 7), new Rectangle2D(2, 4, 3, 1) };
public static Rectangle2D[] AreaArray = { new(-3, -3, 8, 7), new(2, 4, 3, 1) };
public SmallTower(Mobile owner) : base(0x98, owner, 580, 4)
{
@ -384,7 +384,7 @@ namespace Server.Multis
public override HousePlacementEntry ConvertEntry => HousePlacementEntry.TwoStoryFoundations[6];
public override Rectangle2D[] Area => AreaArray;
public override Point3D BaseBanLocation => new Point3D(1, 4, 0);
public override Point3D BaseBanLocation => new(1, 4, 0);
public override HouseDeed GetDeed() => new SmallTowerDeed();
@ -403,7 +403,7 @@ namespace Server.Multis
public class LogCabin : BaseHouse
{
public static Rectangle2D[] AreaArray = { new Rectangle2D(-3, -6, 8, 13) };
public static Rectangle2D[] AreaArray = { new(-3, -6, 8, 13) };
public LogCabin(Mobile owner) : base(0x9A, owner, 1100, 8)
{
@ -425,7 +425,7 @@ namespace Server.Multis
public override HousePlacementEntry ConvertEntry => HousePlacementEntry.TwoStoryFoundations[12];
public override Rectangle2D[] Area => AreaArray;
public override Point3D BaseBanLocation => new Point3D(5, 8, 0);
public override Point3D BaseBanLocation => new(5, 8, 0);
public override HouseDeed GetDeed() => new LogCabinDeed();
@ -444,7 +444,7 @@ namespace Server.Multis
public class SandStonePatio : BaseHouse
{
public static Rectangle2D[] AreaArray = { new Rectangle2D(-5, -4, 12, 8), new Rectangle2D(-2, 4, 3, 1) };
public static Rectangle2D[] AreaArray = { new(-5, -4, 12, 8), new(-2, 4, 3, 1) };
public SandStonePatio(Mobile owner) : base(0x9C, owner, 850, 6)
{
@ -465,7 +465,7 @@ namespace Server.Multis
public override int ConvertOffsetY => -1;
public override Rectangle2D[] Area => AreaArray;
public override Point3D BaseBanLocation => new Point3D(4, 6, 0);
public override Point3D BaseBanLocation => new(4, 6, 0);
public override HouseDeed GetDeed() => new SandstonePatioDeed();
@ -484,7 +484,7 @@ namespace Server.Multis
public class TwoStoryVilla : BaseHouse
{
public static Rectangle2D[] AreaArray = { new Rectangle2D(-5, -5, 11, 11), new Rectangle2D(2, 6, 4, 1) };
public static Rectangle2D[] AreaArray = { new(-5, -5, 11, 11), new(2, 6, 4, 1) };
public TwoStoryVilla(Mobile owner) : base(0x9E, owner, 1100, 8)
{
@ -507,7 +507,7 @@ namespace Server.Multis
public override HousePlacementEntry ConvertEntry => HousePlacementEntry.TwoStoryFoundations[31];
public override Rectangle2D[] Area => AreaArray;
public override Point3D BaseBanLocation => new Point3D(3, 8, 0);
public override Point3D BaseBanLocation => new(3, 8, 0);
public override HouseDeed GetDeed() => new VillaDeed();
@ -526,8 +526,8 @@ namespace Server.Multis
public class SmallShop : BaseHouse
{
public static Rectangle2D[] AreaArray1 = { new Rectangle2D(-3, -3, 7, 7), new Rectangle2D(-1, 4, 4, 1) };
public static Rectangle2D[] AreaArray2 = { new Rectangle2D(-3, -3, 7, 7), new Rectangle2D(-2, 4, 3, 1) };
public static Rectangle2D[] AreaArray1 = { new(-3, -3, 7, 7), new(-1, 4, 4, 1) };
public static Rectangle2D[] AreaArray2 = { new(-3, -3, 7, 7), new(-2, 4, 3, 1) };
public SmallShop(Mobile owner, int id) : base(id, owner, 425, 3)
{
@ -555,7 +555,7 @@ namespace Server.Multis
}
public override Rectangle2D[] Area => ItemID == 0x40A2 ? AreaArray1 : AreaArray2;
public override Point3D BaseBanLocation => new Point3D(3, 4, 0);
public override Point3D BaseBanLocation => new(3, 4, 0);
public override int DefaultPrice => 63000;

View file

@ -297,7 +297,7 @@ namespace Server.Multis
public override int DefaultGumpID => 0x4B;
public override int DefaultDropSound => 0x42;
public override Rectangle2D Bounds => new Rectangle2D(16, 51, 168, 73);
public override Rectangle2D Bounds => new(16, 51, 168, 73);
public override int DefaultMaxItems => 0;
public override int DefaultMaxWeight => 0;