fix: Various code cleanup (#756)

modernuo · Sep 4, 2021 · dbd4d6f · dbd4d6f
1 parent f4378ac
commit dbd4d6f
Show file tree

Hide file tree

Showing 40 changed files with 118 additions and 281 deletions.
diff --git a/Projects/Benchmarks/Program.cs b/Projects/Benchmarks/Program.cs
@@ -1,4 +1,3 @@
-using BenchmarkDotNet.Configs;
 using BenchmarkDotNet.Running;
 
 namespace Benchmarks

diff --git a/...ializationGenerator/SerializableEntityGeneration/SerializableEntityGeneration.Property.cs b/...ializationGenerator/SerializableEntityGeneration/SerializableEntityGeneration.Property.cs
@@ -13,7 +13,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  *************************************************************************/
 
-using System.Collections.Immutable;
 using System.Linq;
 using System.Text;
 using Microsoft.CodeAnalysis;

diff --git a/...ionGenerator/SerializableEntityGeneration/SerializableEntityGeneration.SerializeMethod.cs b/...ionGenerator/SerializableEntityGeneration/SerializableEntityGeneration.SerializeMethod.cs
@@ -15,7 +15,6 @@
 
 using System.Collections.Generic;
 using System.Collections.Immutable;
-using System.Linq;
 using System.Text;
 using Microsoft.CodeAnalysis;
 using SerializableMigration;

diff --git a/Projects/UOContent/Engines/ConPVP/Games/CTF.cs b/Projects/UOContent/Engines/ConPVP/Games/CTF.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 using Server.Gumps;
 using Server.Items;

diff --git a/Projects/UOContent/Engines/Ethics/Evil/Powers/UnholySense.cs b/Projects/UOContent/Engines/Ethics/Evil/Powers/UnholySense.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Text;
+using Server.Buffers;
 using Server.Network;
 
 namespace Server.Ethics.Evil
@@ -46,15 +46,15 @@ public override void BeginInvoke(Player from)
                 ++enemyCount;
             }
 
