Merge branch 'master' into martin-t/ok-config

diff --combined bal-wep-xonotic.cfg
index 70937a49f9740eb9a3204f491cc749f95a026eb2,b897fe6313ef8a2b4f3c9c672a2f7538fe4af68f..85f8e75d8a237f4fe5e6e6a3f69bf568a0bd4f6f
--- 1/bal-wep-xonotic.cfg
--- 2/bal-wep-xonotic.cfg
+++ b/bal-wep-xonotic.cfg
@@@ -43,6 -43,8 +43,8 @@@ 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 1
+ set g_balance_shotgun_secondary_alt_animtime 0.2
+ set g_balance_shotgun_secondary_alt_refire 1.2
  set g_balance_shotgun_secondary_animtime 1.15
  set g_balance_shotgun_secondary_damage 70
  set g_balance_shotgun_secondary_force 200
@@@ -56,8 -58,6 +58,6 @@@ set g_balance_shotgun_secondary_melee_s
  set g_balance_shotgun_secondary_melee_time 0.15
  set g_balance_shotgun_secondary_melee_traces 10
  set g_balance_shotgun_secondary_refire 1.25
- set g_balance_shotgun_secondary_alt_animtime 0.2
- set g_balance_shotgun_secondary_alt_refire 1.2
  set g_balance_shotgun_switchdelay_drop 0.2
  set g_balance_shotgun_switchdelay_raise 0.2
  set g_balance_shotgun_weaponreplace ""
@@@ -65,7 -65,7 +65,7 @@@ set g_balance_shotgun_weaponstart 
  set g_balance_shotgun_weaponstartoverride -1
  set g_balance_shotgun_weaponthrowable 1
  // }}}
- // {{{ #3: Machine Gun
+ // {{{ #3: MachineGun
  set g_balance_machinegun_burst 3
  set g_balance_machinegun_burst_ammo 3
  set g_balance_machinegun_burst_animtime 0.3
@@@ -678,7 -678,7 +678,7 @@@ set g_balance_seeker_weaponstart 
  set g_balance_seeker_weaponstartoverride -1
  set g_balance_seeker_weaponthrowable 1
  // }}}
- // {{{ #19: Shockwave (MUTATOR WEAPON)
+ // {{{ #19: Shockwave
  set g_balance_shockwave_blast_animtime 0.3
  set g_balance_shockwave_blast_damage 40
  set g_balance_shockwave_blast_distance 1000
@@@ -745,12 -745,7 +745,7 @@@ set g_balance_arc_beam_healing_amax 
  set g_balance_arc_beam_healing_aps 50
  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 0
- set g_balance_arc_overheat_max 5
- set g_balance_arc_overheat_min 3
  set g_balance_arc_beam_heat 0
- set g_balance_arc_burst_heat 5
  set g_balance_arc_beam_maxangle 10
  set g_balance_arc_beam_nonplayerdamage 80
  set g_balance_arc_beam_range 1500
@@@ -773,6 -768,11 +768,11 @@@ set g_balance_arc_burst_ammo 1
  set g_balance_arc_burst_damage 250
  set g_balance_arc_burst_healing_aps 100
  set g_balance_arc_burst_healing_hps 100
+ set g_balance_arc_burst_heat 5
+ set g_balance_arc_cooldown 2.5
+ set g_balance_arc_cooldown_release 0
+ set g_balance_arc_overheat_max 5
+ set g_balance_arc_overheat_min 3
  set g_balance_arc_switchdelay_drop 0.2
  set g_balance_arc_switchdelay_raise 0.2
  set g_balance_arc_weaponreplace ""
@@@ -780,12 -780,12 +780,12 @@@ set g_balance_arc_weaponstart 
  set g_balance_arc_weaponstartoverride -1
  set g_balance_arc_weaponthrowable 1
  // }}}
- // {{{ #21: Overkill Heavy Machine Gun
+ // {{{ #21: Overkill Heavy Machine Gun (MUTATOR WEAPON)
  set g_balance_okhmg_primary_ammo 1
  set g_balance_okhmg_primary_damage 30
  set g_balance_okhmg_primary_force 10
  set g_balance_okhmg_primary_refire 0.05
 -set g_balance_okhmg_primary_solidpenetration 32
 +set g_balance_okhmg_primary_solidpenetration 127
  set g_balance_okhmg_primary_spread_add 0.005
  set g_balance_okhmg_primary_spread_max 0.06
  set g_balance_okhmg_primary_spread_min 0.01
@@@ -811,79 -811,12 +811,12 @@@ set g_balance_okhmg_weaponstart 
  set g_balance_okhmg_weaponstartoverride 0
  set g_balance_okhmg_weaponthrowable 0
  // }}}
