Fix AI Tank "repsawn" with 5000HP (#866)

* l4d_tank_control_eq: Fix AI tank "respawn" with 5000HP * Update configs to further prevent AI Tank suicide
SirPlease · Jan 5, 2025 · 35dea4f · 35dea4f
1 parent 0d5ecf6
commit 35dea4f
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 4 deletions.
diff --git a/addons/sourcemod/plugins/optional/l4d_tank_control_eq.smx b/addons/sourcemod/plugins/optional/l4d_tank_control_eq.smx
diff --git a/addons/sourcemod/scripting/l4d_tank_control_eq.sp b/addons/sourcemod/scripting/l4d_tank_control_eq.sp
@@ -54,7 +54,7 @@ public Plugin myinfo =
     name = "L4D2 Tank Control",
     author = "arti, (Contributions by: Sheo, Sir, Altair-Sossai)",
     description = "Distributes the role of the tank evenly throughout the team, allows for overrides. (Includes forwards)",
-    version = "0.0.26",
+    version = "0.0.27",
     url = "https://github.com/SirPlease/L4D2-Competitive-Rework"
 }
 
@@ -173,13 +173,19 @@ public Action L4D_OnTryOfferingTankBot(int tank_index, bool &enterStatis)
 public void L4D_OnLeaveStasis(int tank)
 {
     // Tank is always AI here, delay by a frame.
-    RequestFrame(L4D_OnLeaveStasis_Post, tank);
+    RequestFrame(L4D_OnLeaveStasis_Post, GetClientUserId(tank));
 }
 
