X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=effectinfo.txt;h=1947d3f0611f9704394cfe59bb0f6016e84a9f9c;hb=95974901c0fc4db713bc0a1d11f7bbaa22a55ffe;hp=b36570aab4865bcd52cdabb25186d7b059b04fd9;hpb=cb78214cf1252fa80df3490c0cd3d41bae72bbb8;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/effectinfo.txt b/effectinfo.txt
index b36570aab..1947d3f06 100644
--- a/effectinfo.txt
+++ b/effectinfo.txt
@@ -4662,7 +4662,7 @@ lightcolor 0.9 0.9 0.2
 // used in qcsrc/server/w_common.qc:				zcurveparticles_from_tracetoss(particleeffectnum("tr_bullet"), self.origin, trace_endpos, self.velocity)
 // used in qcsrc/client/projectile.qc:			trailparticles(self, particleeffectnum("tr_bullet"), from, to)
 effect tr_rifle
-trailspacing 256
+trailspacing 128
 type spark
 color 0x800000 0xFF8020
 alpha 256 256 2560
@@ -4672,22 +4672,22 @@ velocitymultiplier 0.7
 effect tr_rifle
 notunderwater
 tex 0 8
-trailspacing 16
+trailspacing 8
 type static
 color 0x202020 0x404040
-size 2 2
-sizeincrease 0.2
+size 4 4
+sizeincrease 0.4
 alpha 256 256 256
 airfriction -4
 velocityjitter 4 4 4
 type smoke
 effect tr_rifle
 underwater
-trailspacing 64
+trailspacing 32
 type bubble
 tex 62 62
 color 0x404040 0x808080
-size 1 1
+size 2 2
 alpha 256 256 128
 gravity -0.125
 bounce 1.5
@@ -4983,7 +4983,7 @@ size 16 16
 alpha 256 256 0
 originjitter 2 2 2
 lightradius 50
-lightradiusfade 200
+lightradiusfade 500
 lightcolor 3.125 4.375 10
 effect electro_lightning
 count 300
@@ -5060,3 +5060,53 @@ velocitymultiplier 2.5
 airfriction 8
 gravity 1.3
 stretchfactor 0.1
+
+
+// crylink joinexplode effect
+// decal
+// used in qcsrc/client/damage.qc:					pointparticles(particleeffectnum("crylink_joinexplode"), org2, '0 0 0', 1)
+effect crylink_joinexplode
+countabsolute 1
+type decal
+tex 47 47
+size 24 24
+alpha 256 256 0
+originjitter 12 12 12
+//lightradius 200
+//lightradiusfade 800
+//lightcolor 3.2 0.4 4
+// purple flare effect
+effect crylink_joinexplode
+countabsolute 1
+type static
+tex 39 39
+color 0x504060 0x504060
+size 24 24
+alpha 256 256 512
+// purple sparks
+effect crylink_joinexplode
+count 40
+type spark
+tex 41 41
+color 0xA040C0 0xA040C0
+bounce 2
+size 6 6
+alpha 256 256 1024
+velocityjitter 512 512 512
+// purple splash
+effect crylink_joinexplode
+count 1.5
+type static
+color 0xE070FF 0xE070FF
+size 16 16
+alpha 256 256 512
+velocityjitter 32 32 32
+// purple splash
+effect crylink_joinexplode
+count 3
+type static
+color 0xE070FF 0xE070FF
+size 16 16
+alpha 256 256 1024
+velocityjitter 256 256 256
+