X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=mutators.cfg;h=ac965a2e1b313b0b5bedb8369cc53327e152a0bc;hp=900f4ae0033fd0f057308323b483964f7ea2fe2c;hb=HEAD;hpb=cf34c825e0e646cc1d80dcfbe5123ce33d0db000

diff --git a/mutators.cfg b/mutators.cfg
index 900f4ae00..0851dc4f7 100644
--- a/mutators.cfg
+++ b/mutators.cfg
@@ -42,8 +42,8 @@ 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 invisibility powerup in seconds."
-set g_instagib_speed_time 30 "Time of speed powerup in seconds."
+set g_instagib_invisibility_time 30 "time of invisibility powerup in seconds"
+set g_instagib_speed_time 30 "time of speed powerup in seconds"
 set g_instagib_damagedbycontents 1 "allow damage from lava pits in instagib"
 set g_instagib_blaster_keepdamage 0 "allow secondary fire to hurt players"
 set g_instagib_blaster_keepforce 0 "allow secondary fire to push players"
@@ -63,6 +63,8 @@ set g_overkill_filter_healthmega 0
 set g_overkill_filter_armormedium 1
 set g_overkill_filter_armorbig 1
 set g_overkill_filter_armormega 0
+set g_overkill_blaster_keepdamage 0 "allow secondary fire to hurt players"
+set g_overkill_blaster_keepforce 0 "allow secondary fire to push players"
 
 
 // =========
@@ -187,7 +189,7 @@ set g_random_gravity_negative 1000 "negative gravity multiplier"
 set g_nades 0 "enable off-hand grenades - use the 'dropweapon' (second press throws) or '+hook' (release throws) binds"
 set g_nades_spread 0.04 "random spread offset of throw direction"
 set g_nades_throw_offset "0 -25 0" "nade throwing offset"
-set g_nades_spawn 1 "give nades right away when player spawns rather than delaying entire refire"
+set g_nades_onspawn 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_pickup 0 "allow picking up thrown nades (not your own)"
 set g_nades_pickup_time 2 "time until picked up nade explodes"
@@ -202,11 +204,11 @@ 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 "nade velocity: 0 is absolute, 1 is relative (takes into account player velocity), 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 9:veil"
+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, 10:ammo, 11:darkness"
 
 seta cl_nade_timer 1 "show a visual timer for nades, 1 = only circle, 2 = circle with text"
-seta cl_nade_type 3
-seta cl_pokenade_type "zombie"
+seta cl_nade_type 3 "selected type of the off-hand grenade. 1:normal 2:napalm 3:ice 4:translocate 5:spawn 6:heal 7:pokenade 8:entrap 9:veil 10:ammo 11:darkness"
+seta cl_pokenade_type "zombie" "monster to spawn"
 
 // ------------
 //  Nade bonus
@@ -220,7 +222,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 9:veil"
+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 10:ammo 11:darkness"
 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"
@@ -236,52 +238,77 @@ set g_nades_bonus_score_time   -1 "Bonus nade score given per second (negative t
 set g_nades_bonus_score_time_flagcarrier 2 "Bonus nade score given per second as flag carrier (negative to have the score decay)"
 
 // Napalm (2)
+set g_nades_napalm 0 "Napalm nade: spreads fire balls around the fountain and burns for a while"
 set g_nades_napalm_blast 1 "Whether the napalm grenades also give damage with the usual grenade explosion"
 set g_nades_napalm_burntime 0.5 "Time that the fire from napalm will stick to the player"
 set g_nades_napalm_selfdamage 1 "Whether the player that tossed the nade can be harmed by its fire"
 // Napalm fireballs
 set g_nades_napalm_ball_count 6 "Number of fireballs emitted during the explosion"
 set g_nades_napalm_ball_spread 500 "Maximum force which the fireballs will have on explosion"
