diff --git a/AndorsTrail/res/raw/itemlist_guynmart.json b/AndorsTrail/res/raw/itemlist_guynmart.json
index fb1b7a1ea..fa097f78f 100644
--- a/AndorsTrail/res/raw/itemlist_guynmart.json
+++ b/AndorsTrail/res/raw/itemlist_guynmart.json
@@ -118,11 +118,15 @@
             "increaseAttackCost":0,
             "increaseAttackChance":-6,
             "increaseBlockChance":10,
-            "increaseDamageResistance":1,
-            "addedConditions":[
+            "increaseDamageResistance":1
+        },
+        "hitReceivedEffect":{
+            "conditionsSource":[
                 {
                     "condition":"barkskin",
-                    "magnitude":3
+                    "magnitude":2,
+                    "duration":2,
+                    "chance":"20"
                 }
             ]
         }
diff --git a/AndorsTrail/res/xml/graveyard1.tmx b/AndorsTrail/res/xml/graveyard1.tmx
index 34197808a..be0628e81 100644
--- a/AndorsTrail/res/xml/graveyard1.tmx
+++ b/AndorsTrail/res/xml/graveyard1.tmx
@@ -1,188 +1,187 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
-<map version="1.0" orientation="orthogonal" width="21" height="30" tilewidth="32" tileheight="32">
+<map version="2017.05.26" orientation="orthogonal" renderorder="right-down" width="21" height="30" tilewidth="32" tileheight="32" nextobjectid="52">
  <properties>
   <property name="colorfilter" value="none"/>
   <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>
  <layer name="Ground" width="21" height="30">
@@ -192,7 +191,7 @@
  </layer>
  <layer name="Objects" width="21" height="30">
   <data encoding="base64" compression="zlib">
-   eJytVU1rGzEQFb0JfLAWEnCPPfTcOP0DLvkDCfkzbWnvJST3fP6C5vPWYxOo7XOgDmu70B6CIR89tddWD81Ds7J2QyAPxGhXo9n3ZkbaSceYH37cN1hguGjMP9fseye+tw/43IoduLwvffhtYNIQ76sf5+KLmOSg49An5an50I5dGB9axvxph5h/vf3YimvpHvCbdkKO3nq/dw3jsh2+D1vn874VuSPuJ//8S3i/fB7szEW9BN71rDFdP5b9uPB7lrz96e1GK+bxTmICB4UxpYtz4MoF7cBvb1dsXBu6MMe7jQzPvgv9Am7QiHyBR084AeC0ZoMfgfmqxDxVuSVP4JuP9V1pXrfVuhPQc63eISZ7YJpoR26QW+oj+IzYx0X8Bt/n8jlQ2qkJeG2rz3XzXD41Zi5yWpU6d23UgPyyv5ZkrY7nfkYTsVeE+Gu2uvbC1fM88X6H4jt2VX3siTLJS6o95dlNeoZ631iTBWo+cqFPkIe6fELTjatqWpfcIS/sWd0Dew11r9NEHBbVNZ6Nz8LjobproJfSfidH2oFrPu8E5j2pM5+hHbXcT/yovY4nexBYkVyOpO68kzTwnjUqXfW8d+38AEfkqq/q9Ur6VPcIeabnHd+ijhupp87Zsao170TOdT6nmfNOoJ5Xsq90jzvvZ7qXhNdM1fmyHfnqs3/RmdfOup8rngeJPgD/qi0/NuWfw1qX6myMG/qTvazzwLXOs7APa0fF/J2Y68+R0ttXc6wtqLuH3wTSez7libzl7u9tv7YjY1d6kD1TSo5wDlKe3PdlMe4fqnnT4J7dhOfkCS14/gfUNXdi
+   eJytVU1rFEEQbbw17GF7wMB69OBZR//ASv5AQv6Mit5D0Lvm4xcYo948moC7e15ww+yuoAdZSKInvWo/uh5d09s9QbCg6a/qmvdeVfcsBsZ88e1HRw+bbBjzx3X7Xonv5TU+l9KPXd6XPvw2bNER76Nvp+KLmMSg49AnxanxsJ/7GE97xvzqx5i//fhZL+zN3foZ4FsOgkaPvN/jQkut5PekF7Ej7q6ffxPcd26FfuUiXxrWhtaY2rf7vp35M/d8/9X3e72o45XE/Ol5HVXGNBIHY9i5i/zhs2nj3sSFMdb2MjhHLtQLsE37QS/gGAomGDBt2+BHw3hLYr5T2u4q3T75WJ8V5x3bzjsNfL6rNcRkDSxVTPCANtCW/GicI/ZJFb/B9ZyeY8WdnGAPbHteGuf01LZyEdOW5Lm2kQP0nfajxrUt4zzMcKIdVCH+tm3v3XZlnG+937H4zl2bH2uiSXRJuac466RmyPehNVlDzmcu1Al0KOkJTheuzWlHtIMurFldAwcdeS9xoh1X7T3ejdeC47q8a0MtpfVOjOzHroxT5xPjoeSZc3BHLg8TP3Iv4WQNwjZFy5nknW+SNqwzR41r3/farjdghFYjla+7Uqe6Rogzve/TfuRxIfnUmp2oXPNN5FjruczcdxryeS7nGvdv9/29riXBtVJ5Bn7i1Xf/bLDOnXk/VTiPEn4w/Kte+PZc/jnMdaPuxryjPlnLWgfuDW6Ec9h7U62/ibn6nCm+IzXG3k319vCbsPSdT3FCt9z7/dLvvZK2LzXImmlEI9yDFCfPfdiI5ydq3NV4Zj/BufiPPXD+BVf1dSk=
   </data>
  </layer>
  <layer name="Layer1" width="21" height="30" visible="0">
