Merge branch 'jesusalva/inns' into 'master'

CURRENT_INN was entirely removed from sources - it is not possible to guess.

See merge request evol/clientdata!101

20 files changed, 79 insertions, 59 deletions

diff --git a/maps/001-2-1.tmx b/maps/001-2-1.tmx
index 73d5a8bd..ae26bd84 100644
--- a/maps/001-2-1.tmx
+++ b/maps/001-2-1.tmx
@@ -483,7 +483,7 @@
   </object>
   <object id="2" name="save" type="save" x="864" y="960" width="32" height="32">
    <properties>
-    <property name="inn" value="CURRENT_INN"/>
+    <property name="inn" value="NO_INN"/>
    </properties>
   </object>
   <object id="3" name="^NOBLE1?$" type="anchor" x="1184" y="1184" width="32" height="32"/>
diff --git a/maps/001-2-10.tmx b/maps/001-2-10.tmx
index 1af6e401..f4bf5357 100644
--- a/maps/001-2-10.tmx
+++ b/maps/001-2-10.tmx
@@ -490,7 +490,7 @@
   </object>
   <object id="3" name="save" type="save" x="832" y="960" width="32" height="32">
    <properties>
-    <property name="inn" value="CURRENT_INN"/>
+    <property name="inn" value="NO_INN"/>
    </properties>
   </object>
   <object id="4" name="^NOBLE2$" type="anchor" x="1280" y="1184" width="32" height="32"/>
diff --git a/maps/001-2-11.tmx b/maps/001-2-11.tmx
index 79efe03d..35bd6df6 100644
--- a/maps/001-2-11.tmx
+++ b/maps/001-2-11.tmx
@@ -513,7 +513,7 @@
   </object>
   <object id="2" name="save" type="save" x="832" y="992" width="32" height="32">
    <properties>
-    <property name="inn" value="CURRENT_INN"/>
+    <property name="inn" value="NO_INN"/>
    </properties>
   </object>
   <object id="3" name="^NOBLE3$" type="anchor" x="1440" y="1056" width="32" height="32"/>
diff --git a/maps/001-2-13.tmx b/maps/001-2-13.tmx
index 0dd78ba1..f18059e7 100644
--- a/maps/001-2-13.tmx
+++ b/maps/001-2-13.tmx
@@ -447,7 +447,7 @@
   </object>
   <object id="3" name="save" type="save" x="1312" y="992" width="32" height="32">
    <properties>
-    <property name="inn" value="CURRENT_INN"/>
+    <property name="inn" value="NO_INN"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/001-2-15.tmx b/maps/001-2-15.tmx
index d97f9900..5168f597 100644
--- a/maps/001-2-15.tmx
+++ b/maps/001-2-15.tmx
@@ -507,7 +507,7 @@
   </object>
   <object id="2" name="save" type="save" x="864" y="1312" width="32" height="32">
    <properties>
-    <property name="inn" value="CURRENT_INN"/>
+    <property name="inn" value="NO_INN"/>
    </properties>
   </object>
   <object id="4" name="^NOBLE5$" type="anchor" x="1088" y="1216" width="32" height="32"/>
diff --git a/maps/001-2-22.tmx b/maps/001-2-22.tmx
index 975ada9a..bad75f64 100644
--- a/maps/001-2-22.tmx
+++ b/maps/001-2-22.tmx
@@ -434,27 +434,27 @@
   </object>
   <object id="4" name="save" type="save" x="1280" y="1184" width="32" height="32">
    <properties>
-    <property name="inn" value="CURRENT_INN"/>
+    <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="CURRENT_INN"/>
+    <property name="inn" value="NO_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"/>
+    <property name="inn" value="NO_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"/>
+    <property name="inn" value="NO_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"/>
+    <property name="inn" value="NO_INN"/>
    </properties>
   </object>
   <object id="9" name="graphics/particles/warp.xml" type="particle_effect" x="2304" y="1088" width="32" height="32"/>
diff --git a/maps/001-2-29.tmx b/maps/001-2-29.tmx
index 48537df8..c698d6bf 100644
--- a/maps/001-2-29.tmx
+++ b/maps/001-2-29.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" tiledversion="1.0.2" orientation="orthogonal" renderorder="right-down" width="68" height="77" tilewidth="32" tileheight="32" backgroundcolor="#808080" nextobjectid="18">
+<map version="1.2" tiledversion="1.2.2" orientation="orthogonal" renderorder="right-down" width="68" height="77" tilewidth="32" tileheight="32" infinite="0" backgroundcolor="#808080" nextlayerid="9" nextobjectid="25">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
@@ -44,7 +44,7 @@
  <tileset firstgid="1145" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="96"/>
  </tileset>
