Fixes dictionary uses (#7)

Scripts/Items/Talismans/TalismanSlayer.cs

@@ -20,84 +20,70 @@ namespace Server.Items
 
   public static class TalismanSlayer
   {
-    private static Dictionary<TalismanSlayerName, Type[]> m_Table = new Dictionary<TalismanSlayerName, Type[]>();
+    private static Dictionary<TalismanSlayerName, Type[]> m_Table;
 
     public static void Initialize()
     {
-      m_Table[TalismanSlayerName.Bear] = new[]
+      m_Table = new Dictionary<TalismanSlayerName, Type[]>
       {
-        typeof(GrizzlyBear), typeof(BlackBear), typeof(BrownBear), typeof(PolarBear) //, typeof( Grobu )
-      };
+        [TalismanSlayerName.Bear] = new[]
+        {
+          typeof(GrizzlyBear), typeof(BlackBear), typeof(BrownBear), typeof(PolarBear) //, typeof( Grobu )
+        },
+        [TalismanSlayerName.Vermin] = new[]
+        {
+          typeof(RatmanMage), typeof(RatmanMage), typeof(RatmanArcher), typeof(Barracoon), typeof(Ratman), typeof(SewerRat),
+          typeof(Rat), typeof(GiantRat) //, typeof( Chiikkaha )
+        },
+        [TalismanSlayerName.Bat] = new[] { typeof(Mongbat), typeof(StrongMongbat), typeof(VampireBat) },
+        [TalismanSlayerName.Mage] =
+          new[]
+          {
+            typeof(EvilMage), typeof(EvilMageLord), typeof(AncientLich), typeof(Lich), typeof(LichLord),
+            typeof(SkeletalMage), typeof(BoneMagi), typeof(OrcishMage), typeof(KhaldunZealot), typeof(JukaMage)
+          },
+        [TalismanSlayerName.Beetle] =
+          new[]
+          {
+            typeof(Beetle), typeof(RuneBeetle), typeof(FireBeetle), typeof(DeathwatchBeetle),
+            typeof(DeathwatchBeetleHatchling)
+          },
+        [TalismanSlayerName.Bird] = new[]
+        {
+          typeof(Bird), typeof(TropicalBird), typeof(Chicken), typeof(Crane), typeof(DesertOstard), typeof(Eagle),
+          typeof(ForestOstard), typeof(FrenziedOstard),
+          typeof(Phoenix), /*typeof( Pyre ), typeof( Swoop ), typeof( Saliva ),*/ typeof(Harpy), typeof(StoneHarpy) // ?????
+        },
+        [TalismanSlayerName.Ice] = new[]
+        {
+          typeof(ArcticOgreLord), typeof(IceElemental), typeof(SnowElemental), typeof(FrostOoze),
+          typeof(IceFiend), /*typeof( UnfrozenMummy ),*/ typeof(FrostSpider), typeof(LadyOfTheSnow), typeof(FrostTroll),
 
-      m_Table[TalismanSlayerName.Vermin] = new[]
-      {
-        typeof(RatmanMage), typeof(RatmanMage), typeof(RatmanArcher), typeof(Barracoon),
-        typeof(Ratman), typeof(SewerRat), typeof(Rat), typeof(GiantRat) //, typeof( Chiikkaha )
-      };
+          // TODO WinterReaper, check
+          typeof(IceSnake), typeof(SnowLeopard), typeof(PolarBear), typeof(IceSerpent), typeof(GiantIceWorm)
+        },
+        [TalismanSlayerName.Flame] = new[]
+        {
+          typeof(FireBeetle), typeof(HellHound), typeof(LavaSerpent), typeof(FireElemental), typeof(PredatorHellCat),
+          typeof(Phoenix), typeof(FireGargoyle), typeof(HellCat),
+          /*typeof( Pyre ),*/ typeof(FireSteed), typeof(LavaLizard),
 
-      m_Table[TalismanSlayerName.Bat] = new[]
-      {
-        typeof(Mongbat), typeof(StrongMongbat), typeof(VampireBat)
-      };
-
-      m_Table[TalismanSlayerName.Mage] = new[]
-      {
-        typeof(EvilMage), typeof(EvilMageLord), typeof(AncientLich), typeof(Lich), typeof(LichLord),
-        typeof(SkeletalMage), typeof(BoneMagi), typeof(OrcishMage), typeof(KhaldunZealot), typeof(JukaMage)
-      };
-
-      m_Table[TalismanSlayerName.Beetle] = new[]
-      {
-        typeof(Beetle), typeof(RuneBeetle), typeof(FireBeetle), typeof(DeathwatchBeetle),
-        typeof(DeathwatchBeetleHatchling)
-      };
-
-      m_Table[TalismanSlayerName.Bird] = new[]
-      {
-        typeof(Bird), typeof(TropicalBird), typeof(Chicken), typeof(Crane),
-        typeof(DesertOstard), typeof(Eagle), typeof(ForestOstard), typeof(FrenziedOstard),
-        typeof(Phoenix), /*typeof( Pyre ), typeof( Swoop ), typeof( Saliva ),*/ typeof(Harpy),
-        typeof(StoneHarpy) // ?????
-      };
-
-      m_Table[TalismanSlayerName.Ice] = new[]
-      {
-        typeof(ArcticOgreLord), typeof(IceElemental), typeof(SnowElemental), typeof(FrostOoze),
-        typeof(IceFiend), /*typeof( UnfrozenMummy ),*/ typeof(FrostSpider), typeof(LadyOfTheSnow),
-        typeof(FrostTroll),
-
-        // TODO WinterReaper, check
-        typeof(IceSnake), typeof(SnowLeopard), typeof(PolarBear), typeof(IceSerpent), typeof(GiantIceWorm)
-      };
-
-      m_Table[TalismanSlayerName.Flame] = new[]
-      {
-        typeof(FireBeetle), typeof(HellHound), typeof(LavaSerpent), typeof(FireElemental),
-        typeof(PredatorHellCat), typeof(Phoenix), typeof(FireGargoyle), typeof(HellCat),
-        /*typeof( Pyre ),*/ typeof(FireSteed), typeof(LavaLizard),
-
-        // TODO check
-        typeof(LavaSnake)
-      };
-
-      m_Table[TalismanSlayerName.Bovine] = new[]
-      {
-        typeof(Cow), typeof(Bull), typeof(Gaman) /*, typeof( MinotaurCaptain ),
-				typeof( MinotaurScout ), typeof( Minotaur )*/
-
-        // TODO TormentedMinotaur
+          // TODO check
+          typeof(LavaSnake)
+        },
+        [TalismanSlayerName.Bovine] = new[]
+        {
+          typeof(Cow), typeof(Bull), typeof(Gaman) /*, typeof( MinotaurCaptain ),
+				  typeof( MinotaurScout ), typeof( Minotaur )*/
+          // TODO TormentedMinotaur
+        }
       };
     }
 
     public static bool Slays(TalismanSlayerName name, Mobile m)
     {
-      if (!m_Table.ContainsKey(name))
-        return false;
-
-      Type[] types = m_Table[name];
-
-      if (types == null || m == null)
-        return false;
+      if (m == null || !m_Table.TryGetValue(name, out Type[] types) || types == null)
+        return false;;
 
       Type type = m.GetType();
 
@@ -108,4 +94,4 @@ namespace Server.Items
       return false;
     }
   }
-}
+}