@@ -202,33 +201,33 @@
  </layer>
  <layer name="Above" width="21" height="30">
   <data encoding="base64" compression="zlib">
-   eJzFlssNwjAMhi0kDkgcCheUOZiAigVgPC4wAtBJ4ByQQGrnoBaN5KZO4iRFfJeUYP/xI64KAPBQAFr1V4r5rVV/z+fj4tLaXS1brdw2Ul2kLr5rUwz/M3G6zgyxmoRtnp3mrV3v3XMVcU7F+BteAZ2ayZlSzgDewljsmE3ukhqMAcaK2PcE4Wpjc1wO97adpt33nJyMZiy+HFI1sWYbh++e2T8xNaKM1esqcC99uPI5M7FL54yrb26uqT3znRujKa0x1ZTMUaymhNJhT9/5O4EmN+OhM1LBPqX2GKH9ofc0R5POwJrocLP+D6aLdF9fbyn2t4R0DsZ6tx3m/LPU55d8ADDDO+s=
+   eJzFlksOwiAQhicmLkxcVDeGc3gCGy+gx3OjR1A5ia7RRJP2HJYE4pQOMECN36aIMz/zYJoCADwEgBL9J8b+VqK/F/Lxcensro6tEn4brm5TfddtNfzfxuk7M8ZqErd5Gs1b97ybtUw4RxL+lldEpyFyxtQzgDczFjdmmzunBmOgY9W490RD1cbluBzubY2m2/eSnKxmKqEccjV1zTYe3z2xfyJqhBmr1zJyL0P48jkTsXPnjKpvaa65PQudm6LJrTHW5MxRqiaH2mOP3/k7hiY147EzctF9yu2xBvcH39MSTTwDa6RDzfo/mC7yfUO9xbjfEtw5GOvddpjTa67PL/kANJc76w==
   </data>
  </layer>
- <layer name="Walkable" width="21" height="30" visible="0">
+ <layer name="Walkable" width="21" height="30">
   <data encoding="base64" compression="zlib">
