Merge pull request #146 from doluk/patch-2

Fix calculation of WarClan.total_attacks

Author: majordoobie

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")