Fix warp placement

Fix monster placement

10 files changed, 162 insertions, 169 deletions

diff --git a/maps/000-1.tmx b/maps/000-1.tmx
index 7462faba..44f60eb1 100644
--- a/maps/000-1.tmx
+++ b/maps/000-1.tmx
@@ -1083,7 +1083,7 @@
     <property name="spawn" value="35000"/>
    </properties>
   </object>
-  <object id="9" name="Tortuga" type="spawn" x="2400" y="800" width="768" height="768">
+  <object id="9" name="Tortuga" type="spawn" x="2400" y="832" width="800" height="768">
    <properties>
     <property name="death" value="120000"/>
     <property name="max_beings" value="3"/>
@@ -1120,7 +1120,7 @@
     <property name="death" value="120000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1008"/>
-    <property name="spawn" value="25000"/>
+    <property name="spawn" value="60000"/>
    </properties>
   </object>
   <object id="14" name="Little Blub" type="spawn" x="2656" y="960" width="160" height="256">
@@ -1227,7 +1227,7 @@
     <property name="spawn" value="35000"/>
    </properties>
   </object>
-  <object id="27" name="Croc" type="spawn" x="1792" y="2400" width="320" height="1120">
+  <object id="27" name="Croc" type="spawn" x="1536" y="2400" width="320" height="1120">
    <properties>
     <property name="death" value="300000"/>
     <property name="max_beings" value="1"/>
@@ -1255,82 +1255,82 @@
   </object>
   <object id="33" name="Crocotree" type="spawn" x="2496" y="3680">
    <properties>
-    <property name="death" value="420000"/>
+    <property name="death" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1010"/>
-    <property name="spawn" value="240000"/>
+    <property name="spawn" value="420000"/>
    </properties>
   </object>
   <object id="35" name="Crocotree" type="spawn" x="1824" y="3328">
    <properties>
-    <property name="death" value="420000"/>
+    <property name="death" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1010"/>
-    <property name="spawn" value="240000"/>
+    <property name="spawn" value="420000"/>
    </properties>
   </object>
   <object id="36" name="Crocotree" type="spawn" x="1248" y="3584">
    <properties>
-    <property name="death" value="420000"/>
+    <property name="death" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1010"/>
-    <property name="spawn" value="240000"/>
+    <property name="spawn" value="420000"/>
    </properties>
   </object>
   <object id="37" name="Crocotree" type="spawn" x="2144" y="2976">
    <properties>
-    <property name="death" value="420000"/>
+    <property name="death" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1010"/>
-    <property name="spawn" value="240000"/>
+    <property name="spawn" value="420000"/>
    </properties>
   </object>
   <object id="38" name="Crocotree" type="spawn" x="1696" y="2464">
    <properties>
-    <property name="death" value="420000"/>
+    <property name="death" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1010"/>
-    <property name="spawn" value="240000"/>
+    <property name="spawn" value="420000"/>
    </properties>
   </object>
   <object id="39" name="Crocotree" type="spawn" x="2048" y="2016">
    <properties>
-    <property name="death" value="420000"/>
+    <property name="death" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1010"/>
-    <property name="spawn" value="240000"/>
+    <property name="spawn" value="420000"/>
    </properties>
   </object>
   <object id="40" name="Crocotree" type="spawn" x="992" y="2208">
    <properties>
-    <property name="death" value="420000"/>
+    <property name="death" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1010"/>
-    <property name="spawn" value="240000"/>
+    <property name="spawn" value="420000"/>
    </properties>
   </object>
   <object id="41" name="Crocotree" type="spawn" x="1408" y="1408">
    <properties>
-    <property name="death" value="420000"/>
+    <property name="death" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1010"/>
-    <property name="spawn" value="240000"/>
+    <property name="spawn" value="420000"/>
    </properties>
   </object>
   <object id="42" name="Crocotree" type="spawn" x="2240" y="1056">
    <properties>
