X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=mutators.cfg;h=2c0bfae53af18d6eaeef96cd896be92d43def1d7;hp=79ac41791ade308fde3b9371f47757b23b2656b0;hb=ff958ce0ab588b5ca218b037a51f509c5168a9b0;hpb=723fe3aa08556fdde679753c0afde734853f34e5

diff --git a/mutators.cfg b/mutators.cfg
index 79ac41791a..2c0bfae53a 100644
--- a/mutators.cfg
+++ b/mutators.cfg
@@ -40,7 +40,7 @@ set g_instagib_ammo_convert_bullets 0 "convert bullet ammo packs to insta cell a
 set g_instagib_ammo_convert_cells 0 "convert normal cell ammo packs to insta cell ammo packs"
 set g_instagib_ammo_convert_rockets 0 "convert rocket ammo packs to insta cell ammo packs"
 set g_instagib_ammo_convert_shells 0 "convert shell ammo packs to insta cell ammo packs"
-set g_instagib_invisibility_time 30 "Time of ivisibility powerup in seconds."
+set g_instagib_invisibility_time 30 "Time of invisibility powerup in seconds."
 set g_instagib_invis_alpha 0.15
 set g_instagib_speed_time 30 "Time of speed powerup in seconds."
 set g_instagib_speed_highspeed 1.5 "speed-multiplier that applies while you carry the invincibility powerup"
@@ -54,13 +54,14 @@ set g_instagib_friendlypush 1 "allow pushing teammates with the vaporizer primar
 // ==========
 //  overkill
 // ==========
-set g_overkill 0 "internal cvar, to enable overkill, use  `exec defaultOverkill.cfg`"
+set g_overkill 0 "internal cvar, to enable overkill, use `exec ruleset-overkill.cfg`"
+set g_overkill_weapons 0 "Whether to enable overkill weapons outside of overkill ruleset."
 
-set g_overkill_powerups_replace 1
-set g_overkill_itemwaypoints 1
+set g_overkill_powerups_replace 1 "replace strength and shield with HMG and RPC"
+set g_overkill_itemwaypoints 1 "show waypoints with timer before health and armor spawns"
 set g_overkill_filter_healthmega 0
-set g_overkill_filter_armormedium 0
-set g_overkill_filter_armorbig 0
+set g_overkill_filter_armormedium 1
+set g_overkill_filter_armorbig 1
 set g_overkill_filter_armormega 0
 
 
@@ -68,6 +69,8 @@ set g_overkill_filter_armormega 0
 //  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"
+set g_vampire_factor 1.0 "Multiply damage done by this factor before adding it to the player's health"
+set g_vampire_use_total_damage 0 "If 1 then add combined damage (health + armor) to attackers health. If 0 add only health damage."
 
 
 // ========
@@ -198,7 +201,7 @@ set g_nades_nade_edgedamage 90
 set g_nades_nade_radius 300
 set g_nades_nade_force 650
 set g_nades_nade_newton_style 0 "0 is absolute, 1 is relative (takes into account player speed), 2 is something in between"
-set g_nades_nade_type 1 "Type of the off-hand grenade. 1:normal 2:napalm 3:ice 4:translocate 5:spawn 6:heal 7:pokenade 8:entrap"
+set g_nades_nade_type 1 "Type of the off-hand grenade. 1:normal 2:napalm 3:ice 4:translocate 5:spawn 6:heal 7:pokenade 8:entrap 9:veil"
 
 seta cl_nade_timer 1 "show a visual timer for nades, 1 = only circle, 2 = circle with text"
 seta cl_nade_type 3
@@ -216,7 +219,7 @@ seta cl_pokenade_type "zombie"
 //
 set g_nades_bonus 0 "Enable bonus grenades"
 set g_nades_bonus_client_select 0 "Allow client side selection of bonus nade type"
-set g_nades_bonus_type 2 "Type of the bonus grenade. 1:normal 2:napalm 3:ice 4:translocate 5:spawn 6:heal 7:pokenade 8:entrap"
+set g_nades_bonus_type 2 "Type of the bonus grenade. 1:normal 2:napalm 3:ice 4:translocate 5:spawn 6:heal 7:pokenade 8:entrap 9:veil"
 set g_nades_bonus_onstrength 1 "Always give bonus grenades to players that have the strength powerup"
 set g_nades_bonus_max 3 "Maximum number of bonus grenades"
 set g_nades_bonus_only 0 "Disallow regular nades, only bonus nades can be used"
