warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleanup & Fixes for .NET 5 (#309)

Browse source 
- [X] Fixes several bugs
- [X] Updates more ordinal issues
- [X] Cleans up the code a bit
- [X] Turns classes static that should have been
- [X] Changes TcpServer.Instances to a HashSet

Bumps release version
This commit is contained in:
Kamron Batman 2020-11-15 10:03:50 -08:00 • committed by GitHub
parent 4ad8811df2
commit 525cda5413
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
266 changed files with 1348 additions and 1800 deletions
Download patch file Download diff file Expand all files Collapse all files

76
Projects/UOContent/Commands/Object Creation/Add.cs
View file

@ -8,7 +8,7 @@ using CPA = Server.CommandPropertyAttribute;
namespace Server.Commands
{
public class Add
public static class Add
{
private static readonly Type m_EntityType = typeof(IEntity);
@ -72,7 +72,7 @@ namespace Server.Commands
sb.AppendFormat("from {0} to {1} in {2}", start, end, from.Map);
}
sb.Append(":");
sb.Append(':');
for (var i = 0; i < args.Length; ++i)
{
@ -300,7 +300,7 @@ namespace Server.Commands
object obj = value;
if (value?.StartsWith("0x") == true)
if (value?.StartsWith("0x", StringComparison.Ordinal) == true)
{
if (IsSignedNumeric(type))
{
@ -670,91 +670,81 @@ namespace Server.Commands
}
}
[Usage("Tile <name> [params] [set {<propertyName> <value> ...}]")]
[Description(
"Tiles an item or npc by name into a targeted bounding box. Optional constructor parameters. Optional set property list."
)]
[Usage("Tile <name> [params] [set {<propertyName> <value> ...}]"), Description(
"Tiles an item or npc by name into a targeted bounding box. Optional constructor parameters. Optional set property list."
)]
public static void Tile_OnCommand(CommandEventArgs e)
{
Internal_OnCommand(e, false);
}
[Usage("TileRXYZ <x> <y> <w> <h> <z> <name> [params] [set {<propertyName> <value> ...}]")]
[Description(
"Tiles an item or npc by name into a given bounding box, (x, y) parameters are relative to your characters position. Optional constructor parameters. Optional set property list."
)]
[Usage("TileRXYZ <x> <y> <w> <h> <z> <name> [params] [set {<propertyName> <value> ...}]"), Description(
"Tiles an item or npc by name into a given bounding box, (x, y) parameters are relative to your characters position. Optional constructor parameters. Optional set property list."
)]
public static void TileRXYZ_OnCommand(CommandEventArgs e)
{
InternalRXYZ_OnCommand(e, false);
}
[Usage("TileXYZ <x> <y> <w> <h> <z> <name> [params] [set {<propertyName> <value> ...}]")]
[Description(
"Tiles an item or npc by name into a given bounding box. Optional constructor parameters. Optional set property list."
)]
[Usage("TileXYZ <x> <y> <w> <h> <z> <name> [params] [set {<propertyName> <value> ...}]"), Description(
"Tiles an item or npc by name into a given bounding box. Optional constructor parameters. Optional set property list."
)]
public static void TileXYZ_OnCommand(CommandEventArgs e)
{
InternalXYZ_OnCommand(e, false);
}
[Usage("TileZ <z> <name> [params] [set {<propertyName> <value> ...}]")]
[Description(
"Tiles an item or npc by name into a targeted bounding box at a fixed Z location. Optional constructor parameters. Optional set property list."
)]
[Usage("TileZ <z> <name> [params] [set {<propertyName> <value> ...}]"), Description(
"Tiles an item or npc by name into a targeted bounding box at a fixed Z location. Optional constructor parameters. Optional set property list."
)]
public static void TileZ_OnCommand(CommandEventArgs e)
{
InternalZ_OnCommand(e, false);
}
[Usage("TileAvg <name> [params] [set {<propertyName> <value> ...}]")]
[Description(
"Tiles an item or npc by name into a targeted bounding box on the map's average Z elevation. Optional constructor parameters. Optional set property list."
)]
[Usage("TileAvg <name> [params] [set {<propertyName> <value> ...}]"), Description(
"Tiles an item or npc by name into a targeted bounding box on the map's average Z elevation. Optional constructor parameters. Optional set property list."
)]
public static void TileAvg_OnCommand(CommandEventArgs e)
{
InternalAvg_OnCommand(e, false);
}
[Usage("Outline <name> [params] [set {<propertyName> <value> ...}]")]
[Description(
"Tiles an item or npc by name around a targeted bounding box. Optional constructor parameters. Optional set property list."
)]
[Usage("Outline <name> [params] [set {<propertyName> <value> ...}]"), Description(
"Tiles an item or npc by name around a targeted bounding box. Optional constructor parameters. Optional set property list."
)]
public static void Outline_OnCommand(CommandEventArgs e)
{
Internal_OnCommand(e, true);
}
[Usage("OutlineRXYZ <x> <y> <w> <h> <z> <name> [params] [set {<propertyName> <value> ...}]")]
[Description(
"Tiles an item or npc by name around a given bounding box, (x, y) parameters are relative to your characters position. Optional constructor parameters. Optional set property list."
)]
[Usage("OutlineRXYZ <x> <y> <w> <h> <z> <name> [params] [set {<propertyName> <value> ...}]"), Description(
"Tiles an item or npc by name around a given bounding box, (x, y) parameters are relative to your characters position. Optional constructor parameters. Optional set property list."
)]
public static void OutlineRXYZ_OnCommand(CommandEventArgs e)
{
InternalRXYZ_OnCommand(e, true);
}
[Usage("OutlineXYZ <x> <y> <w> <h> <z> <name> [params] [set {<propertyName> <value> ...}]")]
[Description(
"Tiles an item or npc by name around a given bounding box. Optional constructor parameters. Optional set property list."
)]
[Usage("OutlineXYZ <x> <y> <w> <h> <z> <name> [params] [set {<propertyName> <value> ...}]"), Description(
"Tiles an item or npc by name around a given bounding box. Optional constructor parameters. Optional set property list."
)]
public static void OutlineXYZ_OnCommand(CommandEventArgs e)
{
InternalXYZ_OnCommand(e, true);
}
[Usage("OutlineZ <z> <name> [params] [set {<propertyName> <value> ...}]")]
[Description(
"Tiles an item or npc by name around a targeted bounding box at a fixed Z location. Optional constructor parameters. Optional set property list."
)]
[Usage("OutlineZ <z> <name> [params] [set {<propertyName> <value> ...}]"), Description(
"Tiles an item or npc by name around a targeted bounding box at a fixed Z location. Optional constructor parameters. Optional set property list."
)]
public static void OutlineZ_OnCommand(CommandEventArgs e)
{
InternalZ_OnCommand(e, true);
}
[Usage("OutlineAvg <name> [params] [set {<propertyName> <value> ...}]")]
[Description(
"Tiles an item or npc by name around a targeted bounding box on the map's average Z elevation. Optional constructor parameters. Optional set property list."
)]
[Usage("OutlineAvg <name> [params] [set {<propertyName> <value> ...}]"), Description(
"Tiles an item or npc by name around a targeted bounding box on the map's average Z elevation. Optional constructor parameters. Optional set property list."
)]
public static void OutlineAvg_OnCommand(CommandEventArgs e)
{
InternalAvg_OnCommand(e, true);

9
Projects/UOContent/Commands/Object Creation/AddGump.cs
View file

@ -93,10 +93,9 @@ namespace Server.Gumps
CommandSystem.Register("AddMenu", AccessLevel.GameMaster, AddMenu_OnCommand);
}
[Usage("AddMenu [searchString]")]
[Description(
"Opens an add menu, with an optional initial search string. This menu allows you to search for Items or Mobiles and add them interactively."
)]
[Usage("AddMenu [searchString]"), Description(
"Opens an add menu, with an optional initial search string. This menu allows you to search for Items or Mobiles and add them interactively."
)]
private static void AddMenu_OnCommand(CommandEventArgs e)
{
var val = e.ArgString.Trim();
@ -135,7 +134,7 @@ namespace Server.Gumps
var t = types[i];
if ((typeofMobile.IsAssignableFrom(t) || typeofItem.IsAssignableFrom(t)) &&
t.Name.ToLower().IndexOf(match, StringComparison.Ordinal) >= 0 && !results.Contains(t))
t.Name.ToLower().Contains(match, StringComparison.Ordinal) && !results.Contains(t))
{
var ctors = t.GetConstructors();

5
Projects/UOContent/Commands/Object Creation/Categorization.cs
View file

@ -48,8 +48,7 @@ namespace Server.Commands
CommandSystem.Register("RebuildCategorization", AccessLevel.Administrator, RebuildCategorization_OnCommand);
}
[Usage("RebuildCategorization")]
[Description("Rebuilds the categorization data file used by the Add command.")]
[Usage("RebuildCategorization"), Description("Rebuilds the categorization data file used by the Add command.")]
public static void RebuildCategorization_OnCommand(CommandEventArgs e)
{
var root = new CategoryEntry(null, "Add Menu", new[] { Items, Mobiles });
@ -305,7 +304,7 @@ namespace Server.Commands
var text = lines[index].Text;
var start = text.IndexOf('(');
var start = text.IndexOf('(', StringComparison.Ordinal);
if (start < 0)
{

283
Projects/UOContent/Commands/Object Creation/Decorate.cs
View file

@ -20,8 +20,7 @@ namespace Server.Commands
CommandSystem.Register("Decorate", AccessLevel.Administrator, Decorate_OnCommand);
}
[Usage("Decorate")]
[Description("Generates world decoration.")]
[Usage("Decorate"), Description("Generates world decoration.")]
private static void Decorate_OnCommand(CommandEventArgs e)
{
m_Mobile = e.Mobile;
@ -104,9 +103,9 @@ namespace Server.Commands
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("LabelNumber"))
if (m_Params[i].StartsWith("LabelNumber", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -124,9 +123,9 @@ namespace Server.Commands
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("LabelNumber"))
if (m_Params[i].StartsWith("LabelNumber", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -172,9 +171,9 @@ namespace Server.Commands
{
locked = true;
}
else if (m_Params[i].StartsWith("TargetMap"))
else if (m_Params[i].StartsWith("TargetMap", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -201,54 +200,54 @@ namespace Server.Commands
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("Range"))
if (m_Params[i].StartsWith("Range", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
range = Utility.ToInt32(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("WarningString"))
else if (m_Params[i].StartsWith("WarningString", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
messageString = m_Params[i].Substring(++indexOf);
}
}
else if (m_Params[i].StartsWith("WarningNumber"))
else if (m_Params[i].StartsWith("WarningNumber", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
messageNumber = Utility.ToInt32(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("HintString"))
else if (m_Params[i].StartsWith("HintString", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
hintString = m_Params[i].Substring(++indexOf);
}
}
else if (m_Params[i].StartsWith("HintNumber"))
else if (m_Params[i].StartsWith("HintNumber", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
hintNumber = Utility.ToInt32(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("ResetDelay"))
else if (m_Params[i].StartsWith("ResetDelay", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -274,36 +273,36 @@ namespace Server.Commands
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("Range"))
if (m_Params[i].StartsWith("Range", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
range = Utility.ToInt32(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("WarningString"))
else if (m_Params[i].StartsWith("WarningString", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
messageString = m_Params[i].Substring(++indexOf);
}
}
else if (m_Params[i].StartsWith("WarningNumber"))
else if (m_Params[i].StartsWith("WarningNumber", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
messageNumber = Utility.ToInt32(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("ResetDelay"))
else if (m_Params[i].StartsWith("ResetDelay", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -325,9 +324,9 @@ namespace Server.Commands
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("CannonDirection"))
if (m_Params[i].StartsWith("CannonDirection", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -349,27 +348,27 @@ namespace Server.Commands
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("Word"))
if (m_Params[i].StartsWith("Word", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
word = m_Params[i].Substring(++indexOf);
}
}
else if (m_Params[i].StartsWith("DestStart"))
else if (m_Params[i].StartsWith("DestStart", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
destination.Start = Point2D.Parse(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("DestEnd"))
else if (m_Params[i].StartsWith("DestEnd", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -387,9 +386,9 @@ namespace Server.Commands
for (var i = 0; !fill && i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("Content"))
if (m_Params[i].StartsWith("Content", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -418,9 +417,9 @@ namespace Server.Commands
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("Facing"))
if (m_Params[i].StartsWith("Facing", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -448,9 +447,9 @@ namespace Server.Commands
{
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("SpawnLocation"))
if (m_Params[i].StartsWith("SpawnLocation", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -516,45 +515,45 @@ namespace Server.Commands
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("Spawn"))
if (m_Params[i].StartsWith("Spawn", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
sp.AddEntry(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("MinDelay"))
else if (m_Params[i].StartsWith("MinDelay", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
sp.MinDelay = TimeSpan.Parse(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("MaxDelay"))
else if (m_Params[i].StartsWith("MaxDelay", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
sp.MaxDelay = TimeSpan.Parse(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("NextSpawn"))
else if (m_Params[i].StartsWith("NextSpawn", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
sp.NextSpawn = TimeSpan.Parse(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("Count"))
else if (m_Params[i].StartsWith("Count", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -565,36 +564,36 @@ namespace Server.Commands
}
}
}
else if (m_Params[i].StartsWith("Team"))
else if (m_Params[i].StartsWith("Team", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
sp.Team = Utility.ToInt32(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("HomeRange"))
else if (m_Params[i].StartsWith("HomeRange", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
sp.HomeRange = Utility.ToInt32(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("Running"))
else if (m_Params[i].StartsWith("Running", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
sp.Running = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("Group"))
else if (m_Params[i].StartsWith("Group", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -607,36 +606,36 @@ namespace Server.Commands
{
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("Description"))
if (m_Params[i].StartsWith("Description", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
rune.Description = m_Params[i].Substring(++indexOf);
}
}
else if (m_Params[i].StartsWith("Marked"))
else if (m_Params[i].StartsWith("Marked", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
rune.Marked = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("TargetMap"))
else if (m_Params[i].StartsWith("TargetMap", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
rune.TargetMap = Map.Parse(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("Target"))
else if (m_Params[i].StartsWith("Target", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -649,108 +648,108 @@ namespace Server.Commands
{
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("Skill"))
if (m_Params[i].StartsWith("Skill", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
st.Skill = (SkillName)Enum.Parse(typeof(SkillName), m_Params[i].Substring(++indexOf), true);
}
}
else if (m_Params[i].StartsWith("RequiredFixedPoint"))
else if (m_Params[i].StartsWith("RequiredFixedPoint", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
st.Required = Utility.ToInt32(m_Params[i].Substring(++indexOf)) * 0.1;
}
}
else if (m_Params[i].StartsWith("Required"))
else if (m_Params[i].StartsWith("Required", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
st.Required = Utility.ToDouble(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("MessageString"))
else if (m_Params[i].StartsWith("MessageString", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
st.MessageString = m_Params[i].Substring(++indexOf);
}
}
else if (m_Params[i].StartsWith("MessageNumber"))
else if (m_Params[i].StartsWith("MessageNumber", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
st.MessageNumber = Utility.ToInt32(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("PointDest"))
else if (m_Params[i].StartsWith("PointDest", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
st.PointDest = Point3D.Parse(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("MapDest"))
else if (m_Params[i].StartsWith("MapDest", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
st.MapDest = Map.Parse(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("Creatures"))
else if (m_Params[i].StartsWith("Creatures", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
st.Creatures = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("SourceEffect"))
else if (m_Params[i].StartsWith("SourceEffect", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
st.SourceEffect = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("DestEffect"))
else if (m_Params[i].StartsWith("DestEffect", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
st.DestEffect = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("SoundID"))
else if (m_Params[i].StartsWith("SoundID", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
st.SoundID = Utility.ToInt32(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("Delay"))
else if (m_Params[i].StartsWith("Delay", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -768,90 +767,90 @@ namespace Server.Commands
{
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("Substring"))
if (m_Params[i].StartsWith("Substring", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
kt.Substring = m_Params[i].Substring(++indexOf);
}
}
else if (m_Params[i].StartsWith("Keyword"))
else if (m_Params[i].StartsWith("Keyword", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
kt.Keyword = Utility.ToInt32(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("Range"))
else if (m_Params[i].StartsWith("Range", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
kt.Range = Utility.ToInt32(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("PointDest"))
else if (m_Params[i].StartsWith("PointDest", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
kt.PointDest = Point3D.Parse(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("MapDest"))
else if (m_Params[i].StartsWith("MapDest", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
kt.MapDest = Map.Parse(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("Creatures"))
else if (m_Params[i].StartsWith("Creatures", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
kt.Creatures = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("SourceEffect"))
else if (m_Params[i].StartsWith("SourceEffect", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
kt.SourceEffect = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("DestEffect"))
else if (m_Params[i].StartsWith("DestEffect", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
kt.DestEffect = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("SoundID"))
else if (m_Params[i].StartsWith("SoundID", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
kt.SoundID = Utility.ToInt32(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("Delay"))
else if (m_Params[i].StartsWith("Delay", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -869,63 +868,63 @@ namespace Server.Commands
{
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("PointDest"))
if (m_Params[i].StartsWith("PointDest", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
tp.PointDest = Point3D.Parse(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("MapDest"))
else if (m_Params[i].StartsWith("MapDest", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
tp.MapDest = Map.Parse(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("Creatures"))
else if (m_Params[i].StartsWith("Creatures", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
tp.Creatures = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("SourceEffect"))
else if (m_Params[i].StartsWith("SourceEffect", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
tp.SourceEffect = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("DestEffect"))
else if (m_Params[i].StartsWith("DestEffect", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
tp.DestEffect = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("SoundID"))
else if (m_Params[i].StartsWith("SoundID", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
tp.SoundID = Utility.ToInt32(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("Delay"))
else if (m_Params[i].StartsWith("Delay", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -943,9 +942,9 @@ namespace Server.Commands
{
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("ContentType"))
if (m_Params[i].StartsWith("ContentType", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -972,18 +971,18 @@ namespace Server.Commands
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("Light"))
if (m_Params[i].StartsWith("Light", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
item.Light = (LightType)Enum.Parse(typeof(LightType), m_Params[i].Substring(++indexOf), true);
}
}
else if (m_Params[i].StartsWith("Hue"))
else if (m_Params[i].StartsWith("Hue", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -999,18 +998,18 @@ namespace Server.Commands
}
}
}
else if (m_Params[i].StartsWith("Name"))
else if (m_Params[i].StartsWith("Name", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
item.Name = m_Params[i].Substring(++indexOf);
}
}
else if (m_Params[i].StartsWith("Amount"))
else if (m_Params[i].StartsWith("Amount", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -1249,7 +1248,7 @@ namespace Server.Commands
{
line = line.Trim();
if (line.Length > 0 && !line.StartsWith("#"))
if (line.Length > 0 && !line.StartsWith("#", StringComparison.Ordinal))
{
break;
}
@ -1262,7 +1261,7 @@ namespace Server.Commands
var list = new DecorationList();
var indexOf = line.IndexOf(' ');
var indexOf = line.IndexOf(' ', StringComparison.Ordinal);
list.m_Type = AssemblyHandler.FindFirstTypeForName(line.Substring(0, indexOf++), true);
@ -1272,14 +1271,14 @@ namespace Server.Commands
}
line = line.Substring(indexOf);
indexOf = line.IndexOf('(');
indexOf = line.IndexOf('(', StringComparison.Ordinal);
if (indexOf >= 0)
{
list.m_ItemID = Utility.ToInt32(line.Substring(0, indexOf - 1));
var parms = line.Substring(++indexOf);
if (line.EndsWith(")"))
if (line.EndsWith(")", StringComparison.Ordinal))
{
parms = parms.Substring(0, parms.Length - 1);
}
@ -1308,7 +1307,7 @@ namespace Server.Commands
break;
}
if (line.StartsWith("#"))
if (line.StartsWith("#", StringComparison.Ordinal))
{
continue;
}
@ -1338,7 +1337,7 @@ namespace Server.Commands
public static void Pop(out string v, ref string line)
{
var space = line.IndexOf(' ');
var space = line.IndexOf(' ', StringComparison.Ordinal);
if (space >= 0)
{

283
Projects/UOContent/Commands/Object Creation/DecorateMag.cs
View file

@ -21,8 +21,7 @@ namespace Server.Commands
CommandSystem.Register("DecorateMag", AccessLevel.Administrator, DecorateMag_OnCommand);
}
[Usage("DecorateMag")]
[Description("Generates world decoration.")]
[Usage("DecorateMag"), Description("Generates world decoration.")]
private static void DecorateMag_OnCommand(CommandEventArgs e)
{
m_Mobile = e.Mobile;
@ -101,9 +100,9 @@ namespace Server.Commands
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("LabelNumber"))
if (m_Params[i].StartsWith("LabelNumber", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -121,9 +120,9 @@ namespace Server.Commands
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("LabelNumber"))
if (m_Params[i].StartsWith("LabelNumber", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -169,9 +168,9 @@ namespace Server.Commands
{
locked = true;
}
else if (m_Params[i].StartsWith("TargetMap"))
else if (m_Params[i].StartsWith("TargetMap", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -198,54 +197,54 @@ namespace Server.Commands
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("Range"))
if (m_Params[i].StartsWith("Range", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
range = Utility.ToInt32(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("WarningString"))
else if (m_Params[i].StartsWith("WarningString", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
messageString = m_Params[i].Substring(++indexOf);
}
}
else if (m_Params[i].StartsWith("WarningNumber"))
else if (m_Params[i].StartsWith("WarningNumber", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
messageNumber = Utility.ToInt32(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("HintString"))
else if (m_Params[i].StartsWith("HintString", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
hintString = m_Params[i].Substring(++indexOf);
}
}
else if (m_Params[i].StartsWith("HintNumber"))
else if (m_Params[i].StartsWith("HintNumber", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
hintNumber = Utility.ToInt32(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("ResetDelay"))
else if (m_Params[i].StartsWith("ResetDelay", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -271,36 +270,36 @@ namespace Server.Commands
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("Range"))
if (m_Params[i].StartsWith("Range", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
range = Utility.ToInt32(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("WarningString"))
else if (m_Params[i].StartsWith("WarningString", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
messageString = m_Params[i].Substring(++indexOf);
}
}
else if (m_Params[i].StartsWith("WarningNumber"))
else if (m_Params[i].StartsWith("WarningNumber", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
messageNumber = Utility.ToInt32(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("ResetDelay"))
else if (m_Params[i].StartsWith("ResetDelay", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -322,9 +321,9 @@ namespace Server.Commands
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("CannonDirection"))
if (m_Params[i].StartsWith("CannonDirection", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -346,27 +345,27 @@ namespace Server.Commands
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("Word"))
if (m_Params[i].StartsWith("Word", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
word = m_Params[i].Substring(++indexOf);
}
}
else if (m_Params[i].StartsWith("DestStart"))
else if (m_Params[i].StartsWith("DestStart", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
destination.Start = Point2D.Parse(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("DestEnd"))
else if (m_Params[i].StartsWith("DestEnd", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -384,9 +383,9 @@ namespace Server.Commands
for (var i = 0; !fill && i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("Content"))
if (m_Params[i].StartsWith("Content", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -415,9 +414,9 @@ namespace Server.Commands
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("Facing"))
if (m_Params[i].StartsWith("Facing", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -445,9 +444,9 @@ namespace Server.Commands
{
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("SpawnLocation"))
if (m_Params[i].StartsWith("SpawnLocation", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -513,45 +512,45 @@ namespace Server.Commands
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("Spawn"))
if (m_Params[i].StartsWith("Spawn", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
sp.AddEntry(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("MinDelay"))
else if (m_Params[i].StartsWith("MinDelay", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
sp.MinDelay = TimeSpan.Parse(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("MaxDelay"))
else if (m_Params[i].StartsWith("MaxDelay", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
sp.MaxDelay = TimeSpan.Parse(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("NextSpawn"))
else if (m_Params[i].StartsWith("NextSpawn", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
sp.NextSpawn = TimeSpan.Parse(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("Count"))
else if (m_Params[i].StartsWith("Count", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -562,36 +561,36 @@ namespace Server.Commands
}
}
}
else if (m_Params[i].StartsWith("Team"))
else if (m_Params[i].StartsWith("Team", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
sp.Team = Utility.ToInt32(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("HomeRange"))
else if (m_Params[i].StartsWith("HomeRange", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
sp.HomeRange = Utility.ToInt32(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("Running"))
else if (m_Params[i].StartsWith("Running", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
sp.Running = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("Group"))
else if (m_Params[i].StartsWith("Group", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -604,36 +603,36 @@ namespace Server.Commands
{
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("Description"))
if (m_Params[i].StartsWith("Description", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
rune.Description = m_Params[i].Substring(++indexOf);
}
}
else if (m_Params[i].StartsWith("Marked"))
else if (m_Params[i].StartsWith("Marked", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
rune.Marked = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("TargetMap"))
else if (m_Params[i].StartsWith("TargetMap", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
rune.TargetMap = Map.Parse(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("Target"))
else if (m_Params[i].StartsWith("Target", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -646,108 +645,108 @@ namespace Server.Commands
{
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("Skill"))
if (m_Params[i].StartsWith("Skill", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
st.Skill = (SkillName)Enum.Parse(typeof(SkillName), m_Params[i].Substring(++indexOf), true);
}
}
else if (m_Params[i].StartsWith("RequiredFixedPoint"))
else if (m_Params[i].StartsWith("RequiredFixedPoint", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
st.Required = Utility.ToInt32(m_Params[i].Substring(++indexOf)) * 0.1;
}
}
else if (m_Params[i].StartsWith("Required"))
else if (m_Params[i].StartsWith("Required", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
st.Required = Utility.ToDouble(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("MessageString"))
else if (m_Params[i].StartsWith("MessageString", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
st.MessageString = m_Params[i].Substring(++indexOf);
}
}
else if (m_Params[i].StartsWith("MessageNumber"))
else if (m_Params[i].StartsWith("MessageNumber", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
st.MessageNumber = Utility.ToInt32(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("PointDest"))
else if (m_Params[i].StartsWith("PointDest", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
st.PointDest = Point3D.Parse(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("MapDest"))
else if (m_Params[i].StartsWith("MapDest", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
st.MapDest = Map.Parse(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("Creatures"))
else if (m_Params[i].StartsWith("Creatures", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
st.Creatures = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("SourceEffect"))
else if (m_Params[i].StartsWith("SourceEffect", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
st.SourceEffect = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("DestEffect"))
else if (m_Params[i].StartsWith("DestEffect", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
st.DestEffect = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("SoundID"))
else if (m_Params[i].StartsWith("SoundID", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
st.SoundID = Utility.ToInt32(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("Delay"))
else if (m_Params[i].StartsWith("Delay", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -765,90 +764,90 @@ namespace Server.Commands
{
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("Substring"))
if (m_Params[i].StartsWith("Substring", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
kt.Substring = m_Params[i].Substring(++indexOf);
}
}
else if (m_Params[i].StartsWith("Keyword"))
else if (m_Params[i].StartsWith("Keyword", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
kt.Keyword = Utility.ToInt32(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("Range"))
else if (m_Params[i].StartsWith("Range", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
kt.Range = Utility.ToInt32(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("PointDest"))
else if (m_Params[i].StartsWith("PointDest", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
kt.PointDest = Point3D.Parse(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("MapDest"))
else if (m_Params[i].StartsWith("MapDest", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
kt.MapDest = Map.Parse(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("Creatures"))
else if (m_Params[i].StartsWith("Creatures", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
kt.Creatures = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("SourceEffect"))
else if (m_Params[i].StartsWith("SourceEffect", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
kt.SourceEffect = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("DestEffect"))
else if (m_Params[i].StartsWith("DestEffect", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
kt.DestEffect = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("SoundID"))
else if (m_Params[i].StartsWith("SoundID", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
kt.SoundID = Utility.ToInt32(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("Delay"))
else if (m_Params[i].StartsWith("Delay", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -866,63 +865,63 @@ namespace Server.Commands
{
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("PointDest"))
if (m_Params[i].StartsWith("PointDest", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
tp.PointDest = Point3D.Parse(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("MapDest"))
else if (m_Params[i].StartsWith("MapDest", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
tp.MapDest = Map.Parse(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("Creatures"))
else if (m_Params[i].StartsWith("Creatures", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
tp.Creatures = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("SourceEffect"))
else if (m_Params[i].StartsWith("SourceEffect", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
tp.SourceEffect = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("DestEffect"))
else if (m_Params[i].StartsWith("DestEffect", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
tp.DestEffect = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("SoundID"))
else if (m_Params[i].StartsWith("SoundID", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
tp.SoundID = Utility.ToInt32(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("Delay"))
else if (m_Params[i].StartsWith("Delay", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -940,9 +939,9 @@ namespace Server.Commands
{
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("ContentType"))
if (m_Params[i].StartsWith("ContentType", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -969,18 +968,18 @@ namespace Server.Commands
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("Light"))
if (m_Params[i].StartsWith("Light", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
item.Light = (LightType)Enum.Parse(typeof(LightType), m_Params[i].Substring(++indexOf), true);
}
}
else if (m_Params[i].StartsWith("Hue"))
else if (m_Params[i].StartsWith("Hue", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -996,18 +995,18 @@ namespace Server.Commands
}
}
}
else if (m_Params[i].StartsWith("Name"))
else if (m_Params[i].StartsWith("Name", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
item.Name = m_Params[i].Substring(++indexOf);
}
}
else if (m_Params[i].StartsWith("Amount"))
else if (m_Params[i].StartsWith("Amount", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -1236,7 +1235,7 @@ namespace Server.Commands
{
line = line.Trim();
if (line.Length > 0 && !line.StartsWith("#"))
if (line.Length > 0 && !line.StartsWith("#", StringComparison.Ordinal))
{
break;
}
@ -1249,7 +1248,7 @@ namespace Server.Commands
var list = new DecorationListMag();
var indexOf = line.IndexOf(' ');
var indexOf = line.IndexOf(' ', StringComparison.Ordinal);
list.m_Type = AssemblyHandler.FindFirstTypeForName(line.Substring(0, indexOf++), true);
@ -1259,14 +1258,14 @@ namespace Server.Commands
}
line = line.Substring(indexOf);
indexOf = line.IndexOf('(');
indexOf = line.IndexOf('(', StringComparison.Ordinal);
if (indexOf >= 0)
{
list.m_ItemID = Utility.ToInt32(line.Substring(0, indexOf - 1));
var parms = line.Substring(++indexOf);
if (line.EndsWith(")"))
if (line.EndsWith(")", StringComparison.Ordinal))
{
parms = parms.Substring(0, parms.Length - 1);
}
@ -1295,7 +1294,7 @@ namespace Server.Commands
break;
}
if (line.StartsWith("#"))
if (line.StartsWith("#", StringComparison.Ordinal))
{
continue;
}
@ -1325,7 +1324,7 @@ namespace Server.Commands
public void Pop(out string v, ref string line)
{
var space = line.IndexOf(' ');
var space = line.IndexOf(' ', StringComparison.Ordinal);
if (space >= 0)
{

13
Projects/UOContent/Commands/Object Creation/GenTeleporter.cs
View file

@ -19,13 +19,6 @@ namespace Server.Commands
public bool Back { get; set; }
public override string ToString() => $"{{{Source},{Destination},{Back}}}";
public bool Equals(TeleporterDefinition other) =>
Source.Equals(other.Source) && Destination.Equals(other.Destination) && Back == other.Back;
public override bool Equals(object obj) => obj is TeleporterDefinition other && Equals(other);
public override int GetHashCode() => HashCode.Combine(Source, Destination, Back);
}
public static class GenTeleporter
@ -39,8 +32,7 @@ namespace Server.Commands
CommandSystem.Register("TelGenDelete", AccessLevel.Administrator, TelGenDelete_OnCommand);
}
[Usage("TelGenDelete")]
[Description("Destroys world/dungeon teleporters for all facets.")]
[Usage("TelGenDelete"), Description("Destroys world/dungeon teleporters for all facets.")]
public static void TelGenDelete_OnCommand(CommandEventArgs e)
{
var from = e.Mobile;
@ -70,8 +62,7 @@ namespace Server.Commands
from.SendMessage(WarningHue, $"{count} Teleporters Removed.");
}
[Usage("TelGen")]
[Description("Generates world/dungeon teleporters for all facets.")]
[Usage("TelGen"), Description("Generates world/dungeon teleporters for all facets.")]
public static void GenTeleporter_OnCommand(CommandEventArgs e)
{
var from = e.Mobile;