Merge pull request #214 from mathsman5133/feature/th16-content

Feature/th16 content

Author: lukasthaler

coc/abc.py

@@ -171,6 +171,12 @@ def __init__(self, data, townhall):
 
         self._townhall = townhall
 
+        # copies for a static hash
+        self.__name = data['name']
+        self.__level = data['level']
+        self.__village = data['village']
+        self.__is_active = data.get("superTroopIsActive")
+
     def __repr__(self):
         attrs = [
             ("name", self.name),
@@ -180,20 +186,27 @@ def __repr__(self):
         return "<%s %s>" % (
             self.__class__.__name__, " ".join("%s=%r" % t for t in attrs),)
 
+    def __eq__(self, other):
+        return self.name == other.name and self.level == other.level \
+            and self.village == other.village and self.is_active == other.is_active
+
+    def __hash__(self):
+        return hash((self.__name, self.__level, self.__village, self.__is_active))
+
     @classmethod
-    def _load_json_meta(cls, troop_meta, id, name, lab_to_townhall):
+    def _load_json_meta(cls, json_meta, id, name, lab_to_townhall):
         cls.id = int(id)
         cls.name = name
         cls.lab_to_townhall = lab_to_townhall
 
-        cls.range = try_enum(UnitStat, troop_meta.get("AttackRange"))
-        cls.dps = try_enum(UnitStat, troop_meta.get("DPS"))
-        cls.ground_target = _get_maybe_first(troop_meta, "GroundTargets",
+        cls.range = try_enum(UnitStat, json_meta.get("AttackRange"))
+        cls.dps = try_enum(UnitStat, json_meta.get("DPS"))
+        cls.ground_target = _get_maybe_first(json_meta, "GroundTargets",
                                              default=True)
-        cls.hitpoints = try_enum(UnitStat, troop_meta.get("Hitpoints"))
+        cls.hitpoints = try_enum(UnitStat, json_meta.get("Hitpoints"))
 
         # get production building
-        production_building = troop_meta.get("ProductionBuilding", [None])[0] if troop_meta.get("ProductionBuilding") else None
+        production_building = json_meta.get("ProductionBuilding", [None])[0] if json_meta.get("ProductionBuilding") else None
         if production_building == "Barrack":
             cls.is_elixir_troop = True
         elif production_building == "Dark Elixir Barrack":
@@ -213,16 +226,16 @@ def _load_json_meta(cls, troop_meta, id, name, lab_to_townhall):
 
         # without production_building, it is a hero
         if not production_building:
-            laboratory_levels = troop_meta.get("LaboratoryLevel")
+            laboratory_levels = json_meta.get("LaboratoryLevel")
         else:
             # it is a troop or spell or siege
             prod_unit = buildings.get(production_building)
             if production_building in ("SiegeWorkshop", "Spell Forge", "Mini Spell Factory",
                                        "Dark Elixir Barrack", "Barrack", "Barrack2"):
-                min_prod_unit_level = troop_meta.get("BarrackLevel", [None, ])[0]
+                min_prod_unit_level = json_meta.get("BarrackLevel", [None, ])[0]
                 # there are some special troops, which have no BarrackLevel attribute
                 if not min_prod_unit_level:
-                    laboratory_levels = troop_meta.get("LaboratoryLevel")
+                    laboratory_levels = json_meta.get("LaboratoryLevel")
                 else:
                     # get the min th level were we can unlock by the required level of the production building
                     min_th_level = [th for i, th in
@@ -235,10 +248,10 @@ def _load_json_meta(cls, troop_meta, id, name, lab_to_townhall):
                     # the first_lab_level is the lowest possible (there are some inconsistencies with siege machines)
                     # To handle them properly, replacing all lab_level lower than first_lab_level with first_lab_level
                     laboratory_levels = []
-                    for lab_level in troop_meta.get("LaboratoryLevel"):
+                    for lab_level in json_meta.get("LaboratoryLevel"):
                         laboratory_levels.append(max(lab_level, first_lab_level))
             elif production_building == "Pet Shop":
-                min_prod_unit_level = troop_meta.get("LaboratoryLevel", [None, ])[0]
+                min_prod_unit_level = json_meta.get("LaboratoryLevel", [None, ])[0]
                 # there are some special troops, which have no BarrackLevel attribute
 
                 # get the min th level were we can unlock by the required level of the production building
@@ -252,35 +265,35 @@ def _load_json_meta(cls, troop_meta, id, name, lab_to_townhall):
                 # the first_lab_level is the lowest possible (there are some inconsistencies with siege machines)
                 # To handle them properly, replacing all lab_level lower than first_lab_level with first_lab_level
                 laboratory_levels = []
-                for lab_level in troop_meta.get("LaboratoryLevel"):
+                for lab_level in json_meta.get("LaboratoryLevel"):
                     laboratory_levels.append(max(lab_level, first_lab_level))
             else:
                 return
 
         cls.lab_level = try_enum(UnitStat, laboratory_levels)
-        cls.housing_space = _get_maybe_first(troop_meta, "HousingSpace", default=0)
-        cls.speed = try_enum(UnitStat, troop_meta.get("Speed"))
+        cls.housing_space = _get_maybe_first(json_meta, "HousingSpace", default=0)
+        cls.speed = try_enum(UnitStat, json_meta.get("Speed"))
         cls.level = cls.dps and UnitStat(range(1, len(cls.dps) + 1))
 
         # all 3
-        cls.upgrade_cost = try_enum(UnitStat, troop_meta.get("UpgradeCost"))
-        cls.upgrade_resource = Resource(value=troop_meta["UpgradeResource"][0])
+        cls.upgrade_cost = try_enum(UnitStat, json_meta.get("UpgradeCost"))
+        cls.upgrade_resource = Resource(value=json_meta["UpgradeResource"][0])
         cls.upgrade_time = try_enum(UnitStat,
                                     [TimeDelta(hours=hours) for hours in
-                                     troop_meta.get("UpgradeTimeH", [])])
-        cls._is_home_village = False if troop_meta.get("VillageType") else True
+                                     json_meta.get("UpgradeTimeH", [])])
+        cls._is_home_village = False if json_meta.get("VillageType") else True
         cls.village = "home" if cls._is_home_village else "builderBase"
 
         # spells and troops
-        cls.training_cost = try_enum(UnitStat, troop_meta.get("TrainingCost"))
-        cls.training_time = try_enum(UnitStat, troop_meta.get("TrainingTime"))
+        cls.training_cost = try_enum(UnitStat, json_meta.get("TrainingCost"))
+        cls.training_time = try_enum(UnitStat, json_meta.get("TrainingTime"))
 
         # only heroes
-        cls.ability_time = try_enum(UnitStat, troop_meta.get("AbilityTime"))
-        cls.ability_troop_count = try_enum(UnitStat, troop_meta.get("AbilitySummonTroopCount"))
-        cls.required_th_level = try_enum(UnitStat, troop_meta.get("RequiredTownHallLevel") or laboratory_levels)
+        cls.ability_time = try_enum(UnitStat, json_meta.get("AbilityTime"))
+        cls.ability_troop_count = try_enum(UnitStat, json_meta.get("AbilitySummonTroopCount"))
+        cls.required_th_level = try_enum(UnitStat, json_meta.get("RequiredTownHallLevel") or laboratory_levels)
         cls.regeneration_time = try_enum(
-            UnitStat, [TimeDelta(minutes=value) for value in troop_meta.get("RegenerationTimeMinutes", [])]
+            UnitStat, [TimeDelta(minutes=value) for value in json_meta.get("RegenerationTimeMinutes", [])]
         )
 
         cls.is_loaded = True
@@ -345,6 +358,10 @@ def _load_json(self, english_aliases, lab_to_townhall):
             if True in meta.get("DisableProduction", [False]) and "pets" not in str(self.FILE_PATH):
                 continue
 
+            # ignore deprecated content
+            if True in meta.get("Deprecated", [False]):
+                continue
+
             #hacky but the aliases convert so that isnt great
             IGNORED_PETS = ["Unused", "PhoenixEgg"]
             if "pets" in str(self.FILE_PATH) and supercell_name in IGNORED_PETS:

coc/client.py

@@ -35,7 +35,7 @@
 from .errors import Forbidden, GatewayError, NotFound, PrivateWarLog
 from .enums import WarRound
 from .miscmodels import BaseLeague, GoldPassSeason, Label, League, Location, LoadGameData
-from .hero import HeroHolder, PetHolder
+from .hero import HeroHolder, PetHolder, EquipmentHolder
 from .http import HTTPClient, BasicThrottler, BatchThrottler
 from .iterators import (
     PlayerIterator,
@@ -173,6 +173,7 @@ class Client:
         "_spell_holder",
         "_hero_holder",
         "_pet_holder",
+        "_equipment_holder"
     )
 
     def __init__(
@@ -249,25 +250,31 @@ def _load_holders(self):
         with open(BUILDING_FILE_PATH) as fp:
             buildings = ujson.load(fp)
 
+        # defaults for if loading fails
+        lab_to_townhall = {i - 2: i for i in range(1, 17)}
+        smithy_to_townhall = {i - 7: i for i in range(8, 17)}
+
         for supercell_name, data in buildings.items():
             if supercell_name == "Laboratory":
                 lab_to_townhall = {index: th_level for index, th_level in enumerate(data["TownHallLevel"], start=1)}
                 # there are troops with no lab ...
                 lab_to_townhall[-1] = 1
                 lab_to_townhall[0] = 2
-                break
-        else:
-            # if the files failed to load, fallback to the old formula of lab level = TH level - 2
-            lab_to_townhall = {i-2: i for i in range(1, 15)}
+            elif supercell_name =='Smithy':
+                smithy_to_townhall = {index: th_level for index, th_level in enumerate(data["TownHallLevel"], start=1)}
 
+        # load holders tied to the lab
         for holder in (self._troop_holder, self._spell_holder, self._hero_holder, self._pet_holder):
             holder._load_json(english_aliases, lab_to_townhall)
+        # load holders tied to the smithy
+        self._equipment_holder._load_json(english_aliases, smithy_to_townhall)
 
     def _create_holders(self):
-        self._troop_holder, self._spell_holder, self._hero_holder, self._pet_holder = TroopHolder(), \
-                                                                                      SpellHolder(), \
-                                                                                      HeroHolder(), \
-                                                                                      PetHolder()
+        self._troop_holder = TroopHolder()
+        self._spell_holder = SpellHolder()
+        self._hero_holder = HeroHolder()
+        self._pet_holder = PetHolder()
+        self._equipment_holder = EquipmentHolder()
 
         if not self.load_game_data.never:
             self._load_holders()

coc/enums.py

@@ -77,6 +77,10 @@ class Resource(Enum):
     builder_elixir = "Elixir2"
     dark_elixir = "DarkElixir"
     gold = "Gold"
+    builder_gold = "Gold2"
+    shiny_ore = "CommonOre"
+    glowy_ore = "RareOre"
+    starry_ore = "EpicOre"
 
 
 HOME_TROOP_ORDER = [
@@ -105,7 +109,8 @@ class Resource(Enum):
     "Bowler",
     "Ice Golem",
     "Headhunter",
-    "Apprentice Warden"
+    "Apprentice Warden",
+    "Root Rider",
 ]
 
 SIEGE_MACHINE_ORDER = [
@@ -186,6 +191,24 @@ class Resource(Enum):
     "Diggy",
     "Poison Lizard",
     "Phoenix",
+    "Spirit Fox"
+]
+
+EQUIPMENT = [
+    "Barbarian Puppet",
+    "Rage Vial",
+    "Archer Puppet",
+    "Invisibility Vial",
+    "Eternal Tome",
+    "Life Gem",
+    "Seeking Shield",
+    "Royal Gem",
+    "Earthquake Boots",
+    "Vampstache",
+    "Giant Arrow",
+    "Healer Puppet",
+    "Rage Gem",
+    "Healing Tome"
 ]
 
 ACHIEVEMENT_ORDER = [