@@ -274,6 +277,10 @@ set g_nades_entrap_speed 0.5 "Running speed while entrapped"
 set g_nades_entrap_time 10 "Life time of the orb"
 set g_nades_entrap_radius 500
 
+// Veil (9)
+set g_nades_veil_time 8 "Life time of the orb"
+set g_nades_veil_radius 200
+
 
 // ============
 //  camp check
@@ -289,7 +296,7 @@ set g_campcheck_distance 1800
 // ==========
 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"
-set g_new_toys_use_pickupsound 1 "play the 'new toys, new toys!' roflsound when picking up a new toys weapon"
+set g_new_toys_use_pickupsound 0 "play the 'new toys, new toys!' roflsound when picking up a new toys weapon"
 
 
 // =======
@@ -307,7 +314,7 @@ set g_buffs_random_location 0 "randomize buff location on start and when reset"
 set g_buffs_random_location_attempts 10 "number of random locations a single buff will attempt to respawn at before giving up"
 set g_buffs_spawn_count 0 "how many buffs to spawn on the map if none exist already"
 set g_buffs_replace_powerups 0 "replace powerups on the map with random buffs"
-set g_buffs_drop 1 "allow dropping buffs"
+set g_buffs_drop 0 "allow dropping buffs"
 set g_buffs_cooldown_activate 5 "cooldown period when buff is first activated"
 set g_buffs_cooldown_respawn 3 "cooldown period when buff is reloading"
 set g_buffs_ammo 1 "ammo buff: infinite ammunition"
@@ -341,10 +348,10 @@ set g_buffs_disability_weaponspeed 0.7 "weapon speed multiplier while disabled"
 set g_buffs_speed 1 "speed buff: increased movement/attack/health regeneration speed, carrier takes slightly more damage"
 set g_buffs_speed_time 60 "speed buff carry time"
 set g_buffs_speed_speed 1.7 "player speed multiplier while holding speed buff"
-set g_buffs_speed_rate 0.8 "player weapon rate multiplier while holding speed buff"
-set g_buffs_speed_weaponspeed 1.6 "weapon speed multiplier while holding speed buff"
-set g_buffs_speed_damage_take 1.2 "damage taken multiplier while holding speed buff"
-set g_buffs_speed_regen 1.2 "regeneration speed multiplier while holding speed buff"
+set g_buffs_speed_rate 0.8 "weapon attack rate multiplier, smaller value means faster rate while holding the speed buff"
+set g_buffs_speed_weaponspeed 1.6 "projectile speed multiplier, higher value means faster projectiles while holding the speed buff"
+set g_buffs_speed_damage_take 1.2 "damage taken multiplier, higher value means more damage taken while holding speed buff"
+set g_buffs_speed_regen 1.2 "regeneration speed multiplier, higher value means faster health regeneration while holding speed buff"
 set g_buffs_vampire 1 "vampire buff: attacks to players and monsters heal the carrier"
 set g_buffs_vampire_time 60 "vampire buff carry time"
 set g_buffs_vampire_damage_steal 0.6 "damage stolen multiplier while holding vampire buff"
@@ -376,6 +383,13 @@ set g_buffs_flight 0 "flight buff: crouch jump to reverse your gravity!"
 set g_buffs_flight_time 60 "flight buff carry time"
 
 
+// ================
+//  grappling hook
+// ================
+set g_grappling_hook 0 "let players spawn with the grappling hook which allows them to pull themselves up"
+set g_grappling_hook_useammo 0 "use ammunition with the off-hand grappling hook"
+
+
 // ==============
 //  vampire hook
 // ==============
@@ -386,6 +400,12 @@ set g_vampirehook_health_steal "2" "give hooker this much health per damage fram
 set g_vampirehook_teamheal "1" "hooking teammates drains hooker's health"
 
 
+// =================
+//  offhand blaster
+// =================
+set g_offhand_blaster 0 "whether to enable offhand blaster"
+
+
 // ===============
 //  rocket minsta
 // ===============