Fix some warps (patch by vargavind)

11 files changed, 536 insertions, 234 deletions

diff --git a/maps/001-1.tmx b/maps/001-1.tmx
index e626aa6a..f8b5ba1a 100644
--- a/maps/001-1.tmx
+++ b/maps/001-1.tmx
@@ -2,7 +2,7 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="167" height="114" tilewidth="32" tileheight="32">
  <properties>
-  <property name="minimap" value="graphics/images/minimap_new_3-1.png"/>
+  <property name="minimap" value="graphics/minimaps/001-1.png"/>
   <property name="music" value="Faith.ogg"/>
   <property name="name" value="Tulimshar"/>
  </properties>
@@ -51,18 +51,25 @@
   </data>
  </layer>
  <objectgroup name="Objects" width="0" height="0">
-  <object name="Warp to Tulimshar" type="WARP" x="1344" y="2816" width="160" height="32">
+  <object name="ToSandstorm" type="WARP" x="1344" y="2816" width="160" height="32">
    <properties>
-    <property name="DEST_MAP" value="1"/>
+    <property name="DEST_MAP" value="002-1"/>
     <property name="DEST_X" value="1872"/>
     <property name="DEST_Y" value="560"/>
    </properties>
   </object>
-  <object name="ToINN" type="WARP" x="1024" y="2304" width="64" height="32">
+  <object name="ToInn" type="WARP" x="1024" y="2304" width="64" height="32">
    <properties>
-    <property name="DEST_MAP" value="8"/>
-    <property name="DEST_X" value="800"/>
-    <property name="DEST_Y" value="1088"/>
+    <property name="DEST_MAP" value="001-2"/>
+    <property name="DEST_X" value="816"/>
+    <property name="DEST_Y" value="1104"/>
+   </properties>
+  </object>
+  <object name="ToHouse" type="WARP" x="2368" y="1344" width="64" height="32">
+   <properties>
+    <property name="DEST_MAP" value="001-2"/>
+    <property name="DEST_X" value="2288"/>
+    <property name="DEST_Y" value="2320"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/001-2.tmx b/maps/001-2.tmx
index 6810648b..c4f8f559 100644
--- a/maps/001-2.tmx
+++ b/maps/001-2.tmx
@@ -3,6 +3,7 @@
 <map version="1.0" orientation="orthogonal" width="160" height="100" tilewidth="32" tileheight="32">
  <properties>
   <property name="music" value="The Mana World - Snow Village.ogg"/>
+  <property name="name" value="Tulimshar indoor"/>
  </properties>
  <tileset name="INN Tilleset" firstgid="1" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/inn.png"/>
@@ -25,7 +26,7 @@
    H4sIAAAAAAAAAO3dO27CQBQFUG8gq0r2kI42O4hIKAmkSpnvztgDpKVlCgrHMqCMjJ/tOUe6sscC6RZmRPWmqgAAAAAAAAAAAAAAAADG6T66AMV4bqzvUh4iigSaRxfgj9voAi3WKa/RJSjWR8pndIkO7Br5PT7fHtelmEUXyDDEfZk8b9EFoMVNdAGK9hhdoGf7CwHK08dvf1+7XtqD7EUAADAM5/6z5wYAAAAAAAAAAAAAAAAAACiHGfvTs6mlbd3Vd7rQnLE/r8yhB2C8vlK+M579nLj2oXkGDsCUnTvPyEwurm0q5xkxTsuUl+gSAFCYp39+fnGVFnDaqnbv/aNv77V7799w5cy2j56Hn9MNAAAAAAAAAAAAAAAAAAAAgGk4AE/rtgoA+gAA
   </data>
  </layer>
- <layer name="Collision" width="160" height="100">
+ <layer name="Collision" width="160" height="100" visible="0">
   <data encoding="base64" compression="gzip">
    H4sIAAAAAAAAAO3c2Y6EIBAF0Nb//+h5GRPTccGFKqAPyYnpxQjFDfii8/T5zAAAAAAAAAAAAAAAAABA06Z/v9aPVsZdY0ylvs9ptZ+1+5d1najrRs5r6ThLalCrLq3kL/p6W21afZ+dn8i6LmOPnvcWcrfXr6PPUdftzZP5bGW/y8rgVi1GyUVk/u6ct7X+RdW9pf33u09P6/prntRpL3+1a99S/hbr+7HIfb93S+3mg+P6nm857s1vVO1byB8583g0v+s813S1ZdeZ+vmzznDVm/mSP66SPzLZf8lUo2WPCQAAAAAAAAAAAAAAAAAARtHD8+glzxt7Fnk8rbzfoOS5d/mjpr18eSdDX2rst5H7b0n+smvMuPk7a9n1pTx/d7+bd45R658M9qv3/FkD+zba/ptdT8bP30L++neWk73f7573JvnrX4/5u9Oy68x5TnrZf+VvHD3m72oGs2vMWPmz9o0jomX0ef2/7BoDAAAAAAAAAAAAAAAAAAAA8J4/UHc7TwD6AAA=
   </data>
@@ -33,72 +34,79 @@
  <objectgroup name="Objects" width="0" height="0">
   <object name="ToOutside" type="WARP" x="800" y="1120" width="32" height="32">
    <properties>
-    <property name="DEST_MAP" value="3"/>
+    <property name="DEST_MAP" value="001-1"/>
     <property name="DEST_X" value="1040"/>
-    <property name="DEST_Y" value="2336"/>
+    <property name="DEST_Y" value="2320"/>
    </properties>
   </object>
   <object name="ToArena" type="WARP" x="736" y="736" width="32" height="64">
    <properties>
-    <property name="DEST_MAP" value="6"/>
+    <property name="DEST_MAP" value="001-3"/>
     <property name="DEST_X" value="2304"/>
     <property name="DEST_Y" value="992"/>
    </properties>
   </object>
   <object name="To2ndFloor" type="WARP" x="1408" y="768" width="32" height="64">
    <properties>
-    <property name="DEST_MAP" value="8"/>
-    <property name="DEST_X" value="2080"/>
-    <property name="DEST_Y" value="800"/>
+    <property name="DEST_MAP" value="001-2"/>
+    <property name="DEST_X" value="2096"/>
+    <property name="DEST_Y" value="816"/>
    </properties>
   </object>
   <object name="To1stFloor" type="WARP" x="2048" y="800" width="32" height="32">
    <properties>
-    <property name="DEST_MAP" value="8"/>
-    <property name="DEST_X" value="1280"/>
-    <property name="DEST_Y" value="832"/>
+    <property name="DEST_MAP" value="001-2"/>
+    <property name="DEST_X" value="1360"/>
+    <property name="DEST_Y" value="816"/>
    </properties>
   </object>
   <object name="ToBedroom" type="WARP" x="2144" y="960" width="32" height="32">
    <properties>
-    <property name="DEST_MAP" value="8"/>
+    <property name="DEST_MAP" value="001-2"/>
     <property name="DEST_X" value="3280"/>
