Merge remote branch 'origin/samual/balancesamual'

Conflicts:
	balanceSamual.cfg

diff --cc balanceSamual.cfg
index 718376c127e07cbf169600ee472e6be6e8c57ec1,de48bf902a1c96a75a5c90ce559a0ade15e5ae30..4e3733a7551d38076e00f50e63a4f286813981f9
--- 1/balanceSamual.cfg
--- 2/balanceSamual.cfg
+++ b/balanceSamual.cfg
@@@ -226,10 -226,9 +226,10 @@@ set g_balance_laser_primary_delay 0.0
  set g_balance_laser_primary_gauntlet 0
  set g_balance_laser_primary_force_zscale 2 // 350 upforce
  set g_balance_laser_primary_force_velocitybias 0.3
 +set g_balance_laser_primary_force_other_scale 1
  set g_balance_laser_secondary 0 // when 1, a secondary laser mode exists
  set g_balance_laser_secondary_damage 25
- set g_balance_laser_secondary_edgedamage 10
+ set g_balance_laser_secondary_edgedamage 12.5
  set g_balance_laser_secondary_force 400
  set g_balance_laser_secondary_radius 70
  set g_balance_laser_secondary_speed 12000
@@@ -242,14 -241,13 +242,14 @@@ set g_balance_laser_secondary_delay 
  set g_balance_laser_secondary_gauntlet 0
  set g_balance_laser_secondary_force_zscale 1.25
  set g_balance_laser_secondary_force_velocitybias 0
 +set g_balance_laser_secondary_force_other_scale 1
  // }}}
  // {{{ shotgun
- set g_balance_shotgun_primary_bullets 10
- set g_balance_shotgun_primary_damage 6
+ set g_balance_shotgun_primary_bullets 12
+ set g_balance_shotgun_primary_damage 5
  set g_balance_shotgun_primary_force 15
  set g_balance_shotgun_primary_spread 0.11
- set g_balance_shotgun_primary_refire 0.5
+ set g_balance_shotgun_primary_refire 0.75
  set g_balance_shotgun_primary_animtime 0.2
  set g_balance_shotgun_primary_ammo 1
  set g_balance_shotgun_primary_speed 8000
@@@ -265,18 -263,17 +265,18 @@@ set g_balance_shotgun_secondary_refire 
  set g_balance_shotgun_secondary_animtime 1
  // }}}
  // {{{ uzi
- set g_balance_uzi_mode 0                              // Activates varible spread for sustained & burst mode secondary
+ set g_balance_uzi_mode 1                              // Activates varible spread for sustained & burst mode secondary
  set g_balance_uzi_spread_min 0.02
- set g_balance_uzi_spread_max 0.6
+ set g_balance_uzi_spread_max 0.1
  set g_balance_uzi_spread_add 0.012
  
- set g_balance_uzi_burst 0                             // # of bullets in a burst (if set to 2 or more)
+ set g_balance_uzi_burst 3                             // # of bullets in a burst (if set to 2 or more)
 +set g_balance_uzi_burst_animtime 0.75
- set g_balance_uzi_burst_refire 0.05           // refire between burst bullets
+ set g_balance_uzi_burst_refire 0.075          // refire between burst bullets
  set g_balance_uzi_burst_refire2 0.75  // refire after burst
  set g_balance_uzi_burst_spread 0.04
- set g_balance_uzi_burst_damage 18             
- set g_balance_uzi_burst_force 50
+ set g_balance_uzi_burst_damage 25             
+ set g_balance_uzi_burst_force 20
  set g_balance_uzi_burst_ammo 3
  
  set g_balance_uzi_first 1
@@@ -628,16 -625,15 +628,16 @@@ set g_balance_sniperrifle_primary_bulle
  set g_balance_sniperrifle_primary_burstcost 0
  set g_balance_sniperrifle_primary_bullethail 0 // empty magazine on shot
  set g_balance_sniperrifle_secondary 1
 +set g_balance_sniperrifle_secondary_reload 0
  set g_balance_sniperrifle_secondary_tracer 0
- set g_balance_sniperrifle_secondary_damage 50
- set g_balance_sniperrifle_secondary_headshotaddeddamage 50 // 50 damage only on head
- set g_balance_sniperrifle_secondary_spread 0
- set g_balance_sniperrifle_secondary_force 2
+ set g_balance_sniperrifle_secondary_damage 25
+ set g_balance_sniperrifle_secondary_headshotaddeddamage 35
+ set g_balance_sniperrifle_secondary_spread 0.01
+ set g_balance_sniperrifle_secondary_force 50
  set g_balance_sniperrifle_secondary_speed 20000
  set g_balance_sniperrifle_secondary_lifetime 5
- set g_balance_sniperrifle_secondary_refire 0.1
- set g_balance_sniperrifle_secondary_animtime 0.1
+ set g_balance_sniperrifle_secondary_refire 0.6
+ set g_balance_sniperrifle_secondary_animtime 0.3
  set g_balance_sniperrifle_secondary_ammo 10
  set g_balance_sniperrifle_secondary_bulletconstant 110 // 15.5qu
  set g_balance_sniperrifle_secondary_burstcost 0