Fix some bad warp locations and add some missing save locations.

15 files changed, 38 insertions, 28 deletions

diff --git a/maps/001-2-1.tmx b/maps/001-2-1.tmx
index 817c50de..9d4d5a02 100644
--- a/maps/001-2-1.tmx
+++ b/maps/001-2-1.tmx
@@ -410,7 +410,7 @@
     <property name="dest_y" value="31"/>
    </properties>
   </object>
-  <object id="2" name="save" type="save" x="864" y="928" width="32" height="32">
+  <object id="2" name="save" type="save" x="864" y="960" width="32" height="32">
    <properties>
     <property name="inn" value="CURRENT_INN"/>
    </properties>
diff --git a/maps/001-2-10.tmx b/maps/001-2-10.tmx
index 4d35143e..6353836c 100644
--- a/maps/001-2-10.tmx
+++ b/maps/001-2-10.tmx
@@ -417,7 +417,7 @@
     <property name="dest_y" value="50"/>
    </properties>
   </object>
-  <object id="3" name="save" type="save" x="832" y="928" width="32" height="32">
+  <object id="3" name="save" type="save" x="832" y="960" width="32" height="32">
    <properties>
     <property name="inn" value="CURRENT_INN"/>
    </properties>
diff --git a/maps/001-2-11.tmx b/maps/001-2-11.tmx
index 115c0e7f..6b1a2391 100644
--- a/maps/001-2-11.tmx
+++ b/maps/001-2-11.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="75" height="72" tilewidth="32" tileheight="32" nextobjectid="2">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="75" height="72" tilewidth="32" tileheight="32" nextobjectid="3">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
@@ -435,6 +435,11 @@
     <property name="dest_y" value="55"/>
    </properties>
   </object>
+  <object id="2" name="save" type="save" x="832" y="992" width="32" height="32">
+   <properties>
+    <property name="inn" value="CURRENT_INN"/>
+   </properties>
+  </object>
  </objectgroup>
  <layer name="Heights" width="75" height="72">
   <data encoding="csv">
diff --git a/maps/001-2-12.tmx b/maps/001-2-12.tmx
index 66a3d633..5e618d26 100644
--- a/maps/001-2-12.tmx
+++ b/maps/001-2-12.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="67" height="61" tilewidth="32" tileheight="32" backgroundcolor="#a0a0a0" nextobjectid="4">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="67" height="61" tilewidth="32" tileheight="32" backgroundcolor="#a0a0a0" nextobjectid="5">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
diff --git a/maps/001-2-13.tmx b/maps/001-2-13.tmx
index 9a6e1a37..ad0729fc 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="3">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="66" height="62" tilewidth="32" tileheight="32" backgroundcolor="#a0a0a0" nextobjectid="4">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
@@ -376,7 +376,12 @@
    <properties>
     <property name="dest_map" value="001-2-12"/>
     <property name="dest_x" value="27"/>
-    <property name="dest_y" value="30"/>
+    <property name="dest_y" value="28"/>
+   </properties>
+  </object>
+  <object id="3" name="save" type="save" x="1312" y="992" width="32" height="32">
+   <properties>
+    <property name="inn" value="CURRENT_INN"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/001-2-15.tmx b/maps/001-2-15.tmx
index db0e3596..7375e5aa 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="3">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="62" height="72" tilewidth="32" tileheight="32" backgroundcolor="#a0a0a0" nextobjectid="4">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
@@ -429,7 +429,7 @@
     <property name="dest_y" value="68"/>
    </properties>
   </object>
-  <object id="2" name="save" type="save" x="864" y="1280" width="32" height="32">
+  <object id="2" name="save" type="save" x="864" y="1312" width="32" height="32">
    <properties>
     <property name="inn" value="CURRENT_INN"/>
    </properties>
diff --git a/maps/001-2-19.tmx b/maps/001-2-19.tmx
index 2a01243c..00d1dd1c 100644
--- a/maps/001-2-19.tmx
+++ b/maps/001-2-19.tmx
@@ -506,7 +506,7 @@
     <property name="dest_y" value="27"/>
    </properties>
   </object>
-  <object id="5" name="To Artis South" type="ani_warp" x="1312" y="1504" width="32" height="32">
+  <object id="5" name="To Artis South" type="ani_warp" x="1312" y="1536" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
     <property name="dest_x" value="104"/>
diff --git a/maps/001-2-22.tmx b/maps/001-2-22.tmx
index 146fc6f5..5f40cda1 100644
--- a/maps/001-2-22.tmx
+++ b/maps/001-2-22.tmx
@@ -359,16 +359,16 @@
   <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="30"/>
+    <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">
    <properties>
     <property name="death" value="20000"/>
-    <property name="spawn" value="30000"/>
     <property name="max_beings" value="3"/>
     <property name="monster_id" value="1002"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
   <object id="4" name="save" type="save" x="1280" y="1184" width="32" height="32">
diff --git a/maps/001-2-28.tmx b/maps/001-2-28.tmx
index 69be8aa3..f8002348 100644
--- a/maps/001-2-28.tmx
+++ b/maps/001-2-28.tmx
@@ -563,7 +563,7 @@
     <property name="dest_y" value="89"/>
    </properties>
   </object>