-    <property name="DEST_Y" value="736"/>
+    <property name="DEST_Y" value="752"/>
    </properties>
   </object>
   <object name="ToDeposit" type="WARP" x="2432" y="960" width="32" height="32">
    <properties>
-    <property name="DEST_MAP" value="8"/>
+    <property name="DEST_MAP" value="001-2"/>
     <property name="DEST_X" value="4176"/>
-    <property name="DEST_Y" value="736"/>
+    <property name="DEST_Y" value="752"/>
    </properties>
   </object>
   <object name="ToCasino" type="WARP" x="2176" y="704" width="64" height="32">
    <properties>
-    <property name="DEST_MAP" value="8"/>
-    <property name="DEST_X" value="1024"/>
-    <property name="DEST_Y" value="2304"/>
+    <property name="DEST_MAP" value="001-2"/>
+    <property name="DEST_X" value="1040"/>
+    <property name="DEST_Y" value="2320"/>
    </properties>
   </object>
   <object name="To2ndFloor" type="WARP" x="3264" y="704" width="64" height="32">
    <properties>
-    <property name="DEST_MAP" value="8"/>
-    <property name="DEST_X" value="2144"/>
-    <property name="DEST_Y" value="928"/>
+    <property name="DEST_MAP" value="001-2"/>
+    <property name="DEST_X" value="2160"/>
+    <property name="DEST_Y" value="944"/>
    </properties>
   </object>
   <object name="To2ndFloor" type="WARP" x="4160" y="704" width="64" height="32">
    <properties>
-    <property name="DEST_MAP" value="8"/>
-    <property name="DEST_X" value="2432"/>
-    <property name="DEST_Y" value="928"/>
+    <property name="DEST_MAP" value="001-2"/>
+    <property name="DEST_X" value="2448"/>
+    <property name="DEST_Y" value="944"/>
    </properties>
   </object>
   <object name="To2ndFloor" type="WARP" x="1024" y="2336" width="32" height="32">
    <properties>
-    <property name="DEST_MAP" value="8"/>
+    <property name="DEST_MAP" value="001-2"/>
     <property name="DEST_X" value="2192"/>
-    <property name="DEST_Y" value="736"/>
+    <property name="DEST_Y" value="752"/>
+   </properties>
+  </object>
+  <object name="ToOutdoor" type="WARP" x="2272" y="2336" width="32" height="32">
+   <properties>
+    <property name="DEST_MAP" value="001-1"/>
+    <property name="DEST_X" value="2416"/>
+    <property name="DEST_Y" value="1360"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/001-3.tmx b/maps/001-3.tmx
index 8a0a9d87..868223d3 100644
--- a/maps/001-3.tmx
+++ b/maps/001-3.tmx
@@ -1,5 +1,10 @@
-<?xml version="1.0"?>
-<map version="0.99b" orientation="orthogonal" width="150" height="150" tilewidth="32" tileheight="32">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
+<map version="1.0" orientation="orthogonal" width="150" height="150" tilewidth="32" tileheight="32">
+ <properties>
+  <property name="minimap" value="graphics/minimaps/001-3.png"/>
+  <property name="name" value="Tulimshar arena"/>
+ </properties>
  <tileset name="Arena" firstgid="1" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/arena.png"/>
  </tileset>
@@ -30,21 +35,16 @@
   </data>
  </layer>
  <objectgroup name="Objects" width="0" height="0">
-  <object name="ToINN" type="WARP" x="2272" y="928" width="96" height="32">
+  <object name="ToInn" type="WARP" x="2272" y="928" width="96" height="32">
    <properties>
-    <property name="DEST_MAP">
-     8
-    </property>
-    <property name="DEST_Y">
-     736
-    </property>
-    <property name="DEST_X">
-     768
-    </property>
+    <property name="DEST_MAP" value="001-2"/>
+    <property name="DEST_X" value="768"/>
+    <property name="DEST_Y" value="736"/>
    </properties>
   </object>
-  <object name="Phaet the Royal Guard" type="NPC" x="2480" y="1200" width="0" height="0">
+  <object name="Phaet the Royal Guard" type="NPC" x="2480" y="1200">
    <properties>
+    <property name="NPC_ID" value="125"/>
     <property name="SCRIPT">
      function npc_handler(npc, ch)
        do_message(npc, ch, "Do you want to go back?")
@@ -56,21 +56,16 @@
        end
      end
     </property>
-    <property name="NPC_ID">
-     125
-    </property>
    </properties>
   </object>
-  <object name="Aradin the Royal Guard" type="NPC" x="2224" y="1200" width="0" height="0">
+  <object name="Aradin the Royal Guard" type="NPC" x="2224" y="1200">
    <properties>
+    <property name="NPC_ID" value="126"/>
     <property name="SCRIPT">
      function npc_handler(npc, ch)
        do_message(npc, ch, "Don't touch me!\nYou won't find it very funny.")
      end
     </property>
-    <property name="NPC_ID">
-     126
-    </property>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/002-1.tmx b/maps/002-1.tmx
index 4488ec01..43d61693 100644
--- a/maps/002-1.tmx
+++ b/maps/002-1.tmx
@@ -2,8 +2,9 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="136" height="128" tilewidth="32" tileheight="32">
  <properties>
-  <property name="minimap" value="graphics/images/minimap_new_1-1.png"/>
+  <property name="minimap" value="graphics/minimaps/002-1"/>
   <property name="music" value="Faith.ogg"/>
+  <property name="name" value="Sandstorm, south of Tulimshar"/>
   <property name="overlay0image" value="graphics/images/ambient/sandstorm.png"/>
   <property name="overlay0parallax" value="1.0"/>
   <property name="overlay0scrollX" value="4"/>