-   eJzVk1EOwCAIQz3F7n8Fb7gvE7MAfUV/RkJmXK0t4HzGmCJXKNzCEhzFundTvIP5fm9kl2vXksUJX7R2+6G07PtUe+WVBO1Bxq3qQnV2eudg6XxV/qKzxHvFR8L10+XLvFNPTo+UvkorOaf4iXdSY+K9et/VG3MyqgOdeTWj2T+qxw2Xs9JEdGb9VHunOh3/CtvhpLMc3fPXfAGBeSqQ
+   eJzVk8ENwCAMA5mi+6/Ahn0h9UHsM1EfICFVYMw5pPMZY5q5htMtLdFRbXo31aeeNFPC2PFVo+O3+07r4Vi+65RdZSWD9kDl7eryNyfV0v5W+XZnSXbld5qdvlXiV2WnmdL/UfEpVnLO+ZPspMYkO91zjK4PKibqV9Wx2qM86Ug9FRPhrN7TrXU5k/xOe+JJe3l3z63zBeTIKpA=
   </data>
  </layer>
  <layer name="Layer2" width="21" height="30" visible="0">
   <data encoding="base64" compression="zlib">
-   eJzNUlsKwDAI6yl2/yv0hvsqDIkmcTImyB6kqUnc11qb9CmGO1gFp2Ldu1W8g4nPie5yPWfJ6g0fenfzYH51OTOtSqkZZNzMF+Znx2tFe3e/qlkqXxh3PB85Xe1qVo4/7v0KrtKH5kL4L3ceYdAZNLOza4zT7cxHZYcyTehbnRPxTHAqXGoGbOfZvwlOpMPVrvqt5l55yLj+3jfjIT3/
+   eJzNklEKwCAMQz3F7n8Fb7gvfyRtXlDGhMIc8dnEzmeMaWotp1taoqPa9G6qT5nUU9LjCbdbJzz1neZRna2yp8zKK1l0Biq2y0V537UnTOqJznfXS5eLY+/nd2bqnb5Vkk96P9F1/lRfSv/lzCuNOqN6TmbNMdOqciQzVHlSe9qn4txgEhZ9Azfz7t8NpvKReqd503fvMnSsv9cLhdk9/w==
   </data>
  </layer>
  <objectgroup name="Mapevents">
-  <object name="north" type="mapchange" x="288" y="0" width="64" height="32">
+  <object id="1" name="north" type="mapchange" x="288" y="0" width="64" height="32">
    <properties>
     <property name="map" value="graveyard0"/>
     <property name="place" value="south"/>
    </properties>
   </object>
-  <object name="east" type="mapchange" x="640" y="32" width="32" height="64">
+  <object id="2" name="east" type="mapchange" x="640" y="32" width="32" height="64">
    <properties>
     <property name="map" value="waterway5"/>
     <property name="place" value="west"/>
    </properties>
   </object>
-  <object name="north2" type="mapchange" x="640" y="0" width="32" height="32">
+  <object id="3" name="north2" type="mapchange" x="640" y="0" width="32" height="32">
    <properties>
     <property name="map" value="waterway4"/>
     <property name="place" value="south3"/>
@@ -239,121 +238,121 @@
   <properties>
    <property name="active" value="false"/>
   </properties>
-  <object name="graveyard_corpse_0" type="spawn" x="64" y="192" width="224" height="224">
+  <object id="4" name="graveyard_corpse_0" type="spawn" x="64" y="192" width="224" height="224">
    <properties>
     <property name="active" value="false"/>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="graveyard_corpse"/>
    </properties>
   </object>
-  <object name="graveyardking" type="spawn" x="320" y="832" width="32" height="32">
+  <object id="5" name="graveyardking" type="spawn" x="320" y="832" width="32" height="32">
    <properties>
     <property name="spawngroup" value="graveyardking"/>
    </properties>
   </object>
