Fix paranthesis

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

diff --git a/mutators.cfg b/mutators.cfg
index 6873aa89ea604ca1c3af89f99dbae187af404791..c6716585c35e118ca507015565fb3b9efcea5740 100644 (file)
--- a/mutators.cfg
+++ b/mutators.cfg
@@ -23,14 +23,14 @@ set sv_dodging_frozen 0 "allow dodging while frozen"
 
 
 // ===========
-//  minstagib
+//  instagib
 // ===========
-set g_minstagib 0 "enable minstagib"
-set g_minstagib_extralives 1 "how many extra lives you will get per powerup"
-set g_minstagib_ammo_start 10 "starting ammo"
-set g_minstagib_ammo_drop 5 "how much ammo you'll get for weapons or cells"
-set g_minstagib_invis_alpha 0.15
-set g_minstagib_speed_highspeed 1.5 "speed-multiplier that applies while you carry the invincibility powerup"
+set g_instagib 0 "enable instagib"
+set g_instagib_extralives 1 "how many extra lives you will get per powerup"
+set g_instagib_ammo_start 10 "starting ammo"
+set g_instagib_ammo_drop 5 "how much ammo you'll get for weapons or cells"
+set g_instagib_invis_alpha 0.15
+set g_instagib_speed_highspeed 1.5 "speed-multiplier that applies while you carry the invincibility powerup"
 
 
 // =========
@@ -231,13 +231,13 @@ set g_campcheck_damage 100
 set g_campcheck_distance 1800
 
 
-<<<<<<< HEAD
 // ==========
-//  New Toys
+//  new toys
 // ==========
 set g_new_toys 0 "Mutator 'New Toys': enable extra fun guns"
 set g_new_toys_autoreplace 2 "0: never replace, 1: always auto replace guns by available new toys, 2: randomly auto replace guns by available new toys"
-=======
+
+
 // =======
 //  buffs
 // =======
@@ -258,7 +258,7 @@ set g_buffs_resistance_blockpercent 0.7 "damage reduction multiplier, higher val
 set g_buffs_medic 1 "medic buff: increased regeneration speed, extra health, chance to survive a fatal attack"
 set g_buffs_medic_survive_chance 0.6 "multiplier chance of player surviving a fatal hit"
 set g_buffs_medic_survive_health 5 "amount of health player survives with after taking a fatal hit"
-set g_buffs_medic_rot 0.7 "health rot rate multiplier"
+set g_buffs_medic_rot 0.2 "health rot rate multiplier"
 set g_buffs_medic_max 1.5 "stable health medic limit multiplier"
 set g_buffs_medic_regen 1.7 "health medic rate multiplier"
 set g_buffs_vengeance 1 "vengeance buff: attackers also take damage"
@@ -284,4 +284,3 @@ set g_buffs_flight_gravity 0.3 "player gravity multiplier while holding flight b
 set g_buffs_invisible 1 "invisible buff: carrier becomes invisible"
 set g_buffs_invisible_alpha 0.4 "player invisibility multiplier while holding invisible buff"
 
->>>>>>> master