Fix legacy vaporizer beam effect appearing invisible in free for all gamemodes

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

diff --git a/effectinfo.txt b/effectinfo.txt
index 5942acf285df47ea92e7ce95c3df8951d80393b0..f7ee6975209a7aee47ab373d0df0de66027f3ea0 100644 (file)
--- a/effectinfo.txt
+++ b/effectinfo.txt
@@ -2751,14 +2751,36 @@ effect flac_explode
        velocityjitter 256 256 256
        velocityoffset 0 0 80
 effect tr_bullet
-       type spark
-       alpha 256 256 2560
-       color 0xff8960 0xff8533
-       size 4 4
-       stretchfactor 0.200000
-       tex 70 70
-       trailspacing 750
-       velocitymultiplier 3
+       type beam
+       alpha 500 600 10000
+       color 0xf03000 0xff6010
+       countabsolute 1
+       sizeincrease -3
+       size 0.6 0.8
+       tex 200 200
+effect tr_bullet
+       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
+       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
@@ -3396,6 +3418,30 @@ effect TE_TEI_G3PINK_HIT
        sizeincrease -6
        size 10 10
        trailspacing 40
+effect TE_TEI_G3_HIT
+       type beam
+       alpha 128 128 256
+       color 0xFFFFFF 0xFFFFFF
+       countabsolute 1
+       size 8 8
+       tex 200 200
+effect TE_TEI_G3_HIT
+       type smoke
+       airfriction -4
+       alpha 256 256 512
+       color 0xFFFFFF 0xFFFFFF
+       sizeincrease -2
+       size 2 2
+       trailspacing 20
+       velocityjitter 2 2 2
+effect TE_TEI_G3_HIT
+       type smoke
+       airfriction -4
+       alpha 256 256 512
+       color 0xFFFFFF 0xFFFFFF
+       sizeincrease -6
+       size 10 10
+       trailspacing 40
 effect particlegibs_damage_hit
        type blood
        airfriction 3
@@ -5610,7 +5656,7 @@ effect tr_hagar
        trailspacing 16
        underwater
        velocityjitter 16 16 16
-effect damage_laser
+effect damage_blaster
        type smoke
        airfriction -0.350000
        alpha 128 16 128
@@ -5645,7 +5691,7 @@ effect damage_shotgun
        originjitter 1 1 1
        size 8 16
        tex 0 8
-effect damage_shotgun_alien
+effect alien_damage_shotgun
        type blood
        airfriction 1
        alpha 256 256 64
@@ -5659,7 +5705,7 @@ effect damage_shotgun_alien
        tex 24 32
        velocityjitter 64 64 64
        velocitymultiplier 5
-effect damage_shotgun_alien
+effect alien_damage_shotgun
        type alphastatic
        alpha 100 256 400
        color 0x000000 0x204010
@@ -5667,7 +5713,7 @@ effect damage_shotgun_alien
        originjitter 1 1 1
        size 8 16
        tex 0 8
-effect damage_shotgun_robot
+effect robot_damage_shotgun
        type blood
        airfriction 1
        alpha 256 256 64
@@ -5681,7 +5727,7 @@ effect damage_shotgun_robot
        tex 24 32
        velocityjitter 64 64 64
        velocitymultiplier 5
-effect damage_shotgun_robot
+effect robot_damage_shotgun
        type alphastatic
        alpha 100 256 400
        color 0x000000 0x301860
@@ -5689,7 +5735,7 @@ effect damage_shotgun_robot
        originjitter 1 1 1
        size 8 16
        tex 0 8
-effect damage_uzi
+effect damage_machinegun
        type blood
        airfriction 1
        alpha 256 256 64
@@ -5703,14 +5749,14 @@ effect damage_uzi
        tex 24 32
        velocityjitter 32 32 32
        velocitymultiplier 5
-effect damage_uzi
+effect damage_machinegun
        type alphastatic
        alpha 100 256 400
        color 0x000000 0x420000
        count 1
        size 6 12
        tex 0 8
-effect damage_uzi_alien
+effect alien_damage_machinegun
        type blood
        airfriction 1
        alpha 256 256 64
@@ -5724,14 +5770,14 @@ effect damage_uzi_alien
        tex 24 32
        velocityjitter 32 32 32
        velocitymultiplier 5
-effect damage_uzi_alien
+effect alien_damage_machinegun
        type alphastatic
        alpha 100 256 400
        color 0x000000 0x204010
        count 1
        size 6 12
        tex 0 8
-effect damage_uzi_robot
+effect robot_damage_machinegun
        type blood
        airfriction 1
        alpha 256 256 64
@@ -5745,7 +5791,7 @@ effect damage_uzi_robot
        tex 24 32
        velocityjitter 32 32 32
        velocitymultiplier 5
