From 59d87c3b93a0363bb003fd1f3c2f8031e186869f Mon Sep 17 00:00:00 2001
From: wushin <pasekei@gmail.com>
Date: Mon, 26 Sep 2016 11:57:39 -0500
Subject: Converted warps into maps Converted mobs into maps

---
 maps/000-1.tmx    |  96 ++++++++++++++-
 maps/000-2-0.tmx  |  12 +-
 maps/000-2-1.tmx  |  10 +-
 maps/000-2-2.tmx  |  10 +-
 maps/000-2-3.tmx  |   4 +-
 maps/000-2-4.tmx  |  14 ++-
 maps/001-1.tmx    | 351 ++++++++++++++++++++++++++++++++++++++++++++++++++----
 maps/001-2-0.tmx  |   8 +-
 maps/001-2-1.tmx  |   4 +-
 maps/001-2-10.tmx |  10 +-
 maps/001-2-12.tmx |  24 +++-
 maps/001-2-13.tmx |   6 +-
 maps/001-2-14.tmx |   8 +-
 maps/001-2-15.tmx |   8 +-
 maps/001-2-16.tmx |   8 +-
 maps/001-2-17.tmx |   6 +-
 maps/001-2-18.tmx |   4 +-
 maps/001-2-19.tmx |  46 ++++++-
 maps/001-2-2.tmx  |   8 +-
 maps/001-2-20.tmx |  19 ++-
 maps/001-2-21.tmx |  16 +--
 maps/001-2-22.tmx |   8 +-
 maps/001-2-23.tmx |  10 +-
 maps/001-2-24.tmx |   4 +-
 maps/001-2-25.tmx |  18 ++-
 maps/001-2-26.tmx |   8 +-
 maps/001-2-27.tmx |   4 +-
 maps/001-2-28.tmx |  18 +--
 maps/001-2-29.tmx |  12 +-
 maps/001-2-3.tmx  |   4 +-
 maps/001-2-30.tmx |  17 +--
 maps/001-2-31.tmx |  10 +-
 maps/001-2-32.tmx |  14 +--
 maps/001-2-33.tmx |  38 +++---
 maps/001-2-34.tmx |  34 +++---
 maps/001-2-35.tmx |   4 +-
 maps/001-2-36.tmx |   2 +
 maps/001-2-37.tmx |   4 +
 maps/001-2-38.tmx |   6 +-
 maps/001-2-39.tmx |   8 +-
 maps/001-2-4.tmx  |  17 +--
 maps/001-2-40.tmx |   6 +-
 maps/001-2-41.tmx |   4 +-
 maps/001-2-5.tmx  |   6 +-
 maps/001-2-6.tmx  |   4 +-
 maps/001-2-7.tmx  |  16 +--
 maps/001-2-8.tmx  |   6 +-
 maps/001-2-9.tmx  |   6 +-
 maps/test.tmx     |  29 ++++-
 maps/testbg.tmx   |   3 +
 50 files changed, 774 insertions(+), 218 deletions(-)

diff --git a/maps/000-1.tmx b/maps/000-1.tmx
index 2b94a08f..b615f040 100644
--- a/maps/000-1.tmx
+++ b/maps/000-1.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="120" height="160" tilewidth="32" tileheight="32" nextobjectid="31">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="120" height="160" tilewidth="32" tileheight="32" nextobjectid="44">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
@@ -1031,8 +1031,8 @@
   <object id="1" name="To La Johanne" type="warp" x="3008" y="3200" width="28" height="32">
    <properties>
     <property name="dest_map" value="000-2-0"/>
-    <property name="dest_x" value="672"/>
-    <property name="dest_y" value="864"/>
+    <property name="dest_x" value="21"/>
+    <property name="dest_y" value="28"/>
    </properties>
   </object>
   <object id="3" name="Tortuga" type="spawn" x="704" y="1280" width="416" height="640">
@@ -1227,7 +1227,7 @@
     <property name="monster_id" value="1006"/>
    </properties>
   </object>
-  <object id="27" name="Croc" type="spawn" x="1536" y="24000" width="320" height="1120">
+  <object id="27" name="Croc" type="spawn" x="1792" y="2400" width="320" height="1120">
    <properties>
     <property name="eA_death" value="300000"/>
     <property name="eA_spawn" value="35000"/>
@@ -1245,6 +1245,94 @@
   </object>
   <object id="29" name="graphics/particles/panels.xml" type="particle_effect" x="2848" y="1632" width="32" height="32"/>
   <object id="30" name="graphics/particles/panels.xml" type="particle_effect" x="2080" y="2976" width="32" height="32"/>
+  <object id="31" name="Piou" type="spawn" x="0" y="0">
+   <properties>
+    <property name="eA_death" value="15000"/>
+    <property name="eA_spawn" value="60000"/>
+    <property name="max_beings" value="4"/>
+    <property name="monster_id" value="1002"/>
+   </properties>
+  </object>
+  <object id="33" name="Crocotree" type="spawn" x="2496" y="3680">
+   <properties>
+    <property name="eA_death" value="420000"/>
+    <property name="eA_spawn" value="240000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1010"/>
+   </properties>
+  </object>
+  <object id="35" name="Crocotree" type="spawn" x="1824" y="3328">
+   <properties>
+    <property name="eA_death" value="420000"/>
+    <property name="eA_spawn" value="240000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1010"/>
+   </properties>
+  </object>
+  <object id="36" name="Crocotree" type="spawn" x="1248" y="3584">
+   <properties>
+    <property name="eA_death" value="420000"/>
+    <property name="eA_spawn" value="240000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1010"/>
+   </properties>
+  </object>
+  <object id="37" name="Crocotree" type="spawn" x="2144" y="2976">
+   <properties>
+    <property name="eA_death" value="420000"/>
+    <property name="eA_spawn" value="240000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1010"/>
+   </properties>
+  </object>
+  <object id="38" name="Crocotree" type="spawn" x="1696" y="2464">
+   <properties>
+    <property name="eA_death" value="420000"/>
+    <property name="eA_spawn" value="240000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1010"/>
+   </properties>
+  </object>
+  <object id="39" name="Crocotree" type="spawn" x="2048" y="2016">
+   <properties>
+    <property name="eA_death" value="420000"/>
+    <property name="eA_spawn" value="240000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1010"/>
+   </properties>
+  </object>
+  <object id="40" name="Crocotree" type="spawn" x="992" y="2208">
+   <properties>
+    <property name="eA_death" value="420000"/>
+    <property name="eA_spawn" value="240000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1010"/>
+   </properties>
+  </object>
+  <object id="41" name="Crocotree" type="spawn" x="1408" y="1408">
+   <properties>
+    <property name="eA_death" value="420000"/>
+    <property name="eA_spawn" value="240000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1010"/>
+   </properties>
+  </object>
+  <object id="42" name="Crocotree" type="spawn" x="2240" y="1056">
+   <properties>
+    <property name="eA_death" value="420000"/>
+    <property name="eA_spawn" value="240000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1010"/>
+   </properties>
+  </object>
+  <object id="43" name="Crocotree" type="spawn" x="2688" y="2112">
+   <properties>
+    <property name="eA_death" value="420000"/>
+    <property name="eA_spawn" value="240000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1010"/>
+   </properties>
+  </object>
  </objectgroup>
  <layer name="Heights" width="120" height="160">
   <data encoding="csv">
diff --git a/maps/000-2-0.tmx b/maps/000-2-0.tmx
index 81282fe7..26db02fa 100644
--- a/maps/000-2-0.tmx
+++ b/maps/000-2-0.tmx
@@ -315,18 +315,18 @@
 </data>
  </layer>
  <objectgroup name="Object">
-  <object id="1" name="ToOutside" type="warp" x="608" y="896" width="32" height="32">
+  <object id="1" name="ToOutside" type="script_warp" x="608" y="896" width="32" height="32">
    <properties>
     <property name="dest_map" value="000-1"/>
-    <property name="dest_x" value="4512"/>
-    <property name="dest_y" value="2208"/>
+    <property name="dest_x" value="72"/>
+    <property name="dest_y" value="29"/>
    </properties>
   </object>
-  <object id="2" name="To Nard's Room" type="warp" x="1056" y="896" width="32" height="32">
+  <object id="2" name="To Nard's Room" type="script_warp" x="1056" y="896" width="32" height="32">
    <properties>
     <property name="dest_map" value="000-2-3"/>
-    <property name="dest_x" value="640"/>
-    <property name="dest_y" value="864"/>
+    <property name="dest_x" value="20"/>
+    <property name="dest_y" value="27"/>
    </properties>
   </object>
   <object id="3" name="To Second Deck" type="warp" x="992" y="800" width="32" height="32">
diff --git a/maps/000-2-1.tmx b/maps/000-2-1.tmx
index 5c43f5b0..12b905d4 100644
--- a/maps/000-2-1.tmx
+++ b/maps/000-2-1.tmx
@@ -346,18 +346,18 @@
 </data>
  </layer>
  <objectgroup name="Object">
-  <object id="1" name="To Ship's Hold" type="warp" x="2304" y="1092" width="32" height="28">
+  <object id="1" name="To Ship's Hold" type="script_warp" x="2304" y="1092" width="32" height="28">
    <properties>
     <property name="dest_map" value="000-2-2"/>
-    <property name="dest_x" value="1536"/>
-    <property name="dest_y" value="896"/>
+    <property name="dest_x" value="48"/>
+    <property name="dest_y" value="28"/>
    </properties>
   </object>
   <object id="2" name="To First Deck" type="warp" x="2304" y="960" width="32" height="28">
    <properties>
     <property name="dest_map" value="000-2-0"/>
-    <property name="dest_x" value="960"/>
-    <property name="dest_y" value="832"/>
+    <property name="dest_x" value="31"/>
+    <property name="dest_y" value="26"/>
    </properties>
   </object>
   <object id="3" name="Piou" type="spawn" x="992" y="736" width="1376" height="640">
