Merge branch 'maps3' into 'master'

Mapfixes

See merge request themanaworld/evolved/clientdata!29

4 files changed, 26 insertions, 26 deletions

diff --git a/maps/012-4.tmx b/maps/012-4.tmx
index 569e51a7..ce9ed77c 100644
--- a/maps/012-4.tmx
+++ b/maps/012-4.tmx
@@ -1082,12 +1082,12 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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 id="5" name="Objects" visible="0">
+ <objectgroup id="5" name="Objects">
   <object id="1" name="To Moggun Cave" type="warp" x="6176" y="1856" width="32" height="32">
    <properties>
     <property name="dest_map" value="012-3"/>
-    <property name="dest_x" value="448"/>
-    <property name="dest_y" value="62"/>
+    <property name="dest_x" value="458"/>
+    <property name="dest_y" value="72"/>
    </properties>
   </object>
   <object id="2" name="To Small Cave" type="warp" x="11616" y="832" width="32" height="32">
diff --git a/maps/099-1.tmx b/maps/099-1.tmx
index 0bfa1093..f15ec6d6 100644
--- a/maps/099-1.tmx
+++ b/maps/099-1.tmx
@@ -1713,7 +1713,7 @@
    <properties>
     <property name="dest_map" value="099-2"/>
     <property name="dest_x" value="45"/>
-    <property name="dest_y" value="27"/>
+    <property name="dest_y" value="37"/>
    </properties>
   </object>
   <object id="2" name="To Room" type="warp" x="3104" y="960" width="32" height="32">
@@ -1761,7 +1761,7 @@
   <object id="12" name="To Room" type="warp" x="4224" y="4480" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-2"/>
-    <property name="dest_x" value="111"/>
+    <property name="dest_x" value="110"/>
     <property name="dest_y" value="64"/>
    </properties>
   </object>
@@ -1789,7 +1789,7 @@
   <object id="16" name="To Room" type="warp" x="3584" y="1856" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-2"/>
-    <property name="dest_x" value="111"/>
+    <property name="dest_x" value="110"/>
     <property name="dest_y" value="90"/>
    </properties>
   </object>
@@ -1810,14 +1810,14 @@
   <object id="19" name="To Room" type="warp" x="4256" y="2400" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-2"/>
-    <property name="dest_x" value="80"/>
+    <property name="dest_x" value="79"/>
     <property name="dest_y" value="116"/>
    </properties>
   </object>
   <object id="21" name="To Room" type="warp" x="4832" y="3040" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-2"/>
-    <property name="dest_x" value="111"/>
+    <property name="dest_x" value="110"/>
     <property name="dest_y" value="116"/>
    </properties>
   </object>
@@ -1831,21 +1831,21 @@
   <object id="23" name="To Room" type="warp" x="2144" y="3392" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-2"/>
-    <property name="dest_x" value="46"/>
+    <property name="dest_x" value="45"/>
     <property name="dest_y" value="147"/>
    </properties>
   </object>
   <object id="24" name="To Room" type="warp" x="3904" y="1216" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-2"/>
-    <property name="dest_x" value="80"/>
+    <property name="dest_x" value="79"/>
     <property name="dest_y" value="147"/>
    </properties>
   </object>
   <object id="25" name="To Room" type="warp" x="4480" y="1856" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-2"/>
-    <property name="dest_x" value="112"/>
+    <property name="dest_x" value="110"/>
     <property name="dest_y" value="147"/>
    </properties>
   </object>
@@ -1973,7 +1973,7 @@
   <object id="45" name="To Room" type="warp" x="2496" y="960" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-6"/>
-    <property name="dest_x" value="112"/>
+    <property name="dest_x" value="110"/>
     <property name="dest_y" value="147"/>
    </properties>
   </object>
@@ -2001,7 +2001,7 @@
   <object id="49" name="To Room" type="warp" x="3744" y="1440" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-6"/>
-    <property name="dest_x" value="46"/>
+    <property name="dest_x" value="45"/>
     <property name="dest_y" value="147"/>
    </properties>
   </object>
