Merge remote branch 'origin/master' into fruitiex/fruitbalance

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

diff --git a/effectinfo.txt b/effectinfo.txt
index dddf34c8883ee105c6117a7550224eb86af4ad7f..4116ae438241bf98c1d92ae2002bd69999262615 100644 (file)
--- a/effectinfo.txt
+++ b/effectinfo.txt
@@ -4988,7 +4988,45 @@ lightcolor 3.125 4.375 10
 effect electro_lightning
 count 300
 type spark
-color 0x283880 0x283880 // 0x202020 0x404040
+color 0x501860 0x501860 // 0x202020 0x404040
+tex 65 65
+size 6 6
+alpha 100 206 1724
+originjitter 1.5 1.5 1.5
+velocityjitter 6 6 6
+sizeincrease 10
+velocitymultiplier 2000
+effect electro_lightning
+count 30
+type spark
+tex 8 15
+color 0xDDFDFF 0xFDFDFF
+size 2 5
+alpha 110 170 1500
+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 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
@@ -4996,25 +5034,25 @@ originjitter 1.5 1.5 1.5
 velocityjitter 6 6 6
 sizeincrease 15
 velocitymultiplier 2000
-effect electro_lightning
+effect gauntlet_lightning
 count 30
 type spark
 tex 8 15
-color 0xD9FDFF 0xD9FDFF
-size 3 7
-alpha 110 228 2024
+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 electro_lightning
+effect gauntlet_lightning
 count 50
 type spark
 tex 41 41
-color 0xD9FDFF 0xD9FDFF
-size 3 4
-alpha 110 228 1500
+color 0xFD0000 0xF90000
+size 2 3
+alpha 110 228 600
 originjitter 1 1 1
 velocityjitter 350 350 350
 velocitymultiplier 2.5