[skip ci] move all maps

11 files changed, 34 insertions, 27 deletions

diff --git a/maps/jacks-basement.tmx b/maps/017-2-1.tmx
index 2535c884..2535c884 100644
--- a/maps/jacks-basement.tmx
+++ b/maps/017-2-1.tmx
diff --git a/maps/jacks-indoor.tmx b/maps/017-2.tmx
index fe79afb5..b02d8666 100644
--- a/maps/jacks-indoor.tmx
+++ b/maps/017-2.tmx
@@ -607,12 +607,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
 </data>
  </layer>
- <objectgroup name="Objects" visible="0">
+ <objectgroup name="Objects">
   <object id="1" name="To Outside" type="warp" x="992" y="1024" width="32" height="32">
    <properties>
-    <property name="dest_map" value="009-1"/>
-    <property name="dest_x" value="42"/>
-    <property name="dest_y" value="45"/>
+    <property name="dest_map" value="017-1"/>
+    <property name="dest_x" value="0"/>
+    <property name="dest_y" value="0"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/029-2.tmx b/maps/018-1-1.tmx
index 1be1ca53..b790f281 100644
--- a/maps/029-2.tmx
+++ b/maps/018-1-1.tmx
@@ -564,7 +564,7 @@
   </object>
   <object id="6" name="To Sincerity" type="warp" x="1056" y="2496" width="32" height="32">
    <properties>
-    <property name="dest_map" value="029-1"/>
+    <property name="dest_map" value="018-1"/>
     <property name="dest_x" value="54"/>
     <property name="dest_y" value="38"/>
    </properties>
diff --git a/maps/029-1.tmx b/maps/018-1.tmx
index b22682ac..7f88d33d 100644
--- a/maps/029-1.tmx
+++ b/maps/018-1.tmx
@@ -688,7 +688,7 @@
   </object>
   <object id="7" name="To Cave" type="warp" x="1728" y="1184" width="32" height="32">
    <properties>
-    <property name="dest_map" value="029-2"/>
+    <property name="dest_map" value="018-1-1"/>
     <property name="dest_x" value="33"/>
     <property name="dest_y" value="77"/>
    </properties>
diff --git a/maps/hh-castle.tmx b/maps/018-2-1.tmx
index 0e760a55..ac2bdf82 100644
--- a/maps/hh-castle.tmx
+++ b/maps/018-2-1.tmx
@@ -85,8 +85,8 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,881,0,0,0,0,0,0,0,881,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,897,0,20,0,0,0,20,0,897,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0,0,0,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,36,0,0,0,36,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -397,7 +397,7 @@
   </object>
   <object id="2" name="To Heroes' Hold - Main Cave" type="warp" x="800" y="1056" width="96" height="32">
    <properties>
-    <property name="dest_map" value="hh-maincave"/>
+    <property name="dest_map" value="018-2"/>
     <property name="dest_x" value="0"/>
     <property name="dest_y" value="0"/>
    </properties>
diff --git a/maps/hh-outside.tmx b/maps/018-2.tmx
index 5cc26f24..7ce3480a 100644
--- a/maps/hh-outside.tmx
+++ b/maps/018-2.tmx
@@ -891,11 +891,11 @@
 </data>
  </layer>
  <objectgroup name="Objects">
-  <object id="1" name="To Swamp" type="warp" x="2016" y="3392" width="32" height="32">
+  <object id="1" name="To LoF" type="warp" x="2016" y="3392" width="32" height="32">
    <properties>
-    <property name="dest_map" value="026-1"/>
-    <property name="dest_x" value="63"/>
-    <property name="dest_y" value="17"/>
+    <property name="dest_map" value="000-1"/>
+    <property name="dest_x" value="22"/>
+    <property name="dest_y" value="22"/>
    </properties>
   </object>
   <object id="2" name="Spawn Area 1" type="spawn" x="2022" y="948" width="1902" height="704">
@@ -941,7 +941,7 @@
   </object>
   <object id="22" name="To Heroes' Hold - Castle" type="warp" x="2240" y="2016" width="128" height="32">
    <properties>
-    <property name="dest_map" value="hh-castle"/>
+    <property name="dest_map" value="018-2-1"/>
     <property name="dest_x" value="26"/>
     <property name="dest_y" value="32"/>
    </properties>
diff --git a/maps/skull-cave.tmx b/maps/018-3-1.tmx
index ffba8f46..6102c802 100644
--- a/maps/skull-cave.tmx
+++ b/maps/018-3-1.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" tiledversion="1.0.3" orientation="orthogonal" renderorder="right-down" width="150" height="150" tilewidth="32" tileheight="32" nextobjectid="1">
+<map version="1.0" tiledversion="1.0.3" orientation="orthogonal" renderorder="right-down" width="150" height="150" tilewidth="32" tileheight="32" nextobjectid="2">
  <properties>
   <property name="music" value="finalman_and_yakslem-cavesong.ogg"/>
   <property name="name" value="Skull Cave"/>
