From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Sun, 25 Jul 2010 15:39:16 +0000 (+0300)
Subject: particle effects on gauntlet too, make crylink secondary force negative again
X-Git-Tag: xonotic-v0.1.0preview~410
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=607b108436cc6d640395fe064e1f3082b407eff0;ds=sidebyside

particle effects on gauntlet too, make crylink secondary force negative again
---

diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg
index 97ac7ccf7d..792813b817 100644
--- a/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@ -366,7 +366,7 @@ set g_balance_crylink_primary_other_fadetime 0.25
 set g_balance_crylink_secondary 1
 set g_balance_crylink_secondary_damage 4
 set g_balance_crylink_secondary_edgedamage 0
-set g_balance_crylink_secondary_force 16
+set g_balance_crylink_secondary_force -40
 set g_balance_crylink_secondary_radius 15
 set g_balance_crylink_secondary_speed 1600
 set g_balance_crylink_secondary_spread 0.03
diff --git a/effectinfo.txt b/effectinfo.txt
index a9fdc33e06..b759fbeaaa 100644
--- a/effectinfo.txt
+++ b/effectinfo.txt
@@ -4990,8 +4990,8 @@ effect electro_lightning
 count 30
 type spark
 tex 8 15
-color 0xD9FDFF 0xD9FDFF
-size 3 7
+color 0xDDFDFF 0xFDFDFF
+size 2 5
 alpha 110 228 2024
 originjitter 1 1 1
 velocityjitter 150 150 150
@@ -5002,8 +5002,46 @@ effect electro_lightning
 count 50
 type spark
 tex 41 41
-color 0xD9FDFF 0xD9FDFF
-size 3 4
+color 0xFDFDFF 0xF9FDFF
+size 2 3
+alpha 110 228 1500
+originjitter 1 1 1
+velocityjitter 350 350 350
+velocitymultiplier 2.5
+airfriction 8
+gravity 1.3
+stretchfactor 0.1
+
+// used in qcsrc/server/w_gauntlet.qc:	pointparticles(particleeffectnum("electro_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)
+effect gauntlet_lightning
+count 300
+type spark
+color 0x280000 0x280000 // 0x202020 0x404040
+tex 65 65
+size 5 5
+alpha 256 256 1024
+originjitter 1.5 1.5 1.5
+velocityjitter 6 6 6
+sizeincrease 20
+velocitymultiplier 2000
+effect electro_lightning
+count 30
+type spark
+tex 8 15
+color 0xDD0000 0xFD0000
+size 2 5
+alpha 110 228 2024
+originjitter 1 1 1
+velocityjitter 150 150 150
+velocitymultiplier 0.5
+airfriction 2
+stretchfactor 1.5
+effect electro_lightning
+count 50
+type spark
+tex 41 41
+color 0xFD0000 0xF90000
+size 2 3
 alpha 110 228 1500
 originjitter 1 1 1
 velocityjitter 350 350 350
diff --git a/qcsrc/client/hook.qc b/qcsrc/client/hook.qc
index efa16533d5..513c792633 100644
--- a/qcsrc/client/hook.qc
+++ b/qcsrc/client/hook.qc
@@ -179,6 +179,7 @@ void Draw_GrapplingHook()
 			pointparticles(particleeffectnum("electro_lightning"), b, normalize(a - b), frametime);
 			break;
 		case ENT_CLIENT_GAUNTLET:
+			pointparticles(particleeffectnum("gauntlet_lightning"), b, normalize(a - b), frametime);
 			break;
 	}
 }