Merge branch 'master' into Mario/balance

[xonotic/xonotic-data.pk3dir.git] / bal-wep-nexuiz25.cfg

diff --git a/bal-wep-nexuiz25.cfg b/bal-wep-nexuiz25.cfg
index bb7ab5f6780738b28e140ba39d829e2725e84206..8a47e40d50dc73ebf56bf40bbf450c8f6c2afbe0 100644 (file)
--- a/bal-wep-nexuiz25.cfg
+++ b/bal-wep-nexuiz25.cfg
@@ -43,7 +43,7 @@ set g_balance_shotgun_primary_spread 0.07
 set g_balance_shotgun_reload_ammo 0
 set g_balance_shotgun_reload_time 2
 set g_balance_shotgun_secondary 2
-set g_balance_shotgun_secondary_animtime 1
+set g_balance_shotgun_secondary_animtime 1.15
 set g_balance_shotgun_secondary_damage 80
 set g_balance_shotgun_secondary_force 200
 set g_balance_shotgun_secondary_melee_delay 0.25
@@ -720,7 +720,7 @@ set g_balance_shockwave_melee_traces 10
 set g_balance_shockwave_switchdelay_drop 0.15
 set g_balance_shockwave_switchdelay_raise 0.15
 set g_balance_shockwave_weaponreplace ""
-set g_balance_shockwave_weaponstart 1
+set g_balance_shockwave_weaponstart 0
 set g_balance_shockwave_weaponstartoverride -1
 set g_balance_shockwave_weaponthrowable 0
 // }}}