@@ -2029,7 +2029,7 @@
   <object id="56" name="To Room" type="warp" x="3264" y="1856" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-6"/>
-    <property name="dest_x" value="111"/>
+    <property name="dest_x" value="110"/>
     <property name="dest_y" value="116"/>
    </properties>
   </object>
@@ -2043,14 +2043,14 @@
   <object id="59" name="To Room" type="warp" x="2848" y="1248" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-6"/>
-    <property name="dest_x" value="80"/>
+    <property name="dest_x" value="79"/>
     <property name="dest_y" value="147"/>
    </properties>
   </object>
   <object id="60" name="To Room" type="warp" x="3680" y="2400" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-6"/>
-    <property name="dest_x" value="80"/>
+    <property name="dest_x" value="79"/>
     <property name="dest_y" value="116"/>
    </properties>
   </object>
@@ -2092,7 +2092,7 @@
   <object id="66" name="To Room" type="warp" x="1504" y="2080" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-6"/>
-    <property name="dest_x" value="111"/>
+    <property name="dest_x" value="110"/>
     <property name="dest_y" value="90"/>
    </properties>
   </object>
@@ -2127,7 +2127,7 @@
   <object id="71" name="To Room" type="warp" x="2496" y="4576" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-6"/>
-    <property name="dest_x" value="111"/>
+    <property name="dest_x" value="110"/>
     <property name="dest_y" value="64"/>
    </properties>
   </object>
diff --git a/maps/099-2.tmx b/maps/099-2.tmx
index 3d85a258..158c1621 100644
--- a/maps/099-2.tmx
+++ b/maps/099-2.tmx
@@ -1713,7 +1713,7 @@
    <properties>
     <property name="dest_map" value="099-1"/>
     <property name="dest_x" value="40"/>
-    <property name="dest_y" value="131"/>
+    <property name="dest_y" value="130"/>
    </properties>
   </object>
   <object id="6" name="To Hallway" type="warp" x="2529" y="2080" width="32" height="32">
@@ -1741,7 +1741,7 @@
    <properties>
     <property name="dest_map" value="099-1"/>
     <property name="dest_x" value="84"/>
-    <property name="dest_y" value="88"/>
+    <property name="dest_y" value="87"/>
    </properties>
   </object>
   <object id="10" name="To Hallway" type="warp" x="2528" y="2912" width="32" height="32">
@@ -1768,8 +1768,8 @@
   <object id="13" name="To Hallway" type="warp" x="1440" y="3744" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-1"/>
-    <property name="dest_x" value="69"/>
-    <property name="dest_y" value="145"/>
+    <property name="dest_x" value="62"/>
+    <property name="dest_y" value="140"/>
    </properties>
   </object>
   <object id="14" name="To Hallway" type="warp" x="2560" y="3744" width="32" height="32">
diff --git a/maps/099-6.tmx b/maps/099-6.tmx
index 5a88b097..778f138a 100644
--- a/maps/099-6.tmx
+++ b/maps/099-6.tmx
@@ -1714,7 +1714,7 @@
    <properties>
     <property name="dest_map" value="099-1"/>
     <property name="dest_x" value="40"/>
-    <property name="dest_y" value="131"/>
+    <property name="dest_y" value="130"/>
    </properties>
   </object>
   <object id="6" name="To Hallway" type="warp" x="2529" y="2080" width="32" height="32">
@@ -1742,7 +1742,7 @@
    <properties>
     <property name="dest_map" value="099-1"/>
     <property name="dest_x" value="84"/>
-    <property name="dest_y" value="88"/>
+    <property name="dest_y" value="87"/>
    </properties>
   </object>
   <object id="10" name="To Hallway" type="warp" x="2528" y="2912" width="32" height="32">
@@ -1769,8 +1769,8 @@
   <object id="13" name="To Hallway" type="warp" x="1440" y="3744" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-1"/>
-    <property name="dest_x" value="69"/>
-    <property name="dest_y" value="145"/>
+    <property name="dest_x" value="62"/>
+    <property name="dest_y" value="140"/>
    </properties>
   </object>
   <object id="14" name="To Hallway" type="warp" x="2560" y="3744" width="32" height="32">