Merge branch 'master' into Mario/balance

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

diff --git a/bal-wep-samual.cfg b/bal-wep-samual.cfg
index e20a8700d49bcaee48064cffe62db86ab7458268..af2234f0d6c898c02d110d98273a46019bdb7c9d 100644 (file)
--- a/bal-wep-samual.cfg
+++ b/bal-wep-samual.cfg
@@ -281,6 +281,7 @@ set g_balance_arc_burst_damage 500
 set g_balance_arc_burst_healing_aps 100
 set g_balance_arc_burst_healing_hps 100
 set g_balance_arc_cooldown 2.5
+set g_balance_arc_cooldown_release 1
 set g_balance_arc_overheat_max 5
 set g_balance_arc_overheat_min 3
 set g_balance_arc_beam_heat 1
@@ -750,7 +751,7 @@ set g_balance_shotgun_primary_spread 0.12
 set g_balance_shotgun_reload_ammo 0
 set g_balance_shotgun_reload_time 2
 set g_balance_shotgun_secondary 1
-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