Merge branch 'Mario/monsters' into 'develop'

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

diff --git a/gamemodes-server.cfg b/gamemodes-server.cfg
index 1d2a0d70a945168d319ccda9b4e1a08dcb8675a2..318749021fe8d329ae55e6cbb58de4eafb3486ef 100644 (file)
--- a/gamemodes-server.cfg
+++ b/gamemodes-server.cfg
@@ -322,7 +322,7 @@ exec ctfscoring-samual.cfg
 // ====================
 set g_cts 0 "CTS: complete the stage"
 set g_cts_selfdamage 1 "0 = disable all selfdamage and falldamage in cts"
-set g_cts_finish_kill_delay 10 "prevent cheating by running back to the start line, and starting out with more speed than otherwise possible"
+set g_cts_finish_kill_delay 2 "kill player this many seconds after stage completion to prevent cheating by starting out with more speed than otherwise possible; set it to 0 to not kill or to -1 to kill instantly"
 set g_cts_send_rankings_cnt 15 "send this number of map records to clients"
 set g_cts_removeprojectiles 0 "remove projectiles when the player dies, to prevent using weapons earlier in the stage than intended"
 
@@ -451,6 +451,7 @@ set g_lms_last_join 3       "if g_lms_join_anytime is 0, new players can only join if
 set g_lms_join_anytime 1       "1: new players can join, but get same amount of lives as the worst player; 0: new players can only join if the worst active player has (fraglimit - g_lms_last_join) or more lives"
 set g_lms_items 0 "enables items to spawn, weaponarena still disables weapons and ammo (to force all items to spawn, use g_pickup_items 1 instead)"
 set g_lms_weaponarena "most_available" "starting weapons - takes the same options as g_weaponarena"
+set g_lms_forfeit_min_match_time 30 "end the match early if at least this many seconds have elapsed and less than 2 players are playing due to forfeits"
 
 
 // =========
@@ -550,8 +551,6 @@ set g_invasion_monster_count 10 "number of monsters on first wave (increments)"
 set g_invasion_zombies_only 0 "only spawn zombies"
 set g_invasion_spawn_delay 0.25
 set g_invasion_spawnpoint_spawn_delay 0.5
-set g_invasion_teams 0 "number of teams in invasion (note: use mapinfo to set this)"
-set g_invasion_team_spawns 1 "use team spawns in teamplay invasion mode"
 set g_invasion_type 0 "type of invasion mode - 0: round-based, 1: hunting, 2: complete the stage (note: use mapinfo to set this)"
 
 // ======