- <layer name="Ground" width="68" height="77">
+ <layer id="1" name="Ground" width="68" height="77">
   <data encoding="csv">
 112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,
 112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,
@@ -125,7 +125,7 @@
 112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112
 </data>
  </layer>
- <layer name="Ground 2" width="68" height="77">
+ <layer id="2" name="Ground 2" width="68" height="77">
   <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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -206,7 +206,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Ground 3" width="68" height="77">
+ <layer id="3" name="Ground 3" width="68" height="77">
   <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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -287,7 +287,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Fringe" width="68" height="77">
+ <layer id="4" name="Fringe" width="68" height="77">
   <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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -368,7 +368,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Over" width="68" height="77">
+ <layer id="5" name="Over" width="68" height="77">
   <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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -449,7 +449,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Collision" width="68" height="77">
+ <layer id="6" name="Collision" width="68" height="77">
   <data encoding="csv">
 1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,
 1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,
@@ -530,7 +530,7 @@
 1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146,1146
 </data>
  </layer>
- <layer name="Heights" width="68" height="77">
+ <layer id="7" name="Heights" width="68" height="77">
   <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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -611,7 +611,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <objectgroup name="Object">
+ <objectgroup id="8" 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-2-28"/>
@@ -626,5 +626,25 @@
     <property name="dest_y" value="31"/>
    </properties>
   </object>
+  <object id="18" name="save" type="save" x="928" y="896" width="32" height="32">
+   <properties>
+    <property name="inn" value="REDPLUSH_INN"/>
+   </properties>
+  </object>
+  <object id="22" name="save" type="save" x="928" y="1120" width="32" height="32">
+   <properties>
+    <property name="inn" value="REDPLUSH_INN"/>
+   </properties>
+  </object>
+  <object id="23" name="save" type="save" x="928" y="1344" width="32" height="32">
+   <properties>
+    <property name="inn" value="REDPLUSH_INN"/>
+   </properties>
+  </object>
+  <object id="24" name="save" type="save" x="928" y="1568" width="32" height="32">
+   <properties>
+    <property name="inn" value="REDPLUSH_INN"/>
+   </properties>
+  </object>
  </objectgroup>
 </map>
diff --git a/maps/001-2-3.tmx b/maps/001-2-3.tmx
index e339df2f..e25f4e40 100644
--- a/maps/001-2-3.tmx
+++ b/maps/001-2-3.tmx
@@ -461,7 +461,7 @@
   </object>
   <object id="2" name="save" type="save" x="1344" y="1024" width="32" height="32">
    <properties>
-    <property name="inn" value="CURRENT_INN"/>
+    <property name="inn" value="NO_INN"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/001-2-37.tmx b/maps/001-2-37.tmx
index 9de2b525..13c888eb 100644
--- a/maps/001-2-37.tmx
+++ b/maps/001-2-37.tmx
@@ -511,22 +511,22 @@
   </object>
   <object id="26" name="save" type="save" x="800" y="1312" width="32" height="32">
    <properties>
-    <property name="inn" value="CURRENT_INN"/>
+    <property name="inn" value="NO_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"/>
+    <property name="inn" value="NO_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"/>
+    <property name="inn" value="NO_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"/>
+    <property name="inn" value="NO_INN"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/001-2-38.tmx b/maps/001-2-38.tmx
index 7f45d8e7..e29d085b 100644
--- a/maps/001-2-38.tmx
+++ b/maps/001-2-38.tmx
@@ -511,22 +511,22 @@
   </object>
   <object id="26" name="save" type="save" x="800" y="1312" width="32" height="32">
    <properties>
-    <property name="inn" value="CURRENT_INN"/>
+    <property name="inn" value="NO_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"/>
+    <property name="inn" value="NO_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"/>
+    <property name="inn" value="NO_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"/>
+    <property name="inn" value="NO_INN"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/008-2-0.tmx b/maps/008-2-0.tmx
index 49e89262..17d5ee7e 100644
--- a/maps/008-2-0.tmx
+++ b/maps/008-2-0.tmx
@@ -612,7 +612,7 @@
   </object>
   <object id="13" name="save" type="save" x="1184" y="864" width="64" height="32">
    <properties>
-    <property name="inn" value="CURRENT_INN"/>
+    <property name="inn" value="NO_INN"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/008-2-1.tmx b/maps/008-2-1.tmx
index cc9a3345..7dedc1ed 100644
--- a/maps/008-2-1.tmx
+++ b/maps/008-2-1.tmx
@@ -639,7 +639,7 @@
   </object>
   <object name="save" type="save" x="1344" y="864" width="32" height="32">
    <properties>
