Effectinfo: temporary order fix

diff --git a/effectinfo.txt b/effectinfo.txt
index 5942acf285df47ea92e7ce95c3df8951d80393b0..4ba0766fbada789523c07289203696b734fb7208 100644 (file)
--- a/effectinfo.txt
+++ b/effectinfo.txt
@@ -6366,45 +6366,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 +6416,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 +6458,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
@@ -7854,6 +7698,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