@@ -934,5 +934,13 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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="Objects"/>
+ <objectgroup name="Objects">
+  <object id="1" name="Exit" type="warp" x="2240" y="2496" width="64" height="32">
+   <properties>
+    <property name="dest_map" value="018-3"/>
+    <property name="dest_x" value="0"/>
+    <property name="dest_y" value="0"/>
+   </properties>
+  </object>
+ </objectgroup>
 </map>
diff --git a/maps/somber-cave.tmx b/maps/018-3.tmx
index bf09c4e9..d4e2bbf9 100644
--- a/maps/somber-cave.tmx
+++ b/maps/018-3.tmx
@@ -1093,7 +1093,7 @@
  <objectgroup name="Objects">
   <object id="1" name="Somber Cave Exit" type="warp" x="3648" y="736" width="32" height="32">
    <properties>
-    <property name="dest_map" value="009-1"/>
+    <property name="dest_map" value="017-1"/>
     <property name="dest_x" value="1"/>
     <property name="dest_y" value="1"/>
    </properties>
diff --git a/maps/si-cave.tmx b/maps/018-4-1.tmx
index 4fc68f73..133317ba 100644
--- a/maps/si-cave.tmx
+++ b/maps/018-4-1.tmx
@@ -923,7 +923,7 @@
  <objectgroup name="Objects">
   <object id="9" name="To Outside" type="warp" x="3264" y="2752" width="32" height="32">
    <properties>
-    <property name="dest_map" value="si-outside"/>
+    <property name="dest_map" value="018-4"/>
     <property name="dest_x" type="int" value="94"/>
     <property name="dest_y" type="int" value="90"/>
    </properties>
diff --git a/maps/si-house.tmx b/maps/018-4-2.tmx
index 81c2a718..8c87068f 100644
--- a/maps/si-house.tmx
+++ b/maps/018-4-2.tmx
@@ -339,7 +339,7 @@
   <object id="4" name="graphics/particles/fireplace.particle.xml" type="PARTICLE_EFFECT" x="1088" y="768" width="32" height="32"/>
   <object id="5" name="To Outside" type="warp" x="1056" y="1152" width="32" height="32">
    <properties>
-    <property name="dest_map" value="si-outside"/>
+    <property name="dest_map" value="018-4"/>
     <property name="dest_x" type="int" value="73"/>
     <property name="dest_y" type="int" value="26"/>
    </properties>
diff --git a/maps/si-outside.tmx b/maps/018-4.tmx
index 0039f523..7ac6f7dd 100644
--- a/maps/si-outside.tmx
+++ b/maps/018-4.tmx
@@ -789,9 +789,8 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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="Objects" visible="0">
+ <objectgroup name="Objects">
   <object id="1" name="graphics/particles/bonfire.particle.xml" type="PARTICLE_EFFECT" x="2144" y="736" width="32" height="32"/>
-  <object id="2" name="graphics/particles/warper.particle.xml" type="PARTICLE_EFFECT" x="5248" y="3360" width="32" height="32"/>
   <object id="10" name="To Cave" type="warp" x="3008" y="2848" width="32" height="32">
    <properties>
     <property name="dest_map" value="si-cave"/>
@@ -799,16 +798,16 @@
     <property name="dest_y" type="int" value="84"/>
    </properties>
   </object>
-  <object id="3" name="To Hurnscald" type="warp" x="5248" y="3360" width="32" height="32">
+  <object id="3" name="To LoF" type="warp" x="5248" y="3360" width="32" height="32">
    <properties>
-    <property name="dest_map" value="018-1"/>
-    <property name="dest_x" type="int" value="166"/>
-    <property name="dest_y" type="int" value="49"/>
+    <property name="dest_map" value="017-1"/>
+    <property name="dest_x" type="int" value="0"/>
+    <property name="dest_y" type="int" value="0"/>
    </properties>
   </object>
   <object id="9" name="To House" type="warp" x="2336" y="768" width="32" height="32">
    <properties>
-    <property name="dest_map" value="si-house"/>
+    <property name="dest_map" value="018-4-2"/>
     <property name="dest_x" type="int" value="33"/>
     <property name="dest_y" type="int" value="34"/>
    </properties>
@@ -833,7 +832,7 @@
    <properties>
     <property name="death" value="10000"/>
     <property name="max_beings" value="10"/>
-    <property name="monster_id" value="117"/>
+    <property name="monster_id" value="1002"/>
     <property name="spawn" value="15000"/>
    </properties>
   </object>