Merge branch 'master' into Mario/overkill

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

diff --git a/mutators.cfg b/mutators.cfg
index b25fb138fa2509216c8a1f9bc6df98fefe95b3d6..ef60d819342d63325f218ebb1e190b34ac4f5246 100644 (file)
--- a/mutators.cfg
+++ b/mutators.cfg
@@ -37,11 +37,6 @@ set g_minstagib_speed_highspeed 1.5 "speed-multiplier that applies while you car
 //  overkill
 // ==========
 set g_overkill 0 "enable overkill"
-set g_overkill_spawnsystem 1 "experimental spawnsystem"
-set g_overkill_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_overkill_spawnsystem_delay_death 0 "how long to wait before its OK to spawn at a player after death "
-set g_overkill_spawnsystem_check_health 1 "only allow spawn at this player if hes health is full"
-set g_overkill_spawnsystem_close2death 1 "spawn as close as possible to where we died"
 
 set g_overkill_100a_anyway 1
 set g_overkill_100h_anyway 1
@@ -110,6 +105,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"
 
 
 // ========================
@@ -189,3 +189,4 @@ set g_campcheck 0 "damages campers every few seconds"
 set g_campcheck_interval 10
 set g_campcheck_damage 100
 set g_campcheck_distance 1800
+