Connect the three maps, other warps disregarded for now due hurry

3 files changed, 60 insertions, 100 deletions

diff --git a/maps/022-1.tmx b/maps/022-1.tmx
index 680424eb..f9c6408c 100644
--- a/maps/022-1.tmx
+++ b/maps/022-1.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" tiledversion="1.0.3" orientation="orthogonal" renderorder="right-down" width="140" height="140" tilewidth="32" tileheight="32" nextobjectid="59">
+<map version="1.0" tiledversion="1.0.3" orientation="orthogonal" renderorder="right-down" width="140" height="140" tilewidth="32" tileheight="32" nextobjectid="60">
  <properties>
   <property name="author" value="The Mana World Brazil Team"/>
   <property name="license" value="GPL v2+"/>
@@ -1363,7 +1363,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <objectgroup color="#ff5500" name="spawns">
+ <objectgroup color="#ff5500" name="spawns" visible="0">
   <object id="1" name="Rudolph Slime" type="spawn" x="640" y="1248" width="704" height="2240">
    <properties>
     <property name="max_beings" value="8"/>
@@ -1456,28 +1456,11 @@
     <property name="npc_id" value="SCRIPT"/>
    </properties>
   </object>
-  <object id="19" name="paraCaverna" type="warp" x="2176" y="2880" width="32" height="32">
+  <object id="19" name="to Frozen Cave" type="warp" x="2176" y="2880" width="32" height="32">
    <properties>
-    <property name="dest_map" value="010-3"/>
-    <property name="dest_x" value="1440"/>
-    <property name="dest_y" value="2240"/>
-    <property name="npc_id" value="SCRIPT"/>
-   </properties>
-  </object>
-  <object id="26" name="paraCaverna" type="warp" x="2400" y="1088" width="32" height="32">
-   <properties>
-    <property name="dest_map" value="010-3"/>
-    <property name="dest_x" value="1344"/>
-    <property name="dest_y" value="1024"/>
-    <property name="npc_id" value="SCRIPT"/>
-   </properties>
-  </object>
-  <object id="27" name="Froz" type="warp" x="2944" y="640" width="96" height="32">
-   <properties>
-    <property name="dest_map" value="froz"/>
-    <property name="dest_x" value="93"/>
-    <property name="dest_y" value="118"/>
-    <property name="npc_id" value="SCRIPT"/>
+    <property name="dest_map" value="023-1"/>
+    <property name="dest_x" value="45"/>
+    <property name="dest_y" value="69"/>
    </properties>
   </object>
   <object id="31" name="paraCaverna" type="warp" x="1568" y="1760" width="32" height="32">
@@ -1496,24 +1479,15 @@
     <property name="npc_id" value="SCRIPT"/>
    </properties>
   </object>
-  <object id="41" name="Para Dentro do Coliseu" type="warp" x="1280" y="768" width="96" height="16">
+  <object id="59" name="to Ice Labyrinth" type="warp" x="2208" y="3584" width="64" height="32">
    <properties>
-    <property name="dest_map" value="coliseu001"/>
-    <property name="dest_x" value="127"/>
-    <property name="dest_y" value="48"/>
-    <property name="npc_id" value="SCRIPT"/>
-   </properties>
-  </object>
-  <object id="42" name="Para Dentro do Coliseu" type="warp" x="1184" y="768" width="96" height="16">
-   <properties>
-    <property name="dest_map" value="coliseu001"/>
-    <property name="dest_x" value="124"/>
-    <property name="dest_y" value="48"/>
-    <property name="npc_id" value="SCRIPT"/>
+    <property name="dest_map" value="021-1"/>
+    <property name="dest_x" value="136"/>
+    <property name="dest_y" value="30"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup color="#55007f" name="margin">
+ <objectgroup color="#55007f" name="margin" visible="0">
   <object id="54" type="fixme" x="0" y="0" width="4480" height="640"/>
   <object id="55" type="fixme" x="0" y="3840" width="4480" height="640"/>
   <object id="56" type="fixme" x="1" y="-17" width="640" height="4480"/>
diff --git a/maps/023-1.tmx b/maps/023-1.tmx
index 0b286a0f..8d57a2a2 100644
--- a/maps/023-1.tmx
+++ b/maps/023-1.tmx
@@ -579,20 +579,16 @@
 </data>
  </layer>
  <objectgroup name="warps">
-  <object id="2" name="D(paraC)" type="warp" x="1888" y="640" width="32" height="32">
+  <object id="2" name="D(paraC)" type="slide" x="1888" y="640" width="32" height="32">
    <properties>