- // {{{ #22: Overkill Rocket Propelled Chainsaw
- set g_balance_okrpc_primary_ammo 10
- set g_balance_okrpc_primary_animtime 1
- set g_balance_okrpc_primary_damage 150
- set g_balance_okrpc_primary_damage2 500
- set g_balance_okrpc_primary_damageforcescale 2
- set g_balance_okrpc_primary_edgedamage 50
- set g_balance_okrpc_primary_force 400
- set g_balance_okrpc_primary_health 25
- set g_balance_okrpc_primary_lifetime 30
- set g_balance_okrpc_primary_radius 300
- set g_balance_okrpc_primary_refire 1
- set g_balance_okrpc_primary_speed 2500
- set g_balance_okrpc_primary_speedaccel 5000
- set g_balance_okrpc_reload_ammo 10
- set g_balance_okrpc_reload_time 1
- set g_balance_okrpc_secondary_ammo 0
- set g_balance_okrpc_secondary_animtime 0.2
- set g_balance_okrpc_secondary_damage 25
- set g_balance_okrpc_secondary_delay 0
- set g_balance_okrpc_secondary_edgedamage 12.5
- set g_balance_okrpc_secondary_force 300
- set g_balance_okrpc_secondary_lifetime 5
- set g_balance_okrpc_secondary_radius 70
- set g_balance_okrpc_secondary_refire 0.7
- set g_balance_okrpc_secondary_refire_type 1
- set g_balance_okrpc_secondary_shotangle 0
- set g_balance_okrpc_secondary_speed 6000
- set g_balance_okrpc_secondary_spread 0
- set g_balance_okrpc_switchdelay_drop 0.2
- set g_balance_okrpc_switchdelay_raise 0.2
- set g_balance_okrpc_weaponreplace ""
- set g_balance_okrpc_weaponstart 0
- set g_balance_okrpc_weaponstartoverride 0
- set g_balance_okrpc_weaponthrowable 0
- // }}}
- // {{{ Overkill Shotgun
- set g_balance_okshotgun_primary_ammo 3
- set g_balance_okshotgun_primary_animtime 0.65
- set g_balance_okshotgun_primary_bot_range 512
- set g_balance_okshotgun_primary_bullets 10
- set g_balance_okshotgun_primary_damage 17
- set g_balance_okshotgun_primary_force 80
- set g_balance_okshotgun_primary_refire 0.75
- set g_balance_okshotgun_primary_solidpenetration 3.8
- set g_balance_okshotgun_primary_spread 0.07
- set g_balance_okshotgun_reload_ammo 24
- set g_balance_okshotgun_reload_time 2
- set g_balance_okshotgun_secondary_animtime 0.2
- set g_balance_okshotgun_secondary_damage 25
- set g_balance_okshotgun_secondary_delay 0
- set g_balance_okshotgun_secondary_edgedamage 12.5
- set g_balance_okshotgun_secondary_force 300
- set g_balance_okshotgun_secondary_lifetime 5
- set g_balance_okshotgun_secondary_radius 70
- set g_balance_okshotgun_secondary_refire 0.7
- set g_balance_okshotgun_secondary_refire_type 1
- set g_balance_okshotgun_secondary_shotangle 0
- set g_balance_okshotgun_secondary_speed 6000
- set g_balance_okshotgun_secondary_spread 0
- set g_balance_okshotgun_switchdelay_drop 0.2
- set g_balance_okshotgun_switchdelay_raise 0.2
- set g_balance_okshotgun_weaponreplace ""
- set g_balance_okshotgun_weaponstart 0
- set g_balance_okshotgun_weaponstartoverride -1
- set g_balance_okshotgun_weaponthrowable 1
- // }}}
- // {{{ Overkill Machine Gun
+ // {{{ #22: Overkill MachineGun (MUTATOR WEAPON)
  set g_balance_okmachinegun_primary_ammo 1
  set g_balance_okmachinegun_primary_damage 25
  set g_balance_okmachinegun_primary_force 5
  set g_balance_okmachinegun_primary_refire 0.1
 -set g_balance_okmachinegun_primary_solidpenetration 63
 +set g_balance_okmachinegun_primary_solidpenetration 100
  set g_balance_okmachinegun_primary_spread_add 0.012
  set g_balance_okmachinegun_primary_spread_max 0.05
  set g_balance_okmachinegun_primary_spread_min 0
@@@ -908,7 -841,7 +841,7 @@@ set g_balance_okmachinegun_weaponstart 
  set g_balance_okmachinegun_weaponstartoverride -1
  set g_balance_okmachinegun_weaponthrowable 1
  // }}}
- // {{{ Overkill Nex
+ // {{{ #23: Overkill Nex (MUTATOR WEAPON)
  set g_balance_oknex_charge 0
  set g_balance_oknex_charge_animlimit 0.5
  set g_balance_oknex_charge_limit 1
@@@ -943,13 -876,13 +876,13 @@@ set g_balance_oknex_secondary_damagefal
  set g_balance_oknex_secondary_damagefalloff_halflife 0
  set g_balance_oknex_secondary_damagefalloff_maxdist 0
  set g_balance_oknex_secondary_damagefalloff_mindist 0
