warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

C# 9 Cleanup (#325)

Browse source 
- [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
Download patch file Download diff file Expand all files Collapse all files

42
Projects/UOContent/Engines/Quests/Collector/Items/ImageTypeInfo.cs
View file

@ -32,27 +32,27 @@ namespace Server.Engines.Quests.Collector
{
private static readonly ImageTypeInfo[] m_Table =
{
new ImageTypeInfo(9734, typeof(Betrayer), 75, 45),
new ImageTypeInfo(9735, typeof(Bogling), 75, 45),
new ImageTypeInfo(9736, typeof(BogThing), 60, 47),
new ImageTypeInfo(9615, typeof(Gazer), 75, 45),
new ImageTypeInfo(9743, typeof(Beetle), 60, 55),
new ImageTypeInfo(9667, typeof(GiantBlackWidow), 55, 52),
new ImageTypeInfo(9657, typeof(Scorpion), 65, 47),
new ImageTypeInfo(9758, typeof(JukaMage), 75, 45),
new ImageTypeInfo(9759, typeof(JukaWarrior), 75, 45),
new ImageTypeInfo(9636, typeof(Lich), 75, 45),
new ImageTypeInfo(9756, typeof(MeerMage), 75, 45),
new ImageTypeInfo(9757, typeof(MeerWarrior), 75, 45),
new ImageTypeInfo(9638, typeof(Mongbat), 70, 50),
new ImageTypeInfo(9639, typeof(Mummy), 75, 45),
new ImageTypeInfo(9654, typeof(Pixie), 75, 45),
new ImageTypeInfo(9747, typeof(PlagueBeast), 60, 45),
new ImageTypeInfo(9750, typeof(SandVortex), 60, 43),
new ImageTypeInfo(9614, typeof(StoneGargoyle), 75, 45),
new ImageTypeInfo(9753, typeof(SwampDragon), 50, 55),
new ImageTypeInfo(8448, typeof(Wisp), 75, 45),
new ImageTypeInfo(9746, typeof(Juggernaut), 55, 38)
new(9734, typeof(Betrayer), 75, 45),
new(9735, typeof(Bogling), 75, 45),
new(9736, typeof(BogThing), 60, 47),
new(9615, typeof(Gazer), 75, 45),
new(9743, typeof(Beetle), 60, 55),
new(9667, typeof(GiantBlackWidow), 55, 52),
new(9657, typeof(Scorpion), 65, 47),
new(9758, typeof(JukaMage), 75, 45),
new(9759, typeof(JukaWarrior), 75, 45),
new(9636, typeof(Lich), 75, 45),
new(9756, typeof(MeerMage), 75, 45),
new(9757, typeof(MeerWarrior), 75, 45),
new(9638, typeof(Mongbat), 70, 50),
new(9639, typeof(Mummy), 75, 45),
new(9654, typeof(Pixie), 75, 45),
new(9747, typeof(PlagueBeast), 60, 45),
new(9750, typeof(SandVortex), 60, 43),
new(9614, typeof(StoneGargoyle), 75, 45),
new(9753, typeof(SwampDragon), 50, 55),
new(8448, typeof(Wisp), 75, 45),
new(9746, typeof(Juggernaut), 55, 38)
};
public ImageTypeInfo(int figurine, Type type, int x, int y)

2
Projects/UOContent/Engines/Quests/Collector/Objectives.cs
View file

@ -53,7 +53,7 @@ namespace Server.Engines.Quests.Collector
public class SitOnTheStoolObjective : QuestObjective
{
private static readonly Point3D m_StoolLocation = new Point3D(2899, 706, 0);
private static readonly Point3D m_StoolLocation = new(2899, 706, 0);
private static readonly Map m_StoolMap = Map.Trammel;
private DateTime m_Begin;

84
Projects/UOContent/Engines/Quests/Core/Items/EnchantedSextant.cs
View file

@ -11,60 +11,60 @@ namespace Server.Items
// TODO: Trammel/Haven
private static readonly Point2D[] m_TrammelBanks =
{
new Point2D(652, 820),
new Point2D(1813, 2825),
new Point2D(3734, 2149),
new Point2D(2503, 552),
new Point2D(3764, 1317),
new Point2D(587, 2146),
new Point2D(1655, 1606),
new Point2D(1425, 1690),
new Point2D(4471, 1156),
new Point2D(1317, 3773),
new Point2D(2881, 684),
new Point2D(2731, 2192),
new Point2D(3620, 2617),
new Point2D(2880, 3472),
new Point2D(1897, 2684),
new Point2D(5346, 74),
new Point2D(5275, 3977),
new Point2D(5669, 3131)
new(652, 820),
new(1813, 2825),
new(3734, 2149),
new(2503, 552),
new(3764, 1317),
new(587, 2146),
new(1655, 1606),
new(1425, 1690),
new(4471, 1156),
new(1317, 3773),
new(2881, 684),
new(2731, 2192),
new(3620, 2617),
new(2880, 3472),
new(1897, 2684),
new(5346, 74),
new(5275, 3977),
new(5669, 3131)
};
private static readonly Point2D[] m_FeluccaBanks =
{
new Point2D(652, 820),
new Point2D(1813, 2825),
new Point2D(3734, 2149),
new Point2D(2503, 552),
new Point2D(3764, 1317),
new Point2D(3695, 2511),
new Point2D(587, 2146),
new Point2D(1655, 1606),
new Point2D(1425, 1690),
new Point2D(4471, 1156),
new Point2D(1317, 3773),
new Point2D(2881, 684),
new Point2D(2731, 2192),
new Point2D(2880, 3472),
new Point2D(1897, 2684),
new Point2D(5346, 74),
new Point2D(5275, 3977),
new Point2D(5669, 3131)
new(652, 820),
new(1813, 2825),
new(3734, 2149),
new(2503, 552),
new(3764, 1317),
new(3695, 2511),
new(587, 2146),
new(1655, 1606),
new(1425, 1690),
new(4471, 1156),
new(1317, 3773),
new(2881, 684),
new(2731, 2192),
new(2880, 3472),
new(1897, 2684),
new(5346, 74),
new(5275, 3977),
new(5669, 3131)
};
private static readonly Point2D[] m_IlshenarBanks =
{
new Point2D(854, 680),
new Point2D(855, 603),
new Point2D(1226, 554),
new Point2D(1610, 556)
new(854, 680),
new(855, 603),
new(1226, 554),
new(1610, 556)
};
private static readonly Point2D[] m_MalasBanks =
{
new Point2D(996, 519),
new Point2D(2048, 1345)
new(996, 519),
new(2048, 1345)
};
[Constructible]

10
Projects/UOContent/Engines/Quests/Dark Tides/Conversations.cs
View file

@ -20,9 +20,9 @@ namespace Server.Engines.Quests.Necro
{
private static readonly QuestItemInfo[] m_Info =
{
new QuestItemInfo(1026153, 6178), // teleporter
new QuestItemInfo(1049117, 4036), // Horn of Retreat
new QuestItemInfo(1048032, 3702) // a bag
new(1026153, 6178), // teleporter
new(1049117, 4036), // Horn of Retreat
new(1048032, 3702) // a bag
};
public override object Message => 1060099;
@ -39,7 +39,7 @@ namespace Server.Engines.Quests.Necro
{
private static readonly QuestItemInfo[] m_Info =
{
new QuestItemInfo(1026153, 6178) // teleporter
new(1026153, 6178) // teleporter
};
public override object Message => 1060103;
@ -76,7 +76,7 @@ namespace Server.Engines.Quests.Necro
{
private static readonly QuestItemInfo[] m_Info =
{
new QuestItemInfo(1023643, 8787) // spellbook
new(1023643, 8787) // spellbook
};
public override object Message => 1060110;

2
Projects/UOContent/Engines/Quests/Dark Tides/Items/KronusScroll.cs
View file

@ -6,7 +6,7 @@ namespace Server.Engines.Quests.Necro
{
public class KronusScroll : QuestItem
{
private static readonly Rectangle2D m_WellOfTearsArea = new Rectangle2D(2080, 1346, 10, 10);
private static readonly Rectangle2D m_WellOfTearsArea = new(2080, 1346, 10, 10);
private static readonly Map m_WellOfTearsMap = Map.Malas;
[Constructible]

8
Projects/UOContent/Engines/Quests/Dark Tides/Objectives.cs
View file

@ -8,7 +8,7 @@ namespace Server.Engines.Quests.Necro
{
private static readonly QuestItemInfo[] m_Info =
{
new QuestItemInfo(1023643, 8787) // spellbook
new(1023643, 8787) // spellbook
};
public override object Message => 1060102;
@ -99,7 +99,7 @@ namespace Server.Engines.Quests.Necro
{
private static readonly QuestItemInfo[] m_Info =
{
new QuestItemInfo(1023676, 3679) // glowing rune
new(1023676, 3679) // glowing rune
};
public override object Message => 1060109;
@ -169,7 +169,7 @@ namespace Server.Engines.Quests.Necro
{
private static readonly QuestItemInfo[] m_Info =
{
new QuestItemInfo(1026153, 6178) // teleporter
new(1026153, 6178) // teleporter
};
public override object Message => 1060115;
@ -269,7 +269,7 @@ namespace Server.Engines.Quests.Necro
public class FindWellOfTearsObjective : QuestObjective
{
private static readonly Rectangle2D m_WellOfTearsArea = new Rectangle2D(2080, 1346, 10, 10);
private static readonly Rectangle2D m_WellOfTearsArea = new(2080, 1346, 10, 10);
private bool m_Inside;

10
Projects/UOContent/Engines/Quests/Study of the Solen Hive/NestArea.cs
View file

@ -6,24 +6,24 @@ namespace Server.Engines.Quests.Naturalist
{
private static readonly NestArea[] m_Areas =
{
new NestArea(false, new Rectangle2D(5861, 1787, 26, 25)),
new(false, new Rectangle2D(5861, 1787, 26, 25)),
new NestArea(
new(
false,
new Rectangle2D(5734, 1788, 14, 50),
new Rectangle2D(5748, 1800, 3, 34),
new Rectangle2D(5751, 1808, 2, 20)
),
new NestArea(false, new Rectangle2D(5907, 1908, 19, 43)),
new(false, new Rectangle2D(5907, 1908, 19, 43)),
new NestArea(
new(
false,
new Rectangle2D(5721, 1926, 24, 29),
new Rectangle2D(5745, 1935, 7, 22)
),
new NestArea(
new(
true,
new Rectangle2D(5651, 1853, 21, 32),
new Rectangle2D(5672, 1857, 6, 20)

2
Projects/UOContent/Engines/Quests/Study of the Solen Hive/Objectives.cs
View file

@ -5,7 +5,7 @@ namespace Server.Engines.Quests.Naturalist
{
public class StudyNestsObjective : QuestObjective
{
private readonly List<NestArea> m_StudiedNests = new List<NestArea>();
private readonly List<NestArea> m_StudiedNests = new();
private NestArea m_CurrentNest;
private DateTime m_StudyBegin;
private StudyState m_StudyState;

24
Projects/UOContent/Engines/Quests/Uzeraan Turmoil/Conversations.cs
View file

@ -24,7 +24,7 @@ namespace Server.Engines.Quests.Haven
{
private static readonly QuestItemInfo[] m_Info =
{
new QuestItemInfo(1023676, 0xE68) // glowing rune
new(1023676, 0xE68) // glowing rune
};
public override object Message
@ -80,8 +80,8 @@ namespace Server.Engines.Quests.Haven
{
private static readonly QuestItemInfo[] m_Info =
{
new QuestItemInfo(1026153, 0x1822), // teleporter
new QuestItemInfo(1048032, 0xE76) // a bag
new(1026153, 0x1822), // teleporter
new(1048032, 0xE76) // a bag
};
public override object Message
@ -135,7 +135,7 @@ namespace Server.Engines.Quests.Haven
{
private static readonly QuestItemInfo[] m_Info =
{
new QuestItemInfo(1023637, 0xE34) // scroll
new(1023637, 0xE34) // scroll
};
public override object Message
@ -180,9 +180,9 @@ namespace Server.Engines.Quests.Haven
{
private static readonly QuestItemInfo[] m_Info =
{
new QuestItemInfo(1048030, 0x14EB), // a Treasure Map
new QuestItemInfo(1023969, 0xF81), // Fertile Dirt
new QuestItemInfo(1049117, 0xFC4) // Horn of Retreat
new(1048030, 0x14EB), // a Treasure Map
new(1023969, 0xF81), // Fertile Dirt
new(1049117, 0xFC4) // Horn of Retreat
};
public override object Message => 1049325;
@ -209,8 +209,8 @@ namespace Server.Engines.Quests.Haven
{
private static readonly QuestItemInfo[] m_Info =
{
new QuestItemInfo(1023965, 0xF7D), // Daemon Blood
new QuestItemInfo(1022581, 0xA22) // lantern
new(1023965, 0xF7D), // Daemon Blood
new(1022581, 0xA22) // lantern
};
public override object Message
@ -258,13 +258,13 @@ namespace Server.Engines.Quests.Haven
{
private static readonly QuestItemInfo[] m_Info =
{
new QuestItemInfo(1017412, 0xF80) // Daemon Bone
new(1017412, 0xF80) // Daemon Bone
};
private static readonly QuestItemInfo[] m_InfoPaladin =
{
new QuestItemInfo(1017412, 0xF80), // Daemon Bone
new QuestItemInfo(1060577, 0x1F14) // Recall Rune
new(1017412, 0xF80), // Daemon Bone
new(1060577, 0x1F14) // Recall Rune
};
public override object Message

30
Projects/UOContent/Engines/Quests/Witch Apprentice/Ingredient.cs
View file

@ -27,35 +27,35 @@ namespace Server.Engines.Quests.Hag
private static readonly IngredientInfo[] m_Table =
{
// sheep liver
new IngredientInfo(1055020, 5, typeof(Sheep)),
new(1055020, 5, typeof(Sheep)),
// rabbit's foot
new IngredientInfo(1055021, 5, typeof(Rabbit), typeof(JackRabbit)),
new(1055021, 5, typeof(Rabbit), typeof(JackRabbit)),
// mongbat wing
new IngredientInfo(1055022, 5, typeof(Mongbat), typeof(GreaterMongbat)),
new(1055022, 5, typeof(Mongbat), typeof(GreaterMongbat)),
// chicken gizzard
new IngredientInfo(1055023, 5, typeof(Chicken)),
new(1055023, 5, typeof(Chicken)),
// rat tail
new IngredientInfo(1055024, 5, typeof(Rat), typeof(GiantRat), typeof(SewerRat)),
new(1055024, 5, typeof(Rat), typeof(GiantRat), typeof(SewerRat)),
// frog's leg
new IngredientInfo(1055025, 5, typeof(BullFrog)),
new(1055025, 5, typeof(BullFrog)),
// deer heart
new IngredientInfo(1055026, 5, typeof(Hind), typeof(GreatHart)),
new(1055026, 5, typeof(Hind), typeof(GreatHart)),
// lizard tongue
new IngredientInfo(1055027, 5, typeof(LavaLizard), typeof(Lizardman)),
new(1055027, 5, typeof(LavaLizard), typeof(Lizardman)),
// slime ooze
new IngredientInfo(1055028, 5, typeof(Slime)),
new(1055028, 5, typeof(Slime)),
// spirit essence
new IngredientInfo(1055029, 5, typeof(Ghoul), typeof(Spectre), typeof(Shade), typeof(Wraith), typeof(Bogle)),
new(1055029, 5, typeof(Ghoul), typeof(Spectre), typeof(Shade), typeof(Wraith), typeof(Bogle)),
// Swamp Water
new IngredientInfo(1055030, 1),
new(1055030, 1),
// Freshly Cut Red Mushrooms
new IngredientInfo(1055031, 1),
new(1055031, 1),
// Bones Buried In Hallowed Ground
new IngredientInfo(1055032, 1),
new(1055032, 1),
// Star Chart
new IngredientInfo(1055033, 1),
new(1055033, 1),
// Captain Blackheart's Whiskey
new IngredientInfo(1055034, 1)
new(1055034, 1)
};
private IngredientInfo(int name, int quantity, params Type[] creatures)

2
Projects/UOContent/Engines/Quests/Witch Apprentice/Items/HagApprenticeCorpse.cs
View file

@ -37,7 +37,7 @@ namespace Server.Engines.Quests.Hag
return apprentice;
}
private static List<Item> GetEquipment() => new List<Item>();
private static List<Item> GetEquipment() => new();
public override void AddNameProperty(ObjectPropertyList list)
{

10
Projects/UOContent/Engines/Quests/Witch Apprentice/Objectives.cs
View file

@ -8,11 +8,11 @@ namespace Server.Engines.Quests.Hag
{
private static readonly Point3D[] m_CorpseLocations =
{
new Point3D(778, 1158, 0),
new Point3D(698, 1443, 0),
new Point3D(785, 1548, 0),
new Point3D(734, 1504, 0),
new Point3D(819, 1266, 0)
new(778, 1158, 0),
new(698, 1443, 0),
new(785, 1548, 0),
new(734, 1504, 0),
new(819, 1266, 0)
};
private Point3D m_CorpseLocation;

40
Projects/UOContent/Engines/Quests/Witch Apprentice/WitchApprenticeQuest.cs
View file

@ -33,26 +33,26 @@ namespace Server.Engines.Quests.Hag
private static readonly Point3D[] m_ZeefzorpulLocations =
{
new Point3D(1226, 1573, 0),
new Point3D(1929, 1148, 0),
new Point3D(1366, 2723, 0),
new Point3D(1675, 2984, 0),
new Point3D(2177, 3367, 10),
new Point3D(1171, 3594, 0),
new Point3D(1010, 2667, 5),
new Point3D(1591, 2156, 5),
new Point3D(2592, 464, 60),
new Point3D(474, 1654, 0),
new Point3D(897, 2411, 0),
new Point3D(1471, 2505, 5),
new Point3D(1257, 872, 16),
new Point3D(2581, 1118, 0),
new Point3D(2513, 1102, 0),
new Point3D(1608, 3371, 0),
new Point3D(4687, 1179, 0),
new Point3D(3704, 2196, 20),
new Point3D(3346, 572, 0),
new Point3D(569, 1309, 0)
new(1226, 1573, 0),
new(1929, 1148, 0),
new(1366, 2723, 0),
new(1675, 2984, 0),
new(2177, 3367, 10),
new(1171, 3594, 0),
new(1010, 2667, 5),
new(1591, 2156, 5),
new(2592, 464, 60),
new(474, 1654, 0),
new(897, 2411, 0),
new(1471, 2505, 5),
new(1257, 872, 16),
new(2581, 1118, 0),
new(2513, 1102, 0),
new(1608, 3371, 0),
new(4687, 1179, 0),
new(3704, 2196, 20),
new(3346, 572, 0),
new(569, 1309, 0)
};
public WitchApprenticeQuest(PlayerMobile from) : base(from)