From 0ee32524073669c9a65e330a410b186af1bd6e5d Mon Sep 17 00:00:00 2001
From: HoraK-FDF <HoraK-FDF@web.de>
Date: Fri, 3 Dec 2021 23:15:15 +0100
Subject: fixed fractional values in object coordinates and added collusion
 til… (#464)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fixed fractional values in object coordinates and added collusion tiles to switches

* map 099-2 added switch collusion tiles
---
 maps/099-1.tmx | 100 ++++++++++++++++++++++++++++-----------------------------
 maps/099-2.tmx |  12 +++----
 maps/099-3.tmx |  26 +++++++--------
 maps/099-6.tmx |  14 ++++----
 maps/099-7.tmx |   2 +-
 5 files changed, 77 insertions(+), 77 deletions(-)

diff --git a/maps/099-1.tmx b/maps/099-1.tmx
index 5b11676c..43ec1941 100644
--- a/maps/099-1.tmx
+++ b/maps/099-1.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.4" tiledversion="1.4.1" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="150" height="150" tilewidth="32" tileheight="32" infinite="0" nextlayerid="12" nextobjectid="81">
+<map version="1.5" tiledversion="1.7.0" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="150" height="150" tilewidth="32" tileheight="32" infinite="0" nextlayerid="12" nextobjectid="81">
  <properties>
   <property name="music" value="ominous3.ogg"/>
   <property name="name" value="Keshlam's Adventurer's Guild"/>
@@ -1252,7 +1252,7 @@
 </data>
  </layer>
  <objectgroup color="#00ff00" id="9" name="Objects">
-  <object id="1" name="To Room" type="warp" x="928" y="478.667" width="32" height="32">
+  <object id="1" name="To Room" type="warp" x="928" y="480" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-2"/>
     <property name="dest_tile_x" value="25"/>
@@ -1266,21 +1266,21 @@
     <property name="dest_tile_y" value="21"/>
    </properties>
   </object>
-  <object id="3" name="To Room" type="warp" x="3361.33" y="226.667" width="32" height="32">
+  <object id="3" name="To Room" type="warp" x="3360" y="224" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-2"/>
     <property name="dest_tile_x" value="90"/>
     <property name="dest_tile_y" value="21"/>
    </properties>
   </object>
-  <object id="4" name="To Room" type="warp" x="2912" y="4321.33" width="32" height="32">
+  <object id="4" name="To Room" type="warp" x="2912" y="4320" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-2"/>
     <property name="dest_tile_x" value="121"/>
     <property name="dest_tile_y" value="21"/>
    </properties>
   </object>
-  <object id="5" name="To Room" type="warp" x="640" y="3649.33" width="32" height="32">
+  <object id="5" name="To Room" type="warp" x="640" y="3648" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-2"/>
     <property name="dest_tile_x" value="25"/>
@@ -1294,28 +1294,28 @@
     <property name="dest_tile_y" value="49"/>
    </properties>
   </object>
-  <object id="10" name="To Room" type="warp" x="3806" y="3712" width="32" height="32">
+  <object id="10" name="To Room" type="warp" x="3808" y="3712" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-3"/>
     <property name="dest_tile_x" value="72"/>
     <property name="dest_tile_y" value="26"/>
    </properties>
   </object>
-  <object id="12" name="To Room" type="warp" x="3584" y="4001.33" width="32" height="32">
+  <object id="12" name="To Room" type="warp" x="3584" y="4000" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-2"/>
     <property name="dest_tile_x" value="91"/>
     <property name="dest_tile_y" value="49"/>
    </properties>
   </object>
-  <object id="13" name="To Room" type="warp" x="2048" y="3617.33" width="32" height="32">
+  <object id="13" name="To Room" type="warp" x="2048" y="3616" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-2"/>
     <property name="dest_tile_x" value="121"/>
     <property name="dest_tile_y" value="48"/>
    </properties>
   </object>
-  <object id="14" name="To Room" type="warp" x="2049.33" y="2274.67" width="32" height="32">
+  <object id="14" name="To Room" type="warp" x="2048" y="2272" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-2"/>
     <property name="dest_tile_x" value="25"/>
@@ -1329,84 +1329,84 @@
     <property name="dest_tile_y" value="75"/>
    </properties>
   </object>
-  <object id="16" name="To Room" type="warp" x="2944" y="1377.33" width="32" height="32">
+  <object id="16" name="To Room" type="warp" x="2944" y="1376" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-2"/>
     <property name="dest_tile_x" value="91"/>
     <property name="dest_tile_y" value="75"/>
    </properties>
   </object>
-  <object id="17" name="To Room" type="warp" x="480" y="2434.67" width="32" height="32">
+  <object id="17" name="To Room" type="warp" x="480" y="2432" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-2"/>
     <property name="dest_tile_x" value="121"/>
     <property name="dest_tile_y" value="75"/>
    </properties>
   </object>
-  <object id="18" name="To Room" type="warp" x="1345.33" y="3966.67" width="32" height="32">
+  <object id="18" name="To Room" type="warp" x="1344" y="3968" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-2"/>
     <property name="dest_tile_x" value="25"/>
     <property name="dest_tile_y" value="101"/>
    </properties>
   </object>
-  <object id="19" name="To Room" type="warp" x="3616" y="1923" width="32" height="32">
+  <object id="19" name="To Room" type="warp" x="3616" y="1920" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-2"/>
     <property name="dest_tile_x" value="60"/>
     <property name="dest_tile_y" value="101"/>
    </properties>
   </object>
-  <object id="21" name="To Room" type="warp" x="4192" y="2561.33" width="32" height="32">
+  <object id="21" name="To Room" type="warp" x="4192" y="2560" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-2"/>
     <property name="dest_tile_x" value="91"/>
     <property name="dest_tile_y" value="101"/>
    </properties>
   </object>
-  <object id="22" name="To Room" type="warp" x="2304" y="1825.33" width="32" height="32">
+  <object id="22" name="To Room" type="warp" x="2304" y="1824" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-2"/>
     <property name="dest_tile_x" value="121"/>
     <property name="dest_tile_y" value="101"/>
    </properties>
   </object>
-  <object id="23" name="To Room" type="warp" x="1504" y="2913.33" width="32" height="32">
+  <object id="23" name="To Room" type="warp" x="1504" y="2912" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-2"/>
     <property name="dest_tile_x" value="26"/>
     <property name="dest_tile_y" value="132"/>
    </properties>
   </object>
-  <object id="24" name="To Room" type="warp" x="3265.33" y="737.333" width="32" height="32">
+  <object id="24" name="To Room" type="warp" x="3264" y="736" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-2"/>
     <property name="dest_tile_x" value="60"/>
     <property name="dest_tile_y" value="132"/>
    </properties>
   </object>
-  <object id="25" name="To Room" type="warp" x="3838.67" y="1377.33" width="32" height="32">
+  <object id="25" name="To Room" type="warp" x="3840" y="1376" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-2"/>
     <property name="dest_tile_x" value="92"/>
     <property name="dest_tile_y" value="132"/>
    </properties>
   </object>
-  <object id="26" name="To Room" type="warp" x="3104" y="3329.33" width="32" height="32">
+  <object id="26" name="To Room" type="warp" x="3104" y="3328" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-2"/>
     <property name="dest_tile_x" value="121"/>
     <property name="dest_tile_y" value="132"/>
    </properties>
   </object>
-  <object id="28" name="To Room" type="warp" x="1534.67" y="480" width="32" height="32">
+  <object id="28" name="To Room" type="warp" x="1536" y="480" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-3"/>
     <property name="dest_tile_x" value="29"/>
     <property name="dest_tile_y" value="63"/>
    </properties>
   </object>
-  <object id="29" name="To Room" type="warp" x="2433.33" y="770.667" width="32" height="32">
+  <object id="29" name="To Room" type="warp" x="2432" y="768" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-3"/>
     <property name="dest_tile_x" value="35"/>
@@ -1427,14 +1427,14 @@
     <property name="dest_tile_y" value="63"/>
    </properties>
   </object>
-  <object id="32" name="To Room" type="warp" x="3841.33" y="2465.33" width="32" height="32">
+  <object id="32" name="To Room" type="warp" x="3840" y="2464" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-3"/>
     <property name="dest_tile_x" value="53"/>
     <property name="dest_tile_y" value="63"/>
    </properties>
   </object>
-  <object id="33" name="To Room" type="warp" x="3617.33" y="3072" width="32" height="32">
+  <object id="33" name="To Room" type="warp" x="3616" y="3072" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-3"/>
     <property name="dest_tile_x" value="59"/>
@@ -1448,21 +1448,21 @@
     <property name="dest_tile_y" value="63"/>
    </properties>
   </object>
-  <object id="35" name="To Room" type="warp" x="1920" y="2913.33" width="32" height="32">
+  <object id="35" name="To Room" type="warp" x="1920" y="2912" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-3"/>
     <property name="dest_tile_x" value="85"/>
     <property name="dest_tile_y" value="63"/>
    </properties>
   </object>
-  <object id="36" name="To Room" type="warp" x="640" y="1697.33" width="32" height="32">
+  <object id="36" name="To Room" type="warp" x="640" y="1696" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-3"/>
     <property name="dest_tile_x" value="91"/>
     <property name="dest_tile_y" value="63"/>
    </properties>
   </object>
-  <object id="38" name="To Room" type="warp" x="448" y="1790.67" width="32" height="32">
+  <object id="38" name="To Room" type="warp" x="448" y="1792" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-3"/>
     <property name="dest_tile_x" value="97"/>
@@ -1476,7 +1476,7 @@
     <property name="dest_tile_y" value="63"/>
    </properties>
   </object>
-  <object id="40" name="To Room" type="warp" x="609.333" y="2945.33" width="32" height="32">
+  <object id="40" name="To Room" type="warp" x="608" y="2944" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-3"/>
     <property name="dest_tile_x" value="109"/>
@@ -1490,7 +1490,7 @@
     <property name="dest_tile_y" value="63"/>
    </properties>
   </object>
-  <object id="52" name="To Room" type="warp" x="4094.67" y="1378.67" width="32" height="32">
+  <object id="52" name="To Room" type="warp" x="4096" y="1376" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-1"/>
     <property name="dest_tile_x" value="35"/>
@@ -1506,21 +1506,21 @@
     <property name="dest_tile_y" value="132"/>
    </properties>
   </object>
-  <object id="44" name="To Room" type="warp" x="1248" y="477.333" width="32" height="32">
+  <object id="44" name="To Room" type="warp" x="1248" y="480" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-1"/>
     <property name="dest_tile_x" value="35"/>
     <property name="dest_tile_y" value="30"/>
    </properties>
   </object>
-  <object id="45" name="To Room" type="warp" x="1856" y="481.333" width="32" height="32">
+  <object id="45" name="To Room" type="warp" x="1856" y="480" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-6"/>
     <property name="dest_tile_x" value="92"/>
     <property name="dest_tile_y" value="132"/>
    </properties>
   </object>
-  <object id="46" name="To Room" type="warp" x="2144" y="481.333" width="32" height="32">
+  <object id="46" name="To Room" type="warp" x="2144" y="480" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-1"/>
     <property name="dest_tile_x" value="35"/>
@@ -1534,42 +1534,42 @@
     <property name="dest_tile_y" value="21"/>
    </properties>
   </object>
-  <object id="48" name="To Room" type="warp" x="3105.33" y="224" width="32" height="32">
+  <object id="48" name="To Room" type="warp" x="3104" y="224" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-1"/>
     <property name="dest_tile_x" value="35"/>
     <property name="dest_tile_y" value="30"/>
    </properties>
   </object>
-  <object id="49" name="To Room" type="warp" x="3104" y="961.333" width="32" height="32">
+  <object id="49" name="To Room" type="warp" x="3104" y="960" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-6"/>
     <property name="dest_tile_x" value="26"/>
     <property name="dest_tile_y" value="132"/>
    </properties>
   </object>
-  <object id="50" name="To Room" type="warp" x="3328" y="961.333" width="32" height="32">
+  <object id="50" name="To Room" type="warp" x="3328" y="960" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-6"/>
     <property name="dest_tile_x" value="90"/>
     <property name="dest_tile_y" value="21"/>
    </properties>
   </object>
-  <object id="51" name="To Room" type="warp" x="3456" y="737.333" width="32" height="32">
+  <object id="51" name="To Room" type="warp" x="3456" y="736" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-6"/>
     <property name="dest_tile_x" value="121"/>
     <property name="dest_tile_y" value="101"/>
    </properties>
   </object>
-  <object id="54" name="To Room" type="warp" x="3168" y="1378.67" width="32" height="32">
+  <object id="54" name="To Room" type="warp" x="3168" y="1376" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-1"/>
     <property name="dest_tile_x" value="35"/>
     <property name="dest_tile_y" value="30"/>
    </properties>
   </object>
-  <object id="56" name="To Room" type="warp" x="2625.33" y="1377.33" width="32" height="32">
+  <object id="56" name="To Room" type="warp" x="2624" y="1376" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-6"/>
     <property name="dest_tile_x" value="91"/>
@@ -1611,28 +1611,28 @@
     <property name="dest_tile_y" value="101"/>
    </properties>
   </object>
-  <object id="63" name="To Room" type="warp" x="3360" y="1922" width="32" height="32">
+  <object id="63" name="To Room" type="warp" x="3360" y="1920" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-1"/>
     <property name="dest_tile_x" value="35"/>
     <property name="dest_tile_y" value="30"/>
    </properties>
   </object>
-  <object id="64" name="To Room" type="warp" x="1600" y="1601.33" width="32" height="32">
+  <object id="64" name="To Room" type="warp" x="1600" y="1600" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-1"/>
     <property name="dest_tile_x" value="35"/>
     <property name="dest_tile_y" value="30"/>
    </properties>
   </object>
-  <object id="65" name="To Room" type="warp" x="1088" y="1601.33" width="32" height="32">
+  <object id="65" name="To Room" type="warp" x="1088" y="1600" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-6"/>
     <property name="dest_tile_x" value="121"/>
     <property name="dest_tile_y" value="75"/>
    </properties>
   </object>
-  <object id="66" name="To Room" type="warp" x="862.667" y="1601.33" width="32" height="32">
+  <object id="66" name="To Room" type="warp" x="864" y="1600" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-6"/>
     <property name="dest_tile_x" value="91"/>
@@ -1646,63 +1646,63 @@
     <property name="dest_tile_y" value="75"/>
    </properties>
   </object>
-  <object id="68" name="To Room" type="warp" x="1278.67" y="3294.67" width="32" height="32">
+  <object id="68" name="To Room" type="warp" x="1280" y="3296" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-6"/>
     <property name="dest_tile_x" value="25"/>
     <property name="dest_tile_y" value="75"/>
    </properties>
   </object>
-  <object id="69" name="To Room" type="warp" x="928" y="3649.33" width="32" height="32">
+  <object id="69" name="To Room" type="warp" x="928" y="3648" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-1"/>
     <property name="dest_tile_x" value="35"/>
     <property name="dest_tile_y" value="30"/>
    </properties>
   </object>
-  <object id="70" name="To Room" type="warp" x="928" y="4321.33" width="32" height="32">
+  <object id="70" name="To Room" type="warp" x="928" y="4320" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-6"/>
     <property name="dest_tile_x" value="121"/>
     <property name="dest_tile_y" value="48"/>
    </properties>
   </object>
-  <object id="71" name="To Room" type="warp" x="1856" y="4094.67" width="32" height="32">
+  <object id="71" name="To Room" type="warp" x="1856" y="4096" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-6"/>
     <property name="dest_tile_x" value="91"/>
     <property name="dest_tile_y" value="49"/>
    </properties>
   </object>
-  <object id="72" name="To Room" type="warp" x="2688" y="3710.67" width="32" height="32">
+  <object id="72" name="To Room" type="warp" x="2688" y="3712" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-6"/>
     <property name="dest_tile_x" value="59"/>
     <property name="dest_tile_y" value="49"/>
    </properties>
   </object>
-  <object id="73" name="To Room" type="warp" x="4000" y="4001.33" width="32" height="32">
+  <object id="73" name="To Room" type="warp" x="4000" y="4000" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-1"/>
     <property name="dest_tile_x" value="35"/>
     <property name="dest_tile_y" value="30"/>
    </properties>
   </object>
-  <object id="74" name="To Room" type="warp" x="2654.67" y="3328" width="32" height="32">
+  <object id="74" name="To Room" type="warp" x="2656" y="3328" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-6"/>
     <property name="dest_tile_x" value="25"/>
     <property name="dest_tile_y" value="49"/>
    </properties>
   </object>
-  <object id="75" name="To Room" type="warp" x="2814.67" y="2784" width="32" height="32">
+  <object id="75" name="To Room" type="warp" x="2816" y="2784" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-1"/>
     <property name="dest_tile_x" value="35"/>
     <property name="dest_tile_y" value="30"/>
    </properties>
   </object>
-  <object id="76" name="To Room" type="warp" x="2528" y="2273.33" width="32" height="32">
+  <object id="76" name="To Room" type="warp" x="2528" y="2272" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-6"/>
     <property name="dest_tile_x" value="121"/>
diff --git a/maps/099-2.tmx b/maps/099-2.tmx
index 52deb571..6d9cec2a 100644
--- a/maps/099-2.tmx
+++ b/maps/099-2.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.4" tiledversion="1.4.1" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="150" height="150" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="21">
+<map version="1.5" tiledversion="1.7.0" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="150" height="150" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="21">
  <properties>
   <property name="music" value=""/>
   <property name="name" value="Keshlam's Adventurer's Guild Quarters"/>
@@ -1121,7 +1121,7 @@
 366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,366,366,0,0,0,366,366,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
 366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,366,366,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
 366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,366,366,366,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,366,366,0,0,0,366,366,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
-366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,366,366,0,0,0,366,366,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
+366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,366,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,366,366,0,0,0,366,366,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
 366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
 366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
 366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
@@ -1173,7 +1173,7 @@
 366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
 366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,366,366,0,0,366,366,366,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,366,366,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
 366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,366,366,366,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
-366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,366,366,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
+366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,366,366,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,366,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
 366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,366,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,366,366,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,366,366,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
 366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,366,366,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,366,366,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
 366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,366,366,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
@@ -1233,7 +1233,7 @@
 366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,366,366,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
 366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,366,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,366,366,0,0,366,366,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
 366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,366,0,0,0,0,0,366,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,366,366,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
-366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
+366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,366,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
 366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
 366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
 366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
@@ -1291,7 +1291,7 @@
     <property name="dest_tile_y" value="116"/>
    </properties>
   </object>
-  <object id="6" name="To Hallway" type="warp" x="1889" y="1600" width="32" height="32">
+  <object id="6" name="To Hallway" type="warp" x="1888" y="1600" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-1"/>
     <property name="dest_tile_x" value="97"/>
@@ -1368,7 +1368,7 @@
     <property name="dest_tile_y" value="59"/>
    </properties>
   </object>
-  <object id="17" name="To Hallway" type="warp" x="833" y="4256" width="32" height="32">
+  <object id="17" name="To Hallway" type="warp" x="832" y="4256" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-1"/>
     <property name="dest_tile_x" value="47"/>
diff --git a/maps/099-3.tmx b/maps/099-3.tmx
index 62c89750..3be2b3b5 100644
--- a/maps/099-3.tmx
+++ b/maps/099-3.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.4" tiledversion="1.4.1" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="150" height="130" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="28">
+<map version="1.5" tiledversion="1.7.0" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="150" height="130" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="28">
  <properties>
   <property name="music" value="ghoulish-fun.ogg"/>
   <property name="name" value="Keshlam's Adventurer's Guild Basement"/>
@@ -1057,7 +1057,7 @@
 1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,
 1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,
 1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,
-1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,
+1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,0,0,0,1710,0,0,1710,0,0,1710,0,0,1710,0,0,1710,0,0,1710,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,1710,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,0,0,1710,0,0,1710,0,0,1710,0,0,0,0,0,1710,0,0,1710,0,0,1710,0,0,1710,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,1710,0,0,1710,0,0,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,
 1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,0,0,0,1710,0,0,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,
 1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,0,0,0,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,0,0,0,0,0,1710,0,0,0,0,0,0,0,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,0,0,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,
 1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,
@@ -1128,7 +1128,7 @@
     <property name="dest_tile_y" value="115"/>
    </properties>
   </object>
-  <object id="2" name="To Hallway" type="warp" x="925.333" y="1948" width="32" height="32">
+  <object id="2" name="To Hallway" type="warp" x="928" y="1952" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-1"/>
     <property name="dest_tile_x" value="48"/>
@@ -1142,35 +1142,35 @@
     <property name="dest_tile_y" value="26"/>
    </properties>
   </object>
-  <object id="4" name="To Hallway" type="warp" x="1310.67" y="1950.67" width="32" height="32">
+  <object id="4" name="To Hallway" type="warp" x="1312" y="1952" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-1"/>
     <property name="dest_tile_x" value="128"/>
     <property name="dest_tile_y" value="18"/>
    </properties>
   </object>
-  <object id="5" name="To Hallway" type="warp" x="1505.33" y="1948" width="32" height="32">
+  <object id="5" name="To Hallway" type="warp" x="1504" y="1952" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-1"/>
     <property name="dest_tile_x" value="110"/>
     <property name="dest_tile_y" value="45"/>
    </properties>
   </object>
-  <object id="6" name="To Hallway" type="warp" x="1697.33" y="1949.33" width="32" height="32">
+  <object id="6" name="To Hallway" type="warp" x="1696" y="1952" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-1"/>
     <property name="dest_tile_x" value="120"/>
     <property name="dest_tile_y" value="79"/>
    </properties>
   </object>
-  <object id="7" name="To Hallway" type="warp" x="1889.33" y="1952" width="32" height="32">
+  <object id="7" name="To Hallway" type="warp" x="1888" y="1952" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-1"/>
     <property name="dest_tile_x" value="113"/>
     <property name="dest_tile_y" value="98"/>
    </properties>
   </object>
-  <object id="8" name="To Hallway" type="warp" x="2528" y="1950.67" width="32" height="32">
+  <object id="8" name="To Hallway" type="warp" x="2528" y="1952" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-1"/>
     <property name="dest_tile_x" value="125"/>
@@ -1184,35 +1184,35 @@
     <property name="dest_tile_y" value="93"/>
    </properties>
   </object>
-  <object id="10" name="To Hallway" type="warp" x="2913.33" y="1948" width="32" height="32">
+  <object id="10" name="To Hallway" type="warp" x="2912" y="1952" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-1"/>
     <property name="dest_tile_x" value="20"/>
     <property name="dest_tile_y" value="55"/>
    </properties>
   </object>
-  <object id="11" name="To Hallway" type="warp" x="3104" y="1953.33" width="32" height="32">
+  <object id="11" name="To Hallway" type="warp" x="3104" y="1952" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-1"/>
     <property name="dest_tile_x" value="14"/>
     <property name="dest_tile_y" value="55"/>
    </properties>
   </object>
-  <object id="12" name="To Hallway" type="warp" x="3294.67" y="1950.67" width="32" height="32">
+  <object id="12" name="To Hallway" type="warp" x="3296" y="1952" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-1"/>
     <property name="dest_tile_x" value="15"/>
     <property name="dest_tile_y" value="68"/>
    </properties>
   </object>
-  <object id="13" name="To Hallway" type="warp" x="3484" y="1952" width="32" height="32">
+  <object id="13" name="To Hallway" type="warp" x="3488" y="1952" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-1"/>
     <property name="dest_tile_x" value="19"/>
     <property name="dest_tile_y" value="94"/>
    </properties>
   </object>
-  <object id="14" name="To Hallway" type="warp" x="3678.67" y="1952" width="32" height="32">
+  <object id="14" name="To Hallway" type="warp" x="3680" y="1952" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-1"/>
     <property name="dest_tile_x" value="57"/>
diff --git a/maps/099-6.tmx b/maps/099-6.tmx
index 3551c538..f7e11b0c 100644
--- a/maps/099-6.tmx
+++ b/maps/099-6.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.4" tiledversion="1.4.1" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="150" height="150" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="26">
+<map version="1.5" tiledversion="1.7.0" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="150" height="150" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="26">
  <properties>
   <property name="music" value="ominous3.ogg"/>
   <property name="name" value="Keshlam's Adventurer's Guild Quarters"/>
@@ -1101,7 +1101,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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 id="8" name="Collision" width="150" height="150" visible="0" opacity="0.5">
+ <layer id="8" name="Collision" width="150" height="150" opacity="0.5">
   <data encoding="csv">
 366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
 366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
@@ -1120,8 +1120,8 @@
 366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,366,366,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,366,366,0,0,0,366,366,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
 366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,366,366,0,0,0,366,366,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
 366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,366,366,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
-366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,366,366,366,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,366,366,0,0,0,366,366,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
-366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,366,366,0,0,0,366,366,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
+366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,366,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,366,366,366,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,366,366,0,0,0,366,366,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
+366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,366,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,366,366,0,0,0,366,366,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
 366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
 366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
 366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
@@ -1174,7 +1174,7 @@
 366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,366,366,0,0,366,366,366,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,366,366,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
 366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,366,366,366,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
 366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,366,366,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
-366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,366,366,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,366,366,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
+366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,366,366,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,366,366,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,366,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
 366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,366,366,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,366,366,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
 366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,366,366,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
 366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
@@ -1198,7 +1198,7 @@
 366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,366,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,366,366,0,366,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,366,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
 366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
 366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,366,366,366,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,366,366,366,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,366,366,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
-366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,366,366,366,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,366,366,0,0,366,366,366,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,366,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
+366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,366,0,0,366,366,366,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,366,366,0,0,366,366,366,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,366,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
 366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,366,366,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
 366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,366,366,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
 366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,366,366,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,366,366,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,366,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
@@ -1233,7 +1233,7 @@
 366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,366,366,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
 366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,366,366,0,0,366,366,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
 366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,366,0,0,0,0,0,366,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,366,366,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
-366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
+366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,366,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
 366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
 366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,0,0,0,0,0,0,0,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
 366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,0,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,366,
diff --git a/maps/099-7.tmx b/maps/099-7.tmx
index 6f891aa5..9debae7b 100644
--- a/maps/099-7.tmx
+++ b/maps/099-7.tmx
@@ -1320,6 +1320,6 @@
   <object id="12" name="graphics/particles/lightning-map.xml" type="particle_effect" x="1304" y="3904" width="232" height="144"/>
   <object id="13" name="graphics/particles/lightning-map.xml" type="particle_effect" x="3448" y="3648" width="232" height="144"/>
   <object id="14" name="graphics/particles/lightning-map.xml" type="particle_effect" x="2360" y="672" width="232" height="144"/>
-  <object id="15" name="graphics/particles/firespot.particle.xml" type="particle_effect" x="2425.33" y="505.667" width="32" height="32"/>
+  <object id="15" name="graphics/particles/firespot.particle.xml" type="particle_effect" x="2425" y="506" width="32" height="32"/>
  </objectgroup>
 </map>
-- 
cgit v1.2.3-60-g2f50