-void L4D_OnLeaveStasis_Post(int tank)
+void L4D_OnLeaveStasis_Post(int userid)
 {
+    int tank = GetClientOfUserId(userid);
     // Tank passed from AI to a player, nothing to do here.
-    if (!IsClientInGame(tank))
+    if (!tank || !IsClientInGame(tank))
+        return;
+
+    // @Forgetest: 
+    //   AI Tank may have committed suicide at the moment
+    if (!IsPlayerAlive(tank) || GetEntProp(tank, Prop_Send, "m_isIncapacitated")) // Thanks to @sheo for noting the tank incap
         return;
 
     if (hTankDebug.BoolValue)

diff --git a/cfg/cfgogl/acemodrv/shared_cvars.cfg b/cfg/cfgogl/acemodrv/shared_cvars.cfg
@@ -127,6 +127,8 @@ confogl_addcvar versus_tank_flow_team_variation 0
 confogl_addcvar versus_boss_flow_max 0.9
 confogl_addcvar versus_boss_flow_min 0.10
 confogl_addcvar tank_stuck_time_suicide 999999999
+confogl_addcvar tank_stuck_visibility_tolerance_suicide 999999999
+confogl_addcvar tank_visibility_tolerance_suicide 999999999
 confogl_addcvar director_tank_lottery_selection_time 3
 confogl_addcvar z_witch_damage_per_kill_hit 100
 confogl_addcvar z_witch_personal_space 500

diff --git a/cfg/cfgogl/apex/shared_cvars.cfg b/cfg/cfgogl/apex/shared_cvars.cfg
@@ -127,6 +127,8 @@ confogl_addcvar versus_tank_flow_team_variation 0
 confogl_addcvar versus_boss_flow_max 0.9
 confogl_addcvar versus_boss_flow_min 0.10
 confogl_addcvar tank_stuck_time_suicide 999999999
+confogl_addcvar tank_stuck_visibility_tolerance_suicide 999999999
+confogl_addcvar tank_visibility_tolerance_suicide 999999999
 confogl_addcvar director_tank_lottery_selection_time 3
 confogl_addcvar z_frustration_spawn_delay 25
 confogl_addcvar tankcontrol_print_all 0

diff --git a/cfg/cfgogl/deadman/confogl.cfg b/cfg/cfgogl/deadman/confogl.cfg
@@ -131,6 +131,8 @@ confogl_addcvar z_brawl_chance 0
 confogl_addcvar versus_boss_flow_max 0.85
 confogl_addcvar versus_boss_flow_min 0.10
 confogl_addcvar tank_stuck_time_suicide 999999999
+confogl_addcvar tank_stuck_visibility_tolerance_suicide 999999999
+confogl_addcvar tank_visibility_tolerance_suicide 999999999
 confogl_addcvar director_tank_lottery_selection_time 3
 confogl_addcvar z_witch_damage_per_kill_hit 75
 confogl_addcvar z_witch_personal_space 240

diff --git a/cfg/cfgogl/eq/shared_cvars.cfg b/cfg/cfgogl/eq/shared_cvars.cfg
@@ -130,6 +130,8 @@ confogl_addcvar versus_tank_flow_team_variation 0
 confogl_addcvar versus_boss_flow_max 0.9
 confogl_addcvar versus_boss_flow_min 0.10
 confogl_addcvar tank_stuck_time_suicide 999999999
+confogl_addcvar tank_stuck_visibility_tolerance_suicide 999999999
+confogl_addcvar tank_visibility_tolerance_suicide 999999999
 confogl_addcvar director_tank_lottery_selection_time 3
 confogl_addcvar z_witch_damage_per_kill_hit 100
 confogl_addcvar z_witch_personal_space 500

diff --git a/cfg/cfgogl/neomod/shared_cvars.cfg b/cfg/cfgogl/neomod/shared_cvars.cfg
@@ -126,6 +126,8 @@ confogl_addcvar versus_tank_flow_team_variation 0
 confogl_addcvar versus_boss_flow_max 0.85
 confogl_addcvar versus_boss_flow_min 0.20
 confogl_addcvar tank_stuck_time_suicide 999999999
+confogl_addcvar tank_stuck_visibility_tolerance_suicide 999999999
+confogl_addcvar tank_visibility_tolerance_suicide 999999999
 confogl_addcvar director_tank_lottery_selection_time 3
 confogl_addcvar z_frustration_spawn_delay 25
 confogl_addcvar z_frustration_los_delay 1.2

diff --git a/cfg/cfgogl/nextmod/shared_cvars.cfg b/cfg/cfgogl/nextmod/shared_cvars.cfg
@@ -131,6 +131,8 @@ confogl_addcvar versus_tank_flow_team_variation 0
 confogl_addcvar versus_boss_flow_max 0.85
 confogl_addcvar versus_boss_flow_min 0.20
 confogl_addcvar tank_stuck_time_suicide 999999999
+confogl_addcvar tank_stuck_visibility_tolerance_suicide 999999999
+confogl_addcvar tank_visibility_tolerance_suicide 999999999
 confogl_addcvar director_tank_lottery_selection_time 3
 confogl_addcvar z_frustration_spawn_delay 25
 confogl_addcvar z_frustration_los_delay 1.2

diff --git a/cfg/cfgogl/pmelite/confogl.cfg b/cfg/cfgogl/pmelite/confogl.cfg
@@ -160,6 +160,8 @@ confogl_addcvar versus_tank_flow_team_variation  0
 confogl_addcvar versus_boss_flow_max 0.80
 confogl_addcvar versus_boss_flow_min 0.20
 confogl_addcvar tank_stuck_time_suicide 999999999
+confogl_addcvar tank_stuck_visibility_tolerance_suicide 999999999
+confogl_addcvar tank_visibility_tolerance_suicide 999999999
 confogl_addcvar director_tank_lottery_selection_time 3
 confogl_addcvar z_witch_damage_per_kill_hit 75
 confogl_addcvar z_witch_personal_space 240

diff --git a/cfg/cfgogl/zonehunters/shared_cvars.cfg b/cfg/cfgogl/zonehunters/shared_cvars.cfg
@@ -107,6 +107,8 @@ confogl_addcvar versus_tank_flow_team_variation 0
 confogl_addcvar versus_boss_flow_max 0.85
 confogl_addcvar versus_boss_flow_min 0.20
 confogl_addcvar tank_stuck_time_suicide 999999999
+confogl_addcvar tank_stuck_visibility_tolerance_suicide 999999999
+confogl_addcvar tank_visibility_tolerance_suicide 999999999
 confogl_addcvar director_tank_lottery_selection_time 3
 confogl_addcvar z_frustration_spawn_delay 20
 confogl_addcvar z_frustration_los_delay 1.2

diff --git a/cfg/cfgogl/zonemod/shared_cvars.cfg b/cfg/cfgogl/zonemod/shared_cvars.cfg
@@ -126,6 +126,8 @@ confogl_addcvar versus_tank_flow_team_variation 0
 confogl_addcvar versus_boss_flow_max 0.85
 confogl_addcvar versus_boss_flow_min 0.20
 confogl_addcvar tank_stuck_time_suicide 999999999
+confogl_addcvar tank_stuck_visibility_tolerance_suicide 999999999
+confogl_addcvar tank_visibility_tolerance_suicide 999999999
 confogl_addcvar director_tank_lottery_selection_time 3
 confogl_addcvar z_frustration_spawn_delay 20
 confogl_addcvar z_frustration_los_delay 1.2

diff --git a/cfg/cfgogl/zoneretro/shared_cvars.cfg b/cfg/cfgogl/zoneretro/shared_cvars.cfg
@@ -118,6 +118,8 @@ confogl_addcvar versus_tank_flow_team_variation 0
 confogl_addcvar versus_boss_flow_max 0.85
 confogl_addcvar versus_boss_flow_min 0.20
 confogl_addcvar tank_stuck_time_suicide 999999999
+confogl_addcvar tank_stuck_visibility_tolerance_suicide 999999999
+confogl_addcvar tank_visibility_tolerance_suicide 999999999
 confogl_addcvar director_tank_lottery_selection_time 3
 confogl_addcvar z_frustration_spawn_delay 20
 confogl_addcvar z_frustration_los_delay 1.2