From: Samual Date: Wed, 28 Sep 2011 22:16:37 +0000 (-0400) Subject: g_balance_electro_secondary_damagedbycontents (allows or disallows secondary blobs... X-Git-Tag: xonotic-v0.6.0~40^2~92^2~1^2~38 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7c537991fff2dfc1e18755e0b965fcc6a3fe927c;p=xonotic%2Fxonotic-data.pk3dir.git g_balance_electro_secondary_damagedbycontents (allows or disallows secondary blobs to be destroyed in lava) - Also add the other new cvars for hook secondary to the balance configs --- diff --git a/balance25.cfg b/balance25.cfg index fe16d2de0..62dd2d855 100644 --- a/balance25.cfg +++ b/balance25.cfg @@ -416,6 +416,7 @@ set g_balance_electro_secondary_animtime 0.3 set g_balance_electro_secondary_ammo 2 set g_balance_electro_secondary_health 5 set g_balance_electro_secondary_damageforcescale 4 +set g_balance_electro_secondary_damagedbycontents 0 set g_balance_electro_secondary_count 1 set g_balance_electro_secondary_bouncefactor 0.5 set g_balance_electro_secondary_bouncestop 0.075 @@ -630,6 +631,8 @@ set g_balance_hook_secondary_refire 3 // don't drop too many bombs... set g_balance_hook_secondary_animtime 0.3 // good shoot anim set g_balance_hook_secondary_power 3 // effect behaves like a square function set g_balance_hook_secondary_duration 1.5 // effect runs for three seconds +set g_balance_hook_secondary_health 0 +set g_balance_hook_secondary_damageforcescale 0 // }}} // {{{ hlac set g_balance_hlac_primary_spread_min 0.01 diff --git a/balanceFruit.cfg b/balanceFruit.cfg index b6d298515..7777868a6 100644 --- a/balanceFruit.cfg +++ b/balanceFruit.cfg @@ -416,6 +416,7 @@ set g_balance_electro_secondary_animtime 0.2 set g_balance_electro_secondary_ammo 2 set g_balance_electro_secondary_health 10 set g_balance_electro_secondary_damageforcescale 4 +set g_balance_electro_secondary_damagedbycontents 0 set g_balance_electro_secondary_count 3 set g_balance_electro_secondary_bouncefactor 0.5 set g_balance_electro_secondary_bouncestop 0.075 @@ -630,6 +631,8 @@ set g_balance_hook_secondary_refire 3 // don't drop too many bombs... set g_balance_hook_secondary_animtime 0.2 // good shoot anim set g_balance_hook_secondary_power 3 // effect behaves like a square function set g_balance_hook_secondary_duration 1.5 // effect runs for three seconds +set g_balance_hook_secondary_health 0 +set g_balance_hook_secondary_damageforcescale 0 // }}} // {{{ hlac set g_balance_hlac_primary_spread_min 0.01 diff --git a/balanceLeeStricklin.cfg b/balanceLeeStricklin.cfg index 4d9f8180a..db3cc7efe 100644 --- a/balanceLeeStricklin.cfg +++ b/balanceLeeStricklin.cfg @@ -416,6 +416,7 @@ set g_balance_electro_secondary_animtime 0.3 set g_balance_electro_secondary_ammo 2 set g_balance_electro_secondary_health 10 set g_balance_electro_secondary_damageforcescale 4 +set g_balance_electro_secondary_damagedbycontents 0 set g_balance_electro_secondary_count 3 set g_balance_electro_secondary_bouncefactor 0.5 set g_balance_electro_secondary_bouncestop 0.075 @@ -630,6 +631,8 @@ set g_balance_hook_secondary_refire 3 // don't drop too many bombs... set g_balance_hook_secondary_animtime 0.3 // good shoot anim set g_balance_hook_secondary_power 3 // effect behaves like a square function set g_balance_hook_secondary_duration 1.5 // effect runs for three seconds +set g_balance_hook_secondary_health 0 +set g_balance_hook_secondary_damageforcescale 0 // }}} // {{{ hlac set g_balance_hlac_primary_spread_min 0.01 diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg index c2bc31ac0..e19749d2b 100644 --- a/balanceXonotic.cfg +++ b/balanceXonotic.cfg @@ -416,6 +416,7 @@ set g_balance_electro_secondary_animtime 0.2 set g_balance_electro_secondary_ammo 2 set g_balance_electro_secondary_health 5 set g_balance_electro_secondary_damageforcescale 4 +set g_balance_electro_secondary_damagedbycontents 1 set g_balance_electro_secondary_count 3 set g_balance_electro_secondary_bouncefactor 0.4 set g_balance_electro_secondary_bouncestop 0.05 @@ -622,7 +623,7 @@ set g_balance_hook_secondary_damage 25 // not much set g_balance_hook_secondary_edgedamage 5 // not much set g_balance_hook_secondary_radius 500 // LOTS set g_balance_hook_secondary_force -2000 // LOTS -set g_balance_hook_secondary_ammo 50 // a whole pack +set g_balance_hook_secondary_ammo 30 // a whole pack set g_balance_hook_secondary_lifetime 5 // infinite set g_balance_hook_secondary_speed 0 // not much throwing set g_balance_hook_secondary_gravity 5 // fast falling @@ -630,6 +631,8 @@ set g_balance_hook_secondary_refire 3 // don't drop too many bombs... set g_balance_hook_secondary_animtime 0.3 // good shoot anim set g_balance_hook_secondary_power 3 // effect behaves like a square function set g_balance_hook_secondary_duration 1.5 // effect runs for three seconds +set g_balance_hook_secondary_health 15 +set g_balance_hook_secondary_damageforcescale 0 // }}} // {{{ hlac // TO BE REMOVED set g_balance_hlac_primary_spread_min 0.01 diff --git a/balancetZork.cfg b/balancetZork.cfg index 865356c32..3fc066b73 100644 --- a/balancetZork.cfg +++ b/balancetZork.cfg @@ -417,6 +417,7 @@ set g_balance_electro_secondary_animtime 0.15 set g_balance_electro_secondary_ammo 2 set g_balance_electro_secondary_health 10 set g_balance_electro_secondary_damageforcescale 2 +set g_balance_electro_secondary_damagedbycontents 0 set g_balance_electro_secondary_count 3 set g_balance_electro_secondary_bouncefactor 0.5 set g_balance_electro_secondary_bouncestop 0.075 @@ -630,6 +631,8 @@ set g_balance_hook_secondary_refire 3 // don't drop too many bombs... set g_balance_hook_secondary_animtime 0.3 // good shoot anim set g_balance_hook_secondary_power 3 // effect behaves like a square function set g_balance_hook_secondary_duration 1.5 // effect runs for three seconds +set g_balance_hook_secondary_health 0 +set g_balance_hook_secondary_damageforcescale 0 // }}} // {{{ hlac set g_balance_hlac_primary_spread_min 0.01 diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh index aa27f7412..993ebcc34 100644 --- a/qcsrc/server/autocvars.qh +++ b/qcsrc/server/autocvars.qh @@ -220,6 +220,7 @@ float autocvar_g_balance_electro_secondary_bouncestop; float autocvar_g_balance_electro_secondary_count; float autocvar_g_balance_electro_secondary_damage; float autocvar_g_balance_electro_secondary_damageforcescale; +float autocvar_g_balance_electro_secondary_damagedbycontents; float autocvar_g_balance_electro_secondary_edgedamage; float autocvar_g_balance_electro_secondary_force; float autocvar_g_balance_electro_secondary_health; diff --git a/qcsrc/server/w_electro.qc b/qcsrc/server/w_electro.qc index 526d4cd32..6253e50fc 100644 --- a/qcsrc/server/w_electro.qc +++ b/qcsrc/server/w_electro.qc @@ -175,6 +175,7 @@ void W_Electro_Attack2() proj.health = autocvar_g_balance_electro_secondary_health; proj.event_damage = W_Plasma_Damage; proj.flags = FL_PROJECTILE; + proj.damagedbycontents = (autocvar_g_balance_electro_secondary_damagedbycontents); proj.bouncefactor = autocvar_g_balance_electro_secondary_bouncefactor; proj.bouncestop = autocvar_g_balance_electro_secondary_bouncestop;