Merge remote-tracking branch 'origin/master' into morosophos/rankings_cnt

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

diff --git a/effectinfo.txt b/effectinfo.txt
index 4ba0766fbada789523c07289203696b734fb7208..128169c502911d760c7de4707850887c805f6284 100644 (file)
--- a/effectinfo.txt
+++ b/effectinfo.txt
@@ -7581,6 +7581,15 @@ effect arc_lightning
        underwater
        velocityjitter 250 250 250
        velocitymultiplier 20
+effect arc_lightning
+       type smoke
+       alpha 40 40 350
+       color 0x80C0FF 0x80C0FF
+       countabsolute 1
+       sizeincrease 400
+       size 4 4
+       tex 38 38
+       velocitymultiplier 100
 effect arc_beam
        type spark
        airfriction -10
@@ -8161,3 +8170,95 @@ effect rocketminsta_laser_neutral
        trailspacing 12
        velocityjitter 50 50 50
        velocityoffset 0 0 15
+effect arc_muzzleflash
+       type smoke
+       alpha 256 256 512
+       color 0x00ff00 0x8f4333
+       count 2
+       lightcolor 0.3 2 0.2
+       lightradiusfade 2000
+       lightradius 200
+       originjitter 1.5 1.5 1.5
+       size 5 5
+       tex 0 8
+       velocityjitter 6 6 6
+       velocitymultiplier 0.010000
+effect arc_muzzleflash
+       type spark
+       airfriction 12
+       alpha 0 128 1024
+       color 0x00ff00 0x8f4333
+       count 15
+       originjitter 1 1 1
+       rotate -180 180 -400 400
+       size 5 10
+       stretchfactor 2
+       tex 48 55
+       velocityjitter 200 200 200
+       velocitymultiplier 0.500000
+effect arc_bolt_explode
+       type decal
+       alpha 256 256 0
+       countabsolute 1
+       lightcolor 8 4 1
+       lightradiusfade 400
+       lightradius 120
+       originjitter 14 14 14
+       size 28 38
+       tex 8 16
+effect arc_bolt_explode
+       type smoke
+       airfriction 8
+       alpha 80 200 356
+       bounce 1.500000
+       color 0x00ffff 0x00ffff
+       count 3.500000
+       liquidfriction 8
+       notunderwater
+       originjitter 8 8 8
+       sizeincrease 5
+       size 16 26
+       tex 48 55
+       velocityjitter 156 156 156
+effect arc_bolt_explode
+       type static
+       airfriction 12
+       alpha 128 256 456
+       bounce 1.500000
+       color 0x00ff00 0x8f4333
+       count 12
+       liquidfriction 8
+       notunderwater
+       originjitter 8 8 8
+       sizeincrease 15
+       size 20 26
+       tex 48 55
+       velocityjitter 286 286 286
+effect arc_bolt_explode
+       type bubble
+       alpha 128 256 64
+       bounce 1.500000
+       color 0x404040 0x808080
+       count 16
+       gravity -0.125000
+       liquidfriction 0.250000
+       originjitter 16 16 16
+       size 3 3
+       tex 62 62
+       underwater
+       velocityjitter 96 96 96
+effect arc_bolt_explode
+       type spark
+       airfriction 1
+       alpha 644 956 684
+       bounce 1.600000
+       color 0x00ff00 0x8f4333
+       count 16
+       gravity 1
+       liquidfriction 0.800000
+       notunderwater
+       originjitter 16 16 16
+       size 1 0.100000
+       tex 40 40
+       velocityjitter 224 224 224
+       velocityoffset 0 0 80