Also use my ground impact particles for grabber attacks

diff --git a/data/effectinfo.txt b/data/effectinfo.txt
index 8ab32a0144dda982d235b656e55016e38feddc96..87e026939f6613229833a7b90b1366de8e7711ed 100644 (file)
--- a/data/effectinfo.txt
+++ b/data/effectinfo.txt
@@ -4921,7 +4921,7 @@ size 2 2
 alpha 255 255 112\r
 bounce 1.4\r
 stretchfactor 0.5\r
-velocityjitter 200 200 400\r
+velocityjitter 200 200 300\r
 velocitymultiplier 2\r
 airfriction 2\r
 gravity 1\r

diff --git a/data/qcsrc/server/g_grabber.qc b/data/qcsrc/server/g_grabber.qc
index 333362035b4a4bdb891ce67bcfc2610481bd6511..df88340f088073fe894f2daa4cc36bf01d3b4147 100644 (file)
--- 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")\r
                sound (self, CHAN_PROJECTILE, "weapons/grabber_impact_player.wav", VOL_BASE, ATTN_NORM);\r
        else\r
+       {\r
                sound (self, CHAN_PROJECTILE, "weapons/grabber_impact_world.wav", VOL_BASE, ATTN_NORM);\r
+               if(trace_dphitq3surfaceflags & Q3SURFACEFLAG_METALSTEPS)\r
+                       pointparticles(particleeffectnum("ground_metal"), trace_endpos, '0 0 0', 1);\r
+               else\r
+                       pointparticles(particleeffectnum("ground_dirt"), trace_endpos, '0 0 0', 1);\r
+       }\r
 \r
        self.state = 1;\r
        self.think = GrabberThink;\r

diff --git a/data/qcsrc/server/w_grabber.qc b/data/qcsrc/server/w_grabber.qc
index 705ffa459c7b7ad83204a738486eced3521e6b95..2439ca965929ed214d3a2aa4ba45d8fe6a03caf0 100644 (file)
--- 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")\r
                        sound (self, CHAN_PROJECTILE, "weapons/grabber_impact2_player.wav", VOL_BASE, ATTN_NORM);\r
                else\r
+               {\r
                        sound (self, CHAN_PROJECTILE, "weapons/grabber_impact2_world.wav", VOL_BASE, ATTN_NORM);\r
+                       if(trace_dphitq3surfaceflags & Q3SURFACEFLAG_METALSTEPS)\r
+                               pointparticles(particleeffectnum("ground_metal"), trace_endpos, '0 0 0', 1);\r
+                       else\r
+                               pointparticles(particleeffectnum("ground_dirt"), trace_endpos, '0 0 0', 1);\r
+               }\r
 \r
                W_Grabber_UpdateStats(self, FALSE, TRUE); // the shot is recorded above\r
        }\r