-    <property name="death" value="420000"/>
+    <property name="death" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1010"/>
-    <property name="spawn" value="240000"/>
+    <property name="spawn" value="420000"/>
    </properties>
   </object>
   <object id="43" name="Crocotree" type="spawn" x="2688" y="2112">
    <properties>
-    <property name="death" value="420000"/>
+    <property name="death" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1010"/>
-    <property name="spawn" value="240000"/>
+    <property name="spawn" value="420000"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/001-1.tmx b/maps/001-1.tmx
index 0a352a8e..32d98aec 100644
--- a/maps/001-1.tmx
+++ b/maps/001-1.tmx
@@ -1643,7 +1643,7 @@
    <properties>
     <property name="dest_map" value="001-2-26"/>
     <property name="dest_x" value="28"/>
-    <property name="dest_y" value="46"/>
+    <property name="dest_y" value="42"/>
     <property name="npc_id" value="NPC_ARTIS_DOOR"/>
     <property name="trigger_x" value="2"/>
     <property name="trigger_y" value="3"/>
@@ -1663,7 +1663,7 @@
    <properties>
     <property name="dest_map" value="001-2-27"/>
     <property name="dest_x" value="35"/>
-    <property name="dest_y" value="35"/>
+    <property name="dest_y" value="34"/>
     <property name="npc_id" value="NPC_ARTIS_DOOR"/>
     <property name="trigger_x" value="2"/>
     <property name="trigger_y" value="3"/>
@@ -1681,9 +1681,9 @@
   </object>
   <object id="17" name="To Legion of Aemil" type="script_warp" x="1824" y="1312" width="32" height="32">
    <properties>
-    <property name="dest_map" value="001-1"/>
-    <property name="dest_x" value="1"/>
-    <property name="dest_y" value="1"/>
+    <property name="dest_map" value="001-2-33"/>
+    <property name="dest_x" value="34"/>
+    <property name="dest_y" value="45"/>
    </properties>
   </object>
   <object id="18" name="To Noble House #1" type="ani_warp" x="4544" y="960" width="32" height="32">
@@ -1759,8 +1759,8 @@
   <object id="25" name="ToLeftBuildingStairway" type="ani_warp" x="1568" y="3072" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-31"/>
-    <property name="dest_x" value="48"/>
-    <property name="dest_y" value="40"/>
+    <property name="dest_x" value="32"/>
+    <property name="dest_y" value="39"/>
     <property name="npc_id" value="NPC_ARTIS_DOOR"/>
     <property name="trigger_x" value="2"/>
     <property name="trigger_y" value="3"/>
@@ -1785,244 +1785,244 @@
   <object id="82" name="graphics/particles/fountain.xml" type="particle_effect" x="2848" y="2496" width="32" height="32"/>
   <object id="85" name="Piou" type="spawn" x="0" y="0">
    <properties>
-    <property name="death" value="15000"/>
+    <property name="death" value="60000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="1002"/>
-    <property name="spawn" value="60000"/>
+    <property name="spawn" value="15000"/>
    </properties>
   </object>
   <object id="87" name="Piousse" type="spawn" x="0" y="0">
    <properties>
-    <property name="death" value="15000"/>
+    <property name="death" value="150000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1003"/>
-    <property name="spawn" value="150000"/>
+    <property name="spawn" value="15000"/>
    </properties>
   </object>
-  <object id="88" name="Fluffy" type="spawn" x="5600" y="1024" width="320" height="480">
+  <object id="88" name="Fluffy" type="spawn" x="5216" y="608" width="768" height="992">
    <properties>
-    <property name="death" value="18000"/>
+    <property name="death" value="100000"/>
     <property name="max_beings" value="6"/>
     <property name="monster_id" value="1022"/>
     <property name="script" value="Mobs#001-1::OnFluffyDeath"/>
-    <property name="spawn" value="100000"/>
+    <property name="spawn" value="18000"/>
    </properties>
   </object>
-  <object id="89" name="Fluffy" type="spawn" x="5984" y="1536" width="320" height="480">
+  <object id="89" name="Fluffy" type="spawn" x="6304" y="1376" width="192" height="352">
    <properties>
