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
GitHub
parent
351611a23a
commit
3551d962f7
417 changed files with 2209 additions and 2213 deletions
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
||||
|
|
|
|||
|
|
@ -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()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue