Merge branch 'master' into Mario/balance

diff --combined bal-wep-nexuiz25.cfg
index f962dc31c85c255875eee757a59b29aea1e2c71b,97707a7255789ab49f96602d9b5a5373a8f673d1..8a47e40d50dc73ebf56bf40bbf450c8f6c2afbe0
--- 1/bal-wep-nexuiz25.cfg
--- 2/bal-wep-nexuiz25.cfg
+++ b/bal-wep-nexuiz25.cfg
@@@ -43,7 -43,7 +43,7 @@@ set g_balance_shotgun_primary_spread 0.
  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
@@@ -433,6 -433,7 +433,7 @@@ set g_balance_porto_weaponthrowable 
  // {{{ #12: Vaporizer
  set g_balance_vaporizer_primary_ammo 10
  set g_balance_vaporizer_primary_animtime 0.3
+ set g_balance_vaporizer_primary_damage -1
  set g_balance_vaporizer_primary_refire 1
  set g_balance_vaporizer_reload_ammo 0
  set g_balance_vaporizer_reload_time 0
@@@ -719,7 -720,7 +720,7 @@@ set g_balance_shockwave_melee_traces 1
  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
  // }}}
@@@ -740,6 -741,7 +741,7 @@@ set g_balance_arc_beam_healing_aps 5
  set g_balance_arc_beam_healing_hmax 150
  set g_balance_arc_beam_healing_hps 50
  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,6 -752,18 +752,18 @@@ set g_balance_arc_beam_range 100
  set g_balance_arc_beam_refire 0.5
  set g_balance_arc_beam_returnspeed 8
  set g_balance_arc_beam_tightness 0.5
+ set g_balance_arc_bolt 0
+ set g_balance_arc_bolt_ammo 1
+ set g_balance_arc_bolt_damage 25
+ set g_balance_arc_bolt_damageforcescale 0
+ set g_balance_arc_bolt_edgedamage 12.5
+ set g_balance_arc_bolt_force 100
+ set g_balance_arc_bolt_health 15
+ set g_balance_arc_bolt_lifetime 5
+ set g_balance_arc_bolt_radius 65
+ set g_balance_arc_bolt_refire 0.16667
+ set g_balance_arc_bolt_speed 2200
+ set g_balance_arc_bolt_spread 0.03
  set g_balance_arc_burst_ammo 15
  set g_balance_arc_burst_damage 150
  set g_balance_arc_burst_healing_aps 100