Better Grabber impact effects

diff --git a/data/effectinfo.txt b/data/effectinfo.txt
index 04ba5b88f3d1478fa1f43433bc3d46267fccd1f0..499832fd5410ed97eeb294113222cd842e68a3eb 100644 (file)
--- a/data/effectinfo.txt
+++ b/data/effectinfo.txt
@@ -2063,10 +2063,180 @@ lightcolor 1 0.2 0.1
 \r
 \r
 // used in qcsrc/server/g_grabber.qc:  pointparticles(particleeffectnum("grabber_impact"), self.origin, '0 0 0', 1)\r
+// decal\r
 effect grabber_impact\r
-lightradius 120\r
-lightradiusfade 700\r
-lightcolor 0.3 0.6 1\r
+countabsolute 1\r
+type decal\r
+tex 47 47\r
+size 10 10\r
+alpha 256 256 0\r
+originjitter 14 14 14\r
+lightradius 90\r
+lightradiusfade 480\r
+lightcolor 0 2 4\r
+rotate -180 180 0 0\r
+// rotating something\r
+effect grabber_impact\r
+count 5\r
+type smoke\r
+tex 46 46\r
+color 0x1680A0 0x1680A0\r
+size 18 24\r
+sizeincrease 15\r
+alpha 55 55 65\r
+rotate 90 -90 250 -250\r
+// shockwave\r
+effect grabber_impact\r
+countabsolute 1\r
+type static\r
+tex 33 33\r
+color 0x1680A0 0x1680A0\r
+size 12 12\r
+alpha 50 50 400\r
+sizeincrease 450\r
+// shockwave2\r
+effect grabber_impact\r
+countabsolute 1\r
+type static\r
+tex 65 65\r
+color 0x1680A0 0x1680A0\r
+size 5 5\r
+alpha 50 50 100\r
+sizeincrease 250\r
+// flare effect\r
+effect grabber_impact\r
+countabsolute 1\r
+type static\r
+tex 37 37\r
+color 0x80C0FF 0x80C0FF\r
+size 8 8\r
+alpha 256 256 128\r
+// small sparks which form a sphere as they slow down\r
+//effect grabber_impact\r
+//count 128\r
+//type spark\r
+//color 0x2030FF 0x80C0FF\r
+//size 1 2\r
+//alpha 256 256 512\r
+//bounce 2\r
+//airfriction 8\r
+//liquidfriction 8\r
+//velocityjitter 384 384 384\r
+// small sparks which glow brightly but live briefly\r
+effect grabber_impact\r
+count 32\r
+type spark\r
+tex 41 41\r
+color 0xD9FDFF 0xD9FDFF\r
+size 2 2\r
+alpha 0 128 512\r
+bounce 2\r
+stretchfactor 3\r
+velocityjitter 600 600 600\r
+velocitymultiplier 0.5\r
+airfriction 9\r
+// small sparks that live longer\r
+effect grabber_impact\r
+count 8\r
+type spark\r
+tex 41 41\r
+color 0xD9FDFF 0xD9FDFF\r
+size 1 1\r
+alpha 255 255 112\r
+bounce 1.6\r
+stretchfactor 0.7\r
+velocityjitter 300 300 600\r
+velocitymultiplier 2.5\r
+airfriction 2\r
+gravity 1\r
+\r
+// used in qcsrc/server/w_grabber.qc:  pointparticles(particleeffectnum("grabber_impact2"), trace_endpos, '0 0 0', 1);\r
+// decal\r
+effect grabber_impact2\r
+countabsolute 1\r
+type decal\r
+tex 47 47\r
+size 18 18\r
+alpha 256 256 0\r
+originjitter 14 14 14\r
+lightradius 180\r
+lightradiusfade 240\r
+lightcolor 0 2 4\r
+rotate -180 180 0 0\r
+// rotating something\r
+effect grabber_impact2\r
+count 15\r
+type smoke\r
+tex 46 46\r
+color 0x1680A0 0x1680A0\r
+size 20 26\r
+sizeincrease 15\r
+alpha 55 55 50\r
+rotate 180 -180 500 -500\r
+// shockwave\r
+effect grabber_impact2\r
+countabsolute 1\r
+type static\r
+tex 33 33\r
+color 0x1680A0 0x1680A0\r
+size 16 16\r
+alpha 50 50 400\r
+sizeincrease 900\r
+// shockwave2\r
+effect grabber_impact2\r
+countabsolute 1\r
+type static\r
+tex 65 65\r
+color 0x1680A0 0x1680A0\r
+size 7 7\r
+alpha 50 50 100\r
+sizeincrease 500\r
+// flare effect\r
+effect grabber_impact2\r
+countabsolute 1\r
+type static\r
+tex 37 37\r
+color 0x80C0FF 0x80C0FF\r
+size 14 14\r
+alpha 256 256 64\r
+// small sparks which form a sphere as they slow down\r
+//effect grabber_impact2\r
+//count 128\r
+//type spark\r
+//color 0x2030FF 0x80C0FF\r
+//size 1 2\r
+//alpha 256 256 512\r
+//bounce 2\r
+//airfriction 8\r
+//liquidfriction 8\r
+//velocityjitter 384 384 384\r
+// small sparks which glow brightly but live briefly\r
+effect grabber_impact2\r
+count 64\r
+type spark\r
+tex 41 41\r
+color 0xD9FDFF 0xD9FDFF\r
+size 4 4\r
+alpha 0 128 512\r
+bounce 2\r
+stretchfactor 3\r
+velocityjitter 600 600 600\r
+velocitymultiplier 0.5\r
+airfriction 9\r
+// small sparks that live longer\r
+effect grabber_impact2\r
+count 24\r
+type spark\r
+tex 41 41\r
+color 0xD9FDFF 0xD9FDFF\r
+size 2 2\r
+alpha 255 255 112\r
+bounce 1.6\r
+stretchfactor 0.7\r
+velocityjitter 300 300 600\r
+velocitymultiplier 2.5\r
+airfriction 2\r
+gravity 1\r
 \r
 \r
 \r

diff --git a/data/qcsrc/server/w_grabber.qc b/data/qcsrc/server/w_grabber.qc
index ca9025f476f890f04fb5b1565f58d27146a2c11b..dbf470f3d44b61c50f2b1ddc4a12d170389c1042 100644 (file)
--- a/data/qcsrc/server/w_grabber.qc
+++ b/data/qcsrc/server/w_grabber.qc
@@ -46,6 +46,7 @@ void W_Grabber_Attack2()
        if (trace_fraction < 1)\r
        {\r
                Damage(trace_ent, self, self, cvar("g_balance_grabber_secondary_damage"), WEP_GRABBER | HITTYPE_SECONDARY, trace_endpos, cvar("g_balance_grabber_secondary_force") * w_shotdir);\r
+               pointparticles(particleeffectnum("grabber_impact2"), trace_endpos, '0 0 0', 1);\r
                W_Grabber_UpdateStats(self, FALSE, TRUE); // the shot is recorded above\r
        }\r
 \r