@@ -55,13 +56,13 @@
  </layer>
  <layer name="Collision" width="136" height="128">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAAO2V0W7sIAxEq/3/j+5DtVJEAyFgMzackUa6mybE9pz4fj4/Px+MMcYYY4wxxhhjjPG2vkpdC47lO6lrwnEMH3msyAg+8hg+8Nus3mjkjPIZizqe3lG75+271XkpWPDIZ2epc1y5C6zZWMmaxe56e44645VsRFfvzvPo/+nd2eyhVedG4runFnXWHnx4fWPW59bOe/seT+bUWav2h1U2J0id9ywfnt+b172K80alzttif7SuWzA1qvI9qzPvfV/rPnXeFnyMzMRCEb5x7xrUeVvzkVWrch55Jos9ZXH+bvyq847ER2tGVs9G5+eu3kxGa6XO24qPKOy8rePa1+oeet6nzjsqH4p91ZvXyveq87biI6rKmlW7YlTqvC34WLlXTpM67512SOTaRqTO2YOP69+j8xRd6pw998eKvZOJvad5tK5l88hMrHTSTlLnbM3I9boFGzuxMNKLOuMVO+Tb54x2YeSt1Bmv4gONSZ0xfMSWOmNPNnZiSNWLOucIu2PmvOwMPtWvzjkCH6gudc7wEVvqnFcyAlfvpc6YHRJT3/mqM4aP2P2oM4aP2FJn7MWGJz8nsanO2XN3nJSjhe5mq87Zk4+dtXIG6qx35WO0zmj9qbO24mN2rpnYW6HrLNR5W+0P8vWROm8rPpCP1HnDR2yp84aPPt3NYcVM1HnDx39F61Wd+cl8ZOhJnfnJfGSQOvMRPixYicJbD//Kb0adOfsjdn/qzOEjttSZv+WjxcmJDK3oWZ37LvsjS513atWuzj07FwqtnI86f/iILXX+8BFb6vxPZKTVX7Se1dnP8BFpjm/0rbtWf6S+1Nl775BIs84qdfajfETLfobvu3usv5VRqbP33B/ZVONEKXX28BFb6ux35MOz5tXzUGffy0drLhkZiqzrPNXZZ94fkWuzkjp7Cz4i51TWNtKz8ltRZ59lf5T1lLVFrn1W6vwzMdL6jeaVmQ/kryg7ZDfuvPpR/7/BDoktdeYn8eH5jXtJnflJfGSUOnP4iC115vChUc881XnDR2yp847AB9zVZ6DOOwIfM2rVNlrz03Mr56DOOzMbpa41etYLH20+nn4jG6nznuUj236JoDdzUuedmY/v+2b2XnSp8/biwzKHTHmOqtajOu9RPsra0X+15lXOTp2rFx8Rpa6r9f6n76lnR0d2b5+989pdd3Or/e3u2et9WTw6m1NUy7W89vTs9Vomo37N7N3ymSzOKEXddzOr/bv2fHlOBqM/je6B2u/yTPjYS3ezsZiXOm/4iKW7nZLRFr2fpLez+96nznmGj5PzHpE6M4wxxhhjjDHGGGOMMcYYY4wxxhhjjDHGGGOMMcY4kn8BKB/zJAAQAQA=
+   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
   </data>
  </layer>
  <objectgroup name="Objects" width="0" height="0">
   <object name="ToTulimshar" type="WARP" x="1792" y="384" width="160" height="32">
    <properties>
-    <property name="DEST_MAP" value="3"/>
+    <property name="DEST_MAP" value="001-1"/>
     <property name="DEST_X" value="1424"/>
     <property name="DEST_Y" value="2576"/>
    </properties>
@@ -136,26 +137,33 @@
     <property name="FILENAME" value="scripts/test.lua"/>
    </properties>
   </object>
-  <object name="ToEastDesert" type="WARP" x="3456" y="2496" width="64" height="96">
+  <object name="ToEasternDesert" type="WARP" x="3456" y="2496" width="32" height="96">
    <properties>
-    <property name="DEST_MAP" value="7"/>
-    <property name="DEST_X" value="704"/>
+    <property name="DEST_MAP" value="005-1"/>
+    <property name="DEST_X" value="752"/>
     <property name="DEST_Y" value="1296"/>
    </properties>
   </object>
-  <object name="ToWestDesert" type="WARP" x="352" y="2080" width="64" height="160">
+  <object name="ToWesternDesert" type="WARP" x="384" y="2079" width="32" height="160">
    <properties>
-    <property name="DEST_MAP" value="15"/>
-    <property name="DEST_X" value="5376"/>
-    <property name="DEST_Y" value="2112"/>
+    <property name="DEST_MAP" value="003-1"/>
+    <property name="DEST_X" value="5392"/>
+    <property name="DEST_Y" value="2448"/>
    </properties>
   </object>
   <object name="ToCave" type="WARP" x="640" y="3048" width="32" height="32">
    <properties>
-    <property name="DEST_MAP" value="2"/>
+    <property name="DEST_MAP" value="002-3"/>
     <property name="DEST_X" value="1200"/>
     <property name="DEST_Y" value="1024"/>
    </properties>
   </object>
+  <object name="ToBeach" type="WARP" x="864" y="416" width="96" height="32">
+   <properties>
+    <property name="DEST_MAP" value="004-1"/>
+    <property name="DEST_X" value="2704"/>
+    <property name="DEST_Y" value="3568"/>
+   </properties>
+  </object>
  </objectgroup>
 </map>
diff --git a/maps/002-4.tmx b/maps/002-4.tmx
index 86a1f4e8..d7ab4bbf 100644
--- a/maps/002-4.tmx
+++ b/maps/002-4.tmx
@@ -1,8 +1,10 @@
-<?xml version="1.0"?>
-<map version="0.99b" orientation="orthogonal" width="128" height="128" tilewidth="32" tileheight="32">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
+<map version="1.0" orientation="orthogonal" width="128" height="128" tilewidth="32" tileheight="32">
  <properties>
+  <property name="minimap" value="graphics/minimaps/002-4"/>
   <property name="music" value="finalman_and_yakslem-cavesong.ogg"/>
-  <property name="minimap" value="graphics/images/minimap_new_5-1.png"/>
+  <property name="name" value="Desert mines, level 2"/>
  </properties>
  <tileset name="cave" firstgid="1" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/cave.png" trans="ff00ff"/>
@@ -31,74 +33,31 @@
   </data>
  </layer>
  <objectgroup name="Object Group 1" width="0" height="0">
-  <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="1280" y="1440" width="32" height="32">
-   <properties/>
-  </object>
-  <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="1600" y="1440" width="32" height="32">
-   <properties/>
-  </object>
-  <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="1920" y="1376" width="32" height="32">
-   <properties/>
-  </object>
-  <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="2080" y="1376" width="32" height="32">
-   <properties/>
-  </object>
-  <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="1920" y="1600" width="32" height="32">
-   <properties/>
-  </object>
-  <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="2080" y="1600" width="32" height="32">
-   <properties/>
-  </object>
-  <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="1920" y="1824" width="32" height="32">
-   <properties/>
-  </object>
-  <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="2080" y="1824" width="32" height="32">
-   <properties/>
-  </object>
-  <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="1920" y="2048" width="32" height="32">
-   <properties/>
-  </object>
-  <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="2080" y="2048" width="32" height="32">
-   <properties/>
-  </object>
-  <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="1920" y="2272" width="32" height="32">
-   <properties/>
-  </object>
-  <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="2080" y="2272" width="32" height="32">
-   <properties/>
-  </object>
-  <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="1920" y="2496" width="32" height="32">
-   <properties/>
-  </object>
-  <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="2080" y="2496" width="32" height="32">
-   <properties/>
-  </object>
-  <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="1920" y="2720" width="32" height="32">
-   <properties/>
-  </object>
-  <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="2080" y="2720" width="32" height="32">
-   <properties/>
-  </object>
-  <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="1440" y="2176" width="32" height="32">
-   <properties/>
-  </object>
-  <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="1440" y="2368" width="32" height="32">
-   <properties/>
-  </object>
-  <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="2848" y="1120" width="32" height="32">
-   <properties/>
-  </object>
-  <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="3104" y="1120" width="32" height="32">
-   <properties/>
-  </object>
-  <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="2848" y="1344" width="32" height="32">
-   <properties/>
-  </object>
-  <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="3104" y="1344" width="32" height="32">
-   <properties/>
-  </object>
-  <object name="Naem the Miner" type="NPC" x="1040" y="3024" width="0" height="0">
+  <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="1280" y="1440" width="32" height="32"/>
+  <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="1600" y="1440" width="32" height="32"/>
+  <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="1920" y="1376" width="32" height="32"/>
+  <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="2080" y="1376" width="32" height="32"/>
+  <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="1920" y="1600" width="32" height="32"/>
+  <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="2080" y="1600" width="32" height="32"/>
+  <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="1920" y="1824" width="32" height="32"/>
+  <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="2080" y="1824" width="32" height="32"/>
+  <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="1920" y="2048" width="32" height="32"/>
+  <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="2080" y="2048" width="32" height="32"/>
+  <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="1920" y="2272" width="32" height="32"/>
+  <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="2080" y="2272" width="32" height="32"/>
+  <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="1920" y="2496" width="32" height="32"/>
+  <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="2080" y="2496" width="32" height="32"/>
+  <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="1920" y="2720" width="32" height="32"/>
+  <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="2080" y="2720" width="32" height="32"/>
+  <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="1440" y="2176" width="32" height="32"/>
+  <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="1440" y="2368" width="32" height="32"/>
+  <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="2848" y="1120" width="32" height="32"/>
+  <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="3104" y="1120" width="32" height="32"/>
+  <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="2848" y="1344" width="32" height="32"/>
+  <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="3104" y="1344" width="32" height="32"/>
+  <object name="Naem the Miner" type="NPC" x="1040" y="3024">
    <properties>