-    <property name="death" value="18000"/>
+    <property name="death" value="100000"/>
     <property name="max_beings" value="4"/>
     <property name="monster_id" value="1022"/>
     <property name="script" value="Mobs#001-1::OnFluffyDeath"/>
-    <property name="spawn" value="100000"/>
+    <property name="spawn" value="18000"/>
    </properties>
   </object>
-  <object id="90" name="Piou" type="spawn" x="5696" y="864" width="320" height="672">
+  <object id="90" name="Piou" type="spawn" x="5216" y="608" width="768" height="992">
    <properties>
-    <property name="death" value="15000"/>
-    <property name="max_beings" value="2"/>
+    <property name="death" value="60000"/>
+    <property name="max_beings" value="1"/>
     <property name="monster_id" value="1002"/>
-    <property name="spawn" value="60000"/>
+    <property name="spawn" value="12000"/>
    </properties>
   </object>
-  <object id="91" name="Pikpik" type="spawn" x="832" y="2304" width="192" height="896">
+  <object id="91" name="Pikpik" type="spawn" x="1088" y="1856" width="128" height="320">
    <properties>
-    <property name="death" value="40000"/>
+    <property name="death" value="20000"/>
     <property name="max_beings" value="3"/>
     <property name="monster_id" value="1013"/>
-    <property name="spawn" value="20000"/>
+    <property name="spawn" value="40000"/>
    </properties>
   </object>
-  <object id="92" name="Pikpik" type="spawn" x="1248" y="4288" width="448" height="224">
+  <object id="92" name="Pikpik" type="spawn" x="736" y="3008" width="224" height="160">
    <properties>
-    <property name="death" value="40000"/>
-    <property name="max_beings" value="3"/>
+    <property name="death" value="20000"/>
+    <property name="max_beings" value="1"/>
     <property name="monster_id" value="1013"/>
-    <property name="spawn" value="20000"/>
+    <property name="spawn" value="40000"/>
    </properties>
   </object>
-  <object id="93" name="Pikpik" type="spawn" x="1696" y="3936" width="544" height="320">
+  <object id="93" name="Pikpik" type="spawn" x="1216" y="4352" width="288" height="128">
    <properties>
-    <property name="death" value="40000"/>
-    <property name="max_beings" value="3"/>
+    <property name="death" value="20000"/>
+    <property name="max_beings" value="2"/>
     <property name="monster_id" value="1013"/>
-    <property name="spawn" value="20000"/>
+    <property name="spawn" value="40000"/>
    </properties>
   </object>
   <object id="94" name="Crocotree" type="spawn" x="1440" y="4352">
    <properties>
-    <property name="death" value="420000"/>
+    <property name="death" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1010"/>
-    <property name="spawn" value="240000"/>
+    <property name="spawn" value="420000"/>
    </properties>
   </object>
   <object id="95" name="Crocotree" type="spawn" x="2240" y="4352">
    <properties>
-    <property name="death" value="420000"/>
+    <property name="death" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1010"/>
-    <property name="spawn" value="240000"/>
+    <property name="spawn" value="420000"/>
    </properties>
   </object>
-  <object id="96" name="Manana Tree" type="spawn" x="1216" y="4032">
+  <object id="96" name="Manana Tree" type="spawn" x="1184" y="4032">
    <properties>
-    <property name="death" value="420000"/>
+    <property name="death" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1017"/>
-    <property name="spawn" value="240000"/>
+    <property name="spawn" value="420000"/>
    </properties>
   </object>
-  <object id="97" name="Manana Tree" type="spawn" x="1120" y="4160">
+  <object id="97" name="Manana Tree" type="spawn" x="1088" y="4160">
    <properties>
-    <property name="death" value="420000"/>
+    <property name="death" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1017"/>
-    <property name="spawn" value="240000"/>
+    <property name="spawn" value="420000"/>
    </properties>
   </object>
-  <object id="98" name="Manana Tree" type="spawn" x="1344" y="4128">
+  <object id="98" name="Manana Tree" type="spawn" x="1312" y="4128">
    <properties>