-  <object id="8" name="To Artis Right" type="warp" x="1952" y="992" width="32" height="32">
+  <object id="8" name="To Artis Right" type="warp" x="1952" y="1024" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
     <property name="dest_x" value="135"/>
diff --git a/maps/001-2-29.tmx b/maps/001-2-29.tmx
index 8eb9a5de..ca7bcb03 100644
--- a/maps/001-2-29.tmx
+++ b/maps/001-2-29.tmx
@@ -576,29 +576,29 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1066,0,1066,0,0,0,0,1066,1067,1068,1069,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1066,1067,1066,1066,1066,0,1066,1066,1067,1068,1069,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1066,1066,1067,1066,1066,1066,1066,1066,1066,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1066,1066,1066,1066,1066,0,1066,1066,1067,1068,1069,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1066,1066,1066,1066,1066,1066,1066,1066,1066,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1066,1066,1066,1066,1066,1066,1066,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1066,1066,1066,1066,0,0,1066,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1066,1066,1066,1066,1065,1065,1065,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1066,1066,1066,1066,1066,1066,1066,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1066,0,1066,0,0,0,1066,1066,1066,1065,1065,1065,1065,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1066,1067,1066,1066,1066,0,1066,1066,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1066,1067,1066,1066,1066,1066,1066,1066,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1066,1066,1066,1066,1066,0,1066,1066,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1066,1066,1066,1066,1066,1066,1066,1066,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1066,1066,1066,1066,1066,1066,1066,1066,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1066,1066,1066,1066,1066,0,1066,1066,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1066,1066,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1066,1066,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1066,0,1066,0,0,0,1066,1066,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1066,1066,1067,1066,1066,1066,0,1066,1066,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1066,1066,1067,1066,1066,1066,1066,1066,1066,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1066,1066,1066,1066,1066,1066,0,1066,1066,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1066,1066,1066,1066,1066,1066,1066,1066,1066,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1066,1066,1066,1066,1066,1066,1066,1066,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1066,1066,1066,1066,1066,0,1066,1066,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1066,1066,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1066,1066,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1066,0,1066,0,0,0,1066,1066,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1066,1066,1067,1066,1066,1066,0,1066,1066,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1066,1066,1067,1066,1066,1066,1066,1066,1066,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1066,1066,1066,1066,1066,1066,0,1066,1066,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1066,1066,1066,1066,1066,1066,1066,1066,1066,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1066,1066,1066,1066,1066,1066,1066,1066,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1066,1066,1066,1066,1066,0,1066,1066,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1066,1066,1066,1066,1066,0,1066,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
diff --git a/maps/001-2-3.tmx b/maps/001-2-3.tmx
index b7f02fbb..581faed6 100644
--- a/maps/001-2-3.tmx
+++ b/maps/001-2-3.tmx
@@ -391,7 +391,7 @@
     <property name="dest_y" value="30"/>
    </properties>
   </object>
-  <object id="2" name="save" type="save" x="1344" y="992" width="32" height="32">
+  <object id="2" name="save" type="save" x="1344" y="1024" width="32" height="32">
    <properties>
     <property name="inn" value="CURRENT_INN"/>
    </properties>
diff --git a/maps/001-2-38.tmx b/maps/001-2-38.tmx
index 02faa2a9..86fd35fd 100644
--- a/maps/001-2-38.tmx
+++ b/maps/001-2-38.tmx
@@ -423,7 +423,7 @@
 </data>
  </layer>
  <objectgroup name="Object" opacity="0.87">
-  <object id="7" name="To Hall" type="warp" x="736" y="895" width="32" height="32">
+  <object id="7" name="To Hall" type="warp" x="736" y="896" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-33"/>
     <property name="dest_x" value="44"/>
diff --git a/maps/001-2-39.tmx b/maps/001-2-39.tmx
index 34a11c67..1c092c94 100644
--- a/maps/001-2-39.tmx
+++ b/maps/001-2-39.tmx
@@ -491,15 +491,15 @@
  <objectgroup name="Object" opacity="0.87">
   <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="36"/>
+    <property name="dest_map" value="001-2-38"/>
+    <property name="dest_x" value="24"/>
     <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="24"/>
+    <property name="dest_map" value="001-2-37"/>
+    <property name="dest_x" value="36"/>
     <property name="dest_y" value="33"/>
    </properties>
   </object>
diff --git a/maps/001-2-4.tmx b/maps/001-2-4.tmx
index de072d5a..cf5522fc 100644
--- a/maps/001-2-4.tmx
+++ b/maps/001-2-4.tmx
@@ -402,7 +402,7 @@
    <properties>
     <property name="dest_map" value="001-2-6"/>
     <property name="dest_x" value="57"/>
-    <property name="dest_y" value="35"/>
+    <property name="dest_y" value="34"/>
    </properties>
   </object>
   <object id="3" name="To Library Warehouse" type="ani_warp" x="1664" y="864" width="32" height="32">
diff --git a/maps/001-2-6.tmx b/maps/001-2-6.tmx
index 0442eade..0401032e 100644
--- a/maps/001-2-6.tmx
+++ b/maps/001-2-6.tmx
@@ -451,7 +451,7 @@
    <properties>
     <property name="dest_map" value="001-2-4"/>
     <property name="dest_x" value="57"/>
-    <property name="dest_y" value="29"/>
+    <property name="dest_y" value="28"/>
    </properties>
   </object>
  </objectgroup>