-  <object name="graveyard_corpse_1" type="spawn" x="64" y="416" width="224" height="224">
+  <object id="6" name="graveyard_corpse_1" type="spawn" x="64" y="416" width="224" height="224">
    <properties>
     <property name="active" value="false"/>
     <property name="spawngroup" value="graveyard_corpse"/>
    </properties>
   </object>
-  <object name="graveyard_corpse_2" type="spawn" x="64" y="640" width="256" height="128">
+  <object id="7" name="graveyard_corpse_2" type="spawn" x="64" y="640" width="256" height="128">
    <properties>
     <property name="active" value="false"/>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="graveyard_corpse"/>
    </properties>
   </object>
-  <object name="graveyard_corpse2_0" type="spawn" x="192" y="320" width="32" height="32">
+  <object id="8" name="graveyard_corpse2_0" type="spawn" x="192" y="320" width="32" height="32">
    <properties>
     <property name="active" value="false"/>
     <property name="spawngroup" value="graveyard_corpse2"/>
    </properties>
   </object>
-  <object name="graveyard_corpse2_1" type="spawn" x="192" y="512" width="32" height="32">
+  <object id="9" name="graveyard_corpse2_1" type="spawn" x="192" y="512" width="32" height="32">
    <properties>
     <property name="active" value="false"/>
     <property name="spawngroup" value="graveyard_corpse2"/>
    </properties>
   </object>
-  <object name="graveyard_corpse2_2" type="spawn" x="320" y="704" width="32" height="32">
+  <object id="10" name="graveyard_corpse2_2" type="spawn" x="320" y="704" width="32" height="32">
    <properties>
     <property name="active" value="false"/>
     <property name="spawngroup" value="graveyard_corpse2"/>
    </properties>
   </object>
-  <object name="graveyard_corpse_3" type="spawn" x="288" y="192" width="128" height="224">
+  <object id="11" name="graveyard_corpse_3" type="spawn" x="288" y="192" width="128" height="224">
    <properties>
     <property name="active" value="false"/>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="graveyard_corpse"/>
    </properties>
   </object>
-  <object name="graveyard_corpse_4" type="spawn" x="416" y="192" width="160" height="224">
+  <object id="12" name="graveyard_corpse_4" type="spawn" x="416" y="192" width="160" height="224">
    <properties>
     <property name="active" value="false"/>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="graveyard_corpse"/>
    </properties>
   </object>
-  <object name="graveyard_corpse_5" type="spawn" x="288" y="416" width="160" height="224">
+  <object id="13" name="graveyard_corpse_5" type="spawn" x="288" y="416" width="160" height="224">
    <properties>
     <property name="active" value="false"/>
     <property name="quantity" value="4"/>
     <property name="spawngroup" value="graveyard_corpse"/>
    </properties>
   </object>
-  <object name="graveyard_corpse_6" type="spawn" x="448" y="416" width="128" height="224">
+  <object id="14" name="graveyard_corpse_6" type="spawn" x="448" y="416" width="128" height="224">
    <properties>
     <property name="active" value="false"/>
     <property name="spawngroup" value="graveyard_corpse"/>
    </properties>
   </object>
-  <object name="graveyard_corpse_7" type="spawn" x="320" y="640" width="256" height="128">
+  <object id="15" name="graveyard_corpse_7" type="spawn" x="320" y="640" width="256" height="128">
    <properties>
     <property name="active" value="false"/>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="graveyard_corpse"/>
    </properties>
   </object>
-  <object name="graveyard_corpse_8" type="spawn" x="384" y="768" width="192" height="96">
+  <object id="16" name="graveyard_corpse_8" type="spawn" x="384" y="768" width="192" height="96">
    <properties>
     <property name="active" value="false"/>
     <property name="spawngroup" value="graveyard_corpse"/>
    </properties>
   </object>
-  <object name="graveyard_corpse_9" type="spawn" x="64" y="768" width="192" height="96">
+  <object id="17" name="graveyard_corpse_9" type="spawn" x="64" y="768" width="192" height="96">
    <properties>
     <property name="active" value="false"/>
     <property name="spawngroup" value="graveyard_corpse"/>
    </properties>
   </object>