-effect damage_uzi_robot
+effect robot_damage_machinegun
        type alphastatic
        alpha 100 256 400
        color 0x000000 0x301860
@@ -5776,7 +5822,7 @@ effect damage_minelayer
        size 4 8
        tex 0 8
        velocityjitter 11 11 50
-effect damage_grenadelauncher
+effect damage_mortar
        type smoke
        alpha 512 64 1024
        color 0x8f0d00 0xff5a00
@@ -5788,7 +5834,7 @@ effect damage_grenadelauncher
        size 4 8
        tex 48 55
        velocityjitter 22 22 50
-effect damage_grenadelauncher
+effect damage_mortar
        type alphastatic
        alpha 128 32 128
        color 0x000000 0x111111
@@ -5800,6 +5846,46 @@ effect damage_grenadelauncher
        size 4 8
        tex 0 8
        velocityjitter 11 11 50
+effect damage_arc
+       type static
+       airfriction -0.650000
+       alpha 48 8 48
+       color 0x66ffff 0x2288ff
+       count 2
+       gravity -0.000100
+       liquidfriction 0.600000
+       notunderwater
+       originjitter 2 2 2
+       rotate 180 360 -30 30
+       sizeincrease -14
+       size 4 8
+       tex 47 47
+       velocityjitter 6 6 12
+effect damage_arc
+       type smoke
+       airfriction -0.500000
+       alpha 64 16 64
+       color 0x2244ff 0x002266
+       count 4
+       notunderwater
+       originjitter 3 3 3
+       rotate 0 180 -30 30
+       sizeincrease 10
+       size 3 6
+       tex 0 8
+       velocityjitter 0.3 0.3 0.5
+effect damage_arc
+       type spark
+       airfriction 1
+       alpha 768 64 256
+       bounce 1.500000
+       color 0x003090 0x00CCFF
+       count 0.500000
+       gravity 0.150000
+       liquidfriction 0.600000
+       size 1 1
+       tex 66 68
+       velocityjitter 24 24 24
 effect damage_electro
        type static
        airfriction -0.500000
@@ -5892,7 +5978,7 @@ effect damage_hlac
        size 2 4
        tex 0 8
        velocityjitter 0.4 0.4 0.6
-effect damage_nex
+effect damage_vortex
        type static
        airfriction -0.500000
        alpha 64 8 64
@@ -5906,7 +5992,7 @@ effect damage_nex
        size 5 10
        tex 47 47
        velocityjitter 8 8 16
-effect damage_nex
+effect damage_vortex
        type smoke
        airfriction -0.350000
        alpha 64 16 64
@@ -5918,7 +6004,7 @@ effect damage_nex
        size 4 8
        tex 0 8
        velocityjitter 0.5 0.5 0.8
-effect damage_nex
+effect damage_vortex
        type spark
        airfriction 2
        alpha 255 255 112
@@ -5931,7 +6017,7 @@ effect damage_nex
        tex 41 41
        velocityjitter 100 100 300
        velocitymultiplier 3
-effect damage_minstanex
+effect damage_vaporizer
        type static
        airfriction -0.500000
        alpha 64 8 64
@@ -5945,7 +6031,7 @@ effect damage_minstanex
        size 5 10
        tex 47 47
        velocityjitter 8 8 16
-effect damage_minstanex
+effect damage_vaporizer
        type smoke
        airfriction -0.350000
        alpha 64 16 64
@@ -5957,7 +6043,7 @@ effect damage_minstanex
        size 4 8
        tex 0 8
        velocityjitter 0.5 0.5 0.8
-effect damage_minstanex
+effect damage_vaporizer
        type spark
        airfriction 2
        alpha 255 255 112
@@ -6105,7 +6191,7 @@ effect damage_fireball
        size 4 8
        tex 0 8
        velocityjitter 11 11 50
-effect damage_rocketlauncher
+effect damage_devastator
        type smoke
        alpha 512 64 1024
        color 0x8f0c00 0xff2a00
@@ -6117,7 +6203,7 @@ effect damage_rocketlauncher
        size 5 10
        tex 48 55
        velocityjitter 22 22 30
-effect damage_rocketlauncher
+effect damage_devastator
        type alphastatic
        alpha 128 32 128
        color 0x000000 0x111111
@@ -6366,45 +6452,6 @@ effect blueflag_touch
        tex 40 40
        velocityjitter 300 300 300
        velocitymultiplier 0.500000
