Merge branch 'master' into terencehill/ca_fixes

[xonotic/xonotic-data.pk3dir.git] / gamemodes.cfg

diff --git a/gamemodes.cfg b/gamemodes.cfg
index 9addcbc7d829291fade7e0319f36dd2d204ad0d2..08b988273ef0302b9020a57af8a3c7872c87ba16 100644 (file)
--- a/gamemodes.cfg
+++ b/gamemodes.cfg
@@ -87,11 +87,10 @@ seta g_invasion_round_limit -1 "Invasion round limit overriding the mapinfo spec
 //  respawn delay/waves/weapon_stay
 // =================================
 // when variables are set to anything other than 0, they take over the global setting. Negative values force an output value of zero.
-// to force disable delay or waves, set them to 0.125
-set g_ctf_respawn_delay_small 5
-set g_ctf_respawn_delay_small_count 0
+set g_ctf_respawn_delay_small 1
+set g_ctf_respawn_delay_small_count 1
 set g_ctf_respawn_delay_large 5
-set g_ctf_respawn_delay_large_count 0
+set g_ctf_respawn_delay_large_count 5
 set g_ctf_respawn_delay_max 0
 set g_ctf_respawn_waves 0
 set g_ctf_weapon_stay 0
@@ -204,10 +203,10 @@ set g_assault 0 "Assault: attack the enemy base as fast as you can, then defend
 // ============
 //  clan arena
 // ============
-set g_ca 0 "Clan Arena: Played in rounds, once you're dead you're out! The team with survivors wins the round."
-set g_ca_point_limit 10 "point limit 10 is standard for clan arena"
-set g_ca_point_leadlimit 0
-set g_ca_spectate_enemies 0 "Allow spectating enemy player by dead player during clan arena games."
+set g_ca 0 "Clan Arena: Played in rounds, once you're dead you're out! The team with survivors wins the round"
+seta g_ca_point_limit -1 "Clan Arena point limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
+seta g_ca_point_leadlimit -1 "Clan Arena point lead limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
+set g_ca_spectate_enemies 0 "Allow spectating enemy player by dead player during clan arena games"
 set g_ca_warmup 10 "how long the players will have time to run around the map before the round starts"
 set g_ca_damage2score_multiplier 0.01
 set g_ca_round_timelimit 180 "round time limit in seconds"