-  <object name="graveyard_corpse2_3" type="spawn" x="416" y="512" width="32" height="32">
+  <object id="18" name="graveyard_corpse2_3" type="spawn" x="416" y="512" width="32" height="32">
    <properties>
     <property name="active" value="false"/>
     <property name="spawngroup" value="graveyard_corpse2"/>
    </properties>
   </object>
-  <object name="graveyard_corpse2_4" type="spawn" x="416" y="704" width="32" height="32">
+  <object id="19" name="graveyard_corpse2_4" type="spawn" x="416" y="704" width="32" height="32">
    <properties>
     <property name="active" value="false"/>
     <property name="spawngroup" value="graveyard_corpse2"/>
    </properties>
   </object>
-  <object name="graveyard_corpse2_5" type="spawn" x="416" y="320" width="32" height="32">
+  <object id="20" name="graveyard_corpse2_5" type="spawn" x="416" y="320" width="32" height="32">
    <properties>
     <property name="active" value="false"/>
     <property name="spawngroup" value="graveyard_corpse2"/>
    </properties>
   </object>
-  <object name="graveyard_corpse_entrance" type="spawn" x="224" y="160" width="160" height="64">
+  <object id="21" name="graveyard_corpse_entrance" type="spawn" x="224" y="160" width="160" height="64">
    <properties>
     <property name="active" value="false"/>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="graveyard_corpse"/>
    </properties>
   </object>
-  <object name="graveyard_corpse_boss_patrol" type="spawn" x="256" y="704" width="128" height="96">
+  <object id="22" name="graveyard_corpse_boss_patrol" type="spawn" x="256" y="704" width="128" height="96">
    <properties>
     <property name="active" value="false"/>
     <property name="quantity" value="2"/>
@@ -362,7 +361,7 @@
   </object>
  </objectgroup>
  <objectgroup name="Keys">
-  <object name="graveyardenterance" type="key" x="320" y="96" width="32" height="32">
+  <object id="23" name="graveyardenterance" type="key" x="288" y="96" width="64" height="32">
    <properties>
     <property name="phrase" value="graveyardwall_1"/>
     <property name="requireId" value="graveyard_quest"/>
@@ -372,169 +371,169 @@
   </object>
  </objectgroup>
  <objectgroup name="Script">
-  <object name="graveyardday" type="script" x="256" y="768" width="128" height="64">
+  <object id="24" name="graveyardday" type="script" x="256" y="768" width="128" height="64">
    <properties>
     <property name="when" value="always"/>
    </properties>
   </object>
-  <object name="graveyardbosskill_10" type="script" x="288" y="800" width="64" height="64">
+  <object id="25" name="graveyardbosskill_10" type="script" x="288" y="800" width="64" height="64">
    <properties>
     <property name="when" value="always"/>
    </properties>
   </object>
  </objectgroup>
  <objectgroup name="Replace" visible="0">
-  <object name="graveyard_quest:50" type="replace" x="96" y="224" width="32" height="32">
+  <object id="26" name="graveyard_quest:50" type="replace" x="96" y="224" width="32" height="32">
    <properties>
     <property name="Objects" value="Layer1"/>
     <property name="Walkable" value="Layer2"/>
    </properties>
   </object>
-  <object name="graveyard_quest:50" type="replace" x="416" y="224" width="32" height="32">
+  <object id="27" name="graveyard_quest:50" type="replace" x="416" y="224" width="32" height="32">
    <properties>
     <property name="Objects" value="Layer1"/>
     <property name="Walkable" value="Layer2"/>
    </properties>
   </object>
-  <object name="graveyard_quest:50" type="replace" x="512" y="224" width="32" height="32">
+  <object id="28" name="graveyard_quest:50" type="replace" x="512" y="224" width="32" height="32">
    <properties>
     <property name="Objects" value="Layer1"/>
     <property name="Walkable" value="Layer2"/>
    </properties>
   </object>