diff --git a/maps/000-2-2.tmx b/maps/000-2-2.tmx
index 63c207a5..c5d19626 100644
--- a/maps/000-2-2.tmx
+++ b/maps/000-2-2.tmx
@@ -430,16 +430,18 @@
 </data>
  </layer>
  <objectgroup name="Object">
-  <object id="1" name="To Second Deck" type="warp" x="1536" y="928" width="32" height="28">
+  <object id="1" name="To Second Deck" type="script_warp" x="1536" y="928" width="32" height="28">
    <properties>
     <property name="dest_map" value="000-2-1"/>
-    <property name="dest_x" value="1952"/>
-    <property name="dest_y" value="1088"/>
+    <property name="dest_x" value="61"/>
+    <property name="dest_y" value="34"/>
    </properties>
   </object>
-  <object id="2" name="To ..." type="warp" x="740" y="992" width="28" height="32">
+  <object id="2" name="To ..." type="script_warp" x="740" y="992" width="28" height="32">
    <properties>
     <property name="dest_map" value="000-2-2"/>
+    <property name="dest_x" value="1"/>
+    <property name="dest_y" value="1"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/000-2-3.tmx b/maps/000-2-3.tmx
index 87af5197..f5c7889d 100644
--- a/maps/000-2-3.tmx
+++ b/maps/000-2-3.tmx
@@ -320,8 +320,8 @@
   <object id="1" name="To First Deck" type="warp" x="612" y="864" width="28" height="32">
    <properties>
     <property name="dest_map" value="000-2-0"/>
-    <property name="dest_x" value="992"/>
-    <property name="dest_y" value="864"/>
+    <property name="dest_x" value="32"/>
+    <property name="dest_y" value="28"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/000-2-4.tmx b/maps/000-2-4.tmx
index 5a4fd90a..9f7444e5 100644
--- a/maps/000-2-4.tmx
+++ b/maps/000-2-4.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="70" height="62" tilewidth="32" tileheight="32" nextobjectid="20">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="70" height="62" tilewidth="32" tileheight="32" nextobjectid="22">
  <properties>
   <property name="actorsfix" value="1"/>
   <property name="license" value="CC BY-SA 3.0"/>
@@ -436,8 +436,16 @@
   <object id="11" name="ToLevel1" type="warp" x="1312" y="960" width="32" height="32">
    <properties>
     <property name="dest_map" value="000-2-1"/>
-    <property name="dest_x" value="1952"/>
-    <property name="dest_y" value="1088"/>
+    <property name="dest_x" value="25"/>
+    <property name="dest_y" value="31"/>
+   </properties>
+  </object>
+  <object id="20" name="Cuco" type="spawn" x="928" y="928" width="128" height="128">
+   <properties>
+    <property name="eA_death" value="90000"/>
+    <property name="eA_spawn" value="80000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1020"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/001-1.tmx b/maps/001-1.tmx
index 532050aa..7225d3e1 100644
--- a/maps/001-1.tmx
+++ b/maps/001-1.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="250" height="175" tilewidth="32" tileheight="32" nextobjectid="83">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="250" height="175" tilewidth="32" tileheight="32" nextobjectid="116">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
@@ -1540,50 +1540,65 @@
 </data>
  </layer>
  <objectgroup name="Object">
-  <object id="1" name="To Library" type="warp" x="1632" y="2560" width="32" height="32">
+  <object id="1" name="To Library" type="ani_warp" x="1632" y="2560" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-4"/>
     <property name="dest_x" value="48"/>
     <property name="dest_y" value="40"/>
+    <property name="npc_id" value="NPC_ARTIS_DOOR"/>
+    <property name="trigger_x" value="2"/>
+    <property name="trigger_y" value="3"/>
    </properties>
   </object>
-  <object id="2" name="To Moon's House" type="warp" x="2240" y="2464" width="32" height="32">
+  <object id="2" name="To Moon's House" type="ani_warp" x="2240" y="2464" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-2"/>
     <property name="dest_x" value="38"/>
     <property name="dest_y" value="38"/>
+    <property name="npc_id" value="NPC_ARTIS_DOOR"/>
+    <property name="trigger_x" value="2"/>
+    <property name="trigger_y" value="3"/>
    </properties>
   </object>
-  <object id="3" name="To Light Armor Shop West" type="warp" x="1632" y="2080" width="32" height="32">
+  <object id="3" name="To Light Armor Shop West" type="ani_warp" x="1632" y="2080" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-0"/>
     <property name="dest_x" value="30"/>
     <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"/>
    </properties>
   </object>
-  <object id="4" name="To Light Armor Shop East" type="warp" x="1760" y="2272" width="32" height="32">
+  <object id="4" name="To Light Armor Shop East" type="ani_warp" x="1760" y="2272" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-0"/>
     <property name="dest_x" value="37"/>
     <property name="dest_y" value="45"/>
+    <property name="npc_id" value="NPC_ARTIS_DOOR"/>
+    <property name="trigger_x" value="2"/>
+    <property name="trigger_y" value="3"/>
    </properties>
   </object>
-  <object id="5" name="To Harbourmaster Lodge" type="warp" x="5376" y="3136" width="32" height="32">
+  <object id="5" name="To Harbourmaster Lodge" type="ani_warp" x="5376" y="3136" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-16"/>
     <property name="dest_x" value="32"/>
     <property name="dest_y" value="35"/>
+    <property name="npc_id" value="NPC_ARTIS_DOOR"/>
+    <property name="trigger_x" value="2"/>
+    <property name="trigger_y" value="3"/>
    </properties>
   </object>
   <object id="6" name="graphics/particles/panels.xml" type="particle_effect" x="5760" y="800" width="32" height="32"/>
   <object id="7" name="To Ship" type="warp" x="6208" y="3488" width="32" height="32">
    <properties>
-    <property name="dest_map" value="001-1"/>
-    <property name="dest_x" value="0"/>
-    <property name="dest_y" value="0"/>
+    <property name="dest_map" value="001-2-21"/>
+    <property name="dest_x" value="20"/>
+    <property name="dest_y" value="28"/>
    </properties>
   </object>
-  <object id="8" name="To Merchant Hall" type="warp" x="3216" y="1184" width="32" height="32">
+  <object id="8" name="To Merchant Hall" type="warp" x="3200" y="1184" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-19"/>
     <property name="dest_x" value="32"/>
@@ -1597,116 +1612,158 @@
     <property name="dest_y" value="49"/>
    </properties>
   </object>
-  <object id="10" name="To RedPlush's Right Entrance" type="warp" x="4304" y="2656" width="32" height="32">
+  <object id="10" name="To RedPlush's Right Entrance" type="warp" x="4288" y="2656" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-28"/>
     <property name="dest_x" value="60"/>
     <property name="dest_y" value="31"/>
    </properties>
   </object>
-  <object id="11" name="To RedPlush's INN" type="warp" x="3776" y="2816" width="32" height="32">
+  <object id="11" name="To RedPlush's INN" type="ani_warp" x="3776" y="2816" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-28"/>
     <property name="dest_x" value="29"/>
     <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"/>
    </properties>
   </object>
-  <object id="12" name="To Dock Warehouse" type="warp" x="5824" y="2368" width="32" height="32">
+  <object id="12" name="To Dock Warehouse" type="ani_warp" x="5824" y="2368" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-18"/>
     <property name="dest_x" value="39"/>
     <property name="dest_y" value="35"/>
+    <property name="npc_id" value="NPC_ARTIS_DOOR"/>
+    <property name="trigger_x" value="2"/>
+    <property name="trigger_y" value="3"/>
    </properties>
   </object>
-  <object id="13" name="To Alchemy Lab" type="warp" x="5216" y="2240" width="32" height="32">
+  <object id="13" name="To Alchemy Lab" type="ani_warp" x="5216" y="2240" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-26"/>
     <property name="dest_x" value="28"/>
     <property name="dest_y" value="46"/>
+    <property name="npc_id" value="NPC_ARTIS_DOOR"/>
+    <property name="trigger_x" value="2"/>
+    <property name="trigger_y" value="3"/>
    </properties>
   </object>
-  <object id="14" name="To Geo and Meorwen's House" type="warp" x="4224" y="2144" width="32" height="32">
+  <object id="14" name="To Geo and Meorwen's House" type="ani_warp" x="4224" y="2144" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-15"/>
     <property name="dest_x" value="34"/>
     <property name="dest_y" value="45"/>
+    <property name="npc_id" value="NPC_ARTIS_DOOR"/>
+    <property name="trigger_x" value="2"/>
+    <property name="trigger_y" value="3"/>
    </properties>
   </object>
-  <object id="15" name="To Blacksmith" type="warp" x="3232" y="3424" width="32" height="32">
+  <object id="15" name="To Blacksmith" type="ani_warp" x="3232" y="3424" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-27"/>
     <property name="dest_x" value="35"/>
     <property name="dest_y" value="35"/>
+    <property name="npc_id" value="NPC_ARTIS_DOOR"/>
+    <property name="trigger_x" value="2"/>
+    <property name="trigger_y" value="3"/>
    </properties>
   </object>
-  <object id="16" name="To Town Hall" type="warp" x="2848" y="2080" width="32" height="32">
+  <object id="16" name="To Town Hall" type="ani_warp" x="2848" y="2080" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-7"/>
     <property name="dest_x" value="36"/>
     <property name="dest_y" value="45"/>
+    <property name="npc_id" value="NPC_ARTIS_DOOR"/>
+    <property name="trigger_x" value="2"/>
+    <property name="trigger_y" value="3"/>
    </properties>
   </object>
-  <object id="17" name="To Legion of Aemil" type="warp" x="1824" y="1312" width="32" height="32">
+  <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"/>
    </properties>
   </object>
