Merge branch 'master' into martin-t/okc3

[xonotic/xonotic-data.pk3dir.git] / balance-xdf.cfg

diff --git a/balance-xdf.cfg b/balance-xdf.cfg
index cc7c8109d67a35bcb8d13e4baab7888079df67c3..6b2e4d5557f9373eab457ce4998204651b1a8133 100644 (file)
--- a/balance-xdf.cfg
+++ b/balance-xdf.cfg
@@ -101,6 +101,7 @@ set g_pickup_respawntime_powerup 0.1
 set g_pickup_respawntime_weapon 0.1
 set g_pickup_respawntime_superweapon 0.1
 set g_pickup_respawntime_ammo 0.1
+set g_pickup_respawntime_initial_random 2
 set g_pickup_respawntimejitter_short 0
 set g_pickup_respawntimejitter_medium 0
 set g_pickup_respawntimejitter_long 0
@@ -204,6 +205,7 @@ set g_maxpushtime 8.0 "timeout for kill credit when your damage knocks someone i
 
 // {{{ powerups
 set g_balance_powerup_invincible_takedamage 0.33 // only 1/3rd damage is taken
+set g_balance_powerup_invincible_takeforce 0.33
 set g_balance_powerup_invincible_time 30
 set g_balance_powerup_strength_damage 3
 set g_balance_powerup_strength_force 3