- set g_balance_oknex_secondary_force 300
- set g_balance_oknex_secondary_refire 0.7
- set g_balance_oknex_secondary_refire_type 1
  set g_balance_oknex_secondary_delay 0
  set g_balance_oknex_secondary_edgedamage 12.5
+ set g_balance_oknex_secondary_force 300
  set g_balance_oknex_secondary_lifetime 5
  set g_balance_oknex_secondary_radius 70
+ set g_balance_oknex_secondary_refire 0.7
+ set g_balance_oknex_secondary_refire_type 1
  set g_balance_oknex_secondary_shotangle 0
  set g_balance_oknex_secondary_speed 6000
  set g_balance_oknex_secondary_spread 0
@@@ -960,3 -893,70 +893,70 @@@ set g_balance_oknex_weaponstart 
  set g_balance_oknex_weaponstartoverride -1
  set g_balance_oknex_weaponthrowable 1
  // }}}
+ // {{{ #24: Overkill Rocket Propelled Chainsaw (MUTATOR WEAPON)
+ set g_balance_okrpc_primary_ammo 10
+ set g_balance_okrpc_primary_animtime 1
+ set g_balance_okrpc_primary_damage 150
+ set g_balance_okrpc_primary_damage2 500
+ set g_balance_okrpc_primary_damageforcescale 2
+ set g_balance_okrpc_primary_edgedamage 50
+ set g_balance_okrpc_primary_force 400
+ set g_balance_okrpc_primary_health 25
+ set g_balance_okrpc_primary_lifetime 30
+ set g_balance_okrpc_primary_radius 300
+ set g_balance_okrpc_primary_refire 1
+ set g_balance_okrpc_primary_speed 2500
+ set g_balance_okrpc_primary_speedaccel 5000
+ set g_balance_okrpc_reload_ammo 10
+ set g_balance_okrpc_reload_time 1
+ set g_balance_okrpc_secondary_ammo 0
+ set g_balance_okrpc_secondary_animtime 0.2
+ set g_balance_okrpc_secondary_damage 25
+ set g_balance_okrpc_secondary_delay 0
+ set g_balance_okrpc_secondary_edgedamage 12.5
+ set g_balance_okrpc_secondary_force 300
+ set g_balance_okrpc_secondary_lifetime 5
+ set g_balance_okrpc_secondary_radius 70
+ set g_balance_okrpc_secondary_refire 0.7
+ set g_balance_okrpc_secondary_refire_type 1
+ set g_balance_okrpc_secondary_shotangle 0
+ set g_balance_okrpc_secondary_speed 6000
+ set g_balance_okrpc_secondary_spread 0
+ set g_balance_okrpc_switchdelay_drop 0.2
+ set g_balance_okrpc_switchdelay_raise 0.2
+ set g_balance_okrpc_weaponreplace ""
+ set g_balance_okrpc_weaponstart 0
+ set g_balance_okrpc_weaponstartoverride 0
+ set g_balance_okrpc_weaponthrowable 0
+ // }}}
+ // {{{ #25: Overkill Shotgun (MUTATOR WEAPON)
+ set g_balance_okshotgun_primary_ammo 3
+ set g_balance_okshotgun_primary_animtime 0.65
+ set g_balance_okshotgun_primary_bot_range 512
+ set g_balance_okshotgun_primary_bullets 10
+ set g_balance_okshotgun_primary_damage 17
+ set g_balance_okshotgun_primary_force 80
+ set g_balance_okshotgun_primary_refire 0.75
+ set g_balance_okshotgun_primary_solidpenetration 3.8
+ set g_balance_okshotgun_primary_spread 0.07
+ set g_balance_okshotgun_reload_ammo 24
+ set g_balance_okshotgun_reload_time 2
+ set g_balance_okshotgun_secondary_animtime 0.2
+ set g_balance_okshotgun_secondary_damage 25
+ set g_balance_okshotgun_secondary_delay 0
+ set g_balance_okshotgun_secondary_edgedamage 12.5
+ set g_balance_okshotgun_secondary_force 300
+ set g_balance_okshotgun_secondary_lifetime 5
+ set g_balance_okshotgun_secondary_radius 70
+ set g_balance_okshotgun_secondary_refire 0.7
+ set g_balance_okshotgun_secondary_refire_type 1
+ set g_balance_okshotgun_secondary_shotangle 0
+ set g_balance_okshotgun_secondary_speed 6000
+ set g_balance_okshotgun_secondary_spread 0
+ set g_balance_okshotgun_switchdelay_drop 0.2
+ set g_balance_okshotgun_switchdelay_raise 0.2
+ set g_balance_okshotgun_weaponreplace ""
+ set g_balance_okshotgun_weaponstart 0
+ set g_balance_okshotgun_weaponstartoverride -1
+ set g_balance_okshotgun_weaponthrowable 1
+ // }}}