-  <object id="18" name="To Noble House #1" type="warp" x="4544" y="960" width="32" height="32">
+  <object id="18" name="To Noble House #1" type="ani_warp" x="4544" y="960" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-12"/>
     <property name="dest_x" value="34"/>
     <property name="dest_y" value="35"/>
+    <property name="npc_id" value="NPC_ARTIS_DOOR"/>
+    <property name="trigger_x" value="2"/>
+    <property name="trigger_y" value="3"/>
    </properties>
   </object>
-  <object id="19" name="To Noble House #2" type="warp" x="4096" y="960" width="32" height="32">
+  <object id="19" name="To Noble House #2" type="ani_warp" x="4096" y="960" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-1"/>
     <property name="dest_x" value="37"/>
     <property name="dest_y" value="40"/>
+    <property name="npc_id" value="NPC_ARTIS_DOOR"/>
+    <property name="trigger_x" value="2"/>
+    <property name="trigger_y" value="3"/>
    </properties>
   </object>
-  <object id="20" name="To Merchant Hall North" type="warp" x="3328" y="1024" width="32" height="32">
+  <object id="20" name="To Merchant Hall North" type="ani_warp" x="3328" y="1024" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-19"/>
     <property name="dest_x" value="41"/>
     <property name="dest_y" value="30"/>
+    <property name="npc_id" value="NPC_ARTIS_DOOR"/>
+    <property name="trigger_x" value="2"/>
+    <property name="trigger_y" value="3"/>
    </properties>
   </object>
-  <object id="21" name="To Merchant Hall" type="warp" x="3424" y="1568" width="32" height="32">
+  <object id="21" name="To Merchant Hall" type="ani_warp" x="3424" y="1568" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-20"/>
     <property name="dest_x" value="33"/>
     <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"/>
    </properties>
   </object>
-  <object id="22" name="To Noble House #3" type="warp" x="4736" y="1728" width="32" height="32">
+  <object id="22" name="To Noble House #3" type="ani_warp" x="4736" y="1728" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-11"/>
     <property name="dest_x" value="46"/>
     <property name="dest_y" value="45"/>
+    <property name="npc_id" value="NPC_ARTIS_DOOR"/>
+    <property name="trigger_x" value="2"/>
+    <property name="trigger_y" value="3"/>
    </properties>
   </object>
-  <object id="23" name="To Noble House #4 East" type="warp" x="4320" y="1568" width="32" height="32">
+  <object id="23" name="To Noble House #4 East" type="ani_warp" x="4320" y="1568" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-10"/>
     <property name="dest_x" value="51"/>
     <property name="dest_y" value="44"/>
+    <property name="npc_id" value="NPC_ARTIS_DOOR"/>
+    <property name="trigger_x" value="2"/>
+    <property name="trigger_y" value="3"/>
    </properties>
   </object>
-  <object id="24" name="To Noble House #4 West" type="warp" x="3776" y="1568" width="32" height="32">
+  <object id="24" name="To Noble House #4 West" type="ani_warp" x="3776" y="1568" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-10"/>
     <property name="dest_x" value="27"/>
     <property name="dest_y" value="44"/>
+    <property name="npc_id" value="NPC_ARTIS_DOOR"/>
+    <property name="trigger_x" value="2"/>
+    <property name="trigger_y" value="3"/>
    </properties>
   </object>
-  <object id="25" name="ToLeftBuildingStairway" type="warp" x="1568" y="3072" width="32" height="32">
+  <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="npc_id" value="NPC_ARTIS_DOOR"/>
+    <property name="trigger_x" value="2"/>
+    <property name="trigger_y" value="3"/>
    </properties>
   </object>
   <object id="32" name="graphics/particles/chimney.xml" type="particle_effect" x="4032" y="3072" width="32" height="32"/>
@@ -1726,6 +1783,248 @@
   <object id="53" name="graphics/particles/panels.xml" type="particle_effect" x="3296" y="2112" width="32" height="32"/>
   <object id="81" name="graphics/particles/chimney.xml" type="particle_effect" x="4608" y="1344" width="32" height="32"/>
   <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="eA_death" value="15000"/>
+    <property name="eA_spawn" value="60000"/>
+    <property name="max_beings" value="2"/>
+    <property name="monster_id" value="1002"/>
+   </properties>
+  </object>
+  <object id="87" name="Piousse" type="spawn" x="0" y="0">
+   <properties>
+    <property name="eA_death" value="15000"/>
+    <property name="eA_spawn" value="150000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1003"/>
+   </properties>
+  </object>
+  <object id="88" name="Fluffy" type="spawn" x="5600" y="1024" width="320" height="480">
+   <properties>
+    <property name="eA_death" value="18000"/>
+    <property name="eA_spawn" value="100000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1022"/>
+    <property name="script" value="Mobs#001-1::OnFluffyDeath"/>
+   </properties>
+  </object>
+  <object id="89" name="Fluffy" type="spawn" x="5984" y="1536" width="320" height="480">
+   <properties>
+    <property name="eA_death" value="18000"/>
+    <property name="eA_spawn" value="100000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1022"/>
+    <property name="script" value="Mobs#001-1::OnFluffyDeath"/>
+   </properties>
+  </object>
+  <object id="90" name="Piou" type="spawn" x="5696" y="864" width="320" height="672">
+   <properties>
+    <property name="eA_death" value="15000"/>
+    <property name="eA_spawn" value="60000"/>
+    <property name="max_beings" value="2"/>
+    <property name="monster_id" value="1002"/>
+   </properties>
+  </object>
+  <object id="91" name="Pikpik" type="spawn" x="832" y="2304" width="192" height="896">
+   <properties>
+    <property name="eA_death" value="40000"/>
+    <property name="eA_spawn" value="20000"/>
+    <property name="max_beings" value="3"/>
+    <property name="monster_id" value="1013"/>
+   </properties>
+  </object>
+  <object id="92" name="Pikpik" type="spawn" x="1248" y="4288" width="448" height="224">
+   <properties>
+    <property name="eA_death" value="40000"/>
+    <property name="eA_spawn" value="20000"/>
+    <property name="max_beings" value="3"/>
+    <property name="monster_id" value="1013"/>
+   </properties>
+  </object>
+  <object id="93" name="Pikpik" type="spawn" x="1696" y="3936" width="544" height="320">
+   <properties>
+    <property name="eA_death" value="40000"/>
+    <property name="eA_spawn" value="20000"/>
+    <property name="max_beings" value="3"/>
+    <property name="monster_id" value="1013"/>
+   </properties>
+  </object>
+  <object id="94" name="Crocotree" type="spawn" x="1440" y="4352">
+   <properties>
+    <property name="eA_death" value="420000"/>
+    <property name="eA_spawn" value="240000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1010"/>
+   </properties>
+  </object>
+  <object id="95" name="Crocotree" type="spawn" x="2240" y="4352">
+   <properties>
+    <property name="eA_death" value="420000"/>
+    <property name="eA_spawn" value="240000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1010"/>
+   </properties>
+  </object>
+  <object id="96" name="Manana Tree" type="spawn" x="1216" y="4032">
+   <properties>
+    <property name="eA_death" value="420000"/>
+    <property name="eA_spawn" value="240000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1017"/>
+   </properties>
+  </object>
+  <object id="97" name="Manana Tree" type="spawn" x="1120" y="4160">
+   <properties>
+    <property name="eA_death" value="420000"/>
+    <property name="eA_spawn" value="240000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1017"/>
+   </properties>
+  </object>
+  <object id="98" name="Manana Tree" type="spawn" x="1344" y="4128">
+   <properties>
+    <property name="eA_death" value="420000"/>
+    <property name="eA_spawn" value="240000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1017"/>
+   </properties>
+  </object>
+  <object id="99" name="Manana Tree" type="spawn" x="1184" y="2464">
+   <properties>
+    <property name="eA_death" value="420000"/>
+    <property name="eA_spawn" value="240000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1017"/>
+   </properties>
+  </object>
+  <object id="100" name="Manana Tree" type="spawn" x="1120" y="2528">
+   <properties>
+    <property name="eA_death" value="420000"/>
+    <property name="eA_spawn" value="240000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1017"/>
+   </properties>
+  </object>
+  <object id="101" name="Manana Tree" type="spawn" x="1280" y="2336">
+   <properties>
+    <property name="eA_death" value="420000"/>
+    <property name="eA_spawn" value="240000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1017"/>
+   </properties>
+  </object>
+  <object id="102" name="Manana Tree" type="spawn" x="1408" y="2240">
+   <properties>
+    <property name="eA_death" value="420000"/>
+    <property name="eA_spawn" value="240000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1017"/>
+   </properties>
+  </object>
+  <object id="103" name="Manana Tree" type="spawn" x="1568" y="2272">
+   <properties>
+    <property name="eA_death" value="420000"/>
+    <property name="eA_spawn" value="240000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1017"/>
+   </properties>
+  </object>
+  <object id="104" name="Manana Tree" type="spawn" x="1312" y="2144">
+   <properties>
+    <property name="eA_death" value="420000"/>
+    <property name="eA_spawn" value="240000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1017"/>
+   </properties>
+  </object>
+  <object id="105" name="Manana Tree" type="spawn" x="1504" y="2080">
+   <properties>
+    <property name="eA_death" value="420000"/>
+    <property name="eA_spawn" value="240000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1017"/>
+   </properties>
+  </object>
+  <object id="106" name="Manana Tree" type="spawn" x="4896" y="832">
+   <properties>
+    <property name="eA_death" value="420000"/>
+    <property name="eA_spawn" value="240000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1017"/>
+   </properties>
+  </object>
+  <object id="107" name="Manana Tree" type="spawn" x="4896" y="1024">
+   <properties>
+    <property name="eA_death" value="420000"/>
+    <property name="eA_spawn" value="240000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1017"/>
+   </properties>
+  </object>
+  <object id="108" name="Manana Tree" type="spawn" x="4992" y="1184">
+   <properties>
+    <property name="eA_death" value="420000"/>
+    <property name="eA_spawn" value="240000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1017"/>
+   </properties>
+  </object>
+  <object id="109" name="Manana Tree" type="spawn" x="5088" y="928">
+   <properties>
+    <property name="eA_death" value="420000"/>
+    <property name="eA_spawn" value="240000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1017"/>
+   </properties>
+  </object>
+  <object id="110" name="Manana Tree" type="spawn" x="6528" y="1632">
+   <properties>
+    <property name="eA_death" value="420000"/>
+    <property name="eA_spawn" value="240000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1017"/>
+   </properties>
+  </object>
+  <object id="111" name="Manana Tree" type="spawn" x="6368" y="1600">
+   <properties>
+    <property name="eA_death" value="420000"/>
+    <property name="eA_spawn" value="240000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1017"/>
+   </properties>
+  </object>
+  <object id="112" name="Manana Tree" type="spawn" x="6400" y="1760">
+   <properties>
+    <property name="eA_death" value="420000"/>
+    <property name="eA_spawn" value="240000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1017"/>
+   </properties>
+  </object>
+  <object id="113" name="Manana Tree" type="spawn" x="5952" y="2080">
+   <properties>
+    <property name="eA_death" value="420000"/>
+    <property name="eA_spawn" value="240000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1017"/>
+   </properties>
+  </object>
+  <object id="114" name="Manana Tree" type="spawn" x="6144" y="2016">
+   <properties>
+    <property name="eA_death" value="420000"/>
+    <property name="eA_spawn" value="240000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1017"/>
+   </properties>
+  </object>
+  <object id="115" name="Manana Tree" type="spawn" x="6432" y="2112">
+   <properties>
+    <property name="eA_death" value="420000"/>
+    <property name="eA_spawn" value="240000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1017"/>
+   </properties>
+  </object>
  </objectgroup>
  <layer name="Heights" width="250" height="175">
   <data encoding="csv">
