From: tzork Date: Fri, 12 Nov 2010 07:39:39 +0000 (+0100) Subject: Get rid of bouncestop and bouncefactor for electro for now (not worht the fuzz) ... X-Git-Tag: xonotic-v0.1.0preview~153^2~2^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=59865d98f65068bde3ab2cd06257130927f4fa48;p=xonotic%2Fxonotic-data.pk3dir.git Get rid of bouncestop and bouncefactor for electro for now (not worht the fuzz) Support g_balance_crylink_secondary_joinexplode too. --- diff --git a/balance25.cfg b/balance25.cfg index e21df9972..9a0792012 100644 --- a/balance25.cfg +++ b/balance25.cfg @@ -384,8 +384,6 @@ 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_count 1 -set g_balance_electro_secondary_bouncefactor 1 -set g_balance_electro_secondary_bouncestop 0 set g_balance_electro_combo_damage 80 set g_balance_electro_combo_edgedamage 0 set g_balance_electro_combo_force 200 @@ -435,6 +433,11 @@ set g_balance_crylink_secondary_ammo 2 set g_balance_crylink_secondary_bouncedamagefactor 0.5 set g_balance_crylink_secondary_joinspeed 0 set g_balance_crylink_secondary_jointime 0 +set g_balance_crylink_secondary_joinexplode 0 +set g_balance_crylink_secondary_joinexplode_damage 0 +set g_balance_crylink_secondary_joinexplode_edgedamage 0 +set g_balance_crylink_secondary_joinexplode_radius 0 +set g_balance_crylink_secondary_joinexplode_force 0 set g_balance_crylink_secondary_linkexplode 1 set g_balance_crylink_secondary_middle_lifetime 5 // range: 35000 full, fades to 70000 diff --git a/balanceLeeStricklin.cfg b/balanceLeeStricklin.cfg index 2288341d5..1e72552ae 100644 --- a/balanceLeeStricklin.cfg +++ b/balanceLeeStricklin.cfg @@ -395,8 +395,6 @@ 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_count 3 -set g_balance_electro_secondary_bouncefactor 1 -set g_balance_electro_secondary_bouncestop 0 set g_balance_electro_combo_damage 70 set g_balance_electro_combo_edgedamage 0 set g_balance_electro_combo_force 200 @@ -446,6 +444,11 @@ set g_balance_crylink_secondary_ammo 3 set g_balance_crylink_secondary_bouncedamagefactor 0.5 set g_balance_crylink_secondary_joinspeed 0 set g_balance_crylink_secondary_jointime 0 +set g_balance_crylink_secondary_joinexplode 0 +set g_balance_crylink_secondary_joinexplode_damage 0 +set g_balance_crylink_secondary_joinexplode_edgedamage 0 +set g_balance_crylink_secondary_joinexplode_radius 0 +set g_balance_crylink_secondary_joinexplode_force 0 set g_balance_crylink_secondary_linkexplode 1 set g_balance_crylink_secondary_middle_lifetime 5 // range: 10000 full, fades to 10000 diff --git a/balanceNexSVN.cfg b/balanceNexSVN.cfg index b5d3fcccf..b17358db7 100644 --- a/balanceNexSVN.cfg +++ b/balanceNexSVN.cfg @@ -383,8 +383,6 @@ 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_count 1 -set g_balance_electro_secondary_bouncefactor 1 -set g_balance_electro_secondary_bouncestop 0 set g_balance_electro_combo_damage 80 set g_balance_electro_combo_edgedamage 0 set g_balance_electro_combo_force 200 @@ -434,6 +432,11 @@ set g_balance_crylink_secondary_ammo 2 set g_balance_crylink_secondary_bouncedamagefactor 0.5 set g_balance_crylink_secondary_joinspeed 0 set g_balance_crylink_secondary_jointime 0 +set g_balance_crylink_secondary_joinexplode 0 +set g_balance_crylink_secondary_joinexplode_damage 0 +set g_balance_crylink_secondary_joinexplode_edgedamage 0 +set g_balance_crylink_secondary_joinexplode_radius 0 +set g_balance_crylink_secondary_joinexplode_force 0 set g_balance_crylink_secondary_linkexplode 1 set g_balance_crylink_secondary_middle_lifetime 5 // range: 35000 full, fades to 70000 diff --git a/balanceSamual.cfg b/balanceSamual.cfg index 4148ce068..7c51b370f 100644 --- a/balanceSamual.cfg +++ b/balanceSamual.cfg @@ -384,8 +384,6 @@ 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_count 3 -set g_balance_electro_secondary_bouncefactor 1 -set g_balance_electro_secondary_bouncestop 0 set g_balance_electro_combo_damage 50 set g_balance_electro_combo_edgedamage 0 set g_balance_electro_combo_force 200 @@ -434,6 +432,11 @@ set g_balance_crylink_secondary_ammo 2 set g_balance_crylink_secondary_bouncedamagefactor 0.5 set g_balance_crylink_secondary_joinspeed 0 set g_balance_crylink_secondary_jointime 0 +set g_balance_crylink_secondary_joinexplode 0 +set g_balance_crylink_secondary_joinexplode_damage 0 +set g_balance_crylink_secondary_joinexplode_edgedamage 0 +set g_balance_crylink_secondary_joinexplode_radius 0 +set g_balance_crylink_secondary_joinexplode_force 0 set g_balance_crylink_secondary_linkexplode 1 set g_balance_crylink_secondary_middle_lifetime 5 // range: 35000 full, fades to 70000 diff --git a/balanceTest.cfg b/balanceTest.cfg index c9a06f8ad..296fb4c06 100644 --- a/balanceTest.cfg +++ b/balanceTest.cfg @@ -384,8 +384,6 @@ 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_count 3 -set g_balance_electro_secondary_bouncefactor 1 -set g_balance_electro_secondary_bouncestop 0 set g_balance_electro_combo_damage 60 set g_balance_electro_combo_edgedamage 0 set g_balance_electro_combo_force 80 @@ -435,6 +433,11 @@ set g_balance_crylink_secondary_ammo 1 set g_balance_crylink_secondary_bouncedamagefactor 0.5 set g_balance_crylink_secondary_joinspeed 250 set g_balance_crylink_secondary_jointime 0 +set g_balance_crylink_secondary_joinexplode 0 +set g_balance_crylink_secondary_joinexplode_damage 0 +set g_balance_crylink_secondary_joinexplode_edgedamage 0 +set g_balance_crylink_secondary_joinexplode_radius 0 +set g_balance_crylink_secondary_joinexplode_force 0 set g_balance_crylink_secondary_linkexplode 0 set g_balance_crylink_secondary_middle_lifetime 5 // range: 10000 full, fades to 10000 diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg index d00c292c5..702ddc68f 100644 --- a/balanceXonotic.cfg +++ b/balanceXonotic.cfg @@ -384,8 +384,6 @@ 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_count 3 -set g_balance_electro_secondary_bouncefactor 1 -set g_balance_electro_secondary_bouncestop 0 set g_balance_electro_combo_damage 40 set g_balance_electro_combo_edgedamage 0 set g_balance_electro_combo_force 80 @@ -435,6 +433,11 @@ 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_jointime 0 +set g_balance_crylink_secondary_joinexplode 0 +set g_balance_crylink_secondary_joinexplode_damage 0 +set g_balance_crylink_secondary_joinexplode_edgedamage 0 +set g_balance_crylink_secondary_joinexplode_radius 0 +set g_balance_crylink_secondary_joinexplode_force 0 set g_balance_crylink_secondary_linkexplode 1 set g_balance_crylink_secondary_middle_lifetime 5 // range: 10000 full, fades to 10000 diff --git a/balancetZork.cfg b/balancetZork.cfg index 8bb1f4859..3ba426487 100644 --- a/balancetZork.cfg +++ b/balancetZork.cfg @@ -405,8 +405,6 @@ 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_count 3 -set g_balance_electro_secondary_bouncefactor 0.5 -set g_balance_electro_secondary_bouncestop 0.01 set g_balance_electro_combo_damage 80 set g_balance_electro_combo_edgedamage 10 @@ -441,7 +439,6 @@ set g_balance_crylink_primary_middle_fadetime 0.25 set g_balance_crylink_primary_other_lifetime 2 // range: 800 full, fades to 1300 set g_balance_crylink_primary_other_fadetime 0.25 - set g_balance_crylink_secondary 1 set g_balance_crylink_secondary_damage 2 set g_balance_crylink_secondary_edgedamage 0 @@ -457,6 +454,11 @@ 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_jointime 0 +set g_balance_crylink_secondary_joinexplode 0 +set g_balance_crylink_secondary_joinexplode_damage 0 +set g_balance_crylink_secondary_joinexplode_edgedamage 0 +set g_balance_crylink_secondary_joinexplode_radius 0 +set g_balance_crylink_secondary_joinexplode_force 0 set g_balance_crylink_secondary_linkexplode 0 set g_balance_crylink_secondary_middle_lifetime 5 // range: 10000 full, fades to 10000 diff --git a/qcsrc/server/w_crylink.qc b/qcsrc/server/w_crylink.qc index 747dc4edc..758a2577c 100644 --- a/qcsrc/server/w_crylink.qc +++ b/qcsrc/server/w_crylink.qc @@ -149,14 +149,29 @@ void W_Crylink_LinkJoinEffect_Think() if(n >= 2) { - if(cvar("g_balance_crylink_primary_joinexplode")) + + if(e.projectiledeathtype & HITTYPE_SECONDARY) { - n = n / cvar("g_balance_crylink_primary_shots"); - RadiusDamage (e, e.realowner, cvar("g_balance_crylink_primary_joinexplode_damage") * n, - cvar("g_balance_crylink_primary_joinexplode_edgedamage") * n, - cvar("g_balance_crylink_primary_joinexplode_radius") * n, world, - cvar("g_balance_crylink_primary_joinexplode_force") * n, e.projectiledeathtype, other); + if(cvar("g_balance_crylink_secondary_joinexplode")) + { + n = n / cvar("g_balance_crylink_secondary_shots"); + RadiusDamage (e, e.realowner, cvar("g_balance_crylink_secondary_joinexplode_damage") * n, + cvar("g_balance_crylink_secondary_joinexplode_edgedamage") * n, + cvar("g_balance_crylink_secondary_joinexplode_radius") * n, world, + cvar("g_balance_crylink_secondary_joinexplode_force") * n, e.projectiledeathtype, other); + } } + else + { + if(cvar("g_balance_crylink_primary_joinexplode")) + { + n = n / cvar("g_balance_crylink_primary_shots"); + RadiusDamage (e, e.realowner, cvar("g_balance_crylink_primary_joinexplode_damage") * n, + cvar("g_balance_crylink_primary_joinexplode_edgedamage") * n, + cvar("g_balance_crylink_primary_joinexplode_radius") * n, world, + cvar("g_balance_crylink_primary_joinexplode_force") * n, e.projectiledeathtype, other); + } + } // they seem to touch... // TODO make a specific particle effect for this @@ -166,6 +181,7 @@ void W_Crylink_LinkJoinEffect_Think() remove(self); } + // NO bounce protection, as bounces are limited! void W_Crylink_Touch (void) { @@ -486,22 +502,27 @@ float w_crylink(float req) if(self.crylink_lastgroup) { vector pos; + entity linkjoineffect; + + if(self.crylink_waitrelease == 1) { pos = W_Crylink_LinkJoin(self.crylink_lastgroup, cvar("g_balance_crylink_primary_joinspeed"), cvar("g_balance_crylink_primary_jointime")); + } else { pos = W_Crylink_LinkJoin(self.crylink_lastgroup, cvar("g_balance_crylink_secondary_joinspeed"), cvar("g_balance_crylink_secondary_jointime")); } - - entity linkjoineffect; + linkjoineffect = spawn(); - linkjoineffect.classname = "linkjoineffect"; linkjoineffect.think = W_Crylink_LinkJoinEffect_Think; + linkjoineffect.classname = "linkjoineffect"; linkjoineffect.nextthink = time + w_crylink_linkjoin_time; linkjoineffect.owner = self; setorigin(linkjoineffect, pos); + + } self.crylink_waitrelease = 0; if(!w_crylink(WR_CHECKAMMO1) && !w_crylink(WR_CHECKAMMO2)) diff --git a/qcsrc/server/w_electro.qc b/qcsrc/server/w_electro.qc index 1600a1c9a..014fc34e5 100644 --- a/qcsrc/server/w_electro.qc +++ b/qcsrc/server/w_electro.qc @@ -178,8 +178,8 @@ void W_Electro_Attack2() proj.event_damage = W_Plasma_Damage; proj.flags = FL_PROJECTILE; - proj.bouncefactor = cvar("g_balance_electro_secondary_bouncefactor"); - proj.bouncestop = cvar("g_balance_electro_secondary_bouncestop"); + //proj.bouncefactor = cvar("g_balance_electro_secondary_bouncefactor"); + //proj.bouncestop = cvar("g_balance_electro_secondary_bouncestop"); #if 0 entity p2;