X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=mutators.cfg;h=8dc7a4181ed8785203669a0af82197ef2eb43dae;hp=07e276f4bae7771c380784bc48f609af98f86451;hb=daf778eca4ed89cd364e7700d5a2b77f4de6fd7a;hpb=9a2bcac8d6b0967c9b43f5a91cea80468f1cb8dd

diff --git a/mutators.cfg b/mutators.cfg
index 07e276f4ba..8dc7a4181e 100644
--- a/mutators.cfg
+++ b/mutators.cfg
@@ -43,7 +43,7 @@ set g_overkill_100h_anyway 1
 set g_overkill_powerups_replace 1
 set g_overkill_superguns_respawn_time 20
 
-set g_overkill_ammo_charge 1
+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
@@ -124,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"
 
@@ -277,6 +277,7 @@ set g_new_toys_autoreplace 2 "0: never replace, 1: always auto replace guns by a
 // =======
 set cl_buffs_autoreplace 1 "automatically drop current buff when picking up another"
 set g_buffs 0 "enable buffs (requires buff items or powerups)"
+set g_buffs_effects 1 "show particle effects from carried buffs"
 set g_buffs_waypoint_distance 1024 "maximum distance at which buff waypoint can be seen from item"
 set g_buffs_randomize 1 "randomize buff type when player drops buff"
 set g_buffs_random_lifetime 30 "re-spawn the buff again if it hasn't been touched after this time in seconds"
@@ -287,34 +288,59 @@ set g_buffs_replace_powerups 1 "replace powerups on the map with random 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"
+set g_buffs_ammo_time 60 "ammo buff carry time"
 set g_buffs_resistance 1 "resistance buff: greatly reduces damage taken"
+set g_buffs_resistance_time 60 "resistance buff time"
 set g_buffs_resistance_blockpercent 0.7 "damage reduction multiplier, higher values mean less damage"
 set g_buffs_medic 1 "medic buff: increased regeneration speed, extra health, chance to survive a fatal attack"
+set g_buffs_medic_time 60 "medic buff carry time"
 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.2 "health rot rate multiplier"
-set g_buffs_medic_max 1.5 "stable health medic limit multiplier"
+set g_buffs_medic_max 2.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"
+set g_buffs_vengeance_time 60 "vengeance buff carry time"
 set g_buffs_vengeance_damage_multiplier 0.6 "amount of damage dealt the attacker takes when hitting a target with vengeance"
 set g_buffs_bash 1 "bash buff: increased knockback force and immunity to knockback"
+set g_buffs_bash_time 60 "bash buff carry time"
 set g_buffs_bash_force 2 "bash force multiplier"
 set g_buffs_bash_force_self 1.2 "bash self force multiplier"
 set g_buffs_disability 1 "disability buff: attacks to players and monsters deal slowness (decreased movement/attack speed) for a few seconds"
-set g_buffs_disability_time 3 "time in seconds for target disability"
-set g_buffs_disability_speed 0.5 "player speed multiplier while disabled"
-set g_buffs_disability_rate 1.7 "player weapon rate multiplier while disabled"
+set g_buffs_disability_time 60 "disability buff carry time"
+set g_buffs_disability_slowtime 3 "time in seconds for target disability"
+set g_buffs_disability_speed 0.7 "player speed multiplier while disabled"
+set g_buffs_disability_rate 1.5 "player weapon rate multiplier while disabled"
+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_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"
-set g_buffs_jump 1 "jump buff: greatly increased jump height"
+set g_buffs_jump 0 "jump buff: greatly increased jump height"
+set g_buffs_jump_time 60 "jump buff carry time"
 set g_buffs_jump_height 600 "jump height while holding jump buff"
-set g_buffs_flight 1 "flight buff: greatly decreased gravity"
+set g_buffs_flight 0 "flight buff: greatly decreased gravity"
+set g_buffs_flight_time 60 "flight buff carry time"
 set g_buffs_flight_gravity 0.3 "player gravity multiplier while holding flight buff"
 set g_buffs_invisible 1 "invisible buff: carrier becomes invisible"
+set g_buffs_invisible_time 60 "invisible buff carry time"
 set g_buffs_invisible_alpha 0.4 "player invisibility multiplier while holding invisible buff"
-
+set g_buffs_inferno 1 "inferno buff: targets damaged by player carrying inferno buff will also receive burning damage"
+set g_buffs_inferno_time 60 "inferno buff carry time"
+set g_buffs_inferno_damagemultiplier 0.05 "multiplier of damage dealt during burn"
+set g_buffs_inferno_burntime_factor 2 "burn time logarithm base. 0 < x < 1: increasingly increasing, x > 1: decreasingly increasing"
+set g_buffs_inferno_burntime_min_time 0.5 "minimum seconds of burn time"
+set g_buffs_inferno_burntime_target_damage 150 "damage required for g_buffs_inferno_burntime_target_time seconds of burn"
+set g_buffs_inferno_burntime_target_time 5 "seconds of burn given g_buffs_inferno_burntime_target_damage damage"
+set g_buffs_swapper 1 "swapper buff: press dropweapon to switch places with a nearby enemy"
+set g_buffs_swapper_time 60 "swapper buff carry time"
+set g_buffs_swapper_range 1500 "maximum range of swapping with enemy"
+set g_buffs_magnet 1 "magnet buff: greatly increased item pickup range"
+set g_buffs_magnet_time 60 "magnet buff carry time"
+set g_buffs_magnet_range_item 450 "item pickup range"