diff --git a/maps/001-2-0.tmx b/maps/001-2-0.tmx
index 7b08b843..b09ec3a8 100644
--- a/maps/001-2-0.tmx
+++ b/maps/001-2-0.tmx
@@ -421,15 +421,15 @@
   <object id="1" name="To Artis North" type="warp" x="960" y="1120" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
-    <property name="dest_x" value="1632"/>
-    <property name="dest_y" value="2112"/>
+    <property name="dest_x" value="51"/>
+    <property name="dest_y" value="66"/>
    </properties>
   </object>
   <object id="2" name="To Artis South" type="warp" x="1184" y="1472" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
-    <property name="dest_x" value="1760"/>
-    <property name="dest_y" value="2304"/>
+    <property name="dest_x" value="55"/>
+    <property name="dest_y" value="72"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/001-2-1.tmx b/maps/001-2-1.tmx
index 36c5f458..a1773e4e 100644
--- a/maps/001-2-1.tmx
+++ b/maps/001-2-1.tmx
@@ -406,8 +406,8 @@
   <object id="1" name="To Artis" type="warp" x="1184" y="1312" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
-    <property name="dest_x" value="1600"/>
-    <property name="dest_y" value="2112"/>
+    <property name="dest_x" value="128"/>
+    <property name="dest_y" value="31"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/001-2-10.tmx b/maps/001-2-10.tmx
index 2186cf54..106dd28d 100644
--- a/maps/001-2-10.tmx
+++ b/maps/001-2-10.tmx
@@ -406,15 +406,15 @@
   <object id="1" name="To Artis Left" type="warp" x="864" y="1440" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
-    <property name="dest_x" value="0"/>
-    <property name="dest_y" value="0"/>
+    <property name="dest_x" value="118"/>
+    <property name="dest_y" value="50"/>
    </properties>
   </object>
-  <object id="2" name="To Artis Right" type="warp" x="1632.25" y="1440.25" width="32" height="32">
+  <object id="2" name="To Artis Right" type="warp" x="1632" y="1440" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
-    <property name="dest_x" value="0"/>
-    <property name="dest_y" value="0"/>
+    <property name="dest_x" value="135"/>
+    <property name="dest_y" value="50"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/001-2-12.tmx b/maps/001-2-12.tmx
index 9411d1ff..66a3d633 100644
--- a/maps/001-2-12.tmx
+++ b/maps/001-2-12.tmx
@@ -366,9 +366,27 @@
 </data>
  </layer>
  <objectgroup name="Object">
-  <object id="1" name="To Second level" type="warp" x="832" y="864" width="64" height="32"/>
-  <object id="2" name="To Artis" type="warp" x="1088" y="1152" width="32" height="32"/>
-  <object id="3" name="To Basement" type="warp" x="928" y="896" width="32" height="32"/>
+  <object id="1" name="To Second level" type="warp" x="832" y="864" width="64" height="32">
+   <properties>
+    <property name="dest_map" value="001-2-13"/>
+    <property name="dest_x" value="27"/>
+    <property name="dest_y" value="29"/>
+   </properties>
+  </object>
+  <object id="2" name="To Artis" type="warp" x="1088" y="1152" width="32" height="32">
+   <properties>
+    <property name="dest_map" value="001-1"/>
+    <property name="dest_x" value="142"/>
+    <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">
+   <properties>
+    <property name="dest_map" value="001-2-14"/>
+    <property name="dest_x" value="25"/>
+    <property name="dest_y" value="29"/>
+   </properties>
+  </object>
  </objectgroup>
  <layer name="Heights" width="67" height="61">
   <data encoding="csv">
diff --git a/maps/001-2-13.tmx b/maps/001-2-13.tmx
index e2635dc3..3da9008c 100644
--- a/maps/001-2-13.tmx
+++ b/maps/001-2-13.tmx
@@ -374,9 +374,9 @@
  <objectgroup name="Object">
   <object id="1" name="To First Floor" type="warp" x="832" y="928" width="64" height="32">
    <properties>
-    <property name="dest_map" value="001-1"/>
-    <property name="dest_x" value="1600"/>
-    <property name="dest_y" value="2112"/>
+    <property name="dest_map" value="001-2-12"/>
+    <property name="dest_x" value="27"/>
+    <property name="dest_y" value="30"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/001-2-14.tmx b/maps/001-2-14.tmx
index 013c3cfd..8625f54c 100644
--- a/maps/001-2-14.tmx
+++ b/maps/001-2-14.tmx
@@ -432,7 +432,13 @@
 </data>
  </layer>
  <objectgroup name="Object">
-  <object id="1" name="To First Floor" type="warp" x="800" y="864" width="64" height="32"/>
+  <object id="1" name="To First Floor" type="warp" x="800" y="864" width="64" height="32">
+   <properties>
+    <property name="dest_map" value="001-2-12"/>
+    <property name="dest_x" value="30"/>
+    <property name="dest_y" value="28"/>
+   </properties>
+  </object>
  </objectgroup>
  <layer name="Heights" width="65" height="61">
   <data encoding="csv">
diff --git a/maps/001-2-15.tmx b/maps/001-2-15.tmx
index 95f95053..6c87ca85 100644
--- a/maps/001-2-15.tmx
+++ b/maps/001-2-15.tmx
@@ -422,7 +422,13 @@
 </data>
  </layer>
  <objectgroup name="Object">
-  <object id="1" name="To Artis" type="warp" x="1088" y="1472" width="32" height="32"/>
+  <object id="1" name="To Artis" type="warp" x="1088" y="1472" width="32" height="32">
+   <properties>
+    <property name="dest_map" value="001-1"/>
+    <property name="dest_x" value="132"/>
+    <property name="dest_y" value="68"/>
+   </properties>
+  </object>
  </objectgroup>
  <layer name="Heights" width="62" height="72">
   <data encoding="csv">
diff --git a/maps/001-2-16.tmx b/maps/001-2-16.tmx
index e96e060b..0bde164a 100644
--- a/maps/001-2-16.tmx
+++ b/maps/001-2-16.tmx
@@ -370,15 +370,15 @@
   <object id="1" name="To Artis" type="warp" x="1024" y="1152" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
-    <property name="dest_x" value=""/>
-    <property name="dest_y" value=""/>
+    <property name="dest_x" value="168"/>
+    <property name="dest_y" value="99"/>
    </properties>
   </object>
   <object id="2" name="To Left Chamber" type="warp" x="768" y="928" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-17"/>
-    <property name="dest_x" value=""/>
-    <property name="dest_y" value=""/>
+    <property name="dest_x" value="35"/>
+    <property name="dest_y" value="29"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/001-2-17.tmx b/maps/001-2-17.tmx
index 5a4c92af..83946788 100644
--- a/maps/001-2-17.tmx
+++ b/maps/001-2-17.tmx
@@ -372,9 +372,9 @@
  <objectgroup name="Objects">
   <object id="1" name="To Right Chamber" type="warp" x="1152" y="928" 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-16"/>
+    <property name="dest_x" value="25"/>
+    <property name="dest_y" value="29"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/001-2-18.tmx b/maps/001-2-18.tmx
index f8de103d..82229469 100644
--- a/maps/001-2-18.tmx
+++ b/maps/001-2-18.tmx
@@ -388,8 +388,8 @@
   <object id="1" name="To Artis" type="warp" x="1248" y="1152" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
-    <property name="dest_x" value="1600"/>
-    <property name="dest_y" value="2112"/>
+    <property name="dest_x" value="182"/>
+    <property name="dest_y" value="75"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/001-2-19.tmx b/maps/001-2-19.tmx
index 989ba0d4..2a01243c 100644
--- a/maps/001-2-19.tmx
+++ b/maps/001-2-19.tmx
@@ -475,11 +475,47 @@
 </data>
  </layer>
  <objectgroup name="Object">
