From: Lyberta <lyberta@lyberta.net>
Date: Sat, 3 Jun 2017 13:14:39 +0000 (+0300)
Subject: Merged master into Lyberta/StandaloneOverkillWeapons.
X-Git-Tag: xonotic-v0.8.5~2119^2~67
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=238d04f302418c0b644c68d45e64eb05b3583f09;p=xonotic%2Fxonotic-data.pk3dir.git

Merged master into Lyberta/StandaloneOverkillWeapons.
---

238d04f302418c0b644c68d45e64eb05b3583f09
diff --cc bal-wep-xonotic.cfg
index 7686ad2f4,ac5be34f3..0d3ed4601
--- a/bal-wep-xonotic.cfg
+++ b/bal-wep-xonotic.cfg
@@@ -778,29 -778,16 +778,29 @@@ set g_balance_arc_weaponstartoverride -
  set g_balance_arc_weaponthrowable 1
  // }}}
  // {{{ #21: Heavy Machine Gun
 -set g_balance_hmg_ammo 1
 -set g_balance_hmg_damage 30
 -set g_balance_hmg_force 10
 -set g_balance_hmg_refire 0.05
 +set g_balance_hmg_primary_ammo 1
- set g_balance_hmg_primary_damage 10
- set g_balance_hmg_primary_force 5
++set g_balance_hmg_primary_damage 30
++set g_balance_hmg_primary_force 10
 +set g_balance_hmg_primary_refire 0.05
 +set g_balance_hmg_primary_solidpenetration 32
- set g_balance_hmg_primary_spread_add 0.01
- set g_balance_hmg_primary_spread_max 0.05
- set g_balance_hmg_primary_spread_min 0.02
++set g_balance_hmg_primary_spread_add 0.005
++set g_balance_hmg_primary_spread_max 0.06
++set g_balance_hmg_primary_spread_min 0.01
  set g_balance_hmg_reload_ammo 120
  set g_balance_hmg_reload_time 1
 -set g_balance_hmg_solidpenetration 32
 -set g_balance_hmg_spread_add 0.005
 -set g_balance_hmg_spread_max 0.06
 -set g_balance_hmg_spread_min 0.01
 +set g_balance_hmg_secondary_ammo 0
 +set g_balance_hmg_secondary_animtime 0.2
 +set g_balance_hmg_secondary_damage 25
 +set g_balance_hmg_secondary_delay 0
 +set g_balance_hmg_secondary_edgedamage 12.5
 +set g_balance_hmg_secondary_force 300
 +set g_balance_hmg_secondary_lifetime 5
 +set g_balance_hmg_secondary_radius 70
 +set g_balance_hmg_secondary_refire 0.7
 +set g_balance_hmg_secondary_refire_type 1
 +set g_balance_hmg_secondary_shotangle 0
 +set g_balance_hmg_secondary_speed 6000
 +set g_balance_hmg_secondary_spread 0
  set g_balance_hmg_switchdelay_drop 0.2
  set g_balance_hmg_switchdelay_raise 0.2
  set g_balance_hmg_weaponreplace ""
@@@ -809,34 -796,21 +809,34 @@@ set g_balance_hmg_weaponstartoverride 
  set g_balance_hmg_weaponthrowable 0
  // }}}
  // {{{ #22: Rocket Propelled Chainsaw
 -set g_balance_rpc_ammo 10
 -set g_balance_rpc_animtime 1
 -set g_balance_rpc_damage 150
 -set g_balance_rpc_damage2 500
 -set g_balance_rpc_damageforcescale 2
 -set g_balance_rpc_edgedamage 50
 -set g_balance_rpc_force 400
 -set g_balance_rpc_health 25
 -set g_balance_rpc_lifetime 30
 -set g_balance_rpc_radius 300
 -set g_balance_rpc_refire 1
 +set g_balance_rpc_primary_ammo 10
 +set g_balance_rpc_primary_animtime 1
 +set g_balance_rpc_primary_damage 150
 +set g_balance_rpc_primary_damage2 500
 +set g_balance_rpc_primary_damageforcescale 2
 +set g_balance_rpc_primary_edgedamage 50
 +set g_balance_rpc_primary_force 400
 +set g_balance_rpc_primary_health 25
 +set g_balance_rpc_primary_lifetime 30
 +set g_balance_rpc_primary_radius 300
 +set g_balance_rpc_primary_refire 1
- set g_balance_rpc_primary_speed 1250
++set g_balance_rpc_primary_speed 2500
 +set g_balance_rpc_primary_speedaccel 5000
  set g_balance_rpc_reload_ammo 10
  set g_balance_rpc_reload_time 1
 -set g_balance_rpc_speed 2500
 -set g_balance_rpc_speedaccel 5000
 +set g_balance_rpc_secondary_ammo 0
 +set g_balance_rpc_secondary_animtime 0.2
 +set g_balance_rpc_secondary_damage 25
 +set g_balance_rpc_secondary_delay 0
 +set g_balance_rpc_secondary_edgedamage 12.5
 +set g_balance_rpc_secondary_force 300
 +set g_balance_rpc_secondary_lifetime 5
 +set g_balance_rpc_secondary_radius 70
 +set g_balance_rpc_secondary_refire 0.7
 +set g_balance_rpc_secondary_refire_type 1
 +set g_balance_rpc_secondary_shotangle 0
 +set g_balance_rpc_secondary_speed 6000
 +set g_balance_rpc_secondary_spread 0
  set g_balance_rpc_switchdelay_drop 0.2
  set g_balance_rpc_switchdelay_raise 0.2
  set g_balance_rpc_weaponreplace ""