+    <property name="NPC_ID" value="109"/>
     <property name="SCRIPT">
      function npc_handler(npc, ch)
        do_message(npc, ch, "Do you want me to lift you to the upper level?")
@@ -108,13 +67,11 @@
        end
      end
     </property>
-    <property name="NPC_ID">
-     109
-    </property>
    </properties>
   </object>
-  <object name="Chest" type="NPC" x="2976" y="1184" width="0" height="0">
+  <object name="Chest" type="NPC" x="2976" y="1184">
    <properties>
+    <property name="NPC_ID" value="111"/>
     <property name="SCRIPT">
      function npc_handler(npc, ch)
        local g = tonumber(get_quest_var(npc, ch, "005_chest"))
@@ -134,35 +91,20 @@
        end
      end
     </property>
-    <property name="NPC_ID">
-     111
-    </property>
    </properties>
   </object>
-  <object name="Spider" type="SPAWN" x="0" y="0" width="0" height="0">
+  <object name="Spider" type="SPAWN" x="0" y="0">
    <properties>
-    <property name="SPAWN_RATE">
-     10
-    </property>
-    <property name="MONSTER_ID">
-     10
-    </property>
-    <property name="MAX_BEINGS">
-     20
-    </property>
+    <property name="MAX_BEINGS" value="20"/>
+    <property name="MONSTER_ID" value="10"/>
+    <property name="SPAWN_RATE" value="10"/>
    </properties>
   </object>
-  <object name="Yellow Slime" type="SPAWN" x="0" y="0" width="0" height="0">
+  <object name="Yellow Slime" type="SPAWN" x="0" y="0">
    <properties>
-    <property name="SPAWN_RATE">
-     10
-    </property>
-    <property name="MONSTER_ID">
-     5
-    </property>
-    <property name="MAX_BEINGS">
-     25
-    </property>
+    <property name="MAX_BEINGS" value="25"/>
+    <property name="MONSTER_ID" value="5"/>
+    <property name="SPAWN_RATE" value="10"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/003-1.tmx b/maps/003-1.tmx
index 6b6c015e..d967137d 100644
--- a/maps/003-1.tmx
+++ b/maps/003-1.tmx
@@ -2,8 +2,9 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="190" height="138" tilewidth="32" tileheight="32">
  <properties>
-  <property name="minimap" value="graphics/images/minimap_new_15-1.png"/>
+  <property name="minimap" value="graphics/minimaps/003-1"/>
   <property name="music" value="Faith.ogg"/>
+  <property name="name" value="Beach leading to woodlands"/>
  </properties>
  <tileset name="Desert1" firstgid="1" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/desert1.png"/>
@@ -46,22 +47,22 @@
  </layer>
  <layer name="Collision" width="190" height="138">
   <data encoding="base64" compression="gzip">
-   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
+   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
   </data>
  </layer>
  <objectgroup name="Objects" width="0" height="0">
-  <object name="ToDesert" type="WARP" x="5440" y="2400" width="96" height="96">
+  <object name="ToSandstorm" type="WARP" x="5504" y="2400" width="32" height="160">
    <properties>
-    <property name="DEST_MAP" value="1"/>
-    <property name="DEST_X" value="480"/>
-    <property name="DEST_Y" value="2112"/>
+    <property name="DEST_MAP" value="002-1"/>
+    <property name="DEST_X" value="1200"/>
+    <property name="DEST_Y" value="3504"/>
    </properties>
   </object>
   <object name="ToWoodland" type="WARP" x="608" y="736" width="96" height="32">
    <properties>
-    <property name="DEST_MAP" value="16"/>
-    <property name="DEST_X" value="3840"/>
-    <property name="DEST_Y" value="3584"/>
+    <property name="DEST_MAP" value="007-1"/>
+    <property name="DEST_X" value="3856"/>
+    <property name="DEST_Y" value="3600"/>
    </properties>
   </object>
   <object name="Black Scorpion" type="SPAWN" x="3456" y="1248" width="640" height="640">
diff --git a/maps/004-1.tmx b/maps/004-1.tmx
index f0dcd10d..56c941f5 100644
--- a/maps/004-1.tmx
+++ b/maps/004-1.tmx
@@ -2,8 +2,9 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="117" height="133" tilewidth="32" tileheight="32">
  <properties>
-  <property name="minimap" value="graphics/images/minimap_new_34-1.png"/>
+  <property name="minimap" value="graphics/minimaps/004-1.png"/>
   <property name="music" value="Faith.ogg"/>
+  <property name="name" value="Beach west of Tulimshar"/>
  </properties>
  <tileset name="Desert1" firstgid="1" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/desert1.png"/>