-    <property name="death" value="420000"/>
+    <property name="death" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1017"/>
-    <property name="spawn" value="240000"/>
+    <property name="spawn" value="420000"/>
    </properties>
   </object>
-  <object id="99" name="Manana Tree" type="spawn" x="1184" y="2464">
+  <object id="99" name="Manana Tree" type="spawn" x="1152" y="2464">
    <properties>
-    <property name="death" value="420000"/>
+    <property name="death" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1017"/>
-    <property name="spawn" value="240000"/>
+    <property name="spawn" value="420000"/>
    </properties>
   </object>
-  <object id="100" name="Manana Tree" type="spawn" x="1120" y="2528">
+  <object id="100" name="Manana Tree" type="spawn" x="1184" y="2528">
    <properties>
-    <property name="death" value="420000"/>
+    <property name="death" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1017"/>
-    <property name="spawn" value="240000"/>
+    <property name="spawn" value="420000"/>
    </properties>
   </object>
-  <object id="101" name="Manana Tree" type="spawn" x="1280" y="2336">
+  <object id="101" name="Manana Tree" type="spawn" x="1248" y="2336">
    <properties>
-    <property name="death" value="420000"/>
+    <property name="death" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1017"/>
-    <property name="spawn" value="240000"/>
+    <property name="spawn" value="420000"/>
    </properties>
   </object>
-  <object id="102" name="Manana Tree" type="spawn" x="1408" y="2240">
+  <object id="102" name="Manana Tree" type="spawn" x="1376" y="2240">
    <properties>
-    <property name="death" value="420000"/>
+    <property name="death" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1017"/>
-    <property name="spawn" value="240000"/>
+    <property name="spawn" value="420000"/>
    </properties>
   </object>
-  <object id="103" name="Manana Tree" type="spawn" x="1568" y="2272">
+  <object id="103" name="Manana Tree" type="spawn" x="1536" y="2272">
    <properties>
-    <property name="death" value="420000"/>
+    <property name="death" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1017"/>
-    <property name="spawn" value="240000"/>
+    <property name="spawn" value="420000"/>
    </properties>
   </object>
-  <object id="104" name="Manana Tree" type="spawn" x="1312" y="2144">
+  <object id="104" name="Manana Tree" type="spawn" x="1280" y="2144">
    <properties>
-    <property name="death" value="420000"/>
+    <property name="death" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1017"/>
-    <property name="spawn" value="240000"/>
+    <property name="spawn" value="420000"/>
    </properties>
   </object>
-  <object id="105" name="Manana Tree" type="spawn" x="1504" y="2080">
+  <object id="105" name="Manana Tree" type="spawn" x="1472" y="2080">
    <properties>
-    <property name="death" value="420000"/>
+    <property name="death" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1017"/>
-    <property name="spawn" value="240000"/>
+    <property name="spawn" value="420000"/>
    </properties>
   </object>
-  <object id="106" name="Manana Tree" type="spawn" x="4896" y="832">
+  <object id="106" name="Manana Tree" type="spawn" x="4864" y="832">
    <properties>
-    <property name="death" value="420000"/>
+    <property name="death" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1017"/>
-    <property name="spawn" value="240000"/>
+    <property name="spawn" value="420000"/>
    </properties>
   </object>
-  <object id="107" name="Manana Tree" type="spawn" x="4896" y="1024">
+  <object id="107" name="Manana Tree" type="spawn" x="4864" y="1024">
    <properties>
-    <property name="death" value="420000"/>
+    <property name="death" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1017"/>
-    <property name="spawn" value="240000"/>
+    <property name="spawn" value="420000"/>
    </properties>
   </object>
-  <object id="108" name="Manana Tree" type="spawn" x="4992" y="1184">
+  <object id="108" name="Manana Tree" type="spawn" x="4960" y="1184">
    <properties>
-    <property name="death" value="420000"/>
+    <property name="death" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1017"/>
-    <property name="spawn" value="240000"/>
+    <property name="spawn" value="420000"/>
    </properties>
   </object>