-    <property name="inn" value="CURRENT_INN"/>
+    <property name="inn" value="NO_INN"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/008-2-11.tmx b/maps/008-2-11.tmx
index 4dcd3f8c..8962ca81 100644
--- a/maps/008-2-11.tmx
+++ b/maps/008-2-11.tmx
@@ -481,12 +481,12 @@
  <objectgroup name="Objects" visible="0">
   <object id="24" name="save" type="save" x="800" y="864" width="64" height="32">
    <properties>
-    <property name="inn" value="CURRENT_INN"/>
+    <property name="inn" value="NO_INN"/>
    </properties>
   </object>
   <object id="25" name="save" type="save" x="1440" y="864" width="32" height="32">
    <properties>
-    <property name="inn" value="CURRENT_INN"/>
+    <property name="inn" value="NO_INN"/>
    </properties>
   </object>
   <object id="26" name="To Lobby" type="warp" x="1120" y="992" width="96" height="32">
diff --git a/maps/008-2-13.tmx b/maps/008-2-13.tmx
index ed9e0073..b376aff8 100644
--- a/maps/008-2-13.tmx
+++ b/maps/008-2-13.tmx
@@ -768,22 +768,22 @@
   </object>
   <object id="26" name="save" type="save" x="928" y="864" width="32" height="32">
    <properties>
-    <property name="inn" value="CURRENT_INN"/>
+    <property name="inn" value="NO_INN"/>
    </properties>
   </object>
   <object id="27" name="save" type="save" x="1024" y="864" width="32" height="32">
    <properties>
-    <property name="inn" value="CURRENT_INN"/>
+    <property name="inn" value="NO_INN"/>
    </properties>
   </object>
   <object id="29" name="save" type="save" x="928" y="992" width="32" height="32">
    <properties>
-    <property name="inn" value="CURRENT_INN"/>
+    <property name="inn" value="NO_INN"/>
    </properties>
   </object>
   <object id="30" name="save" type="save" x="1024" y="992" width="32" height="32">
    <properties>
-    <property name="inn" value="CURRENT_INN"/>
+    <property name="inn" value="NO_INN"/>
    </properties>
   </object>
   <object id="31" name="To Doctor's Office" type="warp" x="768" y="832" width="64" height="32">
diff --git a/maps/008-2-14.tmx b/maps/008-2-14.tmx
index d32c92a1..5b5e8d9e 100644
--- a/maps/008-2-14.tmx
+++ b/maps/008-2-14.tmx
@@ -764,7 +764,7 @@
  <objectgroup name="Objects">
   <object id="24" name="save" type="save" x="992" y="864" width="32" height="32">
    <properties>
-    <property name="inn" value="CURRENT_INN"/>
+    <property name="inn" value="NO_INN"/>
    </properties>
   </object>
   <object id="25" name="To Second Floor" type="warp" x="768" y="992" width="64" height="32">
diff --git a/maps/008-2-22.tmx b/maps/008-2-22.tmx
index c91a0c12..47713cd4 100644
--- a/maps/008-2-22.tmx
+++ b/maps/008-2-22.tmx
@@ -561,7 +561,7 @@
   </object>
   <object id="25" name="save" type="save" x="832" y="992" width="32" height="32">
    <properties>
-    <property name="inn" value="CURRENT_INN"/>
+    <property name="inn" value="NO_INN"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/008-2-3.tmx b/maps/008-2-3.tmx
index ba9f7b8d..dffd66c1 100644
--- a/maps/008-2-3.tmx
+++ b/maps/008-2-3.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" tiledversion="1.1.3" orientation="orthogonal" renderorder="right-down" width="91" height="59" tilewidth="32" tileheight="32" infinite="0" nextobjectid="33">
+<map version="1.2" tiledversion="1.2.2" orientation="orthogonal" renderorder="right-down" width="91" height="59" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="33">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
@@ -42,7 +42,7 @@
  <tileset firstgid="1502" name="hurns-indoor-accessory" tilewidth="32" tileheight="32" tilecount="128" columns="8">
   <image source="../graphics/tilesets/hurns-indoor-accessory.png" width="256" height="512"/>
  </tileset>
- <layer name="Ground1" width="91" height="59">
+ <layer id="1" name="Ground1" width="91" height="59">
   <data encoding="csv">
 121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,
 121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,
@@ -105,7 +105,7 @@
 121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121
 </data>
  </layer>
- <layer name="Ground2" width="91" height="59">
+ <layer id="2" name="Ground2" width="91" height="59">
   <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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -168,7 +168,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Ground3" width="91" height="59">
