Update scoreboard synchronization to reset progress and adjust bonus …

…calculations when in ready state
altair-sossai · Nov 11, 2024 · 35de260 · 35de260
1 parent 35fc804
commit 35de260
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/addons/sourcemod/plugins/optional/l4d2_gameinfo_sync.smx b/addons/sourcemod/plugins/optional/l4d2_gameinfo_sync.smx
diff --git a/addons/sourcemod/scripting/l4d2_gameinfo_sync.sp b/addons/sourcemod/scripting/l4d2_gameinfo_sync.sp
@@ -210,13 +210,16 @@ void SendScoreboard()
     JSONObject command = new JSONObject();
 
     int flipped = GameRules_GetProp("m_bAreTeamsFlipped");
+    bool isInReady = IsInReady();
+    int bonus = SMPlus_GetHealthBonus() + SMPlus_GetDamageBonus() + SMPlus_GetPillsBonus();
+    int maxBonus = SMPlus_GetMaxHealthBonus() + SMPlus_GetMaxDamageBonus() + SMPlus_GetMaxPillsBonus();
 
     command.SetInt("survivorScore", L4D2Direct_GetVSCampaignScore(flipped ? 1 : 0) + L4D_GetTeamScore(flipped ? 2 : 1));
     command.SetInt("infectedScore", L4D2Direct_GetVSCampaignScore(flipped ? 0 : 1) + L4D_GetTeamScore(flipped ? 1 : 2));
-    command.SetInt("bonus", SMPlus_GetHealthBonus() + SMPlus_GetDamageBonus() + SMPlus_GetPillsBonus());
-    command.SetInt("maxBonus", SMPlus_GetMaxHealthBonus() + SMPlus_GetMaxDamageBonus() + SMPlus_GetMaxPillsBonus());
-    command.SetFloat("currentProgress", IsInReady() ? 0.0 : (GetCurrentProgress() / 100.0));
-    command.SetInt("currentProgressPoints", L4D_GetTeamScore(flipped ? 2 : 1));
+    command.SetInt("bonus", isInReady ? maxBonus : bonus);
+    command.SetInt("maxBonus", maxBonus);
+    command.SetFloat("currentProgress", isInReady ? 0.0 : (GetCurrentProgress() / 100.0));
+    command.SetInt("currentProgressPoints", isInReady ? 0 : L4D_GetTeamScore(flipped ? 2 : 1));
 
     HTTPRequest request = BuildHTTPRequest("/api/game-info/scoreboard");