Merge remote-tracking branch 'origin/Mario/bot_fire_fix', fixes #1955

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

diff --git a/gamemodes.cfg b/gamemodes.cfg
index 9addcbc7d829291fade7e0319f36dd2d204ad0d2..30352bba7be4bbeef4a341674f5151d4dfb030da 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
@@ -361,8 +360,6 @@ set g_keepawayball_effects 0 "Add together the numbers you want: EF_ADDITIVE (32
 set g_keepawayball_trail_color 254     "particle trail color from player/ball"
 set g_keepawayball_damageforcescale    3 "Scale of force which is applied to the ball by weapons/explosions/etc"
 set g_keepawayball_respawntime 10      "if no one picks up the ball, how long to wait until the ball respawns"
-seta g_keepaway_teams_override 0
-set g_keepaway_teams 0
 
 
 // ==========