From bc64f61f2d1c8ac9daf848e6292e47caf39b4846 Mon Sep 17 00:00:00 2001
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Fri, 3 Sep 2010 19:38:28 +0300
Subject: [PATCH] Correct particle effects for grabber secondary
---
data/effectinfo.txt | 8 ++++----
data/qcsrc/server/w_grabber.qc | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/data/effectinfo.txt b/data/effectinfo.txt
index ddea493a..271e1daa 100644
--- a/data/effectinfo.txt
+++ b/data/effectinfo.txt
@@ -4548,18 +4548,18 @@ velocitymultiplier -0.1
// gauntlet laser
// based off morphed's cl_gentle
// used in qcsrc/server/w_laser.qc
-effect laser_gauntlet
+effect grabber_melee
tex 43 43
count 3
type spark
-color 0xff00ff 0xff0000
-size 4 8
+color 0xffffff 0x0000ff
+size 8 16
sizeincrease 34
alpha 128 128 292
gravity 0
airfriction 5
liquidfriction 10
-velocityjitter 50 50 50
+velocityjitter 25 25 25
//torch flame, spawn it as fast as you can 20 times per second or more, supports direction but not required
diff --git a/data/qcsrc/server/w_grabber.qc b/data/qcsrc/server/w_grabber.qc
index 9a98f850..d3b45eae 100644
--- a/data/qcsrc/server/w_grabber.qc
+++ b/data/qcsrc/server/w_grabber.qc
@@ -21,7 +21,7 @@ void W_Grabber_Attack2()
WarpZone_traceline_antilag(self, w_shotorg, w_shotorg + w_shotdir * cvar("g_balance_grabber_secondary_radius"), FALSE, self, ANTILAG_LATENCY(self));
- pointparticles(particleeffectnum("laser_gauntlet"), w_shotorg + w_shotdir * cvar("g_balance_grabber_secondary_radius"), '0 0 0', 1);
+ pointparticles(particleeffectnum("grabber_melee"), w_shotorg + w_shotdir * cvar("g_balance_grabber_secondary_radius"), '0 0 0', 1);
if (trace_fraction < 1)
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);
--
2.39.5