X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=mutators.cfg;h=2960588ff692a2d12c23cf4476b0af4756043a52;hp=c6716585c35e118ca507015565fb3b9efcea5740;hb=1a90cd40e2050abaf5fb3838eee64e7ad6f887e9;hpb=402c9d84fe00cc341e02db9b6e3db5b617301ed6

diff --git a/mutators.cfg b/mutators.cfg
index c6716585c..2960588ff 100644
--- a/mutators.cfg
+++ b/mutators.cfg
@@ -33,12 +33,46 @@ set g_instagib_invis_alpha 0.15
 set g_instagib_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_respawn_time 120
+
+set g_overkill_ammo_charge 0
+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_vortex 0.5
+set g_overkill_ammo_charge_rate_machinegun 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_machinegun 0.025
+set g_overkill_ammo_decharge_shotgun 0.15
+set g_overkill_ammo_decharge_vortex 0.2
+set g_overkill_ammo_decharge_rpc 1
+set g_overkill_ammo_decharge_hmg 0.01
+
+
 // =========
 //  vampire
 // =========
 set g_vampire 0 "set to 1 to enable the vampire mode, where the damage done to your opponent gets added to your own health"
 
 
+// ========
+//  midair
+// ========
+set g_midair 0 "if set to 1 you can only apply damage to your opponent while he is airborne"
+set g_midair_shieldtime 0.3 "number of seconds you are still invincible since you lost contact to the ground"
+
+
 // =========
 //  sandbox
 // =========
@@ -90,7 +124,7 @@ set g_spawn_near_teammate_ignore_spawnpoint_closetodeath 1 "spawn as close to de
 // at each time, everyone uses the same weapon,
 // and in regular intervals, this weapon is cycled
 set g_nix 0 "No Items Xonotic - instead of pickup items, everyone plays with the same weapon. After some time, a countdown will start, after which everyone will switch to another weapon, and so on"
-set g_nix_with_laser 0 "always carry the laser as an additional weapon in NIX"
+set g_nix_with_blaster 0 "always carry the blaster as an additional weapon in NIX"
 set g_nix_with_healtharmor 0 "when 1, health and armor still show up in NIX"
 set g_nix_with_powerups 0 "when 1, powerups still show up in NIX"
 
@@ -141,6 +175,7 @@ set g_random_gravity_negative 1000 "negative gravity multiplier"
 //  Nades
 // =======
 set g_nades 0 "enable off-hand grenades"
+set g_nades_throw_offset "0 0 0" "nade throwing offset"
 set g_nades_spawn 1 "give nades right away when player spawns rather than delaying entire refire"
 set g_nades_client_select 0 "allow client side selection of nade type"
 set g_nades_nade_lifetime 3.5