-  <object id="109" name="Manana Tree" type="spawn" x="5088" y="928">
+  <object id="109" name="Manana Tree" type="spawn" x="5056" y="928">
    <properties>
-    <property name="death" value="420000"/>
+    <property name="death" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1017"/>
-    <property name="spawn" value="240000"/>
+    <property name="spawn" value="420000"/>
    </properties>
   </object>
-  <object id="110" name="Manana Tree" type="spawn" x="6528" y="1632">
+  <object id="110" name="Manana Tree" type="spawn" x="6496" y="1632">
    <properties>
-    <property name="death" value="420000"/>
+    <property name="death" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1017"/>
-    <property name="spawn" value="240000"/>
+    <property name="spawn" value="420000"/>
    </properties>
   </object>
-  <object id="111" name="Manana Tree" type="spawn" x="6368" y="1600">
+  <object id="111" name="Manana Tree" type="spawn" x="6336" y="1600">
    <properties>
-    <property name="death" value="420000"/>
+    <property name="death" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1017"/>
-    <property name="spawn" value="240000"/>
+    <property name="spawn" value="420000"/>
    </properties>
   </object>
-  <object id="112" name="Manana Tree" type="spawn" x="6400" y="1760">
+  <object id="112" name="Manana Tree" type="spawn" x="6368" y="1760">
    <properties>
-    <property name="death" value="420000"/>
+    <property name="death" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1017"/>
-    <property name="spawn" value="240000"/>
+    <property name="spawn" value="420000"/>
    </properties>
   </object>
-  <object id="113" name="Manana Tree" type="spawn" x="5952" y="2080">
+  <object id="113" name="Manana Tree" type="spawn" x="5920" y="2080">
    <properties>
-    <property name="death" value="420000"/>
+    <property name="death" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1017"/>
-    <property name="spawn" value="240000"/>
+    <property name="spawn" value="420000"/>
    </properties>
   </object>
-  <object id="114" name="Manana Tree" type="spawn" x="6144" y="2016">
+  <object id="114" name="Manana Tree" type="spawn" x="6112" y="2016">
    <properties>
-    <property name="death" value="420000"/>
+    <property name="death" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1017"/>
-    <property name="spawn" value="240000"/>
+    <property name="spawn" value="420000"/>
    </properties>
   </object>
-  <object id="115" name="Manana Tree" type="spawn" x="6432" y="2112">
+  <object id="115" name="Manana Tree" type="spawn" x="6400" y="2112">
    <properties>
-    <property name="death" value="420000"/>
+    <property name="death" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1017"/>
-    <property name="spawn" value="240000"/>
+    <property name="spawn" value="420000"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/001-2-12.tmx b/maps/001-2-12.tmx
index 5e618d26..5cb24139 100644
--- a/maps/001-2-12.tmx
+++ b/maps/001-2-12.tmx
@@ -370,7 +370,7 @@
    <properties>
     <property name="dest_map" value="001-2-13"/>
     <property name="dest_x" value="27"/>
-    <property name="dest_y" value="29"/>
+    <property name="dest_y" value="28"/>
    </properties>
   </object>
   <object id="2" name="To Artis" type="warp" x="1088" y="1152" width="32" height="32">
@@ -380,7 +380,7 @@
     <property name="dest_y" value="31"/>
    </properties>
   </object>
-  <object id="3" name="To Basement" type="script_warp" x="928" y="896" width="32" height="32">
+  <object id="3" name="To Basement" type="warp" x="928" y="896" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-14"/>
     <property name="dest_x" value="25"/>
diff --git a/maps/001-2-19.tmx b/maps/001-2-19.tmx
index 00d1dd1c..2a5f874c 100644
--- a/maps/001-2-19.tmx
+++ b/maps/001-2-19.tmx
@@ -415,7 +415,7 @@
 1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,
 1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,
 1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,
-1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,
+1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,0,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,
 1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,0,0,0,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,
 1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,0,1230,1230,1230,1230,1230,0,0,0,0,1233,0,0,0,0,0,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,
 1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,0,0,0,1230,1230,1230,1230,1230,0,0,0,0,1233,0,0,0,0,0,0,0,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,