-  <object id="1" name="To Artis North" type="warp" x="1312" y="992" width="32" height="32"/>
-  <object id="2" name="To Storage" type="warp" x="1312" y="800" width="32" height="32"/>
-  <object id="3" name="To Artis Middle" type="warp" x="1056" y="1216" width="32" height="32"/>
-  <object id="4" name="To Merchant Room" type="warp" x="1312" y="1760" width="32" height="32"/>
-  <object id="5" name="To Artis South" type="warp" x="1312" y="1504" width="32" height="32"/>
+  <object id="1" name="To Artis North" type="warp" x="1312" y="992" width="32" height="32">
+   <properties>
+    <property name="dest_map" value="001-1"/>
+    <property name="dest_x" value="104"/>
+    <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">
+   <properties>
+    <property name="dest_map" value="001-2-25"/>
+    <property name="dest_x" value="29"/>
+    <property name="dest_y" value="30"/>
+    <property name="npc_id" value="NPC_ARTIS_DOOR_WOOD"/>
+    <property name="trigger_x" value="2"/>
+    <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">
+   <properties>
+    <property name="dest_map" value="001-1"/>
+    <property name="dest_x" value="101"/>
+    <property name="dest_y" value="37"/>
+   </properties>
+  </object>
+  <object id="4" name="To Merchant Room" type="warp" x="1312" y="1760" width="32" height="32">
+   <properties>
+    <property name="dest_map" value="001-2-20"/>
+    <property name="dest_x" value="29"/>
+    <property name="dest_y" value="27"/>
+   </properties>
+  </object>
+  <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"/>
+    <property name="dest_y" value="42"/>
+    <property name="npc_id" value="NPC_ARTIS_DOOR_WOOD"/>
+    <property name="trigger_x" value="2"/>
+    <property name="trigger_y" value="3"/>
+   </properties>
+  </object>
  </objectgroup>
  <layer name="Heights" width="70" height="81">
   <data encoding="csv">
diff --git a/maps/001-2-2.tmx b/maps/001-2-2.tmx
index 8c4b25d5..0fa07fe5 100644
--- a/maps/001-2-2.tmx
+++ b/maps/001-2-2.tmx
@@ -392,15 +392,15 @@
   <object id="1" name="To Artis" type="warp" x="1216" y="1248" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
-    <property name="dest_x" value="1600"/>
-    <property name="dest_y" value="2112"/>
+    <property name="dest_x" value="70"/>
+    <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">
    <properties>
     <property name="dest_map" value="001-2-3"/>
-    <property name="dest_x" value="2208"/>
-    <property name="dest_y" value="2496"/>
+    <property name="dest_x" value="27"/>
+    <property name="dest_y" value="30"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/001-2-20.tmx b/maps/001-2-20.tmx
index a7039188..250458f1 100644
--- a/maps/001-2-20.tmx
+++ b/maps/001-2-20.tmx
@@ -359,7 +359,22 @@
 </data>
  </layer>
  <objectgroup name="Object">
-  <object id="1" name="To balcony" type="warp" x="1056" y="1120.5" width="32" height="32"/>
-  <object id="2" name="To main hall" type="warp" x="928" y="832" width="32" height="32"/>
+  <object id="1" name="To balcony" type="warp" x="1056" y="1120" width="32" height="32">
+   <properties>
+    <property name="dest_map" value="001-1"/>
+    <property name="dest_x" value="107"/>
+    <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">
+   <properties>
+    <property name="dest_map" value="001-2-19"/>
+    <property name="dest_x" value="41"/>
+    <property name="dest_y" value="55"/>
+    <property name="npc_id" value="NPC_ARTIS_DOOR_WOOD"/>
+    <property name="trigger_x" value="2"/>
+    <property name="trigger_y" value="3"/>
+   </properties>
+  </object>
  </objectgroup>
 </map>
diff --git a/maps/001-2-21.tmx b/maps/001-2-21.tmx
index 16f6ff8f..caf0b12e 100644
--- a/maps/001-2-21.tmx
+++ b/maps/001-2-21.tmx
@@ -321,22 +321,22 @@
   <object id="1" name="ToArtis" type="warp" x="608" y="896" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
-    <property name="dest_x" value="4512"/>
-    <property name="dest_y" value="2208"/>
+    <property name="dest_x" value="141"/>
+    <property name="dest_y" value="69"/>
    </properties>
   </object>
   <object id="2" name="To Nard's Room" type="warp" x="1056" y="896" width="32" height="32">
    <properties>
-    <property name="dest_map" value="000-2-24"/>
-    <property name="dest_x" value="640"/>
-    <property name="dest_y" value="864"/>
+    <property name="dest_map" value="001-2-24"/>
+    <property name="dest_x" value="20"/>
+    <property name="dest_y" value="27"/>
    </properties>
   </object>
   <object id="3" name="To Second Deck" type="warp" x="992" y="800" width="32" height="32">
    <properties>
-    <property name="dest_map" value="000-2-232"/>
-    <property name="dest_x" value="1952"/>
-    <property name="dest_y" value="928"/>
+    <property name="dest_map" value="001-2-22"/>
+    <property name="dest_x" value="61"/>
+    <property name="dest_y" value="29"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/001-2-22.tmx b/maps/001-2-22.tmx
index af3e5b1f..072259e2 100644
--- a/maps/001-2-22.tmx
+++ b/maps/001-2-22.tmx
@@ -352,15 +352,15 @@
   <object id="1" name="To Ship's Hold" type="warp" x="2304" y="1088" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-23"/>
-    <property name="dest_x" value="1536"/>
-    <property name="dest_y" value="896"/>
+    <property name="dest_x" value="48"/>
+    <property name="dest_y" value="28"/>
    </properties>
   </object>
   <object id="2" name="To First Deck" type="warp" x="2304" y="960" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-21"/>
-    <property name="dest_x" value="960"/>
-    <property name="dest_y" value="832"/>
+    <property name="dest_x" value="30"/>
+    <property name="dest_y" value="26"/>
    </properties>
   </object>
   <object id="3" name="Piou" type="spawn" x="992" y="736" width="1376" height="640">
diff --git a/maps/001-2-23.tmx b/maps/001-2-23.tmx
index c2b18bef..cc275a1d 100644
--- a/maps/001-2-23.tmx
+++ b/maps/001-2-23.tmx
@@ -433,16 +433,18 @@
 </data>
  </layer>
  <objectgroup name="Object">
-  <object id="1" name="To Second Deck" type="warp" x="1536" y="928" width="32" height="32">
+  <object id="1" name="To Second Deck" type="script_warp" x="1536" y="928" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-23"/>
-    <property name="dest_x" value="1952"/>
-    <property name="dest_y" value="1088"/>
+    <property name="dest_x" value="61"/>
+    <property name="dest_y" value="34"/>
    </properties>
   </object>
-  <object id="2" name="To ..." type="warp" x="736" y="992" width="32" height="32">
+  <object id="2" name="To ..." type="script_warp" x="736" y="992" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-23"/>
+    <property name="dest_x" value="1"/>
+    <property name="dest_y" value="1"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/001-2-24.tmx b/maps/001-2-24.tmx
index a865bc1a..1c476aa2 100644
--- a/maps/001-2-24.tmx
+++ b/maps/001-2-24.tmx
@@ -323,8 +323,8 @@
   <object id="1" name="To First Deck" type="warp" x="608" y="864" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-21"/>
-    <property name="dest_x" value="992"/>
-    <property name="dest_y" value="864"/>
+    <property name="dest_x" value="32"/>
+    <property name="dest_y" value="28"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/001-2-25.tmx b/maps/001-2-25.tmx
index 6362b5ca..a5e95cd2 100644
--- a/maps/001-2-25.tmx
+++ b/maps/001-2-25.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="70" height="57" tilewidth="32" tileheight="32" backgroundcolor="#808080" nextobjectid="2">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="70" height="57" tilewidth="32" tileheight="32" backgroundcolor="#808080" nextobjectid="3">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
@@ -408,6 +408,20 @@
 </data>
  </layer>
  <objectgroup name="Object">
-  <object id="1" name="To main hall" type="warp" x="927.5" y="992" width="32" height="32"/>
+  <object id="1" name="To main hall" type="warp" x="928" y="992" width="32" height="32">
+   <properties>
+    <property name="dest_map" value="001-2-19"/>
+    <property name="dest_x" value="41"/>
+    <property name="dest_y" value="26"/>
+   </properties>
+  </object>
+  <object id="2" name="Ratto" type="spawn" x="0" y="0">
+   <properties>
+    <property name="eA_death" value="420000"/>
+    <property name="eA_spawn" value="240000"/>
+    <property name="max_beings" value="2"/>
+    <property name="monster_id" value="1005"/>
+   </properties>
+  </object>
  </objectgroup>
 </map>
diff --git a/maps/001-2-26.tmx b/maps/001-2-26.tmx
index 7c7f9f15..434d75e7 100644
--- a/maps/001-2-26.tmx
+++ b/maps/001-2-26.tmx
@@ -422,7 +422,13 @@
 </data>
  </layer>
  <objectgroup name="Object">
-  <object id="1" name="To Artis" type="warp" x="896" y="1376" width="32" height="32"/>
+  <object id="1" name="To Artis" type="warp" x="896" y="1376" width="32" height="32">
+   <properties>
+    <property name="dest_map" value="001-1"/>
+    <property name="dest_x" value="163"/>
+    <property name="dest_y" value="71"/>
+   </properties>
+  </object>
  </objectgroup>
  <layer name="Heights" width="62" height="72">
   <data encoding="csv">
diff --git a/maps/001-2-27.tmx b/maps/001-2-27.tmx
index b8712ead..6615d57a 100644
--- a/maps/001-2-27.tmx
+++ b/maps/001-2-27.tmx
@@ -411,8 +411,8 @@
   <object id="1" name="To Artis" type="warp" x="1120" y="1120" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
