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-2-1.tmx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'maps/000-2-1.tmx')

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">
-- 
cgit v1.2.3-70-g09d2


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(-)

(limited to 'maps/000-2-1.tmx')

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-70-g09d2