+ <layer id="3" name="Ground3" width="91" height="59">
   <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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -231,7 +231,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Fringe" width="91" height="59">
+ <layer id="4" name="Fringe" width="91" height="59">
   <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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -294,7 +294,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Over1" width="91" height="59">
+ <layer id="5" name="Over1" width="91" height="59">
   <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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -357,7 +357,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Over2" width="91" height="59">
+ <layer id="6" name="Over2" width="91" height="59">
   <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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -420,7 +420,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Collision" width="91" height="59" visible="0">
+ <layer id="7" name="Collision" width="91" height="59" visible="0">
   <data encoding="csv">
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
@@ -483,7 +483,7 @@
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
 </data>
  </layer>
- <layer name="Heights" width="91" height="59" visible="0">
+ <layer id="8" name="Heights" width="91" height="59" visible="0">
   <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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -546,7 +546,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <objectgroup name="Objects" visible="0">
+ <objectgroup id="9" name="Objects">
   <object id="24" name="To Downstairs" type="warp" x="2112" y="928" width="64" height="32">
    <properties>
     <property name="dest_map" value="008-2-2"/>
@@ -556,42 +556,42 @@
   </object>
   <object id="25" name="save" type="save" x="1952" y="992" width="32" height="32">
    <properties>
-    <property name="inn" value="CURRENT_INN"/>
+    <property name="inn" value="RUSTYPICK_INN"/>
    </properties>
   </object>
   <object id="26" name="save" type="save" x="1920" y="1120" width="32" height="32">
    <properties>
-    <property name="inn" value="CURRENT_INN"/>
+    <property name="inn" value="RUSTYPICK_INN"/>
    </properties>
   </object>
   <object id="27" name="save" type="save" x="1824" y="992" width="32" height="32">
    <properties>
-    <property name="inn" value="CURRENT_INN"/>
+    <property name="inn" value="RUSTYPICK_INN"/>
    </properties>
   </object>
   <object id="28" name="save" type="save" x="1824" y="1120" width="32" height="32">
    <properties>
-    <property name="inn" value="CURRENT_INN"/>
+    <property name="inn" value="RUSTYPICK_INN"/>
    </properties>
   </object>
   <object id="29" name="save" type="save" x="1696" y="1120" width="32" height="32">
    <properties>
-    <property name="inn" value="CURRENT_INN"/>
+    <property name="inn" value="RUSTYPICK_INN"/>
    </properties>
   </object>
   <object id="30" name="save" type="save" x="1696" y="992" width="32" height="32">
    <properties>
-    <property name="inn" value="CURRENT_INN"/>
+    <property name="inn" value="RUSTYPICK_INN"/>
    </properties>
   </object>
   <object id="31" name="save" type="save" x="1568" y="992" width="32" height="32">
    <properties>
-    <property name="inn" value="CURRENT_INN"/>
+    <property name="inn" value="RUSTYPICK_INN"/>
    </properties>
   </object>
   <object id="32" name="save" type="save" x="1568" y="1120" width="32" height="32">
    <properties>
-    <property name="inn" value="CURRENT_INN"/>
+    <property name="inn" value="RUSTYPICK_INN"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/008-2-4.tmx b/maps/008-2-4.tmx
index e480a43f..58296268 100644
--- a/maps/008-2-4.tmx
+++ b/maps/008-2-4.tmx
@@ -496,7 +496,7 @@
   </object>
   <object id="25" name="save" type="save" x="800" y="864" width="32" height="32">
    <properties>
-    <property name="inn" value="CURRENT_INN"/>
+    <property name="inn" value="NO_INN"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/008-2-7.tmx b/maps/008-2-7.tmx
index 2ec51a0f..349def53 100644
--- a/maps/008-2-7.tmx
+++ b/maps/008-2-7.tmx
@@ -470,7 +470,7 @@
  <objectgroup name="Objects">
   <object id="24" name="save" type="save" x="800" y="864" width="32" height="32">
    <properties>
-    <property name="inn" value="CURRENT_INN"/>
+    <property name="inn" value="NO_INN"/>
    </properties>
   </object>
   <object id="25" name="To Outdoors" type="warp" x="1152" y="960" width="32" height="32">
diff --git a/maps/008-2-9.tmx b/maps/008-2-9.tmx
index 8d160ba7..86eeffab 100644
--- a/maps/008-2-9.tmx
+++ b/maps/008-2-9.tmx
@@ -561,7 +561,7 @@
   </object>
   <object id="25" name="save" type="save" x="832" y="992" width="32" height="32">
    <properties>
-    <property name="inn" value="CURRENT_INN"/>
+    <property name="inn" value="NO_INN"/>
    </properties>
   </object>
  </objectgroup>