-effect yellowflag_touch
-       type spark
-       airfriction 3
-       alpha 0 256 556
-       bounce 1.500000
-       color 0xFFFF0F 0xFFFF0F
-       count 35
-       gravity 1
-       originjitter 1 1 1
-       size 1 3
-       tex 40 40
-       velocityjitter 300 300 300
-       velocitymultiplier 0.500000
-effect pinkflag_touch
-       type spark
-       airfriction 3
-       alpha 0 256 556
-       bounce 1.500000
-       color 0xFF0FFF 0xFF0FFF
-       count 35
-       gravity 1
-       originjitter 1 1 1
-       size 1 3
-       tex 40 40
-       velocityjitter 300 300 300
-       velocitymultiplier 0.500000
-effect neutralflag_touch
-       type spark
-       airfriction 3
-       alpha 0 256 556
-       bounce 1.500000
-       color 0xFFFFFF 0xFFFFFF
-       count 35
-       gravity 1
-       originjitter 1 1 1
-       size 1 3
-       tex 40 40
-       velocityjitter 300 300 300
-       velocitymultiplier 0.500000
 effect red_pass
        type static
        airfriction 5
@@ -6455,81 +6502,6 @@ effect blue_pass
        color 0x0000FF 0x000097
        size 4 4
        trailspacing 12
-effect yellow_pass
-       type static
-       airfriction 5
-       alpha 64 128 64
-       color 0xFFFF0F 0xFFFF0F
-       sizeincrease 2
-       size 2 2
-       tex 32 32
-       trailspacing 64
-effect yellow_pass
-       type static
-       airfriction 9
-       alpha 32 64 32
-       color 0xFFFF0F 0xFFFF0F
-       sizeincrease 8
-       size 1 1
-       tex 0 8
-       trailspacing 12
-       velocityjitter 64 64 64
-effect yellow_pass
-       type static
-       alpha 256 256 1280
-       color 0xFFFF0F 0xFFFF0F
-       size 4 4
-       trailspacing 12
-effect pink_pass
-       type static
-       airfriction 5
-       alpha 64 128 64
-       color 0xFFFFFF 0xFFFFFF
-       sizeincrease 2
-       size 2 2
-       tex 32 32
-       trailspacing 64
-effect pink_pass
-       type static
-       airfriction 9
-       alpha 32 64 32
-       color 0xFFFFFF 0xFFFFFF
-       sizeincrease 8
-       size 1 1
-       tex 0 8
-       trailspacing 12
-       velocityjitter 64 64 64
-effect pink_pass
-       type static
-       alpha 256 256 1280
-       color 0xFFFFFF 0xFFFFFF
-       size 4 4
-       trailspacing 12
-effect neutral_pass
-       type static
-       airfriction 5
-       alpha 64 128 64
-       color 0xFFFFFF 0xFFFFFF
-       sizeincrease 2
-       size 2 2
-       tex 32 32
-       trailspacing 64
-effect neutral_pass
-       type static
-       airfriction 9
-       alpha 32 64 32
-       color 0xFFFFFF 0xFFFFFF
-       sizeincrease 8
-       size 1 1
-       tex 0 8
-       trailspacing 12
-       velocityjitter 64 64 64
-effect neutral_pass
-       type static
-       alpha 256 256 1280
-       color 0xFFFFFF 0xFFFFFF
-       size 4 4
-       trailspacing 12
 effect red_cap
        type spark
        airfriction 2
@@ -6572,48 +6544,6 @@ effect blue_cap
        sizeincrease -80
        size 150 150
        tex 65 65
-effect yellow_cap
-       type spark
-       airfriction 2
-       alpha 0 256 100
-       bounce 1.500000
-       color 0xFFFF0F 0xFFFF0F
-       count 500
-       originjitter 1 1 1
-       size 1 1
-       stretchfactor 0.600000
-       tex 64 64
-       velocityjitter 1000 1000 1500
-       velocitymultiplier 0.500000
-effect yellow_cap
-       type smoke
-       alpha 190 190 180
-       color 0xFFFF0F 0xFFFF0F
-       countabsolute 1
-       sizeincrease -80
-       size 150 150
-       tex 65 65
-effect pink_cap
-       type spark
-       airfriction 2
-       alpha 0 256 100
-       bounce 1.500000
-       color 0xFF0FFF 0xFF0FFF
-       count 500
-       originjitter 1 1 1
-       size 1 1
-       stretchfactor 0.600000
-       tex 64 64
-       velocityjitter 1000 1000 1500
-       velocitymultiplier 0.500000
-effect pink_cap
-       type smoke
-       alpha 190 190 180
-       color 0xFF0FFF 0xFF0FFF
-       countabsolute 1
-       sizeincrease -80
-       size 150 150
-       tex 65 65
 effect spawn_point_red
        type static
        airfriction 0.200000
