Enhance player state reporting in L4D2 Game Info Sync plugin by addin…

…g checks for player health and status for survivors and infected
altair-sossai · Nov 7, 2024 · 2850066 · 2850066
1 parent 1fe00c7
commit 2850066
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 23 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
@@ -237,47 +237,61 @@ void SendPlayers()
         GetClientName(client, name, sizeof(name));
         player.SetString("name", name);
 
-        player.SetFloat("latency", GetClientLatency(client, NetFlow_Both));
+        if (team == L4D2_TEAM_SURVIVOR || team == L4D2_TEAM_INFECTED)
+            player.SetFloat("latency", GetClientLatency(client, NetFlow_Both));
 
         if (team == L4D2_TEAM_SURVIVOR)
         {
             player.SetInt("character", IdentifySurvivor(client));
-            player.SetInt("permanentHealth", GetSurvivorPermanentHealth(client));
-            player.SetInt("temporaryHealth", GetSurvivorTemporaryHealth(client));
-            player.SetInt("primaryWeapon", IdentifyWeapon(GetPlayerWeaponSlot(client, 0)));
 
-            int slot1 = GetPlayerWeaponSlot(client, 1);
-            int secondaryWeapon = IdentifyWeapon(slot1);
+            bool isPlayerAlive = IsPlayerAlive(client);
 
-            player.SetInt("secondaryWeapon", secondaryWeapon);
+            if (isPlayerAlive)
+            {
+                player.SetInt("permanentHealth", GetSurvivorPermanentHealth(client));
+                player.SetInt("temporaryHealth", GetSurvivorTemporaryHealth(client));
+                player.SetInt("primaryWeapon", IdentifyWeapon(GetPlayerWeaponSlot(client, 0)));
 
-            if (secondaryWeapon == WEPID_MELEE)
-                player.SetInt("meleeWeapon", IdentifyMeleeWeapon(slot1));
+                int slot1 = GetPlayerWeaponSlot(client, 1);
+                int secondaryWeapon = IdentifyWeapon(slot1);
 
-            player.SetInt("slotNumber3", IdentifyWeapon(GetPlayerWeaponSlot(client, 2)));
-            player.SetInt("slotNumber4", IdentifyWeapon(GetPlayerWeaponSlot(client, 3)));
-            player.SetInt("slotNumber5", IdentifyWeapon(GetPlayerWeaponSlot(client, 4)));
-            player.SetBool("blackAndWhite", L4D_IsPlayerOnThirdStrike(client));
-            player.SetBool("incapacitated", IsIncapacitated(client));
-            player.SetBool("isPlayerAlive", IsPlayerAlive(client));
+                player.SetInt("secondaryWeapon", secondaryWeapon);
 
-            float progress = GetSurvivorProgress(client);
-            if (progress > SurvivorProgress[client])
-                SurvivorProgress[client] = progress;
+                if (secondaryWeapon == WEPID_MELEE)
+                    player.SetInt("meleeWeapon", IdentifyMeleeWeapon(slot1));
 
+                player.SetInt("slotNumber3", IdentifyWeapon(GetPlayerWeaponSlot(client, 2)));
+                player.SetInt("slotNumber4", IdentifyWeapon(GetPlayerWeaponSlot(client, 3)));
+                player.SetInt("slotNumber5", IdentifyWeapon(GetPlayerWeaponSlot(client, 4)));
+                player.SetBool("blackAndWhite", L4D_IsPlayerOnThirdStrike(client));
+                player.SetBool("incapacitated", IsIncapacitated(client));
+
+                float progress = GetSurvivorProgress(client);
+                if (progress > SurvivorProgress[client])
+                    SurvivorProgress[client] = progress;
+            }
+
+            player.SetBool("isPlayerAlive", isPlayerAlive);
             player.SetFloat("progress", SurvivorProgress[client]);
 
             survivors.Push(player);
         }
 
         if (team == L4D2_TEAM_INFECTED)
         {
-            player.SetInt("type", GetInfectedClass(client));
+            bool isInfectedGhost = IsInfectedGhost(client);
+            bool isPlayerAlive = IsPlayerAlive(client);
+
+            if (isInfectedGhost || isPlayerAlive)
+            {
+                player.SetInt("type", GetInfectedClass(client));
+                player.SetInt("health", GetClientHealth(client));
+                player.SetInt("maxHealth", GetEntProp(client, Prop_Data, "m_iMaxHealth"));
+            }
+
             player.SetInt("damage", InfectedDamage[client]);
-            player.SetInt("health", GetClientHealth(client));
-            player.SetInt("maxHealth", GetEntProp(client, Prop_Data, "m_iMaxHealth"));
-            player.SetBool("isInfectedGhost", IsInfectedGhost(client));
-            player.SetBool("isPlayerAlive", IsPlayerAlive(client));
+            player.SetBool("isInfectedGhost", isInfectedGhost);
+            player.SetBool("isPlayerAlive", isPlayerAlive);
 
             infecteds.Push(player);
         }