From: Martin Taibr Date: Mon, 16 Dec 2019 13:36:03 +0000 (+0100) Subject: 90s ctf stalemate, whitelist X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7e2684d77e10b737692585d1ffa358acf0ebc5dc;p=xonotic%2Fxonotic-data.pk3dir.git 90s ctf stalemate, whitelist --- diff --git a/gamemodes-server.cfg b/gamemodes-server.cfg index 7c830ddd2..b9004bbac 100644 --- a/gamemodes-server.cfg +++ b/gamemodes-server.cfg @@ -253,7 +253,7 @@ set g_ctf_flagcarrier_damagefactor 1 set g_ctf_flagcarrier_forcefactor 1 set g_ctf_stalemate 1 "show the enemy flagcarrier location after both teams have held the flags a certain amount of time" set g_ctf_stalemate_endcondition 1 "condition for stalemate mode to be finished: 1 = If ONE flag is no longer stale, 2 = If BOTH flags are no longer stale" -set g_ctf_stalemate_time 150 "time for each flag until stalemate mode is activated" +set g_ctf_stalemate_time 90 "time for each flag until stalemate mode is activated" set g_ctf_flagcarrier_waypointforenemy_spotting 1 "show the enemy flagcarrier location if a team mate presses +use to spot them" set g_ctf_dropped_capture_delay 1.5 "autocapture delay when flag is thrown onto the base - counted from throw, not landing" set g_ctf_dropped_capture_radius 100 "allow dropped flags to be automatically captured by base flags if the dropped flag is within this radius of it" diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc index 0c44a95f1..ce7ab264d 100644 --- a/qcsrc/server/g_world.qc +++ b/qcsrc/server/g_world.qc @@ -492,6 +492,7 @@ void cvar_changes_init() BADCVAR("g_ca_weaponarena"); BADCVAR("g_freezetag_weaponarena"); BADCVAR("g_lms_weaponarena"); + BADCVAR("g_ctf_stalemate_time"); if(cvar_string("g_mod_balance") == "Testing") {