@@ -438,7 +438,7 @@
 1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,0,0,0,0,0,0,0,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,
 1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,0,0,0,0,0,0,0,0,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,
 1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,0,0,0,0,0,0,0,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,
-1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,0,0,0,0,0,0,0,0,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,
+1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,0,0,0,0,0,0,0,0,1230,1230,1230,1230,1230,1230,1230,1230,0,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,
 1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,0,0,0,0,1230,1230,1230,1230,1230,1233,1233,1230,0,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,
 1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,0,0,0,0,0,0,0,1230,1230,1230,0,0,0,0,0,0,0,0,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,
 1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,0,1233,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,
@@ -447,7 +447,7 @@
 1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,
 1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,0,0,0,0,0,0,1230,1230,1230,1230,0,0,0,0,0,0,0,0,0,0,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,
 1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,0,0,0,0,1230,1230,1230,1230,1230,1230,0,0,0,0,0,0,0,0,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,
-1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,0,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,
+1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,
 1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,
 1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,
 1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,
@@ -482,7 +482,7 @@
     <property name="dest_y" value="33"/>
    </properties>
   </object>
-  <object id="2" name="To Storage" type="ani_warp" x="1312" y="800" width="32" height="32">
+  <object id="2" name="To Storage" type="ani_warp" x="1312" y="768" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-25"/>
     <property name="dest_x" value="29"/>
@@ -492,7 +492,7 @@
     <property name="trigger_y" value="3"/>
    </properties>
   </object>
-  <object id="3" name="To Artis Middle" type="warp" x="1056" y="1216" width="32" height="32">
+  <object id="3" name="To Artis Middle" type="warp" x="1056" y="1248" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
     <property name="dest_x" value="101"/>
@@ -506,7 +506,7 @@
     <property name="dest_y" value="27"/>
    </properties>
   </object>
-  <object id="5" name="To Artis South" type="ani_warp" x="1312" y="1536" width="32" height="32">
+  <object id="5" name="To Artis South" type="ani_warp" x="1312" y="1504" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
     <property name="dest_x" value="104"/>
@@ -566,16 +566,16 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1239,1239,1239,1239,1239,1239,1239,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1239,1239,1239,1239,1239,1239,1239,1239,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1239,1239,1239,1239,1239,1239,1239,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1239,1239,1239,1239,1239,1239,1239,1239,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1239,1239,1239,1239,0,0,0,0,0,1239,1239,0,1239,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1239,1239,1239,1239,1239,1239,1239,0,0,0,1239,1239,1239,1239,1239,1239,1239,1239,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1239,1239,1239,1239,1239,1239,1239,1239,0,0,0,0,0,1239,1239,0,1239,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1239,1239,1239,1239,0,0,0,1239,1239,1239,1239,1239,1239,1239,1239,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1239,1239,1239,1239,1239,1239,1239,0,0,0,1239,1239,1239,1239,1239,1239,1239,1239,1239,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1239,0,0,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1239,0,0,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1239,1239,1239,1239,1239,1239,0,0,0,0,1239,1239,1239,1239,1239,1239,1239,1239,1239,1239,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1239,1239,1239,1239,0,0,0,0,0,0,1239,1239,1239,1239,1239,1239,1239,1239,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1239,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
diff --git a/maps/001-2-2.tmx b/maps/001-2-2.tmx
index 0fa07fe5..8bfbd0a6 100644
--- a/maps/001-2-2.tmx
+++ b/maps/001-2-2.tmx
@@ -396,7 +396,7 @@
     <property name="dest_y" value="78"/>
    </properties>
   </object>
-  <object id="2" name="To Second Level" type="warp" x="832" y="894" width="96" height="32">
+  <object id="2" name="To Second Level" type="warp" x="832" y="928" width="96" height="32">
    <properties>
     <property name="dest_map" value="001-2-3"/>
     <property name="dest_x" value="27"/>
