From: MirceaKitsune Date: Wed, 22 Sep 2010 16:49:14 +0000 (+0300) Subject: Turrets: Don't attack in RPG by default. X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=27db7b892ba8052c16001d89bb365a686e89714d;p=voretournament%2Fvoretournament.git Turrets: Don't attack in RPG by default. --- diff --git a/data/defaultVoretournament.cfg b/data/defaultVoretournament.cfg index d3c3e91b..058f2c9e 100644 --- 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" set g_rpg_canleave 1 "when enabled, anyone can leave a predator's stomach in RPG (like leaving a team mate in team games)" 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" +set g_rpg_turretattack 0 "if disabled, turrets don't attack anyone in RPG games. Otherwise, they attack everyone." // server game balance settings // powerup balance settings diff --git a/data/qcsrc/server/tturrets/system/system_main.qc b/data/qcsrc/server/tturrets/system/system_main.qc index 8d8e03d3..19821bc2 100644 --- 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; */ + // Don't attack in RPG if this is not allowed + if(cvar("g_rpg") && !cvar("g_rpg_turretattack")) + return -22; + #ifdef TURRET_DEBUG_TARGETSELECT dprint("Target:",e_target.netname," is a valid target for ",e_turret.netname,"\n"); #endif