-    <property name="dest_x" value="0"/>
-    <property name="dest_y" value="0"/>
+    <property name="dest_x" value="101"/>
+    <property name="dest_y" value="108"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/001-2-28.tmx b/maps/001-2-28.tmx
index 3441704b..69be8aa3 100644
--- a/maps/001-2-28.tmx
+++ b/maps/001-2-28.tmx
@@ -559,22 +559,22 @@
   <object id="1" name="To Artis Main Road" type="warp" x="928" y="1344" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
-    <property name="dest_x" value="0"/>
-    <property name="dest_y" value="0"/>
+    <property name="dest_x" value="118"/>
+    <property name="dest_y" value="89"/>
    </properties>
   </object>
-  <object id="8" name="To Artis Right" type="warp" x="1952" y="960" width="32" height="32">
+  <object id="8" name="To Artis Right" type="warp" x="1952" y="992" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
-    <property name="dest_x" value="0"/>
-    <property name="dest_y" value="0"/>
+    <property name="dest_x" value="135"/>
+    <property name="dest_y" value="83"/>
    </properties>
   </object>
-  <object id="14" name="To Second Level" type="warp" x="1024" y="768" width="128" height="32">
+  <object id="14" name="To Second Level" type="warp" x="1024" y="800" width="128" height="32">
    <properties>
-    <property name="dest_map" value="001-1"/>
-    <property name="dest_x" value="0"/>
-    <property name="dest_y" value="0"/>
+    <property name="dest_map" value="001-2-29"/>
+    <property name="dest_x" value="38"/>
+    <property name="dest_y" value="34"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/001-2-29.tmx b/maps/001-2-29.tmx
index a76fa71f..8eb9a5de 100644
--- a/maps/001-2-29.tmx
+++ b/maps/001-2-29.tmx
@@ -533,16 +533,16 @@
  <objectgroup name="Object">
   <object id="15" name="To First Level" type="warp" x="1184" y="1120" width="128" height="32">
    <properties>
-    <property name="dest_map" value="001-1"/>
-    <property name="dest_x" value="0"/>
-    <property name="dest_y" value="0"/>
+    <property name="dest_map" value="001-2-28"/>
+    <property name="dest_x" value="33"/>
+    <property name="dest_y" value="27"/>
    </properties>
   </object>
   <object id="16" name="To First Level" type="warp" x="1216" y="768" width="32" height="64">
    <properties>
-    <property name="dest_map" value="001-1"/>
-    <property name="dest_x" value="0"/>
-    <property name="dest_y" value="0"/>
+    <property name="dest_map" value="001-2-30"/>
+    <property name="dest_x" value="36"/>
+    <property name="dest_y" value="31"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/001-2-3.tmx b/maps/001-2-3.tmx
index 90895f4d..6aa652ef 100644
--- a/maps/001-2-3.tmx
+++ b/maps/001-2-3.tmx
@@ -387,8 +387,8 @@
   <object id="1" name="To First Level" type="warp" x="832" y="992" width="96" height="32">
    <properties>
     <property name="dest_map" value="001-2-2"/>
-    <property name="dest_x" value="864"/>
-    <property name="dest_y" value="992"/>
+    <property name="dest_x" value="27"/>
+    <property name="dest_y" value="30"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/001-2-30.tmx b/maps/001-2-30.tmx
index f973577a..2688f912 100644
--- a/maps/001-2-30.tmx
+++ b/maps/001-2-30.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="68" height="77" tilewidth="32" tileheight="32" backgroundcolor="#808080" nextobjectid="19">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="68" height="77" tilewidth="32" tileheight="32" backgroundcolor="#808080" nextobjectid="20">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
@@ -461,16 +461,17 @@
  <objectgroup name="Object">
   <object id="16" name="To Second Level" type="warp" x="1152" y="1024" width="64" height="32">
    <properties>
-    <property name="dest_map" value="001-1"/>
-    <property name="dest_x" value="0"/>
-    <property name="dest_y" value="0"/>
+    <property name="dest_map" value="001-2-29"/>
+    <property name="dest_x" value="37"/>
+    <property name="dest_y" value="27"/>
    </properties>
   </object>
-  <object id="18" name="To Second Level" type="warp" x="1152" y="1024" width="64" height="32">
+  <object id="19" name="Ratto" type="spawn" x="0" y="0">
    <properties>
-    <property name="dest_map" value="001-1"/>
-    <property name="dest_x" value="0"/>
-    <property name="dest_y" value="0"/>
+    <property name="eA_death" value="420000"/>
+    <property name="eA_spawn" value="240000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1005"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/001-2-31.tmx b/maps/001-2-31.tmx
index 93508757..2cc60e77 100644
--- a/maps/001-2-31.tmx
+++ b/maps/001-2-31.tmx
@@ -459,15 +459,15 @@
   <object id="1" name="To Artis Main Road" type="warp" x="1024" y="1280" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
-    <property name="dest_x" value="0"/>
-    <property name="dest_y" value="0"/>
+    <property name="dest_x" value="49"/>
+    <property name="dest_y" value="97"/>
    </properties>
   </object>
   <object id="17" name="To Barber" type="warp" x="1152" y="1024" width="32" height="32">
    <properties>
-    <property name="dest_map" value="001-1"/>
-    <property name="dest_x" value="0"/>
-    <property name="dest_y" value="0"/>
+    <property name="dest_map" value="001-2-41"/>
+    <property name="dest_x" value="25"/>
+    <property name="dest_y" value="32"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/001-2-32.tmx b/maps/001-2-32.tmx
index 539b9e57..17c4ac88 100644
--- a/maps/001-2-32.tmx
+++ b/maps/001-2-32.tmx
@@ -422,16 +422,16 @@
  <objectgroup name="Object" opacity="0.87">
   <object id="4" name="To Hall" type="warp" x="864" y="1057" 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="39"/>
+    <property name="dest_y" value="33"/>
    </properties>
   </object>
-  <object id="24" name="To Fight Room" type="warp" x="1056" y="928" width="32" height="32">
+  <object id="24" name="To Fight Room" type="script_warp" x="1056" y="928" 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-35"/>
+    <property name="dest_x" value="24"/>
+    <property name="dest_y" value="29"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/001-2-33.tmx b/maps/001-2-33.tmx
index 5b0d8d56..ddb7be33 100644
--- a/maps/001-2-33.tmx
+++ b/maps/001-2-33.tmx
@@ -732,22 +732,28 @@
   <object id="1" name="To Artis" type="warp" x="1088" y="1472" 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_x" value="57"/>
+    <property name="dest_y" value="42"/>
    </properties>
   </object>
-  <object id="4" name="To Left Chamber" type="warp" x="928" y="992" width="32" height="32">
+  <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-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"/>
+    <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="warp" x="1248" y="992" width="32" height="32">
+  <object id="5" name="To Right Chamber" type="ani_warp" x="1248" y="992" 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"/>
+    <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">
@@ -766,16 +772,16 @@
   </object>
   <object id="25" name="To Left PvP Arena" type="warp" x="768" y="1280" width="96" 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-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">
    <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-40"/>
+    <property name="dest_x" value="45"/>
+    <property name="dest_y" value="46"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/001-2-34.tmx b/maps/001-2-34.tmx
index 57609ef0..9197734f 100644
--- a/maps/001-2-34.tmx
+++ b/maps/001-2-34.tmx
@@ -37,14 +37,14 @@
  <tileset firstgid="781" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="1037" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
-  <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
+ <tileset firstgid="1037" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
+  <image source="../graphics/tilesets/collision.png" width="96" height="96"/>
  </tileset>
- <tileset firstgid="1043" source="../graphics/tilesets/candle-x1x2.tsx"/>
- <tileset firstgid="1055" name="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
+ <tileset firstgid="1046" source="../graphics/tilesets/candle-x1x2.tsx"/>
+ <tileset firstgid="1058" name="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="1119" name="Height Numbers" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="1122" name="Height Numbers" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <layer name="Ground" width="57" height="58">
@@ -140,7 +140,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,81,81,81,81,81,81,81,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,0,294,0,0,0,0,0,92,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,129,210,210,210,210,210,210,211,0,568,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,129,1106,0,324,277,277,277,227,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,129,1109,0,324,277,277,277,227,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,129,242,242,242,242,229,0,227,261,261,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,225,0,227,277,277,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,225,0,227,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -201,9 +201,9 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,740,292,761,0,732,734,743,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1096,0,0,308,261,261,261,262,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1104,0,0,0,0,0,0,278,0,764,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1112,0,0,0,0,0,0,308,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1099,0,0,308,261,261,261,262,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1107,0,0,0,0,0,0,278,0,764,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1115,0,0,0,0,0,0,308,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,324,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -262,9 +262,9 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,69,0,0,0,69,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,565,0,735,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1043,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1046,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,689,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1114,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,685,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -423,15 +423,15 @@
   <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_x" value="1"/>
-    <property name="dest_y" value="1"/>
+    <property name="dest_x" value="29"/>
+    <property name="dest_y" value="33"/>
    </properties>
   </object>
-  <object id="24" name="To Training Room" type="warp" x="736" y="928" width="32" height="32">
+  <object id="24" name="To Training Room" type="script_warp" x="736" y="928" 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-36"/>
+    <property name="dest_x" value="36"/>
+    <property name="dest_y" value="30"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/001-2-35.tmx b/maps/001-2-35.tmx
index 8847a79c..75d9cd74 100644
--- a/maps/001-2-35.tmx
+++ b/maps/001-2-35.tmx
@@ -493,9 +493,11 @@
 </data>
  </layer>
  <objectgroup name="Object" opacity="0.87">
-  <object id="1" name="To Right Chamber" type="warp" x="736" y="928" width="32" height="32">
+  <object id="1" name="ToWaitingRoom" type="warp" x="736" y="928" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-32"/>
+    <property name="dest_x" value="32"/>
+    <property name="dest_y" value="29"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/001-2-36.tmx b/maps/001-2-36.tmx
index 106317c9..e19bea2d 100644
--- a/maps/001-2-36.tmx
+++ b/maps/001-2-36.tmx
@@ -591,6 +591,8 @@
   <object id="7" name="To Waiting Room" type="warp" x="1184" y="928" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-34"/>
