Map PlanetEvent MaxHealth (#45)

helldivers-2 · Apr 4, 2024 · ac46f2a · ac46f2a
1 parent 326128c
commit ac46f2a
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 3 deletions.
diff --git a/src/Helldivers-2-API/wwwroot/Helldivers-2-API.json b/src/Helldivers-2-API/wwwroot/Helldivers-2-API.json
@@ -860,6 +860,11 @@
             "description": "The current health of the planet.",
             "format": "int64"
           },
+          "maxHealth": {
+            "type": "integer",
+            "description": "The current maximum health of the planet event.",
+            "format": "int64"
+          },
           "startTime": {
             "type": "integer",
             "description": "When this event started.",
@@ -1713,7 +1718,12 @@
           },
           "health": {
             "type": "integer",
-            "description": "The health of the Planet at the time of snapshot.",
+            "description": "The health of the Event at the time of snapshot.",
+            "format": "int64"
+          },
+          "maxHealth": {
+            "type": "integer",
+            "description": "The maximum health of the Event at the time of snapshot.",
             "format": "int64"
           },
           "startTime": {

diff --git a/src/Helldivers-2-API/wwwroot/Helldivers-2-API_arrowhead.json b/src/Helldivers-2-API/wwwroot/Helldivers-2-API_arrowhead.json
@@ -379,6 +379,11 @@
             "description": "The current health of the planet.",
             "format": "int64"
           },
+          "maxHealth": {
+            "type": "integer",
+            "description": "The current maximum health of the planet event.",
+            "format": "int64"
+          },
           "startTime": {
             "type": "integer",
             "description": "When this event started.",

diff --git a/src/Helldivers-2-Core/Mapping/V1/PlanetMapper.cs b/src/Helldivers-2-Core/Mapping/V1/PlanetMapper.cs
@@ -68,6 +68,7 @@ public Planet MapToV1(PlanetInfo info, PlanetStatus status, PlanetEvent? @event,
             EventType: @event.EventType,
             Faction: faction ?? string.Empty,
             Health: @event.Health,
+            MaxHealth: @event.MaxHealth,
             StartTime: DateTime.UnixEpoch.AddSeconds(@event.StartTime),
             EndTime: DateTime.UnixEpoch.AddSeconds(@event.ExpireTime),
             CampaignId: @event.CampaignId,

diff --git a/src/Helldivers-2-Models/ArrowHead/Status/PlanetEvent.cs b/src/Helldivers-2-Models/ArrowHead/Status/PlanetEvent.cs
@@ -9,7 +9,8 @@ namespace Helldivers.Models.ArrowHead.Status;
 /// <param name="PlanetIndex">The index of the planet.</param>
 /// <param name="EventType">A numerical identifier that indicates what type of event this is.</param>
 /// <param name="Race">The identifier of the faction that owns the planet currently.</param>
-/// <param name="Health">The current health of the planet.</param>
+/// <param name="Health">The current health of the event.</param>
+/// <param name="MaxHealth">The current maximum health of the event.</param>
 /// <param name="StartTime">When this event started.</param>
 /// <param name="ExpireTime">When the event will end.</param>
 /// <param name="CampaignId">The unique identifier of a related campaign.</param>
@@ -20,6 +21,7 @@ public sealed record PlanetEvent(
     int EventType,
     int Race,
     long Health,
+    long MaxHealth,
     long StartTime,
     long ExpireTime,
     long CampaignId,

diff --git a/src/Helldivers-2-Models/V1/Planets/Event.cs b/src/Helldivers-2-Models/V1/Planets/Event.cs
@@ -6,7 +6,8 @@
 /// <param name="Id">The unique identifier of this event.</param>
 /// <param name="EventType">The type of event.</param>
 /// <param name="Faction">The faction that initiated the event.</param>
-/// <param name="Health">The health of the <see cref="Planet" /> at the time of snapshot.</param>
+/// <param name="Health">The health of the <see cref="Event" /> at the time of snapshot.</param>
+/// <param name="MaxHealth">The maximum health of the <see cref="Event" /> at the time of snapshot.</param>
 /// <param name="StartTime">When the event started.</param>
 /// <param name="EndTime">When the event will end.</param>
 /// <param name="CampaignId">The identifier of the <see cref="Campaign" /> linked to this event.</param>
@@ -16,6 +17,7 @@ public sealed record Event(
     int EventType,
     string Faction,
     long Health,
+    long MaxHealth,
     DateTime StartTime,
     DateTime EndTime,
     long CampaignId,