Merge remote branch 'origin/mirceakitsune/weapon_mine_layer' into fruitiex/fruitbalance

diff --cc balance25.cfg
index 6287460ca329849a946f1ac2e5839451f2fabb1d,67f5dd625b0037ce9fb58adea7028c854819d88b..0ed48b3e356d53718373dccc9a6832fe821487d1
--- 1/balance25.cfg
--- 2/balance25.cfg
+++ b/balance25.cfg
@@@ -306,8 -303,29 +307,30 @@@ set g_balance_grenadelauncher_secondary
  set g_balance_grenadelauncher_secondary_damageforcescale 4
  set g_balance_grenadelauncher_secondary_bouncefactor 0.5
  set g_balance_grenadelauncher_secondary_bouncestop 0.075
 +set g_balance_grenadelauncher_secondary_remote_detonateprimary 0
  // }}}
+ // {{{ minelayer // TODO
+ set g_balance_minelayer_damage 35
+ set g_balance_minelayer_edgedamage 30
+ set g_balance_minelayer_force 250
+ set g_balance_minelayer_radius 175
+ set g_balance_minelayer_proximityradius 150
+ set g_balance_minelayer_speed 750
+ set g_balance_minelayer_lifetime 60
+ set g_balance_minelayer_refire 1.5
+ set g_balance_minelayer_animtime 0.4
+ set g_balance_minelayer_ammo 5
+ set g_balance_minelayer_health 15
+ set g_balance_minelayer_limit 4 // 0 disables the limit
+ set g_balance_minelayer_protection 1 // don't explode if the mine would hurt the owner or a team mate
+ set g_balance_minelayer_damageforcescale 0
+ set g_balance_minelayer_detonatedelay -1 // positive: timer till detonation is allowed, negative: "security device" that prevents ANY remote detonation if it could hurt its owner, zero: detonatable at any time
+ set g_balance_minelayer_time 0.5
+ set g_balance_minelayer_remote_damage 45
+ set g_balance_minelayer_remote_edgedamage 40
+ set g_balance_minelayer_remote_radius 200
+ set g_balance_minelayer_remote_force 300
+ // }}}
  // {{{ electro
  set g_balance_electro_lightning 0
  set g_balance_electro_primary_damage 65

diff --cc balanceLeeStricklin.cfg
index c1ff936126ba31177bac603eb64366dd10bc250f,57b601de16298122404880df8e2f537510c1d5b6..20c6153a1e8d72423442154c11d2575fc94cc047
--- 1/balanceLeeStricklin.cfg
--- 2/balanceLeeStricklin.cfg
+++ b/balanceLeeStricklin.cfg
@@@ -317,8 -314,29 +318,30 @@@ set g_balance_grenadelauncher_secondary
  set g_balance_grenadelauncher_secondary_damageforcescale 0
  set g_balance_grenadelauncher_secondary_bouncefactor 0.7
  set g_balance_grenadelauncher_secondary_bouncestop 0.12
 +set g_balance_grenadelauncher_secondary_remote_detonateprimary 0
  // }}}
+ // {{{ minelayer // TODO
+ set g_balance_minelayer_damage 35
+ set g_balance_minelayer_edgedamage 30
+ set g_balance_minelayer_force 250
+ set g_balance_minelayer_radius 175
+ set g_balance_minelayer_proximityradius 150
+ set g_balance_minelayer_speed 750
+ set g_balance_minelayer_lifetime 60
+ set g_balance_minelayer_refire 1.5
+ set g_balance_minelayer_animtime 0.4
+ set g_balance_minelayer_ammo 5
+ set g_balance_minelayer_health 15
+ set g_balance_minelayer_limit 4 // 0 disables the limit
+ set g_balance_minelayer_protection 1 // don't explode if the mine would hurt the owner or a team mate
+ set g_balance_minelayer_damageforcescale 0
+ set g_balance_minelayer_detonatedelay -1 // positive: timer till detonation is allowed, negative: "security device" that prevents ANY remote detonation if it could hurt its owner, zero: detonatable at any time
+ set g_balance_minelayer_time 0.5
+ set g_balance_minelayer_remote_damage 45
+ set g_balance_minelayer_remote_edgedamage 40
+ set g_balance_minelayer_remote_radius 200
+ set g_balance_minelayer_remote_force 300
+ // }}}
  // {{{ electro
  set g_balance_electro_lightning 0
  set g_balance_electro_primary_damage 80

diff --cc balanceNexSVN.cfg
index 36615d790cbb7c6d12e55c5ba3ac076b61d6fb75,590ecf02b6794048e4a4fc3f62e55a04b317abc8..82b0cfc50147f8741e5069d9504e33dfc167c13e
--- 1/balanceNexSVN.cfg
--- 2/balanceNexSVN.cfg
+++ b/balanceNexSVN.cfg
@@@ -305,8 -303,29 +306,30 @@@ set g_balance_grenadelauncher_secondary
  set g_balance_grenadelauncher_secondary_damageforcescale 4
  set g_balance_grenadelauncher_secondary_bouncefactor 0.5
  set g_balance_grenadelauncher_secondary_bouncestop 0.075
 +set g_balance_grenadelauncher_secondary_remote_detonateprimary 0
  // }}}
