[BUG] The new json files do not have resourc cost. Will need to fix them.

Author: majordoobie

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.

coc/static/buildings.json

@@ -0,0 +1,45 @@
+"""
+Automates updating the static files. If new files need to be added, then
+place them in the TARGETS list.
+"""
+import json
+import urllib
+import urllib.request
+
+# Targets first index is the URL and the second is the filename. If filename
+# is None, then the url name is used
+TARGETS = [
+    ("buildings.json", None),
+    ("characters.json", None),
+    ("heroes.json", None),
+    ("object_ids.json", None),
+    ("pets.json", None),
+    ("spells.json", None),
+    ("supers.json", None),
+    ("lang/texts_EN.json", "texts_EN.json"),
+]
+
+BASE_URL = "https://coc.guide/static/json/"
+
+
+def main():
+    for target_file in TARGETS:
+        req = urllib.request.Request(f"{BASE_URL}{target_file[0]}")
+        try:
+            print(f"[+] Downloading {req.full_url}")
+            with urllib.request.urlopen(req) as response:
+                bytes = response.read()
+                encoding = response.info().get_content_charset('utf8')
+        except urllib.error.URLError:
+            print(f"[!] Failed to fetch {req.full_url}")
+            continue
+
+        json_obj = json.loads(bytes.decode(encoding))
+
+        filename = target_file[0] if target_file[1] is None else target_file[1]
+        with open(filename, "wt", encoding="UTF-8") as outfile:
+            json.dump(json_obj, outfile)
+
+
+if __name__ == "__main__":
+    main()