@@ -49,5 +50,20 @@
    H4sIAAAAAAAAAO2UUW7jMAxEC+z979Fj7leAQLUTWSI5I+kN8IDd1BHpN2p///38/AIAAAAAAAAAAAAAAAAAAAAAAEAo71HvAvGd0uv6XEW9E8T0eBf1rjDfIb16cOU9K+p33R1VZndVe3NkpouI0KlHnxF5zafT2j4reqfTuj4zunvvYKaT9tyTWT1X76B2Sp/xUXvdudOsGd/OVXt16rSi54pZaq9Onfb6cku7k9rrap2uELVXOv2bq93u9r179lSeel0laq9qZt2p8mm22qkD1d5fn2fNVvt0INrn1b/vnvl0zuiuap8OZOTT2e3n0fuqfap7jO61x3/2HVS7VXf6yUGEu8jvndxXVKfRc+5mPo3anSuZnrKjdudKlDtV1P4cyfadHbU/R1aP2p8bTundp91d7dCNp07vnpm5H7N3S+3QjR2iduhCheeq76tdulGVzFlqh0449BERtUcndonaoxO7RO3RiVmPqrSz1R6d2CVqj07sErVHJ1bP6x3UHp1o3VT4f/qz3p/DuD/HqF068NSXe9Q+HahyXBW1TwcynCqj9umAW3p2+vSM2qearCjvitqpGqXvjLPbGSdSnYrZaqdqepxE9kKntZ1G3ose31lRO1WT4YFO9X26d9pzJp2u1enTqL069BntoSp3s9Rud++0suOMd1mJSA9VPT159iSivThG7VjVZ08fVZ1G3w21Z2WvEX4co3a8aqfOUTt27HS0s7vvZd2BT/NO4oSoHbt32vOdmd/rjHumdrxCrxWuo87/NmdHer3f+RrxPLrf7DucRHR6u6h6H7XfnbpVd6r26UDbA52uz2xHdOoHne7Fk9DpGmR2mu3X5S658TQj353Zx+0eOVOZij3ez1K7deuzfS7Ce88OV5+Pzlb7deqz9eGYp+9wAt/8jPbvdA/UjpWdRrtzidrxqr1m35fXjJFn1H5X7bR15xS135U7dY3ar7JPp46z/n7sToSr6OdH9rq6m+3/TyDCZWVm9lO7XuH3c7Wofa/eZ/a8kTPVznfqc3Z21N5q76o+q+//aEbOULt3osLLaJ9PzlF7PJmoTujUk9k+6BQAAAAAAAAAAAAAAAAAAAAATuc/7ECD2STzAAA=
   </data>
  </layer>
- <objectgroup name="Objects" width="0" height="0"/>
+ <objectgroup name="Objects" width="0" height="0">
+  <object name="ToSandstorm" type="WARP" x="2656" y="3616" width="96" height="32">
+   <properties>
+    <property name="DEST_MAP" value="002-1"/>
+    <property name="DEST_X" value="944"/>
+    <property name="DEST_Y" value="496"/>
+   </properties>
+  </object>
+  <object name="ToBeach" type="WARP" x="1152" y="3552" width="96" height="32">
+   <properties>
+    <property name="DEST_MAP" value="003-1"/>
+    <property name="DEST_X" value="4528"/>
+    <property name="DEST_Y" value="688"/>
+   </properties>
+  </object>
+ </objectgroup>
 </map>
diff --git a/maps/005-1.tmx b/maps/005-1.tmx
index bd0fe2e1..0dac2d43 100644
--- a/maps/005-1.tmx
+++ b/maps/005-1.tmx
@@ -2,8 +2,9 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="200" height="130" tilewidth="32" tileheight="32">
  <properties>
-  <property name="minimap" value="graphics/images/minimap_new_7-1.png"/>
+  <property name="minimap" value="graphics/minimaps/005-1.png"/>
   <property name="music" value="Faith.ogg"/>
+  <property name="name" value="Snake desert"/>
   <property name="overlay0image" value="tmw/data/graphics/images/ambient/sandstorm.png"/>
   <property name="overlay0parallax" value="1.0"/>
   <property name="overlay0scrollX" value="4"/>
@@ -53,11 +54,11 @@
   </data>
  </layer>
  <objectgroup name="Objects" width="0" height="0">
-  <object name="Warp1" type="WARP" x="608" y="1248" width="64" height="128">
+  <object name="ToSandstorm" type="WARP" x="608" y="1248" width="32" height="128">
    <properties>
-    <property name="DEST_MAP" value="1"/>
-    <property name="DEST_X" value="3392"/>
-    <property name="DEST_Y" value="2496"/>
+    <property name="DEST_MAP" value="002-1"/>
+    <property name="DEST_X" value="3408"/>
+    <property name="DEST_Y" value="2512"/>
    </properties>
   </object>
   <object name="Maggot" type="SPAWN" x="0" y="0">
@@ -70,5 +71,110 @@
     <property name="MONSTER_ID" value="8"/>
    </properties>
   </object>
+  <object name="ToSnakeCave" type="WARP" x="2848" y="736" width="32" height="32">
+   <properties>
+    <property name="DEST_MAP" value="005-3"/>
+    <property name="DEST_X" value="1680"/>
+    <property name="DEST_Y" value="1104"/>
+   </properties>
+  </object>
+  <object name="ToSnakeCave" type="WARP" x="2272" y="2400" width="32" height="32">
+   <properties>
+    <property name="DEST_MAP" value="005-3"/>
+    <property name="DEST_X" value="1072"/>
+    <property name="DEST_Y" value="2672"/>
+   </properties>
+  </object>
+  <object name="ToDesertMountains" type="WARP" x="5344" y="3456" width="32" height="32">
+   <properties>
+    <property name="DEST_MAP" value="006-1"/>
+    <property name="DEST_X" value="656"/>
+    <property name="DEST_Y" value="1072"/>
+   </properties>
+  </object>
+  <object name="ToDesertMountains" type="WARP" x="5376" y="3424" width="32" height="32">
+   <properties>
+    <property name="DEST_MAP" value="006-1"/>
+    <property name="DEST_X" value="688"/>
+    <property name="DEST_Y" value="1040"/>
+   </properties>
+  </object>
+  <object name="ToDesertMountains" type="WARP" x="5408" y="3392" width="32" height="32">
+   <properties>
+    <property name="DEST_MAP" value="006-1"/>
+    <property name="DEST_X" value="720"/>
+    <property name="DEST_Y" value="1008"/>
+   </properties>
+  </object>
+  <object name="ToDesertMountains" type="WARP" x="5472" y="3328" width="32" height="32">
+   <properties>
+    <property name="DEST_MAP" value="006-1"/>
+    <property name="DEST_X" value="784"/>
+    <property name="DEST_Y" value="944"/>
+   </properties>
+  </object>
+  <object name="ToDesertMountains" type="WARP" x="5440" y="3360" width="32" height="32">
+   <properties>
+    <property name="DEST_MAP" value="006-1"/>
+    <property name="DEST_X" value="752"/>
+    <property name="DEST_Y" value="976"/>
+   </properties>
+  </object>
+  <object name="ToDesertMountains" type="WARP" x="5504" y="3296" width="32" height="32">
+   <properties>
+    <property name="DEST_MAP" value="006-1"/>
+    <property name="DEST_X" value="816"/>
+    <property name="DEST_Y" value="912"/>
+   </properties>
+  </object>
+  <object name="ToDesertMountains" type="WARP" x="5568" y="3232" width="32" height="32">
+   <properties>
+    <property name="DEST_MAP" value="006-1"/>
+    <property name="DEST_X" value="880"/>
+    <property name="DEST_Y" value="848"/>
+   </properties>
+  </object>
+  <object name="ToDesertMountains" type="WARP" x="5536" y="3264" width="32" height="32">
+   <properties>
+    <property name="DEST_MAP" value="006-1"/>
+    <property name="DEST_X" value="848"/>
+    <property name="DEST_Y" value="880"/>
+   </properties>
+  </object>
+  <object name="ToDesertMountains" type="WARP" x="5600" y="3200" width="32" height="32">
+   <properties>
+    <property name="DEST_MAP" value="006-1"/>
+    <property name="DEST_X" value="912"/>
+    <property name="DEST_Y" value="816"/>
+   </properties>
+  </object>
+  <object name="ToDesertMountains" type="WARP" x="5632" y="3168" width="32" height="32">
+   <properties>
+    <property name="DEST_MAP" value="006-1"/>
+    <property name="DEST_X" value="944"/>
+    <property name="DEST_Y" value="784"/>
+   </properties>
+  </object>
+  <object name="ToDesertMountains" type="WARP" x="5664" y="3136" width="32" height="32">
+   <properties>
+    <property name="DEST_MAP" value="006-1"/>
+    <property name="DEST_X" value="976"/>
+    <property name="DEST_Y" value="752"/>
+   </properties>
+  </object>
+  <object name="ToDesertMountains" type="WARP" x="5696" y="3104" width="32" height="32">
+   <properties>
+    <property name="DEST_MAP" value="006-1"/>
+    <property name="DEST_X" value="1008"/>
+    <property name="DEST_Y" value="720"/>
+   </properties>
+  </object>
+  <object name="ToDesertMountains" type="WARP" x="5728" y="3072" width="32" height="32">
+   <properties>
+    <property name="DEST_MAP" value="006-1"/>
+    <property name="DEST_X" value="1040"/>
+    <property name="DEST_Y" value="688"/>
+   </properties>
+  </object>
  </objectgroup>
 </map>
