From 3a61c447db5f5a94ff24a2e68954d205596052d1 Mon Sep 17 00:00:00 2001 From: div0 Date: Thu, 30 Oct 2008 14:44:54 +0000 Subject: [PATCH] separate out seeker's effects from electro trail, and porto's from grenade trail git-svn-id: svn://svn.icculus.org/nexuiz/trunk@4944 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/effectinfo.txt | 60 +++++++++++++++++++++++++++++++++ data/qcsrc/server/cl_weapons.qc | 4 +-- data/qcsrc/server/w_porto.qc | 2 +- data/qcsrc/server/w_seeker.qc | 9 ++--- 4 files changed, 68 insertions(+), 7 deletions(-) diff --git a/data/effectinfo.txt b/data/effectinfo.txt index 5e43d2eca..8d2a49808 100644 --- a/data/effectinfo.txt +++ b/data/effectinfo.txt @@ -2968,3 +2968,63 @@ originjitter 10 10 10 velocitymultiplier 20 velocityoffset 0 0 10 airfriction 1 + +// port-o-launch trail +// glowing vapor trail +effect TR_WIZSPIKE +trailspacing 2 +type static +color 0x404040 0x404040 +size 3 3 +tex 62 62 +alpha 256 256 968 +//velocityjitter 16 16 16 +lightradius 90 +lighttime 0 +lightcolor 1.5 3 6 +velocitymultiplier -0.1 +// bright sparks +effect TR_WIZSPIKE +trailspacing 6 +count 3 +type snow +tex 42 42 +color 0x404040 0x404040 +size 2 4 +sizeincrease -20 +alpha 444 512 1866 +bounce 1 +velocityoffset 0 0 15 +airfriction 12 +originjitter 1 1 1 +velocityjitter 50 50 50 + +// TAG trail +// glowing vapor trail +effect TR_VORESPIKE +trailspacing 2 +type static +color 0x804000 0x804000 +size 3 3 +tex 62 62 +alpha 256 256 968 +//velocityjitter 16 16 16 +lightradius 90 +lighttime 0 +lightcolor 1.5 3 6 +velocitymultiplier -0.1 +// bright sparks +effect TR_VORESPIKE +trailspacing 6 +count 3 +type snow +tex 42 42 +color 0xff8000 0xff8000 +size 2 4 +sizeincrease -20 +alpha 444 512 1866 +bounce 1 +velocityoffset 0 0 15 +airfriction 12 +originjitter 1 1 1 +velocityjitter 50 50 50 diff --git a/data/qcsrc/server/cl_weapons.qc b/data/qcsrc/server/cl_weapons.qc index f46e226b8..3728ff939 100644 --- a/data/qcsrc/server/cl_weapons.qc +++ b/data/qcsrc/server/cl_weapons.qc @@ -464,8 +464,8 @@ void RegisterWeapons() register_weapon(WEP_PORTO, w_porto, IT_SUPERWEAPON, 0, 0, 0, "porto" , "porto", "Port-O-Launch"); register_weapon(WEP_MINSTANEX, w_minstanex, IT_CELLS, 7, 0, 10000, "minstanex", "minstanex", "MinstaNex"); register_weapon(WEP_HOOK, w_hook, IT_CELLS, 0, 0, 0, "hookgun", "hook", "Grappling Hook"); - register_weapon(WEP_SEEKER, w_seeker, IT_ROCKETS, 8, 0, 0, "seeker", "seeker", "T.A.G. Seeker"); - register_weapon(WEP_HLAC, w_hlac, IT_CELLS, 6, 0, 0, "hlac", "hlac", "Heavy Laser Assault Cannon"); + register_weapon(WEP_SEEKER, w_seeker, IT_ROCKETS, 8, 1, 0, "seeker", "seeker", "T.A.G. Seeker"); + register_weapon(WEP_HLAC, w_hlac, IT_CELLS, 6, 1, 0, "hlac", "hlac", "Heavy Laser Assault Cannon"); register_weapons_done(); } diff --git a/data/qcsrc/server/w_porto.qc b/data/qcsrc/server/w_porto.qc index dc9fbb210..b5ba8fe6b 100644 --- a/data/qcsrc/server/w_porto.qc +++ b/data/qcsrc/server/w_porto.qc @@ -168,7 +168,7 @@ void W_Porto_Attack (void) gren.solid = SOLID_BBOX; gren.effects = EF_LOWPRECISION | EF_RED | EF_ADDITIVE; gren.scale = 4; - gren.modelflags = MF_GRENADE; + gren.modelflags = MF_TRACER; setmodel(gren, "models/grenademodel.md3"); // precision set above setsize(gren, '0 0 0', '0 0 0'); setorigin(gren, w_shotorg); diff --git a/data/qcsrc/server/w_seeker.qc b/data/qcsrc/server/w_seeker.qc index 3aa785b40..04aa2d28f 100644 --- a/data/qcsrc/server/w_seeker.qc +++ b/data/qcsrc/server/w_seeker.qc @@ -173,7 +173,7 @@ void Seeker_Fire_Missile(vector f_org) makevectors(self.v_angle); W_SetupShot (self, f_org, FALSE, 2, "weapons/hagar_fire.wav"); - pointparticles(particleeffectnum("hagar_muzzleflash"), w_shotorg, w_shotdir * 1000, 1); + pointparticles(particleeffectnum("seeker_muzzleflash"), w_shotorg, w_shotdir * 1000, 1); //self.detornator = FALSE; @@ -349,10 +349,11 @@ void Seeker_Fire_Tag() missile.event_damage = Seeker_Tag_Explode; missile.health = 5; - setmodel (missile, "models/laser.mdl"); + setmodel (missile, "models/laser.mdl"); // TODO make this seeker specific setorigin (missile, w_shotorg); - missile.effects = EF_BRIGHTFIELD | EF_FULLBRIGHT | EF_NOSHADOW | EF_LOWPRECISION; + missile.effects = EF_FULLBRIGHT | EF_NOSHADOW | EF_LOWPRECISION; + missile.modelflags = MF_TRACER3; missile.flags = FL_PROJECTILE; missile.velocity = w_shotdir * cvar("g_balance_seeker_tag_speed"); @@ -421,7 +422,7 @@ void Seeker_Fire_Flac() missile.projectiledeathtype = WEP_SEEKER | HITTYPE_SECONDARY; missile.effects = EF_LOWPRECISION; - missile.modelflags = MF_GRENADE; + missile.modelflags = MF_TRACER3; missile.movetype = MOVETYPE_FLY; w_shotdir = w_shotdir + '0 0 0.3'; -- 2.39.2