Merge branch 'master' into Mario/ctf_updates

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

diff --git a/effectinfo.txt b/effectinfo.txt
index 63d80888653cb105ad63b72d61d2c409d8fffb28..334fe7ac9e8d2029e72ad1504ae27d79d6e4c69a 100644 (file)
--- a/effectinfo.txt
+++ b/effectinfo.txt
@@ -7669,6 +7669,54 @@ velocityjitter 300 300 300
 velocitymultiplier 0.5
 airfriction 3
 
+// yellowflag_touch -- effects for touching the yellow flag
+// used nowhere in code
+effect yellowflag_touch
+count 35
+type spark
+tex 40 40
+color 0xFFFF0F 0xFFFF0F
+size 1 3
+alpha 0 256 556
+gravity 1
+bounce 1.5
+originjitter 1 1 1
+velocityjitter 300 300 300
+velocitymultiplier 0.5
+airfriction 3
+
+// pinkflag_touch -- effects for touching the pink flag
+// used nowhere in code
+effect pinkflag_touch
+count 35
+type spark
+tex 40 40
+color 0xFF0FFF 0xFF0FFF
+size 1 3
+alpha 0 256 556
+gravity 1
+bounce 1.5
+originjitter 1 1 1
+velocityjitter 300 300 300
+velocitymultiplier 0.5
+airfriction 3
+
+// neutralflag_touch -- effects for touching the neutral flag
+// used nowhere in code
+effect neutralflag_touch
+count 35
+type spark
+tex 40 40
+color 0xFFFFFF 0xFFFFFF
+size 1 3
+alpha 0 256 556
+gravity 1
+bounce 1.5
+originjitter 1 1 1
+velocityjitter 300 300 300
+velocitymultiplier 0.5
+airfriction 3
+
 // red_pass
 // used nowhere in code
 effect red_pass
@@ -7727,6 +7775,93 @@ size 4 4
 alpha 256 256 1280
 type static
 
+// yellow_pass
+// used nowhere in code
+effect yellow_pass
+trailspacing 64
+color 0xFFFF0F 0xFFFF0F
+size 2 2
+tex 32 32
+alpha 64 128 64
+airfriction 5
+sizeincrease 2
+type static
+effect yellow_pass
+trailspacing 12
+color 0xFFFF0F 0xFFFF0F
+size 1 1
+tex 0 8
+alpha 32 64 32
+airfriction 9
+sizeincrease 8
+velocityjitter 64 64 64
+type static
+effect yellow_pass
+trailspacing 12
+color 0xFFFF0F 0xFFFF0F
+size 4 4
+//tex 48 55
+alpha 256 256 1280
+type static
+
+// pink_pass
+// used nowhere in code
+effect pink_pass
+trailspacing 64
+color 0xFFFFFF 0xFFFFFF
+size 2 2
+tex 32 32
+alpha 64 128 64
+airfriction 5
+sizeincrease 2
+type static
+effect pink_pass
+trailspacing 12
+color 0xFFFFFF 0xFFFFFF
+size 1 1
+tex 0 8
+alpha 32 64 32
+airfriction 9
+sizeincrease 8
+velocityjitter 64 64 64
+type static
+effect pink_pass
+trailspacing 12
+color 0xFFFFFF 0xFFFFFF
+size 4 4
+//tex 48 55
+alpha 256 256 1280
+type static
+
+// neutral_pass
+// used nowhere in code
+effect neutral_pass
+trailspacing 64
+color 0xFFFFFF 0xFFFFFF
+size 2 2
+tex 32 32
+alpha 64 128 64
+airfriction 5
+sizeincrease 2
+type static
+effect neutral_pass
+trailspacing 12
+color 0xFFFFFF 0xFFFFFF
+size 1 1
+tex 0 8
+alpha 32 64 32
+airfriction 9
+sizeincrease 8
+velocityjitter 64 64 64
+type static
+effect neutral_pass
+trailspacing 12
+color 0xFFFFFF 0xFFFFFF
+size 4 4
+//tex 48 55
+alpha 256 256 1280
+type static
+
 // red_cap -- red team capture effect
 effect red_cap
 count 500
@@ -7777,6 +7912,56 @@ alpha 190 190 180
 sizeincrease -80
 color 0x0000FF 0x000097
 
+// yellow_cap -- yellow team capture effect
+effect yellow_cap
+count 500
+type spark
+tex 64 64
+color 0xFFFF0F 0xFFFF0F
+size 1 1
+alpha 0 256 100
+stretchfactor 2
+//gravity 1
+bounce 1.5
+originjitter 1 1 1
+velocityjitter 1000 1000 1500
+velocitymultiplier 0.5
+airfriction 2
+stretchfactor 0.6
+effect yellow_cap
+countabsolute 1
+type smoke
+tex 65 65
+size 150 150
+alpha 190 190 180
+sizeincrease -80
+color 0xFFFF0F 0xFFFF0F
+
+// pink_cap -- pink team capture effect
+effect pink_cap
+count 500
+type spark
+tex 64 64
+color 0xFF0FFF 0xFF0FFF
+size 1 1
+alpha 0 256 100
+stretchfactor 2
+//gravity 1
+bounce 1.5
+originjitter 1 1 1
+velocityjitter 1000 1000 1500
+velocitymultiplier 0.5
+airfriction 2
+stretchfactor 0.6
+effect pink_cap
+countabsolute 1
+type smoke
+tex 65 65
+size 150 150
+alpha 190 190 180
+sizeincrease -80
+color 0xFF0FFF 0xFF0FFF
+
 // spawn_point_red -- red team idle spawn point effect
 effect spawn_point_red
 count 37.5