diff --git a/maps/005-3.tmx b/maps/005-3.tmx
index bd7e95ee..a8908f71 100644
--- a/maps/005-3.tmx
+++ b/maps/005-3.tmx
@@ -2,8 +2,9 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="120" height="116" tilewidth="32" tileheight="32">
  <properties>
-  <property name="minimap" value="graphics/images/minimap_new_22-1.png"/>
+  <property name="minimap" value="graphics/minimaps/005-3.png"/>
   <property name="music" value="finalman_and_yakslem-cavesong.ogg"/>
+  <property name="name" value="Snake pit"/>
   <property name="overlay0image" value="graphics/images/ambient/spotlight.png"/>
  </properties>
  <tileset name="cave" firstgid="1" tilewidth="32" tileheight="32">
@@ -44,4 +45,20 @@
    H4sIAAAAAAAAAO2TQW7DMAwE0/+fmhf30gKBkUi7FGVK6hCYi0Mx9I78/Ho8ngAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC/BavT5ljvJ/6ky4x2+vx7kjrarO4hSu35Dj99rnOPr+Bb9znEa/H6eifqvz2Y1oRWZk7FSd1y6MVmvW9Te87uW25XfGXtV57cTMytytOqcdcZxkuY1UdU47MpJj1Alu6/x+6nEdK/3V7346ihfVP37Xo+dF/TYdZ/it86v4792DUb94v8dtz+/rGed7VO9TdT470/seFbfKDMdvdB74fqOVcUfU2VDrd0ZV57YDUS+Kt1G/zh6guVVyzZjz7vnIzvjWssrqmeVX8Vyd6yoouUR67vCLYz8XpS86c4bf1g7VGe/oNzIXv+f4VT3it8Zvq1pz1Jyd5xFH+J3jd8Rjby/8zner+hj1G3UcOXMq0Yr6/fTc2THyPtU5r+i31aPMce6Rsmf0XaozXtFvr0+Z5fjN8IBfLZNo36jfURe4zfXrOHYq832q813NretXcRwp/M5z7Pq9nnH8qTMj71Od7Qq4rnrP3bsQ6VffqTrbFVjBb+8Mftfxq5SzC37P9+u6wq/uV3EW7Z3lGL/tTEcyz/QTnRH931NR8hj1O7qTMwu/vhO35669ZtytE1FyafXMdIDfe/y2MuydjZ57dx6/8xxHPEXK3e3T7+9m/VeiOc+qrN2qc12JaIazyvH7btfqPFckI3vlXMbdqc5qR9xcs13geS+/mXu0nkM7S8evWnfcNRznZViRNX7PdavsWp3hqqh5VXvt7VKd46pEs6rOtvqO7cLu2ey6NwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAHz/tMY9ygNkAAA==
   </data>
  </layer>
+ <objectgroup name="Object Group 4" width="0" height="0">
+  <object name="CaveExit" type="WARP" x="1664" y="1056" width="32" height="32">
+   <properties>
+    <property name="DEST_MAP" value="005-1"/>
+    <property name="DEST_X" value="2864"/>
+    <property name="DEST_Y" value="784"/>
+   </properties>
+  </object>
+  <object name="CaveExit" type="WARP" x="1056" y="2624" width="32" height="32">
+   <properties>
+    <property name="DEST_MAP" value="005-1"/>
+    <property name="DEST_X" value="2288"/>
+    <property name="DEST_Y" value="2448"/>
+   </properties>
+  </object>
+ </objectgroup>
 </map>
diff --git a/maps/006-1.tmx b/maps/006-1.tmx
index 722347c7..d1a3bfb0 100644
--- a/maps/006-1.tmx
+++ b/maps/006-1.tmx
@@ -1,8 +1,10 @@
-<?xml version="1.0"?>
-<map version="0.99b" orientation="orthogonal" width="150" height="150" tilewidth="32" tileheight="32">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
+<map version="1.0" orientation="orthogonal" width="150" height="150" tilewidth="32" tileheight="32">
  <properties>
-  <property name="minimap" value="graphics/images/minimap_new_24-1.png"/>
+  <property name="minimap" value="graphics/minimaps/006-1.png"/>
   <property name="music" value="Faith.ogg"/>
+  <property name="name" value="Desert mountains"/>
  </properties>
  <tileset name="desert1" firstgid="1" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/desert1.png" trans="ff00ff"/>
@@ -39,7 +41,233 @@
  </layer>
  <layer name="Collision" width="150" height="150">
   <data encoding="base64" compression="gzip">
-   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
+   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
   </data>
  </layer>
