X-Git-Url: http://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=blobdiff_plain;f=data%2Feffectinfo.txt;h=fea6d3da59678855bb0eb09fe6b77b500ce55583;hp=04ba5b88f3d1478fa1f43433bc3d46267fccd1f0;hb=6319537cc67473c0d3b53cee8c1db2c7c640cb79;hpb=49c6da3307a4954b0a809574728e7d123b085a5e

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