Merge remote-tracking branch 'origin/Mario/train_fix'

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

diff --git a/mutators.cfg b/mutators.cfg
index 415d48ce6fbdd5a3c796f128fd9ad93b68f80288..c762ef9dec047aaa26cebd9320da67e40aad6aef 100644 (file)
--- a/mutators.cfg
+++ b/mutators.cfg
@@ -77,6 +77,11 @@ set g_rocket_flying 0 "set to 1 to enable rocket flying in all balance configs"
 // =====================
 set g_spawn_near_teammate 0 "if set, players prefer spawns near a team mate"
 set g_spawn_near_teammate_distance 640 "max distance to consider a spawn to be near a team mate"
+set g_spawn_near_teammate_ignore_spawnpoint 0 "ignore spawnpoints and spawn right at team mates"
+set g_spawn_near_teammate_ignore_spawnpoint_delay 2.5 "how long to wait before its OK to spawn at a player after someone just spawned at this player"
+set g_spawn_near_teammate_ignore_spawnpoint_delay_death 0 "how long to wait before its OK to spawn at a player after death"
+set g_spawn_near_teammate_ignore_spawnpoint_check_health 1 "only allow spawn at this player if their health is full"
+set g_spawn_near_teammate_ignore_spawnpoint_closetodeath 1 "spawn as close to death location as possible"
 
 
 // ========================
@@ -157,12 +162,3 @@ set g_campcheck_interval 10
 set g_campcheck_damage 100
 set g_campcheck_distance 1800
 
-
-// ==============
-//  spawn system
-// ==============
-set g_spawnsystem 0 "spawn at teammates in teamplay modes"
-set g_spawnsystem_delay 2.5 "how long to wait before its OK to spawn at a player after someone just spawned at this player"
-set g_spawnsystem_delay_death 0 "how long to wait before its OK to spawn at a player after death"
-set g_spawnsystem_check_health 1 "only allow spawn at this player if their health is full"
-set g_spawnsystem_closetodeath 1 "spawn as close to death location as possible"