Geoplanetary: Rework warpzones, fix entity names

diff --git a/maps/geoplanetary.map b/maps/geoplanetary.map
index a8b0939b498add1cf67e078cd0345eb357efb9c9..9f8a9e3d50063aa884d77bb0055aa43102607233 100644 (file)
--- a/maps/geoplanetary.map
+++ b/maps/geoplanetary.map
@@ -845,7 +845,7 @@
 }
 {
 ( -1152 -960 512 ) ( -1152 -1280 512 ) ( -1208 -960 512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -1152 -832 512 ) ( -1208 -832 512 ) ( -1152 -832 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -1144 -880 512 ) ( -1200 -880 512 ) ( -1144 -880 -64 ) common/caulk 224 0 0 0.25 0.25 0 0 0
 ( -1152 -960 512 ) ( -1152 -960 -64 ) ( -1152 -1280 512 ) map_geoplanetary/wiz1_4 0 0 -0 0.5 0.5 0 0 0
 ( -1224 -1280 384 ) ( -1168 -1280 384 ) ( -1224 -960 384 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -1208 -1280 -64 ) ( -1208 -1280 512 ) ( -1152 -1280 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
@@ -1124,16 +1124,8 @@
 ( 640 -704 352 ) ( 640 -576 352 ) ( 640 -704 608 ) map_geoplanetary/wiz1_4 0 0 -0 0.5 0.5 0 0 0
 }
 {
-( -824 -832 576 ) ( -824 -896 576 ) ( -1208 -832 576 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -832 -832 1216 ) ( -1216 -832 1216 ) ( -832 -832 512 ) trak4x/base-concrete3 0 0 0 0.25 0.25 0 0 0
-( -704 -840 1216 ) ( -704 -840 512 ) ( -704 -904 1216 ) trak4x/base-concrete3 0 0 0 0.25 0.25 0 0 0
-( -1216 -896 512 ) ( -832 -896 512 ) ( -1216 -832 512 ) trak4x/base-concrete3 0 0 0 0.25 0.25 0 0 0
-( -1216 -896 512 ) ( -1216 -896 1216 ) ( -832 -896 512 ) trak4x/base-concrete3 0 0 0 0.25 0.25 0 0 0
-( -1216 -896 512 ) ( -1216 -832 512 ) ( -1216 -896 1216 ) trak4x/base-concrete3 0 0 0 0.25 0.25 0 0 0
-}
-{
-( -904 -840 512 ) ( -904 -896 512 ) ( -1152 -840 512 ) trak4x/base-concrete3 0 0 0 0.25 0.25 0 0 0
-( -904 -832 512 ) ( -1152 -832 512 ) ( -904 -832 64 ) trak4x/base-concrete3 0 0 0 0.25 0.25 0 0 0
+( -904 -840 512 ) ( -904 -896 512 ) ( -1152 -840 512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -912 -880 512 ) ( -1160 -880 512 ) ( -912 -880 64 ) trak4x/base-concrete3 32 0 0 0.25 0.25 0 0 0
 ( -704 -840 512 ) ( -704 -840 64 ) ( -704 -896 512 ) trak4x/base-concrete3 0 0 0 0.25 0.25 0 0 0
 ( -1136 -896 352 ) ( -888 -896 352 ) ( -1136 -840 352 ) trak5x/base-base1b 0 0 0 0.25 0.25 0 0 0
 ( -1152 -896 64 ) ( -1152 -896 512 ) ( -904 -896 64 ) map_geoplanetary/wiz1_4 0 0 -0 0.5 0.5 0 0 0
@@ -3916,11 +3908,11 @@
 }
 {
 ( -864 -520 384 ) ( -864 -640 384 ) ( -1216 -520 384 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
-( -448 -528 1024 ) ( -448 -528 352 ) ( -448 -648 1024 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -1216 -640 352 ) ( -864 -640 352 ) ( -1216 -520 352 ) trak5x/base-base1b 0 0 0 0.25 0.25 0 0 0
-( -1184 -832 352 ) ( -1184 -832 1024 ) ( -832 -832 352 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -1184 -896 352 ) ( -1184 -896 1024 ) ( -832 -896 352 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -768 -576 384 ) ( -888 -576 384 ) ( -768 -576 376 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -768 -704 384 ) ( -768 -576 376 ) ( -768 -576 384 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -704 -824 -64 ) ( -704 -832 -64 ) ( -704 -824 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
 ( 2392 6496 1648 ) ( 2392 -2904 1648 ) ( -2440 6496 1648 ) common/caulk 0 0 0 0.25 0.25 0 0 0
@@ -4897,18 +4889,18 @@ map_geoplanetary/wiz1_4_mesh
 ( -1240 -776 640 ) ( -1048 -808 640 ) ( -1048 -776 640 ) map_geoplanetary/wiz1_4 0 0 -0 0.5 0.5 0 0 0
 }
 {
-( -1216 -832 384 ) ( -640 -832 384 ) ( -1216 -768 384 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -1200 -832 352 ) ( -1200 -832 640 ) ( -624 -832 352 ) map_geoplanetary/wiz1_4 0 0 -0 0.5 0.5 0 0 0
-( -1216 -832 352 ) ( -1216 -768 352 ) ( -1216 -832 640 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -1048 -776 640 ) ( -1048 -808 640 ) ( -1240 -776 640 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -920 -776 760 ) ( -920 -776 600 ) ( -920 -808 760 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -1056 -824 598 ) ( -1248 -824 758 ) ( -1248 -824 598 ) map_geoplanetary/wiz1_4 0 0 -0 0.5 0.5 0 0 0
+( -1216 -864 384 ) ( -640 -864 384 ) ( -1216 -800 384 ) common/caulk 0 128 0 0.25 0.25 0 0 0
+( -1200 -864 352 ) ( -1200 -864 640 ) ( -624 -864 352 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -1176 -880 352 ) ( -1176 -816 352 ) ( -1176 -880 640 ) common/caulk 192 0 0 0.25 0.25 0 0 0
+( -1048 -808 640 ) ( -1048 -840 640 ) ( -1240 -808 640 ) common/caulk 0 128 0 0.25 0.25 0 0 0
+( -920 -808 760 ) ( -920 -808 600 ) ( -920 -840 760 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -1056 -856 598 ) ( -1248 -856 758 ) ( -1248 -856 598 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
 }
 {
 ( -1216 -832 384 ) ( -640 -832 384 ) ( -1216 -768 384 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -1216 -832 352 ) ( -1216 -768 352 ) ( -1216 -832 640 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -1048 -776 640 ) ( -1048 -808 640 ) ( -1240 -776 640 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( -1248 -824 598 ) ( -1248 -824 758 ) ( -1056 -824 598 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -1248 -832 598 ) ( -1248 -832 758 ) ( -1056 -832 598 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -1176 -808 751 ) ( -1176 -776 591 ) ( -1176 -808 591 ) map_geoplanetary/wiz1_4 0 0 -0 0.5 0.5 0 0 0
 ( -640 -768 640 ) ( -1216 -768 640 ) ( -640 -768 352 ) map_geoplanetary/wiz1_4 0 0 -0 0.5 0.5 0 0 0
 }
@@ -8800,9 +8792,9 @@ map_geoplanetary/wiz1_4_mesh
 ( -1152 -512 352 ) ( -1216 -512 352 ) ( -1152 -512 -128 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
 ( -1216 -1664 -128 ) ( -1216 -512 -128 ) ( -1216 -1664 352 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
 ( -1128 -1120 320 ) ( -1160 -1120 320 ) ( -1128 -928 320 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
-( -1128 -1216 192 ) ( -1128 -1216 32 ) ( -1160 -1216 192 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
 ( -1160 -920 64 ) ( -1160 -1112 64 ) ( -1128 -920 64 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
 ( -1208 -1112 32 ) ( -1208 -920 192 ) ( -1208 -920 32 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+( -1208 -960 -64 ) ( -1216 -960 -64 ) ( -1208 -960 64 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
 }
 {
 ( -1152 -512 352 ) ( -1216 -512 352 ) ( -1152 -512 -128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
@@ -8810,7 +8802,7 @@ map_geoplanetary/wiz1_4_mesh
 ( -1128 -1120 320 ) ( -1160 -1120 320 ) ( -1128 -928 320 ) map_geoplanetary/wiz1_4 0 0 -0 0.5 0.5 0 0 0
 ( -1160 -920 64 ) ( -1160 -1112 64 ) ( -1128 -920 64 ) common/trigger 0 0 0 0.25 0.25 0 0 0
 ( -1208 -920 32 ) ( -1208 -920 192 ) ( -1208 -1112 32 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( -1160 -960 280 ) ( -1128 -960 120 ) ( -1160 -960 120 ) map_geoplanetary/wiz1_4 0 0 -0 0.5 0.5 0 0 0
+( -1160 -960 280 ) ( -1128 -960 120 ) ( -1160 -960 120 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
 }
 {
 patchDef2
@@ -16945,34 +16937,34 @@ map_geoplanetary/wiz1_4_mesh
 }
 {
 ( -1216 -640 352 ) ( -864 -640 352 ) ( -1216 -520 352 ) trak5x/base-base1b 0 0 0 0.25 0.25 0 0 0
-( -1184 -832 352 ) ( -1184 -832 1024 ) ( -832 -832 352 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -1184 -880 352 ) ( -1184 -880 1024 ) ( -832 -880 352 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -768 -576 384 ) ( -888 -576 384 ) ( -768 -576 376 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -768 -576 384 ) ( -768 -576 376 ) ( -768 -704 384 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -888 -576 376 ) ( -768 -704 376 ) ( -888 -704 376 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -992 336 384 ) ( -992 568 320 ) ( -992 568 384 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -992 288 384 ) ( -992 520 320 ) ( -992 520 384 ) common/caulk 192 0 0 0.25 0.25 0 0 0
 }
 {
 ( -1216 -640 352 ) ( -864 -640 352 ) ( -1216 -520 352 ) trak5x/base-base1b 0 0 0 0.25 0.25 0 0 0
-( -1184 -832 352 ) ( -1184 -832 1024 ) ( -832 -832 352 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -1184 -880 352 ) ( -1184 -880 1024 ) ( -832 -880 352 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -1152 -648 352 ) ( -1152 -528 352 ) ( -1152 -648 1024 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -888 -576 376 ) ( -768 -704 376 ) ( -888 -704 376 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -992 568 384 ) ( -992 568 320 ) ( -992 336 384 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -992 520 384 ) ( -992 520 320 ) ( -992 288 384 ) common/caulk 192 0 0 0.25 0.25 0 0 0
 ( -1008 -736 320 ) ( -1248 -736 384 ) ( -1248 -736 320 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
 ( -864 -520 384 ) ( -864 -640 384 ) ( -1216 -520 384 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
-( -1184 -832 352 ) ( -1184 -832 1024 ) ( -832 -832 352 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -1184 -864 352 ) ( -1184 -864 1024 ) ( -832 -864 352 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -768 -576 384 ) ( -768 -576 376 ) ( -768 -704 384 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -888 -704 376 ) ( -768 -704 376 ) ( -888 -576 376 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -768 -704 376 ) ( -888 -704 384 ) ( -888 -704 376 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -992 336 384 ) ( -992 568 320 ) ( -992 568 384 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( -992 304 384 ) ( -992 536 320 ) ( -992 536 384 ) exx/base-metal03 128 0 0 0.25 0.25 0 0 0
 }
 {
 ( -864 -520 384 ) ( -864 -640 384 ) ( -1216 -520 384 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
-( -1184 -832 352 ) ( -1184 -832 1024 ) ( -832 -832 352 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -1184 -864 352 ) ( -1184 -864 1024 ) ( -832 -864 352 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -1152 -648 352 ) ( -1152 -528 352 ) ( -1152 -648 1024 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -888 -704 376 ) ( -768 -704 376 ) ( -888 -576 376 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -992 568 384 ) ( -992 568 320 ) ( -992 336 384 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -992 536 384 ) ( -992 536 320 ) ( -992 304 384 ) common/caulk 128 0 0 0.25 0.25 0 0 0
 ( -1008 -736 320 ) ( -1248 -736 384 ) ( -1248 -736 320 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
 }
 {
@@ -21440,7 +21432,7 @@ map_geoplanetary/wiz1_4_mesh
 }
 {
 ( 1664 4544 512 ) ( 1664 4864 512 ) ( 1720 4544 512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 1664 4416 512 ) ( 1720 4416 512 ) ( 1664 4416 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1664 4464 512 ) ( 1720 4464 512 ) ( 1664 4464 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 1664 4544 512 ) ( 1664 4544 -64 ) ( 1664 4864 512 ) map_geoplanetary/wiz1_4 0 0 -0 0.5 0.5 0 0 0
 ( 1736 4864 384 ) ( 1680 4864 384 ) ( 1736 4544 384 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 1720 4864 -64 ) ( 1720 4864 512 ) ( 1664 4864 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
@@ -21719,16 +21711,8 @@ map_geoplanetary/wiz1_4_mesh
 ( -128 4288 352 ) ( -128 4160 352 ) ( -128 4288 608 ) map_geoplanetary/wiz1_4 0 0 -0 0.5 0.5 0 0 0
 }
 {
-( 1336 4416 576 ) ( 1336 4480 576 ) ( 1720 4416 576 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 1344 4416 1216 ) ( 1728 4416 1216 ) ( 1344 4416 512 ) trak4x/base-concrete3 0 0 0 0.25 0.25 0 0 0
-( 1216 4424 1216 ) ( 1216 4424 512 ) ( 1216 4488 1216 ) trak4x/base-concrete3 0 0 0 0.25 0.25 0 0 0
-( 1728 4480 512 ) ( 1344 4480 512 ) ( 1728 4416 512 ) trak4x/base-concrete3 0 0 0 0.25 0.25 0 0 0
-( 1728 4480 512 ) ( 1728 4480 1216 ) ( 1344 4480 512 ) trak4x/base-concrete3 0 0 0 0.25 0.25 0 0 0
-( 1728 4480 512 ) ( 1728 4416 512 ) ( 1728 4480 1216 ) trak4x/base-concrete3 0 0 0 0.25 0.25 0 0 0
-}
-{
 ( 1416 4424 512 ) ( 1416 4480 512 ) ( 1664 4424 512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 1416 4416 512 ) ( 1664 4416 512 ) ( 1416 4416 64 ) trak4x/base-concrete3 0 0 0 0.25 0.25 0 0 0
+( 1416 4464 512 ) ( 1664 4464 512 ) ( 1416 4464 64 ) trak4x/base-concrete3 0 0 0 0.25 0.25 0 0 0
 ( 1216 4424 512 ) ( 1216 4424 64 ) ( 1216 4480 512 ) trak4x/base-concrete3 0 0 0 0.25 0.25 0 0 0
 ( 1648 4480 352 ) ( 1400 4480 352 ) ( 1648 4424 352 ) trak5x/base-base1b 0 0 0 0.25 0.25 0 0 0
 ( 1664 4480 64 ) ( 1664 4480 512 ) ( 1416 4480 64 ) map_geoplanetary/wiz1_4 0 0 -0 0.5 0.5 0 0 0
@@ -24355,7 +24339,7 @@ map_geoplanetary/wiz1_4_mesh
 ( 1728 4224 352 ) ( 1376 4224 352 ) ( 1728 4104 352 ) trak5x/base-base1b 0 0 0 0.25 0.25 0 0 0
 ( 1696 4416 352 ) ( 1696 4416 1024 ) ( 1344 4416 352 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 1280 4160 384 ) ( 1400 4160 384 ) ( 1280 4160 376 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 1280 4288 384 ) ( 1280 4160 376 ) ( 1280 4160 384 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1216 4416 -64 ) ( 1216 4408 -64 ) ( 1216 4416 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
 ( -1280 1472 -128 ) ( -1280 1760 -128 ) ( -1088 1472 -128 ) trak4x/base-concrete3 0 0 0 0.25 0.25 0 0 0
@@ -25081,21 +25065,13 @@ map_geoplanetary/wiz1_4_mesh
 ( 1728 4416 352 ) ( 1728 4352 352 ) ( 1728 4416 640 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 1344 4288 1216 ) ( 1344 4288 384 ) ( 1344 4544 1216 ) map_geoplanetary/wiz1_4 0 0 -0 0.5 0.5 0 0 0
 ( 1616 4288 832 ) ( 1360 4544 832 ) ( 1616 4544 832 ) map_geoplanetary/wiz1_4 0 0 -0 0.5 0.5 0 0 0
-( 1752 4360 640 ) ( 1560 4392 640 ) ( 1560 4360 640 ) map_geoplanetary/wiz1_4 0 0 -0 0.5 0.5 0 0 0
+( 1752 4360 640 ) ( 1560 4392 640 ) ( 1560 4360 640 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
 }
 {
 ( 1728 4416 384 ) ( 1152 4416 384 ) ( 1728 4352 384 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 1728 4416 352 ) ( 1728 4416 640 ) ( 1152 4416 352 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 1728 4416 352 ) ( 1728 4352 352 ) ( 1728 4416 640 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 1560 4360 640 ) ( 1560 4392 640 ) ( 1752 4360 640 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 1432 4360 760 ) ( 1432 4360 600 ) ( 1432 4392 760 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 1568 4408 598 ) ( 1760 4408 758 ) ( 1760 4408 598 ) map_geoplanetary/wiz1_4 0 0 -0 0.5 0.5 0 0 0
-}
-{
-( 1728 4416 384 ) ( 1152 4416 384 ) ( 1728 4352 384 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 1728 4416 352 ) ( 1728 4352 352 ) ( 1728 4416 640 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 1560 4360 640 ) ( 1560 4392 640 ) ( 1752 4360 640 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 1760 4408 598 ) ( 1760 4408 758 ) ( 1568 4408 598 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( 1768 4416 598 ) ( 1768 4416 758 ) ( 1576 4416 598 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 1688 4392 751 ) ( 1688 4360 591 ) ( 1688 4392 591 ) map_geoplanetary/wiz1_4 0 0 -0 0.5 0.5 0 0 0
 ( 1152 4352 640 ) ( 1728 4352 640 ) ( 1152 4352 352 ) map_geoplanetary/wiz1_4 0 0 -0 0.5 0.5 0 0 0
 }
@@ -28956,7 +28932,7 @@ map_geoplanetary/wiz1_4_mesh
 ( 1688 5112 384 ) ( 1688 5304 384 ) ( 1688 5112 320 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 1688 5176 256 ) ( 1656 5176 256 ) ( 1688 5496 256 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 1656 4992 256 ) ( 1688 4992 192 ) ( 1688 4992 256 ) map_geoplanetary/wiz1_4 0 0 -0 0.5 0.5 0 0 0
-( 1688 5112 192 ) ( 1656 4984 192 ) ( 1688 4984 192 ) map_geoplanetary/wiz1_4 0 0 0 0.25 0.25 0 0 0
+( 1688 5112 192 ) ( 1656 4984 192 ) ( 1688 4984 192 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
 ( 1672 4800 192 ) ( 1640 4800 32 ) ( 1640 4800 192 ) map_geoplanetary/wiz1_4 0 0 -0 0.5 0.5 0 0 0
 }
 {
@@ -28987,9 +28963,9 @@ map_geoplanetary/wiz1_4_mesh
 ( 1664 4096 352 ) ( 1728 4096 352 ) ( 1664 4096 -128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 1728 5248 -128 ) ( 1728 4096 -128 ) ( 1728 5248 352 ) map_geoplanetary/wiz1_4 0 0 -0 0.5 0.5 0 0 0
 ( 1640 4704 320 ) ( 1672 4704 320 ) ( 1640 4512 320 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 1640 4800 192 ) ( 1640 4800 32 ) ( 1672 4800 192 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 1672 4504 64 ) ( 1672 4696 64 ) ( 1640 4504 64 ) common/trigger 0 0 0 0.25 0.25 0 0 0
 ( 1720 4696 32 ) ( 1720 4504 192 ) ( 1720 4504 32 ) map_geoplanetary/wiz1_4 0 0 -0 0.5 0.5 0 0 0
+( 1720 4544 -64 ) ( 1728 4544 -64 ) ( 1720 4544 64 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
 }
 {
 ( 1664 4096 352 ) ( 1728 4096 352 ) ( 1664 4096 -128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
@@ -28997,7 +28973,7 @@ map_geoplanetary/wiz1_4_mesh
 ( 1640 4704 320 ) ( 1672 4704 320 ) ( 1640 4512 320 ) map_geoplanetary/wiz1_4 0 0 -0 0.5 0.5 0 0 0
 ( 1672 4504 64 ) ( 1672 4696 64 ) ( 1640 4504 64 ) common/trigger 0 0 0 0.25 0.25 0 0 0
 ( 1720 4504 32 ) ( 1720 4504 192 ) ( 1720 4696 32 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 1672 4544 280 ) ( 1640 4544 120 ) ( 1672 4544 120 ) map_geoplanetary/wiz1_4 0 0 -0 0.5 0.5 0 0 0
+( 1672 4544 280 ) ( 1640 4544 120 ) ( 1672 4544 120 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
 }
 {
 patchDef2
@@ -31135,7 +31111,7 @@ map_geoplanetary/wiz1_4_mesh
 {
 ( 1728 4416 352 ) ( 1728 4416 640 ) ( 1152 4416 352 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 1344 4288 1216 ) ( 1344 4288 384 ) ( 1344 4544 1216 ) map_geoplanetary/wiz1_4 0 0 -0 0.5 0.5 0 0 0
-( 1432 4392 760 ) ( 1432 4360 600 ) ( 1432 4360 760 ) map_geoplanetary/wiz1_4 0 0 -0 0.5 0.5 0 0 0
+( 1432 4392 760 ) ( 1432 4360 600 ) ( 1432 4360 760 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
 ( 1280 4384 544 ) ( 1408 4344 544 ) ( 1408 4384 544 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 1408 4368 568 ) ( 1408 4344 568 ) ( 1280 4368 568 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 1408 4368 568 ) ( 1408 4384 544 ) ( 1280 4384 544 ) exx/base-crete01red 0 0 0 0.25 0.25 0 0 0
@@ -36542,7 +36518,7 @@ map_geoplanetary/wiz1_4_mesh
 }
 {
 ( 1728 4224 352 ) ( 1376 4224 352 ) ( 1728 4104 352 ) trak5x/base-base1b 0 0 0 0.25 0.25 0 0 0
-( 1696 4416 352 ) ( 1696 4416 1024 ) ( 1344 4416 352 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1696 4464 352 ) ( 1696 4464 1024 ) ( 1344 4464 352 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 1280 4160 384 ) ( 1400 4160 384 ) ( 1280 4160 376 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 1280 4160 384 ) ( 1280 4160 376 ) ( 1280 4288 384 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 1400 4160 376 ) ( 1280 4288 376 ) ( 1400 4288 376 ) common/caulk 0 0 0 0.25 0.25 0 0 0
@@ -36550,7 +36526,7 @@ map_geoplanetary/wiz1_4_mesh
 }
 {
 ( 1728 4224 352 ) ( 1376 4224 352 ) ( 1728 4104 352 ) trak5x/base-base1b 0 0 0 0.25 0.25 0 0 0
-( 1696 4416 352 ) ( 1696 4416 1024 ) ( 1344 4416 352 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1704 4464 352 ) ( 1704 4464 1024 ) ( 1352 4464 352 ) common/caulk 224 0 0 0.25 0.25 0 0 0
 ( 1664 4232 352 ) ( 1664 4112 352 ) ( 1664 4232 1024 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 1400 4160 376 ) ( 1280 4288 376 ) ( 1400 4288 376 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 1504 3016 384 ) ( 1504 3016 320 ) ( 1504 3248 384 ) common/caulk 0 0 0 0.25 0.25 0 0 0
@@ -36558,18 +36534,18 @@ map_geoplanetary/wiz1_4_mesh
 }
 {
 ( 1376 4104 384 ) ( 1376 4224 384 ) ( 1728 4104 384 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
-( 1696 4416 352 ) ( 1696 4416 1024 ) ( 1344 4416 352 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1696 4440 352 ) ( 1696 4440 1024 ) ( 1344 4440 352 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 1280 4160 384 ) ( 1280 4160 376 ) ( 1280 4288 384 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 1400 4288 376 ) ( 1280 4288 376 ) ( 1400 4160 376 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 1280 4288 376 ) ( 1400 4288 384 ) ( 1400 4288 376 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 1504 3248 384 ) ( 1504 3016 320 ) ( 1504 3016 384 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( 1504 3272 384 ) ( 1504 3040 320 ) ( 1504 3040 384 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
 }
 {
 ( 1376 4104 384 ) ( 1376 4224 384 ) ( 1728 4104 384 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
-( 1696 4416 352 ) ( 1696 4416 1024 ) ( 1344 4416 352 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1696 4440 352 ) ( 1696 4440 1024 ) ( 1344 4440 352 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 1664 4232 352 ) ( 1664 4112 352 ) ( 1664 4232 1024 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 1400 4288 376 ) ( 1280 4288 376 ) ( 1400 4160 376 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 1504 3016 384 ) ( 1504 3016 320 ) ( 1504 3248 384 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1504 3040 384 ) ( 1504 3040 320 ) ( 1504 3272 384 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 1520 4320 320 ) ( 1760 4320 384 ) ( 1760 4320 320 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
 }
 {
@@ -40393,9 +40369,9 @@ patchDef2
 effects_warpzone/blueedge
 ( 3 3 0 0 0 )
 (
-( ( -1176 -787.5 640 0 0 ) ( -1176 -787.5 512 0 0.5 ) ( -1176 -787.5 384 0 1 ) )
-( ( -1048 -787.5 640 0.5 0 ) ( -1048 -787.5 512 0.5 0.5 ) ( -1048 -787.5 384 0.5 1 ) )
-( ( -920 -787.5 640 1 0 ) ( -920 -787.5 512 1 0.5 ) ( -920 -787.5 384 1 1 ) )
+( ( -1176 -791.5 640 0 0 ) ( -1176 -791.5 512 0 0.5 ) ( -1176 -791.5 384 0 1 ) )
+( ( -1048 -791.5 640 0.5 0 ) ( -1048 -791.5 512 0.5 0.5 ) ( -1048 -791.5 384 0.5 1 ) )
+( ( -920 -791.5 640 1 0 ) ( -920 -791.5 512 1 0.5 ) ( -920 -791.5 384 1 1 ) )
 )
 }
 }
@@ -40417,9 +40393,9 @@ patchDef2
 effects_warpzone/rededge
 ( 3 3 0 0 0 )
 (
-( ( 1432 4371.5 384 0 0 ) ( 1432 4371.5 512 0 0.5 ) ( 1432 4371.5 640 0 1 ) )
-( ( 1560 4371.5 384 0.5 0 ) ( 1560 4371.5 512 0.5 0.5 ) ( 1560 4371.5 640 0.5 1 ) )
-( ( 1688 4371.5 384 1 0 ) ( 1688 4371.5 512 1 0.5 ) ( 1688 4371.5 640 1 1 ) )
+( ( 1432 4375.5 384 0 0 ) ( 1432 4375.5 512 0 0.5 ) ( 1432 4375.5 640 0 1 ) )
+( ( 1560 4375.5 384 0.5 0 ) ( 1560 4375.5 512 0.5 0.5 ) ( 1560 4375.5 640 0.5 1 ) )
+( ( 1688 4375.5 384 1 0 ) ( 1688 4375.5 512 1 0.5 ) ( 1688 4375.5 640 1 1 ) )
 )
 }
 }
@@ -42937,6 +42913,158 @@ effects_warpzone/rededge
 ( -1512 -912 -64 ) ( -1504 -912 -64 ) ( -1512 -912 64 ) map_geoplanetary/wiz1_4 0 0 -0 0.5 0.5 0 0 0
 ( -1256 -912 64 ) ( -1256 -904 -64 ) ( -1256 -912 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
+{
+( 1752 5248 -128 ) ( 1752 4096 -128 ) ( 1752 5248 352 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+( 1664 4704 320 ) ( 1696 4704 320 ) ( 1664 4512 320 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+( 1664 4800 192 ) ( 1664 4800 32 ) ( 1696 4800 192 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+( 1696 4504 64 ) ( 1696 4696 64 ) ( 1664 4504 64 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+( 1744 4696 32 ) ( 1744 4504 192 ) ( 1744 4504 32 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+( 1744 4544 64 ) ( 1752 4544 -64 ) ( 1744 4544 -64 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+}
+{
+( 1728 4448 384 ) ( 1152 4448 384 ) ( 1728 4384 384 ) common/caulk 0 128 0 0.25 0.25 0 0 0
+( 1728 4448 352 ) ( 1728 4448 640 ) ( 1152 4448 352 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1560 4392 640 ) ( 1560 4424 640 ) ( 1752 4392 640 ) common/caulk 0 128 0 0.25 0.25 0 0 0
+( 1432 4392 760 ) ( 1432 4392 600 ) ( 1432 4424 760 ) common/caulk 128 0 0 0.25 0.25 0 0 0
+( 1568 4440 598 ) ( 1760 4440 758 ) ( 1760 4440 598 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+( 1688 4440 64 ) ( 1688 4448 -64 ) ( 1688 4440 -64 ) common/caulk 128 0 0 0.25 0.25 0 0 0
+}
+{
+( 1376 4104 384 ) ( 1376 4224 384 ) ( 1728 4104 384 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( 1728 4224 352 ) ( 1376 4224 352 ) ( 1728 4104 352 ) trak5x/base-base1b 0 0 0 0.25 0.25 0 0 0
+( 1696 4464 352 ) ( 1696 4464 1024 ) ( 1344 4464 352 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1280 4160 384 ) ( 1400 4160 384 ) ( 1280 4160 376 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1280 4288 384 ) ( 1280 4160 376 ) ( 1280 4160 384 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1216 4416 64 ) ( 1216 4408 -64 ) ( 1216 4416 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 1424 4432 640 ) ( 1424 4416 640 ) ( 1400 4432 640 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1432 4448 408 ) ( 1408 4448 408 ) ( 1432 4448 376 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1432 4432 408 ) ( 1432 4432 376 ) ( 1432 4416 408 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+( 1408 4416 384 ) ( 1432 4416 384 ) ( 1408 4432 384 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1408 4416 376 ) ( 1408 4416 408 ) ( 1432 4416 376 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1408 4416 376 ) ( 1408 4432 376 ) ( 1408 4416 408 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 1704 4432 640 ) ( 1704 4416 640 ) ( 1680 4432 640 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1712 4448 408 ) ( 1688 4448 408 ) ( 1712 4448 376 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1712 4432 408 ) ( 1712 4432 376 ) ( 1712 4416 408 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1688 4416 384 ) ( 1712 4416 384 ) ( 1688 4432 384 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1688 4416 376 ) ( 1688 4416 408 ) ( 1712 4416 376 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1688 4416 384 ) ( 1688 4432 384 ) ( 1688 4416 416 ) map_geoplanetary/wiz1_4 0 16 0 0.5 0.5 0 0 0
+}
+{
+( 1688 4432 648 ) ( 1688 4416 648 ) ( 1688 4432 672 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1456 4448 640 ) ( 1456 4448 664 ) ( 1424 4448 640 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1456 4432 640 ) ( 1424 4432 640 ) ( 1456 4416 640 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+( 1432 4416 664 ) ( 1432 4416 640 ) ( 1432 4432 664 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1424 4416 664 ) ( 1456 4416 664 ) ( 1424 4416 640 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1424 4416 664 ) ( 1424 4432 664 ) ( 1456 4416 664 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+}
+{
+( -864 -520 384 ) ( -864 -640 384 ) ( -1216 -520 384 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( -448 -528 1024 ) ( -448 -528 352 ) ( -448 -648 1024 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -1216 -640 352 ) ( -864 -640 352 ) ( -1216 -520 352 ) trak5x/base-base1b 0 0 0 0.25 0.25 0 0 0
+( -1184 -832 352 ) ( -1184 -832 1024 ) ( -832 -832 352 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -768 -576 384 ) ( -888 -576 384 ) ( -768 -576 376 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -704 -824 64 ) ( -704 -832 -64 ) ( -704 -824 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+}
+{
+( -1184 -848 640 ) ( -1184 -864 640 ) ( -1208 -848 640 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -1176 -832 408 ) ( -1200 -832 408 ) ( -1176 -832 376 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -1176 -848 408 ) ( -1176 -848 376 ) ( -1176 -864 408 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+( -1200 -864 384 ) ( -1176 -864 384 ) ( -1200 -848 384 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -1200 -864 376 ) ( -1200 -864 408 ) ( -1176 -864 376 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -1200 -864 376 ) ( -1200 -848 376 ) ( -1200 -864 408 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+}
+{
+( -904 -848 640 ) ( -904 -864 640 ) ( -928 -848 640 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -896 -832 408 ) ( -920 -832 408 ) ( -896 -832 376 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -896 -848 408 ) ( -896 -848 376 ) ( -896 -864 408 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -920 -864 384 ) ( -896 -864 384 ) ( -920 -848 384 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -920 -864 376 ) ( -920 -864 408 ) ( -896 -864 376 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -920 -864 384 ) ( -920 -848 384 ) ( -920 -864 416 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+}
+{
+( -920 -848 648 ) ( -920 -864 648 ) ( -920 -848 672 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -1152 -832 640 ) ( -1152 -832 664 ) ( -1184 -832 640 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -1152 -848 640 ) ( -1184 -848 640 ) ( -1152 -864 640 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+( -1176 -864 664 ) ( -1176 -864 640 ) ( -1176 -848 664 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -1184 -864 664 ) ( -1152 -864 664 ) ( -1184 -864 640 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -1184 -864 664 ) ( -1184 -848 664 ) ( -1152 -864 664 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+}
+{
+( -1240 -1664 -128 ) ( -1240 -512 -128 ) ( -1240 -1664 352 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+( -1152 -1120 320 ) ( -1184 -1120 320 ) ( -1152 -928 320 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+( -1152 -1216 192 ) ( -1152 -1216 32 ) ( -1184 -1216 192 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+( -1184 -920 64 ) ( -1184 -1112 64 ) ( -1152 -920 64 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+( -1232 -1112 32 ) ( -1232 -920 192 ) ( -1232 -920 32 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+( -1232 -960 64 ) ( -1240 -960 -64 ) ( -1232 -960 -64 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+}
+{
+( -1232 -952 320 ) ( -1248 -952 320 ) ( -1232 -928 320 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+( -1216 -960 88 ) ( -1216 -936 88 ) ( -1216 -960 56 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+( -1224 -960 88 ) ( -1224 -960 56 ) ( -1240 -960 88 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+( -1248 -936 64 ) ( -1248 -960 64 ) ( -1232 -936 64 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+( -1240 -936 56 ) ( -1240 -936 88 ) ( -1240 -960 56 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+( -1248 -936 56 ) ( -1232 -936 56 ) ( -1248 -936 88 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+}
+{
+( -1232 -1232 320 ) ( -1248 -1232 320 ) ( -1232 -1208 320 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+( -1216 -1240 88 ) ( -1216 -1216 88 ) ( -1216 -1240 56 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+( -1232 -1240 88 ) ( -1232 -1240 56 ) ( -1248 -1240 88 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+( -1248 -1216 64 ) ( -1248 -1240 64 ) ( -1232 -1216 64 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+( -1240 -1216 56 ) ( -1240 -1216 88 ) ( -1240 -1240 56 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+( -1240 -1216 56 ) ( -1224 -1216 56 ) ( -1240 -1216 88 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+}
+{
+( -1224 -1216 328 ) ( -1240 -1216 328 ) ( -1224 -1216 352 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+( -1216 -984 320 ) ( -1216 -984 344 ) ( -1216 -952 320 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+( -1232 -984 320 ) ( -1232 -952 320 ) ( -1248 -984 320 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+( -1240 -960 344 ) ( -1240 -960 320 ) ( -1224 -960 344 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+( -1240 -952 344 ) ( -1240 -984 344 ) ( -1240 -952 320 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+( -1248 -952 344 ) ( -1232 -952 344 ) ( -1248 -984 344 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+}
+{
+( -1224 -1216 48 ) ( -1240 -1216 48 ) ( -1224 -1216 72 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+( -1216 -984 40 ) ( -1216 -984 64 ) ( -1216 -952 40 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+( -1232 -984 40 ) ( -1232 -952 40 ) ( -1248 -984 40 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+( -1240 -960 64 ) ( -1240 -960 40 ) ( -1224 -960 64 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+( -1240 -952 64 ) ( -1240 -984 64 ) ( -1240 -952 40 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+( -1248 -952 64 ) ( -1232 -952 64 ) ( -1248 -984 64 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+}
+{
+( 1736 4808 320 ) ( 1720 4808 320 ) ( 1736 4832 320 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+( 1752 4800 88 ) ( 1752 4824 88 ) ( 1752 4800 56 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+( 1744 4800 88 ) ( 1744 4800 56 ) ( 1728 4800 88 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+( 1720 4824 64 ) ( 1720 4800 64 ) ( 1736 4824 64 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+( 1728 4824 56 ) ( 1728 4824 88 ) ( 1728 4800 56 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+( 1720 4824 56 ) ( 1736 4824 56 ) ( 1720 4824 88 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+}
+{
+( 1736 4528 320 ) ( 1720 4528 320 ) ( 1736 4552 320 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+( 1752 4520 88 ) ( 1752 4544 88 ) ( 1752 4520 56 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+( 1736 4520 88 ) ( 1736 4520 56 ) ( 1720 4520 88 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+( 1720 4544 64 ) ( 1720 4520 64 ) ( 1736 4544 64 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+( 1728 4544 56 ) ( 1728 4544 88 ) ( 1728 4520 56 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+( 1728 4544 56 ) ( 1744 4544 56 ) ( 1728 4544 88 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+}
+{
+( 1744 4544 328 ) ( 1728 4544 328 ) ( 1744 4544 352 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+( 1752 4776 320 ) ( 1752 4776 344 ) ( 1752 4808 320 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+( 1736 4776 320 ) ( 1736 4808 320 ) ( 1720 4776 320 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+( 1728 4800 344 ) ( 1728 4800 320 ) ( 1744 4800 344 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+( 1728 4808 344 ) ( 1728 4776 344 ) ( 1728 4808 320 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+( 1720 4808 344 ) ( 1736 4808 344 ) ( 1720 4776 344 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+}
+{
+( 1744 4544 48 ) ( 1728 4544 48 ) ( 1744 4544 72 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+( 1752 4776 40 ) ( 1752 4776 64 ) ( 1752 4808 40 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+( 1736 4776 40 ) ( 1736 4808 40 ) ( 1720 4776 40 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+( 1728 4800 64 ) ( 1728 4800 40 ) ( 1744 4800 64 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+( 1728 4808 64 ) ( 1728 4776 64 ) ( 1728 4808 40 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+( 1720 4808 64 ) ( 1736 4808 64 ) ( 1720 4776 64 ) map_geoplanetary/wiz1_4 0 0 0 0.5 0.5 0 0 0
+}
 }
 {
 "classname" "light"
@@ -43386,10 +43514,6 @@ effects_warpzone/rededge
 "angle" "180.000000"
 }
 {
-"classname" "item_armor_large"
-"origin" "-960.000000 -864.000000 824.000000"
-}
-{
 "classname" "item_health_medium"
 "origin" "-32.000000 -288.000000 648.000000"
 }
@@ -43581,12 +43705,12 @@ effects_warpzone/rededge
 "warpzone_fadeend" "1600"
 "warpzone_fadestart" "1400"
 {
-( -1032 -768 640 ) ( -1032 -800 640 ) ( -1224 -768 640 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( -1040 -788 544 ) ( -1232 -788 544 ) ( -1040 -788 384 ) common/warpzone 0 0 0 0.25 0.25 0 0 0
-( -920 -768 760 ) ( -920 -768 600 ) ( -920 -800 760 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( -1232 -792 384 ) ( -1040 -792 384 ) ( -1232 -760 384 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( -1232 -824 598 ) ( -1232 -824 758 ) ( -1040 -824 598 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( -1176 -800 591 ) ( -1176 -768 591 ) ( -1176 -800 751 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( -1176 -784 640 ) ( -920 -824 640 ) ( -1176 -824 640 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( -1176 -792 640 ) ( -920 -792 384 ) ( -920 -792 640 ) common/warpzone 0 0 0 0.25 0.25 0 0 0
+( -920 -784 640 ) ( -920 -824 384 ) ( -920 -824 640 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( -920 -784 384 ) ( -1176 -824 384 ) ( -920 -824 384 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( -912 -856 384 ) ( -1168 -856 640 ) ( -912 -856 640 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( -1176 -824 640 ) ( -1176 -784 384 ) ( -1176 -784 640 ) common/trigger 0 0 0 0.25 0.25 0 0 0
 }
 }
 {
@@ -43596,12 +43720,12 @@ effects_warpzone/rededge
 "warpzone_fadeend" "1600"
 "warpzone_fadestart" "1400"
 {
-( -1112 -1120 320 ) ( -1144 -1120 320 ) ( -1112 -928 320 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( -1168 -1112 192 ) ( -1168 -920 192 ) ( -1168 -1112 32 ) common/warpzone 0 0 0 0.25 0.25 0 0 0
-( -1112 -1216 192 ) ( -1112 -1216 32 ) ( -1144 -1216 192 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( -1144 -920 64 ) ( -1144 -1112 64 ) ( -1112 -920 64 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( -1208 -920 32 ) ( -1208 -920 192 ) ( -1208 -1112 32 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( -1144 -960 120 ) ( -1112 -960 120 ) ( -1144 -960 280 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( -1208 -1216 320 ) ( -1168 -960 320 ) ( -1168 -1216 320 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( -1168 -960 320 ) ( -1168 -1216 64 ) ( -1168 -1216 320 ) common/warpzone 0 0 0 0.25 0.25 0 0 0
+( -1168 -1216 320 ) ( -1208 -1216 64 ) ( -1208 -1216 320 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( -1168 -960 64 ) ( -1208 -1216 64 ) ( -1168 -1216 64 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( -1232 -1216 64 ) ( -1232 -960 320 ) ( -1232 -1216 320 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( -1208 -960 320 ) ( -1168 -960 64 ) ( -1168 -960 320 ) common/trigger 0 0 0 0.25 0.25 0 0 0
 }
 }
 {
@@ -44401,11 +44525,6 @@ effects_warpzone/rededge
 "origin" "48.000000 3936.000000 648.000000"
 }
 {
-"classname" "item_armor_large"
-"origin" "1472.000000 4448.000000 824.000000"
-"angle" "180.000000"
-}
-{
 "classname" "item_health_medium"
 "origin" "544.000000 3872.000000 648.000000"
 "angle" "180.000000"
@@ -44500,12 +44619,12 @@ effects_warpzone/rededge
 "warpzone_fadeend" "1600"
 "warpzone_fadestart" "1400"
 {
-( 1544 4352 640 ) ( 1544 4384 640 ) ( 1736 4352 640 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( 1552 4372 544 ) ( 1744 4372 544 ) ( 1552 4372 384 ) common/warpzone 0 0 0 0.25 0.25 0 0 0
-( 1432 4352 760 ) ( 1432 4352 600 ) ( 1432 4384 760 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( 1744 4376 384 ) ( 1552 4376 384 ) ( 1744 4344 384 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( 1737 4408 598 ) ( 1737 4408 758 ) ( 1545 4408 598 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( 1688 4384 591 ) ( 1688 4352 591 ) ( 1688 4384 751 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( 1432 4440 640 ) ( 1688 4368 640 ) ( 1432 4368 640 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( 1688 4376 640 ) ( 1432 4376 384 ) ( 1432 4376 640 ) common/warpzone 0 0 0 0.25 0.25 0 0 0
+( 1432 4368 640 ) ( 1432 4440 384 ) ( 1432 4440 640 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( 1688 4440 384 ) ( 1432 4368 384 ) ( 1688 4368 384 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( 1432 4440 384 ) ( 1688 4440 640 ) ( 1432 4440 640 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( 1688 4440 640 ) ( 1688 4368 384 ) ( 1688 4368 640 ) common/trigger 0 0 0 0.25 0.25 0 0 0
 }
 }
 {
@@ -44519,7 +44638,7 @@ effects_warpzone/rededge
 ( 1680 4696 192 ) ( 1680 4504 192 ) ( 1680 4696 32 ) common/warpzone 0 0 0 0.25 0.25 0 0 0
 ( 1624 4800 192 ) ( 1624 4800 32 ) ( 1656 4800 192 ) common/trigger 0 0 0 0.25 0.25 0 0 0
 ( 1656 4504 64 ) ( 1656 4696 64 ) ( 1624 4504 64 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( 1720 4504 32 ) ( 1720 4504 192 ) ( 1720 4696 32 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( 1744 4504 32 ) ( 1744 4504 192 ) ( 1744 4696 32 ) common/trigger 0 0 0 0.25 0.25 0 0 0
 ( 1656 4544 120 ) ( 1624 4544 120 ) ( 1656 4544 280 ) common/trigger 0 0 0 0.25 0.25 0 0 0
 }
 }
@@ -45071,10 +45190,6 @@ effects_warpzone/rededge
 "angle" "-179.999985"
 }
 {
-"classname" "item_health_large"
-"origin" "-1088.000000 -1920.000000 64.000000"
-}
-{
 "classname" "weapon_hagar"
 "origin" "128.000000 3008.000000 -320.000000"
 "angle" "-179.999985"
@@ -45181,11 +45296,6 @@ effects_warpzone/rededge
 "message" " has captured the ^2Blue tunnel ^3control point"
 }
 {
-"classname" "item_health_large"
-"origin" "1600.000000 5504.000000 64.000000"
-"angle" "180.000000"
-}
-{
 "classname" "dom_controlpoint"
 "origin" "255.000000 1792.000000 392.000000"
 "message" " has captured the ^2Tower ^3control point"
@@ -45313,3 +45423,21 @@ effects_warpzone/rededge
 ( 1528 1152 -112 ) ( 1528 960 -112 ) ( 1528 1152 -48 ) common/trigger 0 0 0 0.25 0.25 134217728 0 0
 }
 }
+{
+"classname" "item_armor_mega"
+"origin" "-960.000000 -864.000000 832.000000"
+}
+{
+"classname" "item_armor_mega"
+"origin" "1472.000000 4448.000000 832.000000"
+"angle" "-179.999985"
+}
+{
+"classname" "item_health_big"
+"origin" "1600.000000 5504.000000 64.000000"
+"angle" "180.000000"
+}
+{
+"classname" "item_health_big"
+"origin" "-1088.000000 -1920.000000 64.000000"
+}

diff --git a/maps/geoplanetary.map.options b/maps/geoplanetary.map.options
index af0f235a5f8fcb4a57bcbd6a9ea52f9754a6934c..7eb9268f0a68f80be8d617ecab457f345a185499 100644 (file)
--- a/maps/geoplanetary.map.options
+++ b/maps/geoplanetary.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -sRGB
-Version: 5e
\ No newline at end of file
+Version: 5f
\ No newline at end of file