diff --git a/maps/001-2-20.tmx b/maps/001-2-20.tmx
index 250458f1..64ee6b88 100644
--- a/maps/001-2-20.tmx
+++ b/maps/001-2-20.tmx
@@ -321,7 +321,7 @@
 990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,
 990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,
 990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,
-990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,
+990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,0,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,
 990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,0,990,993,993,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,
 990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,0,0,0,0,0,0,0,0,0,0,0,990,990,990,990,0,0,0,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,
 990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,0,0,0,0,0,0,0,0,993,0,0,0,0,990,990,0,0,0,0,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,
@@ -366,11 +366,11 @@
     <property name="dest_y" value="50"/>
    </properties>
   </object>
-  <object id="2" name="To main hall" type="ani_warp" x="928" y="832" width="32" height="32">
+  <object id="2" name="To main hall" type="ani_warp" x="928" y="800" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-19"/>
     <property name="dest_x" value="41"/>
-    <property name="dest_y" value="55"/>
+    <property name="dest_y" value="54"/>
     <property name="npc_id" value="NPC_ARTIS_DOOR_WOOD"/>
     <property name="trigger_x" value="2"/>
     <property name="trigger_y" value="3"/>
diff --git a/maps/001-2-33.tmx b/maps/001-2-33.tmx
index ddb7be33..4f581a62 100644
--- a/maps/001-2-33.tmx
+++ b/maps/001-2-33.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="71" height="71" tilewidth="32" tileheight="32" nextobjectid="29">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="71" height="71" tilewidth="32" tileheight="32" nextobjectid="41">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
@@ -729,55 +729,48 @@
 </data>
  </layer>
  <objectgroup name="Object" opacity="0.87">
-  <object id="1" name="To Artis" type="warp" x="1088" y="1472" width="32" height="32">
+  <object id="35" name="To Left Chamber" type="ani_warp" x="928" y="1024" width="32" height="32">
    <properties>
-    <property name="dest_map" value="001-1"/>
-    <property name="dest_x" value="57"/>
-    <property name="dest_y" value="42"/>
-   </properties>
-  </object>
-  <object id="4" name="To Left Chamber" type="ani_warp" x="928" y="992" width="32" height="32">
-   <properties>
-    <property name="dest_map" value="001-2-37"/>
-    <property name="dest_x" value="36"/>
-    <property name="dest_y" value="28"/>
+    <property name="dest_map" value="001-2-34"/>
+    <property name="dest_x" value="29"/>
+    <property name="dest_y" value="32"/>
     <property name="npc_id" value="NPC_ARTIS_IN_DOOR"/>
     <property name="trigger_x" value="1"/>
     <property name="trigger_y" value="2"/>
    </properties>
   </object>
-  <object id="5" name="To Right Chamber" type="ani_warp" x="1248" y="992" width="32" height="32">
+  <object id="36" name="To Right Chamber" type="ani_warp" x="1248" y="1024" width="32" height="32">
    <properties>
-    <property name="dest_map" value="001-2-38"/>
-    <property name="dest_x" value="24"/>
-    <property name="dest_y" value="28"/>
+    <property name="dest_map" value="001-2-32"/>
+    <property name="dest_x" value="27"/>
+    <property name="dest_y" value="32"/>
     <property name="npc_id" value="NPC_ARTIS_IN_DOOR"/>
     <property name="trigger_x" value="1"/>
     <property name="trigger_y" value="2"/>
    </properties>
   </object>
-  <object id="7" name="To Right Chamber" type="warp" x="1440" y="896" width="32" height="32">
+  <object id="37" name="To Right Dormroom" type="warp" x="1440" y="960" width="32" height="32">
    <properties>
-    <property name="dest_map" value="001-1"/>
-    <property name="dest_x" value="1"/>
-    <property name="dest_y" value="1"/>
+    <property name="dest_map" value="001-2-38"/>
+    <property name="dest_x" value="24"/>
+    <property name="dest_y" value="28"/>
    </properties>
   </object>
