From fe93e007e214434d3c4fbd159f78face8c5d6de4 Mon Sep 17 00:00:00 2001 From: mand1nga Date: Sun, 23 Aug 2009 14:38:47 +0000 Subject: [PATCH] New awesome effects for Onslaught git-svn-id: svn://svn.icculus.org/nexuiz/trunk@7499 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/effectinfo.txt | 91 ++++++++++++++++++++++++++++ data/models/onslaught/boom.md3 | Bin 54724 -> 0 bytes data/qcsrc/server/mode_onslaught.qc | 86 +++++++++----------------- 3 files changed, 121 insertions(+), 56 deletions(-) delete mode 100644 data/models/onslaught/boom.md3 diff --git a/data/effectinfo.txt b/data/effectinfo.txt index 736afc3ba..f0da1638c 100644 --- a/data/effectinfo.txt +++ b/data/effectinfo.txt @@ -3960,3 +3960,94 @@ airfriction 1.5 liquidfriction 3 originjitter 10 10 25 velocityjitter 656 656 912 + +// fire effect which expands then slows +effect onslaught_generator_gib_explode +notunderwater +count 34 +type static +tex 48 55 +color 0x8f0d00 0xff5a00 +size 20 26 +sizeincrease 45 +alpha 128 256 356 +bounce 1.5 +airfriction 5 +liquidfriction 8 +originjitter 8 8 8 +velocityjitter 286 286 286 + +// smoke +effect onslaught_generator_gib_explode +type alphastatic +notunderwater +tex 0 8 +count 12 +size 1 10 +sizeincrease 90 +gravity -0.3 +alpha 200 500 600 +velocityjitter 244 244 244 +airfriction 5 +color 0x000000 0x111111 +bounce 2 + +// underwater bubbles +effect onslaught_generator_gib_explode +underwater +count 32 +type bubble +tex 62 62 +color 0x404040 0x808080 +size 3 3 +alpha 128 256 64 +gravity -0.125 +bounce 1.5 +liquidfriction 0.25 +originjitter 16 16 16 +velocityjitter 96 96 96 + +// fire effect which expands then slows +effect onslaught_generator_gib_flame +notunderwater +count 30 +type static +tex 48 55 +color 0x8f0d00 0xff5a00 +size 5 10 +sizeincrease 25 +alpha 128 256 356 +gravity -0.5 +airfriction 5 +liquidfriction 8 +originjitter 3 3 3 +velocityjitter 86 86 86 +// smoke +effect onslaught_generator_gib_flame +type alphastatic +notunderwater +tex 0 8 +count 2 +size 10 20 +sizeincrease 30 +gravity -0.8 +alpha 200 500 600 +velocityjitter 44 44 44 +airfriction 5 +color 0x000000 0x111111 +bounce 2 + +// underwater bubbles +effect onslaught_generator_gib_flame +underwater +count 32 +type bubble +tex 62 62 +color 0x404040 0x808080 +size 3 3 +alpha 128 256 64 +gravity -0.125 +bounce 1.5 +liquidfriction 0.25 +originjitter 16 16 16 +velocityjitter 96 96 96 \ No newline at end of file diff --git a/data/models/onslaught/boom.md3 b/data/models/onslaught/boom.md3 deleted file mode 100644 index 24507becb17082a97e005cf4dcc59556c5fcdfd6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 54724 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 q 14) - { - self.think = SUB_Remove; - return; - } - self.frame +=1; -}; - -void onslaught_generator_boom_spawn(vector org, float fscale) -{ - entity e; - e = spawn(); - setmodel(e, "models/onslaught/boom.md3"); - setorigin(e, org); - - e.scale = fscale; - setsize(e, e.mins * e.scale, e.maxs * e.scale); - e.angles = randomvec() * 360; - - e.effects = EF_NOSHADOW; - - e.think = onslaught_generator_boom_think; - e.nextthink = time + 0.05; -}; - void ons_gib_damage (entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector vforce) { self.velocity = self.velocity + vforce; @@ -55,22 +26,26 @@ void ons_gib_damage (entity inflictor, entity attacker, float damage, float deat .float giblifetime; void ons_throwgib_think() { - local vector org; + float d; self.nextthink = time + 0.05; - if(self.count > self.giblifetime) + + d = self.giblifetime - time; + + if(d<0) { self.think = SUB_Remove; return; } - if(self.count > self.giblifetime-10) - self.alpha -= 0.1; - org = self.origin + 20 * randomvec(); - onslaught_generator_boom_spawn(org, random()*0.5+0.3); - self.count +=1; + if(d<1) + self.alpha = d; + + if(d>2) + if(random()<0.6) + pointparticles(particleeffectnum("onslaught_generator_gib_flame"), self.origin, '0 0 0', 1); }; -void ons_throwgib(vector v_from, vector v_to, string smodel, float f_lifetime, float f_fadetime, float b_burn) +void ons_throwgib(vector v_from, vector v_to, string smodel, float f_lifetime, float b_burn) { local entity gib; @@ -86,7 +61,7 @@ void ons_throwgib(vector v_from, vector v_to, string smodel, float f_lifetime, f gib.effects = EF_LOWPRECISION; gib.flags = FL_NOTARGET; gib.velocity = v_to; - gib.giblifetime = f_lifetime; + gib.giblifetime = time + f_lifetime; if (b_burn) { @@ -94,7 +69,7 @@ void ons_throwgib(vector v_from, vector v_to, string smodel, float f_lifetime, f gib.nextthink = time + 0.05; } else - SUB_SetFade(gib, time + f_lifetime, 2); + SUB_SetFade(gib, gib.giblifetime, 2); }; void onslaught_updatelinks() @@ -574,18 +549,18 @@ void onslaught_generator_deaththink() { i = random(); if(i < 0.3) - ons_throwgib(self.origin + '0 0 40', (100 * randomvec() - '1 1 1') * 11 + '0 0 20', "models/onslaught/gen_gib1.md3", 25, 1, 1); + ons_throwgib(self.origin + '0 0 40', (100 * randomvec() - '1 1 1') * 11 + '0 0 20', "models/onslaught/gen_gib1.md3", 6, TRUE); else if(i > 0.7) - ons_throwgib(self.origin + '0 0 40', (100 * randomvec() - '1 1 1') * 12 + '0 0 20', "models/onslaught/gen_gib2.md3", 20, 1, 1); + ons_throwgib(self.origin + '0 0 40', (100 * randomvec() - '1 1 1') * 12 + '0 0 20', "models/onslaught/gen_gib2.md3", 6, TRUE); else - ons_throwgib(self.origin + '0 0 40', (100 * randomvec() - '1 1 1') * 13 + '0 0 20', "models/onslaught/gen_gib3.md3", 15, 1, 1); + ons_throwgib(self.origin + '0 0 40', (100 * randomvec() - '1 1 1') * 13 + '0 0 20', "models/onslaught/gen_gib3.md3", 6, TRUE); } // Spawn fire balls - for(i=0;i < 6;++i) + for(i=0;i < 10;++i) { org = self.origin + randompos('-30 -30 -30' * i + '0 0 -20', '30 30 30' * i + '0 0 20'); - onslaught_generator_boom_spawn(org, (6-i)/5+0.3); + pointparticles(particleeffectnum("onslaught_generator_gib_explode"), org, '0 0 0', 1); } // Short explosion sound + small explosion @@ -716,11 +691,11 @@ void onslaught_generator_damage(entity inflictor, entity attacker, float damage, sound(self, CHAN_TRIGGER, "weapons/rocket_impact.wav", VOL_BASE, ATTN_NORM); i = random(); if(i < 0.3) - ons_throwgib(hitloc + '0 0 20', force * -1, "models/onslaught/gen_gib1.md3", 7, 1, 1); + ons_throwgib(hitloc + '0 0 20', force * -1, "models/onslaught/gen_gib1.md3", 5, TRUE); else if(i > 0.7) - ons_throwgib(hitloc + '0 0 20', force * -1, "models/onslaught/gen_gib2.md3", 6, 1, 1); + ons_throwgib(hitloc + '0 0 20', force * -1, "models/onslaught/gen_gib2.md3", 5, TRUE); else - ons_throwgib(hitloc + '0 0 20', force * -1, "models/onslaught/gen_gib3.md3", 5, 1, 1); + ons_throwgib(hitloc + '0 0 20', force * -1, "models/onslaught/gen_gib3.md3", 5, TRUE); } else { @@ -737,7 +712,7 @@ void onslaught_generator_damage(entity inflictor, entity attacker, float damage, //throw some gibs on damage if(random() < damage/200+0.2) if(random() < 0.5) - ons_throwgib(hitloc + '0 0 20', randomvec()*360, "models/onslaught/gen_gib1.md3", 1, 1, 0); + ons_throwgib(hitloc + '0 0 20', randomvec()*360, "models/onslaught/gen_gib1.md3", 5, FALSE); }; // update links after a delay @@ -936,7 +911,6 @@ void spawnfunc_onslaught_generator() precache_model("models/onslaught/generator_dmg8.md3"); precache_model("models/onslaught/generator_dmg9.md3"); precache_model("models/onslaught/generator_dead.md3"); - precache_model("models/onslaught/boom.md3"); precache_model("models/onslaught/shockwave.md3"); precache_model("models/onslaught/shockwavetransring.md3"); precache_model("models/onslaught/gen_gib1.md3"); @@ -1072,13 +1046,13 @@ void onslaught_controlpoint_icon_damage(entity inflictor, entity attacker, float string t; t = ColoredTeamName(attacker.team); bprint(ColoredTeamName(self.team), " ", self.message, " control point destroyed by ", t, "\n"); - ons_throwgib(self.origin, (2 * randomvec() - '1 1 1') * 25, "models/onslaught/controlpoint_icon_gib1.md3", 5, 1, 0); - ons_throwgib(self.origin, (2 * randomvec() - '1 1 1') * 45, "models/onslaught/controlpoint_icon_gib2.md3", 5, 1, 0); - ons_throwgib(self.origin, (2 * randomvec() - '1 1 1') * 45, "models/onslaught/controlpoint_icon_gib2.md3", 5, 1, 0); - ons_throwgib(self.origin, (2 * randomvec() - '1 1 1') * 75, "models/onslaught/controlpoint_icon_gib4.md3", 5, 1, 0); - ons_throwgib(self.origin, (2 * randomvec() - '1 1 1') * 75, "models/onslaught/controlpoint_icon_gib4.md3", 5, 1, 0); - ons_throwgib(self.origin, (2 * randomvec() - '1 1 1') * 75, "models/onslaught/controlpoint_icon_gib4.md3", 5, 1, 0); - ons_throwgib(self.origin, (2 * randomvec() - '1 1 1') * 75, "models/onslaught/controlpoint_icon_gib4.md3", 5, 1, 0); + ons_throwgib(self.origin, (2 * randomvec() - '1 1 1') * 25, "models/onslaught/controlpoint_icon_gib1.md3", 3, FALSE); + ons_throwgib(self.origin, (2 * randomvec() - '1 1 1') * 45, "models/onslaught/controlpoint_icon_gib2.md3", 3, FALSE); + ons_throwgib(self.origin, (2 * randomvec() - '1 1 1') * 45, "models/onslaught/controlpoint_icon_gib2.md3", 3, FALSE); + ons_throwgib(self.origin, (2 * randomvec() - '1 1 1') * 75, "models/onslaught/controlpoint_icon_gib4.md3", 3, FALSE); + ons_throwgib(self.origin, (2 * randomvec() - '1 1 1') * 75, "models/onslaught/controlpoint_icon_gib4.md3", 3, FALSE); + ons_throwgib(self.origin, (2 * randomvec() - '1 1 1') * 75, "models/onslaught/controlpoint_icon_gib4.md3", 3, FALSE); + ons_throwgib(self.origin, (2 * randomvec() - '1 1 1') * 75, "models/onslaught/controlpoint_icon_gib4.md3", 3, FALSE); } self.owner.goalentity = world; self.owner.islinked = FALSE; -- 2.39.2