From: FruitieX <rasse@rasse-laptop.(none)>
Date: Tue, 5 Oct 2010 16:28:44 +0000 (+0300)
Subject: Merge remote branch 'origin/mirceakitsune/weapon_mine_layer' into fruitiex/fruitbalance
X-Git-Tag: xonotic-v0.1.0preview~307^2~33
X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=0b477ef3d8dde4db94a9600c10d8f789ab2794b7;p=xonotic%2Fxonotic-data.pk3dir.git

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

0b477ef3d8dde4db94a9600c10d8f789ab2794b7
diff --cc balance25.cfg
index 6287460ca,67f5dd625..0ed48b3e3
--- a/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 c1ff93612,57b601de1..20c6153a1
--- a/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 36615d790,590ecf02b..82b0cfc50
--- a/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 aeed47e89,97b3ee424..4c9095a1a
--- a/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 e28bd844d,1918639a8..0f25b8994
--- a/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