Merge remote branch 'origin/fruitiex/space-elevator'

diff --git a/maps/space-elevator.map b/maps/space-elevator.map
index 47db21048ffe4f2a51bb32f01896612008454611..252562ff0cdab814f9bfe7a77f3eb1479499d097 100644 (file)
--- a/maps/space-elevator.map
+++ b/maps/space-elevator.map
@@ -4457,7 +4457,7 @@ map_space-elevator/beam-purple
 ( 32 -3584 -48 ) ( -32 -3584 -48 ) ( 32 -3584 -80 ) exx/floor-wrn01-red 0 0 0 0.25 0.25 0 0 0
 ( 32 -3488 -48 ) ( 32 -3488 -80 ) ( 32 -3616 -48 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -32 -3616 -128 ) ( 32 -3616 -128 ) ( -32 -3488 -128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -32 -3616 -80 ) ( -32 -3616 -48 ) ( 32 -3616 -80 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( -32 -3616 -80 ) ( -32 -3616 -48 ) ( 32 -3616 -80 ) effects_warpzone/warpzone_backdrop 0 0 0 0.25 0.25 0 0 0
 ( -32 -3616 -80 ) ( -32 -3488 -80 ) ( -32 -3616 -48 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -64 -3632 -112 ) ( -64 -3616 -112 ) ( 64 -3632 -112 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
@@ -4502,7 +4502,7 @@ map_space-elevator/beam-purple
 ( 32 -3632 0 ) ( 32 -3600 -128 ) ( 32 -3600 0 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 64 -3600 -128 ) ( 32 -3632 -128 ) ( 64 -3632 -128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 64 -3632 0 ) ( 64 -3600 -128 ) ( 64 -3632 -128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 32 -3616 0 ) ( 64 -3648 -128 ) ( 32 -3616 -128 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( 32 -3616 0 ) ( 64 -3648 -128 ) ( 32 -3616 -128 ) effects_warpzone/warpzone_backdrop 0 0 0 0.25 0.25 0 0 0
 ( -64 -3632 -112 ) ( -64 -3616 -112 ) ( 64 -3632 -112 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
@@ -4510,7 +4510,7 @@ map_space-elevator/beam-purple
 ( -32 -3600 0 ) ( -32 -3600 -128 ) ( -32 -3632 0 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -64 -3632 -128 ) ( -32 -3632 -128 ) ( -64 -3600 -128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -64 -3632 -128 ) ( -64 -3600 -128 ) ( -64 -3632 0 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -32 -3616 -128 ) ( -64 -3648 -128 ) ( -32 -3616 0 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( -32 -3616 -128 ) ( -64 -3648 -128 ) ( -32 -3616 0 ) effects_warpzone/warpzone_backdrop 0 0 0 0.25 0.25 0 0 0
 ( -64 -3632 -112 ) ( -64 -3616 -112 ) ( 64 -3632 -112 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
@@ -4518,7 +4518,7 @@ map_space-elevator/beam-purple
 ( 32 -3632 64 ) ( 32 -3600 -64 ) ( 32 -3600 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 64 -3600 -64 ) ( 32 -3632 -64 ) ( 64 -3632 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 64 -3632 64 ) ( 64 -3600 -64 ) ( 64 -3632 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 32 -3616 64 ) ( 64 -3648 -64 ) ( 32 -3616 -64 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( 32 -3616 64 ) ( 64 -3648 -64 ) ( 32 -3616 -64 ) effects_warpzone/warpzone_backdrop 0 0 0 0.25 0.25 0 0 0
 ( 32 64 0 ) ( 48 64 -16 ) ( 32 -64 0 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
@@ -4540,7 +4540,7 @@ map_space-elevator/beam-purple
 ( 32 -3584 16 ) ( -32 -3584 16 ) ( 32 -3584 -16 ) proceduralx/wall-fruitconcrete 0 0 0 0.25 0.25 0 0 0
 ( 32 -3488 16 ) ( 32 -3488 -16 ) ( 32 -3616 16 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -32 -3616 -64 ) ( 32 -3616 -64 ) ( -32 -3488 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -32 -3616 -16 ) ( -32 -3616 16 ) ( 32 -3616 -16 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( -32 -3616 -16 ) ( -32 -3616 16 ) ( 32 -3616 -16 ) effects_warpzone/warpzone_backdrop 0 0 0 0.25 0.25 0 0 0
 ( -32 -3616 -16 ) ( -32 -3488 -16 ) ( -32 -3616 16 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -64 -3632 0 ) ( -64 -3616 0 ) ( 64 -3632 0 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
@@ -12991,7 +12991,7 @@ trak5x/base-pipe1b
 }
 {
 ( 72 -3840 656 ) ( 72 -3856 656 ) ( -56 -3840 656 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
-( 64 -3840 624 ) ( -64 -3840 624 ) ( 64 -3840 512 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( 64 -3840 624 ) ( -64 -3840 624 ) ( 64 -3840 512 ) effects_warpzone/warpzone_backdrop 0 0 0 0.25 0.25 0 0 0
 ( 64 -3840 624 ) ( 64 -3840 512 ) ( 64 -3856 624 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
 ( -64 -3856 512 ) ( 64 -3856 512 ) ( -64 -3840 512 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
 ( -64 -3842 512 ) ( -64 -3842 624 ) ( 64 -3842 512 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
@@ -13099,14 +13099,14 @@ trak5x/base-pipe1b
 ( -32 -3600 64 ) ( -32 -3600 -64 ) ( -32 -3632 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -64 -3632 -64 ) ( -32 -3632 -64 ) ( -64 -3600 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -64 -3632 -64 ) ( -64 -3600 -64 ) ( -64 -3632 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -32 -3616 -64 ) ( -64 -3648 -64 ) ( -32 -3616 64 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( -32 -3616 -64 ) ( -64 -3648 -64 ) ( -32 -3616 64 ) effects_warpzone/warpzone_backdrop 0 0 0 0.25 0.25 0 0 0
 ( -32 -64 0 ) ( -48 64 -16 ) ( -32 64 0 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
 ( 32 -3488 -64 ) ( 32 -3616 -64 ) ( -32 -3488 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 32 -3584 -48 ) ( -32 -3584 -48 ) ( 32 -3584 -80 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
 ( 32 -3488 -48 ) ( 32 -3488 -80 ) ( 32 -3616 -48 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -32 -3616 -80 ) ( -32 -3616 -48 ) ( 32 -3616 -80 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( -32 -3616 -80 ) ( -32 -3616 -48 ) ( 32 -3616 -80 ) effects_warpzone/warpzone_backdrop 0 0 0 0.25 0.25 0 0 0
 ( -32 -3616 -80 ) ( -32 -3488 -80 ) ( -32 -3616 -48 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 64 -3632 -112 ) ( -64 -3616 -112 ) ( -64 -3632 -112 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
@@ -13115,7 +13115,7 @@ trak5x/base-pipe1b
 ( 32 -3584 -128 ) ( 64 -3584 0 ) ( 32 -3584 0 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
 ( 32 -3632 0 ) ( 32 -3600 -128 ) ( 32 -3600 0 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 64 -3632 0 ) ( 64 -3600 -128 ) ( 64 -3632 -128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 32 -3616 0 ) ( 64 -3648 -128 ) ( 32 -3616 -128 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( 32 -3616 0 ) ( 64 -3648 -128 ) ( 32 -3616 -128 ) effects_warpzone/warpzone_backdrop 0 0 0 0.25 0.25 0 0 0
 ( 64 -3632 -112 ) ( -64 -3616 -112 ) ( -64 -3632 -112 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
@@ -13123,7 +13123,7 @@ trak5x/base-pipe1b
 ( -32 -3584 0 ) ( -64 -3584 0 ) ( -32 -3584 -128 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
 ( -32 -3600 0 ) ( -32 -3600 -128 ) ( -32 -3632 0 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -64 -3632 -128 ) ( -64 -3600 -128 ) ( -64 -3632 0 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -32 -3616 -128 ) ( -64 -3648 -128 ) ( -32 -3616 0 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( -32 -3616 -128 ) ( -64 -3648 -128 ) ( -32 -3616 0 ) effects_warpzone/warpzone_backdrop 0 0 0 0.25 0.25 0 0 0
 ( 64 -3632 -112 ) ( -64 -3616 -112 ) ( -64 -3632 -112 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
@@ -18722,7 +18722,7 @@ proceduralx/wall-fruitconcrete
 ( -32 3584 -48 ) ( 32 3584 -48 ) ( -32 3584 -80 ) exx/floor-wrn01-blue 0 0 0 -0.25 0.25 0 0 0
 ( -32 3488 -48 ) ( -32 3488 -80 ) ( -32 3616 -48 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( 32 3616 -128 ) ( -32 3616 -128 ) ( 32 3488 -128 ) common/caulk 256 -0 180 0.25 0.25 0 0 0
-( 32 3616 -80 ) ( 32 3616 -48 ) ( -32 3616 -80 ) exx/base-metal03 0 0 0 -0.25 0.25 0 0 0
+( 32 3616 -80 ) ( 32 3616 -48 ) ( -32 3616 -80 ) effects_warpzone/warpzone_backdrop 0 0 0 -0.25 0.25 0 0 0
 ( 32 3616 -80 ) ( 32 3488 -80 ) ( 32 3616 -48 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( 64 3632 -112 ) ( 64 3616 -112 ) ( -64 3632 -112 ) common/caulk 256 -0 180 0.25 0.25 0 0 0
 }
@@ -18767,7 +18767,7 @@ proceduralx/wall-fruitconcrete
 ( -32 3632 0 ) ( -32 3600 -128 ) ( -32 3600 0 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( -64 3600 -128 ) ( -32 3632 -128 ) ( -64 3632 -128 ) common/caulk 256 -0 180 0.25 0.25 0 0 0
 ( -64 3632 0 ) ( -64 3600 -128 ) ( -64 3632 -128 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-( -32 3616 0 ) ( -64 3648 -128 ) ( -32 3616 -128 ) exx/base-metal03 0 0 0 -0.25 0.25 0 0 0
+( -32 3616 0 ) ( -64 3648 -128 ) ( -32 3616 -128 ) effects_warpzone/warpzone_backdrop 0 0 0 -0.25 0.25 0 0 0
 ( 64 3632 -112 ) ( 64 3616 -112 ) ( -64 3632 -112 ) common/caulk 256 -0 180 0.25 0.25 0 0 0
 }
 {
@@ -18775,7 +18775,7 @@ proceduralx/wall-fruitconcrete
 ( 32 3600 0 ) ( 32 3600 -128 ) ( 32 3632 0 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( 64 3632 -128 ) ( 32 3632 -128 ) ( 64 3600 -128 ) common/caulk 256 -0 180 0.25 0.25 0 0 0
 ( 64 3632 -128 ) ( 64 3600 -128 ) ( 64 3632 0 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-( 32 3616 -128 ) ( 64 3648 -128 ) ( 32 3616 0 ) exx/base-metal03 0 0 0 -0.25 0.25 0 0 0
+( 32 3616 -128 ) ( 64 3648 -128 ) ( 32 3616 0 ) effects_warpzone/warpzone_backdrop 0 0 0 -0.25 0.25 0 0 0
 ( 64 3632 -112 ) ( 64 3616 -112 ) ( -64 3632 -112 ) common/caulk 256 -0 180 0.25 0.25 0 0 0
 }
 {
@@ -18783,7 +18783,7 @@ proceduralx/wall-fruitconcrete
 ( -32 3632 64 ) ( -32 3600 -64 ) ( -32 3600 64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( -64 3600 -64 ) ( -32 3632 -64 ) ( -64 3632 -64 ) common/caulk 256 -0 180 0.25 0.25 0 0 0
 ( -64 3632 64 ) ( -64 3600 -64 ) ( -64 3632 -64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-( -32 3616 64 ) ( -64 3648 -64 ) ( -32 3616 -64 ) exx/base-metal03 0 0 0 -0.25 0.25 0 0 0
+( -32 3616 64 ) ( -64 3648 -64 ) ( -32 3616 -64 ) effects_warpzone/warpzone_backdrop 0 0 0 -0.25 0.25 0 0 0
 ( -32 -64 0 ) ( -48 -64 -16 ) ( -32 64 0 ) common/caulk 256 -0 180 0.25 0.25 0 0 0
 }
 {
@@ -18805,7 +18805,7 @@ proceduralx/wall-fruitconcrete
 ( -32 3584 16 ) ( 32 3584 16 ) ( -32 3584 -16 ) proceduralx/wall-fruitconcrete 0 0 0 -0.25 0.25 0 0 0
 ( -32 3488 16 ) ( -32 3488 -16 ) ( -32 3616 16 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( 32 3616 -64 ) ( -32 3616 -64 ) ( 32 3488 -64 ) common/caulk 256 -0 180 0.25 0.25 0 0 0
-( 32 3616 -16 ) ( 32 3616 16 ) ( -32 3616 -16 ) exx/base-metal03 0 0 0 -0.25 0.25 0 0 0
+( 32 3616 -16 ) ( 32 3616 16 ) ( -32 3616 -16 ) effects_warpzone/warpzone_backdrop 0 0 0 -0.25 0.25 0 0 0
 ( 32 3616 -16 ) ( 32 3488 -16 ) ( 32 3616 16 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( 64 3632 0 ) ( 64 3616 0 ) ( -64 3632 0 ) common/caulk 256 -0 180 0.25 0.25 0 0 0
 }
@@ -27267,7 +27267,7 @@ trak5x/base-pipe1c
 }
 {
 ( -72 3840 656 ) ( -72 3856 656 ) ( 56 3840 656 ) exx/base-metal03 512 -0 180 0.25 0.25 0 0 0
-( -64 3840 624 ) ( 64 3840 624 ) ( -64 3840 512 ) exx/base-metal03 0 0 0 -0.25 0.25 0 0 0
+( -64 3840 624 ) ( 64 3840 624 ) ( -64 3840 512 ) effects_warpzone/warpzone_backdrop 0 0 0 -0.25 0.25 0 0 0
 ( -64 3840 624 ) ( -64 3840 512 ) ( -64 3856 624 ) exx/base-metal03 0 0 0 -0.25 0.25 0 0 0
 ( 64 3856 512 ) ( -64 3856 512 ) ( 64 3840 512 ) exx/base-metal03 512 -0 180 0.25 0.25 0 0 0
 ( 64 3842 512 ) ( 64 3842 624 ) ( -64 3842 512 ) exx/base-metal03 0 0 0 -0.25 0.25 0 0 0
@@ -27375,14 +27375,14 @@ trak5x/base-pipe1c
 ( 32 3600 64 ) ( 32 3600 -64 ) ( 32 3632 64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( 64 3632 -64 ) ( 32 3632 -64 ) ( 64 3600 -64 ) common/caulk 256 -0 180 0.25 0.25 0 0 0
 ( 64 3632 -64 ) ( 64 3600 -64 ) ( 64 3632 64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-( 32 3616 -64 ) ( 64 3648 -64 ) ( 32 3616 64 ) exx/base-metal03 0 0 0 -0.25 0.25 0 0 0
+( 32 3616 -64 ) ( 64 3648 -64 ) ( 32 3616 64 ) effects_warpzone/warpzone_backdrop 0 0 0 -0.25 0.25 0 0 0
 ( 32 64 0 ) ( 48 -64 -16 ) ( 32 -64 0 ) common/caulk 256 -0 180 0.25 0.25 0 0 0
 }
 {
 ( -32 3488 -64 ) ( -32 3616 -64 ) ( 32 3488 -64 ) common/caulk 256 -0 180 0.25 0.25 0 0 0
 ( -32 3584 -48 ) ( 32 3584 -48 ) ( -32 3584 -80 ) exx/base-metal03 0 0 0 -0.25 0.25 0 0 0
 ( -32 3488 -48 ) ( -32 3488 -80 ) ( -32 3616 -48 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-( 32 3616 -80 ) ( 32 3616 -48 ) ( -32 3616 -80 ) exx/base-metal03 0 0 0 -0.25 0.25 0 0 0
+( 32 3616 -80 ) ( 32 3616 -48 ) ( -32 3616 -80 ) effects_warpzone/warpzone_backdrop 0 0 0 -0.25 0.25 0 0 0
 ( 32 3616 -80 ) ( 32 3488 -80 ) ( 32 3616 -48 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( -64 3632 -112 ) ( 64 3616 -112 ) ( 64 3632 -112 ) common/caulk 256 -0 180 0.25 0.25 0 0 0
 }
@@ -27391,7 +27391,7 @@ trak5x/base-pipe1c
 ( -32 3584 -128 ) ( -64 3584 0 ) ( -32 3584 0 ) exx/base-metal03 0 0 0 -0.25 0.25 0 0 0
 ( -32 3632 0 ) ( -32 3600 -128 ) ( -32 3600 0 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( -64 3632 0 ) ( -64 3600 -128 ) ( -64 3632 -128 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-( -32 3616 0 ) ( -64 3648 -128 ) ( -32 3616 -128 ) exx/base-metal03 0 0 0 -0.25 0.25 0 0 0
+( -32 3616 0 ) ( -64 3648 -128 ) ( -32 3616 -128 ) effects_warpzone/warpzone_backdrop 0 0 0 -0.25 0.25 0 0 0
 ( -64 3632 -112 ) ( 64 3616 -112 ) ( 64 3632 -112 ) common/caulk 256 -0 180 0.25 0.25 0 0 0
 }
 {
@@ -27399,7 +27399,7 @@ trak5x/base-pipe1c
 ( 32 3584 0 ) ( 64 3584 0 ) ( 32 3584 -128 ) exx/base-metal03 0 0 0 -0.25 0.25 0 0 0
 ( 32 3600 0 ) ( 32 3600 -128 ) ( 32 3632 0 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( 64 3632 -128 ) ( 64 3600 -128 ) ( 64 3632 0 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-( 32 3616 -128 ) ( 64 3648 -128 ) ( 32 3616 0 ) exx/base-metal03 0 0 0 -0.25 0.25 0 0 0
+( 32 3616 -128 ) ( 64 3648 -128 ) ( 32 3616 0 ) effects_warpzone/warpzone_backdrop 0 0 0 -0.25 0.25 0 0 0
 ( -64 3632 -112 ) ( 64 3616 -112 ) ( 64 3632 -112 ) common/caulk 256 -0 180 0.25 0.25 0 0 0
 }
 {
@@ -33151,3 +33151,31 @@ effects_jumppad/jumppadfx1_a
 "origin" "0.000000 0.000000 704.000000"
 "height" "64"
 }
+{
+"classname" "misc_model"
+"origin" "0.000000 -3778.000000 576.000000"
+"model" "models/effects_warpzone/rededge.md3"
+"angle" "89.999992"
+"modelscale_vec" "1.000000 3.000000 4.000000"
+}
+{
+"classname" "misc_model"
+"origin" "0.000000 -3678.000000 -64.000000"
+"model" "models/effects_warpzone/rededge.md3"
+"angle" "-90.000000"
+"modelscale_vec" "1.000000 3.000000 4.000000"
+}
+{
+"classname" "misc_model"
+"origin" "0.000000 3778.000000 576.000000"
+"model" "models/effects_warpzone/blueedge.md3"
+"angle" "89.999992"
+"modelscale_vec" "1.000000 3.000000 4.000000"
+}
+{
+"classname" "misc_model"
+"origin" "0.000000 3678.000000 -64.000000"
+"model" "models/effects_warpzone/blueedge.md3"
+"angle" "-90.000000"
+"modelscale_vec" "1 3 4"
+}