" + count, false, false);
+ AddHtml(35, 25, 190, 20, Center("Starting"));
+ AddHtml(35, 25, 190, 20, "
" + count);
}
int y = 25 + 20;
for (int i = 0; i < parts.Count; ++i)
{
- Participant p = (Participant)parts[i];
+ Participant p = parts[i];
y += 4;
@@ -66,7 +66,7 @@ namespace Server.Engines.ConPVP
if (p.Players.Length > 1)
{
- AddHtml(35 + 14, y, 176, 20, $"Participant #{i + 1}", false, false);
+ AddHtml(35 + 14, y, 176, 20, $"Participant #{i + 1}");
y += 22;
offset = 10;
}
@@ -75,7 +75,7 @@ namespace Server.Engines.ConPVP
{
DuelPlayer pl = p.Players[j];
- if (pl != null && pl.Ready)
+ if (pl?.Ready == true)
{
AddImage(35 + offset, y + 4, 0x939);
}
@@ -87,7 +87,7 @@ namespace Server.Engines.ConPVP
string name = pl == null ? "(Empty)" : pl.Mobile.Name;
- AddHtml(35 + offset + 14, y, 166, 20, name, false, false);
+ AddHtml(35 + offset + 14, y, 166, 20, name);
y += 22;
}
@@ -106,4 +106,4 @@ namespace Server.Engines.ConPVP
{
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/ConPVP/Gumps/ReadyUpGump.cs b/Scripts/Engines/ConPVP/Gumps/ReadyUpGump.cs
index c19878547..e97899ef9 100644
--- a/Scripts/Engines/ConPVP/Gumps/ReadyUpGump.cs
+++ b/Scripts/Engines/ConPVP/Gumps/ReadyUpGump.cs
@@ -26,10 +26,10 @@ namespace Server.Engines.ConPVP
AddBackground(0, 0, 210, height, 9250);
AddBackground(10, 10, 190, height - 20, 0xDAC);
- AddHtml(35, 25, 140, 20, Center("Rematch?"), false, false);
+ AddHtml(35, 25, 140, 20, Center("Rematch?"));
- AddButton(35, 55, 247, 248, 1, GumpButtonType.Reply, 0);
- AddButton(115, 55, 242, 241, 2, GumpButtonType.Reply, 0);
+ AddButton(35, 55, 247, 248, 1);
+ AddButton(115, 55, 242, 241, 2);
}
else
{
@@ -58,7 +58,7 @@ namespace Server.Engines.ConPVP
AddBackground(0, 0, 260, height, 9250);
AddBackground(10, 10, 240, height - 20, 0xDAC);
- AddHtml(35, 25, 190, 20, Center("Participants"), false, false);
+ AddHtml(35, 25, 190, 20, Center("Participants"));
int y = 20 + 25;
@@ -72,7 +72,7 @@ namespace Server.Engines.ConPVP
if (p.Players.Length > 1)
{
- AddHtml(35, y, 176, 20, $"Team #{i + 1}", false, false);
+ AddHtml(35, y, 176, 20, $"Team #{i + 1}");
y += 22;
offset = 10;
}
@@ -83,7 +83,7 @@ namespace Server.Engines.ConPVP
string name = pl == null ? "(Empty)" : pl.Mobile.Name;
- AddHtml(35 + offset, y, 166, 20, name, false, false);
+ AddHtml(35 + offset, y, 166, 20, name);
y += 22;
}
@@ -91,12 +91,12 @@ namespace Server.Engines.ConPVP
y += 8;
- AddHtml(35, y, 176, 20, "Continue?", false, false);
+ AddHtml(35, y, 176, 20, "Continue?");
y -= 2;
AddButton(102, y, 247, 248, 0, GumpButtonType.Page, 2);
- AddButton(169, y, 242, 241, 2, GumpButtonType.Reply, 0);
+ AddButton(169, y, 242, 241, 2);
#endregion
@@ -118,7 +118,7 @@ namespace Server.Engines.ConPVP
defs = new BitArray(basedef.Options);
for (int i = 0; i < ruleset.Flavors.Count; ++i)
- defs.Or(((Ruleset)ruleset.Flavors[i]).Options);
+ defs.Or(ruleset.Flavors[i].Options);
height += ruleset.Flavors.Count * 18;
}
@@ -140,20 +140,20 @@ namespace Server.Engines.ConPVP
AddBackground(0, 0, 260, height, 9250);
AddBackground(10, 10, 240, height - 20, 0xDAC);
- AddHtml(35, 25, 190, 20, Center("Rules"), false, false);
+ AddHtml(35, 25, 190, 20, Center("Rules"));
- AddHtml(35, 50, 190, 20, $"Set: {basedef.Title}", false, false);
+ AddHtml(35, 50, 190, 20, $"Set: {basedef.Title}");
y = 70;
for (int i = 0; i < ruleset.Flavors.Count; ++i, y += 18)
- AddHtml(35, y, 190, 20, $" + {((Ruleset)ruleset.Flavors[i]).Title}", false, false);
+ AddHtml(35, y, 190, 20, $" + {ruleset.Flavors[i].Title}");
y += 4;
if (changes > 0)
{
- AddHtml(35, y, 190, 20, "Modifications:", false, false);
+ AddHtml(35, y, 190, 20, "Modifications:");
y += 20;
for (int i = 0; i < opts.Length; ++i)
@@ -164,7 +164,7 @@ namespace Server.Engines.ConPVP
if (name != null) // sanity
{
AddImage(35, y, opts[i] ? 0xD3 : 0xD2);
- AddHtml(60, y, 165, 22, name, false, false);
+ AddHtml(60, y, 165, 22, name);
}
y += 22;
@@ -172,18 +172,18 @@ namespace Server.Engines.ConPVP
}
else
{
- AddHtml(35, y, 190, 20, "Modifications: None", false, false);
+ AddHtml(35, y, 190, 20, "Modifications: None");
y += 20;
}
y += 8;
- AddHtml(35, y, 176, 20, "Continue?", false, false);
+ AddHtml(35, y, 176, 20, "Continue?");
y -= 2;
- AddButton(102, y, 247, 248, 1, GumpButtonType.Reply, 0);
- AddButton(169, y, 242, 241, 3, GumpButtonType.Reply, 0);
+ AddButton(102, y, 247, 248, 1);
+ AddButton(169, y, 242, 241, 3);
#endregion
}
@@ -196,8 +196,8 @@ namespace Server.Engines.ConPVP
public void AddGoldenButton(int x, int y, int bid)
{
- AddButton(x, y, 0xD2, 0xD2, bid, GumpButtonType.Reply, 0);
- AddButton(x + 3, y + 3, 0xD8, 0xD8, bid, GumpButtonType.Reply, 0);
+ AddButton(x, y, 0xD2, 0xD2, bid);
+ AddButton(x + 3, y + 3, 0xD8, 0xD8, bid);
}
public override void OnResponse(NetState sender, RelayInfo info)
@@ -230,4 +230,4 @@ namespace Server.Engines.ConPVP
}
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/ConPVP/Gumps/RulesetGump.cs b/Scripts/Engines/ConPVP/Gumps/RulesetGump.cs
index 3470e6ac5..bb9372ede 100644
--- a/Scripts/Engines/ConPVP/Gumps/RulesetGump.cs
+++ b/Scripts/Engines/ConPVP/Gumps/RulesetGump.cs
@@ -45,7 +45,7 @@ namespace Server.Engines.ConPVP
AddBackground(0, 0, 260, height, 9250);
AddBackground(10, 10, 240, height - 20, 0xDAC);
- AddHtml(35, 25, 190, 20, Center(page.Title), false, false);
+ AddHtml(35, 25, 190, 20, Center(page.Title));
int x = 35;
int y = 47;
@@ -53,7 +53,7 @@ namespace Server.Engines.ConPVP
for (int i = 0; i < page.Children.Length; ++i)
{
AddGoldenButton(x, y, 1 + i);
- AddHtml(x + 25, y, 250, 22, page.Children[i].Title, false, false);
+ AddHtml(x + 25, y, 250, 22, page.Children[i].Title);
y += 22;
}
@@ -67,7 +67,7 @@ namespace Server.Engines.ConPVP
else
AddCheck(x, y, 0xD2, 0xD3, enabled, i);
- AddHtml(x + 25, y, 250, 22, page.Options[i], false, false);
+ AddHtml(x + 25, y, 250, 22, page.Options[i]);
y += 22;
}
@@ -80,13 +80,13 @@ namespace Server.Engines.ConPVP
public void AddGoldenButton(int x, int y, int bid)
{
- AddButton(x, y, 0xD2, 0xD2, bid, GumpButtonType.Reply, 0);
- AddButton(x + 3, y + 3, 0xD8, 0xD8, bid, GumpButtonType.Reply, 0);
+ AddButton(x, y, 0xD2, 0xD2, bid);
+ AddButton(x + 3, y + 3, 0xD8, 0xD8, bid);
}
public override void OnResponse(NetState sender, RelayInfo info)
{
- if (m_DuelContext != null && !m_DuelContext.Registered)
+ if (m_DuelContext?.Registered == false)
return;
if (!m_ReadOnly)
@@ -127,4 +127,4 @@ namespace Server.Engines.ConPVP
}
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/ConPVP/Gumps/TournamentBracketGump.cs b/Scripts/Engines/ConPVP/Gumps/TournamentBracketGump.cs
index 85b88c532..0743d9353 100644
--- a/Scripts/Engines/ConPVP/Gumps/TournamentBracketGump.cs
+++ b/Scripts/Engines/ConPVP/Gumps/TournamentBracketGump.cs
@@ -19,7 +19,7 @@ namespace Server.Engines.ConPVP
Match_Info,
Player_Info
}
-
+
public class TournamentBracketGump : Gump
{
private const int BlackColor32 = 0x000008;
@@ -86,7 +86,7 @@ namespace Server.Engines.ConPVP
sb.Append(" Tournament Bracket");
- AddHtml(25, 35, 250, 20, Center(sb.ToString()), false, false);
+ AddHtml(25, 35, 250, 20, Center(sb.ToString()));
AddRightArrow(25, 53, ToButtonID(0, 4), "Rules");
AddRightArrow(25, 71, ToButtonID(0, 1), "Participants");
@@ -117,7 +117,7 @@ namespace Server.Engines.ConPVP
text = "The tournament will begin shortly.";
}
- AddHtml(25, 92, 250, 40, text, false, false);
+ AddHtml(25, 92, 250, 40, text);
}
else
{
@@ -138,7 +138,7 @@ namespace Server.Engines.ConPVP
defs = new BitArray(basedef.Options);
for (int i = 0; i < ruleset.Flavors.Count; ++i)
- defs.Or(((Ruleset)ruleset.Flavors[i]).Options);
+ defs.Or(ruleset.Flavors[i].Options);
}
else
{
@@ -158,7 +158,7 @@ namespace Server.Engines.ConPVP
60 + 18 + 20 + 20 + 20 + 8 + 20 + ruleset.Flavors.Count * 18 + 4 + 20 + changes * 22 + 6, 9380);
AddLeftArrow(25, 11, ToButtonID(0, 0));
- AddHtml(25, 35, 250, 20, Center("Rules"), false, false);
+ AddHtml(25, 35, 250, 20, Center("Rules"));
int y = 53;
@@ -177,7 +177,7 @@ namespace Server.Engines.ConPVP
break;
}
- AddHtml(35, y, 190, 20, $"Grouping: {groupText}", false, false);
+ AddHtml(35, y, 190, 20, $"Grouping: {groupText}");
y += 20;
string tieText = null;
@@ -201,7 +201,7 @@ namespace Server.Engines.ConPVP
break;
}
- AddHtml(35, y, 190, 20, $"Tiebreaker: {tieText}", false, false);
+ AddHtml(35, y, 190, 20, $"Tiebreaker: {tieText}");
y += 20;
string sdText = "Off";
@@ -216,22 +216,22 @@ namespace Server.Engines.ConPVP
sdText = $"{sdText} (all rounds)";
}
- AddHtml(35, y, 240, 20, $"Sudden Death: {sdText}", false, false);
+ AddHtml(35, y, 240, 20, $"Sudden Death: {sdText}");
y += 20;
y += 8;
- AddHtml(35, y, 190, 20, $"Ruleset: {basedef.Title}", false, false);
+ AddHtml(35, y, 190, 20, $"Ruleset: {basedef.Title}");
y += 20;
for (int i = 0; i < ruleset.Flavors.Count; ++i, y += 18)
- AddHtml(35, y, 190, 20, $" + {((Ruleset)ruleset.Flavors[i]).Title}", false, false);
+ AddHtml(35, y, 190, 20, $" + {ruleset.Flavors[i].Title}");
y += 4;
if (changes > 0)
{
- AddHtml(35, y, 190, 20, "Modifications:", false, false);
+ AddHtml(35, y, 190, 20, "Modifications:");
y += 20;
for (int i = 0; i < opts.Length; ++i)
@@ -242,7 +242,7 @@ namespace Server.Engines.ConPVP
if (name != null) // sanity
{
AddImage(35, y, opts[i] ? 0xD3 : 0xD2);
- AddHtml(60, y, 165, 22, name, false, false);
+ AddHtml(60, y, 165, 22, name);
}
y += 22;
@@ -250,7 +250,7 @@ namespace Server.Engines.ConPVP
}
else
{
- AddHtml(35, y, 190, 20, "Modifications: None", false, false);
+ AddHtml(35, y, 190, 20, "Modifications: None");
}
break;
@@ -265,8 +265,7 @@ namespace Server.Engines.ConPVP
: new List
(tourney.Participants);
AddLeftArrow(25, 11, ToButtonID(0, 0));
- AddHtml(25, 35, 250, 20, Center($"{pList.Count} Participant{(pList.Count == 1 ? "" : "s")}"), false,
- false);
+ AddHtml(25, 35, 250, 20, Center($"{pList.Count} Participant{(pList.Count == 1 ? "" : "s")}"));
StartPage(out int index, out int count, out int y, 12);
@@ -293,11 +292,11 @@ namespace Server.Engines.ConPVP
AddBackground(0, 0, 300, 60 + 18 + 20 + part.Players.Count * 18 + 20 + 20 + 160, 9380);
AddLeftArrow(25, 11, ToButtonID(0, 1));
- AddHtml(25, 35, 250, 20, Center("Participants"), false, false);
+ AddHtml(25, 35, 250, 20, Center("Participants"));
int y = 53;
- AddHtml(25, y, 200, 20, part.Players.Count == 1 ? "Players" : "Team", false, false);
+ AddHtml(25, y, 200, 20, part.Players.Count == 1 ? "Players" : "Team");
y += 20;
for (int i = 0; i < part.Players.Count; ++i)
@@ -314,10 +313,10 @@ namespace Server.Engines.ConPVP
}
AddHtml(25, y, 200, 20,
- $"Free Advances: {(part.FreeAdvances == 0 ? "None" : part.FreeAdvances.ToString())}", false, false);
+ $"Free Advances: {(part.FreeAdvances == 0 ? "None" : part.FreeAdvances.ToString())}");
y += 20;
- AddHtml(25, y, 200, 20, "Log:", false, false);
+ AddHtml(25, y, 200, 20, "Log:");
y += 20;
StringBuilder sb = new StringBuilder();
@@ -343,7 +342,7 @@ namespace Server.Engines.ConPVP
AddBackground(0, 0, 300, 300, 9380);
AddLeftArrow(25, 11, ToButtonID(0, 3));
- AddHtml(25, 35, 250, 20, Center("Participants"), false, false);
+ AddHtml(25, 35, 250, 20, Center("Participants"));
if (!(obj is Mobile mob))
break;
@@ -351,16 +350,13 @@ namespace Server.Engines.ConPVP
Ladder ladder = Ladder.Instance;
LadderEntry entry = ladder?.Find(mob);
- AddHtml(25, 53, 250, 20, $"Name: {mob.Name}", false, false);
+ AddHtml(25, 53, 250, 20, $"Name: {mob.Name}");
AddHtml(25, 73, 250, 20,
- $"Guild: {(mob.Guild == null ? "None" : mob.Guild.Name + " [" + mob.Guild.Abbreviation + "]")}",
- false, false);
- AddHtml(25, 93, 250, 20, $"Rank: {(entry == null ? "N/A" : LadderGump.Rank(entry.Index + 1))}", false,
- false);
- AddHtml(25, 113, 250, 20, $"Level: {(entry == null ? 0 : Ladder.GetLevel(entry.Experience))}", false,
- false);
- AddHtml(25, 133, 250, 20, $"Wins: {entry?.Wins ?? 0:N0}", false, false);
- AddHtml(25, 153, 250, 20, $"Losses: {entry?.Losses ?? 0:N0}", false, false);
+ $"Guild: {(mob.Guild == null ? "None" : mob.Guild.Name + " [" + mob.Guild.Abbreviation + "]")}");
+ AddHtml(25, 93, 250, 20, $"Rank: {(entry == null ? "N/A" : LadderGump.Rank(entry.Index + 1))}");
+ AddHtml(25, 113, 250, 20, $"Level: {(entry == null ? 0 : Ladder.GetLevel(entry.Experience))}");
+ AddHtml(25, 133, 250, 20, $"Wins: {entry?.Wins ?? 0:N0}");
+ AddHtml(25, 153, 250, 20, $"Losses: {entry?.Losses ?? 0:N0}");
break;
}
@@ -370,7 +366,7 @@ namespace Server.Engines.ConPVP
AddBackground(0, 0, 300, 300, 9380);
AddLeftArrow(25, 11, ToButtonID(0, 0));
- AddHtml(25, 35, 250, 20, Center("Rounds"), false, false);
+ AddHtml(25, 35, 250, 20, Center("Rounds"));
// List levelsList = m_List != null
// ? Utility.CastListCovariant(m_List)
@@ -389,11 +385,11 @@ namespace Server.Engines.ConPVP
AddBackground(0, 0, 300, 300, 9380);
AddLeftArrow(25, 11, ToButtonID(0, 2));
- AddHtml(25, 35, 250, 20, Center("Rounds"), false, false);
+ AddHtml(25, 35, 250, 20, Center("Rounds"));
if (!(m_Object is PyramidLevel level))
break;
-
+
List matchesList = m_List != null
? Utility.CastListCovariant(m_List)
: new List(level.Matches);
@@ -401,7 +397,7 @@ namespace Server.Engines.ConPVP
AddRightArrow(25, 53, ToButtonID(5, 0),
$"Free Advance: {(level.FreeAdvance == null ? "None" : level.FreeAdvance.NameList)}");
- AddHtml(25, 73, 200, 20, $"{matchesList.Count} Match{(matchesList.Count == 1 ? "" : "es")}", false, false);
+ AddHtml(25, 73, 200, 20, $"{matchesList.Count} Match{(matchesList.Count == 1 ? "" : "es")}");
StartPage(out int index, out int count, out int y, 10);
@@ -529,14 +525,12 @@ namespace Server.Engines.ConPVP
AddBackground(0, 0, 300, 60 + 18 + 20 + 20 + 20 + ct * 18 + 6, 9380);
AddLeftArrow(25, 11, ToButtonID(0, 5));
- AddHtml(25, 35, 250, 20, Center("Rounds"), false, false);
+ AddHtml(25, 35, 250, 20, Center("Rounds"));
- AddHtml(25, 53, 250, 20, $"Winner: {(match.Winner == null ? "N/A" : match.Winner.NameList)}", false,
- false);
+ AddHtml(25, 53, 250, 20, $"Winner: {(match.Winner == null ? "N/A" : match.Winner.NameList)}");
AddHtml(25, 73, 250, 20,
- $"State: {(match.InProgress ? "In progress" : match.Context != null ? "Complete" : "Waiting")}",
- false, false);
- AddHtml(25, 93, 250, 20, "Participants:", false, false);
+ $"State: {(match.InProgress ? "In progress" : match.Context != null ? "Complete" : "Waiting")}");
+ AddHtml(25, 93, 250, 20, "Participants:");
if (m_Tournament.TourneyType == TourneyType.Standard)
for (int i = 0; i < match.Participants.Count; ++i)
@@ -613,7 +607,7 @@ namespace Server.Engines.ConPVP
}
}
else if (m_Tournament.TourneyType == TourneyType.FreeForAll)
- AddHtml(25, 113, 250, 20, "Free For All", false, false);
+ AddHtml(25, 113, 250, 20, "Free For All");
break;
}
@@ -642,17 +636,17 @@ namespace Server.Engines.ConPVP
private void AddColoredText(int x, int y, int width, int height, string text, int color)
{
if (color == 0)
- AddHtml(x, y, width, height, text, false, false);
+ AddHtml(x, y, width, height, text);
else
- AddHtml(x, y, width, height, Color(text, color), false, false);
+ AddHtml(x, y, width, height, Color(text, color));
}
public void AddRightArrow(int x, int y, int bid, string text)
{
- AddButton(x, y, 0x15E1, 0x15E5, bid, GumpButtonType.Reply, 0);
+ AddButton(x, y, 0x15E1, 0x15E5, bid);
if (text != null)
- AddHtml(x + 20, y - 1, 230, 20, text, false, false);
+ AddHtml(x + 20, y - 1, 230, 20, text);
}
public void AddRightArrow(int x, int y, int bid)
@@ -662,10 +656,10 @@ namespace Server.Engines.ConPVP
public void AddLeftArrow(int x, int y, int bid, string text)
{
- AddButton(x, y, 0x15E3, 0x15E7, bid, GumpButtonType.Reply, 0);
+ AddButton(x, y, 0x15E3, 0x15E7, bid);
if (text != null)
- AddHtml(x + 20, y - 1, 230, 20, text, false, false);
+ AddHtml(x + 20, y - 1, 230, 20, text);
}
public void AddLeftArrow(int x, int y, int bid)
@@ -859,4 +853,4 @@ namespace Server.Engines.ConPVP
}
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/ConPVP/Ladder.cs b/Scripts/Engines/ConPVP/Ladder.cs
index 01be31f5d..8457abd69 100644
--- a/Scripts/Engines/ConPVP/Ladder.cs
+++ b/Scripts/Engines/ConPVP/Ladder.cs
@@ -296,7 +296,7 @@ namespace Server.Engines.ConPVP
}
}
- public class LadderEntry : IComparable
+ public class LadderEntry : IComparable
{
private int m_Experience;
private Ladder m_Ladder;
@@ -350,9 +350,9 @@ namespace Server.Engines.ConPVP
[CommandProperty(AccessLevel.GameMaster)]
public int Rank => Index;
- public int CompareTo(object obj)
+ public int CompareTo(LadderEntry l)
{
- return ((LadderEntry)obj).m_Experience - m_Experience;
+ return (l?.m_Experience ?? 0) - m_Experience;
}
public void Serialize(GenericWriter writer)
diff --git a/Scripts/Engines/ConPVP/Participant.cs b/Scripts/Engines/ConPVP/Participant.cs
index e228c1466..8638252da 100644
--- a/Scripts/Engines/ConPVP/Participant.cs
+++ b/Scripts/Engines/ConPVP/Participant.cs
@@ -52,7 +52,7 @@ namespace Server.Engines.ConPVP
get
{
for (int i = 0; i < Players.Length; ++i)
- if (Players[i] != null && !Players[i].Eliminated)
+ if (Players[i]?.Eliminated == false)
return false;
return true;
@@ -96,7 +96,7 @@ namespace Server.Engines.ConPVP
}
for (int i = 0; i < Players.Length; ++i)
- if (Players[i] != null && Players[i].Mobile == mob)
+ if (Players[i]?.Mobile == mob)
return Players[i];
return null;
@@ -228,4 +228,4 @@ namespace Server.Engines.ConPVP
public Participant Participant{ get; set; }
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/ConPVP/Preferences.cs b/Scripts/Engines/ConPVP/Preferences.cs
index 1b81442c2..4417967a0 100644
--- a/Scripts/Engines/ConPVP/Preferences.cs
+++ b/Scripts/Engines/ConPVP/Preferences.cs
@@ -198,8 +198,8 @@ namespace Server.Engines.ConPVP
AddColumnHeader(35, null);
AddColumnHeader(115, "Arena");
- AddButton(499 + 40 - 365 - 12 - 63 - 4 - 63, height - 12 - 24, 247, 248, 1, GumpButtonType.Reply, 0);
- AddButton(499 + 40 - 365 - 12 - 63, height - 12 - 24, 241, 242, 2, GumpButtonType.Reply, 0);
+ AddButton(499 + 40 - 365 - 12 - 63 - 4 - 63, height - 12 - 24, 247, 248, 1);
+ AddButton(499 + 40 - 365 - 12 - 63, height - 12 - 24, 241, 242, 2);
for (int i = 0; i < arenas.Count; ++i)
{
@@ -258,9 +258,9 @@ namespace Server.Engines.ConPVP
private void AddColoredText(int x, int y, int width, string text, int color)
{
if (color == 0)
- AddHtml(x, y, width, 20, text, false, false);
+ AddHtml(x, y, width, 20, text);
else
- AddHtml(x, y, width, 20, Color(text, color), false, false);
+ AddHtml(x, y, width, 20, Color(text, color));
}
private void AddColumnHeader(int width, string name)
diff --git a/Scripts/Engines/ConPVP/RulesetLayout.cs b/Scripts/Engines/ConPVP/RulesetLayout.cs
index 12ab2438a..c15a06f5e 100644
--- a/Scripts/Engines/ConPVP/RulesetLayout.cs
+++ b/Scripts/Engines/ConPVP/RulesetLayout.cs
@@ -47,7 +47,7 @@ namespace Server.Engines.ConPVP
{
if (m_Root != null)
return m_Root;
-
+
List entries = new List
{
new RulesetLayout("Spells",
@@ -761,4 +761,4 @@ namespace Server.Engines.ConPVP
return TotalLength;
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/ConPVP/SafeZone.cs b/Scripts/Engines/ConPVP/SafeZone.cs
index e6e7f8f1c..12ceec1d7 100644
--- a/Scripts/Engines/ConPVP/SafeZone.cs
+++ b/Scripts/Engines/ConPVP/SafeZone.cs
@@ -21,10 +21,7 @@ namespace Server.Engines.ConPVP
public override bool AllowHousing(Mobile from, Point3D p)
{
- if (from.AccessLevel < AccessLevel.GameMaster)
- return false;
-
- return base.AllowHousing(from, p);
+ return from.AccessLevel >= AccessLevel.GameMaster && base.AllowHousing(from, p);
}
public override bool OnMoveInto(Mobile m, Direction d, Point3D newLocation, Point3D oldLocation)
@@ -35,12 +32,11 @@ namespace Server.Engines.ConPVP
return false;
}
- PlayerMobile pm = m as PlayerMobile;
+ PlayerMobile pm = m as PlayerMobile ??
+ (m is BaseCreature bc && bc.Summoned ?
+ bc.SummonMaster as PlayerMobile : null);
- if (pm == null && m is BaseCreature bc && bc.Summoned)
- pm = bc.SummonMaster as PlayerMobile;
-
- if (pm?.DuelContext != null && pm.DuelContext.StartedBeginCountdown)
+ if (pm?.DuelContext?.StartedBeginCountdown == true)
return true;
if (DuelContext.CheckCombat(m))
@@ -67,4 +63,4 @@ namespace Server.Engines.ConPVP
return false;
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/ConPVP/Tournament.cs b/Scripts/Engines/ConPVP/Tournament.cs
index 7c46ababb..233f3348e 100644
--- a/Scripts/Engines/ConPVP/Tournament.cs
+++ b/Scripts/Engines/ConPVP/Tournament.cs
@@ -247,7 +247,7 @@ namespace Server.Engines.ConPVP
sb.Append(remaining.Count == 2 ? "between " : "among ");
sb.Append(remaining.Count);
-
+
sb.Append(remaining[0].Players.Count == 1 ? " players: " : " teams: ");
bool hasAppended = false;
@@ -370,9 +370,7 @@ namespace Server.Engines.ConPVP
for (int i = 0; i < part.Context.Participants.Count; ++i)
{
- Participant check = part.Context.Participants[i];
-
- if (check != null && !check.Eliminated)
+ if (part.Context.Participants[i]?.Eliminated == false)
++rem;
}
@@ -559,7 +557,7 @@ namespace Server.Engines.ConPVP
{
Mobile mob = players[i];
- if (mob == null || mob.Deleted)
+ if (mob?.Deleted != false)
continue;
Item item = new Trophy(title, rank);
@@ -762,7 +760,7 @@ namespace Server.Engines.ConPVP
if (!match.InProgress)
for (int j = 0; j < Arenas.Count; ++j)
{
- Arena arena = (Arena)Arenas[j];
+ Arena arena = Arenas[j];
if (!arena.IsOccupied)
{
@@ -794,7 +792,7 @@ namespace Server.Engines.ConPVP
if (!bad)
continue;
-
+
for (int j = 0; j < part.Players.Count; ++j)
part.Players[j].SendMessage("You have been disqualified from the tournament.");
@@ -882,7 +880,7 @@ namespace Server.Engines.ConPVP
Undefeated.Clear();
break;
}
-
+
}
if (Undefeated.Count > 1)
@@ -895,7 +893,7 @@ namespace Server.Engines.ConPVP
public void Alert(params string[] alerts)
{
for (int i = 0; i < Arenas.Count; ++i)
- Alert((Arena)Arenas[i], alerts);
+ Alert(Arenas[i], alerts);
}
public void Alert(Arena arena, params string[] alerts)
@@ -909,4 +907,4 @@ namespace Server.Engines.ConPVP
}
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/ConPVP/TournamentController.cs b/Scripts/Engines/ConPVP/TournamentController.cs
index 23d83eb01..67686f869 100644
--- a/Scripts/Engines/ConPVP/TournamentController.cs
+++ b/Scripts/Engines/ConPVP/TournamentController.cs
@@ -34,7 +34,7 @@ namespace Server.Engines.ConPVP
{
TournamentController controller = m_Instances[i];
- if (controller != null && !controller.Deleted && controller.Tournament != null &&
+ if (controller?.Deleted == false && controller.Tournament != null &&
controller.Tournament.Stage != TournamentStage.Inactive)
return true;
}
@@ -140,4 +140,4 @@ namespace Server.Engines.ConPVP
}
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/ConPVP/TournamentPyramid.cs b/Scripts/Engines/ConPVP/TournamentPyramid.cs
index 520e4a3f0..36cec277c 100644
--- a/Scripts/Engines/ConPVP/TournamentPyramid.cs
+++ b/Scripts/Engines/ConPVP/TournamentPyramid.cs
@@ -70,7 +70,8 @@ namespace Server.Engines.ConPVP
{
Faction fac = Faction.Find(mob);
- if (fac != null) index = fac.Definition.Sort;
+ if (fac != null)
+ index = fac.Definition.Sort;
}
else if (partsPerMatch == 2)
{
@@ -186,4 +187,4 @@ namespace Server.Engines.ConPVP
public List Matches{ get; set; } = new List();
public TourneyParticipant FreeAdvance{ get; set; }
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Craft/Core/CraftGump.cs b/Scripts/Engines/Craft/Core/CraftGump.cs
index 929bd3ccf..97dcb7cc8 100644
--- a/Scripts/Engines/Craft/Core/CraftGump.cs
+++ b/Scripts/Engines/Craft/Core/CraftGump.cs
@@ -17,16 +17,7 @@ namespace Server.Engines.Craft
private CraftPage m_Page;
private BaseTool m_Tool;
- /*public CraftGump( Mobile from, CraftSystem craftSystem, BaseTool tool ): this( from, craftSystem, -1, -1, tool, null )
- {
- }*/
-
- public CraftGump(Mobile from, CraftSystem craftSystem, BaseTool tool, object notice) : this(from, craftSystem, tool,
- notice, CraftPage.None)
- {
- }
-
- private CraftGump(Mobile from, CraftSystem craftSystem, BaseTool tool, object notice, CraftPage page) : base(40, 40)
+ public CraftGump(Mobile from, CraftSystem craftSystem, BaseTool tool, object notice, CraftPage page = CraftPage.None) : base(40, 40)
{
m_From = from;
m_CraftSystem = craftSystem;
@@ -50,57 +41,56 @@ namespace Server.Engines.Craft
AddAlphaRegion(10, 10, 510, 417);
if (craftSystem.GumpTitleNumber > 0)
- AddHtmlLocalized(10, 12, 510, 20, craftSystem.GumpTitleNumber, LabelColor, false, false);
+ AddHtmlLocalized(10, 12, 510, 20, craftSystem.GumpTitleNumber, LabelColor);
else
- AddHtml(10, 12, 510, 20, craftSystem.GumpTitleString, false, false);
+ AddHtml(10, 12, 510, 20, craftSystem.GumpTitleString);
- AddHtmlLocalized(10, 37, 200, 22, 1044010, LabelColor, false, false); // CATEGORIES
- AddHtmlLocalized(215, 37, 305, 22, 1044011, LabelColor, false, false); // SELECTIONS
- AddHtmlLocalized(10, 302, 150, 25, 1044012, LabelColor, false, false); // NOTICES
+ AddHtmlLocalized(10, 37, 200, 22, 1044010, LabelColor); // CATEGORIES
+ AddHtmlLocalized(215, 37, 305, 22, 1044011, LabelColor); // SELECTIONS
+ AddHtmlLocalized(10, 302, 150, 25, 1044012, LabelColor); // NOTICES
- AddButton(15, 402, 4017, 4019, 0, GumpButtonType.Reply, 0);
- AddHtmlLocalized(50, 405, 150, 18, 1011441, LabelColor, false, false); // EXIT
+ AddButton(15, 402, 4017, 4019, 0);
+ AddHtmlLocalized(50, 405, 150, 18, 1011441, LabelColor); // EXIT
- AddButton(270, 402, 4005, 4007, GetButtonID(6, 2), GumpButtonType.Reply, 0);
- AddHtmlLocalized(305, 405, 150, 18, 1044013, LabelColor, false, false); // MAKE LAST
+ AddButton(270, 402, 4005, 4007, GetButtonID(6, 2));
+ AddHtmlLocalized(305, 405, 150, 18, 1044013, LabelColor); // MAKE LAST
// Mark option
if (craftSystem.MarkOption)
{
- AddButton(270, 362, 4005, 4007, GetButtonID(6, 6), GumpButtonType.Reply, 0);
- AddHtmlLocalized(305, 365, 150, 18, 1044017 + (context == null ? 0 : (int)context.MarkOption), LabelColor,
- false, false); // MARK ITEM
+ AddButton(270, 362, 4005, 4007, GetButtonID(6, 6));
+ AddHtmlLocalized(305, 365, 150, 18, 1044017 + (context == null ? 0 : (int)context.MarkOption), LabelColor); // MARK ITEM
}
// ****************************************
// Resmelt option
if (craftSystem.Resmelt)
{
- AddButton(15, 342, 4005, 4007, GetButtonID(6, 1), GumpButtonType.Reply, 0);
- AddHtmlLocalized(50, 345, 150, 18, 1044259, LabelColor, false, false); // SMELT ITEM
+ AddButton(15, 342, 4005, 4007, GetButtonID(6, 1));
+ AddHtmlLocalized(50, 345, 150, 18, 1044259, LabelColor); // SMELT ITEM
}
// ****************************************
// Repair option
if (craftSystem.Repair)
{
- AddButton(270, 342, 4005, 4007, GetButtonID(6, 5), GumpButtonType.Reply, 0);
- AddHtmlLocalized(305, 345, 150, 18, 1044260, LabelColor, false, false); // REPAIR ITEM
+ AddButton(270, 342, 4005, 4007, GetButtonID(6, 5));
+ AddHtmlLocalized(305, 345, 150, 18, 1044260, LabelColor); // REPAIR ITEM
}
// ****************************************
// Enhance option
if (craftSystem.CanEnhance)
{
- AddButton(270, 382, 4005, 4007, GetButtonID(6, 8), GumpButtonType.Reply, 0);
- AddHtmlLocalized(305, 385, 150, 18, 1061001, LabelColor, false, false); // ENHANCE ITEM
+ AddButton(270, 382, 4005, 4007, GetButtonID(6, 8));
+ AddHtmlLocalized(305, 385, 150, 18, 1061001, LabelColor); // ENHANCE ITEM
}
// ****************************************
if (notice is int noticeInt && noticeInt > 0)
- AddHtmlLocalized(170, 295, 350, 40, noticeInt, LabelColor, false, false);
+ AddHtmlLocalized(170, 295, 350, 40, noticeInt, LabelColor);
else if (notice is string)
- AddHtml(170, 295, 350, 40, $"{notice}", false, false);
+ AddHtml(170, 295, 350, 40, $"{notice}");
// If the system has more than one resource
if (craftSystem.CraftSubRes.Init)
@@ -131,10 +121,10 @@ namespace Server.Engines.Craft
resourceCount += items[i].Amount;
}
- AddButton(15, 362, 4005, 4007, GetButtonID(6, 0), GumpButtonType.Reply, 0);
+ AddButton(15, 362, 4005, 4007, GetButtonID(6, 0));
if (nameNumber > 0)
- AddHtmlLocalized(50, 365, 250, 18, nameNumber, resourceCount.ToString(), LabelColor, false, false);
+ AddHtmlLocalized(50, 365, 250, 18, nameNumber, resourceCount.ToString(), LabelColor);
else
AddLabel(50, 362, LabelHue, $"{nameString} ({resourceCount} Available)");
}
@@ -169,10 +159,10 @@ namespace Server.Engines.Craft
resourceCount += items[i].Amount;
}
- AddButton(15, 382, 4005, 4007, GetButtonID(6, 7), GumpButtonType.Reply, 0);
+ AddButton(15, 382, 4005, 4007, GetButtonID(6, 7));
if (nameNumber > 0)
- AddHtmlLocalized(50, 385, 250, 18, nameNumber, resourceCount.ToString(), LabelColor, false, false);
+ AddHtmlLocalized(50, 385, 250, 18, nameNumber, resourceCount.ToString(), LabelColor);
else
AddLabel(50, 385, LabelHue, $"{nameString} ({resourceCount} Available)");
}
@@ -184,7 +174,7 @@ namespace Server.Engines.Craft
CreateResList(false, from);
else if (page == CraftPage.PickResource2)
CreateResList(true, from);
- else if (context != null && context.LastGroupIndex > -1)
+ else if (context?.LastGroupIndex > -1)
CreateItemList(context.LastGroupIndex);
}
@@ -210,9 +200,9 @@ namespace Server.Engines.Craft
CraftContext context = m_CraftSystem.GetContext(m_From);
- AddButton(220, 260, 4005, 4007, GetButtonID(6, 4), GumpButtonType.Reply, 0);
+ AddButton(220, 260, 4005, 4007, GetButtonID(6, 4));
AddHtmlLocalized(255, 263, 200, 18, context == null || !context.DoNotColor ? 1061591 : 1061590,
- LabelColor, false, false);
+ LabelColor);
}
int resourceCount = 0;
@@ -225,11 +215,11 @@ namespace Server.Engines.Craft
resourceCount += items[j].Amount;
}
- AddButton(220, 60 + index * 20, 4005, 4007, GetButtonID(5, i), GumpButtonType.Reply, 0);
+ AddButton(220, 60 + index * 20, 4005, 4007, GetButtonID(5, i));
if (subResource.NameNumber > 0)
AddHtmlLocalized(255, 63 + index * 20, 250, 18, subResource.NameNumber, resourceCount.ToString(),
- LabelColor, false, false);
+ LabelColor);
else
AddLabel(255, 60 + index * 20, LabelHue, $"{subResource.NameString} ({resourceCount})");
}
@@ -256,7 +246,7 @@ namespace Server.Engines.Craft
if (i > 0)
{
AddButton(370, 260, 4005, 4007, 0, GumpButtonType.Page, i / 10 + 1);
- AddHtmlLocalized(405, 263, 100, 18, 1044045, LabelColor, false, false); // NEXT PAGE
+ AddHtmlLocalized(405, 263, 100, 18, 1044045, LabelColor); // NEXT PAGE
}
AddPage(i / 10 + 1);
@@ -264,21 +254,21 @@ namespace Server.Engines.Craft
if (i > 0)
{
AddButton(220, 260, 4014, 4015, 0, GumpButtonType.Page, i / 10);
- AddHtmlLocalized(255, 263, 100, 18, 1044044, LabelColor, false, false); // PREV PAGE
+ AddHtmlLocalized(255, 263, 100, 18, 1044044, LabelColor); // PREV PAGE
}
}
- AddButton(220, 60 + index * 20, 4005, 4007, GetButtonID(3, i), GumpButtonType.Reply, 0);
+ AddButton(220, 60 + index * 20, 4005, 4007, GetButtonID(3, i));
if (craftItem.NameNumber > 0)
- AddHtmlLocalized(255, 63 + index * 20, 220, 18, craftItem.NameNumber, LabelColor, false, false);
+ AddHtmlLocalized(255, 63 + index * 20, 220, 18, craftItem.NameNumber, LabelColor);
else
AddLabel(255, 60 + index * 20, LabelHue, craftItem.NameString);
- AddButton(480, 60 + index * 20, 4011, 4012, GetButtonID(4, i), GumpButtonType.Reply, 0);
+ AddButton(480, 60 + index * 20, 4011, 4012, GetButtonID(4, i));
}
else
- AddHtmlLocalized(230, 62, 200, 22, 1044165, LabelColor, false, false); // You haven't made anything yet.
+ AddHtmlLocalized(230, 62, 200, 22, 1044165, LabelColor); // You haven't made anything yet.
}
public void CreateItemList(int selectedGroup)
@@ -304,7 +294,7 @@ namespace Server.Engines.Craft
if (i > 0)
{
AddButton(370, 260, 4005, 4007, 0, GumpButtonType.Page, i / 10 + 1);
- AddHtmlLocalized(405, 263, 100, 18, 1044045, LabelColor, false, false); // NEXT PAGE
+ AddHtmlLocalized(405, 263, 100, 18, 1044045, LabelColor); // NEXT PAGE
}
AddPage(i / 10 + 1);
@@ -312,18 +302,18 @@ namespace Server.Engines.Craft
if (i > 0)
{
AddButton(220, 260, 4014, 4015, 0, GumpButtonType.Page, i / 10);
- AddHtmlLocalized(255, 263, 100, 18, 1044044, LabelColor, false, false); // PREV PAGE
+ AddHtmlLocalized(255, 263, 100, 18, 1044044, LabelColor); // PREV PAGE
}
}
- AddButton(220, 60 + index * 20, 4005, 4007, GetButtonID(1, i), GumpButtonType.Reply, 0);
+ AddButton(220, 60 + index * 20, 4005, 4007, GetButtonID(1, i));
if (craftItem.NameNumber > 0)
- AddHtmlLocalized(255, 63 + index * 20, 220, 18, craftItem.NameNumber, LabelColor, false, false);
+ AddHtmlLocalized(255, 63 + index * 20, 220, 18, craftItem.NameNumber, LabelColor);
else
AddLabel(255, 60 + index * 20, LabelHue, craftItem.NameString);
- AddButton(480, 60 + index * 20, 4011, 4012, GetButtonID(2, i), GumpButtonType.Reply, 0);
+ AddButton(480, 60 + index * 20, 4011, 4012, GetButtonID(2, i));
}
}
@@ -331,17 +321,17 @@ namespace Server.Engines.Craft
{
CraftGroupCol craftGroupCol = m_CraftSystem.CraftGroups;
- AddButton(15, 60, 4005, 4007, GetButtonID(6, 3), GumpButtonType.Reply, 0);
- AddHtmlLocalized(50, 63, 150, 18, 1044014, LabelColor, false, false); // LAST TEN
+ AddButton(15, 60, 4005, 4007, GetButtonID(6, 3));
+ AddHtmlLocalized(50, 63, 150, 18, 1044014, LabelColor); // LAST TEN
for (int i = 0; i < craftGroupCol.Count; i++)
{
CraftGroup craftGroup = craftGroupCol.GetAt(i);
- AddButton(15, 80 + i * 20, 4005, 4007, GetButtonID(0, i), GumpButtonType.Reply, 0);
+ AddButton(15, 80 + i * 20, 4005, 4007, GetButtonID(0, i));
if (craftGroup.NameNumber > 0)
- AddHtmlLocalized(50, 83 + i * 20, 150, 18, craftGroup.NameNumber, LabelColor, false, false);
+ AddHtmlLocalized(50, 83 + i * 20, 150, 18, craftGroup.NameNumber, LabelColor);
else
AddLabel(50, 80 + i * 20, LabelHue, craftGroup.NameString);
}
@@ -608,11 +598,11 @@ namespace Server.Engines.Craft
}
}
- private enum CraftPage
+ public enum CraftPage
{
None,
PickResource,
PickResource2
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Craft/Core/CraftGumpItem.cs b/Scripts/Engines/Craft/Core/CraftGumpItem.cs
index af0d39317..406f0a19c 100644
--- a/Scripts/Engines/Craft/Core/CraftGumpItem.cs
+++ b/Scripts/Engines/Craft/Core/CraftGumpItem.cs
@@ -53,41 +53,40 @@ namespace Server.Engines.Craft
AddImageTiled(10, 387, 510, 22, 2624);
AddAlphaRegion(10, 10, 510, 399);
- AddHtmlLocalized(170, 40, 150, 20, 1044053, LabelColor, false, false); // ITEM
- AddHtmlLocalized(10, 192, 150, 22, 1044054, LabelColor, false, false); // SKILLS
- AddHtmlLocalized(10, 277, 150, 22, 1044055, LabelColor, false, false); // MATERIALS
- AddHtmlLocalized(10, 362, 150, 22, 1044056, LabelColor, false, false); // OTHER
+ AddHtmlLocalized(170, 40, 150, 20, 1044053, LabelColor); // ITEM
+ AddHtmlLocalized(10, 192, 150, 22, 1044054, LabelColor); // SKILLS
+ AddHtmlLocalized(10, 277, 150, 22, 1044055, LabelColor); // MATERIALS
+ AddHtmlLocalized(10, 362, 150, 22, 1044056, LabelColor); // OTHER
if (craftSystem.GumpTitleNumber > 0)
- AddHtmlLocalized(10, 12, 510, 20, craftSystem.GumpTitleNumber, LabelColor, false, false);
+ AddHtmlLocalized(10, 12, 510, 20, craftSystem.GumpTitleNumber, LabelColor);
else
- AddHtml(10, 12, 510, 20, craftSystem.GumpTitleString, false, false);
+ AddHtml(10, 12, 510, 20, craftSystem.GumpTitleString);
- AddButton(15, 387, 4014, 4016, 0, GumpButtonType.Reply, 0);
- AddHtmlLocalized(50, 390, 150, 18, 1044150, LabelColor, false, false); // BACK
+ AddButton(15, 387, 4014, 4016, 0);
+ AddHtmlLocalized(50, 390, 150, 18, 1044150, LabelColor); // BACK
bool needsRecipe = craftItem.Recipe != null && from is PlayerMobile mobile &&
!mobile.HasRecipe(craftItem.Recipe);
if (needsRecipe)
{
- AddButton(270, 387, 4005, 4007, 0, GumpButtonType.Page, 0);
- AddHtmlLocalized(305, 390, 150, 18, 1044151, GreyLabelColor, false, false); // MAKE NOW
+ AddButton(270, 387, 4005, 4007, 0, GumpButtonType.Page);
+ AddHtmlLocalized(305, 390, 150, 18, 1044151, GreyLabelColor); // MAKE NOW
}
else
{
- AddButton(270, 387, 4005, 4007, 1, GumpButtonType.Reply, 0);
- AddHtmlLocalized(305, 390, 150, 18, 1044151, LabelColor, false, false); // MAKE NOW
+ AddButton(270, 387, 4005, 4007, 1);
+ AddHtmlLocalized(305, 390, 150, 18, 1044151, LabelColor); // MAKE NOW
}
if (craftItem.NameNumber > 0)
- AddHtmlLocalized(330, 40, 180, 18, craftItem.NameNumber, LabelColor, false, false);
+ AddHtmlLocalized(330, 40, 180, 18, craftItem.NameNumber, LabelColor);
else
AddLabel(330, 40, LabelHue, craftItem.NameString);
if (craftItem.UseAllRes)
- AddHtmlLocalized(170, 302 + m_OtherCount++ * 20, 310, 18, 1048176, LabelColor, false,
- false); // Makes as many as possible at once
+ AddHtmlLocalized(170, 302 + m_OtherCount++ * 20, 310, 18, 1048176, LabelColor); // Makes as many as possible at once
DrawItem();
DrawSkill();
@@ -100,15 +99,14 @@ namespace Server.Engines.Craft
if (craftItem.RequiredExpansion != Expansion.None)
{
- bool supportsEx = from.NetState != null && from.NetState.SupportsExpansion(craftItem.RequiredExpansion);
+ bool supportsEx = from.NetState?.SupportsExpansion(craftItem.RequiredExpansion) == true;
TextDefinition.AddHtmlText(this, 170, 302 + m_OtherCount++ * 20, 310, 18,
RequiredExpansionMessage(craftItem.RequiredExpansion), false, false,
supportsEx ? LabelColor : RedLabelColor, supportsEx ? LabelHue : RedLabelHue);
}
if (needsRecipe)
- AddHtmlLocalized(170, 302 + m_OtherCount++ * 20, 310, 18, 1073620, RedLabelColor, false,
- false); // You have not learned this recipe.
+ AddHtmlLocalized(170, 302 + m_OtherCount++ * 20, 310, 18, 1073620, RedLabelColor); // You have not learned this recipe.
}
private TextDefinition RequiredExpansionMessage(Expansion expansion)
@@ -132,8 +130,7 @@ namespace Server.Engines.Craft
if (m_CraftItem.IsMarkable(type))
{
- AddHtmlLocalized(170, 302 + m_OtherCount++ * 20, 310, 18, 1044059, LabelColor, false,
- false); // This item may hold its maker's mark
+ AddHtmlLocalized(170, 302 + m_OtherCount++ * 20, 310, 18, 1044059, LabelColor); // This item may hold its maker's mark
m_ShowExceptionalChance = true;
}
}
@@ -148,8 +145,7 @@ namespace Server.Engines.Craft
if (minSkill < 0)
minSkill = 0;
- AddHtmlLocalized(170, 132 + i * 20, 200, 18, AosSkillBonuses.GetLabel(skill.SkillToMake), LabelColor, false,
- false);
+ AddHtmlLocalized(170, 132 + i * 20, 200, 18, AosSkillBonuses.GetLabel(skill.SkillToMake), LabelColor);
AddLabel(430, 132 + i * 20, LabelHue, $"{minSkill:F1}");
}
@@ -171,7 +167,7 @@ namespace Server.Engines.Craft
else if (chance > 1.0)
chance = 1.0;
- AddHtmlLocalized(170, 80, 250, 18, 1044057, LabelColor, false, false); // Success Chance:
+ AddHtmlLocalized(170, 80, 250, 18, 1044057, LabelColor); // Success Chance:
AddLabel(430, 80, LabelHue, $"{chance * 100:F1}%");
if (m_ShowExceptionalChance)
@@ -181,7 +177,7 @@ namespace Server.Engines.Craft
else if (excepChance > 1.0)
excepChance = 1.0;
- AddHtmlLocalized(170, 100, 250, 18, 1044058, 32767, false, false); // Exceptional Chance:
+ AddHtmlLocalized(170, 100, 250, 18, 1044058, 32767); // Exceptional Chance:
AddLabel(430, 100, LabelHue, $"{excepChance * 100:F1}%");
}
}
@@ -232,13 +228,12 @@ namespace Server.Engines.Craft
if (!retainedColor && m_CraftItem.RetainsColorFrom(m_CraftSystem, type))
{
retainedColor = true;
- AddHtmlLocalized(170, 302 + m_OtherCount++ * 20, 310, 18, 1044152, LabelColor, false,
- false); // * The item retains the color of this material
+ AddHtmlLocalized(170, 302 + m_OtherCount++ * 20, 310, 18, 1044152, LabelColor); // * The item retains the color of this material
AddLabel(500, 219 + i * 20, LabelHue, "*");
}
if (nameNumber > 0)
- AddHtmlLocalized(170, 219 + i * 20, 310, 18, nameNumber, LabelColor, false, false);
+ AddHtmlLocalized(170, 219 + i * 20, 310, 18, nameNumber, LabelColor);
else
AddLabel(170, 219 + i * 20, LabelHue, nameString);
@@ -247,13 +242,12 @@ namespace Server.Engines.Craft
if (m_CraftItem.NameNumber == 1041267) // runebook
{
- AddHtmlLocalized(170, 219 + m_CraftItem.Resources.Count * 20, 310, 18, 1044447, LabelColor, false, false);
+ AddHtmlLocalized(170, 219 + m_CraftItem.Resources.Count * 20, 310, 18, 1044447, LabelColor);
AddLabel(430, 219 + m_CraftItem.Resources.Count * 20, LabelHue, "1");
}
if (cropScroll)
- AddHtmlLocalized(170, 302 + m_OtherCount++ * 20, 360, 18, 1044379, LabelColor, false,
- false); // Inscribing scrolls also requires a blank scroll and mana.
+ AddHtmlLocalized(170, 302 + m_OtherCount++ * 20, 360, 18, 1044379, LabelColor); // Inscribing scrolls also requires a blank scroll and mana.
}
public override void OnResponse(NetState sender, RelayInfo info)
@@ -292,4 +286,4 @@ namespace Server.Engines.Craft
}
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Craft/Core/CraftItem.cs b/Scripts/Engines/Craft/Core/CraftItem.cs
index 16c0e27c1..6562b2cee 100644
--- a/Scripts/Engines/Craft/Core/CraftItem.cs
+++ b/Scripts/Engines/Craft/Core/CraftItem.cs
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
+using System.Linq;
using Server.Commands;
using Server.Factions;
using Server.Items;
@@ -273,16 +274,12 @@ namespace Server.Engines.Craft
return false;
IPooledEnumerable- eable = map.GetItemsInRange(from.Location, 2);
-
- foreach (Item item in eable)
- if (item.Z + 16 > from.Z && from.Z + 16 > item.Z && Find(item.ItemID, itemIDs))
- {
- eable.Free();
- return true;
- }
-
+ bool found = eable.Any(item => item.Z + 16 > item.Z && item.Z + 16 > item.Z && Find(item.ItemID, itemIDs));
eable.Free();
+ if (found)
+ return true;
+
for (int x = -2; x <= 2; ++x)
for (int y = -2; y <= 2; ++y)
{
@@ -758,7 +755,7 @@ namespace Server.Engines.Craft
if (from.BeginAction())
{
if (RequiredExpansion == Expansion.None ||
- from.NetState != null && from.NetState.SupportsExpansion(RequiredExpansion))
+ from.NetState?.SupportsExpansion(RequiredExpansion) == true)
{
bool allRequiredSkills = true;
double chance = GetSuccessChance(from, typeRes, craftSystem, false, ref allRequiredSkills);
@@ -860,7 +857,7 @@ namespace Server.Engines.Craft
if (badCraft > 0)
{
- if (tool != null && !tool.Deleted && tool.UsesRemaining > 0)
+ if (tool?.Deleted == false && tool.UsesRemaining > 0)
from.SendGump(new CraftGump(from, craftSystem, tool, badCraft));
else
from.SendLocalizedMessage(badCraft);
@@ -876,7 +873,7 @@ namespace Server.Engines.Craft
ref checkMessage)
&& ConsumeAttributes(from, ref checkMessage, false)))
{
- if (tool != null && !tool.Deleted && tool.UsesRemaining > 0)
+ if (tool?.Deleted == false && tool.UsesRemaining > 0)
from.SendGump(new CraftGump(from, craftSystem, tool, checkMessage));
else if (checkMessage is int messageInt && messageInt > 0)
from.SendLocalizedMessage(messageInt);
@@ -905,7 +902,7 @@ namespace Server.Engines.Craft
if (!(ConsumeRes(from, typeRes, craftSystem, ref resHue, ref maxAmount, ConsumeType.All, ref message)
&& ConsumeAttributes(from, ref message, true)))
{
- if (tool != null && !tool.Deleted && tool.UsesRemaining > 0)
+ if (tool?.Deleted == false && tool.UsesRemaining > 0)
from.SendGump(new CraftGump(from, craftSystem, tool, message));
else if (message is int messageIn && messageIn > 0)
from.SendLocalizedMessage(messageIn);
@@ -992,7 +989,7 @@ namespace Server.Engines.Craft
{
Town town = Town.FromRegion(from.Region);
- if (town != null && town.Owner == faction)
+ if (town?.Owner == faction)
{
Container pack = from.Backpack;
@@ -1013,14 +1010,14 @@ namespace Server.Engines.Craft
if (queryFactionImbue)
from.SendGump(new FactionImbueGump(quality, item, from, craftSystem, tool, num, availableSilver, faction,
def));
- else if (tool != null && !tool.Deleted && tool.UsesRemaining > 0)
+ else if (tool?.Deleted == false && tool.UsesRemaining > 0)
from.SendGump(new CraftGump(from, craftSystem, tool, num));
else if (num > 0)
from.SendLocalizedMessage(num);
}
else if (!allRequiredSkills)
{
- if (tool != null && !tool.Deleted && tool.UsesRemaining > 0)
+ if (tool?.Deleted == false && tool.UsesRemaining > 0)
from.SendGump(new CraftGump(from, craftSystem, tool, 1044153));
else
from.SendLocalizedMessage(1044153); // You don't have the required skills to attempt this item.
@@ -1036,7 +1033,7 @@ namespace Server.Engines.Craft
// Not enough resource to craft it
if (!ConsumeRes(from, typeRes, craftSystem, ref resHue, ref maxAmount, consumeType, ref message, true))
{
- if (tool != null && !tool.Deleted && tool.UsesRemaining > 0)
+ if (tool?.Deleted == false && tool.UsesRemaining > 0)
from.SendGump(new CraftGump(from, craftSystem, tool, message));
else if (message is int messageInt && messageInt > 0)
from.SendLocalizedMessage(messageInt);
@@ -1104,7 +1101,7 @@ namespace Server.Engines.Craft
if (badCraft > 0)
{
- if (m_Tool != null && !m_Tool.Deleted && m_Tool.UsesRemaining > 0)
+ if (m_Tool?.Deleted == false && m_Tool.UsesRemaining > 0)
m_From.SendGump(new CraftGump(m_From, m_CraftSystem, m_Tool, badCraft));
else
m_From.SendLocalizedMessage(badCraft);
diff --git a/Scripts/Engines/Craft/Core/CraftRes.cs b/Scripts/Engines/Craft/Core/CraftRes.cs
index 6e2c53294..42bd7155a 100644
--- a/Scripts/Engines/Craft/Core/CraftRes.cs
+++ b/Scripts/Engines/Craft/Core/CraftRes.cs
@@ -4,14 +4,11 @@ namespace Server.Engines.Craft
{
public class CraftRes
{
- public CraftRes(Type type, int amount)
+ public CraftRes(Type type, TextDefinition name, int amount, TextDefinition message = null)
{
ItemType = type;
Amount = amount;
- }
- public CraftRes(Type type, TextDefinition name, int amount, TextDefinition message) : this(type, amount)
- {
NameNumber = name;
MessageNumber = message;
@@ -41,4 +38,4 @@ namespace Server.Engines.Craft
from.SendLocalizedMessage(502925); // You don't have the resources required to make that item.
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Craft/Core/CraftSubRes.cs b/Scripts/Engines/Craft/Core/CraftSubRes.cs
index 5c1191853..61bd68da6 100644
--- a/Scripts/Engines/Craft/Core/CraftSubRes.cs
+++ b/Scripts/Engines/Craft/Core/CraftSubRes.cs
@@ -31,4 +31,4 @@ namespace Server.Engines.Craft
public double RequiredSkill{ get; }
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Craft/Core/QueryMakersMarkGump.cs b/Scripts/Engines/Craft/Core/QueryMakersMarkGump.cs
index 2330b23e5..fe7c17f1b 100644
--- a/Scripts/Engines/Craft/Core/QueryMakersMarkGump.cs
+++ b/Scripts/Engines/Craft/Core/QueryMakersMarkGump.cs
@@ -31,13 +31,13 @@ namespace Server.Engines.Craft
AddBackground(0, 0, 220, 170, 5054);
AddBackground(10, 10, 200, 150, 3000);
- AddHtmlLocalized(20, 20, 180, 80, 1018317, false, false); // Do you wish to place your maker's mark on this item?
+ AddHtmlLocalized(20, 20, 180, 80, 1018317); // Do you wish to place your maker's mark on this item?
- AddHtmlLocalized(55, 100, 140, 25, 1011011, false, false); // CONTINUE
- AddButton(20, 100, 4005, 4007, 1, GumpButtonType.Reply, 0);
+ AddHtmlLocalized(55, 100, 140, 25, 1011011); // CONTINUE
+ AddButton(20, 100, 4005, 4007, 1);
- AddHtmlLocalized(55, 125, 140, 25, 1011012, false, false); // CANCEL
- AddButton(20, 125, 4005, 4007, 0, GumpButtonType.Reply, 0);
+ AddHtmlLocalized(55, 125, 140, 25, 1011012); // CANCEL
+ AddButton(20, 125, 4005, 4007, 0);
}
public override void OnResponse(NetState sender, RelayInfo info)
@@ -52,4 +52,4 @@ namespace Server.Engines.Craft
m_CraftItem.CompleteCraft(m_Quality, makersMark, m_From, m_CraftSystem, m_TypeRes, m_Tool, null);
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Craft/Core/Recipes.cs b/Scripts/Engines/Craft/Core/Recipes.cs
index cba5b4fc8..9f4b286a7 100644
--- a/Scripts/Engines/Craft/Core/Recipes.cs
+++ b/Scripts/Engines/Craft/Core/Recipes.cs
@@ -34,16 +34,7 @@ namespace Server.Engines.Craft
public int ID{ get; }
- public TextDefinition TextDefinition
- {
- get
- {
- if (m_TD == null)
- m_TD = new TextDefinition(CraftItem.NameNumber, CraftItem.NameString);
-
- return m_TD;
- }
- }
+ public TextDefinition TextDefinition => m_TD ?? (m_TD = new TextDefinition(CraftItem.NameNumber, CraftItem.NameString));
public static void Initialize()
{
diff --git a/Scripts/Engines/Craft/Core/Resmelt.cs b/Scripts/Engines/Craft/Core/Resmelt.cs
index 3fffe268e..12d392327 100644
--- a/Scripts/Engines/Craft/Core/Resmelt.cs
+++ b/Scripts/Engines/Craft/Core/Resmelt.cs
@@ -117,6 +117,7 @@ namespace Server.Engines.Craft
}
catch
{
+ // ignored
}
return SmeltResult.Invalid;
diff --git a/Scripts/Engines/Craft/DefAlchemy.cs b/Scripts/Engines/Craft/DefAlchemy.cs
index a339df268..09e7572ca 100644
--- a/Scripts/Engines/Craft/DefAlchemy.cs
+++ b/Scripts/Engines/Craft/DefAlchemy.cs
@@ -17,16 +17,7 @@ namespace Server.Engines.Craft
public override int GumpTitleNumber => 1044001;
- public static CraftSystem CraftSystem
- {
- get
- {
- if (m_CraftSystem == null)
- m_CraftSystem = new DefAlchemy();
-
- return m_CraftSystem;
- }
- }
+ public static CraftSystem CraftSystem => m_CraftSystem ?? (m_CraftSystem = new DefAlchemy());
public override double GetChanceAtMin(CraftItem item)
{
@@ -35,8 +26,9 @@ namespace Server.Engines.Craft
public override int CanCraft(Mobile from, BaseTool tool, Type itemType)
{
- if (tool == null || tool.Deleted || tool.UsesRemaining < 0)
+ if (tool?.Deleted != false || tool.UsesRemaining < 0)
return 1044038; // You have worn out your tool!
+
if (!BaseTool.CheckAccessible(tool, from))
return 1044263; // The tool must be on your person to use.
@@ -180,4 +172,4 @@ namespace Server.Engines.Craft
}
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Craft/DefBlacksmithy.cs b/Scripts/Engines/Craft/DefBlacksmithy.cs
index 24b347ee1..fd42bc0f9 100644
--- a/Scripts/Engines/Craft/DefBlacksmithy.cs
+++ b/Scripts/Engines/Craft/DefBlacksmithy.cs
@@ -30,16 +30,7 @@ namespace Server.Engines.Craft
public override int GumpTitleNumber => 1044002;
- public static CraftSystem CraftSystem
- {
- get
- {
- if (m_CraftSystem == null)
- m_CraftSystem = new DefBlacksmithy();
-
- return m_CraftSystem;
- }
- }
+ public static CraftSystem CraftSystem => m_CraftSystem ?? (m_CraftSystem = new DefBlacksmithy());
public override CraftECA ECA => CraftECA.ChanceMinusSixtyToFourtyFive;
@@ -111,7 +102,7 @@ namespace Server.Engines.Craft
public override int CanCraft(Mobile from, BaseTool tool, Type itemType)
{
- if (tool == null || tool.Deleted || tool.UsesRemaining < 0)
+ if (tool?.Deleted != false || tool.UsesRemaining < 0)
return 1044038; // You have worn out your tool!
if (!BaseTool.CheckTool(tool, from))
return 1048146; // If you have a tool equipped, you must use that tool.
@@ -801,4 +792,4 @@ namespace Server.Engines.Craft
public class AnvilAttribute : Attribute
{
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Craft/DefBowFletching.cs b/Scripts/Engines/Craft/DefBowFletching.cs
index e64f7bf0f..5d6b385fc 100644
--- a/Scripts/Engines/Craft/DefBowFletching.cs
+++ b/Scripts/Engines/Craft/DefBowFletching.cs
@@ -15,16 +15,7 @@ namespace Server.Engines.Craft
public override int GumpTitleNumber => 1044006;
- public static CraftSystem CraftSystem
- {
- get
- {
- if (m_CraftSystem == null)
- m_CraftSystem = new DefBowFletching();
-
- return m_CraftSystem;
- }
- }
+ public static CraftSystem CraftSystem => m_CraftSystem ?? (m_CraftSystem = new DefBowFletching());
public override CraftECA ECA => CraftECA.FiftyPercentChanceMinusTenPercent;
@@ -35,7 +26,7 @@ namespace Server.Engines.Craft
public override int CanCraft(Mobile from, BaseTool tool, Type itemType)
{
- if (tool == null || tool.Deleted || tool.UsesRemaining < 0)
+ if (tool?.Deleted != false || tool.UsesRemaining < 0)
return 1044038; // You have worn out your tool!
if (!BaseTool.CheckAccessible(tool, from))
return 1044263; // The tool must be on your person to use.
@@ -212,4 +203,4 @@ namespace Server.Engines.Craft
Repair = Core.AOS;
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Craft/DefCarpentry.cs b/Scripts/Engines/Craft/DefCarpentry.cs
index d4868f49d..a4a1ee132 100644
--- a/Scripts/Engines/Craft/DefCarpentry.cs
+++ b/Scripts/Engines/Craft/DefCarpentry.cs
@@ -15,16 +15,7 @@ namespace Server.Engines.Craft
public override int GumpTitleNumber => 1044004;
- public static CraftSystem CraftSystem
- {
- get
- {
- if (m_CraftSystem == null)
- m_CraftSystem = new DefCarpentry();
-
- return m_CraftSystem;
- }
- }
+ public static CraftSystem CraftSystem => m_CraftSystem ?? (m_CraftSystem = new DefCarpentry());
public override double GetChanceAtMin(CraftItem item)
{
@@ -33,7 +24,7 @@ namespace Server.Engines.Craft
public override int CanCraft(Mobile from, BaseTool tool, Type itemType)
{
- if (tool == null || tool.Deleted || tool.UsesRemaining < 0)
+ if (tool?.Deleted != false || tool.UsesRemaining < 0)
return 1044038; // You have worn out your tool!
if (!BaseTool.CheckAccessible(tool, from))
return 1044263; // The tool must be on your person to use.
@@ -545,4 +536,4 @@ namespace Server.Engines.Craft
AddSubRes(typeof(FrostwoodLog), 1072649, 100.0, 1044041, 1072652);
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Craft/DefCartography.cs b/Scripts/Engines/Craft/DefCartography.cs
index edd2567c8..66207d36d 100644
--- a/Scripts/Engines/Craft/DefCartography.cs
+++ b/Scripts/Engines/Craft/DefCartography.cs
@@ -15,16 +15,7 @@ namespace Server.Engines.Craft
public override int GumpTitleNumber => 1044008;
- public static CraftSystem CraftSystem
- {
- get
- {
- if (m_CraftSystem == null)
- m_CraftSystem = new DefCartography();
-
- return m_CraftSystem;
- }
- }
+ public static CraftSystem CraftSystem => m_CraftSystem ?? (m_CraftSystem = new DefCartography());
public override double GetChanceAtMin(CraftItem item)
{
@@ -33,7 +24,7 @@ namespace Server.Engines.Craft
public override int CanCraft(Mobile from, BaseTool tool, Type itemType)
{
- if (tool == null || tool.Deleted || tool.UsesRemaining < 0)
+ if (tool?.Deleted != false || tool.UsesRemaining < 0)
return 1044038; // You have worn out your tool!
if (!BaseTool.CheckAccessible(tool, from))
return 1044263; // The tool must be on your person to use.
@@ -76,4 +67,4 @@ namespace Server.Engines.Craft
AddCraft(typeof(WorldMap), 1044448, 1015233, 39.5, 99.5, typeof(BlankMap), 1044449, 1, 1044450);
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Craft/DefCooking.cs b/Scripts/Engines/Craft/DefCooking.cs
index aa5ccb59e..8afb26226 100644
--- a/Scripts/Engines/Craft/DefCooking.cs
+++ b/Scripts/Engines/Craft/DefCooking.cs
@@ -15,16 +15,7 @@ namespace Server.Engines.Craft
public override int GumpTitleNumber => 1044003;
- public static CraftSystem CraftSystem
- {
- get
- {
- if (m_CraftSystem == null)
- m_CraftSystem = new DefCooking();
-
- return m_CraftSystem;
- }
- }
+ public static CraftSystem CraftSystem => m_CraftSystem ?? (m_CraftSystem = new DefCooking());
public override CraftECA ECA => CraftECA.ChanceMinusSixtyToFourtyFive;
@@ -35,7 +26,7 @@ namespace Server.Engines.Craft
public override int CanCraft(Mobile from, BaseTool tool, Type itemType)
{
- if (tool == null || tool.Deleted || tool.UsesRemaining < 0)
+ if (tool?.Deleted != false || tool.UsesRemaining < 0)
return 1044038; // You have worn out your tool!
if (!BaseTool.CheckAccessible(tool, from))
return 1044263; // The tool must be on your person to use.
@@ -292,4 +283,4 @@ namespace Server.Engines.Craft
/* End Chocolatiering */
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Craft/DefGlassblowing.cs b/Scripts/Engines/Craft/DefGlassblowing.cs
index dd0e803b6..c17378390 100644
--- a/Scripts/Engines/Craft/DefGlassblowing.cs
+++ b/Scripts/Engines/Craft/DefGlassblowing.cs
@@ -16,28 +16,16 @@ namespace Server.Engines.Craft
public override int GumpTitleNumber => 1044622;
- public static CraftSystem CraftSystem
- {
- get
- {
- if (m_CraftSystem == null)
- m_CraftSystem = new DefGlassblowing();
-
- return m_CraftSystem;
- }
- }
+ public static CraftSystem CraftSystem => m_CraftSystem ?? (m_CraftSystem = new DefGlassblowing());
public override double GetChanceAtMin(CraftItem item)
{
- if (item.ItemType == typeof(HollowPrism))
- return 0.5; // 50%
-
- return 0.0; // 0%
+ return item.ItemType == typeof(HollowPrism) ? 0.5 : 0.0;
}
public override int CanCraft(Mobile from, BaseTool tool, Type itemType)
{
- if (tool == null || tool.Deleted || tool.UsesRemaining < 0)
+ if (tool?.Deleted != false || tool.UsesRemaining < 0)
return 1044038; // You have worn out your tool!
if (!BaseTool.CheckTool(tool, from))
return 1048146; // If you have a tool equipped, you must use that tool.
@@ -48,10 +36,7 @@ namespace Server.Engines.Craft
DefBlacksmithy.CheckAnvilAndForge(from, 2, out _, out bool forge);
- if (forge)
- return 0;
-
- return 1044628; // You must be near a forge to blow glass.
+ return forge ? 0 : 1044628; // You must be near a forge to blow glass.
}
public override void PlayCraftEffect(Mobile from)
@@ -128,4 +113,4 @@ namespace Server.Engines.Craft
}
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Craft/DefInscription.cs b/Scripts/Engines/Craft/DefInscription.cs
index 80d6aeb99..c1922259e 100644
--- a/Scripts/Engines/Craft/DefInscription.cs
+++ b/Scripts/Engines/Craft/DefInscription.cs
@@ -36,16 +36,7 @@ namespace Server.Engines.Craft
public override int GumpTitleNumber => 1044009;
- public static CraftSystem CraftSystem
- {
- get
- {
- if (m_CraftSystem == null)
- m_CraftSystem = new DefInscription();
-
- return m_CraftSystem;
- }
- }
+ public static CraftSystem CraftSystem => m_CraftSystem ?? (m_CraftSystem = new DefInscription());
public override double GetChanceAtMin(CraftItem item)
{
@@ -54,7 +45,7 @@ namespace Server.Engines.Craft
public override int CanCraft(Mobile from, BaseTool tool, Type typeItem)
{
- if (tool == null || tool.Deleted || tool.UsesRemaining < 0)
+ if (tool?.Deleted != false || tool.UsesRemaining < 0)
return 1044038; // You have worn out your tool!
if (!BaseTool.CheckAccessible(tool, from))
return 1044263; // The tool must be on your person to use.
@@ -65,9 +56,7 @@ namespace Server.Engines.Craft
if (o is SpellScroll scroll)
{
- Spellbook book = Spellbook.Find(from, scroll.SpellID);
-
- bool hasSpell = book != null && book.HasSpell(scroll.SpellID);
+ bool hasSpell = Spellbook.Find(from, scroll.SpellID)?.HasSpell(scroll.SpellID) == true;
scroll.Delete();
@@ -121,7 +110,6 @@ namespace Server.Engines.Craft
switch (m_Circle)
{
default:
- case 0:
minSkill = -25.0;
maxSkill = 25.0;
break;
@@ -409,4 +397,4 @@ namespace Server.Engines.Craft
SpidersSilk
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Craft/DefMasonry.cs b/Scripts/Engines/Craft/DefMasonry.cs
index 4825822a9..1e73469b1 100644
--- a/Scripts/Engines/Craft/DefMasonry.cs
+++ b/Scripts/Engines/Craft/DefMasonry.cs
@@ -16,16 +16,7 @@ namespace Server.Engines.Craft
public override int GumpTitleNumber => 1044500;
- public static CraftSystem CraftSystem
- {
- get
- {
- if (m_CraftSystem == null)
- m_CraftSystem = new DefMasonry();
-
- return m_CraftSystem;
- }
- }
+ public static CraftSystem CraftSystem => m_CraftSystem ?? (m_CraftSystem = new DefMasonry());
public override double GetChanceAtMin(CraftItem item)
{
@@ -39,7 +30,7 @@ namespace Server.Engines.Craft
public override int CanCraft(Mobile from, BaseTool tool, Type itemType)
{
- if (tool == null || tool.Deleted || tool.UsesRemaining < 0)
+ if (tool?.Deleted != false || tool.UsesRemaining < 0)
return 1044038; // You have worn out your tool!
if (!BaseTool.CheckTool(tool, from))
return 1048146; // If you have a tool equipped, you must use that tool.
@@ -139,4 +130,4 @@ namespace Server.Engines.Craft
}
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Craft/DefTailoring.cs b/Scripts/Engines/Craft/DefTailoring.cs
index 355dcf723..b2e3430a5 100644
--- a/Scripts/Engines/Craft/DefTailoring.cs
+++ b/Scripts/Engines/Craft/DefTailoring.cs
@@ -23,16 +23,7 @@ namespace Server.Engines.Craft
public override int GumpTitleNumber => 1044005;
- public static CraftSystem CraftSystem
- {
- get
- {
- if (m_CraftSystem == null)
- m_CraftSystem = new DefTailoring();
-
- return m_CraftSystem;
- }
- }
+ public static CraftSystem CraftSystem => m_CraftSystem ?? (m_CraftSystem = new DefTailoring());
public override CraftECA ECA => CraftECA.ChanceMinusSixtyToFourtyFive;
@@ -43,7 +34,7 @@ namespace Server.Engines.Craft
public override int CanCraft(Mobile from, BaseTool tool, Type itemType)
{
- if (tool == null || tool.Deleted || tool.UsesRemaining < 0)
+ if (tool?.Deleted != false || tool.UsesRemaining < 0)
return 1044038; // You have worn out your tool!
if (!BaseTool.CheckAccessible(tool, from))
return 1044263; // The tool must be on your person to use.
@@ -427,4 +418,4 @@ namespace Server.Engines.Craft
CanEnhance = Core.AOS;
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Craft/DefTinkering.cs b/Scripts/Engines/Craft/DefTinkering.cs
index 2f20ea63b..813e074dd 100644
--- a/Scripts/Engines/Craft/DefTinkering.cs
+++ b/Scripts/Engines/Craft/DefTinkering.cs
@@ -31,16 +31,7 @@ namespace Server.Engines.Craft
public override int GumpTitleNumber => 1044007;
- public static CraftSystem CraftSystem
- {
- get
- {
- if (m_CraftSystem == null)
- m_CraftSystem = new DefTinkering();
-
- return m_CraftSystem;
- }
- }
+ public static CraftSystem CraftSystem => m_CraftSystem ?? (m_CraftSystem = new DefTinkering());
public override double GetChanceAtMin(CraftItem item)
{
@@ -52,7 +43,7 @@ namespace Server.Engines.Craft
public override int CanCraft(Mobile from, BaseTool tool, Type itemType)
{
- if (tool == null || tool.Deleted || tool.UsesRemaining < 0)
+ if (tool?.Deleted != false || tool.UsesRemaining < 0)
return 1044038; // You have worn out your tool!
if (!BaseTool.CheckAccessible(tool, from))
return 1044263; // The tool must be on your person to use.
@@ -507,7 +498,7 @@ namespace Server.Engines.Craft
Mobile from = m_TrapCraft.From;
BaseTool tool = m_TrapCraft.Tool;
- if (tool != null && !tool.Deleted && tool.UsesRemaining > 0)
+ if (tool?.Deleted == false && tool.UsesRemaining > 0)
from.SendGump(new CraftGump(from, m_TrapCraft.CraftSystem, tool, message));
else if (message > 0)
from.SendLocalizedMessage(message);
@@ -547,4 +538,4 @@ namespace Server.Engines.Craft
public override TrapType TrapType => TrapType.ExplosionTrap;
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Doom/GauntletSpawner.cs b/Scripts/Engines/Doom/GauntletSpawner.cs
index 5c231bc59..4386f012e 100644
--- a/Scripts/Engines/Doom/GauntletSpawner.cs
+++ b/Scripts/Engines/Doom/GauntletSpawner.cs
@@ -27,12 +27,7 @@ namespace Server.Engines.Doom
private Timer m_Timer;
[Constructible]
- public GauntletSpawner() : this(null)
- {
- }
-
- [Constructible]
- public GauntletSpawner(string typeName) : base(0x36FE)
+ public GauntletSpawner(string typeName = null) : base(0x36FE)
{
Visible = false;
Movable = false;
@@ -334,7 +329,7 @@ namespace Server.Engines.Doom
{
State = GauntletSpawnerState.InSequence;
- if (Sequence != null && !Sequence.Deleted)
+ if (Sequence?.Deleted == false)
Sequence.RecurseReset();
}
}
@@ -353,7 +348,7 @@ namespace Server.Engines.Doom
{
State = GauntletSpawnerState.Completed;
- if (Sequence != null && !Sequence.Deleted)
+ if (Sequence?.Deleted == false)
{
if (Sequence.State == GauntletSpawnerState.Completed)
RecurseReset();
@@ -428,7 +423,7 @@ namespace Server.Engines.Doom
public static void CreateTeleporter(int xFrom, int yFrom, int xTo, int yTo)
{
Static telePad = new Static(0x1822);
- Teleporter teleItem = new Teleporter(new Point3D(xTo, yTo, -1), Map.Malas, false);
+ Teleporter teleItem = new Teleporter(new Point3D(xTo, yTo, -1), Map.Malas);
telePad.Hue = 0x482;
telePad.MoveToWorld(new Point3D(xFrom, yFrom, -1), Map.Malas);
@@ -652,4 +647,4 @@ namespace Server.Engines.Doom
{
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Doom/LeverPuzzle/LeverPuzzleController.cs b/Scripts/Engines/Doom/LeverPuzzle/LeverPuzzleController.cs
index cf45b0a6f..d4c5d4598 100644
--- a/Scripts/Engines/Doom/LeverPuzzle/LeverPuzzleController.cs
+++ b/Scripts/Engines/Doom/LeverPuzzle/LeverPuzzleController.cs
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
+using System.Linq;
using Server.Commands;
using Server.Mobiles;
using Server.Network;
@@ -181,12 +182,11 @@ namespace Server.Engines.Doom
[Description("Generates lamp room and lever puzzle in doom.")]
public static void GenLampPuzzle_OnCommand(CommandEventArgs e)
{
- foreach (Item item in Map.Malas.GetItemsInRange(lp_Center, 0))
- if (item is LeverPuzzleController)
- {
- e.Mobile.SendMessage("Lamp room puzzle already exists: please delete the existing controller first ...");
- return;
- }
+ if (Map.Malas.GetItemsInRange(lp_Center, 0).OfType().Any())
+ {
+ e.Mobile.SendMessage("Lamp room puzzle already exists: please delete the existing controller first ...");
+ return;
+ }
e.Mobile.SendMessage("Generating Lamp Room puzzle...");
new LeverPuzzleController().MoveToWorld(lp_Center, Map.Malas);
@@ -199,10 +199,11 @@ namespace Server.Engines.Doom
public static Item AddLeverPuzzlePart(int[] Loc, Item newitem)
{
- if (newitem == null || newitem.Deleted)
+ if (newitem?.Deleted != false)
installed = false;
else
newitem.MoveToWorld(new Point3D(Loc[0], Loc[1], Loc[2]), Map.Malas);
+
return newitem;
}
@@ -220,16 +221,17 @@ namespace Server.Engines.Doom
m_LampRoom?.Unregister();
if (m_Tiles != null)
- foreach (Region region in m_Tiles)
+ foreach (LeverPuzzleRegion region in m_Tiles)
region.Unregister();
- if (m_Box != null && !m_Box.Deleted) m_Box.Delete();
+ if (m_Box?.Deleted == false)
+ m_Box.Delete();
}
public static void NukeItemList(List
- list)
{
- if (list != null && list.Count != 0)
+ if (list?.Count > 0)
foreach (Item item in list)
- if (item != null && !item.Deleted)
+ if (item?.Deleted == false)
item.Delete();
}
@@ -244,31 +246,29 @@ namespace Server.Engines.Doom
public virtual LeverPuzzleStatue GetStatue(int index)
{
LeverPuzzleStatue statue = (LeverPuzzleStatue)m_Statues[index];
-
- if (statue != null && !statue.Deleted) return statue;
- return null;
+ return statue?.Deleted == false ? statue : null;
}
public virtual LeverPuzzleLever GetLever(int index)
{
LeverPuzzleLever lever = (LeverPuzzleLever)m_Levers[index];
- if (lever != null && !lever.Deleted) return lever;
- return null;
+ return lever?.Deleted == false ? lever : null;
}
- public virtual void PuzzleStatus(int message, string fstring)
+ public virtual void PuzzleStatus(int message, string fstring = null)
{
for (int i = 0; i < 2; i++)
{
Item s;
- if ((s = GetStatue(i)) != null) s.PublicOverheadMessage(MessageType.Regular, 0x3B2, message, fstring);
+ if ((s = GetStatue(i)) != null)
+ s.PublicOverheadMessage(MessageType.Regular, 0x3B2, message, fstring);
}
}
public virtual void ResetPuzzle()
{
- PuzzleStatus(1062053, null);
+ PuzzleStatus(1062053);
ResetLevers();
}
@@ -289,8 +289,8 @@ namespace Server.Engines.Doom
public virtual void KillTimers()
{
- if (l_Timer != null && l_Timer.Running) l_Timer.Stop();
- if (m_Timer != null && m_Timer.Running) m_Timer.Stop();
+ if (l_Timer?.Running == true) l_Timer.Stop();
+ if (m_Timer?.Running == true) m_Timer.Stop();
}
public virtual void RemoveSuccessful()
@@ -300,8 +300,7 @@ namespace Server.Engines.Doom
public virtual void LeverPulled(ushort code)
{
- int Correct = 0;
- Mobile m_Player;
+ int correct = 0;
KillTimers();
@@ -315,20 +314,21 @@ namespace Server.Engines.Doom
if (!CircleComplete)
{
- PuzzleStatus(1050004, null); // The circle is the key...
+ PuzzleStatus(1050004); // The circle is the key...
}
else
{
+ Mobile player;
if (TheirKey == MyKey)
{
GenKey();
- if ((Successful = m_Player = GetOccupant(0)) != null)
+ if ((Successful = player = GetOccupant(0)) != null)
{
SendLocationEffect(lp_Center, 0x1153, 0, 60, 1);
PlaySounds(lp_Center, cs1);
- Effects.SendBoltEffect(m_Player, true);
- m_Player.MoveToWorld(lr_Enter, Map.Malas);
+ Effects.SendBoltEffect(player, true);
+ player.MoveToWorld(lr_Enter, Map.Malas);
m_Timer = new LampRoomTimer(this);
m_Timer.Start();
@@ -339,16 +339,13 @@ namespace Server.Engines.Doom
{
for (int i = 0; i < 16; i++) /* Count matching SET bits, ie correct codes */
if (((MyKey >> i) & 1) == 1 && ((TheirKey >> i) & 1) == 1)
- Correct++;
+ correct++;
- PuzzleStatus(Statue_Msg[Correct], Correct > 0 ? Correct.ToString() : null);
+ PuzzleStatus(Statue_Msg[correct], correct > 0 ? correct.ToString() : null);
for (int i = 0; i < 5; i++)
- if ((m_Player = GetOccupant(i)) != null)
- {
- Timer smash = new RockTimer(m_Player, this);
- smash.Start();
- }
+ if ((player = GetOccupant(i)) != null)
+ new RockTimer(player, this).Start();
}
}
@@ -357,33 +354,25 @@ namespace Server.Engines.Doom
public virtual void GenKey() /* Shuffle & build key */
{
- ushort tmp;
- int n, i;
ushort[] CA = { 1, 2, 4, 8 };
- for (i = 0; i < 4; i++)
+ for (int i = 0; i < 4; i++)
{
- n = (n = Utility.Random(0, 3)) == i ? n & ~i : n; /* if (i==n) { return pointless; } */
- tmp = CA[i];
+ int n = (n = Utility.Random(0, 3)) == i ? n & ~i : n;
+ ushort tmp = CA[i];
CA[i] = CA[n];
CA[n] = tmp;
}
- for (i = 0; i < 4; MyKey = (ushort)(CA[i++] | (MyKey <<= 4)))
+ for (int i = 0; i < 4; MyKey = (ushort)(CA[i++] | (MyKey <<= 4)))
{
}
}
private static bool IsValidDamagable(Mobile m)
{
- if (m != null && !m.Deleted)
- {
- if (m.Player && m.Alive)
- return true;
-
- return m is BaseCreature bc && (bc.Controlled || bc.Summoned) && !bc.IsDeadBondedPet;
- }
-
- return false;
+ return m?.Deleted == false &&
+ (m.Player && m.Alive ||
+ m is BaseCreature bc && (bc.Controlled || bc.Summoned) && !bc.IsDeadBondedPet);
}
public static void MoveMobileOut(Mobile m)
@@ -391,7 +380,7 @@ namespace Server.Engines.Doom
if (m != null)
{
if (m is PlayerMobile && !m.Alive)
- if (m.Corpse != null && !m.Corpse.Deleted)
+ if (m.Corpse?.Deleted == false)
m.Corpse.MoveToWorld(lr_Exit, Map.Malas);
BaseCreature.TeleportPets(m, lr_Exit, Map.Malas);
m.Location = lr_Exit;
@@ -401,7 +390,7 @@ namespace Server.Engines.Doom
public static bool AniSafe(Mobile m)
{
- return m != null && !TransformationSpellHelper.UnderTransformation(m) && m.BodyMod == 0 && m.Alive;
+ return m?.BodyMod == 0 && m.Alive && !TransformationSpellHelper.UnderTransformation(m);
}
public static IEntity ZAdjustedIEFromMobile(Mobile m, int ZDelta)
@@ -411,7 +400,7 @@ namespace Server.Engines.Doom
public static void DoDamage(Mobile m, int min, int max, bool poison)
{
- if (m != null && !m.Deleted && m.Alive)
+ if (m?.Deleted == false && m.Alive)
{
int damage = Utility.Random(min, max);
AOS.Damage(m, damage, poison ? 0 : 100, 0, 0, poison ? 100 : 0, 0);
@@ -559,8 +548,8 @@ namespace Server.Engines.Doom
{
IEntity m_IEntity = new Entity(Serial.Zero, RandomPointIn(m_Player.Location, 10), m_Player.Map);
- List mobiles = new List();
- foreach (Mobile m in m_IEntity.Map.GetMobilesInRange(m_IEntity.Location, 2)) mobiles.Add(m);
+ List mobiles = m_IEntity.Map.GetMobilesInRange(m_IEntity.Location, 2).ToList();
+
for (int k = 0; k < mobiles.Count; k++)
if (IsValidDamagable(mobiles[k]) && mobiles[k] != m_Player)
{
@@ -615,7 +604,7 @@ namespace Server.Engines.Doom
if (ticks >= 71 || m_Controller.m_LampRoom.GetPlayerCount() == 0)
{
foreach (Mobile mobile in mobiles)
- if (mobile != null && !mobile.Deleted && !mobile.IsDeadBondedPet)
+ if (mobile?.Deleted == false && !mobile.IsDeadBondedPet)
mobile.Kill();
m_Controller.Enabled = true;
Stop();
@@ -637,7 +626,8 @@ namespace Server.Engines.Doom
DoDamage(mobile, 15, 20, true);
}
- if (Utility.Random((int)(level & ~0xfffffffc), 3) == 3) mobile.ApplyPoison(mobile, PA2[level]);
+ if (Utility.Random((int)(level & ~0xfffffffc), 3) == 3)
+ mobile.ApplyPoison(mobile, PA2[level]);
if (ticks % 12 == 0 && level > 0 && mobile.Player)
mobile.SendLocalizedMessage(PA[level][0], null, PA[level][1]);
}
@@ -648,4 +638,4 @@ namespace Server.Engines.Doom
}
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Doom/LeverPuzzle/LeverPuzzleItems.cs b/Scripts/Engines/Doom/LeverPuzzle/LeverPuzzleItems.cs
index 95aff9979..a1be099c1 100644
--- a/Scripts/Engines/Doom/LeverPuzzle/LeverPuzzleItems.cs
+++ b/Scripts/Engines/Doom/LeverPuzzle/LeverPuzzleItems.cs
@@ -32,7 +32,7 @@ namespace Server.Engines.Doom
{
m_Wanderer = new WandererOfTheVoid();
m_Wanderer.MoveToWorld(LeverPuzzleController.lr_Enter, Map.Malas);
- m_Wanderer.PublicOverheadMessage(MessageType.Regular, 0x3B2, 1060002, ""); // I am the guardian of...
+ m_Wanderer.PublicOverheadMessage(MessageType.Regular, 0x3B2, 1060002); // I am the guardian of...
Timer.DelayCall(TimeSpan.FromSeconds(5.0), CallBackMessage);
}
}
@@ -44,7 +44,7 @@ namespace Server.Engines.Doom
public override void OnAfterDelete()
{
- if (m_Controller != null && !m_Controller.Deleted)
+ if (m_Controller?.Deleted == false)
m_Controller.Delete();
}
@@ -80,7 +80,7 @@ namespace Server.Engines.Doom
public override void OnAfterDelete()
{
- if (m_Controller != null && !m_Controller.Deleted)
+ if (m_Controller?.Deleted == false)
m_Controller.Delete();
}
@@ -134,7 +134,7 @@ namespace Server.Engines.Doom
public override void OnAfterDelete()
{
- if (m_Controller != null && !m_Controller.Deleted)
+ if (m_Controller?.Deleted == false)
m_Controller.Delete();
}
@@ -202,4 +202,4 @@ namespace Server.Engines.Doom
int version = reader.ReadInt();
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Doom/LeverPuzzle/LeverPuzzleRegions.cs b/Scripts/Engines/Doom/LeverPuzzle/LeverPuzzleRegions.cs
index 5d3e91ec5..4c7898a07 100644
--- a/Scripts/Engines/Doom/LeverPuzzle/LeverPuzzleRegions.cs
+++ b/Scripts/Engines/Doom/LeverPuzzle/LeverPuzzleRegions.cs
@@ -5,12 +5,12 @@ namespace Server.Engines.Doom
{
public class LampRoomRegion : BaseRegion
{
- private LeverPuzzleController Controller;
+ private LeverPuzzleController m_Controller;
public LampRoomRegion(LeverPuzzleController controller)
: base(null, Map.Malas, Find(LeverPuzzleController.lr_Enter, Map.Malas), LeverPuzzleController.lr_Rect)
{
- Controller = controller;
+ m_Controller = controller;
Register();
}
@@ -38,13 +38,13 @@ namespace Server.Engines.Doom
if (m.AccessLevel > AccessLevel.Player)
return;
- if (Controller.Successful != null)
+ if (m_Controller.Successful != null)
{
if (m is PlayerMobile)
{
- if (m == Controller.Successful) return;
+ if (m == m_Controller.Successful) return;
}
- else if (m is BaseCreature bc && (bc.Controlled && bc.ControlMaster == Controller.Successful ||
+ else if (m is BaseCreature bc && (bc.Controlled && bc.ControlMaster == m_Controller.Successful ||
bc.Summoned))
{
return;
@@ -57,49 +57,36 @@ namespace Server.Engines.Doom
public override void OnExit(Mobile m)
{
- if (m != null && m == Controller.Successful)
- Controller.RemoveSuccessful();
+ if (m != null && m == m_Controller.Successful)
+ m_Controller.RemoveSuccessful();
}
public override void OnDeath(Mobile m)
{
- if (m != null && !m.Deleted && !(m is WandererOfTheVoid))
- {
- Timer kick = new LeverPuzzleController.LampRoomKickTimer(m);
- kick.Start();
- }
+ if (m?.Deleted != false || m is WandererOfTheVoid)
+ return;
+ Timer kick = new LeverPuzzleController.LampRoomKickTimer(m);
+ kick.Start();
}
public override bool OnSkillUse(Mobile m, int Skill) /* just in case */
{
- if (Controller.Successful == null || m.AccessLevel == AccessLevel.Player && m != Controller.Successful)
- return false;
- return true;
+ return m_Controller.Successful != null && (m.AccessLevel != AccessLevel.Player || m == m_Controller.Successful);
}
}
public class LeverPuzzleRegion : BaseRegion
{
- private LeverPuzzleController Controller;
public Mobile m_Occupant;
public LeverPuzzleRegion(LeverPuzzleController controller, int[] loc)
: base(null, Map.Malas, Find(LeverPuzzleController.lr_Enter, Map.Malas), new Rectangle2D(loc[0], loc[1], 1, 1))
{
- Controller = controller;
Register();
}
[CommandProperty(AccessLevel.GameMaster)]
- public Mobile Occupant
- {
- get
- {
- if (m_Occupant != null && m_Occupant.Alive)
- return m_Occupant;
- return null;
- }
- }
+ public Mobile Occupant => m_Occupant?.Alive == true ? m_Occupant : null;
public override void OnEnter(Mobile m)
{
@@ -113,4 +100,4 @@ namespace Server.Engines.Doom
m_Occupant = null;
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Ethics/Core/Ethic.cs b/Scripts/Engines/Ethics/Core/Ethic.cs
index 7b728ef22..333379997 100644
--- a/Scripts/Engines/Ethics/Core/Ethic.cs
+++ b/Scripts/Engines/Ethics/Core/Ethic.cs
@@ -1,4 +1,5 @@
using System;
+using System.Linq;
using Server.Ethics.Evil;
using Server.Ethics.Hero;
using Server.Items;
@@ -126,16 +127,7 @@ namespace Server.Ethics
if (!Insensitive.Equals(ethic.Definition.JoinPhrase.String, e.Speech))
continue;
- bool isNearAnkh = false;
-
- foreach (Item item in e.Mobile.GetItemsInRange(2))
- if (item is AnkhNorth || item is AnkhWest)
- {
- isNearAnkh = true;
- break;
- }
-
- if (!isNearAnkh)
+ if (!e.Mobile.GetItemsInRange(2).Any(item => item is AnkhNorth || item is AnkhWest))
continue;
pl = new Player(ethic, e.Mobile);
@@ -239,4 +231,4 @@ namespace Server.Ethics
m_Players[i].Serialize(writer);
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Ethics/Core/Persistance.cs b/Scripts/Engines/Ethics/Core/Persistance.cs
index 8a5b200dc..6396149e6 100644
--- a/Scripts/Engines/Ethics/Core/Persistance.cs
+++ b/Scripts/Engines/Ethics/Core/Persistance.cs
@@ -8,7 +8,7 @@ namespace Server.Ethics
{
Movable = false;
- if (Instance == null || Instance.Deleted)
+ if (Instance?.Deleted != false)
Instance = this;
else
base.Delete();
@@ -56,4 +56,4 @@ namespace Server.Ethics
{
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Ethics/Core/Player.cs b/Scripts/Engines/Ethics/Core/Player.cs
index 4069f89c7..3ee9468f8 100644
--- a/Scripts/Engines/Ethics/Core/Player.cs
+++ b/Scripts/Engines/Ethics/Core/Player.cs
@@ -104,7 +104,7 @@ namespace Server.Ethics
Player pl = pm.EthicPlayer;
- if (pl != null && !pl.Ethic.IsEligible(pl.Mobile))
+ if (pl?.Ethic.IsEligible(pl.Mobile) == false)
pm.EthicPlayer = pl = null;
return pl;
@@ -157,4 +157,4 @@ namespace Server.Ethics
writer.WriteDeltaTime(m_Shield);
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Ethics/Evil/Powers/SummonFamiliar.cs b/Scripts/Engines/Ethics/Evil/Powers/SummonFamiliar.cs
index f4f52d4ce..53359a8cd 100644
--- a/Scripts/Engines/Ethics/Evil/Powers/SummonFamiliar.cs
+++ b/Scripts/Engines/Ethics/Evil/Powers/SummonFamiliar.cs
@@ -18,7 +18,7 @@ namespace Server.Ethics.Evil
public override void BeginInvoke(Player from)
{
- if (from.Familiar != null && from.Familiar.Deleted)
+ if (from.Familiar?.Deleted == true)
from.Familiar = null;
if (from.Familiar != null)
@@ -43,4 +43,4 @@ namespace Server.Ethics.Evil
}
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Ethics/Evil/Powers/UnholySteed.cs b/Scripts/Engines/Ethics/Evil/Powers/UnholySteed.cs
index 4e20af9f5..fcef7b4e8 100644
--- a/Scripts/Engines/Ethics/Evil/Powers/UnholySteed.cs
+++ b/Scripts/Engines/Ethics/Evil/Powers/UnholySteed.cs
@@ -18,7 +18,7 @@ namespace Server.Ethics.Evil
public override void BeginInvoke(Player from)
{
- if (from.Steed != null && from.Steed.Deleted)
+ if (from.Steed?.Deleted == true)
from.Steed = null;
if (from.Steed != null)
@@ -43,4 +43,4 @@ namespace Server.Ethics.Evil
}
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Ethics/Hero/Powers/HolySteed.cs b/Scripts/Engines/Ethics/Hero/Powers/HolySteed.cs
index 0f489b2dd..089e6e3a4 100644
--- a/Scripts/Engines/Ethics/Hero/Powers/HolySteed.cs
+++ b/Scripts/Engines/Ethics/Hero/Powers/HolySteed.cs
@@ -18,7 +18,7 @@ namespace Server.Ethics.Hero
public override void BeginInvoke(Player from)
{
- if (from.Steed != null && from.Steed.Deleted)
+ if (from.Steed?.Deleted == true)
from.Steed = null;
if (from.Steed != null)
@@ -43,4 +43,4 @@ namespace Server.Ethics.Hero
}
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Ethics/Hero/Powers/SummonFamiliar.cs b/Scripts/Engines/Ethics/Hero/Powers/SummonFamiliar.cs
index b6935fa38..1a43a8fa6 100644
--- a/Scripts/Engines/Ethics/Hero/Powers/SummonFamiliar.cs
+++ b/Scripts/Engines/Ethics/Hero/Powers/SummonFamiliar.cs
@@ -18,7 +18,7 @@ namespace Server.Ethics.Hero
public override void BeginInvoke(Player from)
{
- if (from.Familiar != null && from.Familiar.Deleted)
+ if (from.Familiar?.Deleted == true)
from.Familiar = null;
if (from.Familiar != null)
@@ -43,4 +43,4 @@ namespace Server.Ethics.Hero
}
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Factions/Core/Election.cs b/Scripts/Engines/Factions/Core/Election.cs
index 5778be84d..93507910e 100644
--- a/Scripts/Engines/Factions/Core/Election.cs
+++ b/Scripts/Engines/Factions/Core/Election.cs
@@ -550,4 +550,4 @@ namespace Server.Factions
Campaign,
Election
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Factions/Core/Faction.cs b/Scripts/Engines/Factions/Core/Faction.cs
index 9363b9f64..d7d708aae 100644
--- a/Scripts/Engines/Factions/Core/Faction.cs
+++ b/Scripts/Engines/Factions/Core/Faction.cs
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
+using System.Linq;
using Server.Accounting;
using Server.Commands;
using Server.Commands.Generic;
@@ -14,10 +15,10 @@ using Server.Targeting;
namespace Server.Factions
{
[CustomEnum(new[] { "Minax", "Council of Mages", "True Britannians", "Shadowlords" })]
- public abstract class Faction : IComparable
+ public abstract class Faction : IComparable
{
public const int StabilityFactor = 300; // 300% greater (3 times) than smallest faction
- public const int StabilityActivation = 200; // Stablity code goes into effect when largest faction has > 200 people
+ public const int StabilityActivation = 200; // Stability code goes into effect when largest faction has > 200 people
public static readonly TimeSpan LeavePeriod = TimeSpan.FromDays(3.0);
@@ -87,9 +88,9 @@ namespace Server.Factions
public static List Factions => Reflector.Factions;
- public int CompareTo(object obj)
+ public int CompareTo(Faction f)
{
- return m_Definition.Sort - ((Faction)obj).m_Definition.Sort;
+ return m_Definition.Sort - (f?.m_Definition.Sort ?? 0);
}
public void Broadcast(string text)
@@ -239,36 +240,18 @@ namespace Server.Factions
return false;
IPooledEnumerable eable = mob.Map.GetObjectsInRange(mob.Location, range, items, mobs);
-
- foreach (IEntity obj in eable)
- if (type.IsInstanceOfType(obj))
- {
- eable.Free();
- return true;
- }
-
+ bool isInstance = eable.Any(type.IsInstanceOfType);
eable.Free();
- return false;
+
+ return isInstance;
}
public static bool IsNearType(Mobile mob, Type[] types, int range)
{
IPooledEnumerable eable = mob.GetObjectsInRange(range);
-
- foreach (IEntity obj in eable)
- {
- Type objType = obj.GetType();
-
- for (int i = 0; i < types.Length; i++)
- if (types[i].IsAssignableFrom(objType))
- {
- eable.Free();
- return true;
- }
- }
-
+ bool found = eable.Any(obj => types.Any(t => t.IsInstanceOfType(obj)));
eable.Free();
- return false;
+ return found;
}
public void RemovePlayerState(PlayerState pl)
@@ -475,7 +458,7 @@ namespace Server.Factions
pm.SendLocalizedMessage(
1042161); // You cannot join a faction because your guild is an Order or Chaos type.
}
- else if (!Guild.NewGuildSystem && guild.Enemies != null && guild.Enemies.Count > 0
+ else if (!Guild.NewGuildSystem && guild.Enemies?.Count > 0
) //CAN join w/wars in new system
{
pm.SendLocalizedMessage(1005056); // You cannot join a faction with active Wars
@@ -1016,7 +999,7 @@ namespace Server.Factions
Player killerEPL = Player.Find(killer);
Player victimEPL = Player.Find(victim);
- if (killerEPL != null && victimEPL != null && victimEPL.Power > 0 && victimState.CanGiveSilverTo(killer))
+ if (killerEPL != null && victimEPL?.Power > 0 && victimState.CanGiveSilverTo(killer))
{
int powerTransfer = Math.Max(1, victimEPL.Power / 5);
@@ -1078,7 +1061,7 @@ namespace Server.Factions
Player killerEPL = Player.Find(killer);
Player victimEPL = Player.Find(victim);
- if (killerEPL != null && victimEPL != null && victimEPL.Power > 0)
+ if (killerEPL != null && victimEPL?.Power > 0)
{
int powerTransfer = Math.Max(1, victimEPL.Power / 5);
@@ -1385,4 +1368,4 @@ namespace Server.Factions
}
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Factions/Core/FactionItem.cs b/Scripts/Engines/Factions/Core/FactionItem.cs
index 9233cc2df..7c370e27f 100644
--- a/Scripts/Engines/Factions/Core/FactionItem.cs
+++ b/Scripts/Engines/Factions/Core/FactionItem.cs
@@ -44,7 +44,7 @@ namespace Server.Factions
{
get
{
- if (Item == null || Item.Deleted)
+ if (Item?.Deleted != false)
return true;
return Expiration != DateTime.MinValue && DateTime.UtcNow >= Expiration;
@@ -77,7 +77,7 @@ namespace Server.Factions
if (Item is IFactionItem item)
item.FactionItemState = null;
- if (Faction != null && Faction.State.FactionItems.Contains(this))
+ if (Faction?.State.FactionItems.Contains(this) == true)
Faction.State.FactionItems.Remove(this);
}
@@ -93,13 +93,7 @@ namespace Server.Factions
{
PlayerState pl = PlayerState.Find(mob);
- if (pl == null)
- return 0;
-
- if (pl.Faction.IsCommander(mob))
- return 9;
-
- return pl.Rank.MaxWearables;
+ return pl == null ? 0 : pl.Faction.IsCommander(mob) ? 9 : pl.Rank.MaxWearables;
}
public static FactionItem Find(Item item)
@@ -140,4 +134,4 @@ namespace Server.Factions
return item;
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Factions/Core/Persistance.cs b/Scripts/Engines/Factions/Core/Persistance.cs
index 71c3e01e6..cfdd0caac 100644
--- a/Scripts/Engines/Factions/Core/Persistance.cs
+++ b/Scripts/Engines/Factions/Core/Persistance.cs
@@ -8,7 +8,7 @@ namespace Server.Factions
{
Movable = false;
- if (Instance == null || Instance.Deleted)
+ if (Instance?.Deleted == true)
Instance = this;
else
base.Delete();
@@ -87,4 +87,4 @@ namespace Server.Factions
Town
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Factions/Core/PlayerState.cs b/Scripts/Engines/Factions/Core/PlayerState.cs
index 7f43fa40c..67e8fb963 100644
--- a/Scripts/Engines/Factions/Core/PlayerState.cs
+++ b/Scripts/Engines/Factions/Core/PlayerState.cs
@@ -4,7 +4,7 @@ using Server.Mobiles;
namespace Server.Factions
{
- public class PlayerState : IComparable
+ public class PlayerState : IComparable
{
private Town m_Finance;
@@ -241,17 +241,14 @@ namespace Server.Factions
public bool IsActive{ get; set; }
- public int CompareTo(object obj)
+ public int CompareTo(PlayerState ps)
{
- return ((PlayerState)obj).m_KillPoints - m_KillPoints;
+ return (ps?.m_KillPoints ?? 0) - m_KillPoints;
}
public bool CanGiveSilverTo(Mobile mob)
{
- if (SilverGiven == null)
- return true;
-
- for (int i = 0; i < SilverGiven.Count; ++i)
+ for (int i = 0; i < SilverGiven?.Count; ++i)
{
SilverGivenEntry sge = SilverGiven[i];
@@ -307,4 +304,4 @@ namespace Server.Factions
return mob is PlayerMobile mobile ? mobile.FactionPlayerState : null;
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Factions/Core/Town.cs b/Scripts/Engines/Factions/Core/Town.cs
index da8a2365d..4bca45747 100644
--- a/Scripts/Engines/Factions/Core/Town.cs
+++ b/Scripts/Engines/Factions/Core/Town.cs
@@ -6,7 +6,7 @@ using Server.Targeting;
namespace Server.Factions
{
[CustomEnum(new[] { "Britain", "Magincia", "Minoc", "Moonglow", "Skara Brae", "Trinsic", "Vesper", "Yew" })]
- public abstract class Town : IComparable, IComparable
+ public abstract class Town : IComparable
{
public const int SilverCaptureBonus = 10000;
@@ -134,12 +134,7 @@ namespace Server.Factions
public int CompareTo(Town other)
{
- return Definition.Sort - other.Definition.Sort;
- }
-
- public int CompareTo(object obj)
- {
- return Definition.Sort - ((Town)obj).Definition.Sort;
+ return Definition.Sort - (other?.Definition.Sort ?? 0);
}
public static Town FromRegion(Region reg)
@@ -386,18 +381,14 @@ namespace Server.Factions
public bool IsSheriff(Mobile mob)
{
- if (mob == null || mob.Deleted)
- return false;
-
- return mob.AccessLevel >= AccessLevel.GameMaster || mob == Sheriff;
+ return mob?.Deleted == false &&
+ (mob.AccessLevel >= AccessLevel.GameMaster || mob == Sheriff);
}
public bool IsFinance(Mobile mob)
{
- if (mob == null || mob.Deleted)
- return false;
-
- return mob.AccessLevel >= AccessLevel.GameMaster || mob == Finance;
+ return mob?.Deleted == false &&
+ (mob.AccessLevel >= AccessLevel.GameMaster || mob == Finance);
}
public void Capture(Faction f)
@@ -511,4 +502,4 @@ namespace Server.Factions
}
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Factions/Gumps/ElectionGump.cs b/Scripts/Engines/Factions/Gumps/ElectionGump.cs
index e708adc3e..227c4b442 100644
--- a/Scripts/Engines/Factions/Gumps/ElectionGump.cs
+++ b/Scripts/Engines/Factions/Gumps/ElectionGump.cs
@@ -31,16 +31,16 @@ namespace Server.Factions
TimeSpan toGo = election.LastStateTime + Election.PendingPeriod - DateTime.UtcNow;
int days = (int)(toGo.TotalDays + 0.5);
- AddHtmlLocalized(20, 40, 380, 20, 1038034, false, false); // A new election campaign is pending
+ AddHtmlLocalized(20, 40, 380, 20, 1038034); // A new election campaign is pending
if (days > 0)
{
- AddHtmlLocalized(20, 60, 280, 20, 1018062, false, false); // Days until next election :
+ AddHtmlLocalized(20, 60, 280, 20, 1018062); // Days until next election :
AddLabel(300, 60, 0, days.ToString());
}
else
{
- AddHtmlLocalized(20, 60, 280, 20, 1018059, false, false); // Election campaigning begins tonight.
+ AddHtmlLocalized(20, 60, 280, 20, 1018059); // Election campaigning begins tonight.
}
break;
@@ -50,31 +50,29 @@ namespace Server.Factions
TimeSpan toGo = election.LastStateTime + Election.CampaignPeriod - DateTime.UtcNow;
int days = (int)(toGo.TotalDays + 0.5);
- AddHtmlLocalized(20, 40, 380, 20, 1018058, false, false); // There is an election campaign in progress.
+ AddHtmlLocalized(20, 40, 380, 20, 1018058); // There is an election campaign in progress.
if (days > 0)
{
- AddHtmlLocalized(20, 60, 280, 20, 1038033, false, false); // Days to go:
+ AddHtmlLocalized(20, 60, 280, 20, 1038033); // Days to go:
AddLabel(300, 60, 0, days.ToString());
}
else
{
- AddHtmlLocalized(20, 60, 280, 20, 1018061, false,
- false); // Campaign in progress. Voting begins tonight.
+ AddHtmlLocalized(20, 60, 280, 20, 1018061); // Campaign in progress. Voting begins tonight.
}
if (m_Election.CanBeCandidate(m_From))
{
- AddButton(20, 110, 4005, 4007, 2, GumpButtonType.Reply, 0);
- AddHtmlLocalized(55, 110, 350, 20, 1011427, false, false); // CAMPAIGN FOR LEADERSHIP
+ AddButton(20, 110, 4005, 4007, 2);
+ AddHtmlLocalized(55, 110, 350, 20, 1011427); // CAMPAIGN FOR LEADERSHIP
}
else
{
PlayerState pl = PlayerState.Find(m_From);
if (pl == null || pl.Rank.Rank < Election.CandidateRank)
- AddHtmlLocalized(20, 100, 380, 20, 1010118, false,
- false); // You must have a higher rank to run for office
+ AddHtmlLocalized(20, 100, 380, 20, 1010118); // You must have a higher rank to run for office
}
break;
@@ -84,20 +82,20 @@ namespace Server.Factions
TimeSpan toGo = election.LastStateTime + Election.VotingPeriod - DateTime.UtcNow;
int days = (int)Math.Ceiling(toGo.TotalDays);
- AddHtmlLocalized(20, 40, 380, 20, 1018060, false, false); // There is an election vote in progress.
+ AddHtmlLocalized(20, 40, 380, 20, 1018060); // There is an election vote in progress.
- AddHtmlLocalized(20, 60, 280, 20, 1038033, false, false);
+ AddHtmlLocalized(20, 60, 280, 20, 1038033);
AddLabel(300, 60, 0, days.ToString());
- AddHtmlLocalized(55, 100, 380, 20, 1011428, false, false); // VOTE FOR LEADERSHIP
- AddButton(20, 100, 4005, 4007, 1, GumpButtonType.Reply, 0);
+ AddHtmlLocalized(55, 100, 380, 20, 1011428); // VOTE FOR LEADERSHIP
+ AddButton(20, 100, 4005, 4007, 1);
break;
}
}
- AddButton(20, 140, 4005, 4007, 0, GumpButtonType.Reply, 0);
- AddHtmlLocalized(55, 140, 350, 20, 1011012, false, false); // CANCEL
+ AddButton(20, 140, 4005, 4007, 0);
+ AddHtmlLocalized(55, 140, 350, 20, 1011012); // CANCEL
}
public override void OnResponse(NetState sender, RelayInfo info)
@@ -126,4 +124,4 @@ namespace Server.Factions
}
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Factions/Gumps/ElectionManagementGump.cs b/Scripts/Engines/Factions/Gumps/ElectionManagementGump.cs
index e4f0071dd..d0028826f 100644
--- a/Scripts/Engines/Factions/Gumps/ElectionManagementGump.cs
+++ b/Scripts/Engines/Factions/Gumps/ElectionManagementGump.cs
@@ -13,11 +13,7 @@ namespace Server.Factions
private Election m_Election;
private int m_Page;
- public ElectionManagementGump(Election election) : this(election, null, 0)
- {
- }
-
- public ElectionManagementGump(Election election, Candidate candidate, int page) : base(40, 40)
+ public ElectionManagementGump(Election election, Candidate candidate = null, int page = 0) : base(40, 40)
{
m_Election = election;
m_Candidate = candidate;
@@ -30,40 +26,39 @@ namespace Server.Factions
AddBackground(0, 0, 448, 354, 9270);
AddAlphaRegion(10, 10, 428, 334);
- AddHtml(10, 10, 428, 20, Color(Center("Candidate Management"), LabelColor), false, false);
+ AddHtml(10, 10, 428, 20, Color(Center("Candidate Management"), LabelColor));
- AddHtml(45, 35, 100, 20, Color("Player Name:", LabelColor), false, false);
- AddHtml(145, 35, 100, 20, Color(candidate.Mobile == null ? "null" : candidate.Mobile.Name, LabelColor),
- false, false);
+ AddHtml(45, 35, 100, 20, Color("Player Name:", LabelColor));
+ AddHtml(145, 35, 100, 20, Color(candidate.Mobile == null ? "null" : candidate.Mobile.Name, LabelColor));
- AddHtml(45, 55, 100, 20, Color("Vote Count:", LabelColor), false, false);
- AddHtml(145, 55, 100, 20, Color(candidate.Votes.ToString(), LabelColor), false, false);
+ AddHtml(45, 55, 100, 20, Color("Vote Count:", LabelColor));
+ AddHtml(145, 55, 100, 20, Color(candidate.Votes.ToString(), LabelColor));
- AddButton(12, 73, 4005, 4007, 1, GumpButtonType.Reply, 0);
- AddHtml(45, 75, 100, 20, Color("Drop Candidate", LabelColor), false, false);
+ AddButton(12, 73, 4005, 4007, 1);
+ AddHtml(45, 75, 100, 20, Color("Drop Candidate", LabelColor));
AddImageTiled(13, 99, 422, 242, 9264);
AddImageTiled(14, 100, 420, 240, 9274);
AddAlphaRegion(14, 100, 420, 240);
- AddHtml(14, 100, 420, 20, Color(Center("Voters"), LabelColor), false, false);
+ AddHtml(14, 100, 420, 20, Color(Center("Voters"), LabelColor));
if (page > 0)
- AddButton(397, 104, 0x15E3, 0x15E7, 2, GumpButtonType.Reply, 0);
+ AddButton(397, 104, 0x15E3, 0x15E7, 2);
else
AddImage(397, 104, 0x25EA);
if ((page + 1) * 10 < candidate.Voters.Count)
- AddButton(414, 104, 0x15E1, 0x15E5, 3, GumpButtonType.Reply, 0);
+ AddButton(414, 104, 0x15E1, 0x15E5, 3);
else
AddImage(414, 104, 0x25E6);
- AddHtml(14, 120, 30, 20, Color(Center("DEL"), LabelColor), false, false);
- AddHtml(47, 120, 150, 20, Color("Name", LabelColor), false, false);
- AddHtml(195, 120, 100, 20, Color(Center("Address"), LabelColor), false, false);
- AddHtml(295, 120, 80, 20, Color(Center("Time"), LabelColor), false, false);
- AddHtml(355, 120, 60, 20, Color(Center("Legit"), LabelColor), false, false);
+ AddHtml(14, 120, 30, 20, Color(Center("DEL"), LabelColor));
+ AddHtml(47, 120, 150, 20, Color("Name", LabelColor));
+ AddHtml(195, 120, 100, 20, Color(Center("Address"), LabelColor));
+ AddHtml(295, 120, 80, 20, Color(Center("Time"), LabelColor));
+ AddHtml(355, 120, 60, 20, Color(Center("Legit"), LabelColor));
int idx = 0;
@@ -71,7 +66,7 @@ namespace Server.Factions
{
Voter voter = candidate.Voters[i];
- AddButton(13, 138 + idx * 20, 4002, 4004, 4 + i, GumpButtonType.Reply, 0);
+ AddButton(13, 138 + idx * 20, 4002, 4004, 4 + i);
object[] fields = voter.AcquireFields();
@@ -83,23 +78,23 @@ namespace Server.Factions
if (obj is Mobile mobile)
{
- AddHtml(x + 2, 140 + idx * 20, 150, 20, Color(mobile.Name, LabelColor), false, false);
+ AddHtml(x + 2, 140 + idx * 20, 150, 20, Color(mobile.Name, LabelColor));
x += 150;
}
else if (obj is IPAddress)
{
- AddHtml(x, 140 + idx * 20, 100, 20, Color(Center(obj.ToString()), LabelColor), false, false);
+ AddHtml(x, 140 + idx * 20, 100, 20, Color(Center(obj.ToString()), LabelColor));
x += 100;
}
else if (obj is DateTime time)
{
AddHtml(x, 140 + idx * 20, 80, 20,
- Color(Center(FormatTimeSpan(time - election.LastStateTime)), LabelColor), false, false);
+ Color(Center(FormatTimeSpan(time - election.LastStateTime)), LabelColor));
x += 80;
}
else if (obj is int i1)
{
- AddHtml(x, 140 + idx * 20, 60, 20, Color(Center(i1 + "%"), LabelColor), false, false);
+ AddHtml(x, 140 + idx * 20, 60, 20, Color(Center(i1 + "%"), LabelColor));
x += 60;
}
}
@@ -110,23 +105,23 @@ namespace Server.Factions
AddBackground(0, 0, 288, 334, 9270);
AddAlphaRegion(10, 10, 268, 314);
- AddHtml(10, 10, 268, 20, Color(Center("Election Management"), LabelColor), false, false);
+ AddHtml(10, 10, 268, 20, Color(Center("Election Management"), LabelColor));
- AddHtml(45, 35, 100, 20, Color("Current State:", LabelColor), false, false);
- AddHtml(145, 35, 100, 20, Color(election.State.ToString(), LabelColor), false, false);
+ AddHtml(45, 35, 100, 20, Color("Current State:", LabelColor));
+ AddHtml(145, 35, 100, 20, Color(election.State.ToString(), LabelColor));
- AddButton(12, 53, 4005, 4007, 1, GumpButtonType.Reply, 0);
- AddHtml(45, 55, 100, 20, Color("Transition Time:", LabelColor), false, false);
- AddHtml(145, 55, 100, 20, Color(FormatTimeSpan(election.NextStateTime), LabelColor), false, false);
+ AddButton(12, 53, 4005, 4007, 1);
+ AddHtml(45, 55, 100, 20, Color("Transition Time:", LabelColor));
+ AddHtml(145, 55, 100, 20, Color(FormatTimeSpan(election.NextStateTime), LabelColor));
AddImageTiled(13, 79, 262, 242, 9264);
AddImageTiled(14, 80, 260, 240, 9274);
AddAlphaRegion(14, 80, 260, 240);
- AddHtml(14, 80, 260, 20, Color(Center("Candidates"), LabelColor), false, false);
- AddHtml(14, 100, 30, 20, Color(Center("-->"), LabelColor), false, false);
- AddHtml(47, 100, 150, 20, Color("Name", LabelColor), false, false);
- AddHtml(195, 100, 80, 20, Color(Center("Votes"), LabelColor), false, false);
+ AddHtml(14, 80, 260, 20, Color(Center("Candidates"), LabelColor));
+ AddHtml(14, 100, 30, 20, Color(Center("-->"), LabelColor));
+ AddHtml(47, 100, 150, 20, Color("Name", LabelColor));
+ AddHtml(195, 100, 80, 20, Color(Center("Votes"), LabelColor));
for (int i = 0; i < election.Candidates.Count; ++i)
{
@@ -136,9 +131,9 @@ namespace Server.Factions
if (mob == null)
continue;
- AddButton(13, 118 + i * 20, 4005, 4007, 2 + i, GumpButtonType.Reply, 0);
- AddHtml(47, 120 + i * 20, 150, 20, Color(mob.Name, LabelColor), false, false);
- AddHtml(195, 120 + i * 20, 80, 20, Color(Center(cd.Votes.ToString()), LabelColor), false, false);
+ AddButton(13, 118 + i * 20, 4005, 4007, 2 + i);
+ AddHtml(47, 120 + i * 20, 150, 20, Color(mob.Name, LabelColor));
+ AddHtml(195, 120 + i * 20, 80, 20, Color(Center(cd.Votes.ToString()), LabelColor));
}
}
}
@@ -181,7 +176,7 @@ namespace Server.Factions
bid -= 2;
if (bid >= 0 && bid < m_Election.Candidates.Count)
- from.SendGump(new ElectionManagementGump(m_Election, m_Election.Candidates[bid], 0));
+ from.SendGump(new ElectionManagementGump(m_Election, m_Election.Candidates[bid]));
}
}
else
@@ -216,4 +211,4 @@ namespace Server.Factions
}
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Factions/Gumps/FactionGump.cs b/Scripts/Engines/Factions/Gumps/FactionGump.cs
index 4a9911614..0ac6e7b64 100644
--- a/Scripts/Engines/Factions/Gumps/FactionGump.cs
+++ b/Scripts/Engines/Factions/Gumps/FactionGump.cs
@@ -37,10 +37,10 @@ namespace Server.Factions
public void AddHtmlText(int x, int y, int width, int height, TextDefinition text, bool back, bool scroll)
{
- if (text != null && text.Number > 0)
+ if (text?.Number > 0)
AddHtmlLocalized(x, y, width, height, text.Number, back, scroll);
else if (text?.String != null)
AddHtml(x, y, width, height, text.String, back, scroll);
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Factions/Gumps/FactionImbueGump.cs b/Scripts/Engines/Factions/Gumps/FactionImbueGump.cs
index d712520e6..8627dfb5a 100644
--- a/Scripts/Engines/Factions/Gumps/FactionImbueGump.cs
+++ b/Scripts/Engines/Factions/Gumps/FactionImbueGump.cs
@@ -32,33 +32,33 @@ namespace Server.Factions
AddBackground(0, 0, 320, 270, 5054);
AddBackground(10, 10, 300, 250, 3000);
- AddHtmlLocalized(20, 20, 210, 25, 1011569, false, false); // Imbue with Faction properties?
+ AddHtmlLocalized(20, 20, 210, 25, 1011569); // Imbue with Faction properties?
- AddHtmlLocalized(20, 60, 170, 25, 1018302, false, false); // Item quality:
- AddHtmlLocalized(175, 60, 100, 25, 1018305 - quality, false, false); // Exceptional, Average, Low
+ AddHtmlLocalized(20, 60, 170, 25, 1018302); // Item quality:
+ AddHtmlLocalized(175, 60, 100, 25, 1018305 - quality); // Exceptional, Average, Low
- AddHtmlLocalized(20, 80, 170, 25, 1011572, false, false); // Item Cost :
+ AddHtmlLocalized(20, 80, 170, 25, 1011572); // Item Cost :
AddLabel(175, 80, 0x34, def.SilverCost.ToString("N0")); // NOTE: Added 'N0'
- AddHtmlLocalized(20, 100, 170, 25, 1011573, false, false); // Your Silver :
+ AddHtmlLocalized(20, 100, 170, 25, 1011573); // Your Silver :
AddLabel(175, 100, 0x34, availableSilver.ToString("N0")); // NOTE: Added 'N0'
AddRadio(20, 140, 210, 211, true, 1);
AddLabel(55, 140, m_Faction.Definition.HuePrimary - 1, "*****");
- AddHtmlLocalized(150, 140, 150, 25, 1011570, false, false); // Primary Color
+ AddHtmlLocalized(150, 140, 150, 25, 1011570); // Primary Color
AddRadio(20, 160, 210, 211, false, 2);
AddLabel(55, 160, m_Faction.Definition.HueSecondary - 1, "*****");
- AddHtmlLocalized(150, 160, 150, 25, 1011571, false, false); // Secondary Color
+ AddHtmlLocalized(150, 160, 150, 25, 1011571); // Secondary Color
- AddHtmlLocalized(55, 200, 200, 25, 1011011, false, false); // CONTINUE
- AddButton(20, 200, 4005, 4007, 1, GumpButtonType.Reply, 0);
+ AddHtmlLocalized(55, 200, 200, 25, 1011011); // CONTINUE
+ AddButton(20, 200, 4005, 4007, 1);
- AddHtmlLocalized(55, 230, 200, 25, 1011012, false, false); // CANCEL
- AddButton(20, 230, 4005, 4007, 0, GumpButtonType.Reply, 0);
+ AddHtmlLocalized(55, 230, 200, 25, 1011012); // CANCEL
+ AddButton(20, 230, 4005, 4007, 0);
}
public override void OnResponse(NetState sender, RelayInfo info)
@@ -89,7 +89,7 @@ namespace Server.Factions
}
}
- if (m_Tool != null && !m_Tool.Deleted && m_Tool.UsesRemaining > 0)
+ if (m_Tool?.Deleted == false && m_Tool.UsesRemaining > 0)
m_Mobile.SendGump(new CraftGump(m_Mobile, m_CraftSystem, m_Tool, m_Notice));
else if (m_Notice is string s)
m_Mobile.SendMessage(s);
@@ -97,4 +97,4 @@ namespace Server.Factions
m_Mobile.SendLocalizedMessage(i);
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Factions/Gumps/FactionStoneGump.cs b/Scripts/Engines/Factions/Gumps/FactionStoneGump.cs
index 410ffc868..8ef7087f4 100644
--- a/Scripts/Engines/Factions/Gumps/FactionStoneGump.cs
+++ b/Scripts/Engines/Factions/Gumps/FactionStoneGump.cs
@@ -26,25 +26,25 @@ namespace Server.Factions
AddHtmlText(20, 30, 510, 20, faction.Definition.Header, false, false);
- AddHtmlLocalized(20, 60, 100, 20, 1011429, false, false); // Led By :
- AddHtml(125, 60, 200, 20, faction.Commander != null ? faction.Commander.Name : "Nobody", false, false);
+ AddHtmlLocalized(20, 60, 100, 20, 1011429); // Led By :
+ AddHtml(125, 60, 200, 20, faction.Commander != null ? faction.Commander.Name : "Nobody");
- AddHtmlLocalized(20, 80, 100, 20, 1011457, false, false); // Tithe rate :
+ AddHtmlLocalized(20, 80, 100, 20, 1011457); // Tithe rate :
if (faction.Tithe >= 0 && faction.Tithe <= 100 && faction.Tithe % 10 == 0)
- AddHtmlLocalized(125, 80, 350, 20, 1011480 + faction.Tithe / 10, false, false);
+ AddHtmlLocalized(125, 80, 350, 20, 1011480 + faction.Tithe / 10);
else
- AddHtml(125, 80, 350, 20, faction.Tithe + "%", false, false);
+ AddHtml(125, 80, 350, 20, faction.Tithe + "%");
- AddHtmlLocalized(20, 100, 100, 20, 1011458, false, false); // Traps placed :
- AddHtml(125, 100, 50, 20, faction.Traps.Count.ToString(), false, false);
+ AddHtmlLocalized(20, 100, 100, 20, 1011458); // Traps placed :
+ AddHtml(125, 100, 50, 20, faction.Traps.Count.ToString());
- AddHtmlLocalized(55, 225, 200, 20, 1011428, false, false); // VOTE FOR LEADERSHIP
- AddButton(20, 225, 4005, 4007, ToButtonID(0, 0), GumpButtonType.Reply, 0);
+ AddHtmlLocalized(55, 225, 200, 20, 1011428); // VOTE FOR LEADERSHIP
+ AddButton(20, 225, 4005, 4007, ToButtonID(0, 0));
- AddHtmlLocalized(55, 150, 100, 20, 1011430, false, false); // CITY STATUS
+ AddHtmlLocalized(55, 150, 100, 20, 1011430); // CITY STATUS
AddButton(20, 150, 4005, 4007, 0, GumpButtonType.Page, 2);
- AddHtmlLocalized(55, 175, 100, 20, 1011444, false, false); // STATISTICS
+ AddHtmlLocalized(55, 175, 100, 20, 1011444); // STATISTICS
AddButton(20, 175, 4005, 4007, 0, GumpButtonType.Page, 4);
bool isMerchantQualified = MerchantTitles.HasMerchantQualifications(from);
@@ -53,31 +53,31 @@ namespace Server.Factions
if (pl != null && pl.MerchantTitle != MerchantTitle.None)
{
- AddHtmlLocalized(55, 200, 250, 20, 1011460, false, false); // UNDECLARE FACTION MERCHANT
- AddButton(20, 200, 4005, 4007, ToButtonID(1, 0), GumpButtonType.Reply, 0);
+ AddHtmlLocalized(55, 200, 250, 20, 1011460); // UNDECLARE FACTION MERCHANT
+ AddButton(20, 200, 4005, 4007, ToButtonID(1, 0));
}
else if (isMerchantQualified)
{
- AddHtmlLocalized(55, 200, 250, 20, 1011459, false, false); // DECLARE FACTION MERCHANT
+ AddHtmlLocalized(55, 200, 250, 20, 1011459); // DECLARE FACTION MERCHANT
AddButton(20, 200, 4005, 4007, 0, GumpButtonType.Page, 5);
}
else
{
- AddHtmlLocalized(55, 200, 250, 20, 1011467, false, false); // MERCHANT OPTIONS
+ AddHtmlLocalized(55, 200, 250, 20, 1011467); // MERCHANT OPTIONS
AddImage(20, 200, 4020);
}
- AddHtmlLocalized(55, 250, 300, 20, 1011461, false, false); // COMMANDER OPTIONS
+ AddHtmlLocalized(55, 250, 300, 20, 1011461); // COMMANDER OPTIONS
if (faction.IsCommander(from))
AddButton(20, 250, 4005, 4007, 0, GumpButtonType.Page, 6);
else
AddImage(20, 250, 4020);
- AddHtmlLocalized(55, 275, 300, 20, 1011426, false, false); // LEAVE THIS FACTION
- AddButton(20, 275, 4005, 4007, ToButtonID(0, 1), GumpButtonType.Reply, 0);
+ AddHtmlLocalized(55, 275, 300, 20, 1011426); // LEAVE THIS FACTION
+ AddButton(20, 275, 4005, 4007, ToButtonID(0, 1));
- AddHtmlLocalized(55, 300, 200, 20, 1011441, false, false); // EXIT
- AddButton(20, 300, 4005, 4007, 0, GumpButtonType.Reply, 0);
+ AddHtmlLocalized(55, 300, 200, 20, 1011441); // EXIT
+ AddButton(20, 300, 4005, 4007, 0);
#endregion
@@ -85,7 +85,7 @@ namespace Server.Factions
AddPage(2);
- AddHtmlLocalized(20, 30, 250, 20, 1011430, false, false); // CITY STATUS
+ AddHtmlLocalized(20, 30, 250, 20, 1011430); // CITY STATUS
List towns = Town.Towns;
@@ -97,11 +97,11 @@ namespace Server.Factions
if (town.Owner == null)
{
- AddHtmlLocalized(200, 55 + i * 30, 150, 20, 1011462, false, false); // : Neutral
+ AddHtmlLocalized(200, 55 + i * 30, 150, 20, 1011462); // : Neutral
}
else
{
- AddHtmlLocalized(200, 55 + i * 30, 150, 20, town.Owner.Definition.OwnerLabel, false, false);
+ AddHtmlLocalized(200, 55 + i * 30, 150, 20, town.Owner.Definition.OwnerLabel);
BaseMonolith monolith = town.Monolith;
@@ -111,12 +111,12 @@ namespace Server.Factions
AddImage(20, 300, 2361);
- AddHtmlLocalized(45, 295, 300, 20, 1011491, false, false); // sigil may be recaptured
+ AddHtmlLocalized(45, 295, 300, 20, 1011491); // sigil may be recaptured
AddImage(20, 320, 2360);
- AddHtmlLocalized(45, 315, 300, 20, 1011492, false, false); // sigil may not be recaptured
+ AddHtmlLocalized(45, 315, 300, 20, 1011492); // sigil may not be recaptured
- AddHtmlLocalized(55, 350, 100, 20, 1011447, false, false); // BACK
+ AddHtmlLocalized(55, 350, 100, 20, 1011447); // BACK
AddButton(20, 350, 4005, 4007, 0, GumpButtonType.Page, 1);
#endregion
@@ -125,18 +125,18 @@ namespace Server.Factions
AddPage(4);
- AddHtmlLocalized(20, 30, 150, 20, 1011444, false, false); // STATISTICS
+ AddHtmlLocalized(20, 30, 150, 20, 1011444); // STATISTICS
- AddHtmlLocalized(20, 100, 100, 20, 1011445, false, false); // Name :
- AddHtml(120, 100, 150, 20, from.Name, false, false);
+ AddHtmlLocalized(20, 100, 100, 20, 1011445); // Name :
+ AddHtml(120, 100, 150, 20, from.Name);
- AddHtmlLocalized(20, 130, 100, 20, 1018064, false, false); // score :
- AddHtml(120, 130, 100, 20, (pl?.KillPoints ?? 0).ToString(), false, false);
+ AddHtmlLocalized(20, 130, 100, 20, 1018064); // score :
+ AddHtml(120, 130, 100, 20, (pl?.KillPoints ?? 0).ToString());
- AddHtmlLocalized(20, 160, 100, 20, 1011446, false, false); // Rank :
- AddHtml(120, 160, 100, 20, (pl?.Rank.Rank ?? 0).ToString(), false, false);
+ AddHtmlLocalized(20, 160, 100, 20, 1011446); // Rank :
+ AddHtml(120, 160, 100, 20, (pl?.Rank.Rank ?? 0).ToString());
- AddHtmlLocalized(55, 250, 100, 20, 1011447, false, false); // BACK
+ AddHtmlLocalized(55, 250, 100, 20, 1011447); // BACK
AddButton(20, 250, 4005, 4007, 0, GumpButtonType.Page, 1);
#endregion
@@ -147,9 +147,9 @@ namespace Server.Factions
{
AddPage(5);
- AddHtmlLocalized(20, 30, 250, 20, 1011467, false, false); // MERCHANT OPTIONS
+ AddHtmlLocalized(20, 30, 250, 20, 1011467); // MERCHANT OPTIONS
- AddHtmlLocalized(20, 80, 300, 20, 1011473, false, false); // Select the title you wish to display
+ AddHtmlLocalized(20, 80, 300, 20, 1011473); // Select the title you wish to display
MerchantTitleInfo[] infos = MerchantTitles.Info;
@@ -158,14 +158,14 @@ namespace Server.Factions
MerchantTitleInfo info = infos[i];
if (MerchantTitles.IsQualified(from, info))
- AddButton(20, 100 + i * 30, 4005, 4007, ToButtonID(1, i + 1), GumpButtonType.Reply, 0);
+ AddButton(20, 100 + i * 30, 4005, 4007, ToButtonID(1, i + 1));
else
AddImage(20, 100 + i * 30, 4020);
AddHtmlText(55, 100 + i * 30, 200, 20, info.Label, false, false);
}
- AddHtmlLocalized(55, 340, 100, 20, 1011447, false, false); // BACK
+ AddHtmlLocalized(55, 340, 100, 20, 1011447); // BACK
AddButton(20, 340, 4005, 4007, 0, GumpButtonType.Page, 1);
}
@@ -179,27 +179,27 @@ namespace Server.Factions
AddPage(6);
- AddHtmlLocalized(20, 30, 200, 20, 1011461, false, false); // COMMANDER OPTIONS
+ AddHtmlLocalized(20, 30, 200, 20, 1011461); // COMMANDER OPTIONS
- AddHtmlLocalized(20, 70, 120, 20, 1011457, false, false); // Tithe rate :
+ AddHtmlLocalized(20, 70, 120, 20, 1011457); // Tithe rate :
if (faction.Tithe >= 0 && faction.Tithe <= 100 && faction.Tithe % 10 == 0)
- AddHtmlLocalized(140, 70, 250, 20, 1011480 + faction.Tithe / 10, false, false);
+ AddHtmlLocalized(140, 70, 250, 20, 1011480 + faction.Tithe / 10);
else
- AddHtml(140, 70, 250, 20, faction.Tithe + "%", false, false);
+ AddHtml(140, 70, 250, 20, faction.Tithe + "%");
- AddHtmlLocalized(20, 100, 120, 20, 1011474, false, false); // Silver available :
- AddHtml(140, 100, 50, 20, faction.Silver.ToString("N0"), false, false); // NOTE: Added 'N0' formatting
+ AddHtmlLocalized(20, 100, 120, 20, 1011474); // Silver available :
+ AddHtml(140, 100, 50, 20, faction.Silver.ToString("N0")); // NOTE: Added 'N0' formatting
- AddHtmlLocalized(55, 130, 200, 20, 1011478, false, false); // CHANGE TITHE RATE
+ AddHtmlLocalized(55, 130, 200, 20, 1011478); // CHANGE TITHE RATE
AddButton(20, 130, 4005, 4007, 0, GumpButtonType.Page, 8);
- AddHtmlLocalized(55, 160, 200, 20, 1018301, false, false); // TRANSFER SILVER
+ AddHtmlLocalized(55, 160, 200, 20, 1018301); // TRANSFER SILVER
if (faction.Silver >= 10000)
AddButton(20, 160, 4005, 4007, 0, GumpButtonType.Page, 7);
else
AddImage(20, 160, 4020);
- AddHtmlLocalized(55, 310, 100, 20, 1011447, false, false); // BACK
+ AddHtmlLocalized(55, 310, 100, 20, 1011447); // BACK
AddButton(20, 310, 4005, 4007, 0, GumpButtonType.Page, 1);
#endregion
@@ -210,9 +210,9 @@ namespace Server.Factions
{
AddPage(7);
- AddHtmlLocalized(20, 30, 250, 20, 1011476, false, false); // TOWN FINANCE
+ AddHtmlLocalized(20, 30, 250, 20, 1011476); // TOWN FINANCE
- AddHtmlLocalized(20, 50, 400, 20, 1011477, false, false); // Select a town to transfer 10000 silver to
+ AddHtmlLocalized(20, 50, 400, 20, 1011477); // Select a town to transfer 10000 silver to
for (int i = 0; i < towns.Count; ++i)
{
@@ -221,12 +221,12 @@ namespace Server.Factions
AddHtmlText(55, 75 + i * 30, 200, 20, town.Definition.TownName, false, false);
if (town.Owner == faction)
- AddButton(20, 75 + i * 30, 4005, 4007, ToButtonID(2, i), GumpButtonType.Reply, 0);
+ AddButton(20, 75 + i * 30, 4005, 4007, ToButtonID(2, i));
else
AddImage(20, 75 + i * 30, 4020);
}
- AddHtmlLocalized(55, 310, 100, 20, 1011447, false, false); // BACK
+ AddHtmlLocalized(55, 310, 100, 20, 1011447); // BACK
AddButton(20, 310, 4005, 4007, 0, GumpButtonType.Page, 1);
}
@@ -236,7 +236,7 @@ namespace Server.Factions
AddPage(8);
- AddHtmlLocalized(20, 30, 400, 20, 1011479, false, false); // Select the % for the new tithe rate
+ AddHtmlLocalized(20, 30, 400, 20, 1011479); // Select the % for the new tithe rate
int y = 55;
@@ -245,8 +245,8 @@ namespace Server.Factions
if (i == 5)
y += 5;
- AddHtmlLocalized(55, y, 300, 20, 1011480 + i, false, false);
- AddButton(20, y, 4005, 4007, ToButtonID(3, i), GumpButtonType.Reply, 0);
+ AddHtmlLocalized(55, y, 300, 20, 1011480 + i);
+ AddButton(20, y, 4005, 4007, ToButtonID(3, i));
y += 20;
@@ -254,7 +254,7 @@ namespace Server.Factions
y += 5;
}
- AddHtmlLocalized(55, 310, 300, 20, 1011447, false, false); // BACK
+ AddHtmlLocalized(55, 310, 300, 20, 1011447); // BACK
AddButton(20, 310, 4005, 4007, 0, GumpButtonType.Page, 1);
#endregion
@@ -354,4 +354,4 @@ namespace Server.Factions
}
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Factions/Gumps/FinanceGump.cs b/Scripts/Engines/Factions/Gumps/FinanceGump.cs
index 8b37c80c2..a4ac3201f 100644
--- a/Scripts/Engines/Factions/Gumps/FinanceGump.cs
+++ b/Scripts/Engines/Factions/Gumps/FinanceGump.cs
@@ -35,20 +35,20 @@ namespace Server.Factions
AddPage(1);
- AddHtmlLocalized(20, 30, 260, 25, 1011541, false, false); // FINANCE MINISTER
+ AddHtmlLocalized(20, 30, 260, 25, 1011541); // FINANCE MINISTER
- AddHtmlLocalized(55, 90, 200, 25, 1011539, false, false); // CHANGE PRICES
+ AddHtmlLocalized(55, 90, 200, 25, 1011539); // CHANGE PRICES
AddButton(20, 90, 4005, 4007, 0, GumpButtonType.Page, 2);
- AddHtmlLocalized(55, 120, 200, 25, 1011540, false, false); // BUY SHOPKEEPERS
+ AddHtmlLocalized(55, 120, 200, 25, 1011540); // BUY SHOPKEEPERS
AddButton(20, 120, 4005, 4007, 0, GumpButtonType.Page, 3);
- AddHtmlLocalized(55, 150, 200, 25, 1011495, false, false); // VIEW FINANCES
+ AddHtmlLocalized(55, 150, 200, 25, 1011495); // VIEW FINANCES
AddButton(20, 150, 4005, 4007, 0, GumpButtonType.Page, 4);
- AddHtmlLocalized(55, 360, 200, 25, 1011441, false, false); // EXIT
- AddButton(20, 360, 4005, 4007, 0, GumpButtonType.Reply, 0);
+ AddHtmlLocalized(55, 360, 200, 25, 1011441); // EXIT
+ AddButton(20, 360, 4005, 4007, 0);
#endregion
@@ -56,7 +56,7 @@ namespace Server.Factions
AddPage(2);
- AddHtmlLocalized(20, 30, 200, 25, 1011539, false, false); // CHANGE PRICES
+ AddHtmlLocalized(20, 30, 200, 25, 1011539); // CHANGE PRICES
for (int i = 0; i < m_PriceOffsets.Length; ++i)
{
@@ -74,12 +74,12 @@ namespace Server.Factions
}
AddRadio(20, 270, 208, 209, town.Tax == 0, 0);
- AddHtmlLocalized(55, 270, 90, 25, 1011542, false, false); // normal
+ AddHtmlLocalized(55, 270, 90, 25, 1011542); // normal
- AddHtmlLocalized(55, 330, 200, 25, 1011509, false, false); // Set Prices
- AddButton(20, 330, 4005, 4007, ToButtonID(0, 0), GumpButtonType.Reply, 0);
+ AddHtmlLocalized(55, 330, 200, 25, 1011509); // Set Prices
+ AddButton(20, 330, 4005, 4007, ToButtonID(0, 0));
- AddHtmlLocalized(55, 360, 200, 25, 1011067, false, false); // Previous page
+ AddHtmlLocalized(55, 360, 200, 25, 1011067); // Previous page
AddButton(20, 360, 4005, 4007, 0, GumpButtonType.Page, 1);
#endregion
@@ -88,7 +88,7 @@ namespace Server.Factions
AddPage(3);
- AddHtmlLocalized(20, 30, 200, 25, 1011540, false, false); // BUY SHOPKEEPERS
+ AddHtmlLocalized(20, 30, 200, 25, 1011540); // BUY SHOPKEEPERS
List vendorLists = town.VendorLists;
@@ -101,7 +101,7 @@ namespace Server.Factions
AddHtmlText(100, 90 + i * 40, 200, 25, list.Definition.Label, false, false);
}
- AddHtmlLocalized(55, 360, 200, 25, 1011067, false, false); // Previous page
+ AddHtmlLocalized(55, 360, 200, 25, 1011067); // Previous page
AddButton(20, 360, 4005, 4007, 0, GumpButtonType.Page, 1);
#endregion
@@ -116,24 +116,24 @@ namespace Server.Factions
int netCashFlow = town.NetCashFlow;
- AddHtmlLocalized(20, 30, 300, 25, 1011524, false, false); // FINANCE STATEMENT
+ AddHtmlLocalized(20, 30, 300, 25, 1011524); // FINANCE STATEMENT
- AddHtmlLocalized(20, 80, 300, 25, 1011538, false, false); // Current total money for town :
+ AddHtmlLocalized(20, 80, 300, 25, 1011538); // Current total money for town :
AddLabel(20, 100, 0x44, town.Silver.ToString());
- AddHtmlLocalized(20, 130, 300, 25, 1011520, false, false); // Finance Minister Upkeep :
+ AddHtmlLocalized(20, 130, 300, 25, 1011520); // Finance Minister Upkeep :
AddLabel(20, 150, 0x44, financeUpkeep.ToString("N0")); // NOTE: Added 'N0'
- AddHtmlLocalized(20, 180, 300, 25, 1011521, false, false); // Sheriff Upkeep :
+ AddHtmlLocalized(20, 180, 300, 25, 1011521); // Sheriff Upkeep :
AddLabel(20, 200, 0x44, sheriffUpkeep.ToString("N0")); // NOTE: Added 'N0'
- AddHtmlLocalized(20, 230, 300, 25, 1011522, false, false); // Town Income :
+ AddHtmlLocalized(20, 230, 300, 25, 1011522); // Town Income :
AddLabel(20, 250, 0x44, dailyIncome.ToString("N0")); // NOTE: Added 'N0'
- AddHtmlLocalized(20, 280, 300, 25, 1011523, false, false); // Net Cash flow per day :
+ AddHtmlLocalized(20, 280, 300, 25, 1011523); // Net Cash flow per day :
AddLabel(20, 300, 0x44, netCashFlow.ToString("N0")); // NOTE: Added 'N0'
- AddHtmlLocalized(55, 360, 200, 25, 1011067, false, false); // Previous page
+ AddHtmlLocalized(55, 360, 200, 25, 1011067); // Previous page
AddButton(20, 360, 4005, 4007, 0, GumpButtonType.Page, 1);
#endregion
@@ -149,31 +149,31 @@ namespace Server.Factions
AddHtmlText(60, 30, 300, 25, vendorList.Definition.Header, false, false);
AddItem(20, 30, vendorList.Definition.ItemID);
- AddHtmlLocalized(20, 90, 200, 25, 1011514, false, false); // You have :
+ AddHtmlLocalized(20, 90, 200, 25, 1011514); // You have :
AddLabel(230, 90, 0x26, vendorList.Vendors.Count.ToString());
- AddHtmlLocalized(20, 120, 200, 25, 1011515, false, false); // Maximum :
+ AddHtmlLocalized(20, 120, 200, 25, 1011515); // Maximum :
AddLabel(230, 120, 0x256, vendorList.Definition.Maximum.ToString());
- AddHtmlLocalized(20, 150, 200, 25, 1011516, false, false); // Cost :
+ AddHtmlLocalized(20, 150, 200, 25, 1011516); // Cost :
AddLabel(230, 150, 0x44, vendorList.Definition.Price.ToString("N0")); // NOTE: Added 'N0'
- AddHtmlLocalized(20, 180, 200, 25, 1011517, false, false); // Daily Pay :
+ AddHtmlLocalized(20, 180, 200, 25, 1011517); // Daily Pay :
AddLabel(230, 180, 0x37, vendorList.Definition.Upkeep.ToString("N0")); // NOTE: Added 'N0'
- AddHtmlLocalized(20, 210, 200, 25, 1011518, false, false); // Current Silver :
+ AddHtmlLocalized(20, 210, 200, 25, 1011518); // Current Silver :
AddLabel(230, 210, 0x44, town.Silver.ToString("N0")); // NOTE: Added 'N0'
- AddHtmlLocalized(20, 240, 200, 25, 1011519, false, false); // Current Payroll :
+ AddHtmlLocalized(20, 240, 200, 25, 1011519); // Current Payroll :
AddLabel(230, 240, 0x44, financeUpkeep.ToString("N0")); // NOTE: Added 'N0'
AddHtmlText(55, 300, 200, 25, vendorList.Definition.Label, false, false);
if (town.Silver >= vendorList.Definition.Price)
- AddButton(20, 300, 4005, 4007, ToButtonID(1, i), GumpButtonType.Reply, 0);
+ AddButton(20, 300, 4005, 4007, ToButtonID(1, i));
else
AddImage(20, 300, 4020);
- AddHtmlLocalized(55, 360, 200, 25, 1011067, false, false); // Previous page
+ AddHtmlLocalized(55, 360, 200, 25, 1011067); // Previous page
AddButton(20, 360, 4005, 4007, 0, GumpButtonType.Page, 3);
}
@@ -289,4 +289,4 @@ namespace Server.Factions
}
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Factions/Gumps/HorseBreederGump.cs b/Scripts/Engines/Factions/Gumps/HorseBreederGump.cs
index 513fb6001..97aedfca3 100644
--- a/Scripts/Engines/Factions/Gumps/HorseBreederGump.cs
+++ b/Scripts/Engines/Factions/Gumps/HorseBreederGump.cs
@@ -22,7 +22,7 @@ namespace Server.Factions
AddHtmlText(20, 30, 300, 25, faction.Definition.Header, false, false);
- AddHtmlLocalized(20, 60, 300, 25, 1018306, false, false); // Purchase a Faction War Horse
+ AddHtmlLocalized(20, 60, 300, 25, 1018306); // Purchase a Faction War Horse
AddItem(70, 120, 0x3FFE);
AddItem(150, 120, 0xEF2);
@@ -31,11 +31,11 @@ namespace Server.Factions
AddItem(150, 150, 0xEEF);
AddLabel(190, 152, 0x3E3, FactionWarHorse.GoldPrice.ToString("N0")); // NOTE: Added 'N0'
- AddHtmlLocalized(55, 210, 200, 25, 1011011, false, false); // CONTINUE
- AddButton(20, 210, 4005, 4007, 1, GumpButtonType.Reply, 0);
+ AddHtmlLocalized(55, 210, 200, 25, 1011011); // CONTINUE
+ AddButton(20, 210, 4005, 4007, 1);
- AddHtmlLocalized(55, 240, 200, 25, 1011012, false, false); // CANCEL
- AddButton(20, 240, 4005, 4007, 0, GumpButtonType.Reply, 0);
+ AddHtmlLocalized(55, 240, 200, 25, 1011012); // CANCEL
+ AddButton(20, 240, 4005, 4007, 0);
}
public override void OnResponse(NetState sender, RelayInfo info)
@@ -88,4 +88,4 @@ namespace Server.Factions
}
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Factions/Gumps/JoinStoneGump.cs b/Scripts/Engines/Factions/Gumps/JoinStoneGump.cs
index c53811756..96874dd37 100644
--- a/Scripts/Engines/Factions/Gumps/JoinStoneGump.cs
+++ b/Scripts/Engines/Factions/Gumps/JoinStoneGump.cs
@@ -24,21 +24,21 @@ namespace Server.Factions
AddHtmlText(20, 130, 510, 100, faction.Definition.About, true, true);
- AddHtmlLocalized(20, 60, 100, 20, 1011429, false, false); // Led By :
- AddHtml(125, 60, 200, 20, faction.Commander != null ? faction.Commander.Name : "Nobody", false, false);
+ AddHtmlLocalized(20, 60, 100, 20, 1011429); // Led By :
+ AddHtml(125, 60, 200, 20, faction.Commander != null ? faction.Commander.Name : "Nobody");
- AddHtmlLocalized(20, 80, 100, 20, 1011457, false, false); // Tithe rate :
+ AddHtmlLocalized(20, 80, 100, 20, 1011457); // Tithe rate :
if (faction.Tithe >= 0 && faction.Tithe <= 100 && faction.Tithe % 10 == 0)
- AddHtmlLocalized(125, 80, 350, 20, 1011480 + faction.Tithe / 10, false, false);
+ AddHtmlLocalized(125, 80, 350, 20, 1011480 + faction.Tithe / 10);
else
- AddHtml(125, 80, 350, 20, faction.Tithe + "%", false, false);
+ AddHtml(125, 80, 350, 20, faction.Tithe + "%");
- AddButton(20, 400, 4005, 4007, 1, GumpButtonType.Reply, 0);
- AddHtmlLocalized(55, 400, 200, 20, 1011425, false, false); // JOIN THIS FACTION
+ AddButton(20, 400, 4005, 4007, 1);
+ AddHtmlLocalized(55, 400, 200, 20, 1011425); // JOIN THIS FACTION
- AddButton(300, 400, 4005, 4007, 0, GumpButtonType.Reply, 0);
- AddHtmlLocalized(335, 400, 200, 20, 1011012, false, false); // CANCEL
+ AddButton(300, 400, 4005, 4007, 0);
+ AddHtmlLocalized(335, 400, 200, 20, 1011012); // CANCEL
}
public override void OnResponse(NetState sender, RelayInfo info)
@@ -47,4 +47,4 @@ namespace Server.Factions
m_Faction.OnJoinAccepted(m_From);
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Factions/Gumps/LeaveFactionGump.cs b/Scripts/Engines/Factions/Gumps/LeaveFactionGump.cs
index db5d67b56..5c3ac78b7 100644
--- a/Scripts/Engines/Factions/Gumps/LeaveFactionGump.cs
+++ b/Scripts/Engines/Factions/Gumps/LeaveFactionGump.cs
@@ -25,11 +25,11 @@ namespace Server.Factions
else
AddHtmlLocalized(20, 15, 230, 60, 1018063, true, true); // Are you sure you want to leave this faction?
- AddHtmlLocalized(55, 80, 75, 20, 1011011, false, false); // CONTINUE
- AddButton(20, 80, 4005, 4007, 1, GumpButtonType.Reply, 0);
+ AddHtmlLocalized(55, 80, 75, 20, 1011011); // CONTINUE
+ AddButton(20, 80, 4005, 4007, 1);
- AddHtmlLocalized(170, 80, 75, 20, 1011012, false, false); // CANCEL
- AddButton(135, 80, 4005, 4007, 2, GumpButtonType.Reply, 0);
+ AddHtmlLocalized(170, 80, 75, 20, 1011012); // CANCEL
+ AddButton(135, 80, 4005, 4007, 2);
}
public override void OnResponse(NetState sender, RelayInfo info)
@@ -90,4 +90,4 @@ namespace Server.Factions
}
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Factions/Gumps/SheriffGump.cs b/Scripts/Engines/Factions/Gumps/SheriffGump.cs
index ec8131e6e..0eaa77a09 100644
--- a/Scripts/Engines/Factions/Gumps/SheriffGump.cs
+++ b/Scripts/Engines/Factions/Gumps/SheriffGump.cs
@@ -28,16 +28,16 @@ namespace Server.Factions
AddPage(1);
- AddHtmlLocalized(20, 30, 260, 25, 1011431, false, false); // Sheriff
+ AddHtmlLocalized(20, 30, 260, 25, 1011431); // Sheriff
- AddHtmlLocalized(55, 90, 200, 25, 1011494, false, false); // HIRE GUARDS
+ AddHtmlLocalized(55, 90, 200, 25, 1011494); // HIRE GUARDS
AddButton(20, 90, 4005, 4007, 0, GumpButtonType.Page, 3);
- AddHtmlLocalized(55, 120, 200, 25, 1011495, false, false); // VIEW FINANCES
+ AddHtmlLocalized(55, 120, 200, 25, 1011495); // VIEW FINANCES
AddButton(20, 120, 4005, 4007, 0, GumpButtonType.Page, 2);
- AddHtmlLocalized(55, 360, 200, 25, 1011441, false, false); // Exit
- AddButton(20, 360, 4005, 4007, 0, GumpButtonType.Reply, 0);
+ AddHtmlLocalized(55, 360, 200, 25, 1011441); // Exit
+ AddButton(20, 360, 4005, 4007, 0);
#endregion
@@ -50,24 +50,24 @@ namespace Server.Factions
int dailyIncome = town.DailyIncome;
int netCashFlow = town.NetCashFlow;
- AddHtmlLocalized(20, 30, 300, 25, 1011524, false, false); // FINANCE STATEMENT
+ AddHtmlLocalized(20, 30, 300, 25, 1011524); // FINANCE STATEMENT
- AddHtmlLocalized(20, 80, 300, 25, 1011538, false, false); // Current total money for town :
+ AddHtmlLocalized(20, 80, 300, 25, 1011538); // Current total money for town :
AddLabel(20, 100, 0x44, town.Silver.ToString("N0")); // NOTE: Added 'N0'
- AddHtmlLocalized(20, 130, 300, 25, 1011520, false, false); // Finance Minister Upkeep :
+ AddHtmlLocalized(20, 130, 300, 25, 1011520); // Finance Minister Upkeep :
AddLabel(20, 150, 0x44, financeUpkeep.ToString("N0")); // NOTE: Added 'N0'
- AddHtmlLocalized(20, 180, 300, 25, 1011521, false, false); // Sheriff Upkeep :
+ AddHtmlLocalized(20, 180, 300, 25, 1011521); // Sheriff Upkeep :
AddLabel(20, 200, 0x44, sheriffUpkeep.ToString("N0")); // NOTE: Added 'N0'
- AddHtmlLocalized(20, 230, 300, 25, 1011522, false, false); // Town Income :
+ AddHtmlLocalized(20, 230, 300, 25, 1011522); // Town Income :
AddLabel(20, 250, 0x44, dailyIncome.ToString("N0")); // NOTE: Added 'N0'
- AddHtmlLocalized(20, 280, 300, 25, 1011523, false, false); // Net Cash flow per day :
+ AddHtmlLocalized(20, 280, 300, 25, 1011523); // Net Cash flow per day :
AddLabel(20, 300, 0x44, netCashFlow.ToString("N0")); // NOTE: Added 'N0'
- AddHtmlLocalized(55, 360, 200, 25, 1011067, false, false); // Previous page
+ AddHtmlLocalized(55, 360, 200, 25, 1011067); // Previous page
AddButton(20, 360, 4005, 4007, 0, GumpButtonType.Page, 1);
#endregion
@@ -76,7 +76,7 @@ namespace Server.Factions
AddPage(3);
- AddHtmlLocalized(20, 30, 300, 25, 1011494, false, false); // HIRE GUARDS
+ AddHtmlLocalized(20, 30, 300, 25, 1011494); // HIRE GUARDS
List guardLists = town.GuardLists;
@@ -90,7 +90,7 @@ namespace Server.Factions
AddHtmlText(120, y, 200, 25, guardList.Definition.Header, false, false);
}
- AddHtmlLocalized(55, 360, 200, 25, 1011067, false, false); // Previous page
+ AddHtmlLocalized(55, 360, 200, 25, 1011067); // Previous page
AddButton(20, 360, 4005, 4007, 0, GumpButtonType.Page, 1);
#endregion
@@ -106,28 +106,28 @@ namespace Server.Factions
AddHtmlText(90, 30, 300, 25, guardList.Definition.Header, false, false);
CenterItem(guardList.Definition.ItemID, 10, 10, 80, 80);
- AddHtmlLocalized(20, 90, 200, 25, 1011514, false, false); // You have :
+ AddHtmlLocalized(20, 90, 200, 25, 1011514); // You have :
AddLabel(230, 90, 0x26, guardList.Guards.Count.ToString());
- AddHtmlLocalized(20, 120, 200, 25, 1011515, false, false); // Maximum :
+ AddHtmlLocalized(20, 120, 200, 25, 1011515); // Maximum :
AddLabel(230, 120, 0x12A, guardList.Definition.Maximum.ToString());
- AddHtmlLocalized(20, 150, 200, 25, 1011516, false, false); // Cost :
+ AddHtmlLocalized(20, 150, 200, 25, 1011516); // Cost :
AddLabel(230, 150, 0x44, guardList.Definition.Price.ToString("N0")); // NOTE: Added 'N0'
- AddHtmlLocalized(20, 180, 200, 25, 1011517, false, false); // Daily Pay :
+ AddHtmlLocalized(20, 180, 200, 25, 1011517); // Daily Pay :
AddLabel(230, 180, 0x37, guardList.Definition.Upkeep.ToString("N0")); // NOTE: Added 'N0'
- AddHtmlLocalized(20, 210, 200, 25, 1011518, false, false); // Current Silver :
+ AddHtmlLocalized(20, 210, 200, 25, 1011518); // Current Silver :
AddLabel(230, 210, 0x44, town.Silver.ToString("N0")); // NOTE: Added 'N0'
- AddHtmlLocalized(20, 240, 200, 25, 1011519, false, false); // Current Payroll :
+ AddHtmlLocalized(20, 240, 200, 25, 1011519); // Current Payroll :
AddLabel(230, 240, 0x44, sheriffUpkeep.ToString("N0")); // NOTE: Added 'N0'
AddHtmlText(55, 300, 200, 25, guardList.Definition.Label, false, false);
- AddButton(20, 300, 4005, 4007, 1 + i, GumpButtonType.Reply, 0);
+ AddButton(20, 300, 4005, 4007, 1 + i);
- AddHtmlLocalized(55, 360, 200, 25, 1011067, false, false); // Previous page
+ AddHtmlLocalized(55, 360, 200, 25, 1011067); // Previous page
AddButton(20, 360, 4005, 4007, 0, GumpButtonType.Page, 3);
}
@@ -185,4 +185,4 @@ namespace Server.Factions
}
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Factions/Gumps/TownStoneGump.cs b/Scripts/Engines/Factions/Gumps/TownStoneGump.cs
index 2e78f0c41..ddae02bb0 100644
--- a/Scripts/Engines/Factions/Gumps/TownStoneGump.cs
+++ b/Scripts/Engines/Factions/Gumps/TownStoneGump.cs
@@ -24,20 +24,20 @@ namespace Server.Factions
AddHtmlText(25, 30, 250, 25, town.Definition.TownStoneHeader, false, false);
- AddHtmlLocalized(55, 60, 150, 25, 1011557, false, false); // Hire Sheriff
- AddButton(20, 60, 4005, 4007, 1, GumpButtonType.Reply, 0);
+ AddHtmlLocalized(55, 60, 150, 25, 1011557); // Hire Sheriff
+ AddButton(20, 60, 4005, 4007, 1);
- AddHtmlLocalized(55, 90, 150, 25, 1011559, false, false); // Hire Finance Minister
- AddButton(20, 90, 4005, 4007, 2, GumpButtonType.Reply, 0);
+ AddHtmlLocalized(55, 90, 150, 25, 1011559); // Hire Finance Minister
+ AddButton(20, 90, 4005, 4007, 2);
- AddHtmlLocalized(55, 120, 150, 25, 1011558, false, false); // Fire Sheriff
- AddButton(20, 120, 4005, 4007, 3, GumpButtonType.Reply, 0);
+ AddHtmlLocalized(55, 120, 150, 25, 1011558); // Fire Sheriff
+ AddButton(20, 120, 4005, 4007, 3);
- AddHtmlLocalized(55, 150, 150, 25, 1011560, false, false); // Fire Finance Minister
- AddButton(20, 150, 4005, 4007, 4, GumpButtonType.Reply, 0);
+ AddHtmlLocalized(55, 150, 150, 25, 1011560); // Fire Finance Minister
+ AddButton(20, 150, 4005, 4007, 4);
- AddHtmlLocalized(55, 210, 150, 25, 1011441, false, false); // EXIT
- AddButton(20, 210, 4005, 4007, 0, GumpButtonType.Reply, 0);
+ AddHtmlLocalized(55, 210, 150, 25, 1011441); // EXIT
+ AddButton(20, 210, 4005, 4007, 0);
}
public override void OnResponse(NetState sender, RelayInfo info)
@@ -201,4 +201,4 @@ namespace Server.Factions
}
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Factions/Gumps/VoteGump.cs b/Scripts/Engines/Factions/Gumps/VoteGump.cs
index fbe278890..98a697b06 100644
--- a/Scripts/Engines/Factions/Gumps/VoteGump.cs
+++ b/Scripts/Engines/Factions/Gumps/VoteGump.cs
@@ -24,23 +24,23 @@ namespace Server.Factions
AddHtmlText(20, 20, 380, 20, election.Faction.Definition.Header, false, false);
if (canVote)
- AddHtmlLocalized(20, 60, 380, 20, 1011428, false, false); // VOTE FOR LEADERSHIP
+ AddHtmlLocalized(20, 60, 380, 20, 1011428); // VOTE FOR LEADERSHIP
else
- AddHtmlLocalized(20, 60, 380, 20, 1038032, false, false); // You have already voted in this election.
+ AddHtmlLocalized(20, 60, 380, 20, 1038032); // You have already voted in this election.
for (int i = 0; i < election.Candidates.Count; ++i)
{
Candidate cd = election.Candidates[i];
if (canVote)
- AddButton(20, 100 + i * 20, 4005, 4007, i + 1, GumpButtonType.Reply, 0);
+ AddButton(20, 100 + i * 20, 4005, 4007, i + 1);
AddLabel(55, 100 + i * 20, 0, cd.Mobile.Name);
AddLabel(300, 100 + i * 20, 0, cd.Votes.ToString());
}
- AddButton(20, 310, 4005, 4007, 0, GumpButtonType.Reply, 0);
- AddHtmlLocalized(55, 310, 100, 20, 1011012, false, false); // CANCEL
+ AddButton(20, 310, 4005, 4007, 0);
+ AddHtmlLocalized(55, 310, 100, 20, 1011012); // CANCEL
}
public override void OnResponse(NetState sender, RelayInfo info)
@@ -63,4 +63,4 @@ namespace Server.Factions
}
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Factions/Items/BaseMonolith.cs b/Scripts/Engines/Factions/Items/BaseMonolith.cs
index 9675b421c..2ccb9e2e9 100644
--- a/Scripts/Engines/Factions/Items/BaseMonolith.cs
+++ b/Scripts/Engines/Factions/Items/BaseMonolith.cs
@@ -8,7 +8,7 @@ namespace Server.Factions
private Sigil m_Sigil;
private Town m_Town;
- public BaseMonolith(Town town, Faction faction) : base(0x1183)
+ public BaseMonolith(Town town = null, Faction faction = null) : base(0x1183)
{
Movable = false;
Town = town;
@@ -80,7 +80,7 @@ namespace Server.Factions
public virtual void UpdateSigil()
{
- if (m_Sigil == null || m_Sigil.Deleted)
+ if (m_Sigil?.Deleted != false)
return;
m_Sigil.MoveToWorld(new Point3D(X, Y, Z + 18), Map);
@@ -126,4 +126,4 @@ namespace Server.Factions
}
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Factions/Items/FactionStone.cs b/Scripts/Engines/Factions/Items/FactionStone.cs
index aeecf5014..0881ba539 100644
--- a/Scripts/Engines/Factions/Items/FactionStone.cs
+++ b/Scripts/Engines/Factions/Items/FactionStone.cs
@@ -8,12 +8,7 @@ namespace Server.Factions
private Faction m_Faction;
[Constructible]
- public FactionStone() : this(null)
- {
- }
-
- [Constructible]
- public FactionStone(Faction faction) : base(0xEDC)
+ public FactionStone(Faction faction = null) : base(0xEDC)
{
Movable = false;
Faction = faction;
@@ -101,4 +96,4 @@ namespace Server.Factions
}
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Factions/Items/JoinStone.cs b/Scripts/Engines/Factions/Items/JoinStone.cs
index 3a29610fb..98baa22b7 100644
--- a/Scripts/Engines/Factions/Items/JoinStone.cs
+++ b/Scripts/Engines/Factions/Items/JoinStone.cs
@@ -8,12 +8,7 @@ namespace Server.Factions
private Faction m_Faction;
[Constructible]
- public JoinStone() : this(null)
- {
- }
-
- [Constructible]
- public JoinStone(Faction faction) : base(0xEDC)
+ public JoinStone(Faction faction = null) : base(0xEDC)
{
Movable = false;
Faction = faction;
@@ -76,4 +71,4 @@ namespace Server.Factions
}
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Factions/Items/Power Faction Items/StormsEye.cs b/Scripts/Engines/Factions/Items/Power Faction Items/StormsEye.cs
index d41c93929..87da13935 100644
--- a/Scripts/Engines/Factions/Items/Power Faction Items/StormsEye.cs
+++ b/Scripts/Engines/Factions/Items/Power Faction Items/StormsEye.cs
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
+using System.Linq;
using Server.Factions;
using Server.Spells;
using Server.Targeting;
@@ -34,64 +35,61 @@ namespace Server
Point3D origin = new Point3D(pt);
Map facet = from.Map;
- if (facet != null && facet.CanFit(pt.X, pt.Y, pt.Z, 16, false, false))
- {
- Movable = false;
+ if (facet?.CanFit(pt.X, pt.Y, pt.Z, 16, false, false) != true)
+ return;
- Effects.SendMovingEffect(
- from, new Entity(Serial.Zero, origin, facet),
- ItemID & 0x3FFF, 7, 0, false, false, Hue - 1
+ Movable = false;
+
+ Effects.SendMovingEffect(
+ from, new Entity(Serial.Zero, origin, facet),
+ ItemID & 0x3FFF, 7, 0, false, false, Hue - 1
+ );
+
+ Timer.DelayCall(TimeSpan.FromSeconds(0.5), delegate
+ {
+ Delete();
+
+ Effects.PlaySound(origin, facet, 530);
+ Effects.PlaySound(origin, facet, 263);
+
+ Effects.SendLocationEffect(
+ origin, facet,
+ 14284, 96, 1, 0, 2
);
- Timer.DelayCall(TimeSpan.FromSeconds(0.5), delegate
+ Timer.DelayCall(TimeSpan.FromSeconds(1.0), delegate
{
- Delete();
+ List targets = facet.GetMobilesInRange(origin, 12).Where(mob =>
+ from.CanBeHarmful(mob, false) && mob.InLOS(new Point3D(origin, origin.Z + 1)) &&
+ Faction.Find(mob) != null).ToList();
- Effects.PlaySound(origin, facet, 530);
- Effects.PlaySound(origin, facet, 263);
-
- Effects.SendLocationEffect(
- origin, facet,
- 14284, 96, 1, 0, 2
- );
-
- Timer.DelayCall(TimeSpan.FromSeconds(1.0), delegate
+ foreach (Mobile mob in targets)
{
- List targets = new List();
+ int damage = mob.Hits * 6 / 10;
- foreach (Mobile mob in facet.GetMobilesInRange(origin, 12))
- if (from.CanBeHarmful(mob, false) &&
- mob.InLOS(new Point3D(origin, origin.Z + 1)))
- if (Faction.Find(mob) != null)
- targets.Add(mob);
+ if (!mob.Player && damage < 10)
+ damage = 10;
+ else if (damage > 75)
+ damage = 75;
- foreach (Mobile mob in targets)
- {
- int damage = mob.Hits * 6 / 10;
+ Effects.SendMovingEffect(
+ new Entity(Serial.Zero, new Point3D(origin, origin.Z + 4), facet), mob,
+ 14068, 1, 32, false, false, 1111, 2
+ );
- if (!mob.Player && damage < 10)
- damage = 10;
- else if (damage > 75) damage = 75;
+ from.DoHarmful(mob);
- Effects.SendMovingEffect(
- new Entity(Serial.Zero, new Point3D(origin, origin.Z + 4), facet), mob,
- 14068, 1, 32, false, false, 1111, 2
- );
+ SpellHelper.Damage(TimeSpan.FromSeconds(0.50), mob, from, damage / 3.0, 0, 0, 0, 0,
+ 100);
+ SpellHelper.Damage(TimeSpan.FromSeconds(0.70), mob, from, damage / 3.0, 0, 0, 0, 0,
+ 100);
+ SpellHelper.Damage(TimeSpan.FromSeconds(1.00), mob, from, damage / 3.0, 0, 0, 0, 0,
+ 100);
- from.DoHarmful(mob);
-
- SpellHelper.Damage(TimeSpan.FromSeconds(0.50), mob, from, damage / 3.0, 0, 0, 0, 0,
- 100);
- SpellHelper.Damage(TimeSpan.FromSeconds(0.70), mob, from, damage / 3.0, 0, 0, 0, 0,
- 100);
- SpellHelper.Damage(TimeSpan.FromSeconds(1.00), mob, from, damage / 3.0, 0, 0, 0, 0,
- 100);
-
- Timer.DelayCall(TimeSpan.FromSeconds(0.50), delegate { mob.PlaySound(0x1FB); });
- }
- });
+ Timer.DelayCall(TimeSpan.FromSeconds(0.50), delegate { mob.PlaySound(0x1FB); });
+ }
});
- }
+ });
}
});
@@ -112,4 +110,4 @@ namespace Server
int version = reader.ReadEncodedInt();
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Factions/Items/Power Faction Items/UrnOfAscension.cs b/Scripts/Engines/Factions/Items/Power Faction Items/UrnOfAscension.cs
index e66bebb8e..4033462ba 100644
--- a/Scripts/Engines/Factions/Items/Power Faction Items/UrnOfAscension.cs
+++ b/Scripts/Engines/Factions/Items/Power Faction Items/UrnOfAscension.cs
@@ -36,7 +36,7 @@ namespace Server
{
Faction.ClearSkillLoss(mob);
- mob.SendGump(new ResurrectGump(mob, from, ResurrectMessage.Generic));
+ mob.SendGump(new ResurrectGump(mob, from));
used = true;
}
}
diff --git a/Scripts/Engines/Factions/Items/Sigil.cs b/Scripts/Engines/Factions/Items/Sigil.cs
index 916ab3be2..18a8d9bc9 100644
--- a/Scripts/Engines/Factions/Items/Sigil.cs
+++ b/Scripts/Engines/Factions/Items/Sigil.cs
@@ -181,7 +181,7 @@ namespace Server.Factions
return false;
}
- private Mobile FindOwner(object parent)
+ private Mobile FindOwner(IEntity parent)
{
if (parent is Item item)
return item.RootParent as Mobile;
@@ -425,10 +425,10 @@ namespace Server.Factions
if (monolith == null && m_Town != null)
monolith = m_Town.Monolith;
- if (monolith != null && !monolith.Deleted)
+ if (monolith?.Deleted == false)
monolith.Sigil = this;
- return monolith != null && !monolith.Deleted;
+ return monolith?.Deleted == false;
}
public override void OnParentDeleted(IEntity parent)
@@ -453,4 +453,4 @@ namespace Server.Factions
base.Delete();
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Factions/Items/StrongholdMonolith.cs b/Scripts/Engines/Factions/Items/StrongholdMonolith.cs
index 5ac5edd1d..782f821cc 100644
--- a/Scripts/Engines/Factions/Items/StrongholdMonolith.cs
+++ b/Scripts/Engines/Factions/Items/StrongholdMonolith.cs
@@ -2,12 +2,9 @@ namespace Server.Factions
{
public class StrongholdMonolith : BaseMonolith
{
- public StrongholdMonolith() : this(null, null)
+ public StrongholdMonolith(Town town = null, Faction faction = null) : base(town, faction)
{
- }
- public StrongholdMonolith(Town town, Faction faction) : base(town, faction)
- {
}
public StrongholdMonolith(Serial serial) : base(serial)
@@ -35,4 +32,4 @@ namespace Server.Factions
int version = reader.ReadInt();
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Factions/Items/TownMonolith.cs b/Scripts/Engines/Factions/Items/TownMonolith.cs
index 83b7a95c2..feb670beb 100644
--- a/Scripts/Engines/Factions/Items/TownMonolith.cs
+++ b/Scripts/Engines/Factions/Items/TownMonolith.cs
@@ -2,11 +2,7 @@ namespace Server.Factions
{
public class TownMonolith : BaseMonolith
{
- public TownMonolith() : this(null)
- {
- }
-
- public TownMonolith(Town town) : base(town, null)
+ public TownMonolith(Town town = null) : base(town)
{
}
@@ -35,4 +31,4 @@ namespace Server.Factions
int version = reader.ReadInt();
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Factions/Items/TownStone.cs b/Scripts/Engines/Factions/Items/TownStone.cs
index 31f47229f..ab7ba5600 100644
--- a/Scripts/Engines/Factions/Items/TownStone.cs
+++ b/Scripts/Engines/Factions/Items/TownStone.cs
@@ -7,12 +7,7 @@ namespace Server.Factions
private Town m_Town;
[Constructible]
- public TownStone() : this(null)
- {
- }
-
- [Constructible]
- public TownStone(Town town) : base(0xEDE)
+ public TownStone(Town town = null) : base(0xEDE)
{
Movable = false;
Town = town;
@@ -81,4 +76,4 @@ namespace Server.Factions
}
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Factions/Items/Traps/BaseFactionTrap.cs b/Scripts/Engines/Factions/Items/Traps/BaseFactionTrap.cs
index c9f5f25be..405998579 100644
--- a/Scripts/Engines/Factions/Items/Traps/BaseFactionTrap.cs
+++ b/Scripts/Engines/Factions/Items/Traps/BaseFactionTrap.cs
@@ -80,7 +80,7 @@ namespace Server.Factions
{
PlayerState victimState = PlayerState.Find(from);
- if (victimState != null && victimState.CanGiveSilverTo(Placer) && victimState.KillPoints > 0)
+ if (victimState?.CanGiveSilverTo(Placer) == true && victimState.KillPoints > 0)
{
int silverGiven = Faction.AwardSilver(Placer, silverToAward);
@@ -236,7 +236,7 @@ namespace Server.Factions
public override void OnDelete()
{
- if (Faction != null && Faction.Traps.Contains(this))
+ if (Faction?.Traps.Contains(this) == true)
Faction.Traps.Remove(this);
base.OnDelete();
@@ -261,4 +261,4 @@ namespace Server.Factions
return faction != Faction;
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Factions/Items/Traps/BaseFactionTrapDeed.cs b/Scripts/Engines/Factions/Items/Traps/BaseFactionTrapDeed.cs
index 254a55fe9..06646e33e 100644
--- a/Scripts/Engines/Factions/Items/Traps/BaseFactionTrapDeed.cs
+++ b/Scripts/Engines/Factions/Items/Traps/BaseFactionTrapDeed.cs
@@ -8,16 +8,12 @@ namespace Server.Factions
{
private Faction m_Faction;
- public BaseFactionTrapDeed(int itemID) : base(itemID)
+ public BaseFactionTrapDeed(int itemID= 0x14F0) : base(itemID)
{
Weight = 1.0;
LootType = LootType.Blessed;
}
- public BaseFactionTrapDeed(bool createdFromDeed) : this(0x14F0)
- {
- }
-
public BaseFactionTrapDeed(Serial serial) : base(serial)
{
}
@@ -120,4 +116,4 @@ namespace Server.Factions
m_Faction = Faction.ReadReference(reader);
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Factions/Items/Traps/FactionExplosionTrap.cs b/Scripts/Engines/Factions/Items/Traps/FactionExplosionTrap.cs
index bcb193df5..920e5fa72 100644
--- a/Scripts/Engines/Factions/Items/Traps/FactionExplosionTrap.cs
+++ b/Scripts/Engines/Factions/Items/Traps/FactionExplosionTrap.cs
@@ -4,16 +4,7 @@ namespace Server.Factions
{
public class FactionExplosionTrap : BaseFactionTrap
{
- [Constructible]
- public FactionExplosionTrap() : this(null)
- {
- }
-
- public FactionExplosionTrap(Faction f) : this(f, null)
- {
- }
-
- public FactionExplosionTrap(Faction f, Mobile m) : base(f, m, 0x11C1)
+ public FactionExplosionTrap(Faction f = null, Mobile m = null) : base(f, m, 0x11C1)
{
}
@@ -81,4 +72,4 @@ namespace Server.Factions
int version = reader.ReadInt();
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Factions/Items/Traps/FactionGasTrap.cs b/Scripts/Engines/Factions/Items/Traps/FactionGasTrap.cs
index 8a8fdcfc4..ea8602e1a 100644
--- a/Scripts/Engines/Factions/Items/Traps/FactionGasTrap.cs
+++ b/Scripts/Engines/Factions/Items/Traps/FactionGasTrap.cs
@@ -4,16 +4,7 @@ namespace Server.Factions
{
public class FactionGasTrap : BaseFactionTrap
{
- [Constructible]
- public FactionGasTrap() : this(null)
- {
- }
-
- public FactionGasTrap(Faction f) : this(f, null)
- {
- }
-
- public FactionGasTrap(Faction f, Mobile m) : base(f, m, 0x113C)
+ public FactionGasTrap(Faction f = null, Mobile m = null) : base(f, m, 0x113C)
{
}
@@ -81,4 +72,4 @@ namespace Server.Factions
int version = reader.ReadInt();
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Factions/Items/Traps/FactionSawTrap.cs b/Scripts/Engines/Factions/Items/Traps/FactionSawTrap.cs
index 376652372..6432656ff 100644
--- a/Scripts/Engines/Factions/Items/Traps/FactionSawTrap.cs
+++ b/Scripts/Engines/Factions/Items/Traps/FactionSawTrap.cs
@@ -4,20 +4,7 @@ namespace Server.Factions
{
public class FactionSawTrap : BaseFactionTrap
{
- [Constructible]
- public FactionSawTrap() : this(null)
- {
- }
-
- public FactionSawTrap(Serial serial) : base(serial)
- {
- }
-
- public FactionSawTrap(Faction f) : this(f, null)
- {
- }
-
- public FactionSawTrap(Faction f, Mobile m) : base(f, m, 0x11AC)
+ public FactionSawTrap(Faction f = null, Mobile m = null) : base(f, m, 0x11AC)
{
}
@@ -81,4 +68,4 @@ namespace Server.Factions
int version = reader.ReadInt();
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Factions/Items/Traps/FactionSpikeTrap.cs b/Scripts/Engines/Factions/Items/Traps/FactionSpikeTrap.cs
index 530d6df22..47303e819 100644
--- a/Scripts/Engines/Factions/Items/Traps/FactionSpikeTrap.cs
+++ b/Scripts/Engines/Factions/Items/Traps/FactionSpikeTrap.cs
@@ -4,16 +4,7 @@ namespace Server.Factions
{
public class FactionSpikeTrap : BaseFactionTrap
{
- [Constructible]
- public FactionSpikeTrap() : this(null)
- {
- }
-
- public FactionSpikeTrap(Faction f) : this(f, null)
- {
- }
-
- public FactionSpikeTrap(Faction f, Mobile m) : base(f, m, 0x11A0)
+ public FactionSpikeTrap(Faction f = null, Mobile m = null) : base(f, m, 0x11A0)
{
}
@@ -84,4 +75,4 @@ namespace Server.Factions
int version = reader.ReadInt();
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Factions/Mobiles/FactionWarHorse.cs b/Scripts/Engines/Factions/Mobiles/FactionWarHorse.cs
index aa26edf01..ab9acc150 100644
--- a/Scripts/Engines/Factions/Mobiles/FactionWarHorse.cs
+++ b/Scripts/Engines/Factions/Mobiles/FactionWarHorse.cs
@@ -8,13 +8,8 @@ namespace Server.Factions
public const int GoldPrice = 3000;
private Faction m_Faction;
- [Constructible]
- public FactionWarHorse() : this(null)
- {
- }
-
- public FactionWarHorse(Faction faction) : base("a war horse", 0xE2, 0x3EA0, AIType.AI_Melee, FightMode.Aggressor, 10,
- 1, 0.2, 0.4)
+ public FactionWarHorse(Faction faction = null)
+ : base("a war horse", 0xE2, 0x3EA0, AIType.AI_Melee, FightMode.Aggressor, 10, 1, 0.2, 0.4)
{
BaseSoundID = 0xA8;
@@ -109,4 +104,4 @@ namespace Server.Factions
}
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Factions/Mobiles/Guards/BaseFactionGuard.cs b/Scripts/Engines/Factions/Mobiles/Guards/BaseFactionGuard.cs
index 4282e7223..a69d30cf1 100644
--- a/Scripts/Engines/Factions/Mobiles/Guards/BaseFactionGuard.cs
+++ b/Scripts/Engines/Factions/Mobiles/Guards/BaseFactionGuard.cs
@@ -241,68 +241,68 @@ namespace Server.Factions
}
else if (DateTime.UtcNow < m_OrdersEnd)
{
- if (m_Town != null && m_Town.IsSheriff(from) && Town.FromRegion(Region) == m_Town)
+ if (m_Town?.IsSheriff(from) != true || Town.FromRegion(Region) != m_Town)
+ return;
+
+ m_OrdersEnd = DateTime.UtcNow + TimeSpan.FromSeconds(10.0);
+
+ bool understood = true;
+ ReactionType newType = 0;
+
+ if (Insensitive.Contains(e.Speech, "attack"))
+ newType = ReactionType.Attack;
+ else if (Insensitive.Contains(e.Speech, "warn"))
+ newType = ReactionType.Warn;
+ else if (Insensitive.Contains(e.Speech, "ignore"))
+ newType = ReactionType.Ignore;
+ else
+ understood = false;
+
+ if (understood)
{
- m_OrdersEnd = DateTime.UtcNow + TimeSpan.FromSeconds(10.0);
+ understood = false;
- bool understood = true;
- ReactionType newType = 0;
-
- if (Insensitive.Contains(e.Speech, "attack"))
- newType = ReactionType.Attack;
- else if (Insensitive.Contains(e.Speech, "warn"))
- newType = ReactionType.Warn;
- else if (Insensitive.Contains(e.Speech, "ignore"))
- newType = ReactionType.Ignore;
- else
- understood = false;
-
- if (understood)
+ if (Insensitive.Contains(e.Speech, "civil"))
{
- understood = false;
+ ChangeReaction(null, newType);
+ understood = true;
+ }
- if (Insensitive.Contains(e.Speech, "civil"))
+ List factions = Faction.Factions;
+
+ for (int i = 0; i < factions.Count; ++i)
+ {
+ Faction faction = factions[i];
+
+ if (faction != m_Faction && Insensitive.Contains(e.Speech, faction.Definition.Keyword))
{
- ChangeReaction(null, newType);
+ ChangeReaction(faction, newType);
understood = true;
}
-
- List factions = Faction.Factions;
-
- for (int i = 0; i < factions.Count; ++i)
- {
- Faction faction = factions[i];
-
- if (faction != m_Faction && Insensitive.Contains(e.Speech, faction.Definition.Keyword))
- {
- ChangeReaction(faction, newType);
- understood = true;
- }
- }
}
- else if (Insensitive.Contains(e.Speech, "patrol"))
- {
- Home = Location;
- RangeHome = 6;
- Combatant = null;
- Orders.Movement = MovementType.Patrol;
- Say(1005146); // This spot looks like it needs protection! I shall guard it with my life.
- understood = true;
- }
- else if (Insensitive.Contains(e.Speech, "follow"))
- {
- Home = Location;
- RangeHome = 6;
- Combatant = null;
- Orders.Follow = from;
- Orders.Movement = MovementType.Follow;
- Say(1005144); // Yes, Sire.
- understood = true;
- }
-
- if (!understood)
- Say(1042183); // I'm sorry, I don't understand your orders...
}
+ else if (Insensitive.Contains(e.Speech, "patrol"))
+ {
+ Home = Location;
+ RangeHome = 6;
+ Combatant = null;
+ Orders.Movement = MovementType.Patrol;
+ Say(1005146); // This spot looks like it needs protection! I shall guard it with my life.
+ understood = true;
+ }
+ else if (Insensitive.Contains(e.Speech, "follow"))
+ {
+ Home = Location;
+ RangeHome = 6;
+ Combatant = null;
+ Orders.Follow = from;
+ Orders.Movement = MovementType.Follow;
+ Say(1005144); // Yes, Sire.
+ understood = true;
+ }
+
+ if (!understood)
+ Say(1042183); // I'm sorry, I don't understand your orders...
}
}
}
@@ -525,4 +525,4 @@ namespace Server.Factions
Delete();
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Factions/Mobiles/Guards/GuardAI.cs b/Scripts/Engines/Factions/Mobiles/Guards/GuardAI.cs
index 2c1c2a774..b3f3e9451 100644
--- a/Scripts/Engines/Factions/Mobiles/Guards/GuardAI.cs
+++ b/Scripts/Engines/Factions/Mobiles/Guards/GuardAI.cs
@@ -27,11 +27,7 @@ namespace Server.Factions
public class ComboEntry
{
- public ComboEntry(Type spell) : this(spell, 100, TimeSpan.Zero)
- {
- }
-
- public ComboEntry(Type spell, int chance) : this(spell, chance, TimeSpan.Zero)
+ public ComboEntry(Type spell, int chance = 100) : this(spell, chance, TimeSpan.Zero)
{
}
@@ -170,7 +166,7 @@ namespace Server.Factions
public bool EquipWeapon()
{
Item weapon = m_Guard.Backpack?.FindItemByType();
-
+
return weapon != null && m_Guard.EquipItem(weapon);
}
@@ -225,18 +221,18 @@ namespace Server.Factions
switch (Utility.Random(maxCircle * 2))
{
case 0:
- case 1: return new MagicArrowSpell(m_Guard, null);
+ case 1: return new MagicArrowSpell(m_Guard);
case 2:
- case 3: return new HarmSpell(m_Guard, null);
+ case 3: return new HarmSpell(m_Guard);
case 4:
- case 5: return new FireballSpell(m_Guard, null);
+ case 5: return new FireballSpell(m_Guard);
case 6:
- case 7: return new LightningSpell(m_Guard, null);
- case 8: return new MindBlastSpell(m_Guard, null);
- case 9: return new ParalyzeSpell(m_Guard, null);
- case 10: return new EnergyBoltSpell(m_Guard, null);
- case 11: return new ExplosionSpell(m_Guard, null);
- default: return new FlameStrikeSpell(m_Guard, null);
+ case 7: return new LightningSpell(m_Guard);
+ case 8: return new MindBlastSpell(m_Guard);
+ case 9: return new ParalyzeSpell(m_Guard);
+ case 10: return new EnergyBoltSpell(m_Guard);
+ case 11: return new ExplosionSpell(m_Guard);
+ default: return new FlameStrikeSpell(m_Guard);
}
}
@@ -255,7 +251,7 @@ namespace Server.Factions
Mobile comb = m_Mobile.Combatant;
- if (comb != null && !comb.Deleted && comb.Alive && !comb.IsDeadBondedPet && m_Mobile.InRange(comb, 12) &&
+ if (comb?.Deleted == false && comb.Alive && !comb.IsDeadBondedPet && m_Mobile.InRange(comb, 12) &&
CanDispel(comb))
{
active = comb;
@@ -317,7 +313,7 @@ namespace Server.Factions
Mobile comb = m_Mobile.Combatant;
- if (comb != null && !comb.Deleted && comb.Alive && !comb.IsDeadBondedPet && CanDispel(comb))
+ if (comb?.Deleted == false && comb.Alive && !comb.IsDeadBondedPet && CanDispel(comb))
{
active = inactive = comb;
actPrio = inactPrio = m_Mobile.GetDistanceToSqrt(comb);
@@ -427,7 +423,7 @@ namespace Server.Factions
Mobile combatant = m_Guard.Combatant;
- if (combatant == null || combatant.Deleted || !combatant.Alive || combatant.IsDeadBondedPet ||
+ if (combatant?.Deleted != false || !combatant.Alive || combatant.IsDeadBondedPet ||
!m_Mobile.CanSee(combatant) || !m_Mobile.CanBeHarmful(combatant, false) || combatant.Map != m_Mobile.Map)
{
// Our combatant is deleted, dead, hidden, or we cannot hurt them
@@ -473,7 +469,7 @@ namespace Server.Factions
if (m_Guard.Map == toHarm.Map && (targ.Range < 0 || m_Guard.InRange(toHarm, targ.Range)) &&
m_Guard.CanSee(toHarm) && m_Guard.InLOS(toHarm))
targ.Invoke(m_Guard, toHarm);
- else if (targ is DispelSpell.InternalTarget)
+ else if ((targ as ISpellTarget)?.Spell is DispelSpell)
targ.Cancel(m_Guard, TargetCancelType.Canceled);
}
else if ((targ.Flags & TargetFlags.Beneficial) != 0)
@@ -512,10 +508,7 @@ namespace Server.Factions
if (m_Guard.Town != null && m_Guard.Orders.Movement == MovementType.Follow)
{
- toFollow = m_Guard.Orders.Follow;
-
- if (toFollow == null)
- toFollow = m_Guard.Town.Sheriff;
+ toFollow = m_Guard.Orders.Follow ?? m_Guard.Town.Sheriff;
}
if (toFollow != null && toFollow.Map == m_Guard.Map &&
@@ -577,7 +570,7 @@ namespace Server.Factions
m_Guard.HitsMax - m_Guard.Hits > Utility.Random(250))
{
if (IsAllowed(GuardAI.Bless))
- spell = new CureSpell(m_Guard, null);
+ spell = new CureSpell(m_Guard);
else
UseItemByType(typeof(BaseCurePotion));
}
@@ -588,16 +581,16 @@ namespace Server.Factions
m_Guard.Home != Point3D.Zero && !Utility.InRange(m_Guard.Location, m_Guard.Home, 15) &&
m_Guard.Mana >= 11)
{
- spell = new RecallSpell(m_Guard, null,
- new RunebookEntry(m_Guard.Home, m_Guard.Map, "Guard's Home", null));
+ spell = new RecallSpell(m_Guard,
+ new RunebookEntry(m_Guard.Home, m_Guard.Map, "Guard's Home"));
}
else if (IsAllowed(GuardAI.Bless))
{
if (m_Guard.Mana >= 11 && m_Guard.Hits + 30 < m_Guard.HitsMax)
- spell = new GreaterHealSpell(m_Guard, null);
+ spell = new GreaterHealSpell(m_Guard);
else if (m_Guard.Hits + 10 < m_Guard.HitsMax &&
(m_Guard.Mana < 11 || m_Guard.NextCombatTime - Core.TickCount > 2000))
- spell = new HealSpell(m_Guard, null);
+ spell = new HealSpell(m_Guard);
}
else if (m_Guard.CanBeginAction())
{
@@ -608,9 +601,9 @@ namespace Server.Factions
(IsAllowed(GuardAI.Magic) || IsAllowed(GuardAI.Bless) || IsAllowed(GuardAI.Curse)))
{
if (!dispelTarget.Paralyzed && m_Guard.Mana > ManaReserve + 20 && 40 > Utility.Random(100))
- spell = new ParalyzeSpell(m_Guard, null);
+ spell = new ParalyzeSpell(m_Guard);
else
- spell = new DispelSpell(m_Guard, null);
+ spell = new DispelSpell(m_Guard);
}
if (combatant != null)
@@ -672,7 +665,7 @@ namespace Server.Factions
if (IsAllowed(GuardAI.Bless))
{
if (types.Count > 1)
- spell = new BlessSpell(m_Guard, null);
+ spell = new BlessSpell(m_Guard);
else if (types.Count == 1)
spell = Activator.CreateInstance(types[0], m_Guard, null) as Spell;
}
@@ -690,7 +683,7 @@ namespace Server.Factions
{
if (!combatant.Poisoned && 40 > Utility.Random(100))
{
- spell = new PoisonSpell(m_Guard, null);
+ spell = new PoisonSpell(m_Guard);
}
else
{
@@ -710,7 +703,7 @@ namespace Server.Factions
types.Add(typeof(FeeblemindSpell));
if (types.Count > 1)
- spell = new CurseSpell(m_Guard, null);
+ spell = new CurseSpell(m_Guard);
else if (types.Count == 1)
spell = (Spell)Activator.CreateInstance(types[0], m_Guard, null);
}
@@ -738,7 +731,7 @@ namespace Server.Factions
if (spell is GreaterHealSpell)
{
if (m_Guard.Hits + 30 > m_Guard.HitsMax && m_Guard.Hits + 10 < m_Guard.HitsMax)
- spell = new HealSpell(m_Guard, null);
+ spell = new HealSpell(m_Guard);
}
else
{
@@ -751,7 +744,7 @@ namespace Server.Factions
UseItemByType(typeof(BaseRefreshPotion));
}
- if (spell == null || !spell.Cast())
+ if (spell?.Cast() != true)
EquipWeapon();
}
else if (spell?.State == SpellState.Sequencing)
@@ -762,4 +755,4 @@ namespace Server.Factions
return true;
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Harvest/Core/HarvestSystem.cs b/Scripts/Engines/Harvest/Core/HarvestSystem.cs
index f86223d1d..693a0a636 100644
--- a/Scripts/Engines/Harvest/Core/HarvestSystem.cs
+++ b/Scripts/Engines/Harvest/Core/HarvestSystem.cs
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
+using System.Linq;
using Server.Items;
using Server.Targeting;
@@ -16,7 +17,7 @@ namespace Server.Engines.Harvest
public virtual bool CheckTool(Mobile from, Item tool)
{
- bool wornOut = tool == null || tool.Deleted || tool is IUsesRemaining remaining && remaining.UsesRemaining <= 0;
+ bool wornOut = tool?.Deleted != false || tool is IUsesRemaining remaining && remaining.UsesRemaining <= 0;
if (wornOut)
from.SendLocalizedMessage(1044038); // You have worn out your tool!
@@ -47,7 +48,7 @@ namespace Server.Engines.Harvest
public virtual bool CheckResources(Mobile from, Item tool, HarvestDefinition def, Map map, Point3D loc, bool timed)
{
HarvestBank bank = def.GetBank(map, loc.X, loc.Y);
- bool available = bank != null && bank.Current >= def.ConsumedPerHarvest;
+ bool available = bank?.Current >= def.ConsumedPerHarvest;
if (!available)
def.SendMessageTo(from, timed ? def.DoubleHarvestMessage : def.NoResourcesMessage);
@@ -136,7 +137,7 @@ namespace Server.Engines.Harvest
HarvestResource resource = MutateResource(from, tool, def, map, loc, vein, primary, fallback);
double skillBase = from.Skills[def.Skill].Base;
- double skillValue = from.Skills[def.Skill].Value;
+ // double skillValue = from.Skills[def.Skill].Value;
Type type = null;
@@ -194,7 +195,7 @@ namespace Server.Engines.Harvest
BonusHarvestResource bonus = def.GetBonusResource();
- if (bonus != null && bonus.Type != null && skillBase >= bonus.ReqSkill)
+ if (bonus?.Type != null && skillBase >= bonus.ReqSkill)
{
Item bonusItem = Construct(bonus.Type, from);
@@ -279,18 +280,8 @@ namespace Server.Engines.Harvest
if (map == null)
return false;
- List
- atFeet = new List
- ();
-
- foreach (Item obj in m.GetItemsInRange(0))
- atFeet.Add(obj);
-
- for (int i = 0; i < atFeet.Count; ++i)
- {
- Item check = atFeet[i];
-
- if (check.StackWith(m, item, false))
- return true;
- }
+ if (m.GetItemsInRange(0).Any(t => t.StackWith(m, item, false)))
+ return true;
item.MoveToWorld(m.Location, map);
return true;
@@ -305,10 +296,7 @@ namespace Server.Engines.Harvest
public virtual Type GetResourceType(Mobile from, Item tool, HarvestDefinition def, Map map, Point3D loc,
HarvestResource resource)
{
- if (resource.Types.Length > 0)
- return resource.Types[Utility.Random(resource.Types.Length)];
-
- return null;
+ return resource.Types.Length > 0 ? resource.Types[Utility.Random(resource.Types.Length)] : null;
}
public virtual HarvestResource MutateResource(Mobile from, Item tool, HarvestDefinition def, Map map, Point3D loc,
@@ -391,17 +379,7 @@ namespace Server.Engines.Harvest
public virtual HarvestDefinition GetDefinition(int tileID)
{
- HarvestDefinition def = null;
-
- for (int i = 0; def == null && i < Definitions.Count; ++i)
- {
- HarvestDefinition check = Definitions[i];
-
- if (check.Validate(tileID))
- def = check;
- }
-
- return def;
+ return Definitions.FirstOrDefault(check => check.Validate(tileID));
}
public virtual void StartHarvesting(Mobile from, Item tool, object toHarvest)
@@ -488,7 +466,7 @@ namespace Server
{
public static bool Check(Item item)
{
- return item != null && item.GetType().IsDefined(typeof(FurnitureAttribute), false);
+ return item?.GetType().IsDefined(typeof(FurnitureAttribute), false) == true;
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Harvest/Fishing.cs b/Scripts/Engines/Harvest/Fishing.cs
index b51b9439d..d642da9ba 100644
--- a/Scripts/Engines/Harvest/Fishing.cs
+++ b/Scripts/Engines/Harvest/Fishing.cs
@@ -38,60 +38,38 @@ namespace Server.Engines.Harvest
private Fishing()
{
- HarvestResource[] res;
- HarvestVein[] veins;
-
- #region Fishing
-
- HarvestDefinition fish = new HarvestDefinition();
-
- // Resource banks are every 8x8 tiles
- fish.BankWidth = 8;
- fish.BankHeight = 8;
-
- // Every bank holds from 5 to 15 fish
- fish.MinTotal = 5;
- fish.MaxTotal = 15;
-
- // A resource bank will respawn its content every 10 to 20 minutes
- fish.MinRespawn = TimeSpan.FromMinutes(10.0);
- fish.MaxRespawn = TimeSpan.FromMinutes(20.0);
-
- // Skill checking is done on the Fishing skill
- fish.Skill = SkillName.Fishing;
-
- // Set the list of harvestable tiles
- fish.Tiles = m_WaterTiles;
- fish.RangedTiles = true;
-
- // Players must be within 4 tiles to harvest
- fish.MaxRange = 4;
-
- // One fish per harvest action
- fish.ConsumedPerHarvest = 1;
- fish.ConsumedPerFeluccaHarvest = 1;
-
- // The fishing
- fish.EffectActions = new[] { 12 };
- fish.EffectSounds = new int[0];
- fish.EffectCounts = new[] { 1 };
- fish.EffectDelay = TimeSpan.Zero;
- fish.EffectSoundDelay = TimeSpan.FromSeconds(8.0);
-
- fish.NoResourcesMessage = 503172; // The fish don't seem to be biting here.
- fish.FailMessage = 503171; // You fish a while, but fail to catch anything.
- fish.TimedOutOfRangeMessage = 500976; // You need to be closer to the water to fish!
- fish.OutOfRangeMessage = 500976; // You need to be closer to the water to fish!
- fish.PackFullMessage = 503176; // You do not have room in your backpack for a fish.
- fish.ToolBrokeMessage = 503174; // You broke your fishing pole.
-
- res = new[]
+ HarvestDefinition fish = new HarvestDefinition
{
+ BankWidth = 8,
+ BankHeight = 8,
+ MinTotal = 5,
+ MaxTotal = 15,
+ MinRespawn = TimeSpan.FromMinutes(10.0),
+ MaxRespawn = TimeSpan.FromMinutes(20.0),
+ Skill = SkillName.Fishing,
+ Tiles = m_WaterTiles,
+ RangedTiles = true,
+ MaxRange = 4,
+ ConsumedPerHarvest = 1,
+ ConsumedPerFeluccaHarvest = 1,
+ EffectActions = new[] { 12 },
+ EffectSounds = new int[0],
+ EffectCounts = new[] { 1 },
+ EffectDelay = TimeSpan.Zero,
+ EffectSoundDelay = TimeSpan.FromSeconds(8.0),
+ NoResourcesMessage = 503172, // The fish don't seem to be biting here.
+ FailMessage = 503171, // You fish a while, but fail to catch anything.
+ TimedOutOfRangeMessage = 500976, // You need to be closer to the water to fish!
+ OutOfRangeMessage = 500976, // You need to be closer to the water to fish!
+ PackFullMessage = 503176, // You do not have room in your backpack for a fish.
+ ToolBrokeMessage = 503174 // You broke your fishing pole.
+ };
+
+ HarvestResource[] res = {
new HarvestResource(00.0, 00.0, 100.0, 1043297, typeof(Fish))
};
- veins = new[]
- {
+ HarvestVein[] veins = {
new HarvestVein(100.0, 0.0, res[0], null)
};
@@ -107,20 +85,9 @@ namespace Server.Engines.Harvest
Definition = fish;
Definitions.Add(fish);
-
- #endregion
}
- public static Fishing System
- {
- get
- {
- if (m_System == null)
- m_System = new Fishing();
-
- return m_System;
- }
- }
+ public static Fishing System => m_System ?? (m_System = new Fishing());
public HarvestDefinition Definition{ get; }
@@ -191,10 +158,7 @@ namespace Server.Engines.Harvest
private static Map SafeMap(Map map)
{
- if (map == null || map == Map.Internal)
- return Map.Trammel;
-
- return map;
+ return map == null || map == Map.Internal ? Map.Trammel : map;
}
public override bool CheckResources(Mobile from, Item tool, HarvestDefinition def, Map map, Point3D loc, bool timed)
@@ -324,10 +288,7 @@ namespace Server.Engines.Harvest
TreasureMapChest.Fill(chest, Math.Max(1, Math.Min(4, sos.Level)));
- if (sos.IsAncient)
- chest.DropItem(new FabledFishingNet());
- else
- chest.DropItem(new SpecialFishingNet());
+ chest.DropItem(sos.IsAncient ? new FabledFishingNet() : new SpecialFishingNet());
chest.Movable = true;
chest.Locked = false;
@@ -388,10 +349,7 @@ namespace Server.Engines.Harvest
return true; // we don't want to give the item to the player, it's on the serpent
}
- if (item is BigFish || item is WoodenChest || item is MetalGoldenChest)
- placeAtFeet = true;
-
- return base.Give(m, item, placeAtFeet);
+ return base.Give(m, item, placeAtFeet || item is BigFish || item is WoodenChest || item is MetalGoldenChest);
}
public override void SendSuccessTo(Mobile from, Item item, HarvestResource resource)
@@ -547,4 +505,4 @@ namespace Server.Engines.Harvest
}
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Harvest/Lumberjacking.cs b/Scripts/Engines/Harvest/Lumberjacking.cs
index 4219a96e5..c66eead6c 100644
--- a/Scripts/Engines/Harvest/Lumberjacking.cs
+++ b/Scripts/Engines/Harvest/Lumberjacking.cs
@@ -43,47 +43,30 @@ namespace Server.Engines.Harvest
HarvestResource[] res;
HarvestVein[] veins;
- #region Lumberjacking
-
- HarvestDefinition lumber = new HarvestDefinition();
-
- // Resource banks are every 4x3 tiles
- lumber.BankWidth = 4;
- lumber.BankHeight = 3;
-
- // Every bank holds from 20 to 45 logs
- lumber.MinTotal = 20;
- lumber.MaxTotal = 45;
-
- // A resource bank will respawn its content every 20 to 30 minutes
- lumber.MinRespawn = TimeSpan.FromMinutes(20.0);
- lumber.MaxRespawn = TimeSpan.FromMinutes(30.0);
-
- // Skill checking is done on the Lumberjacking skill
- lumber.Skill = SkillName.Lumberjacking;
-
- // Set the list of harvestable tiles
- lumber.Tiles = m_TreeTiles;
-
- // Players must be within 2 tiles to harvest
- lumber.MaxRange = 2;
-
- // Ten logs per harvest action
- lumber.ConsumedPerHarvest = 10;
- lumber.ConsumedPerFeluccaHarvest = 20;
-
- // The chopping effect
- lumber.EffectActions = new[] { 13 };
- lumber.EffectSounds = new[] { 0x13E };
- lumber.EffectCounts = Core.AOS ? new[] { 1 } : new[] { 1, 2, 2, 2, 3 };
- lumber.EffectDelay = TimeSpan.FromSeconds(1.6);
- lumber.EffectSoundDelay = TimeSpan.FromSeconds(0.9);
-
- lumber.NoResourcesMessage = 500493; // There's not enough wood here to harvest.
- lumber.FailMessage = 500495; // You hack at the tree for a while, but fail to produce any useable wood.
- lumber.OutOfRangeMessage = 500446; // That is too far away.
- lumber.PackFullMessage = 500497; // You can't place any wood into your backpack!
- lumber.ToolBrokeMessage = 500499; // You broke your axe.
+ HarvestDefinition lumber = new HarvestDefinition
+ {
+ BankWidth = 4,
+ BankHeight = 3,
+ MinTotal = 20,
+ MaxTotal = 45,
+ MinRespawn = TimeSpan.FromMinutes(20.0),
+ MaxRespawn = TimeSpan.FromMinutes(30.0),
+ Skill = SkillName.Lumberjacking,
+ Tiles = m_TreeTiles,
+ MaxRange = 2,
+ ConsumedPerHarvest = 10,
+ ConsumedPerFeluccaHarvest = 20,
+ EffectActions = new[] { 13 },
+ EffectSounds = new[] { 0x13E },
+ EffectCounts = Core.AOS ? new[] { 1 } : new[] { 1, 2, 2, 2, 3 },
+ EffectDelay = TimeSpan.FromSeconds(1.6),
+ EffectSoundDelay = TimeSpan.FromSeconds(0.9),
+ NoResourcesMessage = 500493, // There's not enough wood here to harvest.
+ FailMessage = 500495, // You hack at the tree for a while, but fail to produce any useable wood.
+ OutOfRangeMessage = 500446, // That is too far away.
+ PackFullMessage = 500497, // You can't place any wood into your backpack!
+ ToolBrokeMessage = 500499 // You broke your axe.
+ };
if (Core.ML)
{
@@ -141,20 +124,9 @@ namespace Server.Engines.Harvest
Definition = lumber;
Definitions.Add(lumber);
-
- #endregion
}
- public static Lumberjacking System
- {
- get
- {
- if (m_System == null)
- m_System = new Lumberjacking();
-
- return m_System;
- }
- }
+ public static Lumberjacking System => m_System ?? (m_System = new Lumberjacking());
public HarvestDefinition Definition{ get; }
@@ -212,4 +184,4 @@ namespace Server.Engines.Harvest
Array.Sort(m_TreeTiles);
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Harvest/Mining.cs b/Scripts/Engines/Harvest/Mining.cs
index a06ddf046..043ebbc52 100644
--- a/Scripts/Engines/Harvest/Mining.cs
+++ b/Scripts/Engines/Harvest/Mining.cs
@@ -23,55 +23,36 @@ namespace Server.Engines.Harvest
private Mining()
{
- HarvestResource[] res;
- HarvestVein[] veins;
-
#region Mining for ore and stone
- HarvestDefinition oreAndStone = OreAndStone = new HarvestDefinition();
-
- // Resource banks are every 8x8 tiles
- oreAndStone.BankWidth = 8;
- oreAndStone.BankHeight = 8;
-
- // Every bank holds from 10 to 34 ore
- oreAndStone.MinTotal = 10;
- oreAndStone.MaxTotal = 34;
-
- // A resource bank will respawn its content every 10 to 20 minutes
- oreAndStone.MinRespawn = TimeSpan.FromMinutes(10.0);
- oreAndStone.MaxRespawn = TimeSpan.FromMinutes(20.0);
-
- // Skill checking is done on the Mining skill
- oreAndStone.Skill = SkillName.Mining;
-
- // Set the list of harvestable tiles
- oreAndStone.Tiles = m_MountainAndCaveTiles;
-
- // Players must be within 2 tiles to harvest
- oreAndStone.MaxRange = 2;
-
- // One ore per harvest action
- oreAndStone.ConsumedPerHarvest = 1;
- oreAndStone.ConsumedPerFeluccaHarvest = 2;
-
- // The digging effect
- oreAndStone.EffectActions = new[] { 11 };
- oreAndStone.EffectSounds = new[] { 0x125, 0x126 };
- oreAndStone.EffectCounts = new[] { 1 };
- oreAndStone.EffectDelay = TimeSpan.FromSeconds(1.6);
- oreAndStone.EffectSoundDelay = TimeSpan.FromSeconds(0.9);
-
- oreAndStone.NoResourcesMessage = 503040; // There is no metal here to mine.
- oreAndStone.DoubleHarvestMessage = 503042; // Someone has gotten to the metal before you.
- oreAndStone.TimedOutOfRangeMessage = 503041; // You have moved too far away to continue mining.
- oreAndStone.OutOfRangeMessage = 500446; // That is too far away.
- oreAndStone.FailMessage = 503043; // You loosen some rocks but fail to find any useable ore.
- oreAndStone.PackFullMessage = 1010481; // Your backpack is full, so the ore you mined is lost.
- oreAndStone.ToolBrokeMessage = 1044038; // You have worn out your tool!
-
- res = new[]
+ OreAndStone = new HarvestDefinition
{
+ BankWidth = 8,
+ BankHeight = 8,
+ MinTotal = 10,
+ MaxTotal = 34,
+ MinRespawn = TimeSpan.FromMinutes(10.0),
+ MaxRespawn = TimeSpan.FromMinutes(20.0),
+ Skill = SkillName.Mining,
+ Tiles = m_MountainAndCaveTiles,
+ MaxRange = 2,
+ ConsumedPerHarvest = 1,
+ ConsumedPerFeluccaHarvest = 2,
+ EffectActions = new[] { 11 },
+ EffectSounds = new[] { 0x125, 0x126 },
+ EffectCounts = new[] { 1 },
+ EffectDelay = TimeSpan.FromSeconds(1.6),
+ EffectSoundDelay = TimeSpan.FromSeconds(0.9),
+ NoResourcesMessage = 503040, // There is no metal here to mine.
+ DoubleHarvestMessage = 503042, // Someone has gotten to the metal before you.
+ TimedOutOfRangeMessage = 503041, // You have moved too far away to continue mining.
+ OutOfRangeMessage = 500446, // That is too far away.
+ FailMessage = 503043, // You loosen some rocks but fail to find any useable ore.
+ PackFullMessage = 1010481, // Your backpack is full, so the ore you mined is lost.
+ ToolBrokeMessage = 1044038 // You have worn out your tool!
+ };
+
+ HarvestResource[] res = {
new HarvestResource(00.0, 00.0, 100.0, 1007072, typeof(IronOre), typeof(Granite)),
new HarvestResource(65.0, 25.0, 105.0, 1007073, typeof(DullCopperOre), typeof(DullCopperGranite),
typeof(DullCopperElemental)),
@@ -91,8 +72,7 @@ namespace Server.Engines.Harvest
typeof(ValoriteElemental))
};
- veins = new[]
- {
+ HarvestVein[] veins = {
new HarvestVein(49.6, 0.0, res[0], null), // Iron
new HarvestVein(11.2, 0.5, res[1], res[0]), // Dull Copper
new HarvestVein(09.8, 0.5, res[2], res[0]), // Shadow Iron
@@ -104,11 +84,11 @@ namespace Server.Engines.Harvest
new HarvestVein(01.4, 0.5, res[8], res[0]) // Valorite
};
- oreAndStone.Resources = res;
- oreAndStone.Veins = veins;
+ OreAndStone.Resources = res;
+ OreAndStone.Veins = veins;
if (Core.ML)
- oreAndStone.BonusResources = new[]
+ OreAndStone.BonusResources = new[]
{
new BonusHarvestResource(0, 99.4, null, null), //Nothing
new BonusHarvestResource(100, .1, 1072562, typeof(BlueDiamond)),
@@ -119,56 +99,41 @@ namespace Server.Engines.Harvest
new BonusHarvestResource(100, .1, 1072568, typeof(Turquoise))
};
- oreAndStone.RaceBonus = Core.ML;
- oreAndStone.RandomizeVeins = Core.ML;
+ OreAndStone.RaceBonus = Core.ML;
+ OreAndStone.RandomizeVeins = Core.ML;
- Definitions.Add(oreAndStone);
+ Definitions.Add(OreAndStone);
#endregion
#region Mining for sand
- HarvestDefinition sand = Sand = new HarvestDefinition();
-
- // Resource banks are every 8x8 tiles
- sand.BankWidth = 8;
- sand.BankHeight = 8;
-
- // Every bank holds from 6 to 12 sand
- sand.MinTotal = 6;
- sand.MaxTotal = 12;
-
- // A resource bank will respawn its content every 10 to 20 minutes
- sand.MinRespawn = TimeSpan.FromMinutes(10.0);
- sand.MaxRespawn = TimeSpan.FromMinutes(20.0);
-
- // Skill checking is done on the Mining skill
- sand.Skill = SkillName.Mining;
-
- // Set the list of harvestable tiles
- sand.Tiles = m_SandTiles;
-
- // Players must be within 2 tiles to harvest
- sand.MaxRange = 2;
-
- // One sand per harvest action
- sand.ConsumedPerHarvest = 1;
- sand.ConsumedPerFeluccaHarvest = 1;
-
- // The digging effect
- sand.EffectActions = new[] { 11 };
- sand.EffectSounds = new[] { 0x125, 0x126 };
- sand.EffectCounts = new[] { 6 };
- sand.EffectDelay = TimeSpan.FromSeconds(1.6);
- sand.EffectSoundDelay = TimeSpan.FromSeconds(0.9);
-
- sand.NoResourcesMessage = 1044629; // There is no sand here to mine.
- sand.DoubleHarvestMessage = 1044629; // There is no sand here to mine.
- sand.TimedOutOfRangeMessage = 503041; // You have moved too far away to continue mining.
- sand.OutOfRangeMessage = 500446; // That is too far away.
- sand.FailMessage = 1044630; // You dig for a while but fail to find any of sufficient quality for glassblowing.
- sand.PackFullMessage = 1044632; // Your backpack can't hold the sand, and it is lost!
- sand.ToolBrokeMessage = 1044038; // You have worn out your tool!
+ Sand = new HarvestDefinition
+ {
+ BankWidth = 8,
+ BankHeight = 8,
+ MinTotal = 6,
+ MaxTotal = 12,
+ MinRespawn = TimeSpan.FromMinutes(10.0),
+ MaxRespawn = TimeSpan.FromMinutes(20.0),
+ Skill = SkillName.Mining,
+ Tiles = m_SandTiles,
+ MaxRange = 2,
+ ConsumedPerHarvest = 1,
+ ConsumedPerFeluccaHarvest = 1,
+ EffectActions = new[] { 11 },
+ EffectSounds = new[] { 0x125, 0x126 },
+ EffectCounts = new[] { 6 },
+ EffectDelay = TimeSpan.FromSeconds(1.6),
+ EffectSoundDelay = TimeSpan.FromSeconds(0.9),
+ NoResourcesMessage = 1044629, // There is no sand here to mine.
+ DoubleHarvestMessage = 1044629, // There is no sand here to mine.
+ TimedOutOfRangeMessage = 503041, // You have moved too far away to continue mining.
+ OutOfRangeMessage = 500446, // That is too far away.
+ FailMessage = 1044630, // You dig for a while but fail to find any of sufficient quality for glassblowing.
+ PackFullMessage = 1044632, // Your backpack can't hold the sand, and it is lost!
+ ToolBrokeMessage = 1044038 // You have worn out your tool!
+ };
res = new[]
{
@@ -180,24 +145,15 @@ namespace Server.Engines.Harvest
new HarvestVein(100.0, 0.0, res[0], null)
};
- sand.Resources = res;
- sand.Veins = veins;
+ Sand.Resources = res;
+ Sand.Veins = veins;
- Definitions.Add(sand);
+ Definitions.Add(Sand);
#endregion
}
- public static Mining System
- {
- get
- {
- if (m_System == null)
- m_System = new Mining();
-
- return m_System;
- }
- }
+ public static Mining System => m_System ?? (m_System = new Mining());
public HarvestDefinition OreAndStone{ get; }
@@ -206,16 +162,16 @@ namespace Server.Engines.Harvest
public override Type GetResourceType(Mobile from, Item tool, HarvestDefinition def, Map map, Point3D loc,
HarvestResource resource)
{
- if (def == OreAndStone)
- {
- if (from is PlayerMobile pm && pm.StoneMining && pm.ToggleMiningStone &&
- from.Skills.Mining.Base >= 100.0 && 0.1 > Utility.RandomDouble())
- return resource.Types[1];
+ if (def != OreAndStone)
+ return base.GetResourceType(from, tool, def, map, loc, resource);
- return resource.Types[0];
- }
- return base.GetResourceType(from, tool, def, map, loc, resource);
+ if (from.Skills.Mining.Base >= 100.0 && from is PlayerMobile pm && pm.StoneMining && pm.ToggleMiningStone
+ && 0.1 > Utility.RandomDouble())
+ return resource.Types[1];
+
+ return resource.Types[0];
+
}
public override bool CheckHarvest(Mobile from, Item tool)
@@ -337,6 +293,7 @@ namespace Server.Engines.Harvest
}
catch
{
+ // ignored
}
}
}
@@ -434,4 +391,4 @@ namespace Server.Engines.Harvest
#endregion
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Help/HelpGump.cs b/Scripts/Engines/Help/HelpGump.cs
index 3ceb40308..7833dbb0e 100644
--- a/Scripts/Engines/Help/HelpGump.cs
+++ b/Scripts/Engines/Help/HelpGump.cs
@@ -62,8 +62,8 @@ namespace Server.Engines.Help
AddPage(0);
- AddHtmlLocalized(150, 50, 360, 40, 1001002, false, false); // Ultima Online Help Menu
- AddButton(425, 415, 2073, 2072, 0, GumpButtonType.Reply, 0); // Close
+ AddHtmlLocalized(150, 50, 360, 40, 1001002); // Ultima Online Help Menu
+ AddButton(425, 415, 2073, 2072, 0); // Close
AddPage(1);
@@ -79,7 +79,7 @@ namespace Server.Engines.Help
@"General question about Ultima Online. Select this option if you have a general gameplay question, need help learning to use a skill, or if you would like to search the UO Knowledge Base.",
true, true);
- AddButton(80, 205, 5540, 5541, 2, GumpButtonType.Reply, 0);
+ AddButton(80, 205, 5540, 5541, 2);
AddHtml(110, 205, 450, 58,
@"My character is physically stuck in the game. This choice only covers cases where your character is physically stuck in a location they cannot move out of. This option will only work two times in 24 hours.",
true, true);
@@ -101,7 +101,7 @@ namespace Server.Engines.Help
@"General question about Ultima Online. Select this option if you have a general gameplay question, need help learning to use a skill, or if you would like to search the UO Knowledge Base.",
true, true);
- AddButton(80, 170, 5540, 5541, 2, GumpButtonType.Reply, 0);
+ AddButton(80, 170, 5540, 5541, 2);
AddHtml(110, 170, 450, 74,
@"My character is physically stuck in the game. This choice only covers cases where your character is physically stuck in a location they cannot move out of. This option will only work two times in 24 hours.",
true, true);
@@ -119,29 +119,29 @@ namespace Server.Engines.Help
AddPage(2);
- AddButton(80, 90, 5540, 5541, 3, GumpButtonType.Reply, 0);
+ AddButton(80, 90, 5540, 5541, 3);
AddHtml(110, 90, 450, 74,
@"Report a bug or contact Origin. Use this option to launch your web browser and mail in a bug report. Your report will be read by our Quality Assurance Staff. We apologize for not being able to reply to individual reports. ",
true, true);
- AddButton(80, 170, 5540, 5541, 4, GumpButtonType.Reply, 0);
+ AddButton(80, 170, 5540, 5541, 4);
AddHtml(110, 170, 450, 74,
@"Suggestion for the Game. If you'd like to make a suggestion for the game, it should be directed to the Development Team Members who participate in the discussion forums on the UO.Com web site. Choosing this option will take you to the Discussion Forums. ",
true, true);
- AddButton(80, 250, 5540, 5541, 5, GumpButtonType.Reply, 0);
+ AddButton(80, 250, 5540, 5541, 5);
AddHtml(110, 250, 450, 74,
@"Account Management For questions regarding your account such as forgotten passwords, payment options, account activation, and account transfer, please choose this option.",
true, true);
- AddButton(80, 330, 5540, 5541, 6, GumpButtonType.Reply, 0);
+ AddButton(80, 330, 5540, 5541, 6);
AddHtml(110, 330, 450, 74,
@"Other. If you are experiencing a problem in the game that does not fall into one of the other categories or is not addressed on the Support web page (located at http://support.uo.com), and requires in-game assistance, use this option. ",
true, true);
AddPage(3);
- AddButton(80, 90, 5540, 5541, 7, GumpButtonType.Reply, 0);
+ AddButton(80, 90, 5540, 5541, 7);
AddHtmlLocalized(110, 90, 450, 145, 1062572, true,
true); /* Another player is harassing me (or Exploiting).
* VERBAL HARASSMENT
@@ -165,7 +165,7 @@ namespace Server.Engines.Help
* � What constitutes an exploit?
*/
- AddButton(80, 240, 5540, 5541, 8, GumpButtonType.Reply, 0);
+ AddButton(80, 240, 5540, 5541, 8);
AddHtmlLocalized(110, 240, 450, 145, 1062573, true,
true); /* Another player is harassing me using game mechanics.
*
@@ -188,7 +188,7 @@ namespace Server.Engines.Help
*/
AddButton(150, 390, 5540, 5541, 0, GumpButtonType.Page, 1);
- AddHtmlLocalized(180, 390, 335, 40, 1001015, false, false); // NO - I meant to ask for help with another matter.
+ AddHtmlLocalized(180, 390, 335, 40, 1001015); // NO - I meant to ask for help with another matter.
}
public static void Initialize()
@@ -252,7 +252,7 @@ namespace Server.Engines.Help
{
BaseHouse house = BaseHouse.FindHouseAt(from);
- if (house != null && house.IsAosRules && !from.Region.IsPartOf()) // Dueling
+ if (house?.IsAosRules == true && !from.Region.IsPartOf()) // Dueling
{
from.Location = house.BanLocation;
}
@@ -331,4 +331,4 @@ namespace Server.Engines.Help
from.SendGump(new PagePromptGump(from, type));
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Help/PagePromptGump.cs b/Scripts/Engines/Help/PagePromptGump.cs
index 9e8e1a2a4..40e5ab934 100644
--- a/Scripts/Engines/Help/PagePromptGump.cs
+++ b/Scripts/Engines/Help/PagePromptGump.cs
@@ -19,15 +19,14 @@ namespace Server.Engines.Help
AddPage(0);
- AddHtmlLocalized(264, 80, 200, 24, 1062524, false, false); // Enter Description
- AddHtmlLocalized(120, 108, 420, 48, 1062638, false,
- false); // Please enter a brief description (up to 200 characters) of your problem:
+ AddHtmlLocalized(264, 80, 200, 24, 1062524); // Enter Description
+ AddHtmlLocalized(120, 108, 420, 48, 1062638); // Please enter a brief description (up to 200 characters) of your problem:
AddBackground(100, 148, 440, 200, 3500);
AddTextEntry(120, 168, 400, 200, 1153, 0, "");
- AddButton(175, 355, 2074, 2075, 1, GumpButtonType.Reply, 0); // Okay
- AddButton(405, 355, 2073, 2072, 0, GumpButtonType.Reply, 0); // Cancel
+ AddButton(175, 355, 2074, 2075, 1); // Okay
+ AddButton(405, 355, 2073, 2072, 0); // Cancel
}
public override void OnResponse(NetState sender, RelayInfo info)
@@ -58,4 +57,4 @@ namespace Server.Engines.Help
}
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Help/PageQueue.cs b/Scripts/Engines/Help/PageQueue.cs
index 3e6029d04..522d4aa8d 100644
--- a/Scripts/Engines/Help/PageQueue.cs
+++ b/Scripts/Engines/Help/PageQueue.cs
@@ -1,5 +1,4 @@
using System;
-using System.Collections;
using System.Collections.Generic;
using System.IO;
using System.Net.Mail;
@@ -258,10 +257,10 @@ namespace Server.Engines.Help
{
Mobile m = ns.Mobile;
- if (m != null && m.AccessLevel >= AccessLevel.Counselor && m.AutoPageNotify && !IsHandling(m))
+ if (m?.AccessLevel >= AccessLevel.Counselor && m.AutoPageNotify && !IsHandling(m))
m.SendMessage("A new page has been placed in the queue.");
- if (m != null && m.AccessLevel >= AccessLevel.Counselor && m.AutoPageNotify &&
+ if (m?.AccessLevel >= AccessLevel.Counselor && m.AutoPageNotify &&
Core.TickCount - m.LastMoveTime < 600000)
isStaffOnline = true;
}
diff --git a/Scripts/Engines/Help/PageQueueGump.cs b/Scripts/Engines/Help/PageQueueGump.cs
index 9c24b15ae..876d981d3 100644
--- a/Scripts/Engines/Help/PageQueueGump.cs
+++ b/Scripts/Engines/Help/PageQueueGump.cs
@@ -28,8 +28,8 @@ namespace Server.Engines.Help
AddImageTiled(9, 11, 21, 53, 0xBBC);
- AddButton(10, 12, 0x7D2, 0x7D2, 0, GumpButtonType.Reply, 0);
- AddHtmlLocalized(34, 28, 65, 24, 3001002, 0xFFFFFF, false, false); // Message
+ AddButton(10, 12, 0x7D2, 0x7D2, 0);
+ AddHtmlLocalized(34, 28, 65, 24, 3001002, 0xFFFFFF); // Message
}
public override void OnResponse(NetState state, RelayInfo info)
@@ -55,7 +55,7 @@ namespace Server.Engines.Help
Add(new GumpLabel(180, 12, 2100, "Page Queue"));
List list = PageQueue.List;
-
+
for (int i = 0;i < list.Count;)
{
PageEntry e = list[i];
@@ -98,7 +98,7 @@ namespace Server.Engines.Help
$"[{typeString}] {e.Message} [{(e.Handler == null ? "Unhandled" : "Handling")}]";
Add(new GumpHtml(12, 44 + i % 5 * 80, 350, 70, html, true, true));
- Add(new GumpButton(370, 44 + i % 5 * 80 + 24, 0xFA5, 0xFA7, i + 1, GumpButtonType.Reply, 0));
+ Add(new GumpButton(370, 44 + i % 5 * 80 + 24, 0xFA5, 0xFA7, i + 1));
}
}
@@ -176,9 +176,9 @@ namespace Server.Engines.Help
if (!File.Exists(path))
return new List();
-
+
List list = new List();
-
+
try
{
using (StreamReader ip = new StreamReader(path))
@@ -229,7 +229,7 @@ namespace Server.Engines.Help
AddImageTiled(0, 0, 410, 448, 0xA40);
AddAlphaRegion(1, 1, 408, 446);
- AddHtml(10, 10, 390, 20, Color(Center("Predefined Responses"), LabelColor32), false, false);
+ AddHtml(10, 10, 390, 20, Color(Center("Predefined Responses"), LabelColor32));
List list = PredefinedResponse.List;
@@ -256,16 +256,15 @@ namespace Server.Engines.Help
if (canEdit)
{
- AddButton(370, 44 + i % 5 * 80 + 24, 0xFA5, 0xFA7, 2 + i * 3, GumpButtonType.Reply, 0);
+ AddButton(370, 44 + i % 5 * 80 + 24, 0xFA5, 0xFA7, 2 + i * 3);
if (i > 0)
- AddButton(377, 44 + i % 5 * 80 + 2, 0x15E0, 0x15E4, 3 + i * 3, GumpButtonType.Reply, 0);
+ AddButton(377, 44 + i % 5 * 80 + 2, 0x15E0, 0x15E4, 3 + i * 3);
else
AddImage(377, 44 + i % 5 * 80 + 2, 0x25E4);
if (i < list.Count - 1)
- AddButton(377, 44 + i % 5 * 80 + 70 - 2 - 16, 0x15E2, 0x15E6, 4 + i * 3, GumpButtonType.Reply,
- 0);
+ AddButton(377, 44 + i % 5 * 80 + 70 - 2 - 16, 0x15E2, 0x15E6, 4 + i * 3);
else
AddImage(377, 44 + i % 5 * 80 + 70 - 2 - 16, 0x25E8);
}
@@ -282,8 +281,8 @@ namespace Server.Engines.Help
AddLabel(48, 10, 2100, "Previous Page");
}
- AddButton(12, 44 + i % 5 * 80, 0xFAB, 0xFAD, 1, GumpButtonType.Reply, 0);
- AddHtml(45, 44 + i % 5 * 80, 200, 20, Color("New Response", LabelColor32), false, false);
+ AddButton(12, 44 + i % 5 * 80, 0xFAB, 0xFAD, 1);
+ AddHtml(45, 44 + i % 5 * 80, 200, 20, Color("New Response", LabelColor32));
}
}
else if (canEdit)
@@ -291,17 +290,17 @@ namespace Server.Engines.Help
AddImageTiled(0, 0, 410, 250, 0xA40);
AddAlphaRegion(1, 1, 408, 248);
- AddHtml(10, 10, 390, 20, Color(Center("Predefined Response Editor"), LabelColor32), false, false);
+ AddHtml(10, 10, 390, 20, Color(Center("Predefined Response Editor"), LabelColor32));
- AddButton(10, 40, 0xFB1, 0xFB3, 1, GumpButtonType.Reply, 0);
- AddHtml(45, 40, 200, 20, Color("Remove", LabelColor32), false, false);
+ AddButton(10, 40, 0xFB1, 0xFB3, 1);
+ AddHtml(45, 40, 200, 20, Color("Remove", LabelColor32));
- AddButton(10, 70, 0xFA5, 0xFA7, 2, GumpButtonType.Reply, 0);
- AddHtml(45, 70, 200, 20, Color("Title:", LabelColor32), false, false);
+ AddButton(10, 70, 0xFA5, 0xFA7, 2);
+ AddHtml(45, 70, 200, 20, Color("Title:", LabelColor32));
AddTextInput(10, 90, 300, 20, 0, response.Title);
- AddButton(10, 120, 0xFA5, 0xFA7, 3, GumpButtonType.Reply, 0);
- AddHtml(45, 120, 200, 20, Color("Message:", LabelColor32), false, false);
+ AddButton(10, 120, 0xFA5, 0xFA7, 3);
+ AddHtml(45, 120, 200, 20, Color("Message:", LabelColor32));
AddTextInput(10, 140, 390, 100, 1, response.Message);
}
}
@@ -473,7 +472,7 @@ namespace Server.Engines.Help
AddLabelCropped(128, 38, 264, 20, 2100,
$"{entry.Sender.RawName} {entry.Sender.Location} [{entry.Sender.Map}]");
- AddButton(18, bottom - buttons * 22, 0xFAB, 0xFAD, 8, GumpButtonType.Reply, 0);
+ AddButton(18, bottom - buttons * 22, 0xFAB, 0xFAD, 8);
AddImageTiled(52, bottom - buttons * 22 + 1, 340, 80, 0xA40 /*0xBBC*/ /*0x2458*/);
AddImageTiled(53, bottom - buttons * 22 + 2, 338, 78, 0xBBC /*0x2426*/);
AddTextEntry(55, bottom - buttons++ * 22 + 2, 336, 78, 0x480, 0, "");
@@ -483,7 +482,7 @@ namespace Server.Engines.Help
if (entry.Sender != m)
{
- AddButton(18, bottom - buttons * 22, 0xFA5, 0xFA7, 1, GumpButtonType.Reply, 0);
+ AddButton(18, bottom - buttons * 22, 0xFA5, 0xFA7, 1);
AddLabel(52, bottom - buttons++ * 22, 2100, "Go to Sender");
}
@@ -493,10 +492,10 @@ namespace Server.Engines.Help
{
AddLabelCropped(128, 58, 264, 20, 2100, "Unhandled");
- AddButton(18, bottom - buttons * 22, 0xFB1, 0xFB3, 5, GumpButtonType.Reply, 0);
+ AddButton(18, bottom - buttons * 22, 0xFB1, 0xFB3, 5);
AddLabel(52, bottom - buttons++ * 22, 2100, "Delete Page");
- AddButton(18, bottom - buttons * 22, 0xFB7, 0xFB9, 4, GumpButtonType.Reply, 0);
+ AddButton(18, bottom - buttons * 22, 0xFB7, 0xFB9, 4);
AddLabel(52, bottom - buttons++ * 22, 2100, "Handle Page");
}
else
@@ -505,15 +504,15 @@ namespace Server.Engines.Help
if (entry.Handler != m)
{
- AddButton(18, bottom - buttons * 22, 0xFA5, 0xFA7, 2, GumpButtonType.Reply, 0);
+ AddButton(18, bottom - buttons * 22, 0xFA5, 0xFA7, 2);
AddLabel(52, bottom - buttons++ * 22, 2100, "Go to Handler");
}
else
{
- AddButton(18, bottom - buttons * 22, 0xFA2, 0xFA4, 6, GumpButtonType.Reply, 0);
+ AddButton(18, bottom - buttons * 22, 0xFA2, 0xFA4, 6);
AddLabel(52, bottom - buttons++ * 22, 2100, "Abandon Page");
- AddButton(18, bottom - buttons * 22, 0xFB7, 0xFB9, 7, GumpButtonType.Reply, 0);
+ AddButton(18, bottom - buttons * 22, 0xFB7, 0xFB9, 7);
AddLabel(52, bottom - buttons++ * 22, 2100, "Page Handled");
}
}
@@ -521,12 +520,12 @@ namespace Server.Engines.Help
AddLabel(18, 78, 2100, "Page Location:");
AddLabelCropped(128, 78, 264, 20, 2100, $"{entry.PageLocation} [{entry.PageMap}]");
- AddButton(18, bottom - buttons * 22, 0xFA5, 0xFA7, 3, GumpButtonType.Reply, 0);
+ AddButton(18, bottom - buttons * 22, 0xFA5, 0xFA7, 3);
AddLabel(52, bottom - buttons++ * 22, 2100, "Go to Page Location");
if (entry.SpeechLog != null)
{
- AddButton(18, bottom - buttons * 22, 0xFA5, 0xFA7, 10, GumpButtonType.Reply, 0);
+ AddButton(18, bottom - buttons * 22, 0xFA5, 0xFA7, 10);
AddLabel(52, bottom - buttons * 22, 2100, "View Speech Log");
}
@@ -541,7 +540,7 @@ namespace Server.Engines.Help
List preresp = PredefinedResponse.List;
AddButton(18, 18, 0xFAE, 0xFB0, 0, GumpButtonType.Page, 1);
- AddButton(410 - 18 - 32, 18, 0xFAB, 0xFAC, 9, GumpButtonType.Reply, 0);
+ AddButton(410 - 18 - 32, 18, 0xFAB, 0xFAC, 9);
if (preresp.Count == 0)
{
@@ -553,7 +552,7 @@ namespace Server.Engines.Help
for (int i = 0; i < preresp.Count; ++i)
{
- AddButton(18, 40 + i * 22, 0xFA5, 0xFA7, 100 + i, GumpButtonType.Reply, 0);
+ AddButton(18, 40 + i * 22, 0xFA5, 0xFA7, 100 + i);
AddLabel(52, 40 + i * 22, 2100, preresp[i].Title);
}
}
@@ -799,4 +798,4 @@ namespace Server.Engines.Help
}
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Help/PageResponseGump.cs b/Scripts/Engines/Help/PageResponseGump.cs
index c7a272b74..c3c6a6a80 100644
--- a/Scripts/Engines/Help/PageResponseGump.cs
+++ b/Scripts/Engines/Help/PageResponseGump.cs
@@ -18,15 +18,14 @@ namespace Server.Engines.Help
AddPage(0);
- AddHtmlLocalized(150, 40, 360, 40, 1062610, false, false); // Ultima Online Help Response
+ AddHtmlLocalized(150, 40, 360, 40, 1062610); // Ultima Online Help Response
AddHtml(80, 90, 480, 290, $"{name} tells {from.Name}: {text}", true, true);
- AddHtmlLocalized(80, 390, 480, 40, 1062611, false,
- false); // Clicking the OKAY button will remove the reponse you have received.
- AddButton(400, 417, 2074, 2075, 1, GumpButtonType.Reply, 0); // OKAY
+ AddHtmlLocalized(80, 390, 480, 40, 1062611); // Clicking the OKAY button will remove the reponse you have received.
+ AddButton(400, 417, 2074, 2075, 1); // OKAY
- AddButton(475, 417, 2073, 2072, 0, GumpButtonType.Reply, 0); // CANCEL
+ AddButton(475, 417, 2073, 2072, 0); // CANCEL
}
public override void OnResponse(NetState sender, RelayInfo info)
@@ -35,4 +34,4 @@ namespace Server.Engines.Help
m_From.SendGump(new MessageSentGump(m_From, m_Name, m_Text));
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Help/SpeechLogGump.cs b/Scripts/Engines/Help/SpeechLogGump.cs
index 959a9a8c0..7996e18f7 100644
--- a/Scripts/Engines/Help/SpeechLogGump.cs
+++ b/Scripts/Engines/Help/SpeechLogGump.cs
@@ -39,8 +39,7 @@ namespace Server.Engines.Help
string playerAccount = player.Account is Account ? player.Account.Username : "???";
AddHtml(10, 10, 280, 20,
- $"SPEECH LOG - {playerName} ({Utility.FixHtml(playerAccount)})",
- false, false);
+ $"SPEECH LOG - {playerName} ({Utility.FixHtml(playerAccount)})");
int lastPage = (log.Count - 1) / MaxEntriesPerPage;
@@ -80,12 +79,12 @@ namespace Server.Engines.Help
AddHtml(10, 40, 280, 350, sLog, false, true);
if (page > 0)
- AddButton(10, 395, 0xFAE, 0xFB0, 1, GumpButtonType.Reply, 0); // Previous page
+ AddButton(10, 395, 0xFAE, 0xFB0, 1); // Previous page
AddLabel(45, 395, 0x481, $"Current page: {page + 1}/{lastPage + 1}");
if (page < lastPage)
- AddButton(261, 395, 0xFA5, 0xFA7, 2, GumpButtonType.Reply, 0); // Next page
+ AddButton(261, 395, 0xFA5, 0xFA7, 2); // Next page
}
public override void OnResponse(NetState sender, RelayInfo info)
@@ -111,4 +110,4 @@ namespace Server.Engines.Help
}
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Help/StuckMenu.cs b/Scripts/Engines/Help/StuckMenu.cs
index fa1358c50..229cb815b 100644
--- a/Scripts/Engines/Help/StuckMenu.cs
+++ b/Scripts/Engines/Help/StuckMenu.cs
@@ -125,7 +125,7 @@ namespace Server.Menus.Questions
AddBackground(0, 0, 270, 320, 2600);
- AddHtmlLocalized(50, 20, 250, 35, 1011027, false, false); // Chose a town:
+ AddHtmlLocalized(50, 20, 250, 35, 1011027); // Chose a town:
StuckMenuEntry[] entries = IsInSecondAgeArea(beheld) ? m_T2AEntries : m_Entries;
@@ -133,26 +133,18 @@ namespace Server.Menus.Questions
{
StuckMenuEntry entry = entries[i];
- AddButton(50, 55 + 35 * i, 208, 209, i + 1, GumpButtonType.Reply, 0);
- AddHtmlLocalized(75, 55 + 35 * i, 335, 40, entry.Name, false, false);
+ AddButton(50, 55 + 35 * i, 208, 209, i + 1);
+ AddHtmlLocalized(75, 55 + 35 * i, 335, 40, entry.Name);
}
- AddButton(55, 263, 4005, 4007, 0, GumpButtonType.Reply, 0);
- AddHtmlLocalized(90, 265, 200, 35, 1011012, false, false); // CANCEL
+ AddButton(55, 263, 4005, 4007, 0);
+ AddHtmlLocalized(90, 265, 200, 35, 1011012); // CANCEL
}
private static bool IsInSecondAgeArea(Mobile m)
{
- if (m.Map != Map.Trammel && m.Map != Map.Felucca)
- return false;
-
- if (m.X >= 5120 && m.Y >= 2304)
- return true;
-
- if (m.Region.IsPartOf("Terathan Keep"))
- return true;
-
- return false;
+ return (m.Map == Map.Trammel || m.Map == Map.Felucca) &&
+ (m.X >= 5120 && m.Y >= 2304 || m.Region.IsPartOf("Terathan Keep"));
}
public void BeginClose()
@@ -289,4 +281,4 @@ namespace Server.Menus.Questions
}
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Khaldun/KhaldunGen.cs b/Scripts/Engines/Khaldun/KhaldunGen.cs
index e247f8da0..8370bfe64 100644
--- a/Scripts/Engines/Khaldun/KhaldunGen.cs
+++ b/Scripts/Engines/Khaldun/KhaldunGen.cs
@@ -1,4 +1,5 @@
using System;
+using System.Linq;
using Server.Items;
namespace Server.Commands
@@ -16,46 +17,33 @@ namespace Server.Commands
{
IPooledEnumerable- eable = Map.Felucca.GetItemsInRange(new Point3D(x, y, z), 0);
- foreach (Item item in eable)
- if (item is MorphItem morphItem && morphItem.Z == z && morphItem.InactiveItemID == inactiveItemID &&
- morphItem.ActiveItemID == activeItemID)
- {
- eable.Free();
- return true;
- }
-
+ bool found = eable.Any(item => item is MorphItem morphItem && morphItem.Z == z &&
+ morphItem.InactiveItemID == inactiveItemID &&
+ morphItem.ActiveItemID == activeItemID);
eable.Free();
- return false;
+ return found;
}
public static bool FindEffectController(int x, int y, int z)
{
- IPooledEnumerable eable = Map.Felucca.GetItemsInRange(new Point3D(x, y, z), 0);
-
- foreach (Item item in eable)
- if (item is EffectController && item.Z == z)
- {
- eable.Free();
- return true;
- }
+ IPooledEnumerable
- eable = Map.Felucca.GetItemsInRange(new Point3D(x, y, z), 0);
+ bool found = eable.Any(item => item is EffectController && item.Z == z);
eable.Free();
- return false;
+ return found;
}
public static T TryCreateItem(int x, int y, int z, T srcItem) where T : Item
{
IPooledEnumerable eable = Map.Felucca.GetItemsInBounds(new Rectangle2D(x, y, 1, 1));
-
- foreach (T item in eable)
- if (item.GetType() == srcItem.GetType())
- {
- eable.Free();
- srcItem.Delete();
- return item;
- }
-
+ T t = eable.FirstOrDefault(item => item.GetType() == srcItem.GetType());
eable.Free();
+ if (t != null)
+ {
+ srcItem.Delete();
+ return t;
+ }
+
srcItem.MoveToWorld(new Point3D(x, y, z), Map.Felucca);
m_Count++;
@@ -205,4 +193,4 @@ namespace Server.Commands
e.Mobile.SendMessage($"{m_Count} dynamic Khaldun item{(m_Count == 1 ? "" : "s")} generated.");
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Khaldun/PuzzleChest.cs b/Scripts/Engines/Khaldun/PuzzleChest.cs
index 9b4eeac6d..633fd951a 100644
--- a/Scripts/Engines/Khaldun/PuzzleChest.cs
+++ b/Scripts/Engines/Khaldun/PuzzleChest.cs
@@ -408,7 +408,7 @@ namespace Server.Items
DropItem(gem);
if (0.2 > Utility.RandomDouble())
- DropItem(new BagOfReagents(50));
+ DropItem(new BagOfReagents());
for (int i = 0; i < 2; i++)
{
@@ -557,7 +557,7 @@ namespace Server.Items
AddImage(62, 20, 0x67);
- AddHtmlLocalized(80, 36, 110, 70, 1018309, true, false); // A Puzzle Lock
+ AddHtmlLocalized(80, 36, 110, 70, 1018309, true); // A Puzzle Lock
/* Correctly choose the sequence of cylinders needed to open the latch. Each cylinder
* may potentially be used more than once. Beware! A false attempt could be deadly!
@@ -577,16 +577,16 @@ namespace Server.Items
double lockpicking = from.Skills.Lockpicking.Base;
if (lockpicking >= 60.0)
{
- AddHtmlLocalized(160, 125, 230, 24, 1018308, false, false); // Lockpicking hint:
+ AddHtmlLocalized(160, 125, 230, 24, 1018308); // Lockpicking hint:
AddBackground(159, 150, 230, 95, 0x13EC);
if (lockpicking >= 80.0)
{
- AddHtmlLocalized(165, 157, 200, 40, 1018312, false, false); // In the first slot:
+ AddHtmlLocalized(165, 157, 200, 40, 1018312); // In the first slot:
AddCylinder(350, 165, chest.Solution.First);
- AddHtmlLocalized(165, 197, 200, 40, 1018313, false, false); // Used in unknown slot:
+ AddHtmlLocalized(165, 197, 200, 40, 1018313); // Used in unknown slot:
AddCylinder(350, 200, chest.FirstHint);
if (lockpicking >= 90.0)
@@ -597,7 +597,7 @@ namespace Server.Items
}
else
{
- AddHtmlLocalized(165, 157, 200, 40, 1018313, false, false); // Used in unknown slot:
+ AddHtmlLocalized(165, 157, 200, 40, 1018313); // Used in unknown slot:
AddCylinder(350, 160, chest.FirstHint);
if (lockpicking >= 70.0)
@@ -608,7 +608,7 @@ namespace Server.Items
PuzzleChestSolution lastGuess = chest.GetLastGuess(from);
if (lastGuess != null)
{
- AddHtmlLocalized(127, 249, 170, 20, 1018311, false, false); // Thy previous guess:
+ AddHtmlLocalized(127, 249, 170, 20, 1018311); // Thy previous guess:
AddBackground(290, 247, 115, 25, 0x13EC);
@@ -625,21 +625,21 @@ namespace Server.Items
AddPedestal(305, 270, solution.Fourth, 3, check == 3);
AddPedestal(360, 270, solution.Fifth, 4, check == 4);
- AddButton(258, 370, 0xFA5, 0xFA7, 1, GumpButtonType.Reply, 0);
+ AddButton(258, 370, 0xFA5, 0xFA7, 1);
}
private void AddLeftCylinderButton(int x, int y, PuzzleChestCylinder cylinder, int buttonID)
{
AddBackground(x, y, 30, 30, 0x13EC);
AddCylinder(x - 7, y + 10, cylinder);
- AddButton(x + 38, y + 9, 0x13A8, 0x4B9, buttonID, GumpButtonType.Reply, 0);
+ AddButton(x + 38, y + 9, 0x13A8, 0x4B9, buttonID);
}
private void AddRightCylinderButton(int x, int y, PuzzleChestCylinder cylinder, int buttonID)
{
AddBackground(x, y, 30, 30, 0x13EC);
AddCylinder(x - 7, y + 10, cylinder);
- AddButton(x - 26, y + 9, 0x13A8, 0x4B9, buttonID, GumpButtonType.Reply, 0);
+ AddButton(x - 26, y + 9, 0x13A8, 0x4B9, buttonID);
}
private void AddPedestal(int x, int y, PuzzleChestCylinder cylinder, int switchID, bool initialState)
@@ -739,15 +739,15 @@ namespace Server.Items
AddBackground(15, 250, 305, 163, 0x53);
AddBackground(28, 265, 280, 133, 0xBB8);
- AddHtmlLocalized(35, 271, 270, 24, 1018314, false, false); // Thou hast failed to solve the puzzle!
+ AddHtmlLocalized(35, 271, 270, 24, 1018314); // Thou hast failed to solve the puzzle!
- AddHtmlLocalized(35, 297, 250, 24, 1018315, false, false); // Correctly placed colors:
+ AddHtmlLocalized(35, 297, 250, 24, 1018315); // Correctly placed colors:
AddLabel(285, 297, 0x44, correctCylinders.ToString());
- AddHtmlLocalized(35, 323, 250, 24, 1018316, false, false); // Used colors in wrong slots:
+ AddHtmlLocalized(35, 323, 250, 24, 1018316); // Used colors in wrong slots:
AddLabel(285, 323, 0x44, correctColors.ToString());
- AddButton(152, 369, 0xFA5, 0xFA7, 0, GumpButtonType.Reply, 0);
+ AddButton(152, 369, 0xFA5, 0xFA7, 0);
}
}
}
@@ -805,4 +805,4 @@ namespace Server.Items
int version = reader.ReadEncodedInt();
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/Khaldun/RaiseSwitch.cs b/Scripts/Engines/Khaldun/RaiseSwitch.cs
index 213d167e2..2cf814499 100644
--- a/Scripts/Engines/Khaldun/RaiseSwitch.cs
+++ b/Scripts/Engines/Khaldun/RaiseSwitch.cs
@@ -1,4 +1,5 @@
using System;
+using System.Linq;
using Server.Network;
namespace Server.Items
@@ -7,12 +8,7 @@ namespace Server.Items
{
private ResetTimer m_ResetTimer;
- [Constructible]
- public RaiseSwitch() : this(0x1093)
- {
- }
-
- protected RaiseSwitch(int itemID) : base(itemID)
+ public RaiseSwitch(int itemID = 0x1093) : base(itemID)
{
Movable = false;
}
@@ -32,24 +28,24 @@ namespace Server.Items
return;
}
- if (RaisableItem != null && RaisableItem.Deleted)
+ if (RaisableItem?.Deleted == true)
RaisableItem = null;
Flip();
- if (RaisableItem != null)
+ if (RaisableItem == null)
+ return;
+
+ if (RaisableItem.IsRaisable)
{
- if (RaisableItem.IsRaisable)
- {
- RaisableItem.Raise();
- m.LocalOverheadMessage(MessageType.Regular, 0x5A, true,
- "You hear a grinding noise echoing in the distance.");
- }
- else
- {
- m.LocalOverheadMessage(MessageType.Regular, 0x5A, true,
- "You flip the switch again, but nothing happens.");
- }
+ RaisableItem.Raise();
+ m.LocalOverheadMessage(MessageType.Regular, 0x5A, true,
+ "You hear a grinding noise echoing in the distance.");
+ }
+ else
+ {
+ m.LocalOverheadMessage(MessageType.Regular, 0x5A, true,
+ "You flip the switch again, but nothing happens.");
}
}
@@ -65,10 +61,7 @@ namespace Server.Items
{
ItemID = 0x1095;
- if (RaisableItem != null && RaisableItem.CloseDelay >= TimeSpan.Zero)
- StartResetTimer(RaisableItem.CloseDelay);
- else
- StartResetTimer(TimeSpan.FromMinutes(2.0));
+ StartResetTimer(RaisableItem?.CloseDelay >= TimeSpan.Zero ? RaisableItem.CloseDelay : TimeSpan.FromMinutes(2.0));
}
Effects.PlaySound(Location, Map, 0x3E8);
@@ -183,22 +176,12 @@ namespace Server.Items
public void Refresh()
{
- bool found = false;
- foreach (Mobile mob in GetMobilesInRange(CurrentRange))
- {
- if (mob.Hidden && mob.AccessLevel > AccessLevel.Player)
- continue;
-
- found = true;
- break;
- }
-
- Visible = found;
+ Visible = GetMobilesInRange(CurrentRange).Any(mob => !mob.Hidden || mob.AccessLevel <= AccessLevel.Player);
}
public override void Serialize(GenericWriter writer)
{
- if (RaisableItem != null && RaisableItem.Deleted)
+ if (RaisableItem?.Deleted == true)
RaisableItem = null;
base.Serialize(writer);
@@ -215,4 +198,4 @@ namespace Server.Items
Timer.DelayCall(TimeSpan.Zero, Refresh);
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/MLQuests/Definitions/AGhostOfCovetous.cs b/Scripts/Engines/MLQuests/Definitions/AGhostOfCovetous.cs
index 8425f10cd..a44779f24 100644
Binary files a/Scripts/Engines/MLQuests/Definitions/AGhostOfCovetous.cs and b/Scripts/Engines/MLQuests/Definitions/AGhostOfCovetous.cs differ
diff --git a/Scripts/Engines/MLQuests/Definitions/Bedlam.cs b/Scripts/Engines/MLQuests/Definitions/Bedlam.cs
index 95b0c47d6..73b8985b3 100644
--- a/Scripts/Engines/MLQuests/Definitions/Bedlam.cs
+++ b/Scripts/Engines/MLQuests/Definitions/Bedlam.cs
@@ -100,7 +100,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
AddItem(new Backpack());
AddItem(new Sandals(0x709));
@@ -144,7 +144,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
AddItem(new Backpack());
AddItem(new Sandals(Utility.RandomNeutralHue()));
@@ -196,7 +196,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
AddItem(new Backpack());
AddItem(new Shoes(Utility.RandomNeutralHue()));
@@ -227,4 +227,4 @@ namespace Server.Engines.MLQuests.Definitions
}
#endregion
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/MLQuests/Definitions/Britannia.cs b/Scripts/Engines/MLQuests/Definitions/Britannia.cs
index 632e95a57..62f071960 100644
--- a/Scripts/Engines/MLQuests/Definitions/Britannia.cs
+++ b/Scripts/Engines/MLQuests/Definitions/Britannia.cs
@@ -128,7 +128,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
AddItem(new Backpack());
AddItem(new Sandals(Utility.RandomPinkHue()));
@@ -201,4 +201,4 @@ namespace Server.Engines.MLQuests.Definitions
}
#endregion
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/MLQuests/Definitions/Heartwood.cs b/Scripts/Engines/MLQuests/Definitions/Heartwood.cs
index 7e958a886..26225b9ae 100644
--- a/Scripts/Engines/MLQuests/Definitions/Heartwood.cs
+++ b/Scripts/Engines/MLQuests/Definitions/Heartwood.cs
@@ -1952,7 +1952,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
SetSkill(SkillName.Meditation, 60.0, 80.0);
SetSkill(SkillName.Focus, 60.0, 80.0);
@@ -2014,7 +2014,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
SetSkill(SkillName.Meditation, 60.0, 80.0);
SetSkill(SkillName.Focus, 60.0, 80.0);
@@ -2077,7 +2077,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
SetSkill(SkillName.Meditation, 60.0, 80.0);
SetSkill(SkillName.Focus, 60.0, 80.0);
@@ -2138,7 +2138,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
SetSkill(SkillName.Meditation, 60.0, 80.0);
SetSkill(SkillName.Focus, 60.0, 80.0);
@@ -2200,7 +2200,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
SetSkill(SkillName.Meditation, 60.0, 80.0);
SetSkill(SkillName.Focus, 60.0, 80.0);
@@ -2261,7 +2261,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
SetSkill(SkillName.Meditation, 60.0, 80.0);
SetSkill(SkillName.Focus, 60.0, 80.0);
@@ -2320,7 +2320,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
SetSkill(SkillName.Meditation, 60.0, 80.0);
SetSkill(SkillName.Focus, 60.0, 80.0);
@@ -2383,7 +2383,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
SetSkill(SkillName.Meditation, 60.0, 80.0);
SetSkill(SkillName.Focus, 60.0, 80.0);
@@ -2442,7 +2442,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
SetSkill(SkillName.Meditation, 60.0, 80.0);
SetSkill(SkillName.Focus, 60.0, 80.0);
@@ -2515,7 +2515,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
AddItem(new ElvenBoots());
AddItem(new FemaleLeafChest());
@@ -2570,7 +2570,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
SetSkill(SkillName.Meditation, 60.0, 80.0);
SetSkill(SkillName.Focus, 60.0, 80.0);
@@ -2629,7 +2629,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
SetSkill(SkillName.Meditation, 60.0, 80.0);
SetSkill(SkillName.Focus, 60.0, 80.0);
@@ -2686,7 +2686,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
SetSkill(SkillName.Meditation, 60.0, 80.0);
SetSkill(SkillName.Focus, 60.0, 80.0);
@@ -2758,7 +2758,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
SetSkill(SkillName.Meditation, 60.0, 80.0);
SetSkill(SkillName.Focus, 60.0, 80.0);
@@ -2837,7 +2837,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
SetSkill(SkillName.Meditation, 60.0, 80.0);
SetSkill(SkillName.Focus, 60.0, 80.0);
@@ -2900,7 +2900,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
SetSkill(SkillName.Meditation, 60.0, 80.0);
SetSkill(SkillName.Focus, 60.0, 80.0);
@@ -2965,7 +2965,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
SetSkill(SkillName.Meditation, 60.0, 80.0);
SetSkill(SkillName.Focus, 60.0, 80.0);
@@ -3023,7 +3023,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
SetSkill(SkillName.Meditation, 60.0, 80.0);
SetSkill(SkillName.Focus, 60.0, 80.0);
@@ -3088,7 +3088,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
SetSkill(SkillName.Meditation, 60.0, 80.0);
SetSkill(SkillName.Focus, 60.0, 80.0);
@@ -3147,7 +3147,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
SetSkill(SkillName.Meditation, 60.0, 80.0);
SetSkill(SkillName.Focus, 60.0, 80.0);
@@ -3205,7 +3205,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
SetSkill(SkillName.Meditation, 60.0, 80.0);
SetSkill(SkillName.Focus, 60.0, 80.0);
@@ -3254,7 +3254,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
SetSkill(SkillName.Meditation, 60.0, 80.0);
SetSkill(SkillName.Focus, 60.0, 80.0);
@@ -3322,7 +3322,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
SetSkill(SkillName.Meditation, 60.0, 80.0);
SetSkill(SkillName.Focus, 60.0, 80.0);
@@ -3380,7 +3380,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
SetSkill(SkillName.Meditation, 60.0, 80.0);
SetSkill(SkillName.Focus, 60.0, 80.0);
@@ -3445,7 +3445,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
SetSkill(SkillName.Meditation, 60.0, 80.0);
SetSkill(SkillName.Focus, 60.0, 80.0);
@@ -3505,7 +3505,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
SetSkill(SkillName.Meditation, 60.0, 80.0);
SetSkill(SkillName.Focus, 60.0, 80.0);
@@ -3564,7 +3564,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
SetSkill(SkillName.Meditation, 60.0, 80.0);
SetSkill(SkillName.Focus, 60.0, 80.0);
@@ -3622,7 +3622,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
AddItem(new ElvenBoots(0x1BB));
@@ -3685,7 +3685,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
AddItem(new ElvenBoots(0x901));
AddItem(new WoodlandBelt());
@@ -3746,7 +3746,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
AddItem(new ThighBoots(0x127));
AddItem(new FemaleElvenRobe(Utility.RandomBrightHue()));
@@ -3790,7 +3790,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
AddItem(new ElvenBoots(0x1BB));
AddItem(new Cloak(0x3B2));
@@ -3847,7 +3847,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
AddItem(new ElvenBoots(0x72C));
AddItem(new FemaleElvenRobe(0x8B0));
@@ -3890,7 +3890,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
AddItem(new ElvenBoots());
AddItem(new Tunic(0x732));
@@ -3938,7 +3938,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
AddItem(new ThighBoots());
AddItem(new ElvenPants(0x58D));
@@ -3983,7 +3983,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
AddItem(new ElvenBoots());
AddItem(new HidePants());
@@ -4028,7 +4028,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
AddItem(new Sandals(0x715));
AddItem(new FemaleElvenRobe(0x742));
@@ -4071,7 +4071,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
AddItem(new ElvenBoots(0x1BB));
AddItem(new MaleElvenRobe(0x47E));
@@ -4114,7 +4114,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
AddItem(new Shoes(0x75A));
AddItem(new FemaleElvenRobe(0x13));
@@ -4158,7 +4158,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
AddItem(new ElvenBoots(0x3B2));
AddItem(new RoyalCirclet());
@@ -4208,7 +4208,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
AddItem(new Sandals(0x1BB));
AddItem(new MaleElvenRobe(0x48F));
@@ -4251,7 +4251,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
AddItem(new ElvenBoots(0x901));
AddItem(new ElvenPants(0x8AB));
@@ -4303,7 +4303,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
AddItem(new ElvenBoots(0x1BB));
@@ -4359,7 +4359,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
SetSkill(SkillName.Meditation, 60.0, 80.0);
SetSkill(SkillName.Focus, 60.0, 80.0);
@@ -4410,7 +4410,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
SetSkill(SkillName.Meditation, 60.0, 80.0);
SetSkill(SkillName.Focus, 60.0, 80.0);
@@ -4470,7 +4470,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
SetSkill(SkillName.Meditation, 60.0, 80.0);
SetSkill(SkillName.Focus, 60.0, 80.0);
@@ -4525,7 +4525,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
SetSkill(SkillName.Meditation, 60.0, 80.0);
SetSkill(SkillName.Focus, 60.0, 80.0);
@@ -4579,7 +4579,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
SetSkill(SkillName.Meditation, 60.0, 80.0);
SetSkill(SkillName.Focus, 60.0, 80.0);
@@ -4634,7 +4634,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
SetSkill(SkillName.Meditation, 60.0, 80.0);
SetSkill(SkillName.Focus, 60.0, 80.0);
@@ -4677,4 +4677,4 @@ namespace Server.Engines.MLQuests.Definitions
}
#endregion
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/MLQuests/Definitions/Heritage.cs b/Scripts/Engines/MLQuests/Definitions/Heritage.cs
index 6ea3053b0..d87389985 100644
--- a/Scripts/Engines/MLQuests/Definitions/Heritage.cs
+++ b/Scripts/Engines/MLQuests/Definitions/Heritage.cs
@@ -789,7 +789,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
AddItem(new FancyShirt(Utility.RandomBlueHue()));
AddItem(new LongPants(Utility.RandomNondyedHue()));
@@ -830,4 +830,4 @@ namespace Server.Engines.MLQuests.Definitions
}
#endregion
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/MLQuests/Definitions/HonestBeggar.cs b/Scripts/Engines/MLQuests/Definitions/HonestBeggar.cs
index add1244f7..f6e3cbd6a 100644
--- a/Scripts/Engines/MLQuests/Definitions/HonestBeggar.cs
+++ b/Scripts/Engines/MLQuests/Definitions/HonestBeggar.cs
@@ -87,7 +87,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
AddItem(new Backpack());
AddItem(new Doublet());
@@ -130,7 +130,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
AddItem(new Backpack());
AddItem(new GildedDress());
@@ -161,4 +161,4 @@ namespace Server.Engines.MLQuests.Definitions
}
#endregion
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/MLQuests/Definitions/Ilshenar.cs b/Scripts/Engines/MLQuests/Definitions/Ilshenar.cs
index d9c3a8919..8b54fab17 100644
--- a/Scripts/Engines/MLQuests/Definitions/Ilshenar.cs
+++ b/Scripts/Engines/MLQuests/Definitions/Ilshenar.cs
@@ -258,7 +258,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
AddItem(new Shoes(Utility.RandomNeutralHue()));
AddItem(new Skirt(Utility.RandomBlueHue()));
@@ -308,7 +308,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
AddItem(new Shoes(Utility.RandomNeutralHue()));
AddItem(new LongPants(Utility.RandomBlueHue()));
@@ -344,4 +344,4 @@ namespace Server.Engines.MLQuests.Definitions
int version = reader.ReadInt();
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/MLQuests/Definitions/MistakenIdentity.cs b/Scripts/Engines/MLQuests/Definitions/MistakenIdentity.cs
index 175a51992..ec44695a1 100644
--- a/Scripts/Engines/MLQuests/Definitions/MistakenIdentity.cs
+++ b/Scripts/Engines/MLQuests/Definitions/MistakenIdentity.cs
@@ -208,7 +208,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
AddItem(new Backpack());
AddItem(new Sandals(Utility.RandomNeutralHue()));
@@ -353,4 +353,4 @@ namespace Server.Engines.MLQuests.Definitions
}
#endregion
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/MLQuests/Definitions/NewHavenTraining.cs b/Scripts/Engines/MLQuests/Definitions/NewHavenTraining.cs
index e8200317d..626bc25ba 100644
--- a/Scripts/Engines/MLQuests/Definitions/NewHavenTraining.cs
+++ b/Scripts/Engines/MLQuests/Definitions/NewHavenTraining.cs
@@ -365,7 +365,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
SetSkill(SkillName.Archery, 60.0, 80.0);
@@ -439,7 +439,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
AddItem(new Backpack());
@@ -501,7 +501,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
AddItem(new Backpack());
AddItem(new Boots(0x901));
@@ -557,7 +557,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
AddItem(new Backpack());
AddItem(new Shoes(Utility.RandomNeutralHue()));
@@ -609,7 +609,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
SetSkill(SkillName.Blacksmith, 60.0, 80.0);
@@ -673,7 +673,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
AddItem(new Backpack());
AddItem(new Boots(0x901));
@@ -726,7 +726,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
AddItem(new Backpack());
AddItem(new Boots(0x543));
@@ -780,7 +780,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
AddItem(new Backpack());
AddItem(new Robe(0x2FD));
@@ -832,7 +832,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
AddItem(new Backpack());
AddItem(new Boots(0x591));
@@ -877,7 +877,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
AddItem(new Backpack());
AddItem(new ThighBoots());
@@ -931,7 +931,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
AddItem(new Backpack());
AddItem(new Boots(0x901));
@@ -987,7 +987,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
AddItem(new Backpack());
AddItem(new Boots(0x901));
@@ -1036,4 +1036,4 @@ namespace Server.Engines.MLQuests.Definitions
}
#endregion
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/MLQuests/Definitions/Sanctuary.cs b/Scripts/Engines/MLQuests/Definitions/Sanctuary.cs
index ccfcd5fd3..8183968ee 100644
--- a/Scripts/Engines/MLQuests/Definitions/Sanctuary.cs
+++ b/Scripts/Engines/MLQuests/Definitions/Sanctuary.cs
@@ -738,7 +738,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
SetSkill(SkillName.Meditation, 60.0, 80.0);
SetSkill(SkillName.Focus, 60.0, 80.0);
@@ -801,7 +801,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
SetSkill(SkillName.Meditation, 60.0, 80.0);
SetSkill(SkillName.Focus, 60.0, 80.0);
@@ -859,7 +859,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
SetSkill(SkillName.Meditation, 60.0, 80.0);
SetSkill(SkillName.Focus, 60.0, 80.0);
@@ -916,7 +916,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
SetSkill(SkillName.Meditation, 60.0, 80.0);
SetSkill(SkillName.Focus, 60.0, 80.0);
@@ -984,7 +984,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
SetSkill(SkillName.Meditation, 60.0, 80.0);
SetSkill(SkillName.Focus, 60.0, 80.0);
@@ -1041,7 +1041,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
SetSkill(SkillName.Meditation, 60.0, 80.0);
SetSkill(SkillName.Focus, 60.0, 80.0);
@@ -1105,7 +1105,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
SetSkill(SkillName.Meditation, 60.0, 80.0);
SetSkill(SkillName.Focus, 60.0, 80.0);
@@ -1164,7 +1164,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
SetSkill(SkillName.Meditation, 60.0, 80.0);
SetSkill(SkillName.Focus, 60.0, 80.0);
@@ -1221,7 +1221,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
AddItem(new ElvenBoots());
AddItem(new LeafTonlet());
@@ -1267,7 +1267,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
SetSkill(SkillName.Meditation, 60.0, 80.0);
SetSkill(SkillName.Focus, 60.0, 80.0);
@@ -1311,4 +1311,4 @@ namespace Server.Engines.MLQuests.Definitions
}
#endregion
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/MLQuests/Definitions/Spellweaving.cs b/Scripts/Engines/MLQuests/Definitions/Spellweaving.cs
index f4df926c5..9d89456c8 100644
--- a/Scripts/Engines/MLQuests/Definitions/Spellweaving.cs
+++ b/Scripts/Engines/MLQuests/Definitions/Spellweaving.cs
@@ -495,7 +495,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
SetSkill(SkillName.Meditation, 60.0, 80.0);
SetSkill(SkillName.Focus, 60.0, 80.0);
@@ -553,7 +553,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
SetSkill(SkillName.Meditation, 60.0, 80.0);
SetSkill(SkillName.Focus, 60.0, 80.0);
@@ -620,7 +620,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
SetSkill(SkillName.Meditation, 60.0, 80.0);
SetSkill(SkillName.Focus, 60.0, 80.0);
@@ -680,7 +680,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
SetSkill(SkillName.Meditation, 60.0, 80.0);
SetSkill(SkillName.Focus, 60.0, 80.0);
@@ -724,4 +724,4 @@ namespace Server.Engines.MLQuests.Definitions
}
#endregion
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/MLQuests/Definitions/TheAncientWorld.cs b/Scripts/Engines/MLQuests/Definitions/TheAncientWorld.cs
index affbc8551..1902d85f7 100644
--- a/Scripts/Engines/MLQuests/Definitions/TheAncientWorld.cs
+++ b/Scripts/Engines/MLQuests/Definitions/TheAncientWorld.cs
@@ -122,7 +122,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
SetSkill(SkillName.Meditation, 60.0, 80.0);
SetSkill(SkillName.Focus, 60.0, 80.0);
@@ -163,4 +163,4 @@ namespace Server.Engines.MLQuests.Definitions
}
#endregion
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/MLQuests/Definitions/UnfadingMemories.cs b/Scripts/Engines/MLQuests/Definitions/UnfadingMemories.cs
index 1bfdff0ab..1b48c0eed 100644
--- a/Scripts/Engines/MLQuests/Definitions/UnfadingMemories.cs
+++ b/Scripts/Engines/MLQuests/Definitions/UnfadingMemories.cs
@@ -115,7 +115,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
AddItem(new Backpack());
AddItem(new Sandals(0x72B));
@@ -162,7 +162,7 @@ namespace Server.Engines.MLQuests.Definitions
Hue = Race.RandomSkinHue();
InitStats(100, 100, 25);
- Utility.AssignRandomHair(this, true);
+ Utility.AssignRandomHair(this);
AddItem(new Backpack());
AddItem(new Sandals(0x8FD));
@@ -193,4 +193,4 @@ namespace Server.Engines.MLQuests.Definitions
}
#endregion
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/MLQuests/Gumps/BaseQuestGump.cs b/Scripts/Engines/MLQuests/Gumps/BaseQuestGump.cs
index 984d6adff..593c9a89b 100644
--- a/Scripts/Engines/MLQuests/Gumps/BaseQuestGump.cs
+++ b/Scripts/Engines/MLQuests/Gumps/BaseQuestGump.cs
@@ -93,7 +93,7 @@ namespace Server.Engines.MLQuests.Gumps
AddButton( 275, 430, (int)ButtonGraphic.Continue, (int)ButtonGraphic.Continue + 2, 0, GumpButtonType.Page, m_Page + 1 );
foreach ( ButtonInfo button in m_Buttons )
- AddButton( button.Position == ButtonPosition.Left ? 95 : 313, 455, (int)button.Graphic, (int)button.Graphic + 2, button.ButtonID, GumpButtonType.Reply, 0 );
+ AddButton( button.Position == ButtonPosition.Left ? 95 : 313, 455, (int)button.Graphic, (int)button.Graphic + 2, button.ButtonID, );
if ( m_Title != null )
AddHtmlLocalized( 130, 68, 220, 48, 1114513, m_Title, 0x2710, false, false ); //
~1_TOKEN~
@@ -131,7 +131,7 @@ namespace Server.Engines.MLQuests.Gumps
AddImage(379, 60, 0x15A9);
AddImage(425, 0, 0x28C9);
AddImage(90, 33, 0x232D);
- AddHtmlLocalized(130, 45, 270, 16, label, 0xFFFFFF, false, false);
+ AddHtmlLocalized(130, 45, 270, 16, label, 0xFFFFFF);
AddImageTiled(130, 65, 175, 1, 0x238D);
}
@@ -149,11 +149,10 @@ namespace Server.Engines.MLQuests.Gumps
foreach (ButtonInfo button in m_Buttons)
AddButton(button.Position == ButtonPosition.Left ? 95 : 313, 455, (int)button.Graphic,
- (int)button.Graphic + 2, button.ButtonID, GumpButtonType.Reply, 0);
+ (int)button.Graphic + 2, button.ButtonID);
if (m_Title != null)
- AddHtmlLocalized(130, 68, 220, 48, 1114513, m_Title, 0x2710, false,
- false); // ~1_TOKEN~
+ AddHtmlLocalized(130, 68, 220, 48, 1114513, m_Title, 0x2710); // ~1_TOKEN~
}
#endif
@@ -179,16 +178,14 @@ namespace Server.Engines.MLQuests.Gumps
public void AddDescription(MLQuest quest)
{
- AddHtmlLocalized(98, 140, 312, 16, quest.IsChainTriggered || quest.NextQuest != null ? 1075024 : 1072202, 0x2710,
- false, false); // Description [(quest chain)]
+ AddHtmlLocalized(98, 140, 312, 16, quest.IsChainTriggered || quest.NextQuest != null ? 1075024 : 1072202, 0x2710); // Description [(quest chain)]
TextDefinition.AddHtmlText(this, 98, 156, 312, 240, quest.Description, false, true, 0x15F90, 0xBDE784);
}
public void AddObjectives(MLQuest quest)
{
- AddHtmlLocalized(98, 140, 312, 16, 1049073, 0x2710, false, false); // Objective:
- AddHtmlLocalized(98, 156, 312, 16, quest.ObjectiveType == ObjectiveType.All ? 1072208 : 1072209, 0x2710, false,
- false); // All of the following / Only one of the following
+ AddHtmlLocalized(98, 140, 312, 16, 1049073, 0x2710); // Objective:
+ AddHtmlLocalized(98, 156, 312, 16, quest.ObjectiveType == ObjectiveType.All ? 1072208 : 1072209, 0x2710); // All of the following / Only one of the following
int y = 172;
@@ -210,9 +207,8 @@ namespace Server.Engines.MLQuests.Gumps
{
MLQuest quest = instance.Quest;
- AddHtmlLocalized(98, 140, 312, 16, 1049073, 0x2710, false, false); // Objective:
- AddHtmlLocalized(98, 156, 312, 16, quest.ObjectiveType == ObjectiveType.All ? 1072208 : 1072209, 0x2710, false,
- false); // All of the following / Only one of the following
+ AddHtmlLocalized(98, 140, 312, 16, 1049073, 0x2710); // Objective:
+ AddHtmlLocalized(98, 156, 312, 16, quest.ObjectiveType == ObjectiveType.All ? 1072208 : 1072209, 0x2710); // All of the following / Only one of the following
int y = 172;
@@ -222,14 +218,14 @@ namespace Server.Engines.MLQuests.Gumps
public void AddRewardsPage(MLQuest quest) // For the quest log/offer gumps
{
- AddHtmlLocalized(98, 140, 312, 16, 1072201, 0x2710, false, false); // Reward
+ AddHtmlLocalized(98, 140, 312, 16, 1072201, 0x2710); // Reward
int y = 162;
if (quest.Rewards.Count > 1)
{
// TODO: Is this what this is for? Does "Only one of the following" occur?
- AddHtmlLocalized(98, 156, 312, 16, 1072208, 0x2710, false, false); // All of the following
+ AddHtmlLocalized(98, 156, 312, 16, 1072208, 0x2710); // All of the following
y += 16;
}
@@ -243,7 +239,7 @@ namespace Server.Engines.MLQuests.Gumps
if (quest.Rewards.Count > 1)
{
// TODO: Is this what this is for? Does "Only one of the following" occur?
- AddHtmlLocalized(100, 140, 312, 16, 1072208, 0x2710, false, false); // All of the following
+ AddHtmlLocalized(100, 140, 312, 16, 1072208, 0x2710); // All of the following
y += 16;
}
@@ -292,4 +288,4 @@ namespace Server.Engines.MLQuests.Gumps
pm.CloseGump();
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/MLQuests/Gumps/QuestCancelConfirmGump.cs b/Scripts/Engines/MLQuests/Gumps/QuestCancelConfirmGump.cs
index 708f68268..8dbdde61c 100644
--- a/Scripts/Engines/MLQuests/Gumps/QuestCancelConfirmGump.cs
+++ b/Scripts/Engines/MLQuests/Gumps/QuestCancelConfirmGump.cs
@@ -8,12 +8,7 @@ namespace Server.Engines.MLQuests.Gumps
private bool m_CloseGumps;
private MLQuestInstance m_Instance;
- public QuestCancelConfirmGump(MLQuestInstance instance)
- : this(instance, true)
- {
- }
-
- public QuestCancelConfirmGump(MLQuestInstance instance, bool closeGumps)
+ public QuestCancelConfirmGump(MLQuestInstance instance, bool closeGumps = true)
: base(120, 50)
{
m_Instance = instance;
@@ -50,7 +45,7 @@ namespace Server.Engines.MLQuests.Gumps
AddImage(2, 248, 0x2716);
AddImage(2, 2, 0x2716);
- AddHtmlLocalized(25, 22, 200, 20, 1049000, 0x7D00, false, false); // Confirm Quest Cancellation
+ AddHtmlLocalized(25, 22, 200, 20, 1049000, 0x7D00); // Confirm Quest Cancellation
AddImage(25, 40, 0xBBF);
/*
@@ -60,24 +55,23 @@ namespace Server.Engines.MLQuests.Gumps
*
* Are you certain you wish to cancel at this time?
*/
- AddHtmlLocalized(25, 55, 300, 120, 1060836, 0xFFFFFF, false, false);
+ AddHtmlLocalized(25, 55, 300, 120, 1060836, 0xFFFFFF);
MLQuest quest = instance.Quest;
if (quest.IsChainTriggered || quest.NextQuest != null)
{
AddRadio(25, 145, 0x25F8, 0x25FB, false, 2);
- AddHtmlLocalized(60, 150, 280, 20, 1075023, 0xFFFFFF, false,
- false); // Yes, I want to quit this entire chain!
+ AddHtmlLocalized(60, 150, 280, 20, 1075023, 0xFFFFFF); // Yes, I want to quit this entire chain!
}
AddRadio(25, 180, 0x25F8, 0x25FB, true, 1);
- AddHtmlLocalized(60, 185, 280, 20, 1049005, 0xFFFFFF, false, false); // Yes, I really want to quit this quest!
+ AddHtmlLocalized(60, 185, 280, 20, 1049005, 0xFFFFFF); // Yes, I really want to quit this quest!
AddRadio(25, 215, 0x25F8, 0x25FB, false, 0);
- AddHtmlLocalized(60, 220, 280, 20, 1049006, 0xFFFFFF, false, false); // No, I don't want to quit.
+ AddHtmlLocalized(60, 220, 280, 20, 1049006, 0xFFFFFF); // No, I don't want to quit.
- AddButton(265, 220, 0xF7, 0xF8, 7, GumpButtonType.Reply, 0);
+ AddButton(265, 220, 0xF7, 0xF8, 7);
}
public override void OnResponse(NetState sender, RelayInfo info)
@@ -100,4 +94,4 @@ namespace Server.Engines.MLQuests.Gumps
}
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/MLQuests/Gumps/QuestLogDetailedGump.cs b/Scripts/Engines/MLQuests/Gumps/QuestLogDetailedGump.cs
index 1829c8de9..5a74e17bc 100644
--- a/Scripts/Engines/MLQuests/Gumps/QuestLogDetailedGump.cs
+++ b/Scripts/Engines/MLQuests/Gumps/QuestLogDetailedGump.cs
@@ -9,12 +9,7 @@ namespace Server.Engines.MLQuests.Gumps
private bool m_CloseGumps;
private MLQuestInstance m_Instance;
- public QuestLogDetailedGump(MLQuestInstance instance)
- : this(instance, true)
- {
- }
-
- public QuestLogDetailedGump(MLQuestInstance instance, bool closeGumps)
+ public QuestLogDetailedGump(MLQuestInstance instance, bool closeGumps = true)
: base(1046026) // Quest Log
{
m_Instance = instance;
@@ -39,7 +34,7 @@ namespace Server.Engines.MLQuests.Gumps
AddDescription(quest);
if (instance.Failed) // only displayed on the first page
- AddHtmlLocalized(160, 80, 250, 16, 500039, 0x3C00, false, false); // Failed!
+ AddHtmlLocalized(160, 80, 250, 16, 500039, 0x3C00); // Failed!
BuildPage();
AddObjectivesProgress(instance);
diff --git a/Scripts/Engines/MLQuests/Gumps/QuestLogGump.cs b/Scripts/Engines/MLQuests/Gumps/QuestLogGump.cs
index efbcc89ba..84f13cdcf 100644
--- a/Scripts/Engines/MLQuests/Gumps/QuestLogGump.cs
+++ b/Scripts/Engines/MLQuests/Gumps/QuestLogGump.cs
@@ -10,12 +10,7 @@ namespace Server.Engines.MLQuests.Gumps
private bool m_CloseGumps;
private PlayerMobile m_Owner;
- public QuestLogGump(PlayerMobile pm)
- : this(pm, true)
- {
- }
-
- public QuestLogGump(PlayerMobile pm, bool closeGumps)
+ public QuestLogGump(PlayerMobile pm, bool closeGumps = true)
: base(1046026) // Quest Log
{
m_Owner = pm;
diff --git a/Scripts/Engines/MLQuests/Gumps/RaceChangeGump.cs b/Scripts/Engines/MLQuests/Gumps/RaceChangeGump.cs
index 1d919bde9..11ae33826 100644
--- a/Scripts/Engines/MLQuests/Gumps/RaceChangeGump.cs
+++ b/Scripts/Engines/MLQuests/Gumps/RaceChangeGump.cs
@@ -38,16 +38,14 @@ namespace Server.Engines.MLQuests.Gumps
AddBackground(0, 0, 240, 135, 0x2422);
if (targetRace == Race.Human)
- AddHtmlLocalized(15, 15, 210, 75, 1073643, 0, false,
- false); // Are you sure you wish to embrace your humanity?
+ AddHtmlLocalized(15, 15, 210, 75, 1073643, 0); // Are you sure you wish to embrace your humanity?
else if (targetRace == Race.Elf)
- AddHtmlLocalized(15, 15, 210, 75, 1073642, 0, false,
- false); // Are you sure you want to follow the elven ways?
+ AddHtmlLocalized(15, 15, 210, 75, 1073642, 0); // Are you sure you want to follow the elven ways?
else
- AddHtml(15, 15, 210, 75, $"Are you sure you want to change your race to {targetRace.Name}?", false, false);
+ AddHtml(15, 15, 210, 75, $"Are you sure you want to change your race to {targetRace.Name}?");
- AddButton(160, 95, 0xF7, 0xF8, 1, GumpButtonType.Reply, 0);
- AddButton(90, 95, 0xF2, 0xF1, 0, GumpButtonType.Reply, 0);
+ AddButton(160, 95, 0xF7, 0xF8, 1);
+ AddButton(90, 95, 0xF2, 0xF1, 0);
}
public override void OnResponse(NetState sender, RelayInfo info)
@@ -186,7 +184,7 @@ namespace Server.Engines.MLQuests.Gumps
return;
}
- if (!CanChange(pm, targetRace) || owner != null && !owner.CheckComplete(pm))
+ if (!CanChange(pm, targetRace) || owner?.CheckComplete(pm) == false)
return;
int hue = pvSrc.ReadUInt16();
diff --git a/Scripts/Engines/MLQuests/Items/Bleach.cs b/Scripts/Engines/MLQuests/Items/Bleach.cs
index 43512c436..da0e7446f 100644
--- a/Scripts/Engines/MLQuests/Items/Bleach.cs
+++ b/Scripts/Engines/MLQuests/Items/Bleach.cs
@@ -3,7 +3,7 @@ namespace Server.Items
public class Bleach : PigmentsOfTokuno
{
[Constructible]
- public Bleach() : base(PigmentType.None)
+ public Bleach()
{
LootType = LootType.Blessed;
}
diff --git a/Scripts/Engines/MLQuests/Items/GamanHorns.cs b/Scripts/Engines/MLQuests/Items/GamanHorns.cs
index 59372017f..34243625e 100644
--- a/Scripts/Engines/MLQuests/Items/GamanHorns.cs
+++ b/Scripts/Engines/MLQuests/Items/GamanHorns.cs
@@ -3,12 +3,7 @@ namespace Server.Items
public class GamanHorns : Item
{
[Constructible]
- public GamanHorns() : this(1)
- {
- }
-
- [Constructible]
- public GamanHorns(int amount) : base(0x1084)
+ public GamanHorns(int amount = 1) : base(0x1084)
{
LootType = LootType.Blessed;
Stackable = true;
@@ -36,4 +31,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/MLQuests/Items/PixieLeg.cs b/Scripts/Engines/MLQuests/Items/PixieLeg.cs
index 3b546ab4c..44f0d7313 100644
--- a/Scripts/Engines/MLQuests/Items/PixieLeg.cs
+++ b/Scripts/Engines/MLQuests/Items/PixieLeg.cs
@@ -3,12 +3,7 @@ namespace Server.Items
public class PixieLeg : ChickenLeg
{
[Constructible]
- public PixieLeg() : this(1)
- {
- }
-
- [Constructible]
- public PixieLeg(int amount) : base(amount)
+ public PixieLeg(int amount = 1) : base(amount)
{
LootType = LootType.Blessed;
Hue = 0x1C2;
@@ -34,4 +29,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
-}
\ No newline at end of file
+}
diff --git a/Scripts/Engines/MLQuests/Items/QuestGiverItem.cs b/Scripts/Engines/MLQuests/Items/QuestGiverItem.cs
index 75f2bf189..6617302fa 100644
--- a/Scripts/Engines/MLQuests/Items/QuestGiverItem.cs
+++ b/Scripts/Engines/MLQuests/Items/QuestGiverItem.cs
@@ -24,21 +24,8 @@ namespace Server.Engines.MLQuests.Items
public override bool Nontransferable => true;
- public List MLQuests
- {
- get
- {
- if (m_MLQuests == null)
- {
- m_MLQuests = MLQuestSystem.FindQuestList(GetType());
-
- if (m_MLQuests == null)
- m_MLQuests = MLQuestSystem.EmptyList;
- }
-
- return m_MLQuests;
- }
- }
+ public List MLQuests => m_MLQuests ??
+ (m_MLQuests = MLQuestSystem.FindQuestList(GetType()) ?? MLQuestSystem.EmptyList);
public override void AddNameProperties(ObjectPropertyList list)
{
@@ -101,21 +88,8 @@ namespace Server.Engines.MLQuests.Items
public override bool Nontransferable => true;
- public List MLQuests
- {
- get
- {
- if (m_MLQuests == null)
- {
- m_MLQuests = MLQuestSystem.FindQuestList(GetType());
-
- if (m_MLQuests == null)
- m_MLQuests = MLQuestSystem.EmptyList;
- }
-
- return m_MLQuests;
- }
- }
+ public List