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 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

View file

@ -27,7 +27,7 @@ namespace Server.Factions
public static readonly TimeSpan SkillLossPeriod = TimeSpan.FromMinutes(20.0);
private static readonly Dictionary<Mobile, SkillLossContext>
m_SkillLoss = new Dictionary<Mobile, SkillLossContext>();
m_SkillLoss = new();
private FactionDefinition m_Definition;
public int ZeroRankOffset;
@ -573,7 +573,7 @@ namespace Server.Factions
}
}
public bool IsCommander(Mobile mob) => mob != null && mob.AccessLevel >= AccessLevel.GameMaster || mob == Commander;
public bool IsCommander(Mobile mob) => mob?.AccessLevel >= AccessLevel.GameMaster || mob == Commander;
public override string ToString() => m_Definition.FriendlyName;

View file

@ -39,42 +39,42 @@ namespace Server.Factions
{
public static MerchantTitleInfo[] Info { get; } =
{
new MerchantTitleInfo(
new(
SkillName.Inscribe,
90.0,
new TextDefinition(1060773, "Scribe"),
new TextDefinition(1011468, "SCRIBE"),
new TextDefinition(1010121, "You now have the faction title of scribe")
),
new MerchantTitleInfo(
new(
SkillName.Carpentry,
90.0,
new TextDefinition(1060774, "Carpenter"),
new TextDefinition(1011469, "CARPENTER"),
new TextDefinition(1010122, "You now have the faction title of carpenter")
),
new MerchantTitleInfo(
new(
SkillName.Tinkering,
90.0,
new TextDefinition(1022984, "Tinker"),
new TextDefinition(1011470, "TINKER"),
new TextDefinition(1010123, "You now have the faction title of tinker")
),
new MerchantTitleInfo(
new(
SkillName.Blacksmith,
90.0,
new TextDefinition(1023016, "Blacksmith"),
new TextDefinition(1011471, "BLACKSMITH"),
new TextDefinition(1010124, "You now have the faction title of blacksmith")
),
new MerchantTitleInfo(
new(
SkillName.Fletching,
90.0,
new TextDefinition(1023022, "Bowyer"),
new TextDefinition(1011472, "BOWYER"),
new TextDefinition(1010125, "You now have the faction title of Bowyer")
),
new MerchantTitleInfo(
new(
SkillName.Tailoring,
90.0,
new TextDefinition(1022982, "Tailor"),