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

20
Projects/UOContent/Engines/BulkOrders/Rewards.cs
View file

@ -206,7 +206,7 @@ namespace Server.Engines.BulkOrders
private static readonly ConstructCallback PowerScroll = CreatePowerScroll;
private static readonly ConstructCallback ColoredAnvil = CreateColoredAnvil;
private static readonly ConstructCallback AncientHammer = CreateAncientHammer;
public static readonly SmithRewardCalculator Instance = new SmithRewardCalculator();
public static readonly SmithRewardCalculator Instance = new();
private static readonly int[][][] m_GoldTable =
{
@ -299,9 +299,9 @@ namespace Server.Engines.BulkOrders
private readonly RewardType[] m_Types =
{
// Armors
new RewardType(200, typeof(RingmailGloves), typeof(RingmailChest), typeof(RingmailArms), typeof(RingmailLegs)),
new RewardType(300, typeof(ChainCoif), typeof(ChainLegs), typeof(ChainChest)),
new RewardType(
new(200, typeof(RingmailGloves), typeof(RingmailChest), typeof(RingmailArms), typeof(RingmailLegs)),
new(300, typeof(ChainCoif), typeof(ChainLegs), typeof(ChainChest)),
new(
400,
typeof(PlateArms),
typeof(PlateLegs),
@ -312,8 +312,8 @@ namespace Server.Engines.BulkOrders
),
// Weapons
new RewardType(200, typeof(Bardiche), typeof(Halberd)),
new RewardType(
new(200, typeof(Bardiche), typeof(Halberd)),
new(
300,
typeof(Dagger),
typeof(ShortSpear),
@ -321,7 +321,7 @@ namespace Server.Engines.BulkOrders
typeof(WarFork),
typeof(Kryss)
), // OSI put the dagger in there. Odd, ain't it.
new RewardType(
new(
350,
typeof(Axe),
typeof(BattleAxe),
@ -330,7 +330,7 @@ namespace Server.Engines.BulkOrders
typeof(LargeBattleAxe),
typeof(TwoHandedAxe)
),
new RewardType(
new(
350,
typeof(Broadsword),
typeof(Cutlass),
@ -339,7 +339,7 @@ namespace Server.Engines.BulkOrders
typeof(Scimitar), /*typeof( ThinLongsword ),*/
typeof(VikingSword)
),
new RewardType(
new(
350,
typeof(WarAxe),
typeof(HammerPick),
@ -564,7 +564,7 @@ namespace Server.Engines.BulkOrders
private static readonly ConstructCallback PowerScroll = CreatePowerScroll;
private static readonly ConstructCallback BearRug = CreateBearRug;
private static readonly ConstructCallback ClothingBlessDeed = CreateCBD;
public static readonly TailorRewardCalculator Instance = new TailorRewardCalculator();
public static readonly TailorRewardCalculator Instance = new();
private static readonly int[][][] m_AosGoldTable =
{