+ <objectgroup name="Object Group 4" width="0" height="0">
+  <object name="ToSnakeDesert" type="WARP" x="896" y="672" width="32" height="32">
+   <properties>
+    <property name="DEST_MAP" value="005-1"/>
+    <property name="DEST_X" value="5616"/>
+    <property name="DEST_Y" value="3088"/>
+   </properties>
+  </object>
+  <object name="ToSnakeDesert" type="WARP" x="864" y="704" width="32" height="32">
+   <properties>
+    <property name="DEST_MAP" value="005-1"/>
+    <property name="DEST_X" value="5584"/>
+    <property name="DEST_Y" value="3120"/>
+   </properties>
+  </object>
+  <object name="ToSnakeDesert" type="WARP" x="960" y="608" width="32" height="32">
+   <properties>
+    <property name="DEST_MAP" value="005-1"/>
+    <property name="DEST_X" value="5680"/>
+    <property name="DEST_Y" value="3024"/>
+   </properties>
+  </object>
+  <object name="ToSnakeDesert" type="WARP" x="928" y="640" width="32" height="32">
+   <properties>
+    <property name="DEST_MAP" value="005-1"/>
+    <property name="DEST_X" value="5648"/>
+    <property name="DEST_Y" value="3056"/>
+   </properties>
+  </object>
+  <object name="ToSnakeDesert" type="WARP" x="832" y="736" width="32" height="32">
+   <properties>
+    <property name="DEST_MAP" value="005-1"/>
+    <property name="DEST_X" value="5552"/>
+    <property name="DEST_Y" value="3152"/>
+   </properties>
+  </object>
+  <object name="ToSnakeDesert" type="WARP" x="800" y="768" width="32" height="32">
+   <properties>
+    <property name="DEST_MAP" value="005-1"/>
+    <property name="DEST_X" value="5520"/>
+    <property name="DEST_Y" value="3184"/>
+   </properties>
+  </object>
+  <object name="ToSnakeDesert" type="WARP" x="736" y="832" width="32" height="32">
+   <properties>
+    <property name="DEST_MAP" value="005-1"/>
+    <property name="DEST_X" value="5456"/>
+    <property name="DEST_Y" value="3248"/>
+   </properties>
+  </object>
+  <object name="ToSnakeDesert" type="WARP" x="768" y="800" width="32" height="32">
+   <properties>
+    <property name="DEST_MAP" value="005-1"/>
+    <property name="DEST_X" value="5488"/>
+    <property name="DEST_Y" value="3216"/>
+   </properties>
+  </object>
+  <object name="ToSnakeDesert" type="WARP" x="704" y="864" width="32" height="32">
+   <properties>
+    <property name="DEST_MAP" value="005-1"/>
+    <property name="DEST_X" value="5424"/>
+    <property name="DEST_Y" value="3280"/>
+   </properties>
+  </object>
+  <object name="ToSnakeDesert" type="WARP" x="672" y="896" width="32" height="32">
+   <properties>
+    <property name="DEST_MAP" value="005-1"/>
+    <property name="DEST_X" value="5392"/>
+    <property name="DEST_Y" value="3312"/>
+   </properties>
+  </object>
+  <object name="ToSnakeDesert" type="WARP" x="640" y="928" width="32" height="32">
+   <properties>
+    <property name="DEST_MAP" value="005-1"/>
+    <property name="DEST_X" value="5360"/>
+    <property name="DEST_Y" value="3344"/>
+   </properties>
+  </object>
+  <object name="ToSnakeDesert" type="WARP" x="608" y="960" width="32" height="32">
+   <properties>
+    <property name="DEST_MAP" value="005-1"/>
+    <property name="DEST_X" value="5328"/>
+    <property name="DEST_Y" value="3376"/>
+   </properties>
+  </object>
+  <object name="ToSnakeDesert" type="WARP" x="576" y="992" width="32" height="32">
+   <properties>
+    <property name="DEST_MAP" value="005-1"/>
+    <property name="DEST_X" value="5296"/>
+    <property name="DEST_Y" value="3408"/>
+   </properties>
+  </object>
+  <object name="ToDesertMountainCaves" type="WARP" x="1280" y="832" width="32" height="32">
+   <properties>
+    <property name="DEST_MAP" value="006-3"/>
+    <property name="DEST_X" value="1296"/>
+    <property name="DEST_Y" value="880"/>
+   </properties>
+  </object>
+  <object name="ToDesertMountainCaves" type="WARP" x="1920" y="1856" width="32" height="32">
+   <properties>
+    <property name="DEST_MAP" value="006-3"/>
+    <property name="DEST_X" value="1936"/>
+    <property name="DEST_Y" value="2224"/>
+   </properties>
+  </object>
+  <object name="ToDesertMountainCaves" type="WARP" x="1984" y="960" width="32" height="32">
+   <properties>
+    <property name="DEST_MAP" value="006-3"/>
+    <property name="DEST_X" value="2000"/>
+    <property name="DEST_Y" value="1008"/>
+   </properties>
+  </object>
+  <object name="ToDesertMountainCaves" type="WARP" x="1760" y="864" width="32" height="32">
+   <properties>
+    <property name="DEST_MAP" value="006-3"/>
+    <property name="DEST_X" value="1776"/>
+    <property name="DEST_Y" value="912"/>
+   </properties>
+  </object>
+  <object name="ToDesertMountainCaves" type="WARP" x="2464" y="1408" width="32" height="32">
+   <properties>
+    <property name="DEST_MAP" value="006-3"/>
+    <property name="DEST_X" value="2480"/>
+    <property name="DEST_Y" value="1456"/>
+   </properties>
+  </object>
+  <object name="ToDesertMountainCaves" type="WARP" x="2752" y="768" width="32" height="32">
+   <properties>
+    <property name="DEST_MAP" value="006-3"/>
+    <property name="DEST_X" value="2768"/>
+    <property name="DEST_Y" value="816"/>
+   </properties>
+  </object>
+  <object name="ToDesertMountainCaves" type="WARP" x="2912" y="768" width="32" height="32">
+   <properties>
+    <property name="DEST_MAP" value="006-3"/>
+    <property name="DEST_X" value="2928"/>
+    <property name="DEST_Y" value="816"/>
+   </properties>
+  </object>
+  <object name="ToDesertMountainCaves" type="WARP" x="3328" y="1408" width="32" height="32">
+   <properties>
+    <property name="DEST_MAP" value="006-3"/>
+    <property name="DEST_X" value="3344"/>
+    <property name="DEST_Y" value="1456"/>
+   </properties>
+  </object>
+  <object name="ToDesertMountainCaves" type="WARP" x="3904" y="768" width="32" height="32">
+   <properties>
+    <property name="DEST_MAP" value="006-3"/>
+    <property name="DEST_X" value="3920"/>
+    <property name="DEST_Y" value="816"/>
+   </properties>
+  </object>
+  <object name="ToDesertMountainCaves" type="WARP" x="3648" y="1568" width="32" height="32">
+   <properties>
+    <property name="DEST_MAP" value="006-3"/>
+    <property name="DEST_X" value="3664"/>
+    <property name="DEST_Y" value="1616"/>
+   </properties>
+  </object>
+  <object name="ToDesertMountainCaves" type="WARP" x="3520" y="1792" width="32" height="32">
+   <properties>
+    <property name="DEST_MAP" value="006-3"/>
+    <property name="DEST_X" value="3536"/>
+    <property name="DEST_Y" value="1840"/>
+   </properties>
+  </object>
+  <object name="ToDesertMountainCaves" type="WARP" x="4000" y="1888" width="32" height="32">
+   <properties>
+    <property name="DEST_MAP" value="006-3"/>
+    <property name="DEST_X" value="4016"/>
+    <property name="DEST_Y" value="1936"/>
+   </properties>
+  </object>
+  <object name="ToDesertMountainCaves" type="WARP" x="2944" y="2016" width="32" height="32">
+   <properties>
+    <property name="DEST_MAP" value="006-3"/>
+    <property name="DEST_X" value="2960"/>
+    <property name="DEST_Y" value="2064"/>
+   </properties>
+  </object>
+  <object name="ToDesertMountainCaves" type="WARP" x="3584" y="2368" width="32" height="32">
+   <properties>
+    <property name="DEST_MAP" value="006-3"/>
+    <property name="DEST_X" value="3600"/>
+    <property name="DEST_Y" value="2416"/>
+   </properties>
+  </object>
+  <object name="ToDesertMountainCaves" type="WARP" x="3872" y="3520" width="32" height="32">
+   <properties>
+    <property name="DEST_MAP" value="006-3"/>
+    <property name="DEST_X" value="3888"/>
+    <property name="DEST_Y" value="3568"/>
+   </properties>
+  </object>
+  <object name="ToDesertMountainCaves" type="WARP" x="2528" y="3840" width="32" height="32">
+   <properties>
+    <property name="DEST_MAP" value="006-3"/>
+    <property name="DEST_X" value="2544"/>
+    <property name="DEST_Y" value="3888"/>
+   </properties>
+  </object>
+  <object name="ToDesertMountainCaves" type="WARP" x="1216" y="3872" width="32" height="32">
+   <properties>
+    <property name="DEST_MAP" value="006-3"/>
+    <property name="DEST_X" value="1232"/>
+    <property name="DEST_Y" value="3920"/>
+   </properties>
+  </object>
+  <object name="ToDesertMountainCaves" type="WARP" x="2368" y="2880" width="32" height="32">
+   <properties>
+    <property name="DEST_MAP" value="006-3"/>
+    <property name="DEST_X" value="2384"/>
+    <property name="DEST_Y" value="2928"/>
+   </properties>
+  </object>
+  <object name="ToDesertMountainCaves" type="WARP" x="1632" y="2880" width="32" height="32">
+   <properties>
+    <property name="DEST_MAP" value="006-3"/>
+    <property name="DEST_X" value="1648"/>
+    <property name="DEST_Y" value="2928"/>
+   </properties>
+  </object>
+ </objectgroup>
 </map>
