diff --git a/AndorsTrail/res/raw/conversationlist_erinith.json b/AndorsTrail/res/raw/conversationlist_erinith.json
index dfe8c375c..97b57e964 100644
--- a/AndorsTrail/res/raw/conversationlist_erinith.json
+++ b/AndorsTrail/res/raw/conversationlist_erinith.json
@@ -340,7 +340,7 @@
     },
     {
         "id":"erinith_needspotions_5",
-        "message":"I have heard that the potion makers these days have potions of major health, and not just the regular potions of health.",
+        "message":"I have heard that the potion makers these days have major potions of health, and not just the regular potions of health.",
         "replies":[
             {
                 "text":"N",
diff --git a/AndorsTrail/res/raw/conversationlist_mikhail.json b/AndorsTrail/res/raw/conversationlist_mikhail.json
index c79da307a..f512a5f76 100644
--- a/AndorsTrail/res/raw/conversationlist_mikhail.json
+++ b/AndorsTrail/res/raw/conversationlist_mikhail.json
@@ -523,7 +523,7 @@
     },
     {
         "id":"mikhail_rats_start",
-        "message":"I saw some rats out back in our garden earlier. Could you please go kill any rats that you see out there.",
+        "message":"I saw some rats out back in our garden earlier. Could you please go kill any rats that you see out there?",
         "replies":[
             {
                 "text":"I have already dealt with the rats.",
diff --git a/AndorsTrail/res/raw/conversationlist_next_release.json b/AndorsTrail/res/raw/conversationlist_next_release.json
index ea0f41d0c..64eae8c01 100644
--- a/AndorsTrail/res/raw/conversationlist_next_release.json
+++ b/AndorsTrail/res/raw/conversationlist_next_release.json
@@ -8,5 +8,9 @@
                 "nextPhraseID":"crossglen_valentina_andor_40"
             }
         ]
+    },
+    {
+        "id":"ratdom_maze_rat2_key2",
+        "message":"No trespassing."
     }
 ]
\ No newline at end of file
diff --git a/AndorsTrail/res/raw/itemlist_fungi_panic.json b/AndorsTrail/res/raw/itemlist_fungi_panic.json
index d87811214..5eb6c3e68 100644
--- a/AndorsTrail/res/raw/itemlist_fungi_panic.json
+++ b/AndorsTrail/res/raw/itemlist_fungi_panic.json
@@ -215,7 +215,7 @@
         "iconID":"items_japozero:484",
         "name":"Especially sweet red berries",
         "hasManualPrice":1,
-        "baseMarketCost":22,
+        "baseMarketCost":210,
         "category":"food",
         "useEffect":{
             "conditionsSource":[
diff --git a/AndorsTrail/res/raw/itemlist_omi2.json b/AndorsTrail/res/raw/itemlist_omi2.json
index 124f0bc31..a1d6a4ff9 100644
--- a/AndorsTrail/res/raw/itemlist_omi2.json
+++ b/AndorsTrail/res/raw/itemlist_omi2.json
@@ -758,7 +758,7 @@
                 "max":5
             },
             "increaseMaxHP":12,
-            "increaseMaxAP":2,
+            "increaseMaxAP":1,
             "increaseMoveCost":-1,
             "increaseAttackCost":7,
             "increaseAttackChance":14,
diff --git a/AndorsTrail/res/raw/monsterlist_v070_lodarnpcs.json b/AndorsTrail/res/raw/monsterlist_v070_lodarnpcs.json
index 70de82ca0..d9ef87a24 100644
--- a/AndorsTrail/res/raw/monsterlist_v070_lodarnpcs.json
+++ b/AndorsTrail/res/raw/monsterlist_v070_lodarnpcs.json
@@ -28,6 +28,7 @@
         "iconID":"monsters_rltiles3:14",
         "maxHP":212,
         "unique":1,
+        "monsterClass":"humanoid",
         "attackDamage":{
             "min":1,
             "max":11
@@ -48,6 +49,7 @@
         "iconID":"monsters_rltiles3:14",
         "maxHP":212,
         "unique":1,
+        "monsterClass":"humanoid",
         "attackDamage":{
             "min":1,
             "max":11
diff --git a/AndorsTrail/res/raw/monsterlist_v070_npcs.json b/AndorsTrail/res/raw/monsterlist_v070_npcs.json
index df3a9268a..a4e26614c 100644
--- a/AndorsTrail/res/raw/monsterlist_v070_npcs.json
+++ b/AndorsTrail/res/raw/monsterlist_v070_npcs.json
@@ -27,6 +27,7 @@
         "maxAP":10,
         "moveCost":5,
         "unique":1,
+        "monsterClass":"humanoid",
         "attackDamage":{
             "min":0,
             "max":9
@@ -207,6 +208,7 @@
         "name":"Highwayman",
         "iconID":"monsters_men:8",
         "maxHP":154,
+        "monsterClass":"humanoid",
         "attackDamage":{
             "min":2,
             "max":7
diff --git a/AndorsTrail/res/raw/questlist_fungi_panic.json b/AndorsTrail/res/raw/questlist_fungi_panic.json
index 9d76a2534..db914752b 100644
--- a/AndorsTrail/res/raw/questlist_fungi_panic.json
+++ b/AndorsTrail/res/raw/questlist_fungi_panic.json
@@ -248,12 +248,12 @@
             },
             {
                 "progress":110,
-                "logText":"I braved the elements and my fear of heights and walked out onto the very edge of the Sullengard ravine and looked straight down to the ravine's bottom.",
+                "logText":"Overcoming fears: I braved the elements and my fear of heights and walked out onto the very edge of the Sullengard ravine and looked straight down to the ravine's bottom.",
                 "rewardExperience":300
             },
             {
                 "progress":120,
-                "logText":"Thrown out of my first tavern. I was told to leave the Sullengard tavern and at such a young age too. Am I starting down the wrong path?",
+                "logText":"Thrown out of my first tavern: I was told to leave the Sullengard tavern and at such a young age too. Am I starting down the wrong path?",
                 "rewardExperience":200
             },
             {
diff --git a/AndorsTrail/res/raw/questlist_v0610.json b/AndorsTrail/res/raw/questlist_v0610.json
index eed084ea7..ad58c9258 100644
--- a/AndorsTrail/res/raw/questlist_v0610.json
+++ b/AndorsTrail/res/raw/questlist_v0610.json
@@ -116,7 +116,7 @@
             },
             {
                 "progress":60,
-                "logText":"I have attacked at least one of Tinlyn's lost sheep and is therefore unable to return them all to Tinlyn.",
+                "logText":"I have attacked at least one of Tinlyn's lost sheep and I am therefore unable to return them all to Tinlyn.",
                 "finishesQuest":1
             }
         ]
diff --git a/AndorsTrail/res/xml/arulircave1.tmx b/AndorsTrail/res/xml/arulircave1.tmx
index e6fd28e32..ca5e6eb4f 100644
--- a/AndorsTrail/res/xml/arulircave1.tmx
+++ b/AndorsTrail/res/xml/arulircave1.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.2" tiledversion="1.3.0" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="25" height="30" tilewidth="32" tileheight="32" infinite="0" nextlayerid="12" nextobjectid="33">
+<map version="1.8" tiledversion="1.8.4" orientation="orthogonal" renderorder="right-down" width="25" height="30" tilewidth="32" tileheight="32" infinite="0" nextlayerid="12" nextobjectid="33">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
@@ -185,37 +185,37 @@
  </tileset>
  <layer id="1" name="Ground" width="25" height="30">
   <data encoding="base64" compression="zlib">
-   eAG9ld1NBDEMhE/AC09AC7RDaeyVAJQAiAp4owR64CiBH3+6HTEaJbs5kDjJsuPYM7aTzU3Hm800KLcVd1fyMMtj6ZfTvdyHf1fr93l/FF/Y4JLvGPC8mV/7XwdwbCvWsYWxiZ/84r842fc4VX4KM0Hc/1xrcl00C/r4aOzBQbzjYGsmzPwm9h0f2znOCs952FM8uJKcCecIj/qCX3no5BDPZ+1xFooVPjoxiGndF+Wida/QcCC+jz3NAn7rXDM+19SbPD4zceSMEqe3Bl/n2uJhZshUAkcPp+fnLISvGPG8znM7r7khcCCKW9KKpSY4WrHica08dCtHPo9rcTxV7Yp1fGzPla1YtHxov8PZBxziYU88zM0xlmzunb+FziF8cfhdu446exzg572Gw7Fl46d29bHGwWxa+LvyU6twpfH7nHpnoV7AZjZZv3C4t1dHPzz4tTfSQ692x5FND7LR9LfGse3U7jh8u76WnXPqnQUcymlpcPT95neeHFPFtmSEg7+/y8b7OjInOEc46IOf95k99Oakvjw3bWpNH+tDOaZ5jokFTp6BYpJDGGt6GzWDI8zUzrE2J+f9T46lulTHX/sY4Ri9tz4nbNW4xuH4vCNL8b/l0PsknRzfFQwkJg==
+   eJy9ltENwjAMRBHw0y9gBdZhNMoItCMUxAT8MUJ3oBmBlkTEkjk5jlMJKp2E0nIPxxeXerVY1EY1Xq3XJerq9ag+6mB98HLxvtW/he9zj6AnWydNBYwTeJPwGoC/W6cZTRRfuwsMXsdLuBcYg7InQWe4pzE262+OY5+1Pekih+pqMwzijLEXEgM9iIN54SIG5+Az3F/yyGkSONgbLTcWf+qrxBmjiFHqz3OD+9ZHzjYqlRlJPBsu8Qyvh6RlU/JPMW5VmoPnA1l8nWdYYhCHZ7qfMa8ow07wJwbP2rHAH3PnwJsU1vvKzmgS/vRb0R/3KTdzpVmOuT0sv/2RodWQO/PYC6wvx7Cc+VFhPwy9yJ354EPnF8+5tRcWRrj2wny1ZtZah/RutewTSWNMCruEkWJJs7a0F7l9S81aZFhr+DfDkpF/MObM2hIG/m/4BQPfe/j8GxUMJCY=
   </data>
  </layer>
  <layer id="2" name="Objects" width="25" height="30">
   <data encoding="base64" compression="zlib">
-   eAGtlc2LjlEYxg9jtvMaMpoiX/+D7DX+AFbKZqxFCfnayEcWlijZShm7SYlZeUcYs2KhjJWNMDYKMQnXb55zNXd3z/NKuet+z3nPOfd13R/n3E9/rJT+AL2xuZR5aZZ9q5uVWWyH8m4ps3VteX8APtx3W/DBRMG5urGUa9JHdc3rZs0c+Pw8aYzB9l9HGoQjq0qJalyPO9bIjxBDV0583rH/WldKb32zul8cYBxXHHs1H6v5213HBcWGuhY5J4vCygKexXifdO6EOKK4VksbmlU4cgzOd7TrmsM7UTnGq/8++7n6mfGdk2Gdp46Wg9Xeduwjjm2bcm/Zrjm1eCEO4s058rnluirv+b68ld1oxffZN/LlumKB52jYsx+RwzFg63wbp2uN9ZfKFzzUJsZjW3MYHz+RubXNGH9PCee09Iz0Sa0/OTmsePEJnls1nlejK5bmwG4oxMkJ8zEHP8qcOMDfKfx3mr+XfpBGHuqC3tGbm6lv2T6C5VzZ9yuJgzjuKeY94niq+aHhUj4GHjDcA7i78DxMXPChYFuxs9yX3WNxEMOiFNEzLM80P9dr+stF5Q0f/QYjF3zmbMMHD44DNQb+n1f9KAEcyDHh8/6RyOG5+9a8uGKO/Da5H9TjbOXAfwsc1OmC8IkDMa7H/CabU02PZe4+wXxJuZoQD/5/UZ9cEP4PKTHclvqeGJuxDZ++hd/cgU3CaxN4wT+p/SnV/lL1n7MPlIvI4XtsHPdy/48j+eA+Ifb/cvWBGCw3B3D4TXKWfo4Qy676tuhT36TfpeTHAneULg7j/xS2v0fR7nft2XHNvYm+hbgWXRzTLdj0IktPfsOTfWafPPH2EGox1ZGrfsUbCTX2t41cbRHH1pAffxfN6W9WjoHau+b+JuAL75g+hLi/uA81qyu/+E+u6ItIG0fsXZyhT1JXahrfBXvIZOrNYMd30cZBLLl3gfU6YJEP3t3fpK0W8Z3EvIHl3kuPJI/ul4zE2iZdMUQe18Y1wC/3So8zWov9LHL9C4ft2myyHz7L2HY+xpBz1WVjDvZ9b5kj/5sj42eOP0+kP9Q=
+   eJy1Vr9rFEEUntzetTlvl+wSMKjxfxB7Of8ArxJstBYFUfESG4mKRcoYENsjYNIFQZJUXkTzo9JCMFbXBDVpBA0xSPR9znve29mZPSH4weMmOzPf937MvEk3NaZbYk/GjNkkc9Gq2N9VrIuK86uRmh9gCx5+cMLAM5MZ85jsZZT//lfL4/OGYzoG2f992P59fShvLk5X8xqhnLixH8bG1BM7vjhkOW5RHBdonHL+zvHvVmQtlJOd2KOT9sfCt0vrbmf5dVKrgxGO3xOD5PVfAN0ma4xW8nNf2U+XX3JSq9g6Cq5U8vtq6lwBp6r9teNVW4u3sY3Xd26AP3VNiuelR/sajr8f6ftsZnVuqDnxY8ETA5A6PKFvwLvU6qA2Oh6BaAh/j3Oxfqy4tk1rJsgmyV5zjpCTa4nVh06H43nfKGpgX+T42VNnq+2cgfXU8p8h/m0afyL7nOZ1xtmekcYK64iPOi/i+7SjgTiekw/nSeMNja/WjPmidADpATi70Fl2tCYU97RH4wXtexXbGHY4b7jqazS+V7fcDzLro+4lorWsNH38onGJYwCmqH4N1gBuZvb+A6FeK71K8+szjHrcZQ3dqta4Tvc5Dp9GqG/JuWupc3FAuWom1v9vdJ+2aP+P1MYwl/XPySB+9C3w4wwcT4raogv+OzQ/T7V/qPrX0lj5W+G+BRrIh9RC/H/EPswpjaclGpr7kO8JYjnLdwt9ao9sn/m1tkZIQ/h/xv33SOPXSPGb9KZZjkFqEdJY9HDvqjtfT62O6zOAPM2wDmoxH9DoMt+wqrG8bcjVCVp7UuVH3kXRlDfLjSGXK7V/m/sDIP1F+pAL+I9cdUo0dO8C0Lv2uKYtT1+/7PTmjnMvfBq+3gV8UFzIRzNwTzR8tSj7v6qteiTyqHvmZOD+hGLwaUgNlpx+qXvmUTXK9rh+/E8NYND9PqqG7y7q9b8BT6Q/1A==
   </data>
  </layer>
  <layer id="3" name="Objects_replace" width="25" height="30">
   <data encoding="base64" compression="zlib">
-   eAFjYBgFwzkEBJiGs+9Gnt8qmWnrZ1qbT1vXj5o+GgKjITCSQkBktH4bSdE96ldoCAAAl+YBIQ==
+   eJxjYBgFwxkIMA20C0YBNUEl89A2fxSMglEwCqgFREbrt1EwAgEAl+YBIQ==
   </data>
  </layer>
  <layer id="4" name="Above" width="25" height="30">
   <data encoding="base64" compression="zlib">
-   eAGlVT0vREEUHUQjClYiIRF/wS/Q6DVqGg2JTiGIWtSqjVK10UuWbiWC7Ui28Q/EL6BxT/bd7NmbM+89b2/yzNe555yZuTt6yym111J6C1/fxrl4shyP3oz3xtt3woC/jI8zP4q81vRolvUw+9saraF3uJTSXYnfcXRKkS+ux/Gm8Z/aV3cP53YmSmNnKiV8KraN/8o+FX4mcQ06MZRuxKgx8rbozBmT02eM9/nefQ7tfbgzXkM/5n2KvQG3Unhsh7OCx2ehgToaiHlwIXxvg8XhmP92SAM49thdYGS+j7w94skjx/nLcLwWffEa+vuZO4243Bj8VTV1PKEG+Ks0cv7qziuNPtUF9tkkOA/1AZ1dum/W4Pp5sPfqscabBX7UMP82oXFhGl/kH97dy3cx3zNc1buIHPiaJ8/g8vv4KbgOinWfBwZRpuF+eN/DrKFXnj8x/ut/arh354wtez2aTenS+G8LDdZGntpHFT/yXuydehVvle8dGA+lwR4dp1r1O1a5k2go3XhOwDTRWLcaU6HOCTilof7fMeec3e2G0FHnlNNgvtiH19WifuJaU424/xwP9HJrOKtOyXsS885Evfp+ItbnoVGmk8vzfLS+V4Xtmn/XyOmoPOZH3zGqbm+CBnTi++j5zgtf8Z0GRvEjp4kGcqp8uB/X+ANH85E1
+   eJylVT1LBDEQjXfYiIVuYEHh8C/4C2yut7HWxkbBzkL0sBZrq8XS6rAXVrs9EPW6PbjGfyD+Am1MMOFmc2/ysfsgcJfMvDdJXmarXIhiIMSHM6ZqcJjki99VH8fUJKYI8FHMTF7Ww3oav1nz/6kU4jGSH/GFsKf4L2X8HkZ9rHGw8j8Q9hX/rcRrM6beETj71L3RvGEPr3H6CDUT+5TheS7vk/HVlqmxcM5K1/gKNLSP5h5tu7f55vLaWDbjaI3lBs/p8h8x9+qCO7sQvy/vmLnTFP6Qp847akwiNLoCaUyJL1I8TkHzaqNxSO6batB7ela95CWin2h+7eGh0w+vlcZXthyr8W3mqzzcF61/1h2P2rP6MVwnsjlv4dOw9SB/ur69UPx3iRoh71Oes1UhbhT/g8Q1IY0Qv8ab6lPvoFchPyGNWN+jd4xyu2ggoP230dhh1rl3hzTQ945iTd3tLuDjaot5HxS61m2ml7fVcPfvO0efxtjTT9y8K885+jR8OjEes3tFseVgocHpxGjYGOTbe0cjxsclUwfXF9po6JyU96Tj/wBH85E1
   </data>
  </layer>
  <layer id="5" name="Above_replace" width="25" height="30">
   <data encoding="base64" compression="zlib">
-   eAFjYBgFoyFA2xBIYmJg2CZEWzsuizEwHKOxHZeAdvQL09Yf+EwH2Z0MDEtaAVqbTyt3j5o7GgKjITAaAqMhMBoCIyUEAOsSBoY=
+   eJxjYBgFo4C2IImJgWGbEG3tuCzGwHCMxnZcAtrRL0xbO/ABkN3JTEPX/FEwCkbBKBgFo2AUUAYA6xIGhg==
   </data>
  </layer>
  <layer id="6" name="Top" width="25" height="30">
   <data encoding="base64" compression="zlib">
-   eAFjYBgFoyEwGgKjITAaAqMhMBoCgzkEHosNZtfhd9tlOrj9MB3suEQHO/CH5KjsaAgwMAAAxM0DpA==
+   eJxjYBgFo2AUjIJRMApGwWAGj8UG2gXkg8t0cPthOthxaQjHwSgYPgAAxM0DpA==
   </data>
  </layer>
  <layer id="7" name="Walkable" width="25" height="30" visible="0">
   <data encoding="base64" compression="zlib">
-   eAHNj4sJw0AMQzNF918hGxZBHwjhi88hgRqCf9Lz5fwcx/nCd/ziDTZMnaC+k3ljl59iOydv+m5Sd5zcq5/wpc2o/NIw95qZc3zmtd/x+aS+YvAuNBMuWrw7Gc8kO1e+DGdpd9X7Luvk0lc6zTJSt+rdd6Wpbsi78kznsPI99FNepeeGdgR1pZ/OnImXmTKzO7niwKx20xvJwp9sdOx3s3Oo5SV2OZUORpXR5475TpZXuircn3vfdXXl7WYdM/fJ817aKpLR9RVDM/elxneTesXJufoJ17V4YWq3CvdNavE6PTc73Wr/TzdWb9yZ7/zHDudK88SNL96apvA=
+   eJzdk8ENwCAMA5mi+6/Ahn1VqhA2ITn6aKQ+oOCLDfSrtX7ge+qE9ptB9LgqStv9pzzs9kEwxrNwaxyfzkP1WGHsFNG/01yNMz5Wme16i+xRjGyGUUb1LijGqEvqj1pUVjMdlRmRv+JmGbOiztdpqzXVuznTqTJUNmqOyMlldIJRzSmiQ/hw7yLiMcOIeP0DI6tP7P+KcQP0lKh+
   </data>
  </layer>
  <objectgroup id="8" name="Mapevents" visible="0">
diff --git a/AndorsTrail/res/xml/blackwater_mountain70.tmx b/AndorsTrail/res/xml/blackwater_mountain70.tmx
index 450734cba..25f85853a 100644
--- a/AndorsTrail/res/xml/blackwater_mountain70.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain70.tmx
@@ -1,332 +1,331 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "https://mapeditor.org/dtd/1.0/map.dtd">
-<map version="1.0" orientation="orthogonal" width="10" height="30" tilewidth="32" tileheight="32">
- <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
+<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="10" height="30" tilewidth="32" tileheight="32" infinite="0" nextlayerid="14" nextobjectid="29">
+ <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="385" name="map_bridge_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="385" name="map_bridge_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_bridge_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="513" name="map_broken_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="513" name="map_broken_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="641" name="map_cavewall_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="641" name="map_cavewall_1" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="749" name="map_cavewall_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="749" name="map_cavewall_2" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="857" name="map_cavewall_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="857" name="map_cavewall_3" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="965" name="map_cavewall_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="965" name="map_cavewall_4" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_4.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="1073" name="map_chair_table_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1073" name="map_chair_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1201" name="map_chair_table_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="1201" name="map_chair_table_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_chair_table_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1329" name="map_crate_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1329" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1457" name="map_cupboard_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1457" name="map_cupboard_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1585" name="map_curtain_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1585" name="map_curtain_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1713" name="map_entrance_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1713" name="map_entrance_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1841" name="map_entrance_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="1841" name="map_entrance_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_entrance_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1969" name="map_fence_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1969" name="map_fence_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2097" name="map_fence_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="2097" name="map_fence_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2225" name="map_fence_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="2225" name="map_fence_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2353" name="map_fence_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="2353" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2481" name="map_ground_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="2481" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2609" name="map_ground_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="2609" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2737" name="map_ground_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="2737" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2865" name="map_ground_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="2865" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2993" name="map_ground_5" tilewidth="32" tileheight="32">
+ <tileset firstgid="2993" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3121" name="map_ground_6" tilewidth="32" tileheight="32">
+ <tileset firstgid="3121" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3249" name="map_ground_7" tilewidth="32" tileheight="32">
+ <tileset firstgid="3249" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3377" name="map_ground_8" tilewidth="32" tileheight="32">
+ <tileset firstgid="3377" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3505" name="map_house_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="3505" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_house_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3633" name="map_house_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="3633" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_house_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3761" name="map_indoor_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="3761" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3889" name="map_indoor_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="3889" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_indoor_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4017" name="map_kitchen_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4017" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4145" name="map_outdoor_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4145" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4273" name="map_pillar_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4273" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4401" name="map_pillar_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="4401" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_pillar_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4529" name="map_plant_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4529" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4657" name="map_plant_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="4657" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_plant_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4785" name="map_rock_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4785" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4913" name="map_rock_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="4913" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_rock_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5041" name="map_roof_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5041" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5169" name="map_roof_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="5169" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5297" name="map_roof_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="5297" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5425" name="map_shop_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5425" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5553" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5553" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5681" name="map_table_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5681" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5809" name="map_trail_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5809" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5937" name="map_transition_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5937" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6065" name="map_transition_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="6065" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6193" name="map_transition_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="6193" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6321" name="map_transition_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="6321" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6449" name="map_transition_6" tilewidth="32" tileheight="32">
+ <tileset firstgid="6449" name="map_transition_6" tilewidth="32" tileheight="32" tilecount="144" columns="18">
   <image source="../drawable/map_transition_6.png" width="576" height="256"/>
  </tileset>
- <tileset firstgid="6593" name="map_tree_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="6593" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6721" name="map_tree_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="6721" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_tree_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6849" name="map_wall_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="6849" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6977" name="map_wall_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="6977" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7097" name="map_wall_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="7097" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7217" name="map_wall_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="7217" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_4.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7337" name="map_window_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="7337" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7465" name="map_window_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="7465" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <layer name="Base" width="10" height="30">
+ <layer id="1" name="Base" width="10" height="30">
   <data encoding="base64" compression="zlib">
    eJxjYKAf2MxJR8uGANg4Gh6jYIiBdUwDaz8A0p8CJw==
   </data>
  </layer>
- <layer name="Ground" width="10" height="30">
+ <layer id="2" name="Ground" width="10" height="30">
   <data encoding="base64" compression="zlib">
    eJzNkssNwjAQRC0kDmkgVEJz1EILNkIUQFqI04IvdMARW8kqo9GuY6QccnjKR8/2eHfjybmYmTKPTDBIC9PyfTcQT9vj0zt3vczvA8Deq1u9CPiKlwD2Avx7ditvyjEY3qjkkLXoFTiHrGWv8O3np5yZDA/zBiUfMxr3QLhvmqPV8Uge9q/mYf9qdUHP6i97tf7iPPiG/srdrXOR0OD5jbr8O1fFu533mT/O2Or9AHVB2mY=
   </data>
  </layer>
- <layer name="Objects" width="10" height="30">
+ <layer id="3" name="Objects" width="10" height="30">
   <data encoding="base64" compression="zlib">
    eJx9k79OwzAQxk9ZMiBB7ZREGWABHgEegY2ZmefgFXgUWFn6APnDxlCEYAKpKh2gKqICJAR3ck4+Xxw+6VTX/vl8n30B6OvGABwVAMdFf+1UjGc5wFzEJPdrl4kfr3H+AeOwcFEJjvVkAVbWrV1j1LkbZynAGGM7Dfm14C7wrD1c38c4SPu5G2QaZG6t2/fZ1RMTcVP032AsyrDWJA850hcy36X3qNV2HDGUc2l8DWcjt4e8sypcfzNhjlcT1jFO/Lla+m6JkWytcieZ+13ZcH4pOKrPZqHfmO7Fnvcyzm5s+Zxcn66J9dsx09znqgZYFjGt6XvQehR1DZ1Pmqu12UDfLJRP3Q/Pog+0Yj25g953O//kg33XoheoFulX9w3pfOTyax+sHzH/sen79D/RO99FGH6jE/Hts1/5FtxrfCf0vzXhHb6o/rnq2D9B53PF
   </data>
  </layer>
- <layer name="Objects_1" width="10" height="30">
+ <layer id="4" name="Objects_1" width="10" height="30">
   <data encoding="base64" compression="zlib">
    eJxjYBgFxAImMcJqHokyMAgRoe4HUI0SEeqwgT+CxKn7RaS6UTAKiAXHBjhNAQC7GgVt
   </data>
  </layer>
- <layer name="Above" width="10" height="30">
+ <layer id="5" name="Above" width="10" height="30">
   <data encoding="base64" compression="zlib">
-   eJxjYECAw2IMBEE4EF9CUpcizsDgAsShQBwmjqr2CZK6o0IMDC+A/JdA7IamDsMOIYS6cnYGhgogrmTHVJcqBKHTgOragfIdQNyJRR0y+CWJXx4GXhKp7hWSusdMxOnBBmB6Qfa+ImB3KhNEDSG1l4Swi8/G4k5i7CVFLTXNIsW8M0SqIwV8whGOyACb+0hNDzcF8ZsHA9jijxAgNvywAWxxRA3zYplQxdABchp/BI0DAAj2M4o=
+   eJxjYECAw2IMBEE4EF9CUpcizsDgAsShQBwmjqr2CZK6o0IMDC+A/JdA7IamDsMOIYS6cnYGhgogrmTHVJcqBKHTgOragfIdQNyJRR0y+CWJXx4GXhKp7hWSusdMxOnBBmB6Qfa+IsJukBpCai8JYRefjcWdxNpLrFpqmkWKeWeIVEcK+IQjHJEBNveRmh5uCuI3DwawxR8hQGz4YQPY4oga5sUyoYqhA+Q0/ggaBwDVdjMj
   </data>
  </layer>
- <layer name="Top" width="10" height="30">
+ <layer id="6" name="Top" width="10" height="30">
   <data encoding="base64" compression="zlib">
    eJxjYKAMbBViYNgmBGGHCuFXe4yAPDlgNhMDwxwgfiVJfbNHAfWBEv9Au2AUDGUAAIJTBT4=
   </data>
  </layer>
- <layer name="Walkable" width="10" height="30" visible="0">
+ <layer id="7" name="Walkable" width="10" height="30" visible="0">
   <data encoding="base64" compression="zlib">
    eJzbKMbAsJGGGAaorZZabkIGuNRiY5OjDhcgpJaQ+cSYR2z4YrOXkBuJCRtsbsZnLy69+NQRYx6x4UaK+8iNB1zq8ZkJk8OlB586fPYS6w9S1OGyl5hwxhV2AAQAkuw=
   </data>
  </layer>
- <layer name="Walkable_2" width="10" height="30" visible="0">
+ <layer id="8" name="Walkable_2" width="10" height="30" visible="0">
   <data encoding="base64" compression="zlib">
    eJzbKMbAsJGGGAaorZZabkIGuNRiY5OjDhcgpJaQ+cSYR2z4YrOXkBuJCRtsbsZnLy69+NQRYx6x4UaK+8iNB1zq8ZkJk8OlB586fPYS6w9S1OGyl5hwxhV2AAQAkuw=
   </data>
  </layer>
- <layer name="Walkable_1" width="10" height="30" visible="0">
+ <layer id="9" name="Walkable_1" width="10" height="30" visible="0">
   <data encoding="base64" compression="zlib">
    eJzbKMbAsJFEjAyorQ6fWnLVUcNMmFpkmhJ1yPYRMg+bHnIwsl5c9qOLE+NOYsOb2urwxR8ufcSqIyVeqIkpdTeyODHhR0q6IlYdPneg68fGx2cHACgUobE=
   </data>
  </layer>
- <objectgroup name="Mapevents" visible="0">
-  <object name="south" type="mapchange" x="64" y="928" width="64" height="32">
+ <objectgroup id="10" name="Mapevents" visible="0">
+  <object id="1" name="south" type="mapchange" x="64" y="928" width="64" height="32">
    <properties>
     <property name="map" value="blackwater_mountain14"/>
     <property name="place" value="north2"/>
    </properties>
   </object>
-  <object name="bwm17_vine_selector" type="script" x="224" y="800" width="96" height="32">
+  <object id="2" name="bwm17_vine_selector" type="script" x="224" y="800" width="96" height="32">
    <properties>
     <property name="when" value="enter"/>
    </properties>
   </object>
-  <object name="bwm17_heights_1" type="script" x="32" y="896" width="128" height="32">
+  <object id="3" name="bwm17_heights_1" type="script" x="32" y="896" width="128" height="32">
    <properties>
     <property name="when" value="enter"/>
    </properties>
   </object>
-  <object name="bwm17_heights2_1" type="script" x="256" y="480" width="32" height="96">
+  <object id="4" name="bwm17_heights2_1" type="script" x="256" y="480" width="32" height="96">
    <properties>
     <property name="when" value="enter"/>
    </properties>
   </object>
-  <object name="bwm17_heights2_1" type="script" x="128" y="192" width="96" height="32">
+  <object id="5" name="bwm17_heights2_1" type="script" x="128" y="192" width="96" height="32">
    <properties>
     <property name="when" value="enter"/>
    </properties>
   </object>
-  <object name="bwm17_heights_1" type="script" x="160" y="256" width="32" height="32">
+  <object id="6" name="bwm17_heights_1" type="script" x="160" y="256" width="32" height="32">
    <properties>
     <property name="when" value="enter"/>
    </properties>
   </object>
-  <object name="hole" type="mapchange" x="288" y="320" width="32" height="32">
+  <object id="7" name="hole" type="mapchange" x="288" y="320" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain71"/>
     <property name="place" value="up"/>
    </properties>
   </object>
-  <object name="east" type="mapchange" x="288" y="512" width="32" height="32">
+  <object id="8" name="east" type="mapchange" x="288" y="512" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain15"/>
     <property name="place" value="west"/>
    </properties>
   </object>
-  <object name="bwm70_sign" type="script" x="128" y="288" width="32" height="32">
+  <object id="9" name="bwm70_sign" type="script" x="128" y="288" width="32" height="32">
    <properties>
     <property name="when" value="enter"/>
    </properties>
   </object>
-  <object name="bwm17_heights2_1" type="script" x="256" y="736" width="32" height="96">
+  <object id="10" name="bwm17_heights2_1" type="script" x="256" y="736" width="32" height="96">
    <properties>
     <property name="when" value="enter"/>
    </properties>
   </object>
-  <object name="east2" type="mapchange" x="288" y="704" width="32" height="96">
+  <object id="11" name="east2" type="mapchange" x="288" y="704" width="32" height="96">
    <properties>
     <property name="map" value="blackwater_mountain15"/>
     <property name="place" value="west2"/>
    </properties>
   </object>
-  <object name="bwm70_corpse" type="script" x="224" y="512" width="32" height="32">
+  <object id="12" name="bwm70_corpse" type="script" x="224" y="512" width="32" height="32">
    <properties>
     <property name="when" value="enter"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" visible="0">
-  <object name="forestboar2" type="spawn" x="64" y="576" width="96" height="256">
+ <objectgroup id="11" name="Spawn" visible="0">
+  <object id="13" name="forestboar2" type="spawn" x="64" y="576" width="96" height="256">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="forestboar4"/>
    </properties>
   </object>
-  <object name="gornaud_2" type="spawn" x="128" y="64" width="128" height="128">
+  <object id="14" name="gornaud_2" type="spawn" x="128" y="64" width="128" height="128">
    <properties>
     <property name="spawngroup" value="gornaud_2"/>
    </properties>
   </object>
-  <object name="gornaud_1" type="spawn" x="192" y="416" width="96" height="128">
+  <object id="15" name="gornaud_1" type="spawn" x="192" y="416" width="96" height="128">
    <properties>
     <property name="spawngroup" value="gornaud_2"/>
    </properties>
   </object>
-  <object name="forestboar1" type="spawn" x="32" y="288" width="96" height="160">
+  <object id="16" name="forestboar1" type="spawn" x="32" y="288" width="96" height="160">
    <properties>
     <property name="spawngroup" value="forestboar4"/>
    </properties>
   </object>
-  <object name="primwolf2" type="spawn" x="64" y="224" width="32" height="64">
+  <object id="17" name="primwolf2" type="spawn" x="64" y="224" width="32" height="64">
    <properties>
     <property name="spawngroup" value="primwolf2"/>
    </properties>
   </object>
-  <object name="bwm17_worker" type="spawn" x="128" y="288" width="32" height="32">
+  <object id="18" name="bwm17_worker" type="spawn" x="128" y="288" width="32" height="32">
    <properties>
     <property name="spawngroup" value="bwm17_worker"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys" visible="0">
-  <object name="bwm17_hole" type="key" x="288" y="320" width="32" height="32">
+ <objectgroup id="12" name="Keys" visible="0">
+  <object id="19" name="bwm17_hole" type="key" x="288" y="320" width="32" height="32">
    <properties>
     <property name="phrase" value="bwm17_vine2_1"/>
     <property name="requireId" value="bwm17_vine"/>
@@ -334,7 +333,7 @@
     <property name="requireValue" value="2"/>
    </properties>
   </object>
-  <object name="bwm17_questenabled" type="key" x="160" y="256" width="32" height="64">
+  <object id="20" name="bwm17_questenabled" type="key" x="160" y="256" width="32" height="64">
    <properties>
     <property name="phrase" value="bwm17_questenabled"/>
     <property name="requireId" value="bwm17_vine"/>
@@ -343,8 +342,8 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Replace" visible="0">
-  <object name="bwm17_questenabled2" type="replace" x="256" y="832" width="32" height="32">
+ <objectgroup id="13" name="Replace" visible="0">
+  <object id="21" name="bwm17_questenabled2" type="replace" x="256" y="832" width="32" height="32">
    <properties>
     <property name="Objects" value="Objects_1"/>
     <property name="requireId" value="bwm17_vine"/>
@@ -352,17 +351,17 @@
     <property name="requireValue" value="3"/>
    </properties>
   </object>
-  <object name="bwm17_vine:2" type="replace" x="288" y="320" width="32" height="64">
+  <object id="22" name="bwm17_vine:2" type="replace" x="288" y="320" width="32" height="64">
    <properties>
     <property name="Objects" value="Objects_1"/>
    </properties>
   </object>
-  <object name="bwm17_vine:1" type="replace" x="256" y="832" width="32" height="32">
+  <object id="23" name="bwm17_vine:1" type="replace" x="256" y="832" width="32" height="32">
    <properties>
     <property name="Objects" value="Above"/>
    </properties>
   </object>
-  <object name="bwm17_heights:1" type="replace" x="32" y="0" width="256" height="960">
+  <object id="24" name="bwm17_heights:1" type="replace" x="32" y="0" width="256" height="960">
    <properties>
     <property name="Walkable" value="Walkable_2"/>
     <property name="requireId" value="bwm17_heights"/>
@@ -370,7 +369,7 @@
     <property name="requireValue" value="1"/>
    </properties>
   </object>
-  <object name="bwm17_heights:2" type="replace" x="32" y="0" width="256" height="960">
+  <object id="25" name="bwm17_heights:2" type="replace" x="32" y="0" width="256" height="960">
    <properties>
     <property name="Walkable" value="Walkable_1"/>
     <property name="requireId" value="bwm17_heights"/>
@@ -379,7 +378,7 @@
     <property name="requireValue" value="1"/>
    </properties>
   </object>
-  <object name="bwm17_heights:2" type="replace" x="288" y="384" width="32" height="256">
+  <object id="26" name="bwm17_heights:2" type="replace" x="288" y="384" width="32" height="256">
    <properties>
     <property name="Walkable" value="Walkable_1"/>
     <property name="requireId" value="bwm17_heights"/>
@@ -388,7 +387,7 @@
     <property name="requireValue" value="1"/>
    </properties>
   </object>
-  <object name="bwm17_heights:1" type="replace" x="288" y="384" width="32" height="256">
+  <object id="27" name="bwm17_heights:1" type="replace" x="288" y="384" width="32" height="256">
    <properties>
     <property name="Walkable" value="Walkable_2"/>
     <property name="requireId" value="bwm17_heights"/>
@@ -396,7 +395,7 @@
     <property name="requireValue" value="1"/>
    </properties>
   </object>
-  <object name="bwm17_questenabled1" type="replace" x="128" y="224" width="64" height="96">
+  <object id="28" name="bwm17_questenabled1" type="replace" x="128" y="224" width="64" height="96">
    <properties>
     <property name="Objects" value="Objects_1"/>
     <property name="requireId" value="bwm17_vine"/>
diff --git a/AndorsTrail/res/xml/crossglen_cave.tmx b/AndorsTrail/res/xml/crossglen_cave.tmx
index a11ed8921..0bbced188 100644
--- a/AndorsTrail/res/xml/crossglen_cave.tmx
+++ b/AndorsTrail/res/xml/crossglen_cave.tmx
@@ -256,7 +256,7 @@
     <property name="spawngroup" value="crossglen_caverat2"/>
    </properties>
   </object>
-  <object id="5" name="crossglen_caveboss" type="spawn" x="64" y="129" width="34" height="32">
+  <object id="5" name="crossglen_caveboss" type="spawn" x="64" y="128" width="32" height="32">
    <properties>
     <property name="spawngroup" value="crossglen_caveboss"/>
    </properties>
@@ -296,7 +296,7 @@
   <object id="9" name="ratdom_nondisplay_3" type="replace" x="0" y="32" width="64" height="160">
    <properties>
     <property name="Above" value="Top0"/>
-    <property name="Ground" value="ratdom_ground"/>
+    <property name="Ground" value="ratdom_Ground"/>
     <property name="Walkable" value="ratdom_Walkable"/>
     <property name="requireId" value="ratdom_nondisplay"/>
     <property name="requireType" value="questProgress"/>
diff --git a/AndorsTrail/res/xml/mountainlake12.tmx b/AndorsTrail/res/xml/mountainlake12.tmx
index 95b344668..36dbae3ca 100644
--- a/AndorsTrail/res/xml/mountainlake12.tmx
+++ b/AndorsTrail/res/xml/mountainlake12.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="2017.05.26" orientation="orthogonal" renderorder="right-down" width="29" height="22" tilewidth="32" tileheight="32" nextobjectid="6">
+<map version="1.8" tiledversion="1.8.4" orientation="orthogonal" renderorder="right-down" width="29" height="22" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="6">
  <properties>
   <property name="outdoors" value="1"/>
  </properties>
@@ -183,27 +183,27 @@
  <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <layer name="Ground" width="29" height="22">
+ <layer id="1" name="Ground" width="29" height="22">
   <data encoding="base64" compression="zlib">
    eJztkzEKwCAMRcWt97+H0BvUrXO9Qg9SpRRCiCaa1MnhTcp/xHyDdy5M5JjoKcTM9WM+9hRS5jZ2wXzsKezbi4UvEvnYA7GYLTXyLZ1wNqlr1Dk6m9RZ6+DIbC0n1XHcQUnuiag5qb/EdVDiqzmjp/9SL5QPe2EnNDvqcVp0Qur9zjXvqNmpNtPCyd3nslo75bIWCwkPqB7iFw==
   </data>
  </layer>
- <layer name="Objects" width="29" height="22">
+ <layer id="2" name="Objects" width="29" height="22">
   <data encoding="base64" compression="zlib">
    eJztVM1KxDAQLr1VUMgeCgGfUd9AX2hvPoKHCisI9lC6Pe/StIfelvXmjM2Q6Tjp2nrx4ECYkkm+b36+tDLJaitt+H623+NPyl7sfs3y2PnvakFuhKXl8RvjeS3JJ0svn6H+lCtyvvf4V+BruH8A/56Pe3M5z81pF6kP41jPYxp4Gtjr7ejXWGxOhzTEB8jnepMkN5spXy/ucp1pvYzNbeu5XpU7DvY6O3ri5Tix/OsZjVBthOPMyN2a6R7OwSl1LjGsjXrRipyOML9WLJePubgfcN4JbWdeF6jDN/GOsU/I18Pawzr71cB6yac9nXsHDx5/b0Mfa6vrgvN95AGjgO/O1+oic7pNAz4a4SKvxtd4nRQKH9qJ1SoNZzSwuX/5CL4T/mim9UgrFM6t8k+qGC/HH4x+jurReDlnJvqIRm+G9Cj/U1KXfE6xPnJOPtNaweO4paJLjs91q3F2HkvmLnVOuJ2Ik044lhYnOzE8efZ84byMy5h2X9qSs//29+0TLuniMA==
   </data>
  </layer>
- <layer name="Above" width="29" height="22">
+ <layer id="3" name="Above" width="29" height="22">
   <data encoding="base64" compression="zlib">
    eJxjYBj+4LIY/e05TAM7sfkDZs8tSQaGm5LUtwubP6hpD7J9l4B4jySEpqV9uPy2hwb+gtkH8xO633ABct2CL942U8F/+NIgyG+wdHiLQrsI5SVc4UiuvchxBDOfFukcl330AMjhSI20QAyghh/p5dZRMApGCgAA1AAoLg==
   </data>
  </layer>
- <layer name="Walkable" width="29" height="22" visible="0">
+ <layer id="4" name="Walkable" width="29" height="22">
   <data encoding="base64" compression="zlib">
-   eJzbKMbAsHEUj+JBhEGA3nahA1rah24PLe0mBVDbTlx8bG6jhZ8JhQe5ZuBLR7R0E6nuw6aGlLjHB0iNe5gYPj4xgFh3EuN+bGYSkic3bPDJE6OfHvlmFA8MHggAAP0TfoQ=
+   eJzbKMbAsHEUj+JBhEGA3nahA1rah24PLe0mBVDbTlx8bG6jhX/JkSfkZkLpiBzzyAkHcv1AStzjA6TGPUwMH58YQKw7iXE/NjMJyZMbNvjkidFP63wzigcODwQAAPrVfb0=
   </data>
  </layer>
- <objectgroup name="Mapevents">
+ <objectgroup id="5" name="Mapevents">
   <object id="1" name="east" type="mapchange" x="896" y="288" width="32" height="224">
    <properties>
     <property name="map" value="mountainlake11"/>
@@ -217,7 +217,7 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn">
+ <objectgroup id="6" name="Spawn">
   <object id="3" name="mwolf_2" type="spawn" x="288" y="480" width="32" height="32">
    <properties>
     <property name="spawngroup" value="mwolf_2"/>
@@ -229,7 +229,7 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn2">
+ <objectgroup id="7" name="Spawn2">
   <object id="5" name="mwolf_1" type="spawn" x="64" y="160" width="800" height="416">
    <properties>
     <property name="quantity" value="5"/>
@@ -237,5 +237,5 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys"/>
+ <objectgroup id="8" name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/sullengard_west_ravine.tmx b/AndorsTrail/res/xml/sullengard_west_ravine.tmx
index 5a8b1868d..65f767c63 100644
--- a/AndorsTrail/res/xml/sullengard_west_ravine.tmx
+++ b/AndorsTrail/res/xml/sullengard_west_ravine.tmx
@@ -1,327 +1,326 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "https://mapeditor.org/dtd/1.0/map.dtd">
-<map version="1.0" orientation="orthogonal" width="30" height="26" tilewidth="32" tileheight="32">
+<map version="1.8" tiledversion="1.8.4" orientation="orthogonal" renderorder="right-down" width="30" height="26" tilewidth="32" tileheight="32" infinite="0" nextlayerid="11" nextobjectid="19">
  <properties>
   <property name="outdoors" value="1"/>
  </properties>
- <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="385" name="map_bridge_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="385" name="map_bridge_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_bridge_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="513" name="map_broken_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="513" name="map_broken_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="641" name="map_cavewall_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="641" name="map_cavewall_1" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="749" name="map_cavewall_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="749" name="map_cavewall_2" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="857" name="map_cavewall_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="857" name="map_cavewall_3" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="965" name="map_cavewall_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="965" name="map_cavewall_4" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_4.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="1073" name="map_chair_table_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1073" name="map_chair_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1201" name="map_chair_table_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="1201" name="map_chair_table_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_chair_table_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1329" name="map_crate_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1329" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1457" name="map_cupboard_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1457" name="map_cupboard_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1585" name="map_curtain_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1585" name="map_curtain_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1713" name="map_entrance_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1713" name="map_entrance_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1841" name="map_entrance_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="1841" name="map_entrance_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_entrance_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1969" name="map_fence_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1969" name="map_fence_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2097" name="map_fence_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="2097" name="map_fence_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2225" name="map_fence_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="2225" name="map_fence_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2353" name="map_fence_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="2353" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2481" name="map_ground_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="2481" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2609" name="map_ground_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="2609" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2737" name="map_ground_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="2737" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2865" name="map_ground_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="2865" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2993" name="map_ground_5" tilewidth="32" tileheight="32">
+ <tileset firstgid="2993" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3121" name="map_ground_6" tilewidth="32" tileheight="32">
+ <tileset firstgid="3121" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3249" name="map_ground_7" tilewidth="32" tileheight="32">
+ <tileset firstgid="3249" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3377" name="map_ground_8" tilewidth="32" tileheight="32">
+ <tileset firstgid="3377" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3505" name="map_house_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="3505" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_house_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3633" name="map_house_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="3633" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_house_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3761" name="map_indoor_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="3761" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3889" name="map_indoor_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="3889" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_indoor_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4017" name="map_kitchen_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4017" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4145" name="map_outdoor_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4145" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4273" name="map_pillar_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4273" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4401" name="map_pillar_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="4401" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_pillar_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4529" name="map_plant_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4529" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4657" name="map_plant_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="4657" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_plant_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4785" name="map_rock_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4785" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4913" name="map_rock_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="4913" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_rock_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5041" name="map_roof_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5041" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5169" name="map_roof_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="5169" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5297" name="map_roof_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="5297" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5425" name="map_shop_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5425" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5553" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5553" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5681" name="map_table_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5681" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5809" name="map_trail_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5809" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5937" name="map_transition_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5937" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6065" name="map_transition_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="6065" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6193" name="map_transition_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="6193" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6321" name="map_transition_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="6321" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6449" name="map_transition_5" tilewidth="32" tileheight="32">
+ <tileset firstgid="6449" name="map_transition_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6577" name="map_tree_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="6577" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6705" name="map_tree_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="6705" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_tree_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6833" name="map_wall_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="6833" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6961" name="map_wall_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="6961" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7081" name="map_wall_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="7081" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7201" name="map_wall_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="7201" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_4.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7321" name="map_window_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="7321" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7577" name="map_tree_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="7577" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
- <layer name="Ground" width="30" height="26">
+ <layer id="1" name="Ground" width="30" height="26">
   <data encoding="base64" compression="zlib">
    eJzt1T0OgCAMBWDD5rG9hGdwNWxwBbiCZ1GHJk1TfiytE8PbyPugED3XZTlnZmbECc6m93DlxCfJ0A1MtifZwMVGYpIVXXAi6bdya5aFi72SpeXSWWZDl7s32ov7/arj1josXbC5+Y247zrfcbdS9yJJyOxxuXO0XNxfSs97hrWcC+fpsb66+LuL3a+W1OVm8Ld7uLE9SN3RWWib8H9v7cHCpNmZ3MdBQ9I=
   </data>
  </layer>
- <layer name="Breadcrumb" width="30" height="26" visible="0">
+ <layer id="2" name="Breadcrumb" width="30" height="26" visible="0">
   <data encoding="base64" compression="zlib">
    eJxjYKA9UOSijhnomFb24rOHkJnEuo1UfdjcRGp44DIXBqS4IBiXPKV2kWsvNQE2c6kRjuTaSyuALb/Q2o8we+kJ6OEnXPbS276R4M+BtHOk+BVm70DaPWrvqL20sBdbe40eaR1XHUuoHqZXWJHajsUFAAwWDy4=
   </data>
  </layer>
- <layer name="Objects" width="30" height="26">
+ <layer id="3" name="Objects" width="30" height="26">
   <data encoding="base64" compression="zlib">
    eJyNVj1v1EAUPG1Hhx0pORRd/gD8AKipETqlSBqEkoboJHqExN8IfwH4AZYlSkp0RdB9JYqEcJGglJRUePAbefz87nIjrdZer9+8Gb/d9XI0GKzqdlG3H9IvbRzg9Z+8abP6ei5zeL+uB/CexkF/lbWtypseuJA8MFZYDA99n/OrvJt7YXwY55yZ5Maxsm7jes7woM/DeOWozU85NDah97i+zNp3TvLm3r8DMK/CtKuHisgT7zs4VKPyaVzoWmT93JGnn+s98fVCXatRX1/hfPPPvY++vgqLqfpus+a7sX7mzjfGiPzCe9So8H5p3cytxoijvcHg8bDvA+aUbg3MJNY472rcPejWMfq/FjtqT4atp1wDY6urbaDri9fQcmwtwtfU9L/yRtPnun0J6pTXfi/QNaqc1ML46zBJ7b4R1aT6rdyl1crRXt8/gt/0THKY2PX71NZVtIb8WkCshdVmxIW4J07ru9T4Sj7gQYprdxnUpupTvonjWWbx/fPUHYvWoe4lm7xUDVPTxfgvXT6Hcg9PuMeWopk+ei7Epr5KvEP+09SN/1r8rdyaXzhP+F2f1Ro/unyhA7Gp71Sev7BnjOe9jriU79LOQfB+Si03NB5KLSqg6VVqfSb+n4NZm98j63+69yvbA9G/qXmfCve33e48rwljUxc/gnLyuzIe/fDcqi/CVOYw/vWave866+4Vep7wTCH3udP+VniQq/fvPvg9sbD9SPfAhzsNN0DtH1LDdbvlfg78Dub6velK5qjnqj3ykWP5zuYc9L9Lz16/V4L7TPiBc8khwt2G76vAP1x0PkT/pSvLh7kwB58HOW4c19zO7gjft/x2WPfqA3CfF/o/Hf2/Iyd9Dvh7zt0fbt/+AXPuegA=
   </data>
  </layer>
- <layer name="Above" width="30" height="26">
+ <layer id="4" name="Above" width="30" height="26">
   <data encoding="base64" compression="zlib">
    eJy1lk1OwzAQhSMWiCUUkZ0LV+UYcIAq1whp1G5rAlyHWvGoj9dnO2nDSJbzM+NvZjIeZ++qpLRuHB9RZ5PRRRvT3x3nvbA1nW0cPXCaqOcFy9YznWCDDObzfSv8UjZBzC/z2+5NvIiLbdEGY0Qe6jS0FvvFPmAspouxtfTOZCP0OH71HTEnrdP+mNhz07E1ptQQ+8CzT3CxXjG+hnzdipyY/tNaszlWtD/MiOsrk2e+DnEO7q/NwZ1q77MefXo7jndRT7i/cE4xeX0lgdnVp9yqGsB8I5tjT62vpIvcXvjNNTaIei6xugJX1e4usafnsEpc3ofcL0u8FKvEtW9lPWko5JN5l3JRUv1F5XIJbq6fpdZbMt4c9/thOa6vz8+aKT5cw/XxOeY311Pncn0hl3wehb2M/xGpnqe4JZYSPqenSop185i3w/8uPHu5V/6n3K31nuIzyXx5vb+c1cPZreRWvPtx47hWzH/8vjYHn/A96wcxXRxT6wT9V/+dHB/f23nP8/Oqql5W57xfM7cdYw==
   </data>
  </layer>
- <layer name="Top" width="30" height="26">
+ <layer id="5" name="Top" width="30" height="26">
   <data encoding="base64" compression="zlib">
    eJxjYMAPDskSUEAhOIrDfA454vTT2n0jHbDhiQdahr0oHnuPUMFeXOlusICDstQJX2z+pJff0eNpBZ3sPUjHuD1B53QEs+8Gje1Fjyta2zcKRi5YJgvBAwmGYzsCX91NS4Cv7sYFjsvSvyylJjhOwO3o8uh8UJ0Fw/QGF4F2XiLSXgCTzRvm
   </data>
  </layer>
- <layer name="Walkable" width="30" height="26" visible="0">
+ <layer id="6" name="Walkable" width="30" height="26">
   <data encoding="base64" compression="zlib">
-   eJzFVVsKwCAM8xS7/xW84dhvafNolQWEibRJNM79rLXB+IDWlVH1qJDVMmRc1TfTqeiJHtCc7YfClWlCOtXzyHoxb4ir8qt6c3Pn1KpwOBGXkxvmGXmMWhyPSk/HK/Kg5rpbPz237l4pfTpZZDlX7oKT+6rW3csuIqeib8Kn6Ih8N6Dk5g/c4J5m/wSvc39O8Xb/S6d51dquBucNqGqrekeD+z4ovdBZMT9ML1ufjthH7RvxAkH5ECI=
+   eJzFlV0KgDAMg3cK73+F3VB8Lf350m4YGCgjTVI7t5+1drI+ZPtkRTUieNwKnlb0XPkkfmyG7L3qB9HyPGU+6ffwalXZMq0oL82mzp3CpVA0My1lbqrMWUbrRclIaipZswx0rrv86Xfr9orU6cxiNefkLChzH3HVXnZhNYm/iR7xYfVugPT1D9zQns7+CV3l/JzS7f6XTutSbteDcgdE3IiveFDvB1JLPZ9Kv6v96bJ1aF2LF92MEOk=
   </data>
  </layer>
- <objectgroup name="Mapevents">
-  <object name="north" type="mapchange" x="800" y="0" width="32" height="32">
+ <objectgroup id="7" name="Mapevents">
+  <object id="1" name="north" type="mapchange" x="800" y="0" width="32" height="32">
    <properties>
     <property name="map" value="sullengard_woods1"/>
     <property name="place" value="southeast"/>
    </properties>
   </object>
-  <object name="west" type="mapchange" x="0" y="480" width="32" height="64">
+  <object id="2" name="west" type="mapchange" x="0" y="480" width="32" height="64">
    <properties>
     <property name="map" value="sullengard_woods14"/>
     <property name="place" value="east"/>
    </properties>
   </object>
-  <object name="south1" type="mapchange" x="384" y="800" width="32" height="32">
+  <object id="3" name="south1" type="mapchange" x="384" y="800" width="32" height="32">
    <properties>
     <property name="map" value="sullengard_woods2"/>
     <property name="place" value="north1"/>
    </properties>
   </object>
-  <object name="south2" type="mapchange" x="512" y="800" width="32" height="32">
+  <object id="4" name="south2" type="mapchange" x="512" y="800" width="32" height="32">
    <properties>
     <property name="map" value="sullengard_woods2"/>
     <property name="place" value="north2"/>
    </properties>
   </object>
-  <object name="jackal_defeted_script_10" type="script" x="288" y="64" width="192" height="224">
+  <object id="5" name="jackal_defeted_script_10" type="script" x="288" y="64" width="192" height="224">
    <properties>
     <property name="when" value="step"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn">
-  <object name="sullengard_west_ravine_gj_spawn" type="spawn" x="352" y="128" width="64" height="96">
+ <objectgroup id="8" name="Spawn">
+  <object id="6" name="sullengard_west_ravine_gj_spawn" type="spawn" x="352" y="128" width="64" height="96">
    <properties>
     <property name="active" value="false"/>
     <property name="spawngroup" value="golden_jackal"/>
    </properties>
   </object>
-  <object name="sull_red_forest_snake_spawn1" type="spawn" x="64" y="736" width="288" height="64">
-   <properties>
-    <property name="quantity" value="2"/>
-    <property name="spawngroup" value="sull_red_forest_snake"/>
-   </properties>
-  </object>
-  <object name="sull_red_forest_snake_spawn2" type="spawn" x="32" y="576" width="32" height="192">
-   <properties>
-    <property name="quantity" value="2"/>
-    <property name="spawngroup" value="sull_red_forest_snake"/>
-   </properties>
-  </object>
-  <object name="sull_red_forest_snake_spawn3" type="spawn" x="32" y="256" width="416" height="32">
+  <object id="7" name="sull_red_forest_snake_spawn1" type="spawn" x="64" y="736" width="288" height="64">
    <properties>
     <property name="quantity" value="3"/>
     <property name="spawngroup" value="sull_red_forest_snake"/>
    </properties>
   </object>
-  <object name="sull_red_forest_snake_spawn4" type="spawn" x="32" y="32" width="192" height="32">
+  <object id="8" name="sull_red_forest_snake_spawn2" type="spawn" x="32" y="576" width="32" height="192">
+   <properties>
+    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="sull_red_forest_snake"/>
+   </properties>
+  </object>
+  <object id="9" name="sull_red_forest_snake_spawn3" type="spawn" x="32" y="256" width="416" height="32">
+   <properties>
+    <property name="quantity" value="3"/>
+    <property name="spawngroup" value="sull_red_forest_snake"/>
+   </properties>
+  </object>
+  <object id="10" name="sull_red_forest_snake_spawn4" type="spawn" x="32" y="32" width="192" height="32">
    <properties>
     <property name="spawngroup" value="sull_red_forest_snake"/>
    </properties>
   </object>
-  <object name="sull_red_forest_snake_spawn5" type="spawn" x="672" y="96" width="128" height="32">
+  <object id="11" name="sull_red_forest_snake_spawn5" type="spawn" x="672" y="96" width="128" height="32">
    <properties>
     <property name="spawngroup" value="sull_red_forest_snake"/>
    </properties>
   </object>
-  <object name="flying_tree_ant_spawn1" type="spawn" x="800" y="160" width="128" height="96">
+  <object id="12" name="flying_tree_ant_spawn1" type="spawn" x="800" y="160" width="128" height="96">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="flying_tree_ant"/>
    </properties>
   </object>
-  <object name="sull_forest_tree_fungus_spawn1" type="spawn" x="64" y="544" width="160" height="64">
+  <object id="13" name="sull_forest_tree_fungus_spawn1" type="spawn" x="64" y="544" width="160" height="64">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="sull_forest_tree_fungus"/>
    </properties>
   </object>
-  <object name="sull_forest_tree_fungus_spawn2" type="spawn" x="224" y="192" width="128" height="32">
+  <object id="14" name="sull_forest_tree_fungus_spawn2" type="spawn" x="224" y="192" width="128" height="32">
    <properties>
     <property name="spawngroup" value="sull_forest_tree_fungus"/>
    </properties>
   </object>
-  <object name="sull_forest_tree_fungus_spawn3" type="spawn" x="448" y="192" width="96" height="32">
+  <object id="15" name="sull_forest_tree_fungus_spawn3" type="spawn" x="448" y="192" width="96" height="32">
    <properties>
     <property name="spawngroup" value="sull_forest_tree_fungus"/>
    </properties>
   </object>
-  <object name="sull_forest_tree_fungus_spawn4" type="spawn" x="512" y="96" width="128" height="32">
+  <object id="16" name="sull_forest_tree_fungus_spawn4" type="spawn" x="512" y="96" width="128" height="32">
    <properties>
     <property name="spawngroup" value="sull_forest_tree_fungus"/>
    </properties>
   </object>
-  <object name="huckleber_reaper_spawn1" type="spawn" x="384" y="32" width="256" height="32">
+  <object id="17" name="huckleber_reaper_spawn1" type="spawn" x="384" y="32" width="256" height="32">
    <properties>
     <property name="quantity" value="3"/>
     <property name="spawngroup" value="huckleber_reaper"/>
    </properties>
   </object>
-  <object name="sull_forest_tree_fungus_spawn5" type="spawn" x="128" y="320" width="96" height="32">
+  <object id="18" name="sull_forest_tree_fungus_spawn5" type="spawn" x="128" y="320" width="96" height="32">
    <properties>
     <property name="spawngroup" value="sull_forest_tree_fungus"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys"/>
- <objectgroup name="Replace"/>
+ <objectgroup id="9" name="Keys"/>
+ <objectgroup id="10" name="Replace"/>
 </map>
diff --git a/AndorsTrail/res/xml/sullengard_woods6.tmx b/AndorsTrail/res/xml/sullengard_woods6.tmx
index af0754584..2bab99540 100644
--- a/AndorsTrail/res/xml/sullengard_woods6.tmx
+++ b/AndorsTrail/res/xml/sullengard_woods6.tmx
@@ -1,316 +1,317 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="30" tilewidth="32" tileheight="32" infinite="0" nextlayerid="11" nextobjectid="17">
+<!DOCTYPE map SYSTEM "https://mapeditor.org/dtd/1.0/map.dtd">
+<map version="1.0" orientation="orthogonal" width="30" height="30" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
  </properties>
- <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="385" name="map_bridge_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="385" name="map_bridge_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bridge_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="513" name="map_broken_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="513" name="map_broken_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="641" name="map_cavewall_1" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="641" name="map_cavewall_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="749" name="map_cavewall_2" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="749" name="map_cavewall_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="857" name="map_cavewall_3" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="857" name="map_cavewall_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="965" name="map_cavewall_4" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="965" name="map_cavewall_4" tilewidth="32" tileheight="32">
   <image source="../drawable/map_cavewall_4.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="1073" name="map_chair_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1073" name="map_chair_table_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1201" name="map_chair_table_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1201" name="map_chair_table_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_chair_table_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1329" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1329" name="map_crate_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1457" name="map_cupboard_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1457" name="map_cupboard_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1585" name="map_curtain_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1585" name="map_curtain_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1713" name="map_entrance_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1713" name="map_entrance_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1841" name="map_entrance_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1841" name="map_entrance_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_entrance_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1969" name="map_fence_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1969" name="map_fence_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2097" name="map_fence_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2097" name="map_fence_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2225" name="map_fence_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2225" name="map_fence_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_fence_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2353" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2353" name="map_fence_4" tilewidth="32" tileheight="32">
   <image source="../drawable/map_fence_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2481" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2481" name="map_ground_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2609" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2609" name="map_ground_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2737" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2737" name="map_ground_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2865" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2865" name="map_ground_4" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2993" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2993" name="map_ground_5" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3121" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3121" name="map_ground_6" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3249" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3249" name="map_ground_7" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3377" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3377" name="map_ground_8" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3505" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3505" name="map_house_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_house_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3633" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3633" name="map_house_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_house_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3761" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3761" name="map_indoor_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3889" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3889" name="map_indoor_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_indoor_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4017" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4017" name="map_kitchen_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4145" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4145" name="map_outdoor_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4273" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4273" name="map_pillar_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4401" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4401" name="map_pillar_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_pillar_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4529" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4529" name="map_plant_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4657" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4657" name="map_plant_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_plant_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4785" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4785" name="map_rock_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4913" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4913" name="map_rock_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_rock_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5041" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5041" name="map_roof_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5169" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5169" name="map_roof_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5297" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5297" name="map_roof_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_roof_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5425" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5425" name="map_shop_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5553" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5553" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5681" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5681" name="map_table_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5809" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5809" name="map_trail_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5937" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5937" name="map_transition_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_transition_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6065" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6065" name="map_transition_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_transition_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6193" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6193" name="map_transition_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_transition_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6321" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6321" name="map_transition_4" tilewidth="32" tileheight="32">
   <image source="../drawable/map_transition_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6449" name="map_transition_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6449" name="map_transition_5" tilewidth="32" tileheight="32">
   <image source="../drawable/map_transition_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6577" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6577" name="map_tree_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6705" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6705" name="map_tree_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_tree_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6833" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6833" name="map_wall_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6961" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="6961" name="map_wall_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7081" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="7081" name="map_wall_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7201" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="7201" name="map_wall_4" tilewidth="32" tileheight="32">
   <image source="../drawable/map_wall_4.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7321" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7321" name="map_window_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7577" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7577" name="map_tree_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
- <layer id="1" name="Ground" width="30" height="30">
+ <layer name="Ground" width="30" height="30">
   <data encoding="base64" compression="zlib">
    eJztwzENAAAMA6C+86+kDitkkNBLqqqq6rsD3zGOBw==
   </data>
  </layer>
- <layer id="2" name="Breadcrumb" width="30" height="30" visible="0">
+ <layer name="Breadcrumb" width="30" height="30" visible="0">
   <data encoding="base64" compression="zlib">
    eJztlkEOwCAIBD33F/3/J3tqYozSBXalTUriqbIDipTWfvuCnYe9vFoeFrIP5Vr7I3l4fFjnd2tFbbdvJs8oN8uL6jCYXi1WrjPuSpvNHLk9Y4yHzbT6AaN2PUyVZZiVvSYTc1XOPV/ts9JBvzFrEf1XV74nZa9E2eo7fuJnmG/uIbP6UsRs1TI646HzNGNOVL07hV3tyhcE
   </data>
  </layer>
- <layer id="3" name="Objects" width="30" height="30">
+ <layer name="Objects" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJyVV9FNwzAQNUxAg4T6k2zAMHQBYALYiRESRZH6xQcDtKJqxWdHyAT4qJ/68np2w0lRYufucvfe+eyEEMLPIvzJug5XpaTzWk3HTzI22+f7EF7iNSQ/fbp/x/smXts0xrPN7xwds9vH60BzuI/VVPczXm/xm+/3p1wxD3t8g3PDO9XBXX2YX9WFjuGAZ2CN8cHJ7ViddfakU5KNE6vl81j5+PaOPr9n4RiGTEw8N1bTOebQi7end4PD+c7xMdAzvxvqKcfmf3By8vBjPoGD+WLsGKNjNeVMY2U7D7dcLXncsC3HYLVVqmnG1mTZTP0r3pyTYm52WEecF9tpjjyGv8HJWWtfOTYZ6R18bR1bxZWfLYfF7Qk36IFj5Go6D036ULzfNKdxiRPNF+scOei61zoz/6YD/bs4XjRnv9ovIGaHeLgGGYdSnbFvxPnhfMd8IzbYc5+C31yPya1rSJt42SXsc2t2Tk6lOmO/thbaNEYsuV7XpauUE6/Dvvb7KfpTm+xX1WUuXj8u5eThynkYnrDp0hzHpfVv447ec07L5pLzgxMnC/cN1lEbjo+5yOHCnINXxdzm1w5WOubvWl33td+PvX6p+w8E9aJr1+uTWP9YU8zJXM7hZ6wu5z1RXT6j4Nl0vmp/jymdFRhXjh+S40S5LnGOHt1mcOZ6WDbTOFmXue/q63skODbdVcLPehdj7mHDGHl7LNeSxzlklHPHHBxNeslVY+V1zucA5MznY/TD0hlVcUXuc2NVzJQrlWvnvP+cp7lfsaAucmdm3o+15iDeXgLO8f8CHb5MjBfwYGcY/sfis5PFwbYYryVW2GCP+AXExS0E
+   eJyVV9FNwzAQNUxAg4T6k2zAMHQBYALYiRESRZH6xQcDtKJqxWdHyAT4UT/15XJ2y0lRYufucvfe+eyEEMLPIvzJug4XpaTzWk3HT2YM2+f7EF7iNSQ/fbp/x/smXts05jPmd44O7PbxOsgc72M11f2M11v85vv9KVfO057f0Nz4zurwbn3Ar9WlDnDgM7Hm+ODkdqzOOnvRKcnGiRX5PFY+vr2jr+9VNIYhE5POjdV0Tjn04u3l3eBwvnN8DPKs74Z6yjH8D05OHn7KJ3GAL8VOMTpWU85srGrn4ZarJY8btdUYUFulmlZsIctm6t/irTlZzGHHdaR5qZ3NUcf0Nzg529q3HENGeUdfW8fW4qrPyGFxe8KNeuSYuULnoUkfiveb5jQucWLz5TpnDnbd2zqDf+hQ/y6OF83Zr+0XFNgxHq1BxaFUZ+qbcX4434FvxkZ77VP0m+sxuXVNaRMvu4R9bs1ek1OpztQv1kKbxowl1+u6dJVy0nXY134/ZX9qk/2qmufi9eNSTh6umgfwpE2X5jQuW/8Yd/Jec1o2c84PTpwq2jdUx9pofMpFDhflnLxazDG/drCyY/0u6rqv/X7s9Uu7/1BYL3bten2S659rSjm5lnP6Gav5vCdWV88ofIbOV+3vMaWzguKq8VNynFiuS5yzR7cZnLUels00TtVV7rv68h5JjqG7SvihdynmHjaKkbfHai15nFNGc+64BkdIb3K1seo613MAc9bzMfth6YxqcWXul2Lt6/m5RftwTi6d8/5zntZ+pcK6yJ2ZdT+2NUfx9hJyzv8X6ugFAS/kAWcY/cfSsxPiUFuO1yZW2nCP+AX96y3X
   </data>
  </layer>
- <layer id="4" name="Above" width="30" height="30">
+ <layer name="Above" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJy9lsFuwkAMRDlVvSPEKfxa+1+9RlE+oVdQEb2CisLnFLc76svIDrdairKb2N6ZidebsVv92NDuH/f7/n4d2nzf7rTwOTafiDvdr0/EMd7z0fRc8deWl6Z37iMMnoMxV+QiH2LR/HMB797yL5l8qZNrp/yT6Xc1Tm7EMBaYlp5l+pLbgHdjN8evccaJ3I7Ap/zSdyziHI++p+sg7ejnccQxAbPeZ7pVteTfhlpmGBw/NR/Mb7ub53e9mcufR9zLerV6Xc95Mc45cq58Y8JZ+k5WC5WxF0TsZUFXjgfz8xjx3Ox+x2/tWcyF9dx8l2r+y+rRtfWx1qs4e7+QRVy2XzjmM68z5XbjOpNxcd7V3lH+rM68tvo2PjbtKx2ck9a7Gaeqzqq8wlL1ur5dvneed/M8rLNsn3J9jZ2Lz+njnCou5BF6OhbHVX0P57QFXz//sjxh7Bv0cW6Hbr6un++uyznZD87Ta9b3ruZ9gjnrx1m/zM4facg6YP923TZWR8yb1XFYtpeYJ55PxksWdeu+WW96go/6RHZGyoRPvbU3/Kyf7P/AexG/OWPYoyudyWNb7FPt7Rvw+hlJHGFZD5nML9OGvlnPZbzWyPYY8VMT1naWf7A6r755toZzVj/0Wr51cx8fsz4eYaWxD8su5vPoP28Jqxv7leM6dXmPDuOeYs1dTAs/S4RPueTDi5jfH3ANHIzVnKZ/lHP3d0bwbP2ve9g3z/HJag==
+   eJy9lsFuwkAMRDlVvSPEKfxa+1+9oiif0CuoCK6govA5xe2O+jK1w62Wouwmtndm4vVm6Bbf1rf7x/2+u1/7Nt+1Oy18Ds0n4o7364Q4xns+mp4r/try0vTOfYTBczDmilzkQyyan2bw7iz/nMmXOrl2yj+aflfj5EYMQ4Fp7lmmL7n1eDd0U/waZ5zI7QB8yi99hyLO8eh7ug7Sjn4eRxwjMOt9pltVS/5tqGWGwfFT89781ptpftebufx5xL0sF4vX5ZQX45wj58o3JJyl72i1UBl7QcReZnTluDc/jxHP1eZn/NaexVxYz813ruY/rR5dWx9rvYqz9wtZxGX7hWM+8zpTbjeuMxoX513tHeXP6sxra9vGh6Z9pYNz0no341TVWZVXWKpet22X753nzTQP6yzbp1xfY+fic/o4p4oLeYSejsVxVd/DOa3B18+/LE8Y+wZ9nNu+m67r57vrck72g/P0mvW9q/k2wZz146xfZuePNGQdsH+7biurI+bN6jgs20vME89H4yWLunXfrDc9wUd9IjsjZcKn3ro1/Kyf7P/AexG/OWPYoyudyWNd7FPt7Rvw+hlJHGFZDxnNL9OGvlnPZbzWyPYY8VMT1naWv7c6r755toZzVj/0Wr51Ux8fsz4qrH3397+FfVh2MZ9H/3lzWN3Yrxzbsct7dBj3FGvuYlr4WSL8yiUfXsT8/oBr4GCs5jT9o5y73zOCZ+t/3cO+ADQyyhQ=
   </data>
  </layer>
- <layer id="5" name="Top" width="30" height="30">
+ <layer name="Top" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJzVV0GOwjAM5LTaDyBO2dcjxDeoWpUrXNjnbKPF2tHgSeyWy45URS1xPLHHTtjtXjGV33FexuvyDMszlr/vFZfiGApMwbnjc95jGb+FzZjwy5wVZprj2QwJv8MzbgqKk7e3e8Jvb66KXWZvjPOK+BqQ7+fX6+9eDKcS54v7VTE/OH7VWlEdKw5rMJOWPoJ8t+TUbLEG9+QXeWAvMFvm2YsDxzayT29N5tkDx7cF46T0HEWrd9b4cS1k91TBe4pwjtZCC+inl3OL5zv8ZupzTTwVLFdXOiO31n0UqKVLojd69t57pA4t56cSOw8qOD78/q4cMX+uA4xXtLcivDx767A2W2e10jH2BeONda5ilr1/8b2P6zOisUyPtLnHjk1UW4beHbV1v82sw0BNqPX5fuv5PiX9tvKCmkQd3QJctwA1WXVkPNQ9QX1TMP2bNvA8x31wbXi1YvNrvrO9oPWf5T/hB6Vice8=
+   eJzVV0EOwjAM44T4AOJUXo8mvrFp03aFCzyHVSzCMkmbbFywhKZB07iO05bd7htDej/H+TnNn27+9OnzfUablEADg3Nsv4x7zM+nEdMH8jJnCyON0WK6QN5u0c2CxUlb2z2QtzbW0i6yNsZ1hb4C5Hs4f/+uaTgkP19cr6X5SclrzeX1scVhDUby0t7Jd0tNJRZ78Eh5kQfuBRLLPGs6sLaedWpzMs8aWN8ShJPlZy9Ke2fWj3shuqYMXpOHs7cXSsA8tZqLnr/IG+nPNXpakFpNdEZu7Xsv0EttYG/U4rV3Tx9KzZvkOw8yWB9+/1WNmD/3Aerl3VsRWp21edibpbPa8jHuC8Ib+9zSLHr/4nsf96fHY5E9UsZeKjFebwlqd9TS/TYyDwM9Yc3P91stdxPMW6oLehJ9dHNw3QL0ZPaR8LDuCVGI/8UbeJ7jOrg3tF6R8bneUV6l/yz/hBdwEHHL
   </data>
  </layer>
- <layer id="6" name="Walkable" width="30" height="30" visible="0">
+ <layer name="Walkable" width="30" height="30" visible="0">
   <data encoding="base64" compression="zlib">
    eJy9ktENAjEMQzsF+6/AhnwhqshxnlsgEjp6l9qO47U+9XyssUgPufv+vz/dj/SQuxPOru+UI8VX5+6d85Zqox5UbKep9igOp5f4ovLT9UwzUf+6b5M3v8gYzUriO8EiHk266LxVa3e+9bXT9g3NXU6J/0pD5616f6Ld7Uz5f5tjiqEq5UpznvqXznHCc7JLclf5WnUmmAqn9k7nf+Qq8SPlJFnoZq11yu92ofDJjtw8qd50L3T+icdppbr2Xan9dXyTT4S/m+kkJxNO7U+zQPwhHqs7zldXBKP2Oowk7zcYVDPhqD21/wW6DtDq
   </data>
  </layer>
- <objectgroup id="7" name="Mapevents" visible="0">
-  <object id="1" name="southwest" type="mapchange" x="0" y="896" width="32" height="32">
+ <objectgroup name="Mapevents" visible="0">
+  <object name="southwest" type="mapchange" x="0" y="896" width="32" height="32">
    <properties>
     <property name="map" value="sullengard_woods7"/>
     <property name="place" value="southeast"/>
    </properties>
   </object>
-  <object id="2" name="west" type="mapchange" x="0" y="384" width="32" height="32">
+  <object name="west" type="mapchange" x="0" y="384" width="32" height="32">
    <properties>
     <property name="map" value="sullengard_woods7"/>
     <property name="place" value="east"/>
    </properties>
   </object>
-  <object id="3" name="notice_large_sullengard_trees_selector" type="script" x="416" y="832" width="32" height="64">
+  <object name="notice_large_sullengard_trees_selector" type="script" x="416" y="832" width="32" height="64">
    <properties>
     <property name="when" value="enter"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup id="8" name="Spawn" visible="0">
-  <object id="4" name="preabola_fly_spawn1" type="spawn" x="704" y="288" width="128" height="32">
+ <objectgroup name="Spawn" visible="0">
+  <object name="preabola_fly_spawn1" type="spawn" x="704" y="288" width="128" height="32">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="preabola_fly"/>
    </properties>
   </object>
-  <object id="5" name="sullengard_venom_snake_spawn1" type="spawn" x="864" y="192" width="32" height="32">
+  <object name="sullengard_venom_snake_spawn1" type="spawn" x="864" y="192" width="32" height="32">
    <properties>
     <property name="spawngroup" value="sullengard_venom_snake"/>
    </properties>
   </object>
-  <object id="6" name="sullengard_venom_snake_spawn2" type="spawn" x="736" y="160" width="32" height="32">
+  <object name="sullengard_venom_snake_spawn2" type="spawn" x="736" y="160" width="32" height="32">
    <properties>
     <property name="spawngroup" value="sullengard_venom_snake"/>
    </properties>
   </object>
-  <object id="7" name="sullengard_venom_snake_spawn3" type="spawn" x="704" y="64" width="32" height="32">
+  <object name="sullengard_venom_snake_spawn3" type="spawn" x="704" y="64" width="32" height="32">
    <properties>
     <property name="spawngroup" value="sullengard_venom_snake"/>
    </properties>
   </object>
-  <object id="8" name="preabola_fly_spawn2" type="spawn" x="224" y="832" width="160" height="64">
+  <object name="preabola_fly_spawn2" type="spawn" x="224" y="832" width="160" height="64">
    <properties>
     <property name="quantity" value="3"/>
     <property name="spawngroup" value="preabola_fly"/>
    </properties>
   </object>
-  <object id="9" name="sullengard_venom_snake_spawn4" type="spawn" x="128" y="640" width="160" height="64">
+  <object name="sullengard_venom_snake_spawn4" type="spawn" x="128" y="640" width="160" height="64">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="sullengard_venom_snake"/>
    </properties>
   </object>
-  <object id="10" name="broxwood_spawn1" type="spawn" x="64" y="416" width="96" height="32">
+  <object name="broxwood_spawn1" type="spawn" x="64" y="416" width="96" height="32">
    <properties>
     <property name="spawngroup" value="broxwood"/>
    </properties>
   </object>
-  <object id="11" name="preabola_fly_spawn3" type="spawn" x="512" y="864" width="192" height="64">
+  <object name="preabola_fly_spawn3" type="spawn" x="512" y="864" width="192" height="64">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="preabola_fly"/>
    </properties>
   </object>
-  <object id="12" name="sullengard_venom_snake_spawn5" type="spawn" x="864" y="672" width="64" height="192">
+  <object name="sullengard_venom_snake_spawn5" type="spawn" x="864" y="672" width="64" height="192">
    <properties>
     <property name="quantity" value="3"/>
     <property name="spawngroup" value="sullengard_venom_snake"/>
    </properties>
   </object>
-  <object id="13" name="preabola_fly_spawn4" type="spawn" x="864" y="288" width="32" height="160">
+  <object name="preabola_fly_spawn4" type="spawn" x="864" y="288" width="32" height="160">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="preabola_fly"/>
    </properties>
   </object>
-  <object id="14" name="yellow_tooth_spawn" type="spawn" x="736" y="480" width="128" height="96">
+  <object name="yellow_tooth_spawn" type="spawn" x="736" y="480" width="128" height="96">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="yellow_tooth"/>
    </properties>
   </object>
-  <object id="15" name="preabola_fly_spawn5" type="spawn" x="224" y="160" width="192" height="128">
+  <object name="preabola_fly_spawn5" type="spawn" x="224" y="160" width="192" height="128">
    <properties>
     <property name="quantity" value="4"/>
     <property name="spawngroup" value="preabola_fly"/>
    </properties>
   </object>
-  <object id="16" name="preabola_fly_spawn6" type="spawn" x="512" y="96" width="192" height="64">
+  <object name="preabola_fly_spawn6" type="spawn" x="512" y="96" width="192" height="64">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="preabola_fly"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup id="9" name="Keys"/>
- <objectgroup id="10" name="Replace"/>
+ <objectgroup name="Keys"/>
+ <objectgroup name="Replace"/>
 </map>
diff --git a/AndorsTrail/res/xml/way_to_sullengard_east_ravine_north.tmx b/AndorsTrail/res/xml/way_to_sullengard_east_ravine_north.tmx
index 05dd2c8d0..189a54f43 100644
--- a/AndorsTrail/res/xml/way_to_sullengard_east_ravine_north.tmx
+++ b/AndorsTrail/res/xml/way_to_sullengard_east_ravine_north.tmx
@@ -1,299 +1,300 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.8" tiledversion="1.8.4" orientation="orthogonal" renderorder="right-down" width="40" height="15" tilewidth="32" tileheight="32" infinite="0" nextlayerid="11" nextobjectid="14">
+<!DOCTYPE map SYSTEM "https://mapeditor.org/dtd/1.0/map.dtd">
+<map version="1.0" orientation="orthogonal" width="40" height="15" tilewidth="32" tileheight="32">
  <properties>
   <property name="outdoors" value="1"/>
  </properties>
- <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="385" name="map_bridge_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="385" name="map_bridge_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bridge_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="513" name="map_broken_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="513" name="map_broken_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="641" name="map_cavewall_1" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="641" name="map_cavewall_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="749" name="map_cavewall_2" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="749" name="map_cavewall_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="857" name="map_cavewall_3" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="857" name="map_cavewall_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="965" name="map_cavewall_4" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="965" name="map_cavewall_4" tilewidth="32" tileheight="32">
   <image source="../drawable/map_cavewall_4.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="1073" name="map_chair_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1073" name="map_chair_table_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1201" name="map_chair_table_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1201" name="map_chair_table_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_chair_table_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1329" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1329" name="map_crate_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1457" name="map_cupboard_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1457" name="map_cupboard_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1585" name="map_curtain_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1585" name="map_curtain_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1713" name="map_entrance_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1713" name="map_entrance_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1841" name="map_entrance_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1841" name="map_entrance_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_entrance_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1969" name="map_fence_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1969" name="map_fence_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2097" name="map_fence_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2097" name="map_fence_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2225" name="map_fence_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2225" name="map_fence_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_fence_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2353" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2353" name="map_fence_4" tilewidth="32" tileheight="32">
   <image source="../drawable/map_fence_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2481" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2481" name="map_ground_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2609" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2609" name="map_ground_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2737" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2737" name="map_ground_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2865" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2865" name="map_ground_4" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2993" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2993" name="map_ground_5" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3121" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3121" name="map_ground_6" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3249" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3249" name="map_ground_7" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3377" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3377" name="map_ground_8" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3505" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3505" name="map_house_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_house_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3633" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3633" name="map_house_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_house_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3761" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3761" name="map_indoor_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3889" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3889" name="map_indoor_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_indoor_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4017" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4017" name="map_kitchen_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4145" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4145" name="map_outdoor_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4273" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4273" name="map_pillar_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4401" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4401" name="map_pillar_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_pillar_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4529" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4529" name="map_plant_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4657" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4657" name="map_plant_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_plant_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4785" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4785" name="map_rock_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4913" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4913" name="map_rock_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_rock_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5041" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5041" name="map_roof_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5169" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5169" name="map_roof_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5297" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5297" name="map_roof_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_roof_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5425" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5425" name="map_shop_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5553" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5553" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5681" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5681" name="map_table_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5809" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5809" name="map_trail_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5937" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5937" name="map_transition_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_transition_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6065" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6065" name="map_transition_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_transition_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6193" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6193" name="map_transition_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_transition_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6321" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6321" name="map_transition_4" tilewidth="32" tileheight="32">
   <image source="../drawable/map_transition_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6449" name="map_transition_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6449" name="map_transition_5" tilewidth="32" tileheight="32">
   <image source="../drawable/map_transition_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6577" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6577" name="map_tree_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6705" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6705" name="map_tree_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_tree_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6833" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6833" name="map_wall_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6961" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="6961" name="map_wall_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7081" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="7081" name="map_wall_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7201" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="7201" name="map_wall_4" tilewidth="32" tileheight="32">
   <image source="../drawable/map_wall_4.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7321" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7321" name="map_window_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <layer id="1" name="Base" width="40" height="15">
+ <layer name="Base" width="40" height="15">
   <data encoding="base64" compression="zlib">
    eJxjYBgFo2AUjIJRQEuwkROCaWX2KBgFo2DwAQBqjQIv
   </data>
  </layer>
- <layer id="2" name="Ground" width="40" height="15">
+ <layer name="Ground" width="40" height="15">
   <data encoding="base64" compression="zlib">
-   eJzbyMnAsHEUj+JRPIpHMV68gomBYRceDJJHV58hDpGLEIdgZPXUchfIDhC9EmjmGTx4OZqdyOpB/EYC6skJJ+QwocR9p4H4LInuQ48PbOYuJ8F9O9HiezcB96GrR8e7saQZStx3Go1/lgm/+9DVo+OzOPyA7G9keRCgt/uwqUE3F5s4vdwHAEc3vBQ=
+   eJzbyMnAsHEUj+JRPIpHMV68gomBYRceDJLHpT5CHIKR1VPLXRniEHol0MwzePByNDuR1YP4jQTUkxNOyGFCiftOA/FZEt2HHh/YzF1Ogvt2osX3bgLuQ1ePjndjSTOUuO80Gv8sE373oatHx2dx+AHZ38jyIEBv92FTg24uNnF6uQ8AO1u8UQ==
   </data>
  </layer>
- <layer id="3" name="Objects" width="40" height="15">
+ <layer name="Objects" width="40" height="15">
   <data encoding="base64" compression="zlib">
    eJydVD1LA0EQXa4L2NwVXhLQ2o/8FBWsjKCClUh+Qv6XopYWQdIEhaQwTVJEEyOIZUzhTm6Hm303twYHhrvbfTsz783szWvGfFonm9rnzPqj9e/EmFf3PYVnPzbmy/rcneV1MtqTsW438/e5yLXCxPk77pE9J/o6x/+o5TV24iJmHaP62N4DMQaxz5PrkvwnFtNzMfqAv7d5bv7h3U29HlkD2VDormk2ENzegCfxXukQ0BtN03ucFOv6q/YQVuaQfWIufHYCM8e2Uzdmt+7nmEDdmJ+/n9zai30eJ/l+WR9ln2TdfcjXDcwY9RDvj1anfMd5RJ26cX5XNDzZGPqO97UXqHla899nTrstG3M70XWSZ5i39o/gXvFcaTM3gDXCDGFNasl46qm875wDZ+kkNaZp/dT6wvp+tdx/0uwsc5B4jifxFFPy5dnoKXdVmxvieZVmnK7tc6Pq7x9G2fMgyjDL1NdC4u8s5iHyzxO+7N87C6xL3qyJzNeKsjk/d/nOojyfvC/Ih0zuL13sDvxruf+LVD8r48oYvN4GHchoPvag3w2HP4ry+WF+ZIhHbwh9hgpv6hnFaLoZbIAeo6SoCRrtXUT+PZH88P6wVQIcqI6WohHPD2vBsRlbcTrR9ygpnuczhLks6QHH0jgjR8ZgLowt9aAz2H+OW1kjdxu0/gVFT/tQ
   </data>
  </layer>
- <layer id="4" name="Above" width="40" height="15">
+ <layer name="Above" width="40" height="15">
   <data encoding="base64" compression="zlib">
    eJztU1EOwiAM5RRGdv8L6L78VI/glw4voItnEKKNLw1tGUxNjC8hrNC+vtE2eOfOcXEc/Ws/Ze7fAcwVnrrS+qQGRMi8TdKSO2/hlNALfhbHBTTOqZXXYdk55zs9B78je/OFeiLwX3hN8Zv3o8aV618C2uRXUpvkO/hHTSnOejtpXobGfiBwjmvFfGoxq3i+VvikuSS+Me63Gfpfwjby7YxesIAaSzlKuPcLO7fmfwB7VGa/Fq36psZP1fHXV8dby//r+u6EcHQJ
   </data>
  </layer>
- <layer id="5" name="Top" width="40" height="15">
+ <layer name="Top" width="40" height="15">
   <data encoding="base64" compression="zlib">
    eJxjYBgFpIJbkgPtglFAbTAap6NgFIyCUTAKqAkA0T0B5w==
   </data>
  </layer>
- <objectgroup id="7" name="Mapevents">
-  <object id="1" name="west" type="mapchange" x="0" y="224" width="32" height="192">
+ <layer name="Walkable" width="40" height="15" visible="0">
+  <data encoding="base64" compression="zlib">
+   eJzNVMkNACEItAr7b4EOd/dhYgzHMLLGSXjI5YCg9NbklQ/SMRmw9LMt8tP8tfyWv5ezGl5NHscTfFYd05tszE7dFe9nzWPmDi9mnCvB9FbjtPJD98Tyz+4rEsfu+m7Po7lgcqA2y47MZpQzw5t5dyseqc/TZ/ix/uxfd4pfFgy/P+R2frfLA2wu2OI=
+  </data>
+ </layer>
+ <objectgroup name="Mapevents">
+  <object name="west" type="mapchange" x="0" y="224" width="32" height="192">
    <properties>
     <property name="map" value="way_to_sullengard_east4_bridge"/>
     <property name="place" value="east"/>
    </properties>
   </object>
-  <object id="2" name="northwest" type="mapchange" x="64" y="0" width="32" height="32">
+  <object name="northwest" type="mapchange" x="64" y="0" width="32" height="32">
    <properties>
     <property name="map" value="way_to_sullengard_east_ravine_cabin"/>
     <property name="place" value="southwest"/>
    </properties>
   </object>
-  <object id="3" name="north_left_middle" type="mapchange" x="416" y="0" width="64" height="32">
+  <object name="north_left_middle" type="mapchange" x="416" y="0" width="64" height="32">
    <properties>
     <property name="map" value="way_to_sullengard_east_ravine_cabin"/>
     <property name="place" value="south_left_middle"/>
    </properties>
   </object>
-  <object id="4" name="north_right_middle" type="mapchange" x="608" y="0" width="96" height="32">
+  <object name="north_right_middle" type="mapchange" x="608" y="0" width="96" height="32">
    <properties>
     <property name="map" value="way_to_sullengard_east_ravine_cabin"/>
     <property name="place" value="south_right_middle"/>
    </properties>
   </object>
-  <object id="5" name="northeast" type="mapchange" x="928" y="0" width="160" height="32">
+  <object name="northeast" type="mapchange" x="928" y="0" width="160" height="32">
    <properties>
     <property name="map" value="way_to_sullengard_east_ravine_cabin"/>
     <property name="place" value="southeast"/>
    </properties>
   </object>
-  <object id="6" name="north_middle" type="mapchange" x="768" y="0" width="32" height="32">
+  <object name="north_middle" type="mapchange" x="768" y="0" width="32" height="32">
    <properties>
     <property name="map" value="way_to_sullengard_east_ravine_cabin"/>
     <property name="place" value="south_middle"/>
    </properties>
   </object>
-  <object id="7" name="east" type="mapchange" x="1248" y="224" width="32" height="128">
+  <object name="east" type="mapchange" x="1248" y="224" width="32" height="128">
    <properties>
     <property name="map" value="way_to_sullengard_east2a"/>
     <property name="place" value="west"/>
    </properties>
   </object>
  </objectgroup>
- <layer id="6" name="Walkable" width="40" height="15" visible="0">
-  <data encoding="base64" compression="zlib">
-   eJzNVMkNACEItAr7b4EOd/dhYgzHMLLGSXjI5YCg9NbklQ/SMRmw9LMt8tP8tfyWv5ezGl5NHscTfFYd05tszE7dFe9nzWPmDi9mnCvB9FbjtPJD98Tyz+4rEsfu+m7Po7lgcqA2y47MZpQzw5t5dyseqc/TZ/ix/uxfd4pfFgy/P+R2frfLA2wu2OI=
-  </data>
- </layer>
- <objectgroup id="8" name="Spawn">
-  <object id="8" name="yellow_tooth_spawn1" type="spawn" x="576" y="64" width="224" height="96">
+ <objectgroup name="Spawn">
+  <object name="yellow_tooth_spawn1" type="spawn" x="576" y="64" width="224" height="96">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="yellow_tooth"/>
    </properties>
   </object>
-  <object id="9" name="yellow_tooth_spawn3" type="spawn" x="192" y="96" width="256" height="64">
+  <object name="yellow_tooth_spawn3" type="spawn" x="192" y="96" width="256" height="64">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="yellow_tooth"/>
    </properties>
   </object>
-  <object id="10" name="sullengard_venom_snake_spawn2" type="spawn" x="64" y="64" width="128" height="192">
+  <object name="sullengard_venom_snake_spawn2" type="spawn" x="64" y="64" width="128" height="192">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="sullengard_venom_snake"/>
    </properties>
   </object>
-  <object id="11" name="flying_tree_ant_spawn5" type="spawn" x="448" y="224" width="320" height="64">
+  <object name="flying_tree_ant_spawn5" type="spawn" x="448" y="224" width="320" height="64">
    <properties>
     <property name="quantity" value="3"/>
     <property name="spawngroup" value="flying_tree_ant"/>
    </properties>
   </object>
-  <object id="12" name="flying_tree_ant_spawn6" type="spawn" x="832" y="64" width="320" height="96">
+  <object name="flying_tree_ant_spawn6" type="spawn" x="832" y="64" width="320" height="96">
    <properties>
     <property name="quantity" value="3"/>
     <property name="spawngroup" value="flying_tree_ant"/>
    </properties>
   </object>
-  <object id="13" name="flying_tree_ant_spawn2" type="spawn" x="448" y="64" width="96" height="32">
+  <object name="flying_tree_ant_spawn2" type="spawn" x="448" y="64" width="96" height="32">
    <properties>
     <property name="spawngroup" value="flying_tree_ant"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup id="9" name="Keys" visible="0"/>
- <objectgroup id="10" name="Replace"/>
+ <objectgroup name="Keys" visible="0"/>
+ <objectgroup name="Replace"/>
 </map>