+    <property name="dest_x" value="24"/>
+    <property name="dest_y" value="29"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/001-2-37.tmx b/maps/001-2-37.tmx
index 7a9d9717..1108a1e4 100644
--- a/maps/001-2-37.tmx
+++ b/maps/001-2-37.tmx
@@ -423,11 +423,15 @@
   <object id="24" name="To Hall" type="warp" x="1184" y="896" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-33"/>
+    <property name="dest_x" value="24"/>
+    <property name="dest_y" value="30"/>
    </properties>
   </object>
   <object id="25" name="To Command Room" type="warp" x="1184" y="1056" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-39"/>
+    <property name="dest_x" value="24"/>
+    <property name="dest_y" value="33"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/001-2-38.tmx b/maps/001-2-38.tmx
index 48a574a1..4db6f537 100644
--- a/maps/001-2-38.tmx
+++ b/maps/001-2-38.tmx
@@ -423,14 +423,18 @@
 </data>
  </layer>
  <objectgroup name="Object" opacity="0.87">
-  <object id="7" name="To Hall" type="warp" x="736" y="895.667" width="32" height="32">
+  <object id="7" name="To Hall" type="warp" x="736" y="895" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-33"/>
+    <property name="dest_x" value="44"/>
+    <property name="dest_y" value="30"/>
    </properties>
   </object>
   <object id="24" name="To Command Room" type="warp" x="736" y="1056" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-39"/>
+    <property name="dest_x" value="44"/>
+    <property name="dest_y" value="33"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/001-2-39.tmx b/maps/001-2-39.tmx
index a777688f..34a11c67 100644
--- a/maps/001-2-39.tmx
+++ b/maps/001-2-39.tmx
@@ -492,15 +492,15 @@
   <object id="7" name="To Right Chamber" type="warp" x="1440" y="1056" 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_x" value="36"/>
+    <property name="dest_y" value="33"/>
    </properties>
   </object>
   <object id="8" name="To Left Chamber" type="warp" x="736" y="1056" 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_x" value="24"/>
+    <property name="dest_y" value="33"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/001-2-4.tmx b/maps/001-2-4.tmx
index 1156d8d9..de072d5a 100644
--- a/maps/001-2-4.tmx
+++ b/maps/001-2-4.tmx
@@ -394,22 +394,25 @@
   <object id="1" name="To Artis" type="warp" x="1536" 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_x" value="51"/>
+    <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">
    <properties>
     <property name="dest_map" value="001-2-6"/>
-    <property name="dest_x" value="1"/>
-    <property name="dest_y" value="1"/>
+    <property name="dest_x" value="57"/>
+    <property name="dest_y" value="35"/>
    </properties>
   </object>
-  <object id="3" name="To Library Warehouse" type="warp" x="1664" y="864" width="32" height="32">
+  <object id="3" name="To Library Warehouse" type="ani_warp" x="1664" y="864" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-5"/>
-    <property name="dest_x" value="1"/>
-    <property name="dest_y" value="1"/>
+    <property name="dest_x" value="28"/>
+    <property name="dest_y" value="37"/>
+    <property name="npc_id" value="NPC_ARTIS_IN_DOOR"/>
+    <property name="trigger_x" value="3"/>
+    <property name="trigger_y" value="3"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/001-2-40.tmx b/maps/001-2-40.tmx
index 15fb0a84..1322065e 100644
--- a/maps/001-2-40.tmx
+++ b/maps/001-2-40.tmx
@@ -489,12 +489,16 @@
  <objectgroup name="Object" opacity="0.87">
   <object id="7" name="To Right Hall" type="warp" x="1408" y="1376" width="96" height="32">
    <properties>
-    <property name="dest_map" value="001-2-34"/>
+    <property name="dest_map" value="001-2-33"/>
+    <property name="dest_x" value="25"/>
+    <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">
    <properties>
     <property name="dest_map" value="001-2-34"/>
+    <property name="dest_x" value="43"/>
+    <property name="dest_y" value="39"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/001-2-41.tmx b/maps/001-2-41.tmx
index 84b0599f..6c67d30e 100644
--- a/maps/001-2-41.tmx
+++ b/maps/001-2-41.tmx
@@ -462,8 +462,8 @@
   <object id="1" name="To Hall" type="warp" x="768" y="1024" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-31"/>
-    <property name="dest_x" value="0"/>
-    <property name="dest_y" value="0"/>
+    <property name="dest_x" value="35"/>
+    <property name="dest_y" value="32"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/001-2-5.tmx b/maps/001-2-5.tmx
index 91e278b5..3d2605b5 100644
--- a/maps/001-2-5.tmx
+++ b/maps/001-2-5.tmx
@@ -366,9 +366,9 @@
  <objectgroup name="Object">
   <object id="1" name="To Library First Floor" type="warp" x="896" y="1216" width="32" height="32">
    <properties>
-    <property name="dest_map" value="001-1"/>
-    <property name="dest_x" value="1664"/>
-    <property name="dest_y" value="896"/>
+    <property name="dest_map" value="001-2-4"/>
+    <property name="dest_x" value="52"/>
+    <property name="dest_y" value="29"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/001-2-6.tmx b/maps/001-2-6.tmx
index a2a90fb6..0442eade 100644
--- a/maps/001-2-6.tmx
+++ b/maps/001-2-6.tmx
@@ -450,8 +450,8 @@
   <object id="1" name="To Library First Floor" type="warp" x="1760" y="1216" width="128" height="32">
    <properties>
     <property name="dest_map" value="001-2-4"/>
-    <property name="dest_x" value="1792"/>
-    <property name="dest_y" value="896"/>
+    <property name="dest_x" value="57"/>
+    <property name="dest_y" value="29"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/001-2-7.tmx b/maps/001-2-7.tmx
index 98b0ea1a..ffe46d87 100644
--- a/maps/001-2-7.tmx
+++ b/maps/001-2-7.tmx
@@ -420,22 +420,22 @@
   <object id="1" name="To Artis" type="warp" x="1152" y="1472" 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_x" value="89"/>
+    <property name="dest_y" value="66"/>
    </properties>
   </object>
   <object id="2" name="To Right Room" type="warp" x="1472" y="992" 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-9"/>
+    <property name="dest_x" value="25"/>
+    <property name="dest_y" value="41"/>
    </properties>
   </object>
   <object id="3" name="To Left Room" type="warp" x="832" y="992" 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-8"/>
+    <property name="dest_x" value="45"/>
+    <property name="dest_y" value="41"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/001-2-8.tmx b/maps/001-2-8.tmx
index 6f0262a0..7f50acb9 100644
--- a/maps/001-2-8.tmx
+++ b/maps/001-2-8.tmx
@@ -417,9 +417,9 @@
  <objectgroup name="Object" opacity="0.87">
   <object id="1" name="To Main Hall" type="warp" x="1472" 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-7"/>
+    <property name="dest_x" value="27"/>
+    <property name="dest_y" value="31"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/001-2-9.tmx b/maps/001-2-9.tmx
index dc375717..a2b7a962 100644
--- a/maps/001-2-9.tmx
+++ b/maps/001-2-9.tmx
@@ -417,9 +417,9 @@
  <objectgroup name="Object" opacity="0.88">
   <object id="1" name="To Main Hall" type="warp" x="768" 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-7"/>
+    <property name="dest_x" value="45"/>
+    <property name="dest_y" value="31"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/test.tmx b/maps/test.tmx
index eee53fa6..b5cbd19a 100644
--- a/maps/test.tmx
+++ b/maps/test.tmx
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="100" height="100" tilewidth="32" tileheight="32" nextobjectid="1">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="100" height="100" tilewidth="32" tileheight="32" nextobjectid="4">
  <properties>
   <property name="manaplus version" value="2"/>
+  <property name="name" value="test"/>
   <property name="overlay0image" value="graphics/images/ambient/fog.png"/>
   <property name="overlay0mask" value="2"/>
   <property name="overlay0parallax" value="1.0"/>
@@ -760,6 +761,32 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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 name="Object">
+  <object id="1" name="Tortuga" type="spawn" x="1440" y="896" width="416" height="640">
+   <properties>
+    <property name="eA_death" value="120000"/>
+    <property name="eA_spawn" value="16000"/>
+    <property name="max_beings" value="3"/>
+    <property name="monster_id" value="1004"/>
+   </properties>
+  </object>
+  <object id="2" name="Piou" type="spawn" x="2496" y="960">
+   <properties>
+    <property name="eA_death" value="15000"/>
+    <property name="eA_spawn" value="60000"/>
+    <property name="max_beings" value="4"/>
+    <property name="monster_id" value="1002"/>
+   </properties>
+  </object>
+  <object id="3" name="Ratto" type="spawn" x="2528" y="1216">
+   <properties>
+    <property name="eA_death" value="420000"/>
+    <property name="eA_spawn" value="240000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1005"/>
+   </properties>
+  </object>
+ </objectgroup>
  <layer name="Heights" width="100" height="100">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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/testbg.tmx b/maps/testbg.tmx
index c744f7fe..30d2f154 100644
--- a/maps/testbg.tmx
+++ b/maps/testbg.tmx
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map version="1.0" orientation="orthogonal" renderorder="right-down" width="30" height="30" tilewidth="32" tileheight="32" nextobjectid="1">
+ <properties>
+  <property name="name" value="testbg"/>
+ </properties>
  <tileset firstgid="1" name="artis-indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
  </tileset>
-- 
cgit v1.2.3-60-g2f50


From 6be78dd8a4ef04298a93c98dcf6536efd04cde97 Mon Sep 17 00:00:00 2001
From: wushin <pasekei@gmail.com>
Date: Wed, 12 Oct 2016 09:59:13 -0500
Subject: Convert generic saves to automation

