summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--maps/006-1.tmx12
-rw-r--r--maps/006-3.tmx164
-rw-r--r--maps/008-1.tmx64
-rw-r--r--maps/009-1.tmx86
-rw-r--r--maps/009-2.tmx127
-rw-r--r--maps/009-3.tmx19
-rw-r--r--maps/010-1.tmx46
-rw-r--r--maps/010-2.tmx54
-rw-r--r--maps/013-1.tmx17
-rw-r--r--maps/013-3.tmx56
-rw-r--r--maps/017-1.tmx12
-rw-r--r--maps/018-1.tmx119
-rw-r--r--maps/018-2.tmx60
-rw-r--r--maps/018-3.tmx27
-rw-r--r--maps/019-1.tmx26
-rw-r--r--maps/020-1.tmx171
-rw-r--r--maps/020-2.tmx69
-rw-r--r--maps/020-3.tmx42
-rw-r--r--maps/020-4.tmx18
19 files changed, 827 insertions, 362 deletions
diff --git a/maps/006-1.tmx b/maps/006-1.tmx
index d1a3bfb0..85f2715d 100644
--- a/maps/006-1.tmx
+++ b/maps/006-1.tmx
@@ -7,22 +7,22 @@
<property name="name" value="Desert mountains"/>
</properties>
<tileset name="desert1" firstgid="1" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/desert1.png" trans="ff00ff"/>
+ <image source="../../../trunk/graphics/tiles/desert1.png" trans="ff00ff"/>
</tileset>
<tileset name="desert2" firstgid="257" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/desert2.png" trans="ff00ff"/>
+ <image source="../../../trunk/graphics/tiles/desert2.png" trans="ff00ff"/>
</tileset>
<tileset name="Collision" firstgid="513" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/collision.png" trans="ff00ff"/>
+ <image source="../../../trunk/graphics/tiles/collision.png" trans="ff00ff"/>
</tileset>
<tileset name="Desert x2" firstgid="515" tilewidth="32" tileheight="64">
- <image source="../graphics/tiles/desert_x2.png"/>
+ <image source="../../../trunk/graphics/tiles/desert_x2.png"/>
</tileset>
<tileset name="Desert x3" firstgid="531" tilewidth="32" tileheight="96">
- <image source="../graphics/tiles/desert_x3.png"/>
+ <image source="../../../trunk/graphics/tiles/desert_x3.png"/>
</tileset>
<tileset name="mountain" firstgid="547" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/mountain.png"/>
+ <image source="../../../trunk/graphics/tiles/mountain.png"/>
</tileset>
<layer name="Ground" width="150" height="150">
<data encoding="base64" compression="gzip">
diff --git a/maps/006-3.tmx b/maps/006-3.tmx
index d94015d8..33f367fd 100644
--- a/maps/006-3.tmx
+++ b/maps/006-3.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/minimaps/006-1"/>
<property name="music" value="finalman_and_yakslem-cavesong.ogg"/>
- <property name="minimap" value="graphics/images/minimap_new_25-1.png"/>
+ <property name="name" value="Desert mountain caves"/>
</properties>
<tileset name="cave" firstgid="1" tilewidth="32" tileheight="32">
<image source="../graphics/tiles/cave.png"/>
@@ -34,41 +36,149 @@
</data>
</layer>
<objectgroup name="Object Group 1" width="0" height="0">
- <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="928" y="3456" width="32" height="32">
- <properties/>
+ <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="928" y="3456" width="32" height="32"/>
+ <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="2112" y="3360" width="32" height="32"/>
+ <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="2592" y="3904" width="32" height="32"/>
+ <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="3936" y="3584" width="32" height="32"/>
+ <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="1856" y="2272" width="32" height="32"/>
+ <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="3648" y="2432" width="32" height="32"/>
+ <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="3520" y="2048" width="32" height="32"/>
+ <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="2208" y="1184" width="32" height="32"/>
+ <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="2848" y="1312" width="32" height="32"/>
+ <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="3008" y="896" width="32" height="32"/>
+ <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="1248" y="896" width="32" height="32"/>
+ <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="1344" y="896" width="32" height="32"/>
+ <object name="CavesExit" type="WARP" x="1280" y="832" width="32" height="32">
+ <properties>
+ <property name="DEST_MAP" value="006-1"/>
+ <property name="DEST_X" value="1296"/>
+ <property name="DEST_Y" value="880"/>
+ </properties>
</object>
- <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="2112" y="3360" width="32" height="32">
- <properties/>
+ <object name="CavesExit" type="WARP" x="1760" y="864" width="32" height="32">
+ <properties>
+ <property name="DEST_MAP" value="006-1"/>
+ <property name="DEST_X" value="1776"/>
+ <property name="DEST_Y" value="912"/>
+ </properties>
</object>
- <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="2592" y="3904" width="32" height="32">
- <properties/>
+ <object name="CavesExit" type="warp" x="1984" y="960" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="006-1"/>
+ <property name="dest_x" value="2000"/>
+ <property name="dest_y" value="1008"/>
+ </properties>
</object>
- <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="3936" y="3584" width="32" height="32">
- <properties/>
+ <object name="CavesExit" type="warp" x="2752" y="768" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="006-1"/>
+ <property name="dest_x" value="2768"/>
+ <property name="dest_y" value="816"/>
+ </properties>
</object>
- <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="1856" y="2272" width="32" height="32">
- <properties/>
+ <object name="CavesExit" type="warp" x="2912" y="768" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="006-1"/>
+ <property name="dest_x" value="2928"/>
+ <property name="dest_y" value="816"/>
+ </properties>
</object>
- <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="3648" y="2432" width="32" height="32">
- <properties/>
+ <object name="CavesExit" type="warp" x="3904" y="768" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="006-1"/>
+ <property name="dest_x" value="3920"/>
+ <property name="dest_y" value="816"/>
+ </properties>
</object>
- <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="3520" y="2048" width="32" height="32">
- <properties/>
+ <object name="CavesExit" type="warp" x="3648" y="1568" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="006-1"/>
+ <property name="dest_x" value="3664"/>
+ <property name="dest_y" value="1616"/>
+ </properties>
</object>
- <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="2208" y="1184" width="32" height="32">
- <properties/>
+ <object name="CavesExit" type="warp" x="3328" y="1408" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="006-1"/>
+ <property name="dest_x" value="3344"/>
+ <property name="dest_y" value="1456"/>
+ </properties>
</object>
- <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="2848" y="1312" width="32" height="32">
- <properties/>
+ <object name="CavesExit" type="warp" x="2464" y="1408" width="32" height="32">
+ <properties>
+ <property name="dest_x" value="2480"/>
+ <property name="dest_y" value="1456"/>
+ </properties>
</object>
- <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="3008" y="896" width="32" height="32">
- <properties/>
+ <object name="CavesExit" type="warp" x="1920" y="2176" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="006-1"/>
+ <property name="dest_x" value="1936"/>
+ <property name="dest_y" value="1904"/>
+ </properties>
</object>
- <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="1248" y="896" width="32" height="32">
- <properties/>
+ <object name="CavesExit" type="warp" x="2944" y="2016" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="006-1"/>
+ <property name="dest_x" value="2960"/>
+ <property name="dest_y" value="2064"/>
+ </properties>
</object>
- <object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="1344" y="896" width="32" height="32">
- <properties/>
+ <object name="CavesExit" type="warp" x="3584" y="2368" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="006-1"/>
+ <property name="dest_x" value="3600"/>
+ <property name="dest_y" value="2416"/>
+ </properties>
+ </object>
+ <object name="CavesExit" type="warp" x="3520" y="1792" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="006-1"/>
+ <property name="dest_x" value="3536"/>
+ <property name="dest_y" value="1840"/>
+ </properties>
+ </object>
+ <object name="CavesExit" type="warp" x="4000" y="1888" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="006-1"/>
+ <property name="dest_x" value="4016"/>
+ <property name="dest_y" value="1936"/>
+ </properties>
+ </object>
+ <object name="CavesExit" type="warp" x="2368" y="2880" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="006-1"/>
+ <property name="dest_x" value="2384"/>
+ <property name="dest_y" value="2928"/>
+ </properties>
+ </object>
+ <object name="CavesExit" type="warp" x="1632" y="2880" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="006-1"/>
+ <property name="dest_x" value="1648"/>
+ <property name="dest_y" value="2928"/>
+ </properties>
+ </object>
+ <object name="CavesExit" type="warp" x="1216" y="3872" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="006-1"/>
+ <property name="dest_x" value="1232"/>
+ <property name="dest_y" value="3920"/>
+ </properties>
+ </object>
+ <object name="CavesExit" type="warp" x="2528" y="3840" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="006-1"/>
+ <property name="dest_x" value="2544"/>
+ <property name="dest_y" value="3888"/>
+ </properties>
+ </object>
+ <object name="CavesExit" type="warp" x="3872" y="3520" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="006-1"/>
+ <property name="dest_x" value="3888"/>
+ <property name="dest_y" value="3568"/>
+ </properties>
</object>
</objectgroup>
</map>
diff --git a/maps/008-1.tmx b/maps/008-1.tmx
index c7832cb1..83eb83e6 100644
--- a/maps/008-1.tmx
+++ b/maps/008-1.tmx
@@ -2,8 +2,9 @@
<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
<map version="1.0" orientation="orthogonal" width="154" height="120" tilewidth="32" tileheight="32">
<properties>
- <property name="minimap" value="graphics/images/minimap_new_18-1.png"/>
+ <property name="minimap" value="graphics/minimaps/008-1.png"/>
<property name="music" value="The Mana World - The Forest.ogg"/>
+ <property name="name" value="Woodland around Hurnscald"/>
<property name="overlay0image" value="graphics/images/ambient/clouds.png"/>
<property name="overlay0parallax" value="1.0"/>
<property name="overlay0scrollX" value="0.2"/>
@@ -54,53 +55,60 @@
</data>
</layer>
<objectgroup name="Objects" width="0" height="0">
- <object name="WestGate" type="WARP" x="1728" y="1920" width="32" height="96">
+ <object name="HurnscaldWestGate" type="WARP" x="1728" y="1920" width="32" height="96">
<properties>
- <property name="DEST_MAP" value="19"/>
- <property name="DEST_X" value="832"/>
- <property name="DEST_Y" value="1152"/>
+ <property name="DEST_MAP" value="009-1"/>
+ <property name="DEST_X" value="848"/>
+ <property name="DEST_Y" value="1168"/>
</properties>
</object>
- <object name="SouthGate" type="WARP" x="2464" y="2560" width="128" height="32">
+ <object name="HurnscaldSouthGate" type="WARP" x="2464" y="2560" width="128" height="32">
<properties>
- <property name="DEST_MAP" value="19"/>
- <property name="DEST_X" value="1536"/>
- <property name="DEST_Y" value="1728"/>
+ <property name="DEST_MAP" value="009-1"/>
+ <property name="DEST_X" value="1552"/>
+ <property name="DEST_Y" value="1744"/>
</properties>
</object>
- <object name="EasthGate" type="WARP" x="4064" y="1920" width="32" height="64">
+ <object name="HurnscaldEastGate" type="WARP" x="4064" y="1920" width="32" height="64">
<properties>
- <property name="DEST_MAP" value="19"/>
- <property name="DEST_X" value="3072"/>
- <property name="DEST_Y" value="1120"/>
+ <property name="DEST_MAP" value="009-1"/>
+ <property name="DEST_X" value="3088"/>
+ <property name="DEST_Y" value="1136"/>
</properties>
</object>
- <object name="NorthGate" type="WARP" x="2464" y="1568" width="128" height="32">
+ <object name="HurnscaldNorthGate" type="WARP" x="2464" y="1568" width="128" height="32">
<properties>
- <property name="DEST_MAP" value="19"/>
+ <property name="DEST_MAP" value="009-1"/>
<property name="DEST_X" value="1552"/>
- <property name="DEST_Y" value="800"/>
+ <property name="DEST_Y" value="784"/>
+ </properties>
+ </object>
+ <object name="ToCentralWoodland" type="warp" x="768" y="1920" width="32" height="128">
+ <properties>
+ <property name="DEST_MAP" value="011-1"/>
+ <property name="DEST_X" value="3920"/>
+ <property name="DEST_Y" value="1968"/>
</properties>
</object>
- <object name="ToWoodland" type="WARP" x="2464" y="3232" width="128" height="64">
+ <object name="ToWoodlandMines" type="warp" x="2464" y="544" width="128" height="32">
<properties>
- <property name="DEST_MAP" value="16"/>
- <property name="DEST_X" value="2176"/>
- <property name="DEST_Y" value="736"/>
+ <property name="dest_map" value="018-1"/>
+ <property name="dest_x" value="2512"/>
+ <property name="dest_y" value="3088"/>
</properties>
</object>
- <object name="ToWoodland" type="WARP" x="4192" y="3200" width="96" height="64">
+ <object name="ToSouthEastWoodland" type="warp" x="2464" y="3264" width="128" height="32">
<properties>
- <property name="DEST_MAP" value="16"/>
- <property name="DEST_X" value="3904"/>
- <property name="DEST_Y" value="736"/>
+ <property name="dest_map" value="007-1"/>
+ <property name="dest_x" value="2192"/>
+ <property name="dest_y" value="752"/>
</properties>
</object>
- <object name="ToWoodland" type="WARP" x="768" y="1920" width="64" height="128">
+ <object name="ToSouthEastWoodland" type="warp" x="4192" y="3232" width="96" height="32">
<properties>
- <property name="DEST_MAP" value="9"/>
- <property name="DEST_X" value="3904"/>
- <property name="DEST_Y" value="1952"/>
+ <property name="dest_map" value="007-1"/>
+ <property name="dest_x" value="3920"/>
+ <property name="dest_y" value="752"/>
</properties>
</object>
</objectgroup>
diff --git a/maps/009-1.tmx b/maps/009-1.tmx
index 15c7c653..7268d7e5 100644
--- a/maps/009-1.tmx
+++ b/maps/009-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="75" tilewidth="32" tileheight="32">
<properties>
- <property name="minimap" value="graphics/images/minimap_new_19-1.png"/>
+ <property name="minimap" value="graphics/minimaps/009-1.png"/>
<property name="music" value="Magick - Real.ogg"/>
+ <property name="name" value="Hurnscald"/>
<property name="overlay0image" value="graphics/images/ambient/clouds.png"/>
<property name="overlay0parallax" value="1.0"/>
<property name="overlay0scrollX" value="0.2"/>
@@ -56,36 +57,85 @@
</layer>
<layer name="Collision" width="117" height="75">
<data encoding="base64" compression="gzip">
- H4sIAAAAAAAAAO2SUY7DMAgF297/0PtVKWIdgoEY3MyTRpuubIwZf96v1wcAAAAAAAAAAAAAAAAAAAAAAAAAAGAxMtX9AE5B9zlKdP9s7cxaTyUyq2hwutalZVbR4LSvU++Z1r48a56IxSNOe2C9nzVRp/KNeJxG++zOzCw8M5OutHmdnXX8Lb9He7Q11lR76ex0Zl5naypS7cXrUuvfes/ovI6/tTWrU+0ny6l2P+sctP9dvRVLTct7O647+zuqKXvdBTKXal84zU+1L5z+j/fe1Z7udJtZd+Wb0vqz9F3tp4PT79o7UjGPaj+7O73qb/Zeo2+czt/tu9aTbKfe/r1ndiEyb5z2JDJv6RGnPYjMW9bIqmd1qtXJOG9mXyciDiLJ6m/kPfO8aj+rnUa8yhoRpzPrtHNwer7/qu7V2dJzRiwucep3ulOq/VQ4jdbtnmo/dzq9cz6W+ck1kfO1b2vPnVmZDKeWtXLfTI3Z+h1ZmajT0bf1fp69u7IyUaeWWtpbeAqd4umzen5Pgtn/HjgFAAAAAAAAAAAAAAAAAAAA2Js/vyfEPByJAAA=
+ H4sIAAAAAAAAAO2S22rEMAwFt/v/H92nhSAcRbdYCpkDQ7PFlmWNv3+fzxcAAAAAAAAAAAAAAAAAAAAAAAAAAAAgiUx3P1Drc5Xsfm/tylpvJTOrbHC616VlVtngdK7T6JnWviJr3ojFI05nYL2fNVmn8o1EnGb7nI5nFpGZSVfavM7OOv6W36s92hprur1MduqZ19majnR7ibrU+rfeMzuv429tze50+6lyqt3POgftf1dvxVLT8t6O687+rmrKXp8EsaXbE07r0+0Jp+tE79zt6E6vlXV3vietP0vf3X4mOP2tvSMd8+j283SnV/1577X6xqn/br+1kVQ7jfYfPXMKmXnjdCaZeUuPOJ1BZt6yRlU9q1OtTsV5nn2TyDjIpKq/lffK87r97Haa8SprZJx61mnn4PR8/1Xdq7Ol54pYXOI07vRJ6fbT4TRbd3q6/dzp9M75WOYn12TO176tPU9mZyqcWtbKfZ4a3voT2Zms09W39X6RvU9lZ7JOLbW0t/AWJiXSZ/f83gSzBwAAAAAAAAAAAAAAAAAAAACYxT8HlxeeHIkAAA==
</data>
</layer>
<objectgroup name="Objects" width="0" height="0">
- <object name="WestGate" type="WARP" x="704" y="1120" width="64" height="96">
+ <object name="HurnscaldSouthGate" type="WARP" x="1504" y="1760" width="128" height="32">
<properties>
- <property name="DEST_MAP" value="18"/>
- <property name="DEST_X" value="1696"/>
- <property name="DEST_Y" value="1952"/>
+ <property name="DEST_MAP" value="008-1"/>
+ <property name="DEST_X" value="2512"/>
+ <property name="DEST_Y" value="2640"/>
</properties>
</object>
- <object name="SouthGate" type="WARP" x="1504" y="1760" width="128" height="64">
+ <object name="HurnscaldEastGate" type="WARP" x="3104" y="1120" width="32" height="64">
<properties>
- <property name="DEST_MAP" value="18"/>
- <property name="DEST_X" value="2496"/>
- <property name="DEST_Y" value="2624"/>
+ <property name="DEST_MAP" value="008-1"/>
+ <property name="DEST_X" value="4144"/>
+ <property name="DEST_Y" value="1936"/>
</properties>
</object>
- <object name="EasthGate" type="WARP" x="3104" y="1120" width="64" height="64">
+ <object name="ToInn" type="warp" x="1120" y="960" width="32" height="32">
<properties>
- <property name="DEST_MAP" value="18"/>
- <property name="DEST_X" value="4128"/>
- <property name="DEST_Y" value="1920"/>
+ <property name="dest_map" value="009-2"/>
+ <property name="dest_x" value="1616"/>
+ <property name="dest_y" value="1776"/>
</properties>
</object>
- <object name="NorthGate" type="WARP" x="1504" y="736" width="128" height="64">
+ <object name="ToGeneralStore" type="warp" x="1856" y="1472" width="32" height="32">
<properties>
- <property name="DEST_MAP" value="18"/>
- <property name="DEST_X" value="2496"/>
- <property name="DEST_Y" value="1536"/>
+ <property name="dest_map" value="009-2"/>
+ <property name="dest_x" value="880"/>
+ <property name="dest_y" value="3376"/>
+ </properties>
+ </object>
+ <object name="ToArcherShop" type="warp" x="1888" y="1056" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="009-2"/>
+ <property name="dest_x" value="3056"/>
+ <property name="dest_y" value="944"/>
+ </properties>
+ </object>
+ <object name="ToPotionShop" type="warp" x="2272" y="960" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="009-2"/>
+ <property name="dest_x" value="4176"/>
+ <property name="dest_y" value="816"/>
+ </properties>
+ </object>
+ <object name="ToHospital" type="warp" x="2560" y="992" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="009-2"/>
+ <property name="dest_x" value="4784"/>
+ <property name="dest_y" value="2128"/>
+ </properties>
+ </object>
+ <object name="ToMayor" type="warp" x="2304" y="1408" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="009-2"/>
+ <property name="dest_x" value="3632"/>
+ <property name="dest_y" value="2480"/>
+ </properties>
+ </object>
+ <object name="ToBlacksmith" type="warp" x="2912" y="1472" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="009-2"/>
+ <property name="dest_x" value="5808"/>
+ <property name="dest_y" value="2128"/>
+ </properties>
+ </object>
+ <object name="HurnscaldWestGate" type="warp" x="768" y="1120" width="32" height="96">
+ <properties>
+ <property name="dest_map" value="008-1"/>
+ <property name="dest_x" value="1712"/>
+ <property name="dest_y" value="1968"/>
+ </properties>
+ </object>
+ <object name="HurnscaldNorthGate" type="warp" x="1504" y="768" width="128" height="32">
+ <properties>
+ <property name="dest_map" value="008-1"/>
+ <property name="dest_x" value="2512"/>
+ <property name="dest_y" value="1552"/>
</properties>
</object>
</objectgroup>
diff --git a/maps/009-2.tmx b/maps/009-2.tmx
index 95f20c13..608acac0 100644
--- a/maps/009-2.tmx
+++ b/maps/009-2.tmx
@@ -3,6 +3,7 @@
<map version="1.0" orientation="orthogonal" width="200" height="120" tilewidth="32" tileheight="32">
<properties>
<property name="music" value="Magick - Real.ogg"/>
+ <property name="name" value="Tulimshar indoor"/>
</properties>
<tileset name="Woodland indoor" firstgid="1" tilewidth="32" tileheight="32">
<image source="../graphics/tiles/woodland_indoor.png"/>
@@ -39,5 +40,131 @@
<objectgroup name="Object Group 1" width="0" height="0">
<object name="graphics/particles/fireplace.particle.xml" type="PARTICLE_EFFECT" x="1856" y="1536" width="32" height="32"/>
<object name="graphics/particles/cookingfire.particle.xml" type="PARTICLE_EFFECT" x="3920" y="864" width="32" height="32"/>
+ <object name="To1stFloor" type="warp" x="2368" y="736" width="64" height="32">
+ <properties>
+ <property name="dest_map" value="009-2"/>
+ <property name="dest_x" value="2352"/>
+ <property name="dest_y" value="1488"/>
+ </properties>
+ </object>
+ <object name="ToOutdoor" type="warp" x="3040" y="960" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="009-1"/>
+ <property name="dest_x" value="1904"/>
+ <property name="dest_y" value="1104"/>
+ </properties>
+ </object>
+ <object name="ToOutdoor" type="warp" x="4160" y="832" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="009-1"/>
+ <property name="dest_x" value="2288"/>
+ <property name="dest_y" value="1008"/>
+ </properties>
+ </object>
+ <object name="To2ndFloor" type="warp" x="4576" y="832" width="64" height="32">
+ <properties>
+ <property name="dest_map" value="009-2"/>
+ <property name="dest_x" value="4592"/>
+ <property name="dest_y" value="1424"/>
+ </properties>
+ </object>
+ <object name="To3rdFloor" type="warp" x="4576" y="1344" width="64" height="32">
+ <properties>
+ <property name="dest_map" value="009-2"/>
+ <property name="dest_x" value="4592"/>
+ <property name="dest_y" value="784"/>
+ </properties>
+ </object>
+ <object name="To1stFloor" type="warp" x="4928" y="1504" width="64" height="32">
+ <properties>
+ <property name="dest_map" value="009-2"/>
+ <property name="dest_x" value="4944"/>
+ <property name="dest_y" value="2032"/>
+ </properties>
+ </object>
+ <object name="To1stFloor" type="warp" x="3616" y="1472" width="64" height="32">
+ <properties>
+ <property name="dest_map" value="009-2"/>
+ <property name="dest_x" value="3632"/>
+ <property name="dest_y" value="2224"/>
+ </properties>
+ </object>
+ <object name="ToOutdoor" type="warp" x="1600" y="1760" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="009-1"/>
+ <property name="dest_x" value="1136"/>
+ <property name="dest_y" value="1008"/>
+ </properties>
+ </object>
+ <object name="ToCellar" type="warp" x="2368" y="1696" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="009-2"/>
+ <property name="dest_x" value="4592"/>
+ <property name="dest_y" value="2608"/>
+ </properties>
+ </object>
+ <object name="To2ndFloor" type="warp" x="2336" y="1440" width="64" height="32">
+ <properties>
+ <property name="dest_map" value="009-2"/>
+ <property name="dest_x" value="2384"/>
+ <property name="dest_y" value="752"/>
+ </properties>
+ </object>
+ <object name="ToOutdoor" type="warp" x="3616" y="2496" width="64" height="32">
+ <properties>
+ <property name="dest_map" value="009-1"/>
+ <property name="dest_x" value="2320"/>
+ <property name="dest_y" value="1456"/>
+ </properties>
+ </object>
+ <object name="To2ndFloor" type="warp" x="3616" y="2176" width="64" height="32">
+ <properties>
+ <property name="dest_map" value="009-2"/>
+ <property name="dest_x" value="3632"/>
+ <property name="dest_y" value="1488"/>
+ </properties>
+ </object>
+ <object name="ToOutdoor" type="warp" x="4768" y="2144" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="009-1"/>
+ <property name="dest_x" value="2576"/>
+ <property name="dest_y" value="1040"/>
+ </properties>
+ </object>
+ <object name="To1stFloor" type="warp" x="4576" y="2528" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="009-2"/>
+ <property name="dest_x" value="2384"/>
+ <property name="dest_y" value="1680"/>
+ </properties>
+ </object>
+ <object name="To2ndFloor" type="warp" x="4928" y="1984" width="64" height="32">
+ <properties>
+ <property name="dest_map" value="009-2"/>
+ <property name="dest_x" value="4944"/>
+ <property name="dest_y" value="1488"/>
+ </properties>
+ </object>
+ <object name="ToOutdoor" type="warp" x="5792" y="2144" width="64" height="32">
+ <properties>
+ <property name="dest_map" value="009-1"/>
+ <property name="dest_x" value="2928"/>
+ <property name="dest_y" value="1520"/>
+ </properties>
+ </object>
+ <object name="ToCaveBeneathHurnscald" type="warp" x="4704" y="2848" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="009-3"/>
+ <property name="dest_x" value="5552"/>
+ <property name="dest_y" value="720"/>
+ </properties>
+ </object>
+ <object name="ToOutdoor" type="warp" x="864" y="3392" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="009-1"/>
+ <property name="dest_x" value="1872"/>
+ <property name="dest_y" value="1520"/>
+ </properties>
+ </object>
</objectgroup>
</map>
diff --git a/maps/009-3.tmx b/maps/009-3.tmx
index 0d5dc831..24e94be4 100644
--- a/maps/009-3.tmx
+++ b/maps/009-3.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="151" tilewidth="32" tileheight="32">
<properties>
- <property name="minimap" value="graphics/images/minimap_new_35-1.png"/>
+ <property name="minimap" value="graphics/minimaps/009-3.png"/>
<property name="music" value="finalman_and_yakslem-cavesong.ogg"/>
+ <property name="name" value="Cave beneath Hurnscald"/>
</properties>
<tileset name="Cave" firstgid="1" tilewidth="32" tileheight="32">
<image source="../graphics/tiles/cave.png"/>
@@ -49,7 +50,7 @@
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
</data>
</layer>
- <objectgroup name="Object Group 4" width="0" height="0" visible="0">
+ <objectgroup name="Object Group 4" width="0" height="0">
<object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="5376" y="1344" width="32" height="32"/>
<object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="5728" y="1472" width="32" height="32"/>
<object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="4928" y="3808" width="32" height="32"/>
@@ -74,5 +75,19 @@
<object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="2560" y="2336" width="32" height="32"/>
<object name="graphics/particles/cookingfire.particle.xml" type="PARTICLE_EFFECT" x="5616" y="960" width="32" height="32"/>
<object name="graphics/particles/flame.particle.xml" type="PARTICLE_EFFECT" x="5152" y="1888" width="32" height="32"/>
+ <object name="CaveExitToInn" type="warp" x="5536" y="640" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="009-2"/>
+ <property name="dest_x" value="4720"/>
+ <property name="dest_y" value="2832"/>
+ </properties>
+ </object>
+ <object name="ToLakeCave" type="warp" x="640" y="1792" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="011-4"/>
+ <property name="dest_x" value="4144"/>
+ <property name="dest_y" value="2832"/>
+ </properties>
+ </object>
</objectgroup>
</map>
diff --git a/maps/010-1.tmx b/maps/010-1.tmx
index 228de922..ea0bf7f6 100644
--- a/maps/010-1.tmx
+++ b/maps/010-1.tmx
@@ -2,8 +2,9 @@
<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
<map version="1.0" orientation="orthogonal" width="150" height="120" tilewidth="32" tileheight="32">
<properties>
- <property name="minimap" value="graphics/images/minimap_new_14-1.png"/>
+ <property name="minimap" value="graphics/minimaps/010-1.png"/>
<property name="music" value="The Mana World - The Forest.ogg"/>
+ <property name="name" value="South woodland"/>
<property name="overlay0image" value="graphics/images/ambient/clouds.png"/>
<property name="overlay0parallax" value="1.0"/>
<property name="overlay0scrollX" value="0.2"/>
@@ -54,18 +55,11 @@
</data>
</layer>
<objectgroup name="Objects" width="0" height="0">
- <object name="ToField" type="WARP" x="4160" y="1696" width="64" height="128">
+ <object name="ToCentralWoodland" type="WARP" x="1536" y="736" width="64" height="32">
<properties>
- <property name="DEST_MAP" value="16"/>
- <property name="DEST_X" value="768"/>
- <property name="DEST_Y" value="1712"/>
- </properties>
- </object>
- <object name="ToField" type="WARP" x="1536" y="736" width="64" height="64">
- <properties>
- <property name="DEST_MAP" value="9"/>
- <property name="DEST_X" value="1536"/>
- <property name="DEST_Y" value="3232"/>
+ <property name="DEST_MAP" value="011-1"/>
+ <property name="DEST_X" value="1488"/>
+ <property name="DEST_Y" value="3184"/>
</properties>
</object>
<object name="Scorpion" type="SPAWN" x="2336" y="1728" width="640" height="640">
@@ -78,5 +72,33 @@
<property name="MONSTER_ID" value="17"/>
</properties>
</object>
+ <object name="ToSouthWestWoodland" type="warp" x="448" y="1728" width="32" height="64">
+ <properties>
+ <property name="dest_map" value="015-1"/>
+ <property name="dest_x" value="2960"/>
+ <property name="dest_y" value="1744"/>
+ </properties>
+ </object>
+ <object name="ToDimondsCove" type="warp" x="1152" y="3008" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="010-2"/>
+ <property name="dest_x" value="1040"/>
+ <property name="dest_y" value="1424"/>
+ </properties>
+ </object>
+ <object name="ToSouthernmostWoodland" type="warp" x="1760" y="3328" width="96" height="32">
+ <properties>
+ <property name="dest_map" value="015-1"/>
+ <property name="dest_x" value="1808"/>
+ <property name="dest_y" value="688"/>
+ </properties>
+ </object>
+ <object name="ToSouthEastWoodland" type="warp" x="4192" y="1696" width="32" height="64">
+ <properties>
+ <property name="dest_map" value="007-1"/>
+ <property name="dest_x" value="816"/>
+ <property name="dest_y" value="1712"/>
+ </properties>
+ </object>
</objectgroup>
</map>
diff --git a/maps/010-2.tmx b/maps/010-2.tmx
index 72356e47..e06fe00f 100644
--- a/maps/010-2.tmx
+++ b/maps/010-2.tmx
@@ -3,6 +3,7 @@
<map version="1.0" orientation="orthogonal" width="107" height="110" tilewidth="32" tileheight="32">
<properties>
<property name="music" value="Clouds Calling.ogg"/>
+ <property name="name" value="Dimond's Cove"/>
</properties>
<tileset name="Woodland Indoor" firstgid="1" tilewidth="32" tileheight="32">
<image source="../graphics/tiles/woodland_indoor.png"/>
@@ -36,7 +37,58 @@
</layer>
<layer name="Collision" width="107" height="110">
<data encoding="base64" compression="gzip">
- H4sIAAAAAAAAAO3aW46DMAwF0OlS2v0vcn6mEoN4JEBiB06ko75AsX3Tr/bz+vn5AAAAAAAAAAAAwKC2Vu+9zqzoObaaS+l8ZJUnL1nlMe+hdj6yis9qb4496lraqzSLO2VU0ntk/0/Naqu3kl6m19beK6v7ZrW3V2lWo9pbS9eU3NdiPrV1tqwlY1ZnVqZao+cc3X/v+VxV09rz7Ep6KJ2BcyUrWV3b/0i1RtWfpf/oPr691Lw/mqdllaXWHlnV3BvZx9Jn0bO+qseS57Ur8oxlO0uy2t83qr6I83lmyeq5WR3ZO6pWWR3bN6JWWR3bN6JWAAAAAAAAAABy8l8Rzpr+52jv8ev957vWXkf31npmvb9/peuuWZ1ZWWs9e09mR1f2Ou+a1ZF5ZDhbW1nKKr6/p2e1VvtI/T01qxH7K6kvY909strKMGImT8pq3s989kcyy3Dm1j5b6n0E86zmPWTIquWKnn/tDGSV2xX99Oq15YrOISqrVr23XNE5XD2D0qx6197y+oy2cpm+l+2sPjGrtby2XvfO6v36/xvG3n61149mlKxK9q69fiRL9c97WeuvR/81K/pc9crq+3z6WJNVq99aa/I5cv1o1rKoOduy6pvV0XnNZ9Ezq7UcImrNkBUAAAAAAAAAALTwCz5n2ubotwAA
+ H4sIAAAAAAAAAO3aXa6CMBAGUF2K7n+R9+WaIKHQAu0Mcpqc+FfCzHz1Sd/Px+MNAAAAAAAAAAAAHHZkRdfeu+/oGmVV33t0fbL67n1tFtH1yWo7q605jcykNquoWkdmlbH/u2a11ltNL9O9rdfK6nez2rpXbVZXtbWW9tRc12M+rXX2rCVjVkdWplqj5xzd/+j5nFVT6Xl2NT3UzsC5kpWszu3/SrVG1Z+l/+g+Pr20vH81d8sqS60jsmq5NrKPpc+iZ31WjzXPW1fkGct2lmS1fd+o+iLO55Elq/tmtefeUbXKat99I2qV1b77RtQKAAAAAAAAAEBO/ivCUdP/HG09frz+fVbpdXRvvWc2+vtXu341qyMra61Hr8ls78pe569mtWceGc7WWpayiu/v7lmVas/Yn6zaV3TdW32U9kTXGZHVWoYRM7lTVvN+5rPfk1mGM1f6bKn3K5hnNe8hQ1Y9V/T8W2cgq9zO6GdUrz1XdA5RWfXqveeKzuHsGdRmNbr2nvszWstl+l62s3rHrEp5rb0endXr+f0bxtb9WvdfzVWyqrl36/4rWap/3kupvxH9t6zoczUqq8/z6WNLVr1+a23JZ8/+qyll0XK2ZTU2q73zms9iZFalHCJqzZAVAAAAAAAAAAD08Ad2lAno6LcAAA==
</data>
</layer>
+ <objectgroup name="Object Group 4" width="0" height="0">
+ <object name="ToCellar" type="warp" x="864" y="768" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="010-2"/>
+ <property name="dest_x" value="1136"/>
+ <property name="dest_y" value="2192"/>
+ </properties>
+ </object>
+ <object name="ToOutdoor" type="warp" x="1024" y="1440" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="010-1"/>
+ <property name="dest_x" value="1168"/>
+ <property name="dest_y" value="3056"/>
+ </properties>
+ </object>
+ <object name="To2ndFloor" type="warp" x="1248" y="864" width="96" height="32">
+ <properties>
+ <property name="dest_map" value="010-2"/>
+ <property name="dest_x" value="2640"/>
+ <property name="dest_y" value="848"/>
+ </properties>
+ </object>
+ <object name="To1stFloor" type="warp" x="1152" y="2176" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="010-2"/>
+ <property name="dest_x" value="912"/>
+ <property name="dest_y" value="784"/>
+ </properties>
+ </object>
+ <object name="To3rdFloor" type="warp" x="2112" y="864" width="96" height="32">
+ <properties>
+ <property name="dest_map" value="010-2"/>
+ <property name="dest_x" value="2160"/>
+ <property name="dest_y" value="2288"/>
+ </properties>
+ </object>
+ <object name="To1stFloor" type="warp" x="2624" y="928" width="96" height="32">
+ <properties>
+ <property name="dest_map" value="010-2"/>
+ <property name="dest_x" value="1296"/>
+ <property name="dest_y" value="880"/>
+ </properties>
+ </object>
+ <object name="To2ndFloor" type="warp" x="2112" y="2336" width="96" height="32">
+ <properties>
+ <property name="dest_map" value="010-2"/>
+ <property name="dest_x" value="2160"/>
+ <property name="dest_y" value="912"/>
+ </properties>
+ </object>
+ </objectgroup>
</map>
diff --git a/maps/013-1.tmx b/maps/013-1.tmx
index 8e257634..09fdb98c 100644
--- a/maps/013-1.tmx
+++ b/maps/013-1.tmx
@@ -10,19 +10,19 @@
<property name="overlay0scrollY" value="0.1"/>
</properties>
<tileset name="woodland ground" firstgid="1" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/Woodland_ground.png"/>
+ <image source="../../../trunk/graphics/tiles/Woodland_ground.png"/>
</tileset>
<tileset name="Untitled" firstgid="257" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/collision.png"/>
+ <image source="../../../trunk/graphics/tiles/collision.png"/>
</tileset>
<tileset name="Woodland x2" firstgid="259" tilewidth="32" tileheight="64">
- <image source="../graphics/tiles/Woodland_x2.png"/>
+ <image source="../../../trunk/graphics/tiles/Woodland_x2.png"/>
</tileset>
<tileset name="trees" firstgid="275" tilewidth="32" tileheight="96">
- <image source="../graphics/tiles/Woodland_x3.png"/>
+ <image source="../../../trunk/graphics/tiles/Woodland_x3.png"/>
</tileset>
<tileset name="village" firstgid="291" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/Woodland_village.png"/>
+ <image source="../../../trunk/graphics/tiles/Woodland_village.png"/>
</tileset>
<layer name="Ground" width="154" height="124">
<data encoding="base64" compression="gzip">
@@ -48,5 +48,12 @@
<object name="graphics/particles/waterfall-1x2.particle.xml" type="PARTICLE_EFFECT" x="3593" y="3209" width="32" height="32"/>
<object name="graphics/particles/waterfall-1x3.particle.xml" type="PARTICLE_EFFECT" x="1259" y="3200" width="32" height="32"/>
<object name="graphics/particles/waterfall-1x2.particle.xml" type="PARTICLE_EFFECT" x="1193" y="2793" width="32" height="32"/>
+ <object name="toCave" type="warp" x="4000" y="3296" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="013-3"/>
+ <property name="dest_x" value="1088"/>
+ <property name="dest_y" value="2048"/>
+ </properties>
+ </object>
</objectgroup>
</map>
diff --git a/maps/013-3.tmx b/maps/013-3.tmx
index 40dbf8c6..a5f065ef 100644
--- a/maps/013-3.tmx
+++ b/maps/013-3.tmx
@@ -2,43 +2,43 @@
<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
<map version="1.0" orientation="orthogonal" width="200" height="200" tilewidth="32" tileheight="32">
<tileset name="Cave" firstgid="1" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/cave.png"/>
+ <image source="../../../trunk/graphics/tiles/cave.png"/>
</tileset>
<tileset name="Cave Bilevel Water" firstgid="129" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/cave_bilevel_water.png"/>
+ <image source="../../../trunk/graphics/tiles/cave_bilevel_water.png"/>
</tileset>
<tileset name="Cave x2" firstgid="385" tilewidth="32" tileheight="64">
- <image source="../graphics/tiles/cave_x2.png"/>
+ <image source="../../../trunk/graphics/tiles/cave_x2.png"/>
</tileset>
<tileset name="Arena" firstgid="401" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/arena.png"/>
+ <image source="../../../trunk/graphics/tiles/arena.png"/>
</tileset>
<tileset name="Woodland Ground" firstgid="657" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/Woodland_ground.png"/>
+ <image source="../../../trunk/graphics/tiles/Woodland_ground.png"/>
</tileset>
<tileset name="Woodland x2" firstgid="913" tilewidth="32" tileheight="64">
- <image source="../graphics/tiles/Woodland_x2.png"/>
+ <image source="../../../trunk/graphics/tiles/Woodland_x2.png"/>
</tileset>
<tileset name="Woodland x3" firstgid="929" tilewidth="32" tileheight="96">
- <image source="../graphics/tiles/Woodland_x3.png"/>
+ <image source="../../../trunk/graphics/tiles/Woodland_x3.png"/>
</tileset>
<tileset name="Woodland Village" firstgid="945" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/Woodland_village.png"/>
+ <image source="../../../trunk/graphics/tiles/Woodland_village.png"/>
</tileset>
<tileset name="Woodland Village x2" firstgid="1201" tilewidth="32" tileheight="64">
- <image source="../graphics/tiles/Woodland_village_x2.png"/>
+ <image source="../../../trunk/graphics/tiles/Woodland_village_x2.png"/>
</tileset>
<tileset name="Woodland Indoor" firstgid="1217" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/woodland_indoor.png"/>
+ <image source="../../../trunk/graphics/tiles/woodland_indoor.png"/>
</tileset>
<tileset name="Woodland Indoor x2" firstgid="1473" tilewidth="32" tileheight="64">
- <image source="../graphics/tiles/woodland_indoor_x2.png"/>
+ <image source="../../../trunk/graphics/tiles/woodland_indoor_x2.png"/>
</tileset>
<tileset name="Woodland Indoor x3" firstgid="1489" tilewidth="32" tileheight="96">
- <image source="../graphics/tiles/woodland_indoor_x3.png"/>
+ <image source="../../../trunk/graphics/tiles/woodland_indoor_x3.png"/>
</tileset>
<tileset name="Collision" firstgid="1505" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/collision.png"/>
+ <image source="../../../trunk/graphics/tiles/collision.png"/>
</tileset>
<layer name="Ground" width="200" height="200">
<data encoding="base64" compression="gzip">
@@ -60,4 +60,34 @@
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
</data>
</layer>
+ <objectgroup name="Object Group 4" width="0" height="0">
+ <object name="hiddenExit" type="warp" x="896" y="640" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="013-1"/>
+ <property name="dest_x" value="4032"/>
+ <property name="dest_y" value="3264"/>
+ </properties>
+ </object>
+ <object name="toOutside" type="warp" x="1088" y="2016" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="013-1"/>
+ <property name="dest_x" value="4000"/>
+ <property name="dest_y" value="3328"/>
+ </properties>
+ </object>
+ <object name="toCave" type="warp" x="1152" y="3072" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="013-3"/>
+ <property name="dest_x" value="2528"/>
+ <property name="dest_y" value="4032"/>
+ </properties>
+ </object>
+ <object name="toCave" type="warp" x="2528" y="4000" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="013-3"/>
+ <property name="dest_x" value="1120"/>
+ <property name="dest_y" value="3072"/>
+ </properties>
+ </object>
+ </objectgroup>
</map>
diff --git a/maps/017-1.tmx b/maps/017-1.tmx
index f9fb882f..4718e8b2 100644
--- a/maps/017-1.tmx
+++ b/maps/017-1.tmx
@@ -10,19 +10,19 @@
<property name="overlay0scrollY" value="0.1"/>
</properties>
<tileset name="Woodland" firstgid="1" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/Woodland_ground.png"/>
+ <image source="../../../trunk/graphics/tiles/Woodland_ground.png"/>
</tileset>
<tileset name="Woodland x2" firstgid="257" tilewidth="32" tileheight="64">
- <image source="../graphics/tiles/Woodland_x2.png"/>
+ <image source="../../../trunk/graphics/tiles/Woodland_x2.png"/>
</tileset>
<tileset name="Woodland x3" firstgid="273" tilewidth="32" tileheight="96">
- <image source="../graphics/tiles/Woodland_x3.png"/>
+ <image source="../../../trunk/graphics/tiles/Woodland_x3.png"/>
</tileset>
<tileset name="Woodland Village" firstgid="289" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/Woodland_village.png"/>
+ <image source="../../../trunk/graphics/tiles/Woodland_village.png"/>
</tileset>
<tileset name="Collision" firstgid="545" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/collision.png"/>
+ <image source="../../../trunk/graphics/tiles/collision.png"/>
</tileset>
<layer name="Ground" width="154" height="124">
<data encoding="base64" compression="gzip">
@@ -41,7 +41,7 @@
</layer>
<layer name="Collision" width="154" height="124">
<data encoding="base64" compression="gzip">
- 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
+ H4sIAAAAAAAAAO2VW27kMAwEgz1K7n/IYP8MwxLZJGXachEoIOOR+Or25Pffz88vAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEj8j666XbVhT62v6szCkwufvoOIxlU1lFByde8U8vpX1VHqR3vv3i/EfRbRMBvZ3N17/jIjPVb5QPXc7H7Ev937/ipPjspeu/cMNZ6oDqvX4+fZHN27hZzX7vBnRf/de4W810aaVp07nlV7794l1HvtfPecZ5VPst6E93jt6p7ls5kX8Np3UP11vmf5xbqvegV/vZMr3c5/e71ylWfkvdm9SM9XZ7p3C3PNq/Jc5Zv50VPb0292Fljvs8pcM495/OKp460Ne3hMqeP126wnbw54Doo+qo6WjxTfje55asEz/KXoq+ax8mfCk6N7z7tTEZlcV3dX9GjV7dZhVzKaVOhqnVvpMU9dWOspRZNVea3+z8+q+unW6Yl49hTZcVQLb/2r7+58R6zo1vUp3LnrCi2iOaK9XvlezfVVqsKTr9IrIw9UzRmtF8n5BaKh5o3UzuZf4bdZrcw8XyG7/1lO64zqnax+1kyjnFbN2SyRPndFiUi+yjtZ/SIzeutle9sdNVbt27oX7UeZ1zrryd2t59Oxdh/ZuXfvVt5ZL5U+88zfrdPbiUSF1zzaWt8dn1XNOLrfrdPbsfTM+CejdySy9bq12J2KXXs1O37n0bw6lLzduuxGdrcZfe4MPPYcn513bO1+pGOV10ZnVb9mfB6dC7Q9ezWI6KPeUXKpedWZQffZeddVPpzpo+qnaj2aJ+ov71xgaz3SZnUo/UZmm/nU01dV/1/lSdHxDnnO47VaHZ7kvTs9pvRwfF7d81sZ7aA6rjRQdJ/ljMzreZe8fal+7ta802MrY0VfFfkqdlNZc0fUPSpxvHNHb9WeVcNbu1vzp/krev9O/1f1XBWzWt2aP9Fjnt2s2mM27vJX1Tu7K9bOMl7w3rM+R7R8S3Tr3+01ZRfqnUp97gj1vbjqbbaDbv27fRb1iue84hOPjpGI5Im+M8pOdkXdT8ajnlrVMfLpua+r+tmeurV9CpH9eDSouufVUZ0hshu1J7B3Ze1Muauei/Zq9XzOOXvmnaVbx7ei6mZpPdNp9szyhlXX2/NKL4PfL7O9rjqneMPjnaiXZrmg1mdZXyo5V82gxMzD3RrtgrV75aySq9tjVq5uXXZG9Y+q5eqeR9+p9/FZn3ZP9NiKmY+fu3vamaif3uova/bunnYmG939Z2fv7uFLfM1f55m7e/kC2ejuPzNvdy9f4Wseg37wGKyC3zC4EzwGq+G3DO4Er8FK+D2Du8BfcBd4DVaDv2A1+AvuAo9BNUcf8f8SVqFEd68AAAAAAAAAAAAAAAAAAAAAAAAAAAAAV/wBkJrh7WAqAQA=
</data>
</layer>
<objectgroup name="Object Group 4" width="0" height="0">
diff --git a/maps/018-1.tmx b/maps/018-1.tmx
index 96a43e89..1ba8c5f3 100644
--- a/maps/018-1.tmx
+++ b/maps/018-1.tmx
@@ -10,31 +10,31 @@
<property name="overlay0scrollY" value="0.1"/>
</properties>
<tileset name="Woodland" firstgid="1" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/Woodland_ground.png"/>
+ <image source="../../../trunk/graphics/tiles/Woodland_ground.png"/>
</tileset>
<tileset name="Woodland x2" firstgid="257" tilewidth="32" tileheight="64">
- <image source="../graphics/tiles/Woodland_x2.png"/>
+ <image source="../../../trunk/graphics/tiles/Woodland_x2.png"/>
</tileset>
<tileset name="Woodland x3" firstgid="273" tilewidth="32" tileheight="96">
- <image source="../graphics/tiles/Woodland_x3.png"/>
+ <image source="../../../trunk/graphics/tiles/Woodland_x3.png"/>
</tileset>
<tileset name="Woodland Village" firstgid="289" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/Woodland_village.png"/>
+ <image source="../../../trunk/graphics/tiles/Woodland_village.png"/>
</tileset>
<tileset name="Woodland Village x2" firstgid="545" tilewidth="32" tileheight="64">
- <image source="../graphics/tiles/Woodland_village_x2.png"/>
+ <image source="../../../trunk/graphics/tiles/Woodland_village_x2.png"/>
</tileset>
<tileset name="Woodland Indoor" firstgid="561" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/woodland_indoor.png"/>
+ <image source="../../../trunk/graphics/tiles/woodland_indoor.png"/>
</tileset>
<tileset name="Woodland Indoor x2" firstgid="817" tilewidth="32" tileheight="64">
- <image source="../graphics/tiles/woodland_indoor_x2.png"/>
+ <image source="../../../trunk/graphics/tiles/woodland_indoor_x2.png"/>
</tileset>
<tileset name="Collision" firstgid="833" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/collision.png"/>
+ <image source="../../../trunk/graphics/tiles/collision.png"/>
</tileset>
<tileset name="Untitled" firstgid="835" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/Woodland_water.png"/>
+ <image source="../../../trunk/graphics/tiles/Woodland_water.png"/>
</tileset>
<layer name="Ground" width="200" height="120">
<data encoding="base64" compression="gzip">
@@ -56,12 +56,103 @@
H4sIAAAAAAAAAO2UW64dKwxEI92ZZf6DyteVUAsaY2zKvVklLeWoN/hZ5O9/f/78/QCt1LUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAOPalrAqhA+xZ4H3A7K1LXCnAa3gfAmF9+H1+sGWqx+z5Ovqde7Oe39l/eB6ww8u+Ox6PirNZuycX7ACteRcX0xtjtQT13qEvrD69m8b1x2u+We16pdwC1iFZULu9d653RGfU+oBa/pl5f1l7Vu4B6ZPlzN5f37u4dgJZo7eRqz3nr9NxT7wDq8vTlriz5PHF28kf3AHcRqYi8q2dHd0/1AfdQ1VNvOWc1PH9T9wLfZvU9nPKT5314pd4B1Kb3Bqp6aVSLpeaqPUF9qnhnltPzPqxS7wBq4/FLe27XY73cz7/ffM37gApkeC7C07tSzxW+SeudLN9F+Hr2bbdGgCfRfs3K5b1vrQ3upueTSK3W4omZXRfcS+uVDHnqmdWknhn8Jj1vRfnf4mOrty35ACJZ8bXl95ne7qtnAd8j0zdvHo6Qt4as3tS7hLzdZux3lifyHZzuc6Uf9b4hxjcZu5zlmCmjz9UYljoz+4DzeHa547HR3VVftd88da/UHin1vmEN7369O3+7s5LTWucs/v/fo+bjqQvqcnrnozuzuBF1Pb9b+4iUet+w7tWTO3+78xaz/TbKP6trp4+MWUCMXzPzre7fUt/bOU9PUXXtzNibD2wz3Zn/6Voj1caOnIkl78n5qL32JVb31/teYfbRWulrNpNZnpOzUPvtS8xm6JG6J2/dlv4j8p2egXoXXydDllyWunp/Z/dlue/Np9415PjGc789v+PXWT2rffZ+98xJvUfIYdePVeXtM2JO6p3C2ffRnrXEsMTundmpcZbLem6W31rT27zgO4w8YvGNNaZV0fGeMVdyRuS25oDaZO83wkO9s6c8ao0dnRe0nPCWJefoTGQfJ2a1G1ftB4jdd/ReM7xd3XuRvULOTmaeHO0uercZ7+Otfsu97Hn3zqj9cSOrsvprNdasxlFM5axOzv10r2Dfx2hHkYry0Cxm9KyiZt3GyuwDYne2uidPPI927rb3M+aUIbVXbqSde+SORud3fJGhndmcfDtqn9zKbB8Zezql0/kypfbJraj2Fembr8kzA7VPbiVy36o3Uk0Z/al9ciNROz/xNmb3djxZ4b1a+4N6b+PEvqw+uVFqr9zGaP7W7xk7OyFvLsu9zD7UfrmJqvtCY6k9cwvVdtXG89YRLeV77eVWe+YW3nZwYkfIJ7VvbkG9p5vlnYHaM7exu1/ex1mp/XIbs7ln7uikTubMzKX2C5xjtP9q6tWb+QYstcDvs+uRX5K1J/XOoP77iPDZ7p23u89vUf2q9wUaKqitJasuS4633Oo9gZYvqVez9dtuTriPk/LmjKi1F8MaV70j0OHxVaR68Xdq24k3ywP3oVIv/+zbrI/Vb9Ya4W5WPGPRSqxT/a3Wq94J1OGURvlO9/jWt3oXUA+PzyOk7rX9NvpbVSfUYtXXkares3o3oKfnhzefWM5/yX+9XtQ1QR1W/bwrdb8rc1DXBDV484blfXjiVIJ3AU+sas9b71lzVOq1d1a9I9DhkfdeBf89axjNoXcG7mPFx+1vEarS8+h39W6gDqu+3lWbV937bAbquqAGT9+++cTio9G3L/iven2g4e3/+V/3y6hvdV0Aat6krg2gGrwLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIA7+QcKPZ83AHcBAA==
</data>
</layer>
- <objectgroup name="Objects" width="0" height="0" y="81">
- <object name="ToWoodland" type="WARP" x="2464" y="3232" width="128" height="64">
+ <objectgroup name="Object Group 4" width="0" height="0">
+ <object name="toMine" type="warp" x="2496" y="1888" width="64" height="32">
<properties>
- <property name="DEST_MAP" value="16"/>
- <property name="DEST_X" value="2176"/>
- <property name="DEST_Y" value="736"/>
+ <property name="dest_map" value="018-3"/>
+ <property name="dest_x" value="3200"/>
+ <property name="dest_y" value="4160"/>
+ </properties>
+ </object>
+ <object name="toCave" type="warp" x="3584" y="1952" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="018-3"/>
+ <property name="dest_x" value="1408"/>
+ <property name="dest_y" value="1152"/>
+ </properties>
+ </object>
+ <object name="toCave" type="warp" x="3680" y="1280" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="013-3"/>
+ <property name="dest_x" value="704"/>
+ <property name="dest_y" value="3648"/>
+ </properties>
+ </object>
+ <object name="toCave" type="warp" x="4096" y="1792" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="018-3"/>
+ <property name="dest_x" value="1568"/>
+ <property name="dest_y" value="3104"/>
+ </properties>
+ </object>
+ <object name="toCave" type="warp" x="2880" y="1344" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="018-3"/>
+ <property name="dest_x" value="3936"/>
+ <property name="dest_y" value="5248"/>
+ </properties>
+ </object>
+ <object name="toCave" type="warp" x="2208" y="1728" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="018-3"/>
+ <property name="dest_x" value="2240"/>
+ <property name="dest_y" value="3296"/>
+ </properties>
+ </object>
+ <object name="toCave" type="warp" x="4064" y="1152" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="013-3"/>
+ <property name="dest_x" value="4448"/>
+ <property name="dest_y" value="1408"/>
+ </properties>
+ </object>
+ <object name="toCave" type="warp" x="4288" y="1440" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="013-3"/>
+ <property name="dest_x" value="1952"/>
+ <property name="dest_y" value="5696"/>
+ </properties>
+ </object>
+ <object name="toCave" type="warp" x="4704" y="1280" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="013-3"/>
+ <property name="dest_x" value="2592"/>
+ <property name="dest_y" value="3264"/>
+ </properties>
+ </object>
+ <object name="toCave" type="warp" x="4896" y="1472" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="018-3"/>
+ <property name="dest_x" value="4672"/>
+ <property name="dest_y" value="5120"/>
+ </properties>
+ </object>
+ <object name="toCave" type="warp" x="5056" y="1088" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="018-3"/>
+ <property name="dest_x" value="2048"/>
+ <property name="dest_y" value="3232"/>
+ </properties>
+ </object>
+ <object name="toCave" type="warp" x="5184" y="1408" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="018-3"/>
+ <property name="dest_x" value="928"/>
+ <property name="dest_y" value="5248"/>
+ </properties>
+ </object>
+ <object name="toCave" type="warp" x="5664" y="640" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="013-1"/>
+ <property name="dest_x" value="5664"/>
+ <property name="dest_y" value="2880"/>
+ </properties>
+ </object>
+ <object name="toIndoor" type="warp" x="2080" y="2336" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="018-2"/>
+ <property name="dest_x" value="1600"/>
+ <property name="dest_y" value="896"/>
</properties>
</object>
</objectgroup>
diff --git a/maps/018-2.tmx b/maps/018-2.tmx
index 15e08cbb..955783ac 100644
--- a/maps/018-2.tmx
+++ b/maps/018-2.tmx
@@ -2,23 +2,23 @@
<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
<map version="1.0" orientation="orthogonal" width="146" height="70" tilewidth="32" tileheight="32">
<tileset name="Woodland Indoor" firstgid="1" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/woodland_indoor.png"/>
+ <image source="../../../trunk/graphics/tiles/woodland_indoor.png"/>
</tileset>
<tileset name="Woodland Indoor x2" firstgid="257" tilewidth="32" tileheight="64">
- <image source="../graphics/tiles/woodland_indoor_x2.png"/>
+ <image source="../../../trunk/graphics/tiles/woodland_indoor_x2.png"/>
</tileset>
<tileset name="Woodland Indoor x3" firstgid="273" tilewidth="32" tileheight="96">
- <image source="../graphics/tiles/woodland_indoor_x3.png"/>
+ <image source="../../../trunk/graphics/tiles/woodland_indoor_x3.png"/>
</tileset>
<tileset name="Woodland Village" firstgid="289" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/Woodland_village.png"/>
+ <image source="../../../trunk/graphics/tiles/Woodland_village.png"/>
</tileset>
<tileset name="Collision" firstgid="545" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/collision.png"/>
+ <image source="../../../trunk/graphics/tiles/collision.png"/>
</tileset>
<layer name="Ground" width="146" height="70">
<data encoding="base64" compression="gzip">
- H4sIAAAAAAAAAO3bYXLTMBCGYYUbiAswDfC7UwYOwAxwAuAEhfsfAWVigdhqLcWRvJb9euaZpIlTa1efG9tpnpxzTwAAAAAAAAAAAAAAAAAAAPjrFLyabmvEda3H3apOrfZedcbf75L76eMa6/6V+OD1dFsjritrT+fDKc/V5LbX/Gl1arWndbYeh5965JNtlPpunZOSh4Vk7el8OOW5ufnsPX/31NljHGexjbXH0dqlnrfTbY247lztZ+Xxk+H8aXVqtad1th7Hl+Br8C3ZRqnv1jmpqWsJ+dq5LMbn/A3rbqnO1uP4HvwIfiq9HDFHbxb295Tcfxe8r3jNww2/f685uizPwa/g9/TzkXPkk/sfg093zNWRcnTpdzyniPvjHnKU7idyafW3Je2F5fzJfSYep6THKmuMw7t/+6Gv7It1Pmr7u2QfGT1H8TglPVbpPY5H9/J8ZE85WrKPkKPbpX8H93S+Fvub20fmltLzpdd8qFi3JbloOeo9jnS7cZuf3fg5epzkxi3f685unOv0krxuruWo9+cRuRzFx0fO0dy4vfv/ve7sxrlOL3lBy5FcjxzdnyP5Xnd2/a4395a75p7L0RrX1feYI20p1WY97iXzJ1kdZ+dylHvfHenz/rnxk6P1cuTdy/fd9Gfr/pXMjZ8crZej0mfd1v0rmRv/nnIkFy1HclkrR6MfH5XGP2pdEuf95KgF78Y578/9/4R1/8jR1Ujn/bn/n7DuHznS69zScfbo/SZH5IgckaOtOEqO5KLlSC5r5EieI+ZY948cXW35vN9XsO4fObqS86LlqPf85XJk8T0scrTMls/799Dvo+Roy8fZe+j3kXMUv0cWv0u2Vo6eC9scsd9HzpFFnVsZR2tLF+txj1rnVsYBAAAAAAAAAAAAAAAAAAAAAGjjDyzWdxGwnwAA
+ H4sIAAAAAAAAAO3bcW7TMBTHcZcbeBdAC+zvaQgOgAScAHaCjfsfAVeNwbzZsZvafnHyjfRRuzZd/J5/WZN0fTLGPAEAAAAAAAAAAAAAAAAAAOCvk/Nuvi3h19Ued606U7W3qtP/fhPcDx9P0e5fjnXu5tsSfl1ZezgfJvFcSW5bzV+qzlTtYZ21x2HnHtlgG7m+a+ck534lWXs4Hybx3NJ8tp6/W+psMY5JbKP3OGo71/Nhvi3h112qfUo8flKcv1SdqdrDOmuP45vz3fkRbCPXd+2clNS1hnztUhb9c/aKdbdUZ+1x/HR+Oc+JXo6Yo/cr+3sK7n90Hgpec3/F799rjs7Li/Pq/J5/PnKObHD/s/Plhrk6Uo7O/fbnFH5/3EOOwv1ELrX+toS90Jw/uc/445TwWKXHOKz5tx/awr5o56O0v2v2kdFz5I9TwmOV1uN4NG/PR/aUozX7CDm6Xvh3cE/na76/sX1kack9n3vNVLBuTXJJ5aj1OMLt+m1+NePn6HEWG7d8r5tMvev0nzrXKa+bp3LU+vOIWI784yPnaGnc1vz/XjeZca7TS1ZI5UiuR45uz5F8r5tMu+vNrcWuucdy1OO6+h5zlFpytWmPe838SVrH2bEcxd53R/q8f2n85Khfjqx5+74b/qzdv5yl8ZOjfjnKfdat3b+cpfHvKUdySeVILr1yNPrxUW78o9Ylcd5PjmqwZpzz/tj/T2j3jxxdjHTeH/v/Ce3+kaN0nVs6zh693+SIHJEjcrQVR8mRXFI5kkuPHMlzxBjt/pGjiy2f99sC2v0jRxdyXlI5aj1/sRxpfA+LHK2z5fP+PfT7KDna8nH2Hvp95Bz575H575L1ytFLZpsj9vvIOdKocyvjqG3toj3uUevcyjgAAAAAAAAAAAAAAAAAAAAAAHX8AWrkkNKwnwAA
</data>
</layer>
<layer name="Fringe" width="146" height="70">
@@ -31,14 +31,56 @@
H4sIAAAAAAAAAO3b203DMBQG4L4yDiMxAiMgcXmELRBIMEALQ3AZiLwgIYhCEts9tvN9kp9Sn/6NlNgnSnc7AAAAAAAAAAAAAIA+HaID0I3X6ADQgLdhvA/jIzoIXXgoVPezUN0anY6M33q/bm8S54+dM/7aRwdIMHWd3K+odzmMq2Fcp0fbrOfoAIluM9XRf6z3FB3gSKxRZb1EB8jg+340ttb9XPOmjv83Z079nObWL50DWCbX/qhGJ5k+A3Mds0+YsyeoWau5IcLdijk9r+9AHH0/W3AWHYBFau37zwO+k+UeV8wp9Z7MmIuJY/b70Bd9P1vQ+vPsrdD3A7Wpte+nDan/UQDIRd8P9Vv6rn6r/XAtv7OWHAAAAAAAAAAAAAAA5PEFClP/Y7CfAAA=
</data>
</layer>
- <layer name="Collision" width="146" height="70" visible="0">
+ <layer name="Collision" width="146" height="70">
<data encoding="base64" compression="gzip">
- H4sIAAAAAAAAAO3SW6rDMAxF0dChdP6D7FchmDiWYuvl7MDi9pYUS8fn+zmOLwAAAAAAAAAAAAAAAAAAAAAgnfaRvh8994pde3tr8lgxw9270ZnN9mj0aPI5/y/J0Ov+JI9Xj7zO9+qRJl/L32Ta06NHoxmjeyLZS7PD+TvL52098p4jY49W3JV1ZjOzWWd/le3dd5lJs5x5NOdb7afdwatHvTM95vDa7UmPZu7Qai/NDFazXM3wlh49eWbv0HrHqDl6Z0iyy6yds/18l680f+lver/fvUfS7DKTZPf/rsI+s/cZlbemWxnRI3rk2aMq+zzpjufd9c6JmMWrRxX3WdUhq32lZ1TOup3fM196RI+qiO6QtEc75XyXe/ScO/YoYpbIbKvs9XTviHNH81TImx7l7lGVvEezV91Lu6vXjpKcr96Nzk66l7ZT0XNbd8hqT0m21jPsnO9b9uydcf5bMess+Wbc1WuG0WzRudGjOj2q7k09kuwdcW50FvRojx7tkHdv5up7rbjDDDNUyXvXvbLumWUO672ku0bPXfX+sswRtVf7bvTcHneYYYYqee+6Fz0CAAAAAAAAAAAAAAAAAAAAAHj4Af8039GwnwAA
+ H4sIAAAAAAAAAO3SUY6DMAyE4WqP0vsfsk8rIUSIDdhjhx/p03YrqtiT+f59Pl8AAAAAAAAAAAAAAAAAAAAAQDn7x/r+7B31XpZdR3t78nhihm45eno0ezz5bP+3ZJh1f5Ynq0dZ52f1yJNv5G8q7ZnRo9mM6p5Y9vLssP0u8nlbj7LnqNijJ+4qOrM7s0Vnf5Tt2XeVWbO883jOj9rPu0NWj0ZnZsyRtduVHt25w6i9PDNEzXI0w1t6dOW5e4fRO6rmGJ1hya6y/Zz7z2f5WvO3/mb0+9V7ZM2uMkt2/989uY86m6zeWPP2dKsiVY/U6JGmR132udKdzLsbnaOYJatHHfd5qkNR+1rP6Jz1fv7MfOkRPepC3SFrj1bK+Sx39Zwr9kgxizLbLntd3Vtx7myeDnnTo9o96pL3bPaue3l3zdrRkvPRu+rsrHt5O6WeO7pDUXtaso2eYeV837Ln6Izt345ZV8m34q5ZM8xmU+dGj/r0qLs39ciyt+JcdRb0aI0erZD3aObuez1xhxVm6JL3qntV3bPKHNF7WXdVz931/qrModpr/6567ow7rDBDl7xX3YseAQAAAAAAAAAAAAAAAAAAAAAy/AAWAK+/sJ8AAA==
</data>
</layer>
- <objectgroup name="Object Group 4" width="0" height="0">
+ <objectgroup name="Object Group" width="0" height="0">
<object name="graphics/particles/fireplace.particle.xml" type="PARTICLE_EFFECT" x="928" y="640" width="32" height="32"/>
<object name="graphics/particles/fireplace.particle.xml" type="PARTICLE_EFFECT" x="2784" y="640" width="32" height="32"/>
<object name="graphics/particles/cookingfire.particle.xml" type="PARTICLE_EFFECT" x="1200" y="800" width="32" height="32"/>
+ <object name="toOutside" type="warp" x="1600" y="928" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="018-1"/>
+ <property name="dest_x" value="2080"/>
+ <property name="dest_y" value="2368"/>
+ </properties>
+ </object>
+ <object name="toOutside" type="warp" x="1312" y="640" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="018-1"/>
+ <property name="dest_x" value="2080"/>
+ <property name="dest_y" value="2208"/>
+ </properties>
+ </object>
+ <object name="toBasement" type="warp" x="640" y="768" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="018-2"/>
+ <property name="dest_x" value="3584"/>
+ <property name="dest_y" value="864"/>
+ </properties>
+ </object>
+ <object name="toFirstFloor" type="warp" x="3584" y="832" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="018-2"/>
+ <property name="dest_x" value="640"/>
+ <property name="dest_y" value="736"/>
+ </properties>
+ </object>
+ <object name="toSecondFloor" type="warp" x="640" y="896" width="64" height="32">
+ <properties>
+ <property name="dest_map" value="018-2"/>
+ <property name="dest_x" value="2528"/>
+ <property name="dest_y" value="800"/>
+ </properties>
+ </object>
+ <object name="toFirstFloor" type="warp" x="2496" y="832" width="64" height="32">
+ <properties>
+ <property name="dest_map" value="018-2"/>
+ <property name="dest_x" value="672"/>
+ <property name="dest_y" value="928"/>
+ </properties>
+ </object>
</objectgroup>
</map>
diff --git a/maps/018-3.tmx b/maps/018-3.tmx
index 26b4a4f0..276f611a 100644
--- a/maps/018-3.tmx
+++ b/maps/018-3.tmx
@@ -2,43 +2,43 @@
<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
<map version="1.0" orientation="orthogonal" width="200" height="200" tilewidth="32" tileheight="32">
<tileset name="Cave" firstgid="1" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/cave.png"/>
+ <image source="../../../trunk/graphics/tiles/cave.png"/>
</tileset>
<tileset name="Cave Bilevel Water" firstgid="129" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/cave_bilevel_water.png"/>
+ <image source="../../../trunk/graphics/tiles/cave_bilevel_water.png"/>
</tileset>
<tileset name="Cave x2" firstgid="385" tilewidth="32" tileheight="64">
- <image source="../graphics/tiles/cave_x2.png"/>
+ <image source="../../../trunk/graphics/tiles/cave_x2.png"/>
</tileset>
<tileset name="Arena" firstgid="401" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/arena.png"/>
+ <image source="../../../trunk/graphics/tiles/arena.png"/>
</tileset>
<tileset name="Woodland Ground" firstgid="657" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/Woodland_ground.png"/>
+ <image source="../../../trunk/graphics/tiles/Woodland_ground.png"/>
</tileset>
<tileset name="Woodland x2" firstgid="913" tilewidth="32" tileheight="64">
- <image source="../graphics/tiles/Woodland_x2.png"/>
+ <image source="../../../trunk/graphics/tiles/Woodland_x2.png"/>
</tileset>
<tileset name="Woodland x3" firstgid="929" tilewidth="32" tileheight="96">
- <image source="../graphics/tiles/Woodland_x3.png"/>
+ <image source="../../../trunk/graphics/tiles/Woodland_x3.png"/>
</tileset>
<tileset name="Woodland Village" firstgid="945" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/Woodland_village.png"/>
+ <image source="../../../trunk/graphics/tiles/Woodland_village.png"/>
</tileset>
<tileset name="Woodland Village x2" firstgid="1201" tilewidth="32" tileheight="64">
- <image source="../graphics/tiles/Woodland_village_x2.png"/>
+ <image source="../../../trunk/graphics/tiles/Woodland_village_x2.png"/>
</tileset>
<tileset name="Woodland Indoor" firstgid="1217" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/woodland_indoor.png"/>
+ <image source="../../../trunk/graphics/tiles/woodland_indoor.png"/>
</tileset>
<tileset name="Woodland Indoor x2" firstgid="1473" tilewidth="32" tileheight="64">
- <image source="../graphics/tiles/woodland_indoor_x2.png"/>
+ <image source="../../../trunk/graphics/tiles/woodland_indoor_x2.png"/>
</tileset>
<tileset name="Woodland Indoor x3" firstgid="1489" tilewidth="32" tileheight="96">
- <image source="../graphics/tiles/woodland_indoor_x3.png"/>
+ <image source="../../../trunk/graphics/tiles/woodland_indoor_x3.png"/>
</tileset>
<tileset name="Collision" firstgid="1505" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/collision.png"/>
+ <image source="../../../trunk/graphics/tiles/collision.png"/>
</tileset>
<layer name="Ground" width="200" height="200">
<data encoding="base64" compression="gzip">
@@ -60,4 +60,5 @@
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
</data>
</layer>
+ <objectgroup name="Object Group 4" width="0" height="0"/>
</map>
diff --git a/maps/019-1.tmx b/maps/019-1.tmx
index eb1f77d2..1d1314df 100644
--- a/maps/019-1.tmx
+++ b/maps/019-1.tmx
@@ -6,19 +6,19 @@
<property name="music" value="The Mana World - Snow Village.ogg"/>
</properties>
<tileset name="snow" firstgid="1" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/snowset.png"/>
+ <image source="../../../trunk/graphics/tiles/snowset.png"/>
</tileset>
<tileset name="walk" firstgid="81" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/collision.png"/>
+ <image source="../../../trunk/graphics/tiles/collision.png"/>
</tileset>
<tileset name="snowbuilding" firstgid="83" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/snow_building.png"/>
+ <image source="../../../trunk/graphics/tiles/snow_building.png"/>
</tileset>
<tileset name="Snow_x3" firstgid="193" tilewidth="32" tileheight="96">
- <image source="../graphics/tiles/snow_x3.png"/>
+ <image source="../../../trunk/graphics/tiles/snow_x3.png"/>
</tileset>
<tileset name="Snow_x2" firstgid="209" tilewidth="32" tileheight="64">
- <image source="../graphics/tiles/snow_x2.png"/>
+ <image source="../../../trunk/graphics/tiles/snow_x2.png"/>
</tileset>
<layer name="Ground" width="138" height="128">
<data encoding="base64" compression="gzip">
@@ -37,17 +37,10 @@
</layer>
<layer name="Collision" width="138" height="128">
<data encoding="base64" compression="gzip">
- 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
+ H4sIAAAAAAAAAO2VYc7cIAwFc8X2/ofpr0gUkawDNs/APGlUab8mcfxm2b/Xdf0FAAAAAAAAAAAAAAAAAAAAAAAAAAAAgGOpo54HclJHPQ/kpI56HshJHfU8kLPPqPtCP386u7Mkmyfe9zsFaxeW/GnQ+j8KT97mVHewAtadtRzo4c4sT77Op+4jK179t84Oazw98XwfHPq+2y+J9mr0ubgT54nXWaPoMvJ91N2t4skddW8z3aij7k/hSSvqfpQOPKW+Xt1h9vNE1WlP71YfemZSdzjbE6U/lo7qfDkPoudX97i6J786aqX1t9ne4sqYJ7+6e8uq/ePJc2/1Z61YHfI8nzLRirrPKMpYHJm1f8Vz3/p/y87nSt2H964zniGXYS9lRt9/ddR9RfRvzczdqHs+xZOejHaGJ+P78NpnT5727t2Z1zvt4knPTr5ca83o99Pz+2/t/7Qz5deeLdc9JaKz6O//rJlXpNxbvUfPsyhq96r+T/PkbZ+Z3HibMzPqfr3PE2X/6hnwJL8nu6PuV+FJHXUH2bkmdTiDVqJ3p+7P4x0sUXerOk+sO1P3GNn9l/dUdzvbE+teMnIV/1ri+Wx1t15E7OaE/k/yRN2zxQNL1HPu7onKF2vUHffOjid9OyyfVe8xA5ZY7lF/pu51tieje1ScXdbc873do3cGda+eWPY4iqcnlljvEe2quttZ58hMLFHPeJInGT1Q94kn8Y68Rd0TjsQ78hZ1Byug7tvLk1bUu12Rpx2q+551nqhRz1ymZ/bVUfevpkzUM9QdqzyxRt2/2sHTPaH/sxzJ5MuVYIbeuevgyRk85a378u+7OnKCJ7/y5V7W/ak7xRNb91fQcy37U/e5qyeWZHmXX8/8NZe666yefM2XflbxZJez5utuPPsf6SebJ5Z51F17OlKnvuZOdCere1LuU93zCK30nLV48v/fRubPxuh+dvOkld4ZV3fEs6fZnnj0fsfDWW+/s6HuL3P/3qi73skTS9QznuaI0pVWMnTp6TaefNubun9Pl3vfSd1xtCvX9bw3dY8RDkQ8S92tJ9G7mt3/k+sK1N3OOlOycEc9x+meqFy5o+4TTzSelBm5tuf6LKj7VLrS219P1D33zn1H3WUkZSJ32Lq/133e5vWa3TKDusuZrpwefneeUf+mq39rvN9nZ9T73QV1j3iyDuou8WQd1H2u7MmVoD980XhiiYcnXon2AU98++rJ6Gwzz41THGnF41meUT67zI5OfPXF+/yM/A4rZzndlWvCMzL1kXm2TET6UVOn/DzL/p9mbO1M3d3svahnWA12BgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALAX/wAagOCUABQBAA==
</data>
</layer>
<objectgroup name="Objects" width="0" height="0">
- <object name="ToVillage" type="WARP" x="2176" y="832" width="128" height="128">
- <properties>
- <property name="DEST_MAP" value="11"/>
- <property name="DEST_X" value="2272"/>
- <property name="DEST_Y" value="3136"/>
- </properties>
- </object>
<object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2000" y="592"/>
<object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2032" y="592"/>
<object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2000" y="624"/>
@@ -62,5 +55,12 @@
<object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2000" y="688"/>
<object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2032" y="688"/>
<object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2064" y="688"/>
+ <object name="ToVillage" type="warp" x="2176" y="672" width="128" height="32">
+ <properties>
+ <property name="dest_map" value="020-1"/>
+ <property name="dest_x" value="2240"/>
+ <property name="dest_y" value="4032"/>
+ </properties>
+ </object>
</objectgroup>
</map>
diff --git a/maps/020-1.tmx b/maps/020-1.tmx
index ffe4b1b7..c24bc7d1 100644
--- a/maps/020-1.tmx
+++ b/maps/020-1.tmx
@@ -1,23 +1,24 @@
-<?xml version="1.0"?>
-<map version="0.99b" orientation="orthogonal" width="128" height="148" 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="148" tilewidth="32" tileheight="32">
<properties>
- <property name="music" value="The Mana World - Snow Village.ogg"/>
<property name="minimap" value="graphics/images/minimap_new_11-1.png"/>
+ <property name="music" value="The Mana World - Snow Village.ogg"/>
</properties>
<tileset name="snow" firstgid="1" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/snowset.png" trans="000000"/>
+ <image source="../../../trunk/graphics/tiles/snowset.png" trans="000000"/>
</tileset>
<tileset name="walk" firstgid="81" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/collision.png"/>
+ <image source="../../../trunk/graphics/tiles/collision.png"/>
</tileset>
<tileset name="building" firstgid="83" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/snow_building.png"/>
+ <image source="../../../trunk/graphics/tiles/snow_building.png"/>
</tileset>
<tileset name="Snow_x3" firstgid="193" tilewidth="32" tileheight="96">
- <image source="../graphics/tiles/snow_x3.png"/>
+ <image source="../../../trunk/graphics/tiles/snow_x3.png"/>
</tileset>
<tileset name="Snow_x2" firstgid="209" tilewidth="32" tileheight="64">
- <image source="../graphics/tiles/snow_x2.png"/>
+ <image source="../../../trunk/graphics/tiles/snow_x2.png"/>
</tileset>
<layer name="Ground" width="128" height="148">
<data encoding="base64" compression="gzip">
@@ -36,142 +37,72 @@
</layer>
<layer name="Collision" width="128" height="148">
<data encoding="base64" compression="gzip">
- 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
+ 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
</data>
</layer>
<objectgroup name="Objects" width="0" height="0">
<object name="ToIceCave" type="WARP" x="2400" y="1216" width="96" height="32">
<properties>
- <property name="DEST_MAP">
- 12
- </property>
- <property name="DEST_Y">
- 896
- </property>
- <property name="DEST_X">
- 992
- </property>
+ <property name="DEST_MAP" value="020-3"/>
+ <property name="DEST_X" value="992"/>
+ <property name="DEST_Y" value="896"/>
</properties>
</object>
- <object name="ToSouthSnowField" type="WARP" x="2240" y="3360" width="96" height="64">
+ <object name="ToClothesShop" type="WARP" x="1504" y="1536" width="32" height="32">
<properties>
- <property name="DEST_MAP">
- 10
- </property>
- <property name="DEST_Y">
- 928
- </property>
- <property name="DEST_X">
- 2208
- </property>
+ <property name="DEST_MAP" value="020-2"/>
+ <property name="DEST_X" value="800"/>
+ <property name="DEST_Y" value="1056"/>
</properties>
</object>
- <object name="ToClothesShop" type="WARP" x="1504" y="1536" width="32" height="32">
+ <object name="ToHouse" type="WARP" x="2112" y="1664" width="32" height="32">
<properties>
- <property name="DEST_MAP">
- 13
- </property>
- <property name="DEST_Y">
- 1056
- </property>
- <property name="DEST_X">
- 800
- </property>
+ <property name="DEST_MAP" value="020-2"/>
+ <property name="DEST_X" value="2304"/>
+ <property name="DEST_Y" value="2176"/>
</properties>
</object>
- <object name="ToPotionsShop" type="WARP" x="1792" y="2880" width="32" height="32">
+ <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2000" y="4016"/>
+ <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2032" y="4016"/>
+ <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2000" y="4048"/>
+ <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2032" y="4048"/>
+ <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2064" y="4048"/>
+ <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2096" y="4048"/>
+ <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2000" y="4080"/>
+ <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2032" y="4080"/>
+ <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2064" y="4080"/>
+ <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2096" y="4080"/>
+ <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="1968" y="4112"/>
+ <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2000" y="4112"/>
+ <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2032" y="4112"/>
+ <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2064" y="4112"/>
+ <object name="toSnowField" type="warp" x="2176" y="4064" width="128" height="32">
<properties>
- <property name="DEST_MAP">
- 13
- </property>
- <property name="DEST_Y">
- 800
- </property>
- <property name="DEST_X">
- 2112
- </property>
+ <property name="dest_map" value="019-1"/>
+ <property name="dest_x" value="2240"/>
+ <property name="dest_y" value="704"/>
</properties>
</object>
- <object name="ToINN" type="WARP" x="2048" y="2656" width="32" height="32">
+ <object name="toInn" type="warp" x="2048" y="2624" width="32" height="32">
<properties>
- <property name="DEST_MAP">
- 13
- </property>
- <property name="DEST_Y">
- 960
- </property>
- <property name="DEST_X">
- 3552
- </property>
+ <property name="dest_map" value="020-2"/>
+ <property name="dest_x" value="3552"/>
+ <property name="dest_y" value="992"/>
</properties>
</object>
- <object name="ToWeaponsShop" type="WARP" x="2688" y="1472" width="32" height="32">
+ <object name="toWeaponShop" type="warp" x="2752" y="1472" width="32" height="32">
<properties>
- <property name="DEST_MAP">
- 13
- </property>
- <property name="DEST_Y">
- 2272
- </property>
- <property name="DEST_X">
- 1024
- </property>
+ <property name="dest_map" value="020-2"/>
+ <property name="dest_x" value="1024"/>
+ <property name="dest_y" value="2304"/>
</properties>
</object>
- <object name="ToHouse" type="WARP" x="2112" y="1664" width="32" height="32">
+ <object name="ToPotionsShop" type="WARP" x="1792" y="2880" width="32" height="32">
<properties>
- <property name="DEST_MAP">
- 13
- </property>
- <property name="DEST_Y">
- 2176
- </property>
- <property name="DEST_X">
- 2304
- </property>
+ <property name="DEST_MAP" value="020-2"/>
+ <property name="DEST_X" value="2112"/>
+ <property name="DEST_Y" value="800"/>
</properties>
</object>
- <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2000" y="4016" width="0" height="0">
- <properties/>
- </object>
- <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2032" y="4016" width="0" height="0">
- <properties/>
- </object>
- <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2000" y="4048" width="0" height="0">
- <properties/>
- </object>
- <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2032" y="4048" width="0" height="0">
- <properties/>
- </object>
- <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2064" y="4048" width="0" height="0">
- <properties/>
- </object>
- <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2096" y="4048" width="0" height="0">
- <properties/>
- </object>
- <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2000" y="4080" width="0" height="0">
- <properties/>
- </object>
- <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2032" y="4080" width="0" height="0">
- <properties/>
- </object>
- <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2064" y="4080" width="0" height="0">
- <properties/>
- </object>
- <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2096" y="4080" width="0" height="0">
- <properties/>
- </object>
- <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="1968" y="4112" width="0" height="0">
- <properties/>
- </object>
- <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2000" y="4112" width="0" height="0">
- <properties/>
- </object>
- <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2032" y="4112" width="0" height="0">
- <properties/>
- </object>
- <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2064" y="4112" width="0" height="0">
- <properties/>
- </object>
</objectgroup>
</map>
diff --git a/maps/020-2.tmx b/maps/020-2.tmx
index 0c499386..5aed7969 100644
--- a/maps/020-2.tmx
+++ b/maps/020-2.tmx
@@ -1,13 +1,14 @@
-<?xml version="1.0"?>
-<map version="0.99b" orientation="orthogonal" width="160" height="100" 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="160" height="100" tilewidth="32" tileheight="32">
<properties>
<property name="music" value="The Mana World - Snow Village.ogg"/>
</properties>
<tileset name="INN Tilleset" firstgid="1" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/inn.png"/>
+ <image source="../../../trunk/graphics/tiles/inn.png"/>
</tileset>
<tileset name="Collision" firstgid="257" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/collision.png"/>
+ <image source="../../../trunk/graphics/tiles/collision.png"/>
</tileset>
<layer name="Ground" width="160" height="100">
<data encoding="base64" compression="gzip">
@@ -32,67 +33,37 @@
<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">
- 11
- </property>
- <property name="DEST_Y">
- 1600
- </property>
- <property name="DEST_X">
- 1504
- </property>
+ <property name="DEST_MAP" value="020-1"/>
+ <property name="DEST_X" value="1504"/>
+ <property name="DEST_Y" value="1600"/>
</properties>
</object>
<object name="ToOutside" type="WARP" x="2048" y="800" width="32" height="32">
<properties>
- <property name="DEST_MAP">
- 11
- </property>
- <property name="DEST_Y">
- 2880
- </property>
- <property name="DEST_X">
- 1760
- </property>
+ <property name="DEST_MAP" value="020-1"/>
+ <property name="DEST_X" value="1760"/>
+ <property name="DEST_Y" value="2880"/>
</properties>
</object>
<object name="ToOutside" type="WARP" x="3552" y="1024" width="32" height="32">
<properties>
- <property name="DEST_MAP">
- 11
- </property>
- <property name="DEST_Y">
- 2688
- </property>
- <property name="DEST_X">
- 2048
- </property>
+ <property name="DEST_MAP" value="020-1"/>
+ <property name="DEST_X" value="2048"/>
+ <property name="DEST_Y" value="2656"/>
</properties>
</object>
<object name="ToOutside" type="WARP" x="1024" y="2336" width="32" height="32">
<properties>
- <property name="DEST_MAP">
- 11
- </property>
- <property name="DEST_Y">
- 1536
- </property>
- <property name="DEST_X">
- 2688
- </property>
+ <property name="DEST_MAP" value="020-1"/>
+ <property name="DEST_X" value="2688"/>
+ <property name="DEST_Y" value="1536"/>
</properties>
</object>
<object name="ToOutside" type="WARP" x="2304" y="2240" width="32" height="32">
<properties>
- <property name="DEST_MAP">
- 11
- </property>
- <property name="DEST_Y">
- 1728
- </property>
- <property name="DEST_X">
- 2112
- </property>
+ <property name="DEST_MAP" value="020-1"/>
+ <property name="DEST_X" value="2112"/>
+ <property name="DEST_Y" value="1728"/>
</properties>
</object>
</objectgroup>
diff --git a/maps/020-3.tmx b/maps/020-3.tmx
index db80f891..696f80ff 100644
--- a/maps/020-3.tmx
+++ b/maps/020-3.tmx
@@ -1,14 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
-<map version="0.99b" orientation="orthogonal" width="80" height="80" tilewidth="32" tileheight="32">
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
+<map version="1.0" orientation="orthogonal" width="80" height="80" tilewidth="32" tileheight="32">
<properties>
<property name="minimap" value="graphics/images/minimap_new_12-1.png"/>
<property name="music" value="The Mana World - Snow Village.ogg"/>
</properties>
<tileset name="Untitled" firstgid="1" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/icecave.png"/>
+ <image source="../../../trunk/graphics/tiles/icecave.png"/>
</tileset>
<tileset name="Collision" firstgid="129" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/collision.png"/>
+ <image source="../../../trunk/graphics/tiles/collision.png"/>
</tileset>
<layer name="Ground" width="80" height="80">
<data encoding="base64" compression="gzip">
@@ -27,35 +28,32 @@
</layer>
<layer name="Collision" width="80" height="80">
<data encoding="base64" compression="gzip">
- H4sIAAAAAAAAAO3S0QqDMBBFwXy7X158KIjYWqPlZnUWhoI0sDlkaq1NAAAAAAAAADe3NemdKlk206+/33LSO1Wy7vZt0ruO6FMn/Y5325v0ziPZarP3Lb3zSM5MevcR6KeffnWNNOkW1fvNk+7xj35nOvecTTep/P7mSTfR79k90w2q90/fQb+6elrp5/0dvUtr+2d7J92it99ei95eR8+kW5x5f7/e9er/rc9UM9KkW+inXzUjTbqFfs/sNy1+q7ni3lecT3eo/P7ek24xUt/03gAAAAAAAADczwvupUiSAGQAAA==
+ H4sIAAAAAAAAAO3S0QrCMBBFwXx7v1x8EEpRa9PK3dVZGAQ1sDlkGWMsAAAAAAAAQBujwA4dPZv0Tp2sm+k3328929/TO1a27fZu0rtW9KqTfse77U1650qetdn7Lr1zJWcmvXsF+umnX1+VJt2ie7/7pHt8o9+ZzjNn0006v7/7pJvo99890w2690/fQb++Zlrp5/0dvcsY+2dnJ91itt9ei9leR8+kW5x5f5/e9er/bc90U2nSLfTTr5tKk26h33/2W1af3Vxx7yvOpzt0fn+PSbeo1De9NwAAAAAAAAC/5wYRRQJYAGQAAA==
</data>
</layer>
<objectgroup name="Objects" width="0" height="0">
- <object name="Warp1" type="WARP" x="960" y="832" width="96" height="32">
+ <object name="Bat" type="SPAWN" x="832" y="1088" width="960" height="160">
<properties>
- <property name="DEST_MAP">
- 11
- </property>
- <property name="DEST_Y">
- 1152
- </property>
- <property name="DEST_X">
- 2432
- </property>
+ <property name="MONSTER_ID" value="15"/>
</properties>
</object>
- <object name="Bat" type="SPAWN" x="832" y="1088" width="960" height="160">
+ <object name="Violet" type="SPAWN" x="736" y="1472" width="1120" height="256">
<properties>
- <property name="MONSTER_ID">
- 15
- </property>
+ <property name="MONSTER_ID" value="16"/>
</properties>
</object>
- <object name="Violet" type="SPAWN" x="736" y="1472" width="1120" height="256">
+ <object name="toOutside" type="warp" x="992" y="800" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="020-1"/>
+ <property name="dest_x" value="2432"/>
+ <property name="dest_y" value="1184"/>
+ </properties>
+ </object>
+ <object name="toIceCave2" type="warp" x="800" y="704" width="32" height="32">
<properties>
- <property name="MONSTER_ID">
- 16
- </property>
+ <property name="dest_map" value="020-4"/>
+ <property name="dest_x" value="1152"/>
+ <property name="dest_y" value="1088"/>
</properties>
</object>
</objectgroup>
diff --git a/maps/020-4.tmx b/maps/020-4.tmx
index 4ed770b4..ecdb754f 100644
--- a/maps/020-4.tmx
+++ b/maps/020-4.tmx
@@ -1,13 +1,14 @@
-<?xml version="1.0"?>
-<map version="0.99b" orientation="orthogonal" width="100" height="100" 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="100" height="100" tilewidth="32" tileheight="32">
<properties>
<property name="minimap" value="graphics/images/minimap_new_21-1.png"/>
</properties>
<tileset name="Ice Cave" firstgid="1" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/icecave.png"/>
+ <image source="../../../trunk/graphics/tiles/icecave.png"/>
</tileset>
<tileset name="Col" firstgid="129" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/collision.png"/>
+ <image source="../../../trunk/graphics/tiles/collision.png"/>
</tileset>
<layer name="Ground" width="100" height="100">
<data encoding="base64" compression="gzip">
@@ -29,4 +30,13 @@
H4sIAAAAAAAAAO3RSW7DMBAEQL3dL8/VCCCYq5qkqoE6JRp6ej7XdX0AAAAAAAAAAAAAAACALV0D53zn19/v/u9tvnv430tPT796vku6j7TSzJrb+85pZvXUmnQfabN6ak26j7TRPfUm3Ufa6J5KZ/W+c4rWPPFGz5u7mt3NyKS7OuEeI2+S7mrluzx9i5a3dzaroxlJd7XDXZ6+81vcddHaW2/SfaTddZFKuo+0uy560/J+zXenKumiJe5xxj1qvz9NSQct6b1H7ZxTzOhw5Kx0P+7RN293o3Zu7a806Z6e6H/kzjWzapLuyz3G/aYdzNq9ZlZp0l093X9t3GPfe8x+b1ezMuuddF+73qh35t036W7efo90F6tJJ73/ahJJ77yyRNI7ryyR9M4ra+muNukdd9fapXsAAAAAAAAAAAAAAAAn+gOKg0erQJwAAA==
</data>
</layer>
+ <objectgroup name="Object Group 4" width="0" height="0">
+ <object name="toIceCave1" type="warp" x="1152" y="1056" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="020-3"/>
+ <property name="dest_x" value="800"/>
+ <property name="dest_y" value="736"/>
+ </properties>
+ </object>
+ </objectgroup>
</map>
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-09 12:45:12 +0000