Merge branch 'bones_was_here/team_selection_compatibility' into 'master'

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

diff --git a/gamemodes-server.cfg b/gamemodes-server.cfg
index ba4812b57afd8bdc4c5da48d31320788f122acb2..a57c8f135c70aa561cf68ee2a0e52bb02aa80947 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,20 @@ 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_leader_lives_diff 2 "players leading by at least this number of lives are considered leaders and are more visible"
+set g_lms_leader_minpercent 0.5 "leading players are not considered leaders only if they are more than this percentage of total players"
+set g_lms_leader_wp_time 5 "show waypoints for leaders only for this amount of time"
+set g_lms_leader_wp_interval 25 "periodically show again waypoints for leaders after this amount of time"
+set g_lms_leader_wp_interval_jitter 10 "jitter waypoint interval by this amount of time"
+set g_lms_dynamic_respawn_delay 1 "increase player respawn delay based on the number of lives less than the leader (NOTE: delay doesn't increase when only 2 players are left alive)"
+set g_lms_dynamic_respawn_delay_base 2 "base player respawn delay"
+set g_lms_dynamic_respawn_delay_increase 3 "increase base player respawn delay by this amount of time for each life less than the leader"
+set g_lms_dynamic_respawn_delay_max 20 "max player respawn delay"
+set g_lms_dynamic_vampire 1 "attackers receive a fraction of health removed from enemies based on the number of lives less than the enemy"
+set g_lms_dynamic_vampire_factor_base 0.1 "base vampire factor"
+set g_lms_dynamic_vampire_factor_increase 0.1 "increase vampire factor by this fraction for each life less than the enemy"
+set g_lms_dynamic_vampire_factor_max 0.5 "max vampire factor"
+set g_lms_dynamic_vampire_min_lives_diff 2 "number of lives the attacker must have less than the enemy to receive the base fraction of health"
 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"
 
 
@@ -551,8 +565,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)"
 
 // ======