-  <object id="8" name="To Right Chamber" type="warp" x="736" y="896" width="32" height="32">
+  <object id="38" name="To Left Dormroom" type="warp" x="736" y="960" width="32" height="32">
    <properties>
-    <property name="dest_map" value="001-1"/>
-    <property name="dest_x" value="1"/>
-    <property name="dest_y" value="1"/>
+    <property name="dest_map" value="001-2-37"/>
+    <property name="dest_x" value="36"/>
+    <property name="dest_y" value="28"/>
    </properties>
   </object>
-  <object id="25" name="To Left PvP Arena" type="warp" x="768" y="1280" width="96" height="32">
+  <object id="39" name="To Left PvP Arena" type="warp" x="768" y="1280" width="96" height="32">
    <properties>
     <property name="dest_map" value="001-2-40"/>
     <property name="dest_x" value="27"/>
     <property name="dest_y" value="46"/>
    </properties>
   </object>
-  <object id="26" name="To Right PvP Arena" type="warp" x="1344" y="1280" width="96" height="32">
+  <object id="40" name="To Right PvP Arena" type="warp" x="1344" y="1280" width="96" height="32">
    <properties>
     <property name="dest_map" value="001-2-40"/>
     <property name="dest_x" value="45"/>
diff --git a/maps/001-2-34.tmx b/maps/001-2-34.tmx
index 7f37478e..ebcd86de 100644
--- a/maps/001-2-34.tmx
+++ b/maps/001-2-34.tmx
@@ -422,7 +422,7 @@
  <objectgroup name="Object" opacity="0.87">
   <object id="4" name="To Hall" type="warp" x="928" y="1056" width="32" height="32">
    <properties>
-    <property name="dest_map" value="001-1"/>
+    <property name="dest_map" value="001-2-33"/>
     <property name="dest_x" value="29"/>
     <property name="dest_y" value="33"/>
    </properties>
diff --git a/maps/001-2-4.tmx b/maps/001-2-4.tmx
index cf5522fc..e106fa65 100644
--- a/maps/001-2-4.tmx
+++ b/maps/001-2-4.tmx
@@ -398,7 +398,7 @@
     <property name="dest_y" value="81"/>
    </properties>
   </object>
-  <object id="2" name="To Library Second Floor" type="warp" x="1760" y="832" width="128" height="32">
+  <object id="2" name="To Library Second Floor" type="warp" x="1760" y="864" width="128" height="32">
    <properties>
     <property name="dest_map" value="001-2-6"/>
     <property name="dest_x" value="57"/>
diff --git a/maps/001-2-40.tmx b/maps/001-2-40.tmx
index 1322065e..d89232bb 100644
--- a/maps/001-2-40.tmx
+++ b/maps/001-2-40.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="71" height="71" tilewidth="32" tileheight="32" nextobjectid="30">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="71" height="71" tilewidth="32" tileheight="32" nextobjectid="32">
  <properties>
   <property name="actorsfix" value="1"/>
   <property name="license" value="CC BY-SA 3.0"/>
@@ -487,17 +487,17 @@
 </data>
  </layer>
  <objectgroup name="Object" opacity="0.87">
-  <object id="7" name="To Right Hall" type="warp" x="1408" y="1376" width="96" height="32">
+  <object id="7" name="To Right Hall" type="warp" x="1408" y="1408" width="96" height="32">
    <properties>
     <property name="dest_map" value="001-2-33"/>
-    <property name="dest_x" value="25"/>
+    <property name="dest_x" value="43"/>
     <property name="dest_y" value="39"/>
    </properties>
   </object>
-  <object id="28" name="To Left Hall" type="warp" x="832" y="1376" width="96" height="32">
+  <object id="28" name="To Left Hall" type="warp" x="832" y="1408" width="96" height="32">
    <properties>
-    <property name="dest_map" value="001-2-34"/>
-    <property name="dest_x" value="43"/>
+    <property name="dest_map" value="001-2-33"/>
+    <property name="dest_x" value="25"/>
     <property name="dest_y" value="39"/>
    </properties>
   </object>