Merge branch 'g5_2.2.2_candidate' of github.com:mathsman5133/coc.py into g5_2.2.2_candidate

Author: majordoobie

coc/clans.py

@@ -107,6 +107,8 @@ class Clan(BaseClan):
         The clan's versus trophy count. This is calculated according to members' versus trophy counts.
     required_trophies: :class:`int`
         The minimum 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`
         The frequency for when this clan goes to war.
         For example, this could be ``always``.
@@ -159,6 +161,7 @@ class Clan(BaseClan):
         "capital_district_cls",
         "war_league",
         "chat_language",
+        "required_townhall",
 
         "_cs_labels",
         "_cs_members",
@@ -197,6 +200,7 @@ def _from_data(self, data: dict) -> None:
         self.description: str = data_get("description")
         self.war_league = try_enum(WarLeague, data=data_get("warLeague"))
         self.chat_language = try_enum(ChatLanguage, data=data_get("chatLanguage"))
+        self.required_townhall = data_get("requiredTownhallLevel")
 
         label_cls = self.label_cls
         self._iter_labels = (label_cls(data=ldata, client=self._client) for ldata in data_get("labels", []))

coc/war_clans.py

@@ -104,7 +104,7 @@ def _from_data(self, data: dict) -> None:
 
         if self._war:
             self.max_stars: int = self._war.team_size * 3
-            self.total_attacks: int = self._war.team_size * 2
+            self.total_attacks: int = self._war.team_size * self._war.attacks_per_member
         else:
             self.max_stars: int = (data_get("teamSize") or 0) * 3
             self.total_attacks: int = (data_get("teamSize") or 0) * 3

coc/wars.py

@@ -103,7 +103,7 @@ def _from_data(self, data: dict) -> None:
         self.start_time = try_enum(Timestamp, data=data_get("startTime"))
         self.end_time = try_enum(Timestamp, data=data_get("endTime"))
         self.war_tag: str = data_get("tag")
-        if data_get("attacksPerMember") is None and self.is_cwl:
+        if data_get("attacksPerMember") is None or self.is_cwl:
             self.attacks_per_member: int = 1
         else:
             self.attacks_per_member: int = data_get("attacksPerMember")