-  <object name="graveyard_quest:50" type="replace" x="96" y="320" width="32" height="32">
+  <object id="29" name="graveyard_quest:50" type="replace" x="96" y="320" width="32" height="32">
    <properties>
     <property name="Objects" value="Layer1"/>
     <property name="Walkable" value="Layer2"/>
    </properties>
   </object>
-  <object name="graveyard_quest:50" type="replace" x="192" y="320" width="32" height="32">
+  <object id="30" name="graveyard_quest:50" type="replace" x="192" y="320" width="32" height="32">
    <properties>
     <property name="Objects" value="Layer1"/>
     <property name="Walkable" value="Layer2"/>
    </properties>
   </object>
-  <object name="graveyard_quest:50" type="replace" x="320" y="320" width="32" height="32">
+  <object id="31" name="graveyard_quest:50" type="replace" x="320" y="320" width="32" height="32">
    <properties>
     <property name="Objects" value="Layer1"/>
     <property name="Walkable" value="Layer2"/>
    </properties>
   </object>
-  <object name="graveyard_quest:50" type="replace" x="416" y="320" width="32" height="32">
+  <object id="32" name="graveyard_quest:50" type="replace" x="416" y="320" width="32" height="32">
    <properties>
     <property name="Objects" value="Layer1"/>
     <property name="Walkable" value="Layer2"/>
    </properties>
   </object>
-  <object name="graveyard_quest:50" type="replace" x="512" y="320" width="32" height="32">
+  <object id="33" name="graveyard_quest:50" type="replace" x="512" y="320" width="32" height="32">
    <properties>
     <property name="Objects" value="Layer1"/>
     <property name="Walkable" value="Layer2"/>
    </properties>
   </object>
-  <object name="graveyard_quest:50" type="replace" x="192" y="416" width="32" height="32">
+  <object id="34" name="graveyard_quest:50" type="replace" x="192" y="416" width="32" height="32">
    <properties>
     <property name="Objects" value="Layer1"/>
     <property name="Walkable" value="Layer2"/>
    </properties>
   </object>
-  <object name="graveyard_quest:50" type="replace" x="320" y="416" width="32" height="32">
+  <object id="35" name="graveyard_quest:50" type="replace" x="320" y="416" width="32" height="32">
    <properties>
     <property name="Objects" value="Layer1"/>
     <property name="Walkable" value="Layer2"/>
    </properties>
   </object>
-  <object name="graveyard_quest:50" type="replace" x="416" y="416" width="32" height="32">
+  <object id="36" name="graveyard_quest:50" type="replace" x="416" y="416" width="32" height="32">
    <properties>
     <property name="Objects" value="Layer1"/>
     <property name="Walkable" value="Layer2"/>
    </properties>
   </object>
-  <object name="graveyard_quest:50" type="replace" x="512" y="416" width="32" height="32">
+  <object id="37" name="graveyard_quest:50" type="replace" x="512" y="416" width="32" height="32">
    <properties>
     <property name="Objects" value="Layer1"/>
     <property name="Walkable" value="Layer2"/>
    </properties>
   </object>
-  <object name="graveyard_quest:50" type="replace" x="96" y="512" width="32" height="32">
+  <object id="38" name="graveyard_quest:50" type="replace" x="96" y="512" width="32" height="32">
    <properties>
     <property name="Objects" value="Layer1"/>
     <property name="Walkable" value="Layer2"/>
    </properties>
   </object>
-  <object name="graveyard_quest:50" type="replace" x="192" y="512" width="32" height="32">
+  <object id="39" name="graveyard_quest:50" type="replace" x="192" y="512" width="32" height="32">
    <properties>
     <property name="Objects" value="Layer1"/>
     <property name="Walkable" value="Layer2"/>
    </properties>
   </object>
