Merge pull request #208 from mathsman5133/g10_3.0.0

v3.0.0 big update

Author: Kuchenmampfer

coc/__init__.py

@@ -22,7 +22,7 @@
 SOFTWARE.
 """
 
-__version__ = "2.4.2"
+__version__ = "3.0.0"
 
 from .abc import BasePlayer, BaseClan
 from .clans import RankedClan, Clan
@@ -54,7 +54,6 @@
     GatewayError,
     PrivateWarLog,
 )
-from .login import login, login_with_keys
 from .hero import Hero, Pet
 from .http import BasicThrottler, BatchThrottler, HTTPClient
 from .iterators import (
@@ -78,7 +77,7 @@
     Timestamp,
     TimeDelta,
     Label,
-    WarLeague,
+    BaseLeague
 )
 from .players import Player, ClanMember, RankedPlayer
 from .player_clan import PlayerClan

coc/abc.py

@@ -193,7 +193,7 @@ def _load_json_meta(cls, troop_meta, id, name, lab_to_townhall):
         cls.hitpoints = try_enum(UnitStat, troop_meta.get("Hitpoints"))
 
         # get production building
-        production_building = troop_meta.get("ProductionBuilding", [None])[0]
+        production_building = troop_meta.get("ProductionBuilding", [None])[0] if troop_meta.get("ProductionBuilding") else None
         if production_building == "Barrack":
             cls.is_elixir_troop = True
         elif production_building == "Dark Elixir Barrack":
@@ -326,11 +326,13 @@ class DataContainerHolder:
     def __init__(self):
         self.loaded = False
 
-    def _load_json(self, object_ids, english_aliases, lab_to_townhall):
+    def _load_json(self, english_aliases, lab_to_townhall):
         with open(self.FILE_PATH) as fp:
             data = ujson.load(fp)
 
+        id = 2000
         for c, [supercell_name, meta] in enumerate(data.items()):
+
             # Not interested if it doesn't have a TID, since it likely isn't a real troop.
             if not meta.get("TID"):
                 continue
@@ -340,8 +342,12 @@ def _load_json(self, object_ids, english_aliases, lab_to_townhall):
                 continue
 
             # SC game files have "DisableProduction" true for all pet objects, which we want
-            if "DisableProduction" in meta and "pets" not in str(
-                    self.FILE_PATH):
+            if True in meta.get("DisableProduction", [False]) and "pets" not in str(self.FILE_PATH):
+                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:
                 continue
 
             # A bit of a hacky way to create a "copy" of a new Troop object that hasn't been initiated yet.
@@ -350,11 +356,11 @@ def _load_json(self, object_ids, english_aliases, lab_to_townhall):
                             dict(self.data_object.__dict__))
             new_item._load_json_meta(
                 meta,
-                id=object_ids.get(supercell_name, c),
-                name=english_aliases[meta["TID"][0]][0],
+                id=id,
+                name=english_aliases[meta["TID"][0]]["EN"][0],
                 lab_to_townhall=lab_to_townhall,
             )
-
+            id += 1
             self.items.append(new_item)
             self.item_lookup[new_item.name] = new_item
 

coc/clans.py

@@ -25,7 +25,7 @@
 
 
 from .players import ClanMember
-from .miscmodels import try_enum, ChatLanguage, Location, Label, WarLeague, CapitalDistrict
+from .miscmodels import try_enum, ChatLanguage, Location, Label, BaseLeague, CapitalDistrict
 from .utils import get, cached_property, correct_tag
 from .abc import BaseClan
 
@@ -48,11 +48,13 @@ class RankedClan(BaseClan):
     member_count: :class:`int`
         The number of members in the clan.
     points: :class:`int`
-        The clan's trophy-count. If retrieving info for capital or versus leader-boards, this will be ``None``.
-    versus_points: :class:`int`
-        The clan's versus trophy count. If retrieving info for regular or capital leader boards, this will be ``None``.
+        The clan's trophy-count. If retrieving info for capital or builder base leader-boards, this will be ``None``.
+    builder_base_points: :class:`int`
+        The clan's builder base trophy count. If retrieving info for regular or capital leader boards, this will be
+        ``None``.
     capital_points: :class:`int`
-        The clan's capital trophy count. If retrieving info for regular or versus leader boards, this will be ``None``.
+        The clan's capital trophy count. If retrieving info for regular or builder base leader boards, this will be
+        ``None``.
     rank: :class:`int`
         The clan's rank in the leader board.
     previous_rank: :class:`int`
@@ -63,7 +65,7 @@ class RankedClan(BaseClan):
         "location",
         "member_count",
         "points",
-        "versus_points",
+        "builder_base_points",
         "capital_points",
         "rank",
         "previous_rank",
@@ -77,7 +79,7 @@ def _from_data(self, data: dict) -> None:
         data_get = data.get
 
         self.points: int = data_get("clanPoints")
-        self.versus_points: int = data_get("clanVersusPoints")
+        self.builder_base_points: int = data_get("clanBuilderBasePoints")
         self.capital_points: int = data_get("clanCapitalPoints")
         self.member_count: int = data_get("members")
         self.location = try_enum(Location, data=data_get("location"))
@@ -110,12 +112,14 @@ class Clan(BaseClan):
         The clan's location.
     points: :class:`int`
         The clan's trophy count. This is calculated according to members' trophy counts.
-    versus_points: :class:`int`
-        The clan's versus trophy count. This is calculated according to members' versus trophy counts.
+    builder_base_points: :class:`int`
+        The clan's builder base trophy count. This is calculated according to members' builder base trophy counts.
     capital_points: :class:`int`
         The clan's clan capital points. Unsure how this is calculated.
     required_trophies: :class:`int`
         The minimum trophies required to apply to this clan.
+    required_builder_base_trophies: :class:`int`
+        The minimum builder base trophies required to apply to this clan.
     required_townhall: :class:`int`
         The minimum townhall level required to apply to this clan.
     war_frequency: :class:`str`
@@ -126,9 +130,9 @@ class Clan(BaseClan):
     war_wins: :class:`int`
         The number of wars the clan has won.
     war_ties: :class:`int`
-        The number of wars the clan has tied.
+        The number of wars the clan has tied. This is only available from the clan search endpoint else -1.
     war_losses: :class:`int`
-        The number of wars the clan has lost.
+        The number of wars the clan has lost.  This is only available from the clan search endpoint else -1.
     public_war_log: :class:`bool`
         Indicates if the clan has a public war log.
         If this is ``False``, operations to find the clan's current
@@ -145,9 +149,9 @@ class Clan(BaseClan):
         The type which the clan capital districts found in
         :attr:`Clan.capital_districts` will be of. Ensure any overriding of
         this inherits from :class:`coc.CapitalDistrict`.
-    war_league: :class:`coc.WarLeague`
+    war_league: :class:`coc.BaseLeague`
         The clan's CWL league.
-    capital_league: :class:`coc.WarLeague`
+    capital_league: :class:`coc.BaseLeague`
         The clan's Clan Capital league.
     """
 
