Merge pull request #124 from mathsman5133/g1_th15_update

TH15 Update!

Author: majordoobie

coc/abc.py

@@ -200,7 +200,6 @@ def _load_json_meta(cls, troop_meta, id, name, lab_to_townhall):
 
         # spells and troops
         cls.training_cost = try_enum(UnitStat, troop_meta.get("TrainingCost"))
-        cls.training_resource = Resource(value=troop_meta["TrainingResource"][0])
         cls.training_time = try_enum(UnitStat, troop_meta.get("TrainingTime"))
 
         # only heroes

coc/enums.py

@@ -83,6 +83,7 @@ class Resource(Enum):
     "Bowler",
     "Ice Golem",
     "Headhunter",
+    "Electro Titan",
 ]
 
 SIEGE_MACHINE_ORDER = [
@@ -91,7 +92,8 @@ class Resource(Enum):
     "Stone Slammer",
     "Siege Barracks",
     "Log Launcher",
-    "Flame Flinger"
+    "Flame Flinger",
+    "Battle Drill",
 ]
 
 SUPER_TROOP_ORDER = [
@@ -108,7 +110,7 @@ class Resource(Enum):
     "Super Valkyrie",
     "Super Witch",
     "Ice Hound",
-    "Super Bowler"
+    "Super Bowler",
 ]
 
 HOME_TROOP_ORDER = HOME_TROOP_ORDER + SIEGE_MACHINE_ORDER
@@ -141,11 +143,21 @@ class Resource(Enum):
     "Haste Spell",
     "Skeleton Spell",
     "Bat Spell",
+    "Recall Spell",
 ]
 
 HERO_ORDER = ["Barbarian King", "Archer Queen", "Grand Warden", "Royal Champion", "Battle Machine"]
 
-HERO_PETS_ORDER = ["L.A.S.S.I", "Electro Owl", "Mighty Yak", "Unicorn"]
+HERO_PETS_ORDER = [
+    "L.A.S.S.I",
+    "Electro Owl",
+    "Mighty Yak",
+    "Unicorn",
+    "Poison Lizard",
+    "Diggy",
+    "Frosty",
+    "Phoenix",
+]
 
 ACHIEVEMENT_ORDER = [
     # Home Base

coc/players.py

@@ -650,9 +650,13 @@ def spells(self) -> typing.List[Spell]:
 
         This will return spells in the order found in both spell factory and labatory in-game.
         """
-        dict_spells = self._spells = {s.name: s for s in self._iter_spells}
+        self._spells = {s.name: s for s in self._iter_spells}
+        dict_spells = self._spells
         order = {k: v for v, k in enumerate(SPELL_ORDER)}
-        return list(sorted(dict_spells.values(), key=lambda s: order.get(s.name)))
+
+        return list(sorted(
+                    dict_spells.values(),
+                    key=lambda s: order.get(s.name, 0)))
 
     def get_spell(self, name: str, default_value=None) -> typing.Optional[Spell]:
         """Returns a spell with the given name.