Clean up: Bugs, LINQ, constructors, default values, and null checks (#18)

Scripts/Spells/Fifth/BladeSpirits.cs

@@ -16,7 +16,7 @@ namespace Server.Spells.Fifth
       Reagent.Nightshade
     );
 
-    public BladeSpiritsSpell(Mobile caster, Item scroll) : base(caster, scroll, m_Info)
+    public BladeSpiritsSpell(Mobile caster, Item scroll = null) : base(caster, scroll, m_Info)
     {
     }
 
@@ -103,4 +103,4 @@ namespace Server.Spells.Fifth
       }
     }
   }
-}
+}

Scripts/Spells/Fifth/DispelField.cs

@@ -17,7 +17,7 @@ namespace Server.Spells.Fifth
       Reagent.Garlic
     );
 
-    public DispelFieldSpell(Mobile caster, Item scroll) : base(caster, scroll, m_Info)
+    public DispelFieldSpell(Mobile caster, Item scroll = null) : base(caster, scroll, m_Info)
     {
     }
 
@@ -81,4 +81,4 @@ namespace Server.Spells.Fifth
       }
     }
   }
-}
+}

Scripts/Spells/Fifth/Incognito.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using Server.Factions;
 using Server.Items;
@@ -21,7 +20,7 @@ namespace Server.Spells.Fifth
 
     private static Dictionary<Mobile, InternalTimer> m_Timers = new Dictionary<Mobile, InternalTimer>();
 
-    public IncognitoSpell(Mobile caster, Item scroll) : base(caster, scroll, m_Info)
+    public IncognitoSpell(Mobile caster, Item scroll = null) : base(caster, scroll, m_Info)
     {
     }
 

Scripts/Spells/Fifth/MagicReflect.cs

@@ -1,4 +1,3 @@
-using System.Collections;
 using System.Collections.Generic;
 
 namespace Server.Spells.Fifth
@@ -16,7 +15,7 @@ namespace Server.Spells.Fifth
 
     private static Dictionary<Mobile, ResistanceMod[]> m_Table = new Dictionary<Mobile, ResistanceMod[]>();
 
-    public MagicReflectSpell(Mobile caster, Item scroll) : base(caster, scroll, m_Info)
+    public MagicReflectSpell(Mobile caster, Item scroll = null) : base(caster, scroll, m_Info)
     {
     }
 
@@ -79,7 +78,7 @@ namespace Server.Spells.Fifth
             for (int i = 0; i < mods.Length; ++i)
               targ.AddResistanceMod(mods[i]);
 
-            string buffFormat = string.Format("{0}\t+{1}\t+{1}\t+{1}\t+{1}", physiMod, otherMod);
+            string buffFormat = $"{physiMod}\t+{otherMod}\t+{otherMod}\t+{otherMod}\t+{otherMod}";
 
             BuffInfo.AddBuff(targ, new BuffInfo(BuffIcon.MagicReflection, 1075817, buffFormat, true));
           }

Scripts/Spells/Fifth/MindBlast.cs

@@ -15,7 +15,7 @@ namespace Server.Spells.Fifth
       Reagent.SulfurousAsh
     );
 
-    public MindBlastSpell(Mobile caster, Item scroll) : base(caster, scroll, m_Info)
+    public MindBlastSpell(Mobile caster, Item scroll = null) : base(caster, scroll, m_Info)
     {
       if (Core.AOS)
         m_Info.LeftHandEffect = m_Info.RightHandEffect = 9002;
@@ -144,4 +144,4 @@ namespace Server.Spells.Fifth
       }
     }
   }
-}
+}

Scripts/Spells/Fifth/Paralyze.cs

@@ -16,7 +16,7 @@ namespace Server.Spells.Fifth
       Reagent.SpidersSilk
     );
 
-    public ParalyzeSpell(Mobile caster, Item scroll) : base(caster, scroll, m_Info)
+    public ParalyzeSpell(Mobile caster, Item scroll = null) : base(caster, scroll, m_Info)
     {
     }
 
@@ -109,4 +109,4 @@ namespace Server.Spells.Fifth
       }
     }
   }
-}
+}

Scripts/Spells/Fifth/PoisonField.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using Server.Items;
 using Server.Misc;
 using Server.Mobiles;
@@ -19,7 +20,7 @@ namespace Server.Spells.Fifth
       Reagent.SpidersSilk
     );
 
-    public PoisonFieldSpell(Mobile caster, Item scroll) : base(caster, scroll, m_Info)
+    public PoisonFieldSpell(Mobile caster, Item scroll = null) : base(caster, scroll, m_Info)
     {
     }
 
@@ -197,7 +198,7 @@ namespace Server.Spells.Fifth
 
       private class InternalTimer : Timer
       {
-        private static Queue m_Queue = new Queue();
+        private static Queue<Mobile> m_Queue = new Queue<Mobile>();
         private bool m_InLOS, m_CanFit;
         private InternalItem m_Item;
 
@@ -257,7 +258,7 @@ namespace Server.Spells.Fifth
 
               while (m_Queue.Count > 0)
               {
-                Mobile m = (Mobile)m_Queue.Dequeue();
+                Mobile m = m_Queue.Dequeue();
 
                 caster.DoHarmful(m);
 
@@ -291,4 +292,4 @@ namespace Server.Spells.Fifth
       }
     }
   }
-}
+}

Scripts/Spells/Fifth/SummonCreature.cs

@@ -38,7 +38,7 @@ namespace Server.Spells.Fifth
       typeof(Rabbit)
     };
 
-    public SummonCreatureSpell(Mobile caster, Item scroll) : base(caster, scroll, m_Info)
+    public SummonCreatureSpell(Mobile caster, Item scroll = null) : base(caster, scroll, m_Info)
     {
     }
 
@@ -78,6 +78,7 @@ namespace Server.Spells.Fifth
         }
         catch
         {
+          // ignored
         }
 
       FinishSequence();
@@ -91,4 +92,4 @@ namespace Server.Spells.Fifth
       return base.GetCastDelay() + TimeSpan.FromSeconds(6.0);
     }
   }
-}
+}