version v.0.0.18.7

setting null rewards to Nothing x 0

Author: CrosswaveOmega

pyproject.toml

@@ -22,7 +22,7 @@ classifiers = [
 keywords=['helldivers2','api']
 requires-python = ">=3.8.1"
 
-version = '0.0.1.18.6'
+version = '0.0.1.18.7'
 dependencies= [
 "pydantic>=2.9.2",
 "httpx>=0.27.2"

src/hd2api/builders/assignment_builder.py

@@ -26,6 +26,13 @@ def build_assignment_2(assignment: Assignment) -> Assignment2:
             amount=reward.amount,
             id32=reward.id32,
         )
+    else:
+        set_reward = Reward2(
+            retrieved_at=assignment.retrieved_at,
+            type=0,
+            amount=0,
+            id32=000,
+        )
     ret = Assignment2(
         retrieved_at=assignment.retrieved_at,
         id=assignment.id32,

src/hd2api/models/Planet.py

@@ -231,7 +231,9 @@ def calculate_timeval(self, change: float, is_positive: bool) -> datetime.dateti
 
     def format_estimated_time_string(self, change: float, esttime: datetime.datetime):
         change_str = f"{round(change, 5)}"
-        timeval_str = f"Est.Loss {fdt(esttime,'R')}" if change > 0 else f"{fdt(esttime,'R')}"
+        timeval_str = (
+            f"Est.Loss {fdt(esttime,'R')}" if change > 0 else f"{fdt(esttime,'R')}"
+        )
 
         return f"`[{change_str} dps]`, {timeval_str}"
 
@@ -275,7 +277,8 @@ def average(planets_list: List["Planet"]) -> "Planet":
             return Planet()
 
         avg_health = (
-            sum(planet.health for planet in planets_list if planet.health is not None) // count
+            sum(planet.health for planet in planets_list if planet.health is not None)
+            // count
         )
 
         stats = []
@@ -357,9 +360,7 @@ def simple_planet_view(
         faction = emj(self.currentOwner.lower())
 
         name = f"{faction}P#{self.index}: {self.name}"
-        players = (
-            f"{emj('hdi')}: `{self.statistics.playerCount} {cfi(diff.statistics.playerCount)}`"
-        )
+        players = f"{emj('hdi')}: `{self.statistics.playerCount} {cfi(diff.statistics.playerCount)}`"
         outlist = [f"{players}"]
         if (not self.event) or show_hp_without_event:
             outlist.append(
@@ -384,6 +385,8 @@ def simple_planet_view(
             outlist.append(f"Deadline: [{timev}]")
             if avg:
                 if avg.event:
-                    outlist.append(f"{self.event.estimate_remaining_lib_time(avg.event)}")
+                    outlist.append(
+                        f"{self.event.estimate_remaining_lib_time(avg.event)}"
+                    )
 
         return name, outlist

src/hd2api/models/Reward2.py

@@ -36,8 +36,11 @@ class Reward2(BaseApiModel):
     def format(self):
         """Return the string representation of any reward."""
         type = self.type
+
         if self.id32 in rewards:
             type = rewards[self.id32]
+        if type == 0:
+            return f"Nothing × 0"
         if type == 1:
             return f"{emj('medal')} × {self.amount}"
         if type == 2:

src/hd2api/models/Statistics.py

@@ -111,7 +111,8 @@ def __sub__(self, other: "Statistics") -> "Statistics":
             deaths=(self.deaths or 0) - (other.deaths or 0),
             revives=(self.revives or 0) - (other.revives or 0),
             friendlies=(self.friendlies or 0) - (other.friendlies or 0),
-            missionSuccessRate=(self.missionSuccessRate or 0) - (other.missionSuccessRate or 0),
+            missionSuccessRate=(self.missionSuccessRate or 0)
+            - (other.missionSuccessRate or 0),
             accuracy=(self.accuracy or 0) - (other.accuracy or 0),
             playerCount=(self.playerCount or 0) - (other.playerCount or 0),
             time_delta=self.retrieved_at - other.retrieved_at,  # type: ignore
@@ -137,47 +138,73 @@ def average(stats_list: List["Statistics"]) -> "Statistics":
             // count
         )
         avg_stats = Statistics(
-            missionsWon=sum(stat.missionsWon for stat in stats_list if stat.missionsWon is not None)
+            missionsWon=sum(
+                stat.missionsWon for stat in stats_list if stat.missionsWon is not None
+            )
             // count,
             missionsLost=sum(
-                stat.missionsLost for stat in stats_list if stat.missionsLost is not None
+                stat.missionsLost
+                for stat in stats_list
+                if stat.missionsLost is not None
             )
             // count,
-            missionTime=sum(stat.missionTime for stat in stats_list if stat.missionTime is not None)
+            missionTime=sum(
+                stat.missionTime for stat in stats_list if stat.missionTime is not None
+            )
             // count,
             terminidKills=sum(
-                stat.terminidKills for stat in stats_list if stat.terminidKills is not None
+                stat.terminidKills
+                for stat in stats_list
+                if stat.terminidKills is not None
             )
             // count,
             automatonKills=sum(
-                stat.automatonKills for stat in stats_list if stat.automatonKills is not None
+                stat.automatonKills
+                for stat in stats_list
+                if stat.automatonKills is not None
             )
             // count,
             illuminateKills=sum(
-                stat.illuminateKills for stat in stats_list if stat.illuminateKills is not None
+                stat.illuminateKills
+                for stat in stats_list
+                if stat.illuminateKills is not None
             )
             // count,
             bulletsFired=sum(
-                stat.bulletsFired for stat in stats_list if stat.bulletsFired is not None
+                stat.bulletsFired
+                for stat in stats_list
+                if stat.bulletsFired is not None
+            )
+            // count,
+            bulletsHit=sum(
+                stat.bulletsHit for stat in stats_list if stat.bulletsHit is not None
+            )
+            // count,
+            timePlayed=sum(
+                stat.timePlayed for stat in stats_list if stat.timePlayed is not None
             )
             // count,
-            bulletsHit=sum(stat.bulletsHit for stat in stats_list if stat.bulletsHit is not None)
+            deaths=sum(stat.deaths for stat in stats_list if stat.deaths is not None)
             // count,
-            timePlayed=sum(stat.timePlayed for stat in stats_list if stat.timePlayed is not None)
+            revives=sum(stat.revives for stat in stats_list if stat.revives is not None)
             // count,
-            deaths=sum(stat.deaths for stat in stats_list if stat.deaths is not None) // count,
-            revives=sum(stat.revives for stat in stats_list if stat.revives is not None) // count,
-            friendlies=sum(stat.friendlies for stat in stats_list if stat.friendlies is not None)
+            friendlies=sum(
+                stat.friendlies for stat in stats_list if stat.friendlies is not None
+            )
             // count,
             missionSuccessRate=sum(
                 stat.missionSuccessRate
                 for stat in stats_list
                 if stat.missionSuccessRate is not None
             )
             // count,
-            accuracy=sum(stat.accuracy for stat in stats_list if stat.accuracy is not None)
+            accuracy=sum(
+                stat.accuracy for stat in stats_list if stat.accuracy is not None
+            )
             // count,
-            playerCount=sum(stat.playerCount for stat in stats_list if stat.playerCount is not None)
+            playerCount=sum(
+                stat.playerCount for stat in stats_list if stat.playerCount is not None
+            )
             // count,
             time_delta=datetime.timedelta(seconds=avg_time),
         )
@@ -201,18 +228,23 @@ def format_statistics(self) -> str:
         #             f"I: {hf(self.illuminateKills)}"
 
         # Format deaths and friendlies statistics
-        deaths_and_friendlies = f"Deaths/Friendlies: {hf(self.deaths)}/" f"{hf(self.friendlies)}"
+        deaths_and_friendlies = (
+            f"Deaths/Friendlies: {hf(self.deaths)}/" f"{hf(self.friendlies)}"
+        )
 
         # Format player count
         player_count = f"{emj('hdi')}: {hf(self.playerCount)}"
         thistime = round(
-            max(self.missionTime, 1) / max(((self.missionsWon or 0) + (self.missionsLost or 0)), 1),
+            max(self.missionTime, 1)
+            / max(((self.missionsWon or 0) + (self.missionsLost or 0)), 1),
             4,
         )  # type: ignore
 
         mission_stats += f"\n Time per mission: {sts(thistime)}"
         # Concatenate all formatted statistics
-        statsa = f"`[Missions: {mission_stats}]`\n`[{missiontime}]`\n`[Kills: {kill_stats}]`"
+        statsa = (
+            f"`[Missions: {mission_stats}]`\n`[{missiontime}]`\n`[Kills: {kill_stats}]`"
+        )
         statsb = f"`[{deaths_and_friendlies}]`"
         statsc = f"`Total Time: {sts(self.timePlayed)}`"
         return f"{player_count}\n{statsa}\n{statsb}\n{statsc}"