Turrets: Don't attack in RPG by default.

diff --git a/data/defaultVoretournament.cfg b/data/defaultVoretournament.cfg
index d3c3e91be02a5b72fd7f3a3fd1e07b3b1c0bb796..058f2c9eca0bb76bd28cc0e7ad9edd3c5925590c 100644 (file)
--- a/data/defaultVoretournament.cfg
+++ b/data/defaultVoretournament.cfg
@@ -610,6 +610,7 @@ seta g_cts 0 "CTS: complete the stage"
 seta g_rpg 0 "RPG: RolePlay / Free Roam gametype"\r
 set g_rpg_canleave 1 "when enabled, anyone can leave a predator's stomach in RPG (like leaving a team mate in team games)"\r
 set g_rpg_botattack 1 "bot behavior in RPG. 0 causes bots to never attack, 1 allows bots to swallow you harmlessly, 2 allows bots to attack normally"\r
+set g_rpg_turretattack 0 "if disabled, turrets don't attack anyone in RPG games. Otherwise, they attack everyone."\r
 \r
 // server game balance settings\r
 // powerup balance settings\r

diff --git a/data/qcsrc/server/tturrets/system/system_main.qc b/data/qcsrc/server/tturrets/system/system_main.qc
index 8d8e03d3d0ac39ac4ab4e93b52b051a5cea72d01..19821bc2d69d7492d119ee36bbbfbb4dcebd2bf3 100644 (file)
--- a/data/qcsrc/server/tturrets/system/system_main.qc
+++ b/data/qcsrc/server/tturrets/system/system_main.qc
@@ -581,6 +581,10 @@ float turret_validate_target(entity e_turret,entity e_target,float validate_flag
         return -21;\r
     */\r
 \r
+       // Don't attack in RPG if this is not allowed\r
+       if(cvar("g_rpg") && !cvar("g_rpg_turretattack"))\r
+               return -22;\r
+\r
 #ifdef TURRET_DEBUG_TARGETSELECT\r
     dprint("Target:",e_target.netname," is a valid target for ",e_turret.netname,"\n");\r
 #endif\r