@@ -7737,6 +7667,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
@@ -7854,6 +7793,162 @@ effect arc_overheat_fire
        velocityjitter 92 92 92
        velocitymultiplier 80
        velocityoffset 0 0 80
+effect yellowflag_touch
+       type spark
+       airfriction 3
+       alpha 0 256 556
+       bounce 1.500000
+       color 0xFFFF0F 0xFFFF0F
+       count 35
+       gravity 1
+       originjitter 1 1 1
+       size 1 3
+       tex 40 40
+       velocityjitter 300 300 300
+       velocitymultiplier 0.500000
+effect pinkflag_touch
+       type spark
+       airfriction 3
+       alpha 0 256 556
+       bounce 1.500000
+       color 0xFF0FFF 0xFF0FFF
+       count 35
+       gravity 1
+       originjitter 1 1 1
+       size 1 3
+       tex 40 40
+       velocityjitter 300 300 300
+       velocitymultiplier 0.500000
+effect neutralflag_touch
+       type spark
+       airfriction 3
+       alpha 0 256 556
+       bounce 1.500000
+       color 0xFFFFFF 0xFFFFFF
+       count 35
+       gravity 1
+       originjitter 1 1 1
+       size 1 3
+       tex 40 40
+       velocityjitter 300 300 300
+       velocitymultiplier 0.500000
+effect yellow_pass
+       type static
+       airfriction 5
+       alpha 64 128 64
+       color 0xFFFF0F 0xFFFF0F
+       sizeincrease 2
+       size 2 2
+       tex 32 32
+       trailspacing 64
+effect yellow_pass
+       type static
+       airfriction 9
+       alpha 32 64 32
+       color 0xFFFF0F 0xFFFF0F
+       sizeincrease 8
+       size 1 1
+       tex 0 8
+       trailspacing 12
+       velocityjitter 64 64 64
+effect yellow_pass
+       type static
+       alpha 256 256 1280
+       color 0xFFFF0F 0xFFFF0F
+       size 4 4
+       trailspacing 12
+effect pink_pass
+       type static
+       airfriction 5
+       alpha 64 128 64
+       color 0xFFFFFF 0xFFFFFF
+       sizeincrease 2
+       size 2 2
+       tex 32 32
+       trailspacing 64
+effect pink_pass
+       type static
+       airfriction 9
+       alpha 32 64 32
+       color 0xFFFFFF 0xFFFFFF
+       sizeincrease 8
+       size 1 1
+       tex 0 8
+       trailspacing 12
+       velocityjitter 64 64 64
+effect pink_pass
+       type static
+       alpha 256 256 1280
+       color 0xFFFFFF 0xFFFFFF
+       size 4 4
+       trailspacing 12
+effect neutral_pass
+       type static
+       airfriction 5
+       alpha 64 128 64
+       color 0xFFFFFF 0xFFFFFF
+       sizeincrease 2
+       size 2 2
+       tex 32 32
+       trailspacing 64
+effect neutral_pass
+       type static
+       airfriction 9
+       alpha 32 64 32
+       color 0xFFFFFF 0xFFFFFF
+       sizeincrease 8
+       size 1 1
+       tex 0 8
+       trailspacing 12
+       velocityjitter 64 64 64
+effect neutral_pass
+       type static
+       alpha 256 256 1280
+       color 0xFFFFFF 0xFFFFFF
+       size 4 4
+       trailspacing 12
+effect yellow_cap
+       type spark
+       airfriction 2
+       alpha 0 256 100
+       bounce 1.500000
+       color 0xFFFF0F 0xFFFF0F
+       count 500
+       originjitter 1 1 1
+       size 1 1
+       stretchfactor 0.600000
+       tex 64 64
+       velocityjitter 1000 1000 1500
+       velocitymultiplier 0.500000
+effect yellow_cap
+       type smoke
+       alpha 190 190 180
+       color 0xFFFF0F 0xFFFF0F
+       countabsolute 1
+       sizeincrease -80
+       size 150 150
+       tex 65 65
+effect pink_cap
+       type spark
+       airfriction 2
+       alpha 0 256 100
+       bounce 1.500000
+       color 0xFF0FFF 0xFF0FFF
+       count 500
+       originjitter 1 1 1
+       size 1 1
+       stretchfactor 0.600000
+       tex 64 64
+       velocityjitter 1000 1000 1500
+       velocitymultiplier 0.500000
+effect pink_cap
+       type smoke
+       alpha 190 190 180
+       color 0xFF0FFF 0xFF0FFF
+       countabsolute 1
+       sizeincrease -80
+       size 150 150
+       tex 65 65
 effect relic_resistance
        type static
        airfriction 0.200000
@@ -8161,3 +8256,126 @@ 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
+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