Merge remote branch 'refs/remotes/origin/fruitiex/silencedriflesec'

[xonotic/xonotic-data.pk3dir.git] / effectinfo.txt

diff --git a/effectinfo.txt b/effectinfo.txt
index a9fdc33e0600c26b30d4eaee0129d873e01d42ba..b36570aab4865bcd52cdabb25186d7b059b04fd9 100644 (file)
--- a/effectinfo.txt
+++ b/effectinfo.txt
@@ -4676,8 +4676,8 @@ trailspacing 16
 type static
 color 0x202020 0x404040
 size 2 2
-sizeincrease 2
-alpha 256 256 512
+sizeincrease 0.2
+alpha 256 256 256
 airfriction -4
 velocityjitter 4 4 4
 type smoke
@@ -4688,7 +4688,7 @@ type bubble
 tex 62 62
 color 0x404040 0x808080
 size 1 1
-alpha 256 256 256
+alpha 256 256 128
 gravity -0.125
 bounce 1.5
 liquidfriction 4
@@ -4976,23 +4976,34 @@ 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
 type spark
 tex 8 15
-color 0xD9FDFF 0xD9FDFF
-size 3 7
-alpha 110 228 2024
+color 0xDDFDFF 0xFDFDFF
+size 2 5
+alpha 110 170 1500
 originjitter 1 1 1
 velocityjitter 150 150 150
 velocitymultiplier 0.5
@@ -5002,9 +5013,47 @@ effect electro_lightning
 count 50
 type spark
 tex 41 41
-color 0xD9FDFF 0xD9FDFF
-size 3 4
-alpha 110 228 1500
+color 0xFDFDFF 0xF9FDFF
+size 2 3
+alpha 110 170 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 3 3
+alpha 256 256 1024
+originjitter 1.5 1.5 1.5
+velocityjitter 6 6 6
+sizeincrease 15
+velocitymultiplier 2000
+effect gauntlet_lightning
+count 30
+type spark
+tex 8 15
+color 0xDD0000 0xFD0000
+size 2 5
+alpha 110 228 1024
+originjitter 1 1 1
+velocityjitter 150 150 150
+velocitymultiplier 0.5
+airfriction 2
+stretchfactor 1.5
+effect gauntlet_lightning
+count 50
+type spark
+tex 41 41
+color 0xFD0000 0xF90000
+size 2 3
+alpha 110 228 600
 originjitter 1 1 1
 velocityjitter 350 350 350
 velocitymultiplier 2.5