-  <object name="graveyard_quest:50" type="replace" x="416" y="512" width="32" height="32">
+  <object id="40" name="graveyard_quest:50" type="replace" x="416" y="512" width="32" height="32">
    <properties>
     <property name="Objects" value="Layer1"/>
     <property name="Walkable" value="Layer2"/>
    </properties>
   </object>
-  <object name="graveyard_quest:50" type="replace" x="96" y="608" width="32" height="32">
+  <object id="41" name="graveyard_quest:50" type="replace" x="96" y="608" width="32" height="32">
    <properties>
     <property name="Objects" value="Layer1"/>
     <property name="Walkable" value="Layer2"/>
    </properties>
   </object>
-  <object name="graveyard_quest:50" type="replace" x="192" y="608" width="32" height="32">
+  <object id="42" name="graveyard_quest:50" type="replace" x="192" y="608" width="32" height="32">
    <properties>
     <property name="Objects" value="Layer1"/>
     <property name="Walkable" value="Layer2"/>
    </properties>
   </object>
-  <object name="graveyard_quest:50" type="replace" x="320" y="608" width="32" height="32">
+  <object id="43" name="graveyard_quest:50" type="replace" x="320" y="608" width="32" height="32">
    <properties>
     <property name="Objects" value="Layer1"/>
     <property name="Walkable" value="Layer2"/>
    </properties>
   </object>
-  <object name="graveyard_quest:50" type="replace" x="512" y="608" width="32" height="32">
+  <object id="44" name="graveyard_quest:50" type="replace" x="512" y="608" width="32" height="32">
    <properties>
     <property name="Objects" value="Layer1"/>
     <property name="Walkable" value="Layer2"/>
    </properties>
   </object>
-  <object name="graveyard_quest:50" type="replace" x="96" y="704" width="32" height="32">
+  <object id="45" name="graveyard_quest:50" type="replace" x="96" y="704" width="32" height="32">
    <properties>
     <property name="Objects" value="Layer1"/>
     <property name="Walkable" value="Layer2"/>
    </properties>
   </object>
-  <object name="graveyard_quest:50" type="replace" x="320" y="704" width="32" height="32">
+  <object id="46" name="graveyard_quest:50" type="replace" x="320" y="704" width="32" height="32">
    <properties>
     <property name="Objects" value="Layer1"/>
     <property name="Walkable" value="Layer2"/>
    </properties>
   </object>
-  <object name="graveyard_quest:50" type="replace" x="416" y="704" width="32" height="32">
+  <object id="47" name="graveyard_quest:50" type="replace" x="416" y="704" width="32" height="32">
    <properties>
     <property name="Objects" value="Layer1"/>
     <property name="Walkable" value="Layer2"/>
    </properties>
   </object>
-  <object name="graveyard_quest:50" type="replace" x="512" y="704" width="32" height="32">
+  <object id="48" name="graveyard_quest:50" type="replace" x="512" y="704" width="32" height="32">
    <properties>
     <property name="Objects" value="Layer1"/>
     <property name="Walkable" value="Layer2"/>
    </properties>
   </object>
-  <object name="graveyard_quest:50" type="replace" x="512" y="800" width="32" height="32">
+  <object id="49" name="graveyard_quest:50" type="replace" x="512" y="800" width="32" height="32">
    <properties>
     <property name="Objects" value="Layer1"/>
     <property name="Walkable" value="Layer2"/>
    </properties>
   </object>
-  <object name="graveyard_quest:50" type="replace" x="96" y="800" width="32" height="32">
+  <object id="50" name="graveyard_quest:50" type="replace" x="96" y="800" width="32" height="32">
    <properties>
     <property name="Objects" value="Layer1"/>
     <property name="Walkable" value="Layer2"/>
    </properties>
   </object>
-  <object name="graveyard_quest:50" type="replace" x="192" y="800" width="32" height="32">
+  <object id="51" name="graveyard_quest:50" type="replace" x="192" y="800" width="32" height="32">
    <properties>
     <property name="Objects" value="Layer1"/>
     <property name="Walkable" value="Layer2"/>