---
 maps/000-2-1.tmx  | 22 +++++++++++++++++++++-
 maps/001-2-1.tmx  |  7 ++++++-
 maps/001-2-10.tmx |  7 ++++++-
 maps/001-2-13.tmx |  2 +-
 maps/001-2-15.tmx |  7 ++++++-
 maps/001-2-22.tmx | 27 ++++++++++++++++++++++++++-
 maps/001-2-3.tmx  |  7 ++++++-
 maps/001-2-37.tmx | 22 +++++++++++++++++++++-
 maps/001-2-38.tmx | 22 +++++++++++++++++++++-
 9 files changed, 114 insertions(+), 9 deletions(-)

diff --git a/maps/000-2-1.tmx b/maps/000-2-1.tmx
index 12b905d4..d350a05c 100644
--- a/maps/000-2-1.tmx
+++ b/maps/000-2-1.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="93" height="59" tilewidth="32" tileheight="32" nextobjectid="4">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="93" height="59" tilewidth="32" tileheight="32" nextobjectid="8">
  <properties>
   <property name="actorsfix" value="1"/>
   <property name="license" value="CC BY-SA 3.0"/>
@@ -368,5 +368,25 @@
     <property name="monster_id" value="1002"/>
    </properties>
   </object>
+  <object id="4" name="save" type="save" x="1280" y="1184" width="32" height="32">
+   <properties>
+    <property name="inn" value="NO_INN"/>
+   </properties>
+  </object>
+  <object id="5" name="save" type="save" x="1472" y="1184" width="32" height="32">
+   <properties>
+    <property name="inn" value="NO_INN"/>
+   </properties>
+  </object>
+  <object id="6" name="save" type="save" x="1600" y="1216" width="32" height="32">
+   <properties>
+    <property name="inn" value="NO_INN"/>
+   </properties>
+  </object>
+  <object id="7" name="save" type="save" x="1760" y="1280" width="32" height="32">
+   <properties>
+    <property name="inn" value="NO_INN"/>
+   </properties>
+  </object>
  </objectgroup>
 </map>
diff --git a/maps/001-2-1.tmx b/maps/001-2-1.tmx
index a1773e4e..817c50de 100644
--- a/maps/001-2-1.tmx
+++ b/maps/001-2-1.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="75" height="67" tilewidth="32" tileheight="32" nextobjectid="2">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="75" height="67" tilewidth="32" tileheight="32" nextobjectid="3">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
@@ -410,6 +410,11 @@
     <property name="dest_y" value="31"/>
    </properties>
   </object>
+  <object id="2" name="save" type="save" x="864" y="928" width="32" height="32">
+   <properties>
+    <property name="inn" value="CURRENT_INN"/>
+   </properties>
+  </object>
  </objectgroup>
  <layer name="Heights" width="75" height="67">
   <data encoding="csv">
diff --git a/maps/001-2-10.tmx b/maps/001-2-10.tmx
index 106dd28d..4d35143e 100644
--- a/maps/001-2-10.tmx
+++ b/maps/001-2-10.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="79" height="67" tilewidth="32" tileheight="32" nextobjectid="3">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="79" height="67" tilewidth="32" tileheight="32" nextobjectid="4">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
@@ -417,6 +417,11 @@
     <property name="dest_y" value="50"/>
    </properties>
   </object>
+  <object id="3" name="save" type="save" x="832" y="928" width="32" height="32">
+   <properties>
+    <property name="inn" value="CURRENT_INN"/>
+   </properties>
+  </object>
  </objectgroup>
  <layer name="Heights" width="79" height="67">
   <data encoding="csv">
diff --git a/maps/001-2-13.tmx b/maps/001-2-13.tmx
index 3da9008c..9a6e1a37 100644
--- a/maps/001-2-13.tmx
+++ b/maps/001-2-13.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="66" height="62" tilewidth="32" tileheight="32" backgroundcolor="#a0a0a0" nextobjectid="2">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="66" height="62" tilewidth="32" tileheight="32" backgroundcolor="#a0a0a0" nextobjectid="3">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
diff --git a/maps/001-2-15.tmx b/maps/001-2-15.tmx
index 6c87ca85..db0e3596 100644
--- a/maps/001-2-15.tmx
+++ b/maps/001-2-15.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="62" height="72" tilewidth="32" tileheight="32" backgroundcolor="#a0a0a0" nextobjectid="2">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="62" height="72" tilewidth="32" tileheight="32" backgroundcolor="#a0a0a0" nextobjectid="3">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
@@ -429,6 +429,11 @@
     <property name="dest_y" value="68"/>
    </properties>
   </object>
+  <object id="2" name="save" type="save" x="864" y="1280" width="32" height="32">
+   <properties>
+    <property name="inn" value="CURRENT_INN"/>
+   </properties>
+  </object>
  </objectgroup>
  <layer name="Heights" width="62" height="72">
   <data encoding="csv">
diff --git a/maps/001-2-22.tmx b/maps/001-2-22.tmx
index 072259e2..9b62c839 100644
--- a/maps/001-2-22.tmx
+++ b/maps/001-2-22.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="93" height="59" tilewidth="32" tileheight="32" nextobjectid="4">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="93" height="59" tilewidth="32" tileheight="32" nextobjectid="9">
  <properties>
   <property name="actorsfix" value="1"/>
   <property name="license" value="CC BY-SA 3.0"/>
@@ -371,5 +371,30 @@
     <property name="monster_id" value="1002"/>
    </properties>
   </object>
+  <object id="4" name="save" type="save" x="1280" y="1184" width="32" height="32">
+   <properties>
+    <property name="inn" value="CURRENT_INN"/>
+   </properties>
+  </object>
+  <object id="5" name="save" type="save" x="1472" y="1184" width="32" height="32">
+   <properties>
+    <property name="inn" value="CURRENT_INN"/>
+   </properties>
+  </object>
+  <object id="6" name="save" type="save" x="1760" y="1280" width="32" height="32">
+   <properties>
+    <property name="inn" value="CURRENT_INN"/>
+   </properties>
+  </object>
+  <object id="7" name="save" type="save" x="1600" y="1216" width="32" height="32">
+   <properties>
+    <property name="inn" value="CURRENT_INN"/>
+   </properties>
+  </object>
+  <object id="8" name="save" type="save" x="1696" y="1216" width="32" height="32">
+   <properties>
+    <property name="inn" value="CURRENT_INN"/>
+   </properties>
+  </object>
  </objectgroup>
 </map>
diff --git a/maps/001-2-3.tmx b/maps/001-2-3.tmx
index 6aa652ef..b7f02fbb 100644
--- a/maps/001-2-3.tmx
+++ b/maps/001-2-3.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="69" height="64" tilewidth="32" tileheight="32" nextobjectid="2">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="69" height="64" tilewidth="32" tileheight="32" nextobjectid="3">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
@@ -391,6 +391,11 @@
     <property name="dest_y" value="30"/>
    </properties>
   </object>
+  <object id="2" name="save" type="save" x="1344" y="992" width="32" height="32">
+   <properties>
+    <property name="inn" value="CURRENT_INN"/>
+   </properties>
+  </object>
  </objectgroup>
  <layer name="Heights" width="69" height="64">
   <data encoding="csv">
diff --git a/maps/001-2-37.tmx b/maps/001-2-37.tmx
index 1108a1e4..4a64706c 100644
--- a/maps/001-2-37.tmx
+++ b/maps/001-2-37.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="61" height="71" tilewidth="32" tileheight="32" nextobjectid="26">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="61" height="71" tilewidth="32" tileheight="32" nextobjectid="31">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
@@ -434,5 +434,25 @@
     <property name="dest_y" value="33"/>
    </properties>
   </object>
+  <object id="26" name="save" type="save" x="800" y="1312" width="32" height="32">
+   <properties>
+    <property name="inn" value="CURRENT_INN"/>
+   </properties>
+  </object>
+  <object id="27" name="save" type="save" x="1120" y="1312" width="32" height="32">
+   <properties>
+    <property name="inn" value="CURRENT_INN"/>
+   </properties>
+  </object>
+  <object id="29" name="save" type="save" x="1120" y="1472" width="32" height="32">
+   <properties>
+    <property name="inn" value="CURRENT_INN"/>
+   </properties>
+  </object>
+  <object id="30" name="save" type="save" x="800" y="1472" width="32" height="32">
+   <properties>
+    <property name="inn" value="CURRENT_INN"/>
+   </properties>
+  </object>
  </objectgroup>
 </map>
diff --git a/maps/001-2-38.tmx b/maps/001-2-38.tmx
index 4db6f537..02faa2a9 100644
--- a/maps/001-2-38.tmx
+++ b/maps/001-2-38.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="61" height="71" tilewidth="32" tileheight="32" nextobjectid="26">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="61" height="71" tilewidth="32" tileheight="32" nextobjectid="30">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
@@ -437,5 +437,25 @@
     <property name="dest_y" value="33"/>
    </properties>
   </object>
+  <object id="26" name="save" type="save" x="800" y="1312" width="32" height="32">
+   <properties>
+    <property name="inn" value="CURRENT_INN"/>
+   </properties>
+  </object>
+  <object id="27" name="save" type="save" x="1120" y="1312" width="32" height="32">
+   <properties>
+    <property name="inn" value="CURRENT_INN"/>
+   </properties>
+  </object>
+  <object id="28" name="save" type="save" x="1120" y="1472" width="32" height="32">
+   <properties>
+    <property name="inn" value="CURRENT_INN"/>
+   </properties>
+  </object>
+  <object id="29" name="save" type="save" x="800" y="1472" width="32" height="32">
+   <properties>
+    <property name="inn" value="CURRENT_INN"/>
+   </properties>
+  </object>
  </objectgroup>
 </map>
-- 
cgit v1.2.3-60-g2f50