From: MirceaKitsune Date: Wed, 3 Aug 2011 10:33:35 +0000 (+0300) Subject: Also use my ground impact particles for grabber attacks X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6a3397488dc4d7cc0fa65cbb57247fff513e3d6b;p=voretournament%2Fvoretournament.git Also use my ground impact particles for grabber attacks --- diff --git a/data/effectinfo.txt b/data/effectinfo.txt index 8ab32a01..87e02693 100644 --- a/data/effectinfo.txt +++ b/data/effectinfo.txt @@ -4921,7 +4921,7 @@ size 2 2 alpha 255 255 112 bounce 1.4 stretchfactor 0.5 -velocityjitter 200 200 400 +velocityjitter 200 200 300 velocitymultiplier 2 airfriction 2 gravity 1 diff --git a/data/qcsrc/server/g_grabber.qc b/data/qcsrc/server/g_grabber.qc index 33336203..df88340f 100644 --- a/data/qcsrc/server/g_grabber.qc +++ b/data/qcsrc/server/g_grabber.qc @@ -106,7 +106,13 @@ void Grabber_Stop() if(other.classname == "player") sound (self, CHAN_PROJECTILE, "weapons/grabber_impact_player.wav", VOL_BASE, ATTN_NORM); else + { sound (self, CHAN_PROJECTILE, "weapons/grabber_impact_world.wav", VOL_BASE, ATTN_NORM); + if(trace_dphitq3surfaceflags & Q3SURFACEFLAG_METALSTEPS) + pointparticles(particleeffectnum("ground_metal"), trace_endpos, '0 0 0', 1); + else + pointparticles(particleeffectnum("ground_dirt"), trace_endpos, '0 0 0', 1); + } self.state = 1; self.think = GrabberThink; diff --git a/data/qcsrc/server/w_grabber.qc b/data/qcsrc/server/w_grabber.qc index 705ffa45..2439ca96 100644 --- a/data/qcsrc/server/w_grabber.qc +++ b/data/qcsrc/server/w_grabber.qc @@ -48,7 +48,13 @@ void W_Grabber_Attack2() if(trace_ent.classname == "player") sound (self, CHAN_PROJECTILE, "weapons/grabber_impact2_player.wav", VOL_BASE, ATTN_NORM); else + { sound (self, CHAN_PROJECTILE, "weapons/grabber_impact2_world.wav", VOL_BASE, ATTN_NORM); + if(trace_dphitq3surfaceflags & Q3SURFACEFLAG_METALSTEPS) + pointparticles(particleeffectnum("ground_metal"), trace_endpos, '0 0 0', 1); + else + pointparticles(particleeffectnum("ground_dirt"), trace_endpos, '0 0 0', 1); + } W_Grabber_UpdateStats(self, FALSE, TRUE); // the shot is recorded above }