Fix some warps (patch by vargavind)

1 files changed, 27 insertions, 53 deletions

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>