Merge branch 'martin-t/bullet-trails' into 'master'

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

diff --git a/effectinfo.txt b/effectinfo.txt
index 953526145a7ac787de69364c8ee039b579ffd15a..c07774a05b99473c12eb20e5f9de754fc87f895c 100644 (file)
--- a/effectinfo.txt
+++ b/effectinfo.txt
@@ -2769,6 +2769,18 @@ effect tr_bullet
        tex 0 8
        trailspacing 16
        velocityjitter 4 4 4
+effect tr_bullet
+       type bubble
+       alpha 256 256 128
+       bounce 1.500000
+       color 0x404040 0x808080
+       gravity -0.125000
+       liquidfriction 4
+       size 0.5 0.6
+       tex 62 62
+       trailspacing 16
+       underwater
+       velocityjitter 16 16 16
 effect smoking_smallemitter
        type alphastatic
        airfriction -1
@@ -8272,3 +8284,34 @@ effect arc_bolt_explode
        tex 40 40
        velocityjitter 224 224 224
        velocityoffset 0 0 80
+effect tr_bullet_weak
+       type beam
+       alpha 75 100 3000
+       color 0xf03000 0xff6010
+       countabsolute 1
+       sizeincrease -3
+       size 0.6 0.8
+       tex 200 200
+effect tr_bullet_weak
+       type smoke
+       airfriction -4
+       alpha 256 256 350
+       color 0x202020 0x404040
+       notunderwater
+       sizeincrease 0.400000
+       size 1 2
+       tex 0 8
+       trailspacing 16
+       velocityjitter 4 4 4
+effect tr_bullet_weak
+       type bubble
+       alpha 256 256 128
+       bounce 1.500000
+       color 0x404040 0x808080
+       gravity -0.125000
+       liquidfriction 4
+       size 0.5 0.6
+       tex 62 62
+       trailspacing 32
+       underwater
+       velocityjitter 16 16 16