Correct particle effects for grabber secondary

diff --git a/data/effectinfo.txt b/data/effectinfo.txt
index ddea493a85e1afb07a2eb4767c2a4e23b53a1d5c..271e1daa00f51c8d2217e9be2c1b92435657aebc 100644 (file)
--- a/data/effectinfo.txt
+++ b/data/effectinfo.txt
@@ -4548,18 +4548,18 @@ velocitymultiplier -0.1
 // gauntlet laser\r
 // based off morphed's cl_gentle\r
 // used in qcsrc/server/w_laser.qc\r
 // gauntlet laser\r
 // based off morphed's cl_gentle\r
 // used in qcsrc/server/w_laser.qc\r

-effect laser_gauntlet\r
+effect grabber_melee\r

 tex 43 43\r
 count 3\r
 type spark\r
 tex 43 43\r
 count 3\r
 type spark\r

-color 0xff00ff 0xff0000\r
-size 4 8\r
+color 0xffffff 0x0000ff\r
+size 8 16\r

 sizeincrease 34\r
 alpha 128 128 292\r
 gravity 0\r
 airfriction 5\r
 liquidfriction 10\r
 sizeincrease 34\r
 alpha 128 128 292\r
 gravity 0\r
 airfriction 5\r
 liquidfriction 10\r

-velocityjitter 50 50 50\r
+velocityjitter 25 25 25\r

 \r
 \r
 //torch flame, spawn it as fast as you can  20 times per second or more, supports direction but not required\r
 \r
 \r
 //torch flame, spawn it as fast as you can  20 times per second or more, supports direction but not required\r

diff --git a/data/qcsrc/server/w_grabber.qc b/data/qcsrc/server/w_grabber.qc
index 9a98f850a0ed9e52852ba32ccab7c4bf493b3656..d3b45eae3c5eb4163ef0b6658f939ccefb7b77bf 100644 (file)
--- a/data/qcsrc/server/w_grabber.qc
+++ b/data/qcsrc/server/w_grabber.qc
@@ -21,7 +21,7 @@ void W_Grabber_Attack2()
 \r
        WarpZone_traceline_antilag(self, w_shotorg, w_shotorg + w_shotdir * cvar("g_balance_grabber_secondary_radius"), FALSE, self, ANTILAG_LATENCY(self));\r
 \r
 \r
        WarpZone_traceline_antilag(self, w_shotorg, w_shotorg + w_shotdir * cvar("g_balance_grabber_secondary_radius"), FALSE, self, ANTILAG_LATENCY(self));\r
 \r

-       pointparticles(particleeffectnum("laser_gauntlet"), w_shotorg + w_shotdir * cvar("g_balance_grabber_secondary_radius"), '0 0 0', 1);\r
+       pointparticles(particleeffectnum("grabber_melee"), w_shotorg + w_shotdir * cvar("g_balance_grabber_secondary_radius"), '0 0 0', 1);\r

 \r
        if (trace_fraction < 1)\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
 \r
        if (trace_fraction < 1)\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