@@ -157,9 +161,10 @@ class Clan(BaseClan):
         "description",
         "location",
         "points",
-        "versus_points",
+        "builder_base_points",
         "capital_points",
         "required_trophies",
+        "required_builder_base_trophies",
         "war_frequency",
         "war_win_streak",
         "war_wins",
@@ -200,7 +205,7 @@ def _from_data(self, data: dict) -> None:
         data_get = data.get
 
         self.points: int = data_get("clanPoints")
-        self.versus_points: int = data_get("clanVersusPoints")
+        self.builder_base_points: int = data_get("clanBuilderBasePoints")
         self.capital_points: int = data_get("clanCapitalPoints")
         self.member_count: int = data_get("members")
         self.location = try_enum(Location, data=data_get("location"))
@@ -209,15 +214,16 @@ def _from_data(self, data: dict) -> None:
         self.type: str = data_get("type")
         self.family_friendly = data_get("isFamilyFriendly")
         self.required_trophies: int = data_get("requiredTrophies")
+        self.required_builder_base_trophies: int = data_get("requiredBuilderBaseTrophies")
         self.war_frequency: str = data_get("warFrequency")
         self.war_win_streak: int = data_get("warWinStreak")
         self.war_wins: int = data_get("warWins")
-        self.war_ties: int = data_get("warTies")
-        self.war_losses: int = data_get("warLosses")
+        self.war_ties: int = data_get("warTies", -1)
+        self.war_losses: int = data_get("warLosses", -1)
         self.public_war_log: bool = data_get("isWarLogPublic")
         self.description: str = data_get("description")
-        self.war_league = try_enum(WarLeague, data=data_get("warLeague"))
-        self.capital_league = try_enum(WarLeague, data=data_get("capitalLeague"))
+        self.war_league = try_enum(BaseLeague, data=data_get("warLeague"))
+        self.capital_league = try_enum(BaseLeague, data=data_get("capitalLeague"))
         self.chat_language = try_enum(ChatLanguage, data=data_get("chatLanguage"))
         self.required_townhall = data_get("requiredTownhallLevel")
 
@@ -227,8 +233,8 @@ def _from_data(self, data: dict) -> None:
         # update members globally. only available via /clans/{clanTag}
         member_cls = self.member_cls
         member_data = data.get("memberList", [])
-        for rank, mdata in enumerate(sorted(member_data, key=lambda x: x["versusTrophies"], reverse=True), 1):
-            mdata["versusRank"] = rank
+        for rank, mdata in enumerate(sorted(member_data, key=lambda x: x["builderBaseTrophies"], reverse=True), 1):
+            mdata["builderBaseRank"] = rank
         self._iter_members = (
             member_cls(data=mdata, client=self._client, clan=self) for mdata in member_data
         )