Merge branch 'packer/geoplanetary-warpzonefix' into 'master'

packer/geoplanetary-warpzonefix

See merge request !85

diff --git a/maps/geoplanetary.map b/maps/geoplanetary.map
index feca2041b164a1842e42828f0fd01034d5260efc..48b2696a9c6745c06a56b6a39c42b7be6754814d 100644 (file)
--- a/maps/geoplanetary.map
+++ b/maps/geoplanetary.map
@@ -41184,8 +41184,8 @@ map_geoplanetary/wiz1_4_mesh
 ( -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 8 8 0 0.25 0.25 0 0 0
 ( -1232 -792 384 ) ( -1040 -792 384 ) ( -1232 -760 384 ) common/trigger 8 8 0 0.25 0.25 0 0 0
-( -1232 -823 598 ) ( -1232 -823 758 ) ( -1040 -823 598 ) common/trigger 8 8 0 0.25 0.25 0 0 0
-( -1178 -800 591 ) ( -1178 -768 591 ) ( -1178 -800 751 ) common/trigger 8 8 0 0.25 0.25 0 0 0
+( -1232 -824 598 ) ( -1232 -824 758 ) ( -1040 -824 598 ) common/trigger 8 8 0 0.25 0.25 0 0 0
+( -1176 -800 591 ) ( -1176 -768 591 ) ( -1176 -800 751 ) common/trigger 8 8 0 0.25 0.25 0 0 0
 }
 }
 {
@@ -41199,7 +41199,7 @@ map_geoplanetary/wiz1_4_mesh
 ( -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 8 0 0 0.25 0.25 0 0 0
 ( -1144 -920 64 ) ( -1144 -1112 64 ) ( -1112 -920 64 ) common/trigger 8 0 0 0.25 0.25 0 0 0
-( -1207 -920 32 ) ( -1207 -920 192 ) ( -1207 -1112 32 ) common/trigger 8 0 0 0.25 0.25 0 0 0
+( -1208 -920 32 ) ( -1208 -920 192 ) ( -1208 -1112 32 ) common/trigger 8 0 0 0.25 0.25 0 0 0
 ( -1144 -960 120 ) ( -1112 -960 120 ) ( -1144 -960 280 ) common/trigger 8 0 0 0.25 0.25 0 0 0
 }
 }
@@ -42136,8 +42136,8 @@ map_geoplanetary/wiz1_4_mesh
 ( 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 4407 598 ) ( 1737 4407 758 ) ( 1545 4407 598 ) common/trigger 252 0 0 0.25 0.25 0 0 0
-( 1690 4384 591 ) ( 1690 4352 591 ) ( 1690 4384 751 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( 1737 4408 598 ) ( 1737 4408 758 ) ( 1545 4408 598 ) common/trigger 252 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
 }
 }
 {
@@ -42151,7 +42151,7 @@ map_geoplanetary/wiz1_4_mesh
 ( 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 -8 8 0 0.25 0.25 0 0 0
 ( 1656 4504 64 ) ( 1656 4696 64 ) ( 1624 4504 64 ) common/trigger -8 8 0 0.25 0.25 0 0 0
-( 1719 4504 32 ) ( 1719 4504 192 ) ( 1719 4696 32 ) common/trigger 248 8 0 0.25 0.25 0 0 0
+( 1720 4504 32 ) ( 1720 4504 192 ) ( 1720 4696 32 ) common/trigger 248 8 0 0.25 0.25 0 0 0
 ( 1656 4544 120 ) ( 1624 4544 120 ) ( 1656 4544 280 ) common/trigger -8 8 0 0.25 0.25 0 0 0
 }
 }

diff --git a/maps/geoplanetary.map.options b/maps/geoplanetary.map.options
index ded20481a0f1afe7c43ac24febaf7ed429877ae4..73fb2be38a94284d1d446233f67ae411ce3709c2 100644 (file)
--- a/maps/geoplanetary.map.options
+++ b/maps/geoplanetary.map.options
@@ -2,4 +2,4 @@
 -light + -bounce 8 -dirtscale 2
 -vis +
 -minimap +
-Version: 2e
\ No newline at end of file
+Version: 2f