-            var sb = new StringBuilder();
+            using var sb = new ValueStringBuilder();
 
             sb.Append("You sense ");
             sb.Append(enemyCount == 0 ? "no" : enemyCount.ToString());
             sb.Append(enemyCount == 1 ? " enemy" : " enemies");
 
             if (primary != null)
             {
-                sb.Append(", and a strong presense");
+                sb.Append(", and a strong presence");
 
                 switch (from.Mobile.GetDirectionTo(primary.Mobile))
                 {

diff --git a/Projects/UOContent/Engines/Ethics/Hero/Powers/HolySense.cs b/Projects/UOContent/Engines/Ethics/Hero/Powers/HolySense.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Text;
+using Server.Buffers;
 using Server.Network;
 
 namespace Server.Ethics.Hero
@@ -46,15 +46,15 @@ public override void BeginInvoke(Player from)
                 ++enemyCount;
             }
 
-            var sb = new StringBuilder();
+            using var sb = new ValueStringBuilder();
 
             sb.Append("You sense ");
             sb.Append(enemyCount == 0 ? "no" : enemyCount.ToString());
             sb.Append(enemyCount == 1 ? " enemy" : " enemies");
 
             if (primary != null)
             {
-                sb.Append(", and a strong presense");
+                sb.Append(", and a strong presence");
 
                 switch (from.Mobile.GetDirectionTo(primary.Mobile))
                 {

diff --git a/Projects/UOContent/Engines/Khaldun/RaiseSwitch.cs b/Projects/UOContent/Engines/Khaldun/RaiseSwitch.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Linq;
 using Server.Network;
 
 namespace Server.Items

diff --git a/Projects/UOContent/Engines/ML Quests/Definitions/AGhostOfCovetous.cs b/Projects/UOContent/Engines/ML Quests/Definitions/AGhostOfCovetous.cs
@@ -1,7 +1,6 @@
 using System;
 using Server.Engines.MLQuests.Objectives;
 using Server.Engines.MLQuests.Rewards;
-using Server.Engines.Spawners;
 using Server.Items;
 using Server.Mobiles;
 

diff --git a/Projects/UOContent/Engines/ML Quests/Definitions/Bedlam.cs b/Projects/UOContent/Engines/ML Quests/Definitions/Bedlam.cs
@@ -1,6 +1,5 @@
 using Server.Engines.MLQuests.Objectives;
 using Server.Engines.MLQuests.Rewards;
-using Server.Engines.Spawners;
 using Server.Items;
 using Server.Mobiles;
 

diff --git a/Projects/UOContent/Engines/ML Quests/Definitions/BlightedGrove.cs b/Projects/UOContent/Engines/ML Quests/Definitions/BlightedGrove.cs
@@ -1,7 +1,6 @@
 using System;
 using Server.Engines.MLQuests.Objectives;
 using Server.Engines.MLQuests.Rewards;
-using Server.Engines.Spawners;
 using Server.Items;
 using Server.Mobiles;
 

diff --git a/Projects/UOContent/Engines/ML Quests/Definitions/Britannia.cs b/Projects/UOContent/Engines/ML Quests/Definitions/Britannia.cs
@@ -1,7 +1,6 @@
 using System;
 using Server.Engines.MLQuests.Objectives;
 using Server.Engines.MLQuests.Rewards;
-using Server.Engines.Spawners;
 using Server.Items;
 using Server.Mobiles;
 

diff --git a/Projects/UOContent/Engines/ML Quests/Definitions/Heartwood.cs b/Projects/UOContent/Engines/ML Quests/Definitions/Heartwood.cs
@@ -1,6 +1,5 @@
 using Server.Engines.MLQuests.Objectives;
 using Server.Engines.MLQuests.Rewards;
-using Server.Engines.Spawners;
 using Server.Items;
 using Server.Mobiles;
 

diff --git a/Projects/UOContent/Engines/ML Quests/Definitions/HonestBeggar.cs b/Projects/UOContent/Engines/ML Quests/Definitions/HonestBeggar.cs
@@ -1,7 +1,6 @@
 using System;
 using Server.Engines.MLQuests.Objectives;
 using Server.Engines.MLQuests.Rewards;
-using Server.Engines.Spawners;
 using Server.Items;
 using Server.Mobiles;
 

diff --git a/Projects/UOContent/Engines/ML Quests/Definitions/Ilshenar.cs b/Projects/UOContent/Engines/ML Quests/Definitions/Ilshenar.cs
@@ -1,7 +1,5 @@
-using System;
-using Server.Engines.MLQuests.Objectives;
+using Server.Engines.MLQuests.Objectives;
 using Server.Engines.MLQuests.Rewards;
-using Server.Engines.Spawners;
 using Server.Items;
 using Server.Mobiles;
 

diff --git a/Projects/UOContent/Engines/ML Quests/Definitions/Malas.cs b/Projects/UOContent/Engines/ML Quests/Definitions/Malas.cs
@@ -1,6 +1,5 @@
 using Server.Engines.MLQuests.Objectives;
 using Server.Engines.MLQuests.Rewards;
-using Server.Engines.Spawners;
 using Server.Items;
 using Server.Mobiles;
 

diff --git a/Projects/UOContent/Engines/ML Quests/Definitions/MistakenIdentity.cs b/Projects/UOContent/Engines/ML Quests/Definitions/MistakenIdentity.cs
@@ -2,7 +2,6 @@
 using Server.Engines.MLQuests.Items;
 using Server.Engines.MLQuests.Objectives;
 using Server.Engines.MLQuests.Rewards;
-using Server.Engines.Spawners;
 using Server.Items;
 using Server.Mobiles;
 

diff --git a/Projects/UOContent/Engines/ML Quests/Definitions/NewHavenSkillTraining.cs b/Projects/UOContent/Engines/ML Quests/Definitions/NewHavenSkillTraining.cs
@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using Server.Engines.MLQuests.Objectives;
 using Server.Engines.MLQuests.Rewards;
-using Server.Engines.Spawners;
 using Server.Items;
 using Server.Mobiles;
 

diff --git a/Projects/UOContent/Engines/ML Quests/Definitions/NewHavenTraining.cs b/Projects/UOContent/Engines/ML Quests/Definitions/NewHavenTraining.cs
@@ -1,6 +1,5 @@
 using Server.Engines.MLQuests.Objectives;
 using Server.Engines.MLQuests.Rewards;
-using Server.Engines.Spawners;
 using Server.Items;
 using Server.Mobiles;
 

diff --git a/Projects/UOContent/Engines/ML Quests/Definitions/Sanctuary.cs b/Projects/UOContent/Engines/ML Quests/Definitions/Sanctuary.cs
@@ -1,7 +1,6 @@
 using System;
 using Server.Engines.MLQuests.Objectives;
 using Server.Engines.MLQuests.Rewards;
-using Server.Engines.Spawners;
 using Server.Items;
 using Server.Mobiles;
 

diff --git a/Projects/UOContent/Engines/ML Quests/Definitions/Spellweaving.cs b/Projects/UOContent/Engines/ML Quests/Definitions/Spellweaving.cs
@@ -1,7 +1,6 @@
 using System;
 using Server.Engines.MLQuests.Objectives;
 using Server.Engines.MLQuests.Rewards;
-using Server.Engines.Spawners;
 using Server.Items;
 using Server.Mobiles;
 

diff --git a/Projects/UOContent/Engines/ML Quests/Definitions/TheAncientWorld.cs b/Projects/UOContent/Engines/ML Quests/Definitions/TheAncientWorld.cs
@@ -1,7 +1,6 @@
 using System;
 using Server.Engines.MLQuests.Objectives;
 using Server.Engines.MLQuests.Rewards;
-using Server.Engines.Spawners;
 using Server.Items;
 using Server.Mobiles;
 

diff --git a/Projects/UOContent/Engines/ML Quests/Definitions/UnfadingMemories.cs b/Projects/UOContent/Engines/ML Quests/Definitions/UnfadingMemories.cs
@@ -1,7 +1,6 @@
 using System;
 using Server.Engines.MLQuests.Objectives;
 using Server.Engines.MLQuests.Rewards;
-using Server.Engines.Spawners;
 using Server.Items;
 using Server.Mobiles;
 

diff --git a/Projects/UOContent/Holiday Stuff/Christmas/2010/Addons/FireFliesDeed.cs b/Projects/UOContent/Holiday Stuff/Christmas/2010/Addons/FireFliesDeed.cs
@@ -1,4 +1,3 @@
-using System.Linq;
 using Server.Gumps;
 using Server.Multis;
 using Server.Network;

diff --git a/Projects/UOContent/Items/Armor/BaseArmor.cs b/Projects/UOContent/Items/Armor/BaseArmor.cs
@@ -339,42 +339,21 @@ public virtual double ArmorRating
                     ar += 10 + 5 * (int)_protection;
                 }
 
-                switch (_resource)
+                ar += _resource switch
                 {
-                    case CraftResource.DullCopper:
-                        ar += 2;
-                        break;
-                    case CraftResource.ShadowIron:
-                        ar += 4;
-                        break;
-                    case CraftResource.Copper:
-                        ar += 6;
-                        break;
-                    case CraftResource.Bronze:
-                        ar += 8;
-                        break;
-                    case CraftResource.Gold:
-                        ar += 10;
-                        break;
-                    case CraftResource.Agapite:
-                        ar += 12;
-                        break;
-                    case CraftResource.Verite:
-                        ar += 14;
-                        break;
-                    case CraftResource.Valorite:
-                        ar += 16;
-                        break;
-                    case CraftResource.SpinedLeather:
-                        ar += 10;
-                        break;
-                    case CraftResource.HornedLeather:
-                        ar += 13;
-                        break;
-                    case CraftResource.BarbedLeather:
-                        ar += 16;
-                        break;
-                }
+                    CraftResource.DullCopper    => 2,
+                    CraftResource.ShadowIron    => 4,
+                    CraftResource.Copper        => 6,
+                    CraftResource.Bronze        => 8,
+                    CraftResource.Gold          => 10,
+                    CraftResource.Agapite       => 12,
+                    CraftResource.Verite        => 14,
+                    CraftResource.Valorite      => 16,
+                    CraftResource.SpinedLeather => 10,
+                    CraftResource.HornedLeather => 13,
+                    CraftResource.BarbedLeather => 16,
+                    _                           => 0
+                };
 
                 ar += -8 + 8 * (int)_quality;
                 return ScaleArmorByDurability(ar);
@@ -557,27 +536,22 @@ public virtual double ArmorScalar
             BaseEnergyResistance + GetProtOffset() + GetResourceAttrs().ArmorEnergyResist + _energyBonus;
 
         [CommandProperty(AccessLevel.GameMaster)]
-        public ArmorBodyType BodyPosition
-        {
-            get
-            {
-                return Layer switch
-                {
-                    Layer.Neck       => ArmorBodyType.Gorget,
-                    Layer.TwoHanded  => ArmorBodyType.Shield,
-                    Layer.Gloves     => ArmorBodyType.Gloves,
-                    Layer.Helm       => ArmorBodyType.Helmet,
-                    Layer.Arms       => ArmorBodyType.Arms,
-                    Layer.InnerLegs  => ArmorBodyType.Legs,
-                    Layer.OuterLegs  => ArmorBodyType.Legs,
-                    Layer.Pants      => ArmorBodyType.Legs,
-                    Layer.InnerTorso => ArmorBodyType.Chest,
-                    Layer.OuterTorso => ArmorBodyType.Chest,
-                    Layer.Shirt      => ArmorBodyType.Chest,
-                    _                => ArmorBodyType.Gorget
-                };
-            }
-        }
+        public ArmorBodyType BodyPosition =>
+            Layer switch
+            {
+                Layer.Neck       => ArmorBodyType.Gorget,
+                Layer.TwoHanded  => ArmorBodyType.Shield,
+                Layer.Gloves     => ArmorBodyType.Gloves,
+                Layer.Helm       => ArmorBodyType.Helmet,
+                Layer.Arms       => ArmorBodyType.Arms,
+                Layer.InnerLegs  => ArmorBodyType.Legs,
+                Layer.OuterLegs  => ArmorBodyType.Legs,
+                Layer.Pants      => ArmorBodyType.Legs,
+                Layer.InnerTorso => ArmorBodyType.Chest,
+                Layer.OuterTorso => ArmorBodyType.Chest,
+                Layer.Shirt      => ArmorBodyType.Chest,
+                _                => ArmorBodyType.Gorget
+            };
 
         public static double[] ArmorScalars { get; set; } = { 0.07, 0.07, 0.14, 0.15, 0.22, 0.35 };
 
@@ -865,20 +839,12 @@ public override void OnAfterDuped(Item newItem)
 
         public int ComputeStatReq(StatType type)
         {
-            int v;
-
-            if (type == StatType.Str)
-            {
-                v = StrRequirement;
-            }
-            else if (type == StatType.Dex)
-            {
-                v = DexRequirement;
-            }
-            else
+            int v = type switch
             {
-                v = IntRequirement;
-            }
+                StatType.Str => StrRequirement,
+                StatType.Dex => DexRequirement,
+                _            => IntRequirement
+            };
 
             return AOS.Scale(v, 100 - GetLowerStatReq());
         }