-    <property name="dest_map" value="010-3"/>
-    <property name="dest_x" value="1152"/>
-    <property name="dest_y" value="1504"/>
-    <property name="npc_id" value="SCRIPT"/>
+    <property name="dest_x" value="36"/>
+    <property name="dest_y" value="46"/>
    </properties>
   </object>
-  <object id="3" name="B(paraA)" type="warp" x="1984" y="1024" width="32" height="32">
+  <object id="3" name="B(paraA)" type="slide" x="1984" y="1024" width="32" height="32">
    <properties>
-    <property name="dest_map" value="010-3"/>
-    <property name="dest_x" value="1600"/>
-    <property name="dest_y" value="1760"/>
-    <property name="npc_id" value="SCRIPT"/>
+    <property name="dest_x" value="50"/>
+    <property name="dest_y" value="56"/>
    </properties>
   </object>
   <object id="4" name="paraFora" type="warp" x="1184" y="896" width="32" height="32">
@@ -603,12 +599,10 @@
     <property name="npc_id" value="SCRIPT"/>
    </properties>
   </object>
-  <object id="5" name="F(paraE)" type="warp" x="1120" y="1056" width="32" height="32">
+  <object id="5" name="F(paraE)" type="slide" x="1120" y="1056" width="32" height="32">
    <properties>
-    <property name="dest_map" value="010-3"/>
-    <property name="dest_x" value="992"/>
-    <property name="dest_y" value="1984"/>
-    <property name="npc_id" value="SCRIPT"/>
+    <property name="dest_x" value="31"/>
+    <property name="dest_y" value="61"/>
    </properties>
   </object>
   <object id="6" name="paraFora" type="warp" x="1824" y="1376" width="32" height="32">
@@ -619,12 +613,10 @@
     <property name="npc_id" value="SCRIPT"/>
    </properties>
   </object>
-  <object id="7" name="H(paraG)" type="warp" x="1600" y="1376" width="32" height="32">
+  <object id="7" name="H(paraG)" type="slide" x="1600" y="1376" width="32" height="32">
    <properties>
-    <property name="dest_map" value="010-3"/>
-    <property name="dest_x" value="1600"/>
-    <property name="dest_y" value="1536"/>
-    <property name="npc_id" value="SCRIPT"/>
+    <property name="dest_x" value="50"/>
+    <property name="dest_y" value="49"/>
    </properties>
   </object>
   <object id="8" name="paraFora" type="warp" x="832" y="1152" width="32" height="32">
@@ -635,28 +627,22 @@
     <property name="npc_id" value="SCRIPT"/>
    </properties>
   </object>
-  <object id="9" name="C(paraD)" type="warp" x="1152" y="1504" width="32" height="32">
+  <object id="9" name="C(paraD)" type="slide" x="1152" y="1504" width="32" height="32">
    <properties>
-    <property name="dest_map" value="010-3"/>
-    <property name="dest_x" value="1888"/>
-    <property name="dest_y" value="640"/>
-    <property name="npc_id" value="SCRIPT"/>
+    <property name="dest_x" value="59"/>
+    <property name="dest_y" value="21"/>
    </properties>
   </object>
-  <object id="10" name="G(paraH)" type="warp" x="1600" y="1536" width="32" height="32">
+  <object id="10" name="G(paraH)" type="slide" x="1600" y="1536" width="32" height="32">
    <properties>
-    <property name="dest_map" value="010-3"/>
-    <property name="dest_x" value="1600"/>
-    <property name="dest_y" value="1376"/>
-    <property name="npc_id" value="SCRIPT"/>
+    <property name="dest_x" value="50"/>
+    <property name="dest_y" value="42"/>
    </properties>
   </object>
-  <object id="11" name="A(paraB)" type="warp" x="1600" y="1760" width="32" height="32">
+  <object id="11" name="A(paraB)" type="slide" x="1600" y="1760" width="32" height="32">
    <properties>
-    <property name="dest_map" value="010-3"/>
-    <property name="dest_x" value="1984"/>
-    <property name="dest_y" value="1024"/>
-    <property name="npc_id" value="SCRIPT"/>
+    <property name="dest_x" value="62"/>
+    <property name="dest_y" value="31"/>
    </properties>
   </object>
   <object id="12" name="paraFora" type="warp" x="1504" y="1888" width="32" height="32">
@@ -675,20 +661,17 @@
     <property name="npc_id" value="SCRIPT"/>
    </properties>
   </object>
-  <object id="14" name="E(paraF)" type="warp" x="992" y="1984" width="32" height="32">
+  <object id="14" name="E(paraF)" type="slide" x="992" y="1984" width="32" height="32">
    <properties>
