Merge branch 'fix-many-maps' into 'master'

Fix a bunch of warp placement

See merge request !17

1 files changed, 20 insertions, 20 deletions

diff --git a/maps/001-2-40.tmx b/maps/001-2-40.tmx
index 1322065e..bfc738a7 100644
--- a/maps/001-2-40.tmx
+++ b/maps/001-2-40.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="71" height="71" tilewidth="32" tileheight="32" nextobjectid="30">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="71" height="71" tilewidth="32" tileheight="32" nextobjectid="32">
  <properties>
   <property name="actorsfix" value="1"/>
   <property name="license" value="CC BY-SA 3.0"/>
@@ -486,22 +486,6 @@
 1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138
 </data>
  </layer>
- <objectgroup name="Object" opacity="0.87">
-  <object id="7" name="To Right Hall" type="warp" x="1408" y="1376" width="96" height="32">
-   <properties>
-    <property name="dest_map" value="001-2-33"/>
-    <property name="dest_x" value="25"/>
-    <property name="dest_y" value="39"/>
-   </properties>
-  </object>
-  <object id="28" name="To Left Hall" type="warp" x="832" y="1376" width="96" height="32">
-   <properties>
-    <property name="dest_map" value="001-2-34"/>
-    <property name="dest_x" value="43"/>
-    <property name="dest_y" value="39"/>
-   </properties>
-  </object>
- </objectgroup>
  <layer name="Heights" width="71" height="71">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -548,9 +532,9 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1159,1159,1159,1159,1159,1159,1158,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1158,1159,1159,1159,1159,1159,1159,1159,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1159,1159,1159,1159,1159,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1159,1159,1159,1159,1159,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1159,1159,1159,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1159,1159,1159,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1159,1159,0,0,0,1161,1161,1161,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1161,1161,1161,0,0,0,1159,1159,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1159,1159,0,0,0,1161,1161,1161,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1161,1161,1161,0,0,0,1159,1159,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1159,1159,1159,0,1159,1160,1160,1160,1159,0,0,0,0,0,0,0,0,0,0,0,0,0,1159,1160,1160,1160,1159,0,1159,1159,1159,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1159,1159,0,0,0,1160,1160,1160,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1160,1160,1160,0,0,0,1159,1159,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1159,1159,0,0,0,1159,1159,1159,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1159,1159,1159,0,0,0,1159,1159,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1159,1159,1159,0,1159,1159,1159,1159,1159,0,0,0,0,0,0,0,0,0,0,0,0,0,1159,1159,1159,1159,1159,0,1159,1159,1159,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1159,1159,1159,1159,1159,1159,1159,1159,1159,1159,1159,1159,1159,1159,1159,1159,1159,1159,1159,1159,1159,1159,1159,1159,1159,1159,1159,1159,1159,1159,1159,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1159,1159,1159,1159,1159,1159,1159,1159,0,0,0,0,0,1159,1159,1159,0,0,0,0,0,1159,1159,1159,1159,1159,1159,1159,1159,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1159,1159,1159,1159,1159,1159,0,0,0,0,0,1159,1159,1159,0,0,0,0,0,1159,1159,1159,1159,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -577,4 +561,20 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
+ <objectgroup name="Object" opacity="0.87">
+  <object id="7" name="To Right Hall" type="warp" x="1408" y="1408" width="96" height="32">
+   <properties>
+    <property name="dest_map" value="001-2-33"/>
+    <property name="dest_x" value="43"/>
+    <property name="dest_y" value="39"/>
+   </properties>
+  </object>
+  <object id="28" name="To Left Hall" type="warp" x="832" y="1408" width="96" height="32">
+   <properties>
+    <property name="dest_map" value="001-2-33"/>
+    <property name="dest_x" value="25"/>
+    <property name="dest_y" value="39"/>
+   </properties>
+  </object>
+ </objectgroup>
 </map>