@@ -8110,7 +8295,7 @@ bounce 1.5
 liquidfriction 4
 velocityjitter 16 16 16
 
-effect nade
+effect nade_neutral
 trailspacing 1
 type smoke
 color 0xFFFFFF 0xFFFFFF
@@ -8120,7 +8305,7 @@ sizeincrease -1
 alpha 100 100 250
 //gravity -0.11
 // fire
-effect nade
+effect nade_neutral
 notunderwater
 trailspacing 8
 type smoke
@@ -8130,7 +8315,7 @@ size 15 25
 sizeincrease -10
 alpha 30 30 150
 // bubbles
-effect nade
+effect nade_neutral
 underwater
 trailspacing 16
 type bubble
@@ -8307,7 +8492,7 @@ tex 33 33
 size 25 25
 sizeincrease -30
 
-effect nade_burn
+effect nade_neutral_burn
 trailspacing 1
 type smoke
 color 0xFFFFFF 0xFFFFFF
@@ -8317,7 +8502,7 @@ sizeincrease -1
 alpha 100 100 250
 //gravity -0.11
 // fire
-effect nade_burn
+effect nade_neutral_burn
 notunderwater
 trailspacing 64
 type smoke
@@ -8327,7 +8512,7 @@ size 45 25
 sizeincrease -30
 alpha 200 200 1000
 // bubbles
-effect nade_burn
+effect nade_neutral_burn
 underwater
 trailspacing 16
 type bubble
@@ -8339,7 +8524,7 @@ gravity -0.125
 bounce 1.5
 liquidfriction 4
 velocityjitter 16 16 16
-effect nade_burn
+effect nade_neutral_burn
 trailspacing 16
 type smoke
 color 0xFFFFFF 0xFFFFFF
@@ -8829,7 +9014,7 @@ originjitter 64 64 64
 velocityjitter 324 324 324
 rotate -180 180 -100 100
 
-effect nade_explode
+effect nade_neutral_explode
 countabsolute 1
 type decal
 tex 8 16
@@ -8840,7 +9025,7 @@ lightradius 300
 lightradiusfade 1500
 lightcolor 100 20 20
 // shockwave
-effect nade_explode
+effect nade_neutral_explode
 type smoke
 countabsolute 1
 tex 33 33
@@ -8850,7 +9035,7 @@ color 0xff0000 0xffa2a2
 alpha 80 80 650
 velocitymultiplier 44
 // fire
-effect nade_explode
+effect nade_neutral_explode
 notunderwater
 count 16
 type smoke
@@ -8864,7 +9049,7 @@ originjitter 50 50 50
 velocityjitter 320 320 320
 rotate -180 180 -9 9
 // fire stretched
-effect nade_explode
+effect nade_neutral_explode
 count 8
 type spark
 tex 48 55
@@ -8876,7 +9061,7 @@ sizeincrease 40
 velocityjitter 30 30 30
 airfriction -9
 //smoke
-effect nade_explode
+effect nade_neutral_explode
 type smoke
 count 32
 blend alpha
@@ -8892,7 +9077,7 @@ sizeincrease 50
 airfriction 0.04
 gravity 0.4
 // underwater bubbles
-effect nade_explode
+effect nade_neutral_explode
 underwater
 count 32
 type bubble
@@ -8907,7 +9092,7 @@ originjitter 16 16 16
 velocityjitter 196 196 196
 rotate 0 0 0 0
 // bouncing sparks
-effect nade_explode
+effect nade_neutral_explode
 notunderwater
 count 8
 type spark
@@ -8923,7 +9108,7 @@ velocityoffset 0 0 80
 originjitter 16 16 16
 velocityjitter 424 424 624
 // notbouncing sparks
-effect nade_explode
+effect nade_neutral_explode
 count 16
 type spark
 tex 40 40
@@ -8937,7 +9122,7 @@ velocityoffset 0 0 80
 originjitter 16 16 16
 velocityjitter 424 424 624
 // debris
-effect nade_explode
+effect nade_neutral_explode
 notunderwater
 count 8
 type smoke
@@ -9041,15 +9226,6 @@ effect arc_lightning // impact sparks (underwater)
        airfriction 5
        liquidfriction 5
 
-effect arc_beam // beam core
-       type beam
-       countabsolute 1
-       tex 200 200
-       color 0xFFFFFF 0xFFFFFF
-       size 4 4
-       alpha 512 512 0
-       time 0.005 0.005
-
 effect arc_beam // sparks on beam
        type spark
        stretchfactor 1