-    <property name="dest_map" value="010-3"/>
-    <property name="dest_x" value="1120"/>
-    <property name="dest_y" value="1056"/>
-    <property name="npc_id" value="SCRIPT"/>
+    <property name="dest_x" value="35"/>
+    <property name="dest_y" value="34"/>
    </properties>
   </object>
-  <object id="15" name="paraFora" type="warp" x="1440" y="2240" width="32" height="32">
+  <object id="15" name="Outside" type="warp" x="1440" y="2240" width="32" height="32">
    <properties>
-    <property name="dest_map" value="010"/>
-    <property name="dest_x" value="2176"/>
-    <property name="dest_y" value="2880"/>
-    <property name="npc_id" value="SCRIPT"/>
+    <property name="dest_map" value="022-1"/>
+    <property name="dest_x" value="68"/>
+    <property name="dest_y" value="91"/>
    </properties>
   </object>
   <object id="16" name="I(paraJ)" type="warp" x="1248" y="640" width="32" height="32">
@@ -699,32 +682,27 @@
     <property name="npc_id" value="SCRIPT"/>
    </properties>
   </object>
-  <object id="17" name="J(paraI)" type="warp" x="1472" y="1056" width="32" height="32">
+  <object id="17" name="J(paraI)" type="slide" x="1472" y="1056" width="32" height="32">
    <properties>
-    <property name="dest_map" value="010-3"/>
-    <property name="dest_x" value="1472"/>
-    <property name="dest_y" value="1024"/>
-    <property name="npc_id" value="SCRIPT"/>
+    <property name="dest_x" value="39"/>
+    <property name="dest_y" value="21"/>
    </properties>
   </object>
-  <object id="18" name="I(paraJ)" type="warp" x="1248" y="640" width="32" height="32">
+  <object id="18" name="I(paraJ)" type="slide" x="1248" y="640" width="32" height="32">
    <properties>
-    <property name="dest_map" value="010-3"/>
-    <property name="dest_x" value="1472"/>
-    <property name="dest_y" value="1024"/>
-    <property name="npc_id" value="SCRIPT"/>
+    <property name="dest_x" value="46"/>
+    <property name="dest_y" value="32"/>
    </properties>
   </object>
-  <object id="19" name="paraFora" type="warp" x="1344" y="1056" width="32" height="32">
+  <object id="19" name="to Frostia" type="warp" x="1344" y="1056" width="32" height="32">
    <properties>
-    <property name="dest_map" value="010"/>
-    <property name="dest_x" value="2400"/>
-    <property name="dest_y" value="1120"/>
-    <property name="npc_id" value="SCRIPT"/>
+    <property name="dest_map" value="024-1"/>
+    <property name="dest_x" value="75"/>
+    <property name="dest_y" value="135"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup color="#ff7d00" name="spawns">
+ <objectgroup color="#ff7d00" name="spawns" visible="0">
   <object id="20" name="Noel Slime" type="spawn" x="608" y="640" width="1536" height="896">
    <properties>
     <property name="max_beings" value="4"/>
diff --git a/maps/024-1.tmx b/maps/024-1.tmx
index 7847d470..a8efeef5 100644
--- a/maps/024-1.tmx
+++ b/maps/024-1.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" tiledversion="1.0.3" orientation="orthogonal" renderorder="right-down" width="200" height="160" tilewidth="32" tileheight="32" nextobjectid="59">
+<map version="1.0" tiledversion="1.0.3" orientation="orthogonal" renderorder="right-down" width="200" height="160" tilewidth="32" tileheight="32" nextobjectid="60">
  <properties>
   <property name="author" value="The Mana World Brazil Team"/>
   <property name="license" value="GPL v2+"/>
@@ -1940,7 +1940,15 @@
 </data>
  </layer>
  <objectgroup color="#ffff00" name="spawns"/>
- <objectgroup color="#00aa00" name="warps"/>
+ <objectgroup color="#00aa00" name="warps">
+  <object id="59" name="To Frozen Cave" type="warp" x="2400" y="4288" width="32" height="32">
+   <properties>
+    <property name="dest_map" value="023-1"/>
+    <property name="dest_x" value="42"/>
+    <property name="dest_y" value="32"/>
+   </properties>
+  </object>
+ </objectgroup>
  <objectgroup color="#ff55ff" name="particles">
   <object id="32" name="graphics/particles/smoke.xml" type="PARTICLE_EFFECT" x="1141" y="1349"/>
   <object id="33" name="graphics/particles/smoke.xml" type="PARTICLE_EFFECT" x="1525" y="1349"/>