-set g_nades_napalm_ball_damageforcescale 4
-set g_nades_napalm_ball_damage 40
-set g_nades_napalm_ball_lifetime 7
+set g_nades_napalm_ball_damageforcescale 4 "How affected fireballs are by damage"
+set g_nades_napalm_ball_damage 40 "Damage caused by the fireball"
+set g_nades_napalm_ball_lifetime 7 "How long the fireball will last"
 set g_nades_napalm_ball_radius 100 "Distance from the fireball within which you may get burned"
 // Napalm Fire fountain
 set g_nades_napalm_fountain_lifetime 3 "Time period during which extra fire mines are ejected"
 set g_nades_napalm_fountain_delay 0.5 "Delay between emissions by the fountain"
 set g_nades_napalm_fountain_damage 50 "Damage caused by the center of the fountain"
 set g_nades_napalm_fountain_edgedamage 20 "Damage caused by the edge of the fountain"
-set g_nades_napalm_fountain_radius 130
+set g_nades_napalm_fountain_radius 130 "Distance from the fountain"
 
 // Ice (3)
+set g_nades_ice 1 "Ice nade: freezes and reduces health"
 set g_nades_ice_freeze_time 3 "How long the ice field will last"
 set g_nades_ice_health      0 "How much health the player will have after being unfrozen"
 set g_nades_ice_explode     0 "Whether the ice nade should explode again once the ice field dissipated"
-set g_nades_ice_teamcheck   0 "Don't freeze teammates"
+set g_nades_ice_teamcheck   2 "0: freezes everyone including the player who threw the nade, 1: freezes enemies and teammates, 2: freezes only enemies"
+
+// Translocate (4)
+set g_nades_translocate 1 "Translocate nade: teleports into explosion nade location"
+set g_nades_translocate_destroy_damage 25 "Damage caused when translocate nade is destroyed by some attacker"
 
 // Spawn (5)
+set g_nades_spawn 1 "Spawn nade: respawns into nade explosion location after being fragged"
 set g_nades_spawn_count 3 "Number of times player will spawn at their spawn nade explosion location"
+set g_nades_spawn_health_respawn 0 "How much health the player will have when being respawned, if 0, normal health respawn"
+set g_nades_spawn_destroy_damage 25 "Damage caused when spawn nade is destroyed by some attacker"
 
 // Heal (6)
+set g_nades_heal 1 "Heal nade: spawns a orb to recover health inside, enemies take the reverse effect when being inside orb"
 set g_nades_heal_time 5 "How long the healing field will last"
 set g_nades_heal_rate 30 "Health given per second"
 set g_nades_heal_friend 1 "Multiplier of health given to team mates"
 set g_nades_heal_foe   -2 "Multiplier of health given to enemies"
 
 // Pokenade (7)
+set g_nades_pokenade 0 "Pokenade: spawns a monster into the explosion nade location"
 set g_nades_pokenade_monster_lifetime 150 "How long pokenade monster will survive"
 set g_nades_pokenade_monster_type "zombie" "Monster to spawn"
 
 // Entrap (8)
+set g_nades_entrap 0 "Entrap nade: spawns a orb to slow down movements inside"
 set g_nades_entrap_strength 0.01 "Strength of the orb's movement slowing powers"
 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
+set g_nades_entrap_radius 500 "Distance from the entrap orb"
 
 // Veil (9)
+set g_nades_veil 0 "Veil nade: spawns a orb to turn invisible inside"
 set g_nades_veil_time 8 "Life time of the orb"
-set g_nades_veil_radius 200
-
+set g_nades_veil_radius 200 "Distance from the veil orb"
+
+// Ammo (10)
+set g_nades_ammo 0 "Ammo nade: spawns a orb to recover ammo inside, enemies take the reverse effect when being inside orb"
+set g_nades_ammo_time 4 "Life time of the orb"
+set g_nades_ammo_rate 30 "Ammo given per second"
+set g_nades_ammo_friend 1 "Multiplier of ammo given to team mates"
+set g_nades_ammo_foe   -2 "Multiplier of ammo given to enemies"
+
+// Darkness (11)
+set g_nades_darkness 0 "Darkness nade: blinds enemies"
+set g_nades_darkness_time 4 "How long the dark field will last"
+set g_nades_darkness_explode 0 "Whether the darkness nade should explode again once the dark field dissipated"
+set g_nades_darkness_teamcheck 2 "0: blinds everyone including the player who threw the nade, 1: blinds enemies and teammates, 2: blinds only enemies"
 
 // ============
 //  camp check