Add headhunter and new siege machines, and futureproof the ordered_ design

Author: mathsman5133

coc/enums.py

@@ -93,6 +93,7 @@ def in_game_name(self):
     "Lava Hound",
     "Bowler",
     "Ice Golem",
+    "Headhunter",
 ]
 
 SIEGE_MACHINE_ORDER = [
@@ -103,10 +104,14 @@ def in_game_name(self):
 ]
 
 SUPER_TROOP_ORDER = [
-    "Sneaky Goblin",
     "Super Barbarian",
-    "Super Wall Breaker",
     "Super Giant",
+    "Sneaky Goblin",
+    "Super Wall Breaker",
+    "Inferno Dragon",
+    "Super Witch",
+    "Super Archer",  # not added yet but they're in the API payload for some reason
+    "Super Valkyrie",  # not added yet but they're in the API payload for some reason
 ]
 
 HOME_TROOP_ORDER = ELIXIR_TROOP_ORDER + SUPER_TROOP_ORDER + DARK_ELIXIR_TROOP_ORDER + SIEGE_MACHINE_ORDER
@@ -171,17 +176,19 @@ def in_game_name(self):
     "Treasurer",
     "Anti-Artillery",
     "Sharing is caring",
+    "Games Champion",
+    "Get those other Goblins!",
+    "Dragon Slayer",
+    "War League Legend",
     "Keep your village safe",
+    "Well Seasoned",
+    "Shattered and Scattered",
     "Master Engineering",
     "Next Generation Model",
     "Un-Build It",
     "Champion Builder",
     "High Gear",
     "Hidden Treasures",
-    "Games Champion",
-    "Dragon Slayer",
-    "War League Legend",
-    "Keep your village safe",
 ]
 
 UNRANKED_LEAGUE_DATA = {

coc/players.py

@@ -447,7 +447,7 @@ def get_ordered_troops(self, valid_troops):
         """
         troops_dict = {t.name: t for t in self.troops if t.name in set(valid_troops)}
         key_order = {k: v for v, k in enumerate(valid_troops)}
-        return OrderedDict(sorted(troops_dict.items(), key=lambda i: key_order.get(i[0])))
+        return OrderedDict(sorted(troops_dict.items(), key=lambda i: key_order.get(i[0], 0)))
 
     @property
     def ordered_home_troops(self):
@@ -456,7 +456,7 @@ def ordered_home_troops(self):
         This will return troops in the order found in both barracks and labatory in-game.
         """
         key_order = {k: v for v, k in enumerate(HOME_TROOP_ORDER)}
-        return OrderedDict(sorted(self.home_troops_dict.items(), key=lambda i: key_order.get(i[0])))
+        return OrderedDict(sorted(self.home_troops_dict.items(), key=lambda i: key_order.get(i[0], 0)))
 
     @property
     def ordered_super_troops(self):
@@ -465,7 +465,7 @@ def ordered_super_troops(self):
         This will return super troops in the order found in game.
         """
         key_order = {k: v for v, k in enumerate(SUPER_TROOP_ORDER)}
-        return OrderedDict(sorted(self.super_troops_dict.items(), key=lambda i: key_order.get(i[0])))
+        return OrderedDict(sorted(self.super_troops_dict.items(), key=lambda i: key_order.get(i[0], 0)))
 
     @property
     def ordered_builder_troops(self):
@@ -474,7 +474,7 @@ def ordered_builder_troops(self):
         This will return troops in the order found in both barracks and labatory in-game.
         """
         key_order = {k: v for v, k in enumerate(BUILDER_TROOPS_ORDER)}
-        return OrderedDict(sorted(self.builder_troops_dict.items(), key=lambda i: key_order.get(i[0])))
+        return OrderedDict(sorted(self.builder_troops_dict.items(), key=lambda i: key_order.get(i[0], 0)))
 
     @property
     def ordered_siege_machines(self):
@@ -483,7 +483,7 @@ def ordered_siege_machines(self):
         This will return siege machines in the order found in both barracks and labatory in-game.
         """
         key_order = {k: v for v, k in enumerate(SIEGE_MACHINE_ORDER)}
-        return OrderedDict(sorted(self.siege_machines_dict.items(), key=lambda i: key_order.get(i[0])))
+        return OrderedDict(sorted(self.siege_machines_dict.items(), key=lambda i: key_order.get(i[0], 0)))
 
     @property
     def ordered_spells(self):
@@ -492,7 +492,7 @@ def ordered_spells(self):
         This will return spells in the order found in both spell factory and labatory in-game.
         """
         key_order = {k: v for v, k in enumerate(SPELL_ORDER)}
-        return OrderedDict(sorted(self.spells_dict.items(), key=lambda i: key_order.get(i[0])))
+        return OrderedDict(sorted(self.spells_dict.items(), key=lambda i: key_order.get(i[0], 0)))
 
     @property
     def ordered_heroes(self):
@@ -501,7 +501,7 @@ def ordered_heroes(self):
         This will return heroes in the order found in the labatory in-game.
         """
         key_order = {k: v for v, k in enumerate(HERO_ORDER)}
-        return OrderedDict(sorted(self.heroes_dict.items(), key=lambda i: key_order.get(i[0])))
+        return OrderedDict(sorted(self.heroes_dict.items(), key=lambda i: key_order.get(i[0], 0)))
 
 
 class LeaguePlayer(EqualityComparable):