X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=mutators.cfg;h=3300476bfc9dfaa99738d9d9c37599ff87a585a8;hb=1c758278958da8f2baf1f39cd0f298d5bda097a2;hp=311debc2c0aa19595eddf24cea5bd1e31f0b8820;hpb=21fb564ff1131f208d7a1b01100690326ee5a7ce;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/mutators.cfg b/mutators.cfg
index 311debc2c..3300476bf 100644
--- a/mutators.cfg
+++ b/mutators.cfg
@@ -31,6 +31,9 @@ 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"
+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"
 
 
 // ==========
@@ -109,9 +112,10 @@ set g_rocket_flying 0 "set to 1 to enable rocket flying in all balance configs"
 // =====================
 //  spawn near teammate
 // =====================
+seta cl_spawn_near_teammate 1 "toggle for spawning near teammates (only effective if g_spawn_near_teammate_ignore_spawnpoint is 2)"
 set g_spawn_near_teammate 0 "if set, players prefer spawns near a team mate"
 set g_spawn_near_teammate_distance 640 "max distance to consider a spawn to be near a team mate"
-set g_spawn_near_teammate_ignore_spawnpoint 0 "ignore spawnpoints and spawn right at team mates"
+set g_spawn_near_teammate_ignore_spawnpoint 0 "ignore spawnpoints and spawn right at team mates, if 2, clients can ignore this option"
 set g_spawn_near_teammate_ignore_spawnpoint_delay 2.5 "how long to wait before its OK to spawn at a player after someone just spawned at this player"
 set g_spawn_near_teammate_ignore_spawnpoint_delay_death 0 "how long to wait before its OK to spawn at a player after death"
 set g_spawn_near_teammate_ignore_spawnpoint_check_health 1 "only allow spawn at this player if their health is full"
@@ -209,6 +213,7 @@ set g_nades_bonus_client_select 0 "Allow client side selection of bonus nade typ
 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"
 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"
 // Bonus score
 set g_nades_bonus_score_max   120 "Score value that will give a bonus nade"
 set g_nades_bonus_score_minor   5 "Score given for minor actions (pickups, regular frags etc.)"
@@ -271,6 +276,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"
 
 
 // =======
@@ -387,3 +393,12 @@ set g_rm_laser_force "400" "laser force, divided by laser count"
 // ================
 set g_breakablehook 0 "enable breakable hook mutator (hook can be damaged, and returns damage to the owner when broken)"
 set g_breakablehook_owner 0 "allow owner to break their own hook"
+
+
+// ===========
+//  multijump
+// ===========
+seta cl_multijump 1 "allow multijump mutator"
+set g_multijump 0	"Number of multiple jumps to allow (jumping again in the air), -1 allows for infinite jumps"
+set g_multijump_add 0	"0 = make the current z velocity equal to jumpvelocity, 1 = add jumpvelocity to the current z velocity"
+set g_multijump_speed -999999	"Minimum vertical speed a player must have in order to jump again"