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

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)