Took me a while to notice the Grabber didn't have a muzzle flash effect. Fix that now

diff --git a/data/effectinfo.txt b/data/effectinfo.txt
index 87e026939f6613229833a7b90b1366de8e7711ed..5baf58b34b45dfdb9a741282d755556c8e202611 100644 (file)
--- a/data/effectinfo.txt
+++ b/data/effectinfo.txt
@@ -2090,11 +2090,32 @@ velocityjitter 256 256 256
 \r
 \r
 \r
-// used in qcsrc/server/g_grabber.qc:  pointparticles(particleeffectnum("grapple_muzzleflash"), org, '0 0 0', 1)\r
-effect grapple_muzzleflash\r
+// used in qcsrc/server/g_grabber.qc:  pointparticles(particleeffectnum("grabber_muzzleflash"), org, '0 0 0', 1)\r
+effect grabber_muzzleflash\r
 lightradius 160\r
 lightradiusfade 600\r
-lightcolor 1 0.2 0.1\r
+lightcolor 0 0.8 1\r
+effect grabber_muzzleflash\r
+count 30\r
+type spark\r
+tex 31 31\r
+color 0xD9FDFF 0xD9FDFF\r
+size 3 3\r
+alpha 0 128 512\r
+originjitter 1 1 1\r
+velocityjitter 300 300 300\r
+velocitymultiplier 0.5\r
+airfriction 12\r
+effect grabber_muzzleflash\r
+countabsolute 5\r
+type alphastatic\r
+tex 0 8\r
+size 1 3\r
+sizeincrease 5\r
+alpha 50 128 50\r
+gravity -0.02\r
+color 0x000000 0x44ccff\r
+originjitter 5 5 5\r
 \r
 // used in qcsrc/server/g_grabber.qc:  pointparticles(particleeffectnum("grabber_impact"), self.origin, '0 0 0', 1)\r
 // decal\r
@@ -4911,7 +4932,7 @@ alpha 25 64 50
 gravity -0.01\r
 color 0x000000 0x886666\r
 originjitter 20 20 5\r
-// sparls\r
+// sparks\r
 effect ground_metal\r
 count 10\r
 type spark\r

diff --git a/data/qcsrc/server/g_grabber.qc b/data/qcsrc/server/g_grabber.qc
index df88340f088073fe894f2daa4cc36bf01d3b4147..5433c644a40774c563efa21efca08a7577abbdb2 100644 (file)
--- a/data/qcsrc/server/g_grabber.qc
+++ b/data/qcsrc/server/g_grabber.qc
@@ -326,7 +326,7 @@ void FireGrabber (void)
        // UGLY WORKAROUND: play this on CHAN_WEAPON2 so it can't cut off fire sounds\r
        sound (self, CHAN_WEAPON2, "weapons/grabber_fire.wav", VOL_BASE, ATTN_NORM);\r
        org = self.origin + self.view_ofs + v_forward * grabber_shotorigin_x + v_right * grabber_shotorigin_y + v_up * grabber_shotorigin_z;\r
-       pointparticles(particleeffectnum("grapple_muzzleflash"), org, '0 0 0', 1);\r
+       pointparticles(particleeffectnum("grabber_muzzleflash"), org, '0 0 0', 1);\r
 \r
        missile = WarpZone_RefSys_SpawnSameRefSys(self);\r
        missile.owner = self;\r

diff --git a/data/qcsrc/server/w_grabber.qc b/data/qcsrc/server/w_grabber.qc
index 2439ca965929ed214d3a2aa4ba45d8fe6a03caf0..023b9e0533013872fd35068e731e0ae1d4964077 100644 (file)
--- a/data/qcsrc/server/w_grabber.qc
+++ b/data/qcsrc/server/w_grabber.qc
@@ -37,6 +37,7 @@ void W_Grabber_Attack2()
                return;\r
 \r
        W_SetupShot (self, TRUE, 0, "weapons/grabber_altfire.wav", cvar("g_balance_grabber_secondary_damage"));\r
+       pointparticles(particleeffectnum("grabber_muzzleflash"), w_shotorg, '0 0 0', 1);\r
        W_Grabber_UpdateStats(self, TRUE, FALSE); // the hit is recorded below\r
 \r
        WarpZone_traceline_antilag(self, w_shotorg, w_shotorg + w_shotdir * cvar("g_balance_grabber_secondary_radius"), FALSE, self, ANTILAG_LATENCY(self));\r