X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=effectinfo.txt;h=b0f7b3dd7ca0390e04481a6a30d5977c8824266a;hb=303ead3f668736766fe0b5e918076653d07844b0;hp=b759fbeaaaef0ec31a15ecefdc6e7b6d75bb0b26;hpb=607b108436cc6d640395fe064e1f3082b407eff0;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/effectinfo.txt b/effectinfo.txt
index b759fbeaa..b0f7b3dd7 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,23 +4672,23 @@ velocitymultiplier 0.7
 effect tr_rifle
 notunderwater
 tex 0 8
-trailspacing 16
+trailspacing 8
 type static
 color 0x202020 0x404040
-size 2 2
-sizeincrease 2
-alpha 256 256 512
+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
-alpha 256 256 256
+size 2 2
+alpha 256 256 128
 gravity -0.125
 bounce 1.5
 liquidfriction 4
@@ -4976,15 +4976,26 @@ velocityjitter 156 156 156
 // used in qcsrc/server/w_electro.qc:	pointparticles(particleeffectnum("electro_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)
 // used in qcsrc/server/w_electro.qc:	pointparticles(particleeffectnum("electro_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)
 effect electro_lightning
+countabsolute 1
+type decal
+tex 59 59
+size 16 16
+alpha 256 256 0
+originjitter 2 2 2
+lightradius 50
+lightradiusfade 200
+lightcolor 3.125 4.375 10
+effect electro_lightning
 count 300
 type spark
-color 0x283880 0x283880 // 0x202020 0x404040
+// color 0x501860 0x501860 // 0x202020 0x404040
+color 0x2030FF 0x80C0FF
 tex 65 65
-size 5 5
-alpha 256 256 1024
+size 6 6
+alpha 100 206 1724
 originjitter 1.5 1.5 1.5
 velocityjitter 6 6 6
-sizeincrease 20
+sizeincrease 10
 velocitymultiplier 2000
 effect electro_lightning
 count 30
@@ -4992,7 +5003,7 @@ type spark
 tex 8 15
 color 0xDDFDFF 0xFDFDFF
 size 2 5
-alpha 110 228 2024
+alpha 110 170 1500
 originjitter 1 1 1
 velocityjitter 150 150 150
 velocitymultiplier 0.5
@@ -5004,7 +5015,7 @@ type spark
 tex 41 41
 color 0xFDFDFF 0xF9FDFF
 size 2 3
-alpha 110 228 1500
+alpha 110 170 1500
 originjitter 1 1 1
 velocityjitter 350 350 350
 velocitymultiplier 2.5
@@ -5018,31 +5029,31 @@ count 300
 type spark
 color 0x280000 0x280000 // 0x202020 0x404040
 tex 65 65
-size 5 5
+size 3 3
 alpha 256 256 1024
 originjitter 1.5 1.5 1.5
 velocityjitter 6 6 6
-sizeincrease 20
+sizeincrease 15
 velocitymultiplier 2000
-effect electro_lightning
+effect gauntlet_lightning
 count 30
 type spark
 tex 8 15
 color 0xDD0000 0xFD0000
 size 2 5
-alpha 110 228 2024
+alpha 110 228 1024
 originjitter 1 1 1
 velocityjitter 150 150 150
 velocitymultiplier 0.5
 airfriction 2
 stretchfactor 1.5
-effect electro_lightning
+effect gauntlet_lightning
 count 50
 type spark
 tex 41 41
 color 0xFD0000 0xF90000
 size 2 3
-alpha 110 228 1500
+alpha 110 228 600
 originjitter 1 1 1
 velocityjitter 350 350 350
 velocitymultiplier 2.5