+ // {{{ minelayer // TODO
+ set g_balance_minelayer_damage 35
+ set g_balance_minelayer_edgedamage 30
+ set g_balance_minelayer_force 250
+ set g_balance_minelayer_radius 175
+ set g_balance_minelayer_proximityradius 150
+ set g_balance_minelayer_speed 750
+ set g_balance_minelayer_lifetime 60
+ set g_balance_minelayer_refire 1.5
+ set g_balance_minelayer_animtime 0.4
+ set g_balance_minelayer_ammo 5
+ set g_balance_minelayer_health 15
+ set g_balance_minelayer_limit 4 // 0 disables the limit
+ set g_balance_minelayer_protection 1 // don't explode if the mine would hurt the owner or a team mate
+ set g_balance_minelayer_damageforcescale 0
+ set g_balance_minelayer_detonatedelay -1 // positive: timer till detonation is allowed, negative: "security device" that prevents ANY remote detonation if it could hurt its owner, zero: detonatable at any time
+ set g_balance_minelayer_time 0.5
+ set g_balance_minelayer_remote_damage 45
+ set g_balance_minelayer_remote_edgedamage 40
+ set g_balance_minelayer_remote_radius 200
+ set g_balance_minelayer_remote_force 300
+ // }}}
  // {{{ electro
  set g_balance_electro_lightning 0
  set g_balance_electro_primary_damage 65

diff --cc balanceSamual.cfg
index aeed47e8986b05e972cc96bc387cf511d8a20a7d,97b3ee42429fe3d32546ccbfffd047f9e3dd781a..4c9095a1ad7a51e8c49bb328d4343249030c8514
--- 1/balanceSamual.cfg
--- 2/balanceSamual.cfg
+++ b/balanceSamual.cfg
@@@ -306,8 -303,29 +307,30 @@@ set g_balance_grenadelauncher_secondary
  set g_balance_grenadelauncher_secondary_damageforcescale 4
  set g_balance_grenadelauncher_secondary_bouncefactor 0.5
  set g_balance_grenadelauncher_secondary_bouncestop 0.075
 +set g_balance_grenadelauncher_secondary_remote_detonateprimary 1
  // }}}
+ // {{{ minelayer // TODO
+ set g_balance_minelayer_damage 35
+ set g_balance_minelayer_edgedamage 30
+ set g_balance_minelayer_force 250
+ set g_balance_minelayer_radius 175
+ set g_balance_minelayer_proximityradius 150
+ set g_balance_minelayer_speed 750
+ set g_balance_minelayer_lifetime 60
+ set g_balance_minelayer_refire 1.5
+ set g_balance_minelayer_animtime 0.4
+ set g_balance_minelayer_ammo 5
+ set g_balance_minelayer_health 15
+ set g_balance_minelayer_limit 4 // 0 disables the limit
+ set g_balance_minelayer_protection 1 // don't explode if the mine would hurt the owner or a team mate
+ set g_balance_minelayer_damageforcescale 0
+ set g_balance_minelayer_detonatedelay -1 // positive: timer till detonation is allowed, negative: "security device" that prevents ANY remote detonation if it could hurt its owner, zero: detonatable at any time
+ set g_balance_minelayer_time 0.5
+ set g_balance_minelayer_remote_damage 45
+ set g_balance_minelayer_remote_edgedamage 40
+ set g_balance_minelayer_remote_radius 200
+ set g_balance_minelayer_remote_force 300
+ // }}}
  // {{{ electro
  set g_balance_electro_lightning 0
  set g_balance_electro_primary_damage 65

diff --cc balanceXonotic.cfg
index e28bd844dec4d0d9214cdd7f5bdaa54f4c522232,1918639a876c328acb559291739a4a2e407ace95..0f25b89947aed72b99206f21843909c1d9000179
--- 1/balanceXonotic.cfg
--- 2/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@@ -304,10 -301,31 +305,32 @@@ set g_balance_grenadelauncher_secondary
  set g_balance_grenadelauncher_secondary_ammo 2
  set g_balance_grenadelauncher_secondary_health 40
  set g_balance_grenadelauncher_secondary_damageforcescale 0
 -set g_balance_grenadelauncher_secondary_bouncefactor 0.7
 +set g_balance_grenadelauncher_secondary_bouncefactor 0.5
  set g_balance_grenadelauncher_secondary_bouncestop 0.12
 +set g_balance_grenadelauncher_secondary_remote_detonateprimary 1
  // }}}
+ // {{{ minelayer // TODO
+ set g_balance_minelayer_damage 35
+ set g_balance_minelayer_edgedamage 30
+ set g_balance_minelayer_force 250
+ set g_balance_minelayer_radius 175
+ set g_balance_minelayer_proximityradius 150
+ set g_balance_minelayer_speed 750
+ set g_balance_minelayer_lifetime 60
+ set g_balance_minelayer_refire 1.5
+ set g_balance_minelayer_animtime 0.4
+ set g_balance_minelayer_ammo 5
+ set g_balance_minelayer_health 15
+ set g_balance_minelayer_limit 4 // 0 disables the limit
+ set g_balance_minelayer_protection 1 // don't explode if the mine would hurt the owner or a team mate
+ set g_balance_minelayer_damageforcescale 0
+ set g_balance_minelayer_detonatedelay -1 // positive: timer till detonation is allowed, negative: "security device" that prevents ANY remote detonation if it could hurt its owner, zero: detonatable at any time
+ set g_balance_minelayer_time 0.5
+ set g_balance_minelayer_remote_damage 45
+ set g_balance_minelayer_remote_edgedamage 40
+ set g_balance_minelayer_remote_radius 200
+ set g_balance_minelayer_remote_force 300
+ // }}}
  // {{{ electro // TODO
  set g_balance_electro_lightning 1
  set g_balance_electro_primary_damage 85

diff --cc defaultXonotic.cfg
Simple merge

diff --cc qcsrc/common/constants.qh
Simple merge