Merge branch 'Mario/spawnsystem_mutator' into Mario/overkill

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

diff --git a/mutators.cfg b/mutators.cfg
index b43bc006aa7d5bc982db7d11fd4c2562d485aeb2..ef60d819342d63325f218ebb1e190b34ac4f5246 100644 (file)
--- a/mutators.cfg
+++ b/mutators.cfg
@@ -11,7 +11,7 @@ set g_dodging 0 "set to 1 to enable dodging in games"
 seta cl_dodging_timeout 0.2 "determines how long apart (in seconds) two taps on the same direction key are considered a dodge. use 0 to disable"
 
 set sv_dodging_wall_dodging 0 "set to 1 to allow dodging off walls. 0 to disable"
-set sv_dodging_delay 0.5 "determines how long a player has to wait to be able to dodge again after dodging"
+set sv_dodging_delay 0.7 "determines how long a player has to wait to be able to dodge again after dodging"
 set sv_dodging_up_speed 200 "the jump velocity of the dodge"
 set sv_dodging_horiz_speed 400 "the horizontal velocity of the dodge"
 set sv_dodging_horiz_speed_frozen 200 "the horizontal velocity of the dodge while frozen"
@@ -33,6 +33,34 @@ set g_minstagib_invis_alpha 0.15
 set g_minstagib_speed_highspeed 1.5 "speed-multiplier that applies while you carry the invincibility powerup"
 
 
+// ==========
+//  overkill
+// ==========
+set g_overkill 0 "enable overkill"
+
+set g_overkill_100a_anyway 1
+set g_overkill_100h_anyway 1
+set g_overkill_powerups_replace 1
+set g_overkill_superguns_onemag 1
+set g_overkill_superguns_respawn_time 20
+
+set g_overkill_ammo_charge 1
+set g_overkill_ammo_charge_notice 1
+set g_overkill_ammo_charge_limit 1
+set g_overkill_ammo_charge_rate 0.5
+set g_overkill_ammo_charge_rate_nex 0.5
+set g_overkill_ammo_charge_rate_uzi 0.5
+set g_overkill_ammo_charge_rate_shotgun 0.5
+set g_overkill_ammo_charge_rate_hmg 0.25
+set g_overkill_ammo_charge_rate_rpc 1.5
+set g_overkill_ammo_decharge 0.1
+set g_overkill_ammo_decharge_uzi 0.025
+set g_overkill_ammo_decharge_shotgun 0.15
+set g_overkill_ammo_decharge_nex 0.2
+set g_overkill_ammo_decharge_rpc 1
+set g_overkill_ammo_decharge_hmg 0.01
+
+
 // =========
 //  vampire
 // =========
@@ -77,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"
 
 
 // ========================
@@ -149,17 +182,6 @@ set g_nades_nade_force 650
 set g_nades_nade_newton_style 0
 
 
-// =============
-//  rifle arena
-// =============
-set g_riflearena 0
-set g_riflearena_rifle_secondary_spread 0
-set g_riflearena_rifle_secondary_shots 1
-set g_riflearena_rifle_secondary_animtime 0.15
-set g_riflearena_rifle_secondary_refire 0.15
-set g_riflearena_rifle_secondary_damage 40
-
-
 // ============
 //  camp check
 // ============
@@ -167,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
+