@@ -920,17 +886,8 @@ public void DistributeBonuses(int amount)
             InvalidateProperties();
         }
 
-        public CraftAttributeInfo GetResourceAttrs()
-        {
-            var info = CraftResources.GetInfo(_resource);
-
-            if (info == null)
-            {
-                return CraftAttributeInfo.Blank;
-            }
-
-            return info.AttributeInfo;
-        }
+        public CraftAttributeInfo GetResourceAttrs() =>
+            CraftResources.GetInfo(_resource)?.AttributeInfo ?? CraftAttributeInfo.Blank;
 
         public int GetProtOffset()
         {
@@ -946,31 +903,17 @@ public int GetProtOffset()
 
         public int GetDurabilityBonus()
         {
-            var bonus = 0;
-
-            if (_quality == ArmorQuality.Exceptional)
-            {
-                bonus += 20;
-            }
+            var bonus = _quality == ArmorQuality.Exceptional ? 20 : 0;
 
-            switch (_durability)
+            bonus += _durability switch
             {
-                case ArmorDurabilityLevel.Durable:
-                    bonus += 20;
-                    break;
-                case ArmorDurabilityLevel.Substantial:
-                    bonus += 50;
-                    break;
-                case ArmorDurabilityLevel.Massive:
-                    bonus += 70;
-                    break;
-                case ArmorDurabilityLevel.Fortified:
-                    bonus += 100;
-                    break;
-                case ArmorDurabilityLevel.Indestructible:
-                    bonus += 120;
-                    break;
-            }
+                ArmorDurabilityLevel.Durable        => 20,
+                ArmorDurabilityLevel.Substantial    => 50,
+                ArmorDurabilityLevel.Massive        => 70,
+                ArmorDurabilityLevel.Fortified      => 100,
+                ArmorDurabilityLevel.Indestructible => 120,
+                _                                   => 0
+            };
 
             if (Core.AOS)
             {

diff --git a/Projects/UOContent/Items/Containers/MarkContainer.cs b/Projects/UOContent/Items/Containers/MarkContainer.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Linq;
 
 namespace Server.Items
 {