Merge branch 'martin-t/electro-denoobing' into 'master'

Electro: midair combos

See merge request xonotic/xonotic-data.pk3dir!757

diff --combined bal-wep-testing.cfg
index 5f62ae83c7d8c69ea1aa3cf39e0e5e131bdb3b78,3ee6d9019719bdd0aa9f92e800ad4b77a0f82785..abee0b6df7bb6c37187b219fea8c626e374c874f
--- 1/bal-wep-testing.cfg
--- 2/bal-wep-testing.cfg
+++ b/bal-wep-testing.cfg
@@@ -191,9 -191,13 +191,13 @@@ set g_balance_electro_primary_damage 4
  set g_balance_electro_primary_edgedamage 20
  set g_balance_electro_primary_force 200
  set g_balance_electro_primary_lifetime 5
+ set g_balance_electro_primary_midaircombo_enemy 1
  set g_balance_electro_primary_midaircombo_explode 1
  set g_balance_electro_primary_midaircombo_interval 0.1
+ set g_balance_electro_primary_midaircombo_own 1
  set g_balance_electro_primary_midaircombo_radius 0
+ set g_balance_electro_primary_midaircombo_speed 2000
+ set g_balance_electro_primary_midaircombo_teammate 1
  set g_balance_electro_primary_radius 100
  set g_balance_electro_primary_refire 0.6
  set g_balance_electro_primary_speed 2500
@@@ -289,7 -293,7 +293,7 @@@ set g_balance_crylink_weaponstartoverri
  set g_balance_crylink_weaponthrowable 1
  // }}}
  // {{{ #8: Vortex
 -set g_balance_vortex_charge 0
 +set g_balance_vortex_charge 1
  set g_balance_vortex_charge_always 0
  set g_balance_vortex_charge_animlimit 0.5
  set g_balance_vortex_charge_limit 1
@@@ -305,7 -309,7 +309,7 @@@ set g_balance_vortex_charge_velocity_ra
  set g_balance_vortex_primary_ammo 6
  set g_balance_vortex_primary_animtime 0.4
  set g_balance_vortex_primary_armorpierce 0
 -set g_balance_vortex_primary_damage 65
 +set g_balance_vortex_primary_damage 80
  set g_balance_vortex_primary_damagefalloff_forcehalflife 0
  set g_balance_vortex_primary_damagefalloff_halflife 0
  set g_balance_vortex_primary_damagefalloff_maxdist 0

diff --combined bal-wep-xonotic.cfg
index 7e153b3de6b51caa5c2a54698a504ec2c589b764,67cc55b8d959dc47016375d681350ac7c9c76ee0..c38ea832f3e2c53576a9cd2d9c15538d81ca1633
--- 1/bal-wep-xonotic.cfg
--- 2/bal-wep-xonotic.cfg
+++ b/bal-wep-xonotic.cfg
@@@ -191,9 -191,13 +191,13 @@@ set g_balance_electro_primary_damage 4
  set g_balance_electro_primary_edgedamage 20
  set g_balance_electro_primary_force 200
  set g_balance_electro_primary_lifetime 5
+ set g_balance_electro_primary_midaircombo_enemy 1
  set g_balance_electro_primary_midaircombo_explode 1
  set g_balance_electro_primary_midaircombo_interval 0.1
+ set g_balance_electro_primary_midaircombo_own 1
  set g_balance_electro_primary_midaircombo_radius 0
+ set g_balance_electro_primary_midaircombo_speed 2000
+ set g_balance_electro_primary_midaircombo_teammate 1
  set g_balance_electro_primary_radius 100
  set g_balance_electro_primary_refire 0.6
  set g_balance_electro_primary_speed 2500
@@@ -243,7 -247,7 +247,7 @@@ set g_balance_crylink_primary_joinexplo
  set g_balance_crylink_primary_joinexplode_force 0
  set g_balance_crylink_primary_joinexplode_radius 0
  set g_balance_crylink_primary_joinspread 0.2
 -set g_balance_crylink_primary_linkexplode 0
 +set g_balance_crylink_primary_linkexplode 1
  set g_balance_crylink_primary_middle_fadetime 5
  set g_balance_crylink_primary_middle_lifetime 5
  set g_balance_crylink_primary_other_fadetime 5