diff --git a/maps/007-1.tmx b/maps/007-1.tmx
index 1f9cc91c..95204f1c 100644
--- a/maps/007-1.tmx
+++ b/maps/007-1.tmx
@@ -1,12 +1,14 @@
-<?xml version="1.0"?>
-<map version="0.99b" orientation="orthogonal" width="144" height="124" tilewidth="32" tileheight="32">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
+<map version="1.0" orientation="orthogonal" width="144" height="124" tilewidth="32" tileheight="32">
  <properties>
-  <property name="overlay0parallax" value="1.0"/>
+  <property name="minimap" value="graphics/minimaps/007-1"/>
+  <property name="music" value="The Mana World - The Forest.ogg"/>
+  <property name="name" value="South east woodland"/>
   <property name="overlay0image" value="graphics/images/ambient/clouds.png"/>
-  <property name="overlay0scrollY" value="0.1"/>
+  <property name="overlay0parallax" value="1.0"/>
   <property name="overlay0scrollX" value="0.2"/>
-  <property name="minimap" value="graphics/images/minimap_new_16-1.png"/>
-  <property name="music" value="The Mana World - The Forest.ogg"/>
+  <property name="overlay0scrollY" value="0.1"/>
  </properties>
  <tileset name="Woodland" firstgid="1" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Woodland_ground.png"/>
@@ -43,74 +45,46 @@
  </layer>
  <layer name="Collision" width="144" height="124">
   <data encoding="base64" compression="gzip">
-   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
+   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
   </data>
  </layer>
  <objectgroup name="Objects" width="0" height="0">
-  <object name="ToDesert" type="WARP" x="3808" y="3648" width="96" height="64">
+  <object name="ToBeach" type="WARP" x="3808" y="3648" width="96" height="32">
    <properties>
-    <property name="DEST_MAP">
-     15
-    </property>
-    <property name="DEST_Y">
-     480
-    </property>
-    <property name="DEST_X">
-     640
-    </property>
+    <property name="DEST_MAP" value="003-1"/>
+    <property name="DEST_X" value="656"/>
+    <property name="DEST_Y" value="784"/>
    </properties>
   </object>
-  <object name="ToWoodland" type="WARP" x="640" y="1664" width="96" height="96">
+  <object name="ToSouthWoodland" type="WARP" x="641" y="1696" width="32" height="64">
    <properties>
-    <property name="DEST_MAP">
-     14
-    </property>
-    <property name="DEST_Y">
-     1696
-    </property>
-    <property name="DEST_X">
-     4064
-    </property>
+    <property name="DEST_MAP" value="010-1"/>
+    <property name="DEST_X" value="4080"/>
+    <property name="DEST_Y" value="1712"/>
    </properties>
   </object>
-  <object name="ToWoodland" type="WARP" x="2144" y="672" width="128" height="64">
+  <object name="ToEastWoodland" type="WARP" x="2144" y="672" width="128" height="32">
    <properties>
-    <property name="DEST_MAP">
-     18
-    </property>
-    <property name="DEST_Y">
-     3200
-    </property>
-    <property name="DEST_X">
-     2512
-    </property>
+    <property name="DEST_MAP" value="008-1"/>
+    <property name="DEST_X" value="2512"/>
+    <property name="DEST_Y" value="3216"/>
    </properties>
   </object>
-  <object name="ToWoodland" type="WARP" x="3872" y="640" width="96" height="64">
+  <object name="ToEastWoodland" type="WARP" x="3872" y="640" width="96" height="32">
    <properties>
-    <property name="DEST_MAP">
-     18
-    </property>
-    <property name="DEST_Y">
-     3136
-    </property>
-    <property name="DEST_X">
-     4224
-    </property>
+    <property name="DEST_MAP" value="008-1"/>
+    <property name="DEST_X" value="4240"/>
+    <property name="DEST_Y" value="3152"/>
    </properties>
   </object>
   <object name="Fluffy" type="SPAWN" x="3680" y="1984" width="320" height="320">
    <properties>
-    <property name="MONSTER_ID">
-     18
-    </property>
+    <property name="MONSTER_ID" value="18"/>
    </properties>
   </object>
   <object name="Sleep Flower" type="SPAWN" x="2944" y="992" width="320" height="320">
    <properties>
-    <property name="MONSTER_ID">
-     12
-    </property>
+    <property name="MONSTER_ID" value="12"/>
    </properties>
   </object>
  </objectgroup>