Merge branch 'fruitiex/fruit_vs_tzork-balance' into fruitiex/balance

diff --combined balanceXonotic.cfg
index f270ecef54c6dbf5e5428a4f5a354fb9c91d6e88,9a1fc1d8a9afbd45d0e74c55c95a1806d997a64d..315477a0c9fd890f51eefade4309e86a74e484db
--- 1/balanceXonotic.cfg
--- 2/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@@ -32,7 -32,7 +32,7 @@@ set g_warmup_start_ammo_rockets 50 "sta
  set g_warmup_start_ammo_cells 50 "starting values when being in warmup-stage"
  set g_warmup_start_ammo_fuel 0 "starting values when being in warmup-stage"
  set g_lms_start_health 200
 -set g_lms_start_armor 150
 +set g_lms_start_armor 100
  set g_lms_start_ammo_shells 30
  set g_lms_start_ammo_nails 200
  set g_lms_start_ammo_rockets 150
@@@ -312,7 -312,7 +312,7 @@@ set g_balance_grenadelauncher_secondary
  set g_balance_grenadelauncher_secondary_edgedamage 32
  set g_balance_grenadelauncher_secondary_force 300
  set g_balance_grenadelauncher_secondary_radius 150
- set g_balance_grenadelauncher_secondary_speed 1500
+ set g_balance_grenadelauncher_secondary_speed 1200
  set g_balance_grenadelauncher_secondary_speed_up 225
  set g_balance_grenadelauncher_secondary_speed_z 0
  set g_balance_grenadelauncher_secondary_spread 0
@@@ -363,11 -363,11 +363,11 @@@ set g_balance_electro_primary_spread 
  set g_balance_electro_primary_lifetime 0
  set g_balance_electro_primary_refire 0.4
  set g_balance_electro_primary_animtime 0.03333333
 -set g_balance_electro_primary_ammo 7
 +set g_balance_electro_primary_ammo 5
  set g_balance_electro_primary_range 800
  set g_balance_electro_primary_falloff_mindist 255 // 0.3 * radius
  set g_balance_electro_primary_falloff_maxdist 850
 -set g_balance_electro_primary_falloff_halflifedist 425
 +set g_balance_electro_primary_falloff_halflifedist 595
  set g_balance_electro_secondary_damage 25
  set g_balance_electro_secondary_edgedamage 0
  set g_balance_electro_secondary_force 100
@@@ -406,8 -406,8 +406,8 @@@ set g_balance_crylink_primary_refire 0.
  set g_balance_crylink_primary_animtime 0.4
  set g_balance_crylink_primary_ammo 2
  set g_balance_crylink_primary_bouncedamagefactor 0.2
 -set g_balance_crylink_primary_joinspeed 250
 -set g_balance_crylink_primary_jointime 0
 +set g_balance_crylink_primary_joinspread 0.2
 +set g_balance_crylink_primary_jointime 0.1
  set g_balance_crylink_primary_joinexplode 0
  set g_balance_crylink_primary_joinexplode_damage 0
  set g_balance_crylink_primary_joinexplode_edgedamage 0
@@@ -433,7 -433,7 +433,7 @@@ set g_balance_crylink_secondary_refire 
  set g_balance_crylink_secondary_animtime 0.15
  set g_balance_crylink_secondary_ammo 1
  set g_balance_crylink_secondary_bouncedamagefactor 0.5
 -set g_balance_crylink_secondary_joinspeed 0
 +set g_balance_crylink_secondary_joinspread 0
  set g_balance_crylink_secondary_jointime 0
  set g_balance_crylink_secondary_joinexplode 0                 
  set g_balance_crylink_secondary_joinexplode_damage 0  
@@@ -519,9 -519,9 +519,9 @@@ set g_balance_rocketlauncher_damage 9
  set g_balance_rocketlauncher_edgedamage 33
  set g_balance_rocketlauncher_force 350
  set g_balance_rocketlauncher_radius 125
- set g_balance_rocketlauncher_speed 1080
- set g_balance_rocketlauncher_speedaccel 0
- set g_balance_rocketlauncher_speedstart 1080
+ set g_balance_rocketlauncher_speed 1600
+ set g_balance_rocketlauncher_speedaccel 1600
+ set g_balance_rocketlauncher_speedstart 800
  set g_balance_rocketlauncher_lifetime 5
  set g_balance_rocketlauncher_refire 1
  set g_balance_rocketlauncher_animtime 0.4