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

5
Projects/UOContent/Mobiles/AI/BaseAI.cs
View file

@ -94,7 +94,7 @@ namespace Server.Mobiles
SkillName.Meditation
};
private static readonly Queue<Item> m_Obstacles = new Queue<Item>();
private static readonly Queue<Item> m_Obstacles = new();
protected ActionType m_Action;
public BaseCreature m_Mobile;
@ -380,8 +380,7 @@ namespace Server.Mobiles
var skill = ourSkills[i];
var theirSkill = theirSkills[i];
if (skill != null && skill.Base >= 60.0 &&
m_Mobile.CheckTeach(skill.SkillName, e.Mobile))
if (skill?.Base >= 60.0 && m_Mobile.CheckTeach(skill.SkillName, e.Mobile))
{
var toTeach = skill.Base / 3.0;

6
Projects/UOContent/Mobiles/AI/OppositionGroup.cs
View file

@ -9,7 +9,7 @@ namespace Server
public OppositionGroup(Type[][] types) => m_Types = types;
public static OppositionGroup TerathansAndOphidians { get; } = new OppositionGroup(
public static OppositionGroup TerathansAndOphidians { get; } = new(
new[]
{
new[]
@ -30,7 +30,7 @@ namespace Server
}
);
public static OppositionGroup SavagesAndOrcs { get; } = new OppositionGroup(
public static OppositionGroup SavagesAndOrcs { get; } = new(
new[]
{
new[]
@ -53,7 +53,7 @@ namespace Server
}
);
public static OppositionGroup FeyAndUndead { get; } = new OppositionGroup(
public static OppositionGroup FeyAndUndead { get; } = new(
new[]
{
new[]

8
Projects/UOContent/Mobiles/AI/SpeedInfo.cs
View file

@ -15,7 +15,7 @@ namespace Server
private static readonly SpeedInfo[] m_Speeds =
{
/* Slow */
new SpeedInfo(
new(
0.3,
0.6,
new[]
@ -34,7 +34,7 @@ namespace Server
}
),
/* Fast */
new SpeedInfo(
new(
0.2,
0.4,
new[]
@ -61,7 +61,7 @@ namespace Server
}
),
/* Very Fast */
new SpeedInfo(
new(
0.175,
0.350,
new[]
@ -78,7 +78,7 @@ namespace Server
}
),
/* Medium */
new SpeedInfo(
new(
0.25,
0.5,
new[]

2
Projects/UOContent/Mobiles/Animals/Mounts/Ethereals.cs
View file

@ -349,7 +349,7 @@ namespace Server.Mobiles
private class EtherealSpell : Spell
{
private static readonly SpellInfo m_Info = new SpellInfo("Ethereal Mount", "", 230);
private static readonly SpellInfo m_Info = new("Ethereal Mount", "", 230);
private readonly EtherealMount m_Mount;
private readonly Mobile m_Rider;

2
Projects/UOContent/Mobiles/Townfolk/TownCrier.cs
View file

@ -298,7 +298,7 @@ namespace Server.Mobiles
var entries = m_Owner.Entries;
var index = info.ButtonID - 2;
if (entries != null && index < entries.Count)
if (index < entries?.Count)
{
var tce = entries[index];
var ts = tce.ExpireTime - DateTime.UtcNow;

4
Projects/UOContent/Mobiles/Vendors/BaseVendor.cs
View file

@ -1312,12 +1312,12 @@ namespace Server.Mobiles
var sbInfos = SBInfos;
for (var i = 0; sbInfos != null && i < sbInfos.Count; ++i)
for (var i = 0; i < sbInfos?.Count; ++i)
{
var sbInfo = sbInfos[i];
var buyInfo = sbInfo.BuyInfo;
for (var j = 0; buyInfo != null && j < buyInfo.Count; ++j)
for (var j = 0; j < buyInfo?.Count; ++j)
{
var gbi = buyInfo[j];

2
Projects/UOContent/Mobiles/Vendors/GenericSell.cs
View file

@ -6,7 +6,7 @@ namespace Server.Mobiles
{
public class GenericSellInfo : IShopSellInfo
{
private readonly Dictionary<Type, int> m_Table = new Dictionary<Type, int>();
private readonly Dictionary<Type, int> m_Table = new();
private Type[] m_Types;
public int GetSellPriceFor(Item item)

82
Projects/UOContent/Mobiles/Vendors/NPC/CustomHairstylist.cs
View file

@ -9,9 +9,9 @@ namespace Server.Mobiles
{
public class CustomHairstylist : BaseVendor
{
public static readonly object From = new object();
public static readonly object Vendor = new object();
public static readonly object Price = new object();
public static readonly object From = new();
public static readonly object Vendor = new();
public static readonly object Price = new();
private static readonly HairstylistBuyInfo[] m_SellList =
{
@ -286,30 +286,30 @@ namespace Server.Mobiles
{
public static readonly ChangeHairHueEntry[] BrightEntries =
{
new ChangeHairHueEntry("*****", 12, 10),
new ChangeHairHueEntry("*****", 32, 5),
new ChangeHairHueEntry("*****", 38, 8),
new ChangeHairHueEntry("*****", 54, 3),
new ChangeHairHueEntry("*****", 62, 10),
new ChangeHairHueEntry("*****", 81, 2),
new ChangeHairHueEntry("*****", 89, 2),
new ChangeHairHueEntry("*****", 1153, 2)
new("*****", 12, 10),
new("*****", 32, 5),
new("*****", 38, 8),
new("*****", 54, 3),
new("*****", 62, 10),
new("*****", 81, 2),
new("*****", 89, 2),
new("*****", 1153, 2)
};
public static readonly ChangeHairHueEntry[] RegularEntries =
{
new ChangeHairHueEntry("*****", 1602, 26),
new ChangeHairHueEntry("*****", 1628, 27),
new ChangeHairHueEntry("*****", 1502, 32),
new ChangeHairHueEntry("*****", 1302, 32),
new ChangeHairHueEntry("*****", 1402, 32),
new ChangeHairHueEntry("*****", 1202, 24),
new ChangeHairHueEntry("*****", 2402, 29),
new ChangeHairHueEntry("*****", 2213, 6),
new ChangeHairHueEntry("*****", 1102, 8),
new ChangeHairHueEntry("*****", 1110, 8),
new ChangeHairHueEntry("*****", 1118, 16),
new ChangeHairHueEntry("*****", 1134, 16)
new("*****", 1602, 26),
new("*****", 1628, 27),
new("*****", 1502, 32),
new("*****", 1302, 32),
new("*****", 1402, 32),
new("*****", 1202, 24),
new("*****", 2402, 29),
new("*****", 2213, 6),
new("*****", 1102, 8),
new("*****", 1110, 8),
new("*****", 1118, 16),
new("*****", 1134, 16)
};
public ChangeHairHueEntry(string name, int[] hues)
@ -464,28 +464,28 @@ namespace Server.Mobiles
{
public static readonly ChangeHairstyleEntry[] HairEntries =
{
new ChangeHairstyleEntry(50700, 70 - 137, 20 - 60, 0x203B),
new ChangeHairstyleEntry(60710, 193 - 260, 18 - 60, 0x2045),
new ChangeHairstyleEntry(50703, 316 - 383, 25 - 60, 0x2044),
new ChangeHairstyleEntry(60708, 70 - 137, 75 - 125, 0x203C),
new ChangeHairstyleEntry(60900, 193 - 260, 85 - 125, 0x2047),
new ChangeHairstyleEntry(60713, 320 - 383, 85 - 125, 0x204A),
new ChangeHairstyleEntry(60702, 70 - 137, 140 - 190, 0x203D),
new ChangeHairstyleEntry(60707, 193 - 260, 140 - 190, 0x2049),
new ChangeHairstyleEntry(60901, 315 - 383, 150 - 190, 0x2048),
new ChangeHairstyleEntry(0, 0, 0, 0)
new(50700, 70 - 137, 20 - 60, 0x203B),
new(60710, 193 - 260, 18 - 60, 0x2045),
new(50703, 316 - 383, 25 - 60, 0x2044),
new(60708, 70 - 137, 75 - 125, 0x203C),
new(60900, 193 - 260, 85 - 125, 0x2047),
new(60713, 320 - 383, 85 - 125, 0x204A),
new(60702, 70 - 137, 140 - 190, 0x203D),
new(60707, 193 - 260, 140 - 190, 0x2049),
new(60901, 315 - 383, 150 - 190, 0x2048),
new(0, 0, 0, 0)
};
public static readonly ChangeHairstyleEntry[] BeardEntries =
{
new ChangeHairstyleEntry(50800, 120 - 187, 30 - 80, 0x2040),
new ChangeHairstyleEntry(50904, 243 - 310, 33 - 80, 0x204B),
new ChangeHairstyleEntry(50906, 120 - 187, 100 - 150, 0x204D),
new ChangeHairstyleEntry(50801, 243 - 310, 95 - 150, 0x203E),
new ChangeHairstyleEntry(50802, 120 - 187, 173 - 220, 0x203F),
new ChangeHairstyleEntry(50905, 243 - 310, 165 - 220, 0x204C),
new ChangeHairstyleEntry(50808, 120 - 187, 242 - 290, 0x2041),
new ChangeHairstyleEntry(0, 0, 0, 0)
new(50800, 120 - 187, 30 - 80, 0x2040),
new(50904, 243 - 310, 33 - 80, 0x204B),
new(50906, 120 - 187, 100 - 150, 0x204D),
new(50801, 243 - 310, 95 - 150, 0x203E),
new(50802, 120 - 187, 173 - 220, 0x203F),
new(50905, 243 - 310, 165 - 220, 0x204C),
new(50808, 120 - 187, 242 - 290, 0x2041),
new(0, 0, 0, 0)
};
public ChangeHairstyleEntry(int gumpID, int x, int y, int itemID)

120
Projects/UOContent/Mobiles/Vendors/PlayerBarkeeper.cs
View file

@ -621,66 +621,66 @@ namespace Server.Mobiles
{
private static readonly Entry[] m_Entries =
{
new Entry("Alchemist"),
new Entry("Animal Tamer"),
new Entry("Apothecary"),
new Entry("Artist"),
new Entry("Baker", true),
new Entry("Bard"),
new Entry("Barkeep", "the barkeeper", true),
new Entry("Beggar"),
new Entry("Blacksmith"),
new Entry("Bounty Hunter"),
new Entry("Brigand"),
new Entry("Butler"),
new Entry("Carpenter"),
new Entry("Chef", true),
new Entry("Commander"),
new Entry("Curator"),
new Entry("Drunkard"),
new Entry("Farmer"),
new Entry("Fisherman"),
new Entry("Gambler"),
new Entry("Gypsy"),
new Entry("Herald"),
new Entry("Herbalist"),
new Entry("Hermit"),
new Entry("Innkeeper", true),
new Entry("Jailor"),
new Entry("Jester"),
new Entry("Librarian"),
new Entry("Mage"),
new Entry("Mercenary"),
new Entry("Merchant"),
new Entry("Messenger"),
new Entry("Miner"),
new Entry("Monk"),
new Entry("Noble"),
new Entry("Paladin"),
new Entry("Peasant"),
new Entry("Pirate"),
new Entry("Prisoner"),
new Entry("Prophet"),
new Entry("Ranger"),
new Entry("Sage"),
new Entry("Sailor"),
new Entry("Scholar"),
new Entry("Scribe"),
new Entry("Sentry"),
new Entry("Servant"),
new Entry("Shepherd"),
new Entry("Soothsayer"),
new Entry("Stoic"),
new Entry("Storyteller"),
new Entry("Tailor"),
new Entry("Thief"),
new Entry("Tinker"),
new Entry("Town Crier"),
new Entry("Treasure Hunter"),
new Entry("Waiter", true),
new Entry("Warrior"),
new Entry("Watchman"),
new Entry("No Title", null)
new("Alchemist"),
new("Animal Tamer"),
new("Apothecary"),
new("Artist"),
new("Baker", true),
new("Bard"),
new("Barkeep", "the barkeeper", true),
new("Beggar"),
new("Blacksmith"),
new("Bounty Hunter"),
new("Brigand"),
new("Butler"),
new("Carpenter"),
new("Chef", true),
new("Commander"),
new("Curator"),
new("Drunkard"),
new("Farmer"),
new("Fisherman"),
new("Gambler"),
new("Gypsy"),
new("Herald"),
new("Herbalist"),
new("Hermit"),
new("Innkeeper", true),
new("Jailor"),
new("Jester"),
new("Librarian"),
new("Mage"),
new("Mercenary"),
new("Merchant"),
new("Messenger"),
new("Miner"),
new("Monk"),
new("Noble"),
new("Paladin"),
new("Peasant"),
new("Pirate"),
new("Prisoner"),
new("Prophet"),
new("Ranger"),
new("Sage"),
new("Sailor"),
new("Scholar"),
new("Scribe"),
new("Sentry"),
new("Servant"),
new("Shepherd"),
new("Soothsayer"),
new("Stoic"),
new("Storyteller"),
new("Tailor"),
new("Thief"),
new("Tinker"),
new("Town Crier"),
new("Treasure Hunter"),
new("Waiter", true),
new("Warrior"),
new("Watchman"),
new("No Title", null)
};
private readonly PlayerBarkeeper m_Barkeeper;

2
Projects/UOContent/Mobiles/Vendors/PlayerVendor.cs
View file

@ -200,7 +200,7 @@ namespace Server.Mobiles
var vi = pv?.GetVendorItem(item);
if (vi?.Description != null && vi.Description.Length > 0)
if (vi?.Description?.Length > 0)
{
list.Add(1043305, vi.Description); // <br>Seller's Description:<br>"~1_DESC~"
}

8
Projects/UOContent/Mobiles/Vendors/RentedVendor.cs
View file

@ -12,10 +12,10 @@ namespace Server.Mobiles
{
public static readonly VendorRentalDuration[] Instances =
{
new VendorRentalDuration(TimeSpan.FromDays(7.0), 1062361), // 1 Week
new VendorRentalDuration(TimeSpan.FromDays(14.0), 1062362), // 2 Weeks
new VendorRentalDuration(TimeSpan.FromDays(21.0), 1062363), // 3 Weeks
new VendorRentalDuration(TimeSpan.FromDays(28.0), 1062364) // 1 Month
new(TimeSpan.FromDays(7.0), 1062361), // 1 Week
new(TimeSpan.FromDays(14.0), 1062362), // 2 Weeks
new(TimeSpan.FromDays(21.0), 1062363), // 3 Weeks
new(TimeSpan.FromDays(28.0), 1062364) // 1 Month
};
private VendorRentalDuration(TimeSpan duration, int name)

2
Projects/UOContent/Mobiles/Vendors/SBInfo/SBInfo.cs
View file

@ -4,7 +4,7 @@ namespace Server.Mobiles
{
public abstract class SBInfo
{
public static readonly List<SBInfo> Empty = new List<SBInfo>();
public static readonly List<SBInfo> Empty = new();
public abstract IShopSellInfo SellInfo { get; }
public abstract List<GenericBuyInfo> BuyInfo { get; }