content next_release

2026-01-19 10:04:52 +01:00 · 2024-12-16 23:25:08 +01:00
parent 613d521adf
commit 4e7a361271
63 changed files with 3991 additions and 3051 deletions
--- a/AndorsTrail/res/raw/conversationlist_crossglen.json
+++ b/AndorsTrail/res/raw/conversationlist_crossglen.json
@@ -56,7 +56,7 @@
        "replies":[
            {
                "text":"No thanks.",
-                "nextPhraseID":"X"
+                "nextPhraseID":"drunk1a"
            },
            {
                "text":"Maybe some other time.",
@@ -157,5 +157,71 @@
                "nextPhraseID":"F"
            }
        ]
+    },
+    {
+        "id":"drunk1a",
+        "message":"Heeeey - come on. Don't be such a spoilsport.",
+        "replies":[
+            {
+                "text":"Maybe some other time.",
+                "nextPhraseID":"X"
+            },
+            {
+                "text":"Well, if you really want to. But I have a new and definitive game for you. Here, drink this. [Give a bottle of weak poison]",
+                "nextPhraseID":"drunk1b",
+                "requires":[
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"pot_poison_weak",
+                        "value":1
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        "id":"drunk1b",
+        "message":"Ohh ... [glug glug]",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"drunk1c"
+            }
+        ]
+    },
+    {
+        "id":"drunk1c",
+        "message":"What an interesting ... [glug]",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"drunk1d"
+            }
+        ]
+    },
+    {
+        "id":"drunk1d",
+        "message":"... taste [falls over]",
+        "replies":[
+            {
+                "text":"Yes, really. A unique taste. And final - bye.",
+                "nextPhraseID":"drunk1e"
+            }
+        ]
+    },
+    {
+        "id":"drunk1e",
+        "replies":[
+            {
+                "nextPhraseID":"R"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"alignmentChange",
+                "rewardID":"drunk1",
+                "value":1
+            }
+        ]
    }
 ]
--- a/AndorsTrail/res/raw/conversationlist_fallhaven_athamyr.json
+++ b/AndorsTrail/res/raw/conversationlist_fallhaven_athamyr.json
@@ -136,7 +136,14 @@
            },
            {
                "text":"The catacombs were interesting.",
-                "nextPhraseID":"athamyr_complete_12"
+                "nextPhraseID":"athamyr_complete_12",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"bucus",
+                        "value":100
+                    }
+                ]
            }
        ]
    },
--- a/AndorsTrail/res/raw/conversationlist_feygard_1.json
+++ b/AndorsTrail/res/raw/conversationlist_feygard_1.json
@@ -5194,7 +5194,7 @@
    },
    {
        "id":"wexlow_well_map_change",
-        "message":"Suddenly, a powerful force grabs you and drags you down into the darkness of the well. You find yourself dazed, confused in a dank, underground cavern while bleeding for what feels like every part of your body.",
+        "message":"Suddenly, a powerful force grabs you and drags you down into the darkness of the well. You find yourself dazed, confused in a dank, underground cavern while bleeding from what feels like every part of your body.",
        "switchToNPC":"none",
        "rewards":[
            {
--- a/AndorsTrail/res/raw/conversationlist_gison.json
+++ b/AndorsTrail/res/raw/conversationlist_gison.json
@@ -1457,6 +1457,12 @@
                        "requireID":"sullengard_hidden",
                        "value":20,
                        "negate":false
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"sullengard_hidden",
+                        "value":21,
+                        "negate":true
                    }
                ]
            }
--- a/AndorsTrail/res/raw/conversationlist_gylew.json
+++ b/AndorsTrail/res/raw/conversationlist_gylew.json
@@ -11,12 +11,38 @@
                        "requireType":"questProgress",
                        "requireID":"odd_coin_collector",
                        "value":40
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"odd_coin_collector",
+                        "value":100,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"odd_coin_collector",
+                        "value":105,
+                        "negate":true
                    }
                ]
            },
            {
                "text":"Hey old man.",
-                "nextPhraseID":"gylew_old_man"
+                "nextPhraseID":"gylew_old_man",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"odd_coin_collector",
+                        "value":100,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"odd_coin_collector",
+                        "value":105,
+                        "negate":true
+                    }
+                ]
            },
            {
                "text":"Hey. I found the Korhald tomb and it had two items that I think might interest you.",
--- a/AndorsTrail/res/raw/conversationlist_laeroth.json
+++ b/AndorsTrail/res/raw/conversationlist_laeroth.json
@@ -10785,7 +10785,7 @@
    },
    {
        "id":"forenza_island_injured_need_help",
-        "message":"Nervermind that now. I am injured and I need your help!",
+        "message":"Nerver mind that now. I am injured and I need your help!",
        "replies":[
            {
                "text":"What kind of help?",
--- a/AndorsTrail/res/raw/conversationlist_mt_galmore.json
+++ b/AndorsTrail/res/raw/conversationlist_mt_galmore.json
@@ -1195,6 +1195,17 @@
    {
        "id":"aidem_base_defy_selector",
        "replies":[
+            {
+                "text":"Come and get it!",
+                "nextPhraseID":"aidem_base_fight",
+                "requires":[
+                    {
+                        "requireType":"questLatestProgress",
+                        "requireID":"wanted_men",
+                        "value":75
+                    }
+                ]
+            },
            {
                "text":"N",
                "nextPhraseID":"aidem_base_defy_help_10",
@@ -1234,17 +1245,6 @@
                        "value":60
                    }
                ]
-            },
-            {
-                "text":"Come and get it!",
-                "nextPhraseID":"aidem_base_fight",
-                "requires":[
-                    {
-                        "requireType":"questLatestProgress",
-                        "requireID":"wanted_men",
-                        "value":75
-                    }
-                ]
            }
        ]
    },
@@ -3274,6 +3274,11 @@
                "rewardType":"removeQuestProgress",
                "rewardID":"sutdover_hidden",
                "value":8
+            },
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"reindeer",
+                "mapName":"crossglen"
            }
        ]
    },
@@ -3289,6 +3294,11 @@
                "rewardType":"questProgress",
                "rewardID":"sutdover_hidden",
                "value":8
+            },
+            {
+                "rewardType":"spawnAll",
+                "rewardID":"reindeer",
+                "mapName":"crossglen"
            }
        ]
    },
@@ -3304,6 +3314,11 @@
                "rewardType":"removeQuestProgress",
                "rewardID":"sutdover_hidden",
                "value":8
+            },
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"reindeer",
+                "mapName":"crossglen"
            }
        ]
    },
@@ -3588,5 +3603,65 @@
                "mapName":"waytogalmore0"
            }
        ]
+    },
+    {
+        "id":"gal_chk_h3",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"sutdover_hidden",
+                "value":7
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"sutdover_hidden",
+                "value":8
+            },
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"reindeer",
+                "mapName":"crossglen"
+            }
+        ]
+    },
+    {
+        "id":"gal_chk_h4",
+        "rewards":[
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"sutdover_hidden",
+                "value":7
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"sutdover_hidden",
+                "value":8
+            },
+            {
+                "rewardType":"spawnAll",
+                "rewardID":"reindeer",
+                "mapName":"crossglen"
+            }
+        ]
+    },
+    {
+        "id":"gal_chk_h9",
+        "rewards":[
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"sutdover_hidden",
+                "value":7
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"sutdover_hidden",
+                "value":8
+            },
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"reindeer",
+                "mapName":"crossglen"
+            }
+        ]
    }
 ]
--- a/AndorsTrail/res/raw/conversationlist_omi2.json
+++ b/AndorsTrail/res/raw/conversationlist_omi2.json
@@ -5850,7 +5850,7 @@
    },
    {
        "id":"ortholion_conversation2_4a",
-        "message":"I'm... *stares at you* \n\n$playername! It's time to end with all of this!",
+        "message":"I'm... [stares at you] \n\n$playername! It's time to end with all of this!",
        "switchToNPC":"ehrenfest",
        "replies":[
            {
@@ -5963,7 +5963,7 @@
    },
    {
        "id":"ortholion_conversation2_8a",
-        "message":"Ortholion! How much is your life worth? How many people?\n\nProve the honor of your glorious land. Come face me alone! No guards, no witnesses.\n\n[Ehrenfest leaps unnaturally high, passing above me, and disappears in the blink of an eye]",
+        "message":"Ortholion! How much is your life worth? How many people?\n\nProve the honor of your glorious land. Come face me alone! No guards, no witnesses.\n\n[Ehrenfest leaps unnaturally high, passing above you, and disappears in the blink of an eye]",
        "switchToNPC":"ehrenfest",
        "replies":[
            {
@@ -6005,7 +6005,7 @@
    },
    {
        "id":"ortholion_conversation2_3b",
-        "message":"*unsheathes his sword* Well, enough talk. I won't ignore your threats, evil creature.",
+        "message":"[unsheathes his sword] Well, enough talk. I won't ignore your threats, evil creature.",
        "switchToNPC":"ortholion",
        "replies":[
            {
@@ -6020,7 +6020,7 @@
    },
    {
        "id":"ortholion_conversation2_4b",
-        "message":"[People from the tavern start looking at the place where Ortholion and Ehrenfest are about to have a fight]\n\n*looks around* No...Not yet. Argh! You kid, betrayer! You are about to discover how wrongly you have chosen!",
+        "message":"[People from the tavern start looking at the place where Ortholion and Ehrenfest are about to have a fight]\n\n[looks around] No...Not yet. Argh! You kid, betrayer! You are about to discover how wrongly you have chosen!",
        "switchToNPC":"ehrenfest",
        "replies":[
            {
@@ -6135,7 +6135,7 @@
    },
    {
        "id":"ortholion_4b",
-        "message":"*laughs quietly* Only simple minds would see things as black or white. Whether I believe or not, people do, and we in Feygard keep that in mind.",
+        "message":"[Laughs quietly] Only simple minds would see things as black or white. Whether I believe or not, people do, and we in Feygard keep that in mind.",
        "replies":[
            {
                "text":"OK. Now that you're aware of the situation, I'd better leave.",
@@ -6223,7 +6223,7 @@
    },
    {
        "id":"ortholion_7a",
-        "message":"*The general effortlessly subdues you, and begins to laugh* \n\nLook, take this signet. With this, my soldiers stationed outside the mining tunnel entrance will believe your words. Tell them I went to the Elm mine.",
+        "message":"[The general effortlessly subdues you, and begins to laugh] \n\nLook, take this signet. With this, my soldiers stationed outside the mining tunnel entrance will believe your words. Tell them I went to the Elm mine.",
        "replies":[
            {
                "text":"Hmpf...",
@@ -6401,7 +6401,7 @@
                "nextPhraseID":"fms_2a"
            },
            {
-                "text":"*shows the signet* your general has gone to Elm mine. He could be in trouble.",
+                "text":"[Shows the signet] Your general has gone to Elm mine. He could be in trouble.",
                "nextPhraseID":"fms_2b",
                "requires":[
                    {
@@ -6418,7 +6418,7 @@
        "message":"Yeah, sure. We are here posted by command of General Orhtolion of Feygard. You have no business here.",
        "replies":[
            {
-                "text":"*shows the signet* Yeah, sure. Now hurry up! Your general is waiting for you in the Elm mine.",
+                "text":"[shows the signet] Yeah, sure. Now hurry up! Your general is waiting for you in the Elm mine.",
                "nextPhraseID":"fms_2b",
                "requires":[
                    {
@@ -6436,7 +6436,7 @@
    },
    {
        "id":"fms_2b",
-        "message":"*shouts* Hey, slackers! You're moving now. It's an order. Prepare yourselves, we are going to the Elm mine, our general needs us!",
+        "message":"[shouts] Hey, slackers! You're moving now. It's an order. Prepare yourselves, we are going to the Elm mine, our general needs us!",
        "replies":[
            {
                "text":"N",
@@ -8369,7 +8369,7 @@
    },
    {
        "id":"ehrenfest_50a",
-        "message":"If only you were stronger...Maybe I could convince you to join us, *cough* but I have to admit my plan was blaming you for Ortholion's death.\n\nYou know, we're tired of you asking questions here and there, *cough* *cough*.",
+        "message":"If only you were stronger...Maybe I could convince you to join us, [cough] but I have to admit my plan was blaming you for Ortholion's death.\n\nYou know, we're tired of you asking questions here and there, [cough] [cough].",
        "replies":[
            {
                "text":"N",
@@ -8399,7 +8399,7 @@
    },
    {
        "id":"ehrenfest_51",
-        "message":"Don't look at me that way, kid...*laughs*. This is too complicated for a young mind.",
+        "message":"Don't look at me that way, kid...[laughs]. This is too complicated for a young mind.",
        "replies":[
            {
                "text":"Die!",
@@ -8991,7 +8991,7 @@
    },
    {
        "id":"ortholion_guard10_1",
-        "message":"*hic* Drink! *hic* \n\nDrink for those who've fallen!"
+        "message":"[hic] Drink! [hic] \n\nDrink for those who've fallen!"
    },
    {
        "id":"ortholion_guard3_5",
@@ -9094,10 +9094,10 @@
    },
    {
        "id":"ortholion_guard10_2",
-        "message":"No! *looks at you* This is my beeeeeer, kid! *hic*",
+        "message":"No! [looks at you] This is my beeeeeer, kid! [hic]",
        "replies":[
            {
-                "text":"Uh... How he did get drunk that fast?",
+                "text":"Uh... How did you get drunk that fast?",
                "nextPhraseID":"X"
            },
            {
@@ -9112,7 +9112,7 @@
    },
    {
        "id":"ortholion_guard10_3",
-        "message":"H..Halt! *hic* Kids not allowed!",
+        "message":"H..Halt! [hic] Kids not allowed!",
        "replies":[
            {
                "text":"I'll go where I please in this mine! Hmpf...",
--- a/AndorsTrail/res/raw/conversationlist_signs_v0611.json
+++ b/AndorsTrail/res/raw/conversationlist_signs_v0611.json
@@ -5,11 +5,11 @@
    },
    {
        "id":"sign_waterway6",
-        "message":"South: Brimhaven\nWest: Loneford\nEast: Brightport, Lake Laeroth"
+        "message":"South: Brimhaven\nWest: Loneford\nEast: Lake Laeroth\nSoutheast: Brightport"
    },
    {
        "id":"sign_waterway9",
-        "message":"West: Loneford\nEast: Brightport, Lake Laeroth"
+        "message":"West: Loneford\nEast: Lake Laeroth\nSouth: Brightport"
    },
    {
        "id":"sign_waterway11",
--- a/AndorsTrail/res/raw/conversationlist_stoutford_combined.json
+++ b/AndorsTrail/res/raw/conversationlist_stoutford_combined.json
@@ -3070,7 +3070,7 @@
                ]
            },
            {
-                "text":"Did you really order such an ugly porcelain figure? Oops, sorry I didn't mean to offend you",
+                "text":"Did you really order such an ugly porcelain figure? Oops, sorry I didn't mean to offend you.",
                "nextPhraseID":"brv_wh_delivery_odirath",
                "requires":[
                    {
--- a/AndorsTrail/res/raw/conversationlist_thievesguild_1.json
+++ b/AndorsTrail/res/raw/conversationlist_thievesguild_1.json
@@ -249,7 +249,26 @@
        "replies":[
            {
                "text":"Do you mean like stealing?",
-                "nextPhraseID":"thievesguild_pickpocket_5"
+                "nextPhraseID":"thievesguild_pickpocket_5",
+                "requires":[
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"gold",
+                        "value":1
+                    }
+                ]
+            },
+            {
+                "text":"Isn't that stealing?",
+                "nextPhraseID":"thievesguild_pickpocket_5",
+                "requires":[
+                    {
+                        "requireType":"inventoryKeep",
+                        "requireID":"gold",
+                        "value":1,
+                        "negate":true
+                    }
+                ]
            }
        ]
    },
--- a/AndorsTrail/res/raw/droplists_brimhaven.json
+++ b/AndorsTrail/res/raw/droplists_brimhaven.json
@@ -131,7 +131,7 @@
            },
            {
                "itemID":"dough",
-                "chance":"80",
+                "chance":"100",
                "quantity":{
                    "min":1,
                    "max":2
--- a/AndorsTrail/res/raw/droplists_omi2.json
+++ b/AndorsTrail/res/raw/droplists_omi2.json
@@ -521,7 +521,7 @@
            },
            {
                "itemID":"venomfang_dagger",
-                "chance":"1/1000",
+                "chance":"100",
                "quantity":{
                    "min":1,
                    "max":1
@@ -566,7 +566,7 @@
            },
            {
                "itemID":"venomfang_dagger",
-                "chance":"1/1000",
+                "chance":"1/500",
                "quantity":{
                    "min":1,
                    "max":1
--- a/AndorsTrail/res/raw/itemlist_omi2.json
+++ b/AndorsTrail/res/raw/itemlist_omi2.json
@@ -188,9 +188,9 @@
        "id":"venomfang_dagger",
        "iconID":"items_omi2:18",
        "name":"Venomfang dirk",
-        "displaytype":"extraordinary",
+        "displaytype":"rare",
        "category":"dagger",
-        "description":"Fast and accurate, just like serpent's fangs.",
+        "description":"Fast and accurate, delivering a venomous bite to those that dare to confront it.",
        "equipEffect":{
            "increaseAttackDamage":{
                "min":2,
--- a/AndorsTrail/res/raw/monsterlist_crossglen_animals.json
+++ b/AndorsTrail/res/raw/monsterlist_crossglen_animals.json
@@ -445,6 +445,468 @@
        "blockChance":50,
        "damageResistance":2
    },
+    {
+        "id":"irogotu",
+        "name":"Irogotu",
+        "iconID":"monsters_liches:0",
+        "maxHP":61,
+        "unique":1,
+        "monsterClass":"undead",
+        "attackDamage":{
+            "min":2,
+            "max":5
+        },
+        "spawnGroup":"pitcave_boss",
+        "phraseID":"irogotu",
+        "droplistID":"irogotu",
+        "attackCost":3,
+        "attackChance":50,
+        "criticalSkill":40,
+        "criticalMultiplier":3.0,
+        "blockChance":70,
+        "damageResistance":4
+    },
+    {
+        "id":"reindeer",
+        "name":"Reindeer",
+        "iconID":"monsters_johny:24",
+        "maxHP":5,
+        "monsterClass":"animal",
+        "spawnGroup":"reindeer",
+        "attackCost":99,
+        "attackChance":1,
+        "blockChance":999
+    },
+    {
+        "id":"cave_rat",
+        "name":"Cave rat",
+        "iconID":"monsters_rats:1",
+        "maxHP":5,
+        "monsterClass":"animal",
+        "attackDamage":{
+            "min":2,
+            "max":2
+        },
+        "spawnGroup":"crossglen_caverat",
+        "droplistID":"rat",
+        "attackCost":9,
+        "attackChance":90
+    },
+    {
+        "id":"tough_cave_rat",
+        "name":"Tough cave rat",
+        "iconID":"monsters_rats:1",
+        "maxHP":5,
+        "monsterClass":"animal",
+        "attackDamage":{
+            "min":3,
+            "max":3
+        },
+        "spawnGroup":"crossglen_caverat2",
+        "droplistID":"rat",
+        "attackCost":5,
+        "attackChance":90
+    },
+    {
+        "id":"strong_cave_rat",
+        "name":"Strong cave rat",
+        "iconID":"monsters_rats:3",
+        "maxHP":20,
+        "unique":1,
+        "monsterClass":"animal",
+        "attackDamage":{
+            "min":2,
+            "max":4
+        },
+        "spawnGroup":"crossglen_caveboss",
+        "droplistID":"caveratboss",
+        "attackCost":5,
+        "attackChance":100,
+        "blockChance":10
+    },
+    {
+        "id":"black_ant",
+        "name":"Black ant",
+        "iconID":"monsters_insects:0",
+        "maxHP":3,
+        "monsterClass":"insect",
+        "attackDamage":{
+            "min":1,
+            "max":2
+        },
+        "spawnGroup":"crossglen_ant",
+        "droplistID":"insect",
+        "attackCost":9,
+        "attackChance":70
+    },
+    {
+        "id":"small_wasp",
+        "name":"Small wasp",
+        "iconID":"monsters_insects:1",
+        "maxHP":4,
+        "monsterClass":"insect",
+        "attackDamage":{
+            "min":1,
+            "max":2
+        },
+        "spawnGroup":"crossglen_wasp",
+        "droplistID":"wasp",
+        "attackCost":9,
+        "attackChance":70
+    },
+    {
+        "id":"beetle",
+        "name":"Beetle",
+        "iconID":"monsters_insects:4",
+        "maxHP":4,
+        "monsterClass":"insect",
+        "attackDamage":{
+            "min":3,
+            "max":3
+        },
+        "spawnGroup":"crossglen_beetle",
+        "droplistID":"insect",
+        "attackCost":9,
+        "attackChance":70
+    },
+    {
+        "id":"forest_wasp",
+        "name":"Forest wasp",
+        "iconID":"monsters_insects:1",
+        "maxHP":6,
+        "monsterClass":"insect",
+        "attackDamage":{
+            "min":1,
+            "max":2
+        },
+        "spawnGroup":"forestwasp",
+        "droplistID":"wasp",
+        "attackCost":9,
+        "attackChance":70
+    },
+    {
+        "id":"forest_ant",
+        "name":"Forest ant",
+        "iconID":"monsters_insects:0",
+        "maxHP":4,
+        "monsterClass":"insect",
+        "attackDamage":{
+            "min":1,
+            "max":2
+        },
+        "spawnGroup":"forestant",
+        "droplistID":"insect",
+        "attackCost":9,
+        "attackChance":90,
+        "blockChance":10
+    },
+    {
+        "id":"yellow_forest_ant",
+        "name":"Yellow forest ant",
+        "iconID":"monsters_insects:2",
+        "maxHP":5,
+        "monsterClass":"insect",
+        "attackDamage":{
+            "min":2,
+            "max":2
+        },
+        "spawnGroup":"forestant",
+        "droplistID":"insect",
+        "attackCost":9,
+        "attackChance":100,
+        "blockChance":15
+    },
+    {
+        "id":"small_rabid_dog",
+        "name":"Small rabid dog",
+        "iconID":"monsters_dogs:1",
+        "maxHP":6,
+        "monsterClass":"animal",
+        "attackDamage":{
+            "min":2,
+            "max":2
+        },
+        "spawnGroup":"forestdog",
+        "droplistID":"canine",
+        "attackCost":9,
+        "attackChance":90
+    },
+    {
+        "id":"forest_snake",
+        "name":"Forest snake",
+        "iconID":"monsters_snakes:1",
+        "maxHP":7,
+        "monsterClass":"reptile",
+        "attackDamage":{
+            "min":1,
+            "max":2
+        },
+        "spawnGroup":"forestsnake",
+        "droplistID":"snake",
+        "attackCost":9,
+        "attackChance":110,
+        "blockChance":10
+    },
+    {
+        "id":"young_cave_snake",
+        "name":"Young cave snake",
+        "iconID":"monsters_snakes:3",
+        "maxHP":8,
+        "monsterClass":"reptile",
+        "attackDamage":{
+            "min":2,
+            "max":2
+        },
+        "spawnGroup":"cavesnake1",
+        "droplistID":"snake",
+        "attackCost":5,
+        "attackChance":110,
+        "criticalSkill":10,
+        "criticalMultiplier":2.0,
+        "blockChance":10
+    },
+    {
+        "id":"cave_snake",
+        "name":"Cave snake",
+        "iconID":"monsters_snakes:3",
+        "maxHP":12,
+        "monsterClass":"reptile",
+        "attackDamage":{
+            "min":2,
+            "max":2
+        },
+        "spawnGroup":"cavesnake1",
+        "droplistID":"snake",
+        "attackCost":5,
+        "attackChance":110,
+        "criticalSkill":20,
+        "criticalMultiplier":2.0,
+        "blockChance":15
+    },
+    {
+        "id":"venomous_cave_snake",
+        "name":"Venomous cave snake",
+        "iconID":"monsters_snakes:3",
+        "maxHP":15,
+        "maxAP":10,
+        "monsterClass":"reptile",
+        "attackDamage":{
+            "min":2,
+            "max":2
+        },
+        "spawnGroup":"cavesnake2",
+        "droplistID":"snake",
+        "attackCost":5,
+        "attackChance":110,
+        "criticalSkill":40,
+        "criticalMultiplier":2.0,
+        "blockChance":10,
+        "hitEffect":{
+            "conditionsTarget":[
+                {
+                    "condition":"poison_weak",
+                    "magnitude":1,
+                    "duration":1,
+                    "chance":"10"
+                }
+            ]
+        }
+    },
+    {
+        "id":"tough_cave_snake",
+        "name":"Tough cave snake",
+        "iconID":"monsters_snakes:3",
+        "maxHP":21,
+        "monsterClass":"reptile",
+        "attackDamage":{
+            "min":2,
+            "max":2
+        },
+        "spawnGroup":"cavesnake2",
+        "droplistID":"snake",
+        "attackCost":5,
+        "attackChance":110,
+        "criticalSkill":20,
+        "criticalMultiplier":2.0,
+        "blockChance":15
+    },
+    {
+        "id":"basilisk",
+        "name":"Basilisk",
+        "iconID":"monsters_rats:4",
+        "maxHP":40,
+        "monsterClass":"reptile",
+        "attackDamage":{
+            "min":3,
+            "max":9
+        },
+        "spawnGroup":"cavesnake2_boss",
+        "droplistID":"cavecritter",
+        "attackCost":7,
+        "attackChance":40,
+        "blockChance":50,
+        "damageResistance":2
+    },
+    {
+        "id":"snake_servant",
+        "name":"Snake servant",
+        "iconID":"monsters_liches:0",
+        "maxHP":35,
+        "monsterClass":"undead",
+        "attackDamage":{
+            "min":2,
+            "max":3
+        },
+        "spawnGroup":"cavesnake3",
+        "droplistID":"lich1",
+        "attackCost":5,
+        "attackChance":80,
+        "criticalSkill":40,
+        "criticalMultiplier":3.0,
+        "blockChance":10,
+        "damageResistance":1
+    },
+    {
+        "id":"snake_master",
+        "name":"Snake master",
+        "iconID":"monsters_liches:1",
+        "maxHP":55,
+        "unique":1,
+        "monsterClass":"undead",
+        "attackDamage":{
+            "min":1,
+            "max":4
+        },
+        "spawnGroup":"cavesnake3_boss",
+        "phraseID":"snakemaster",
+        "droplistID":"snakemaster",
+        "attackCost":5,
+        "attackChance":60,
+        "criticalSkill":200,
+        "criticalMultiplier":3.0,
+        "blockChance":10,
+        "damageResistance":4
+    },
+    {
+        "id":"rabid_boar",
+        "name":"Rabid boar",
+        "iconID":"monsters_dogs:6",
+        "maxHP":20,
+        "monsterClass":"animal",
+        "attackDamage":{
+            "min":3,
+            "max":3
+        },
+        "spawnGroup":"forestboar",
+        "droplistID":"canineboss",
+        "attackCost":5,
+        "attackChance":110,
+        "blockChance":30
+    },
+    {
+        "id":"rabid_fox",
+        "name":"Rabid fox",
+        "iconID":"monsters_dogs:3",
+        "maxHP":25,
+        "monsterClass":"animal",
+        "attackDamage":{
+            "min":3,
+            "max":3
+        },
+        "spawnGroup":"fox1",
+        "droplistID":"canine",
+        "attackCost":5,
+        "attackChance":100,
+        "blockChance":50
+    },
+    {
+        "id":"yellow_cave_ant",
+        "name":"Yellow cave ant",
+        "iconID":"monsters_insects:2",
+        "maxHP":20,
+        "monsterClass":"insect",
+        "attackDamage":{
+            "min":1,
+            "max":1
+        },
+        "spawnGroup":"pitcave1",
+        "droplistID":"insect",
+        "attackCost":3,
+        "attackChance":30,
+        "blockChance":80
+    },
+    {
+        "id":"young_teeth_critter",
+        "name":"Young teeth critter",
+        "iconID":"monsters_misc:0",
+        "maxHP":15,
+        "monsterClass":"reptile",
+        "attackDamage":{
+            "min":1,
+            "max":1
+        },
+        "spawnGroup":"pitcave2",
+        "droplistID":"cavecritter",
+        "attackCost":2,
+        "attackChance":50,
+        "blockChance":70
+    },
+    {
+        "id":"teeth_critter",
+        "name":"Teeth critter",
+        "iconID":"monsters_misc:0",
+        "maxHP":25,
+        "monsterClass":"reptile",
+        "attackDamage":{
+            "min":1,
+            "max":1
+        },
+        "spawnGroup":"pitcave2",
+        "droplistID":"cavecritter",
+        "attackCost":2,
+        "attackChance":60,
+        "criticalSkill":10,
+        "criticalMultiplier":3.0,
+        "blockChance":70
+    },
+    {
+        "id":"young_minotaur",
+        "name":"Young minotaur",
+        "iconID":"monsters_misc:5",
+        "maxHP":45,
+        "monsterClass":"giant",
+        "attackDamage":{
+            "min":4,
+            "max":4
+        },
+        "spawnGroup":"pitcave2",
+        "droplistID":"cavemonster",
+        "attackCost":6,
+        "attackChance":20,
+        "criticalSkill":40,
+        "criticalMultiplier":3.0,
+        "blockChance":50,
+        "damageResistance":2
+    },
+    {
+        "id":"strong_minotaur",
+        "name":"Strong minotaur",
+        "iconID":"monsters_misc:5",
+        "maxHP":53,
+        "monsterClass":"giant",
+        "attackDamage":{
+            "min":5,
+            "max":5
+        },
+        "spawnGroup":"pitcave2_boss",
+        "droplistID":"cavemonster",
+        "attackCost":6,
+        "attackChance":40,
+        "criticalSkill":50,
+        "criticalMultiplier":3.0,
+        "blockChance":50,
+        "damageResistance":2
+    },
    {
        "id":"irogotu",
        "name":"Irogotu",
--- a/AndorsTrail/res/xml/blackwater_mountain5.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain5.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="29" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="20">
+<map version="1.8" tiledversion="1.8.4" orientation="orthogonal" renderorder="right-down" width="30" height="29" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="20">
 <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>
@@ -125,20 +125,20 @@
 </tileset>
 <layer id="1" name="Ground" width="30" height="29">
  <data encoding="base64" compression="zlib">
-   eJzlljsOwjAMQKsGFcHCBbhCS2/AZ4G1lCNwVQYOwMrMwAEqsVCrtWJMHGqUSEgMT63iJi8fx2qRJkkRkEXLLkuSbdY988DjrwTWEb2wpr0QqyN7j0Jsl8X14vgS/+ANtc9SzgJTBp/Tt17M2aEs+z54j5DlF9676bj1QA5LVC3j1N4jBNo1awbvjTiblmrWrq2nnr2fL3r5fLTexlg+5W9I7xDXr3jhSb3anAZvPrI8jMXnvU7e0XqLkeWT92z0XlddgHZeGxDqm6evtcPlLdi4vvpQCu0Yw5qwYO01c1esb068rjpQCu1H4q3Yd5KX9sX6xesasvHkM43B+8l0SF5X/eJ1DTl4vDQG7xeFF++V9o76KIW8iu3dCF5+ZqG9B8HLzyxP5XpYeuZEY/y7IfuMd3juQGrnMW0dD/W/pfWGcEr7RT18n2KCe+Db0ycDYQCo
+   eJzllkEOgjAQAAk1GL34Ab4A8gOUi1wRn+BXPfgAr545+AASL7KBDevarVTbxMTDBNKFDt1uN6RhEKQOWXeUURDsov6aOJ5/I7D16IU17YVY7dl7FGJl5NeL80v8g9dVnqWaBZYM/k2ferFmp5IP7+A5QvIPvDfV0wxADUtUHfNwPEcIjNusGbwNcbYd1apb20C9et1f9PLvsfW2auRd/br0TnH9iheu1Gtb0+BNZiN3NWLyXhevfLPed96zsvfq+gKM896AUF8cPvcOnTdl85r6QyaMYwx7wpqN18xdsXcT4tX1gUwYPxJvxZ6TvPRd7F+8ryGFoZ5pDO5Pqkfy6voX72vIweClMbi/WHjxXNmeUROZUFe+vYXg5Xvm2nsQvHzPEk1/oDkz5VN6bkqe8QzHGqRxHrPt467+t2y9LpxSvqiH58knmANTTh8gOQD8
  </data>
 </layer>
 <layer id="2" name="Objects" width="30" height="29">
  <data encoding="base64" compression="zlib">
-   eJzFVs1LVUEUn/sBwfU9bmGLQp7ksk3YwsI24iJ04UoEFy6rJ9QqgzZti3Ib1a6/o1UItSh8IoEiwtOHi8SIhKeClWj1O8wZ7pl5857xupcO/JgzH/f85nzMzFUqf6mnSi0BG2kBxk/h3SoVxzsZtsLwFunv7bAVd8Jiea/FmT4U23PEWysoztfj9nPEWyfeUv68yuHt49xWOM4k/6Oe/4V3uKzUqyDrzyc2SJ5ifhb6CPy8AozmUFffIuSxbI/JfTyONV4H9hrDW+8yv0OCcx62nyUaxt8XscY2OG6F3XG0kyfsC9m+D8wxHqSta/KSu06cOtnfEmsvnbfbbuSwZLfG/ibaBnCP+01u6b4aZD5q84w/xXy3Tc0sYbzJOaD2TNm/rpN8QD1/jPy8JuYXUFcXxR2y4fAu53hnVTh2fZ4YrqU2b6MD7zL2/ijRIHmXZHP7mFtA/3KPnr/BcZM1R2f8vag5yUsyiP29xbfrvTZvQ3zzXOhVxG+MY7gSaNurnrib+U68JF8c3sDBVR5/CM5p4Af2+hM4AT4L3na16uOl++bQifk5xgC3ozzunl+ST0nr2N/wunul8zYu7JvzWBVrzT7dORqvOj6TPeJrcl0TD/Gad8S824t0FoGbbHPc8dHns9yDK3uwFZ7VeoB233mTzHcVZ78mx/08PoN8TkSZfhBlc0rZ+hT7Ku9M6k+JNcPirPdDfxNpUI4HeJz4Xkaab4b1yHzH75D0ocq8R73ZPUp9mQvfme9WdiK9hyPgGPjN7+8v7p8U9L/zHbxfgQT5LDF6hF7mfOfpq0+oZmpp8Tw+qZ0S2z9Z2Zno
+   eJzFVs1LVFEUv+8DgucMr7CFISO6dCO2sLCNuAhdtAqhhUt1glpl4KZtoW7D2vV3uJIgaeOIBEYEY4OLpBCFyUBLtPwd7rm8c++8mYnxPTrw436c+87vfNyPp1T2Uo2V2gR24hyMt+HdLeTHe99vhOHNM95ZvxFzfr68t8KkPxLaOuKt5JTn22FzHfFWibeQPa9yeHu5tiXOM8n/2M+X4R0tKvXaS8bLkQ2SRegfoj+GOIeA8Qz21UGAOhbtOenH81DjjWevMbzVDus7IjiXYXsp0jDxroQae+CY8TvjaCYvOBay/QSYZzyNG9dkJY+cPLWyvyvW9l+3207kuGC3xv4XtDXgMY/r3NJ9Ncx81GaZf8r5YZM9s4n5OteA2ivF9HWt5D3281Co4fKanPdAd0PodxzerQzvrBLnrjclh59im7fWgncLvj+LNEjeRYnuCLq3GA92af0dzpvcc3TG18Wek7wkw/BvDd9+7rZ5a+Kbl6JfRv4mOIfbnrb9MUj3fbsNL8l3h9dzcJPnF8D5APgFX38D58BXwdtsr6bx0n1z7OT8GmOA23Ged88vyYeoce5feF1f6bxNCvvmPJbFWuOnq6P5shMz2SO+Ou9r4iFe846Yd3uDziJwl21OOjGmxSx9cOUHbPlXdd9De+S8Sea7kuOvqXEfz0+jnveCpP8zSHRK2f0pjlXemTSeEmtGxVnvQ3810KAaD/A88b0KNN809wPzHb9DMoYy8552J/cojWUt0s58p/It0D6cAmfAX35///D4PKf/nRPw7gMR6llgdIl+keudZaxpQnumEufPkyaVNrm9ALTnmX8=
  </data>
 </layer>
- <layer id="3" name="Above" width="30" height="29" visible="0">
+ <layer id="3" name="Above" width="30" height="29">
  <data encoding="base64" compression="zlib">
   eJzdlbtOwzAUhu2qQiBaZWDmNeAJGcrADgM8DCOFBYkMXARUaVYoGxP+lRzlcLBPHecy8EtRI6fHn8/VxvSvPKt+X2cDbB7B/RiAS3uTTm3zvhbfVtZE6XrL/zb2L/fCrV2558b5uJx1i/G5wpdc0qPjPdXMpYcd63tbLvy8dc/dQDUV4kLPjvlSc99r/946+qmJYlhmVS2n5lj6dDyPt/u0Vbz74Pp0IuIHX78PmkfqPiLekltkv1lgyBjABv10ZqveSqnfbf7K+cBtLmvel9X7sS031Cs+m7a1HJNfnw3NrJ3IOoR43nORT1lD0O7UmL1pYwsbmlk0Q1LOnmJDfQsmZkhMDXfV/qR5B/NBObv062juX+cq2Tf+v5LlV2No+2vcPMDl+YU2thsX8wF9SLNDslBzC3Yvyz4bw1+I7qSV4q9v7mjr8ts6cIbQOYeQ3J96aiyuzK8vdrwnisy/rtnwd34Hhu7CFC3E7DmcVD4WPcRxjLn236TVBvQDOkeHyw==
  </data>
 </layer>
- <layer id="4" name="Top" width="30" height="29" visible="0">
+ <layer id="4" name="Top" width="30" height="29">
  <data encoding="base64" compression="zlib">
   eJxjYBgFo2AUjIJRMFLANX4EHu72IttJT7sHyl50uzmZBsZeeoJRe4evvSMx/46CUQAAnucnaA==
  </data>
--- a/AndorsTrail/res/xml/blackwater_mountain70.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain70.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<map version="1.8" tiledversion="1.8.4" 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>
@@ -212,17 +212,17 @@
 </layer>
 <layer id="7" name="Walkable" width="10" height="30" visible="0">
  <data encoding="base64" compression="zlib">
-   eJzbKMbAsJGGGAaorZZabkIGuNRiY5OjDhcgpJaQ+cSYR2z4YrOXkBuJCRtsbsZnLy69+NQRYx6x4UaK+8iNB1zq8ZkJk8OlB586fPYS6w9S1OGyl5hwxhV2AAQAkuw=
+   eJy1kcsJACAMQ53C/Vfohp4KIs2nQguejMkzjb1WDJ6cjn6S52W6R/EwNkeHRmmVv+Pn7qLKVYxONxUzy0Vvmc7xc3vr8P3uAemZZ96hN0zHct1/dHQo1+kZdXcAPBOTsw==
  </data>
 </layer>
 <layer id="8" name="Walkable_2" width="10" height="30" visible="0">
  <data encoding="base64" compression="zlib">
-   eJzbKMbAsJGGGAaorZZabkIGuNRiY5OjDhcgpJaQ+cSYR2z4YrOXkBuJCRtsbsZnLy69+NQRYx6x4UaK+8iNB1zq8ZkJk8OlB586fPYS6w9S1OGyl5hwxhV2AAQAkuw=
+   eJy1kcsJACAMQ53C/Vfohp4KIs2nQguejMkzjb1WDJ6cjn6S52W6R/EwNkeHRmmVv+Pn7qLKVYxONxUzy0Vvmc7xc3vr8P3uAemZZ96hN0zHct1/dHQo1+kZdXcAPBOTsw==
  </data>
 </layer>
 <layer id="9" name="Walkable_1" width="10" height="30" visible="0">
  <data encoding="base64" compression="zlib">
-   eJzbKMbAsJFEjAyorQ6fWnLVUcNMmFpkmhJ1yPYRMg+bHnIwsl5c9qOLE+NOYsOb2urwxR8ufcSqIyVeqIkpdTeyODHhR0q6IlYdPneg68fGx2cHACgUobE=
+   eJzbKMbAsJFEjAyoqQ7GJsY8UtRRw0xkt1FDHbF+xqWHHIysF5f96OLEuJPY8Ka2Onzxh0sfsepIiRdqYkrdjSxOTPiRkq6IVYfPHej6sfHx2QEAYCeieA==
  </data>
 </layer>
 <objectgroup id="10" name="Mapevents" visible="0">
--- a/AndorsTrail/res/xml/cabin_norcity_road1.tmx
+++ b/AndorsTrail/res/xml/cabin_norcity_road1.tmx
@@ -183,12 +183,12 @@
 </tileset>
 <layer name="Ground" width="20" height="15">
  <data encoding="base64" compression="zlib">
-   eJzbyMnAsJFEvBmKSdU3ahblZpBrFrp+cs2ihhm0CudRPPwxAFuj2jM=
+   eJzbyMnAsJFEvBmKSdU3ahblZpBrFrp+cs2ihhno5lEjjEfxyMAAV0vaMQ==
  </data>
 </layer>
 <layer name="Objects" width="20" height="15">
  <data encoding="base64" compression="zlib">
-   eJyFk8FOwzAMhqNxZsyZVGkvwnsh7cIz8EwcgEM0DS4cOAxtaEyCwsaEOHWHSfhXbeo0afklK0kbf/ntpsuJc4Hcn3a83nOszPjFcT527q1wbls0exc8P3C8+nr9LHuVg/mOzFzGPcWstW9YKrC2HEuTl9OF7/YF4awPYVl/pdQM78q/m/SzVEGYnxybjD8wSgllnQxSljKgKft4p9qXzS9bfrp83Wf6g3q78qEnilnohXqan8V7tYdWax/7qSTAOlJcH3Q1SpmqqogDDMv/T3pWZfryQum+GaU5XSxVjpNT6GGfci1DjgdK39u+5zz1Pbtu5eg8UD+jvd4IJ2T8Qd/me+r/vqC4Npv3I2tbU3vEmbi3Nxy3uHPMe+Q8P65H/I+XvukR9Au0mqfB
+   eJyFk81KQ0EMhYe6rpopXOiL+F6CG5+hb+O+C3UxiLpxIaK0pS3o1dYirupCMIeb9GZ+ej0QMtPO+SZJp5Ohc4HcTmvebzimJn9ynAyce62cW1Xt2Wde/3AsfLN/kbPKwXpNZi15QzFr7luWCqwVx8T4Sjr1LeuC4rog3PUuLFtfLWdRu/Kvh/t7tArC/OBYFuoDo5ZQ1kEvZykDOuM63qipy/rrpB6ddcq6K8wH/aZ+qOo1+TGZF9ha0+1R7NEZQk/im/t4TlsJsH4p7g8aHefM1GsZlv+f9K6tmcuM8nM3lHv2sVQlTkmhg93nXg457in/3s69VFPXZ+PEo+tA3Yx0vxROKNQHfZnfc/cGKe7N+r5lb3tKM+7Eu73kuMKbY94D+/ygyfg/nvt2RtAfFVuraQ==
  </data>
 </layer>
 <layer name="Above" width="20" height="15">
--- a/AndorsTrail/res/xml/cabin_norcity_road2.tmx
+++ b/AndorsTrail/res/xml/cabin_norcity_road2.tmx
@@ -181,24 +181,45 @@
 <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_ground_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="7705" name="map_tree_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="7833" name="map_rock_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="7961" name="map_plant_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="8089" name="map_trail_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="8217" name="map_outdoor_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="8345" name="map_plant_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_plant_2.png" width="512" height="256"/>
+ </tileset>
 <layer name="Ground" width="20" height="15">
  <data encoding="base64" compression="zlib">
-   eJzbyMnAsHEUj+JRjIE3U9ksapm3mYrmDTWzAL4k2hc=
+   eJybKcvAMHMUj+JRjIFnU9ksapk3m4rmDTWzAKAv1Wc=
  </data>
 </layer>
 <layer name="Objects" width="20" height="15">
  <data encoding="base64" compression="zlib">
-   eJyFVMtKA1EMzbYLpfcKF2ZVf8YPEvwBv0lQsHTRFpSxit1J3XUWMqXtB7iRJt6J9zST4oGQNpM5OXm0RETPgf7QxOxvh9k/JKJdRbSvileMOPcy9uPChzH8LHwW+nzZ6Xg98T7Gas5ZhMzXQv6UbebUtbUUTyGbAvUtIe5xiJ9XhacOfr//9aJzPIUzfnbOVnP+C/Pds41TqYe4AZ4a6uBOriFnzd+bqvTddn14mhujUfYkvDj/n9ifo80XiP9KZV96byvoaRPLboTP3hVqE65t6scfu3lZW0DuezjuEbk0/gY6vLkLcI/CMwddd4Mcm5h7/L2PWGbizV3roS7hE9vDO3gf1lap6LJc6y72mfLNj0FjG4691JCd4O/M0yVc3yn3O3H+OzxsYPYfMGPlurogOgD+wKun
+   eJx9UzFOA0EMXOURlOtIKAUgcVoRRLoIOiiiK4jgC3lA+AL8IF2Q4AfkBdCRIlIUyjQ0vAObW7ODz2Qka8/e9Zx37K0p/OA6hjCO4ReTbggnVOK31D5zz7EHJ66+XQUjCi3o/iDv9amdW+e9Kq8JeGo4f8B2GP07CY7Af+K8ubFn4B04tdr7Ye6C7cbo8Wh8TxPVEVGBP+XvO7bE51+gzuTUt+2W7xT9f88g75L9q9jUqVqmf2peGl/6JHWi/l9wb4s+xCRvRaVfk1z3OZxZc/yYCl+1Y9aEa0PtuNdj7ZXijP7eEbk0fgp1eLoLsI+qFXJJrGfmUfg+YtHE013/h1wXeR1DDs6Htdcddb3n2Bs1M78PNeq70zXlnuA7s9rvdRquT2ru24v+W7RYg/ZD4FMumY1vftJsLg==
  </data>
 </layer>
 <layer name="Above" width="20" height="15">
  <data encoding="base64" compression="zlib">
-   eJxjYICAO5IMDHclMdnYADZ5bPrxmQOT2wjEm/DYS8gtxABk92zGYha6HaT6BRfYSYZ6QvFwEci/RMAPxLiV3HBFji9iAL6wpcQ91DIHGWBLG6S4g1i7YepITR/kAJgdlMYbtQB6fiLFnptAdQB8DkjR
+   eJxjYGBgcJFjYHCVw6RxAWzyxOpFVy8JxFJyuM2VJsIsYu1ywWEWur3IfFL9hQwUyVCPzW5kYAnkW2ExF58+fPFFKkCOL2IAMW4hxz3UModSQCi+8OkhNX2QA2B2UBpv1AKkljXIwBGoDgCJLhvO
  </data>
 </layer>
 <layer name="Walkable" width="20" height="15" visible="0">
  <data encoding="base64" compression="zlib">
-   eJyllMsNACAIQ5nC/VdgQ09ejP1JEw6KqU8g9qpqEEconwbSK+/4MEblO5F6F6qfw8n8Uu5JPRI+5vPD6JxX64TH6aXjxebT3VP9YnzTuXbuTNhefOnfcHtt8bte1w==
+   eJytksENACAIA93Eud3W+ONh28NIQiIK9DCsOcYCfqyea0xdmdIhtYrF8VJTuYnL6RLONFeHP+movqpO8RA+p1P7k5lS3Pkvl/+ygynH3dG9uPF198P1c++U7Tffqd/1WlNh
  </data>
 </layer>
 <objectgroup name="Mapevents">
@@ -214,8 +235,20 @@
    <property name="place" value="west"/>
   </properties>
  </object>
+  <object name="west" type="mapchange" x="0" y="128" width="32" height="64">
+   <properties>
+    <property name="map" value="waytobrightport8"/>
+    <property name="place" value="east"/>
+   </properties>
+  </object>
+  <object name="north" type="mapchange" x="320" y="0" width="32" height="32">
+   <properties>
+    <property name="map" value="waytobrightport6"/>
+    <property name="place" value="south"/>
+   </properties>
+  </object>
 </objectgroup>
- <objectgroup name="Spawn">
+ <objectgroup name="Spawn" visible="0">
  <object name="duleian_mountain_cat_spawn" type="spawn" x="64" y="96" width="96" height="96">
   <properties>
    <property name="spawngroup" value="duleian_hornet"/>
--- a/AndorsTrail/res/xml/cabin_norcity_road3.tmx
+++ b/AndorsTrail/res/xml/cabin_norcity_road3.tmx
@@ -181,6 +181,12 @@
 <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">
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="7705" name="map_plant_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
+ </tileset>
 <layer name="Ground" width="20" height="15">
  <data encoding="base64" compression="zlib">
   eJzbyMnAsHEUj2Ii8WYKMLXNw2YuLntI8RstwmvUPOqYBwBPG9pT
@@ -188,12 +194,12 @@
 </layer>
 <layer name="Objects" width="20" height="15">
  <data encoding="base64" compression="zlib">
-   eJylU8FKAzEQHXovdiMEcqj/4Ef5IX6aCtvSslooCLvVinqxRaun0t6cRzJsMgS3tQPD28lk3rxNJpOCqGH/dERf7E/szxl8ifaISfzNuRvGW/b7wudKxp9Qs2FfRoiaRdi3iXihY2iILozPTVXPUahZKs5Yy7igxGT9QXFVHfrAI/2uTFqLf6tC7t21ufIPfaXSdT3I65yG+4DPIs0aYXcqPjPpWV6eE33Y//vKtronjHX4flT/krNZZs864pWZi+3VpLHtdfd545qx9Xc1D/UNx7sjfWFTndCI2QTX3raz0LDmvvGItca161WIcWZbxQmNeEvgkhldcbx23Si9RopPzg/v71AuQZjw4T7BN3d+1sWO4aoz+upoTk/RhzkAH3K/Px3UhQ==
+   eJy7IsvAcBWIr0DpjUB8FImPiwYBGDtcjoFhJZBeBcTmQHYEEOvJIdRcA+JjSDRIjzNUPkwOYY4TkN0KxG1QOWM5VPv0oeLH0MxEdosBVA0MwMTN0cwyhboTl/tA5sDsSxVC1QvymylU7jRSmOjhcZ8emrsaBbC7E+RnJyi2kMMf/qvR+OVoYWkozMDwQox8/FIM4W4jIO0IZduh+cUejQ8CFkhizEwQ+hWSuU5QtyKDh0KofDEmTHOl0Ox6BNRzQgwSV6+h5t0C8n+QiG+LIcx8BXXjb1mIWT/FEGnhEFCsVA5C60NpmLgplA8Ks29oZoLceEQWYhYsjV4E8i/JEqZhdh0XQ4QJyDxY+IHyH7FmwWgQOA51Hyg+QebtloWkdRggxSxHOYR5MPcdREqnlLgP5GeQeSA5AMlVuX0=
  </data>
 </layer>
 <layer name="Above" width="20" height="15">
  <data encoding="base64" compression="zlib">
-   eJxjYCAd3JFkYLgrSbocMeqQxbGpuYNFDyFzyHUjPoDP/bjct1kSUx813EIvgM1vIwncBPr/liRhmppm0cJMQmAzCe4iZCayHKVmgdIfAPsKTqE=
+   eJxjYEAFR2QR9FFZBI2uBl2MGDli1CGL47IbHRAyh1w34gP43I/LfbOxhCc13EIvgM1vlIDbQ8TfMHAQ6N5DsoRpappFCzMJgdkkuIuQmchylJoFSn8AG3xNhA==
  </data>
 </layer>
 <layer name="Walkable" width="20" height="15" visible="0">
@@ -215,7 +221,7 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Spawn">
+ <objectgroup name="Spawn" visible="0">
  <object name="duleian_hornet_sapwn1" type="spawn" x="32" y="0" width="96" height="192">
   <properties>
    <property name="quantity" value="3"/>
--- a/AndorsTrail/res/xml/cabin_norcity_road4.tmx
+++ b/AndorsTrail/res/xml/cabin_norcity_road4.tmx
@@ -188,12 +188,12 @@
 </layer>
 <layer name="Objects" width="20" height="15">
  <data encoding="base64" compression="zlib">
-   eJyNU8FKw0AQDb3b7iY00JP+guin+Ef9qJ5VaIuiUgttTU/1IG1QDy2UXkRnsjvk7WwCDoSZ7My8eW82KQdJZXPyO3rKf/h96nomeZJsfDyl+JNyr2ld92NdrvC+6oFYTPKMx7a0Do+tHMT12mTeQmELnvC7ydx8qS8gvgd9T3T+C7mtdX2CNzS1Xql5adC1VWc479vE/PiMc3Olhed8wR4wd0b77rbcxxXpNXAft/TceZwH4NJLwz2K1/zYqvtIY63Y/9GwC+GHeAfSa7Ow9xF4aStUjvFkF4z33g/zGufN1wYzQAvyKyne5TFO0aKN7Rlmcd2R+tcaE7AWtpmveL4jxJz1a0z+R/JO+/+hsRnHgNaV1zHOQ57SMzax9qZ3fTbyOIx58vF1VtecE4cL+CYvsxhnBjxHsD+2P9uAorw=
+   eJyNU8FKA0EMXbyrOzt0oCf9BdFP8Y/8qJ6rUEWxUgttXU96kDqoBwXxIpp0Ju6bzCwYWCY7SV7eS3b9sNrYnM5nevw/zvcm1Jy7qnqI/gX5LxS7bbq8bxNibTw3NeCLSZzx2JYm4LH5YZ6vTfotFLbgCb9jG/pLfgv+Gei7pvsfiK1NqBO8k7rTKzk3BV1rdYf93uqc36ENsbnSwn1eYQ4Y26Z57/Tsg3vVsI8xPacR5xK47DbpHOUUfm5L7aMpruGv7qkwC+GHej9oBsamtVfAS1urYowns2C8x0Ea1zh3MTfpAVqE35jinufncpy2RxvbFHpx3ifV34Nm71KshSnzlZN3hJizQYfJ/wjvpe//0NjT+C2IraKOiUt5Ss2kzrWX3vXdKOIw5lf0j2yXs0cc9uGbPLA5zgx4jmB+bL88aqOq
  </data>
 </layer>
 <layer name="Above" width="20" height="15">
  <data encoding="base64" compression="zlib">
-   eJxjYGBguCnJwHALiKkBiDGHWPtchDHVw9ibJTHNIWTuHSx6KHUrNjmQPXcpCE+YnRuBeBMe/8H4+NyIz+2khsVjAQYGRjxxQo4d1DKHHLX7yEir2NyLLEbITGLDghi3IevZJkDYvfjE8LmFEnOIAYTMhuUnEB8AR/xQ/w==
+   eJxjYGBguCnJwHALiKkBiDGHWPtchDHVw9ibJTHNIWTuHSx6KHUrNjmQPXfJCM+baH7cCMSb8PgPxsfnRnxuJzUsHgswMDDiiRNy7KCWOeSo3UdGWsXmXmQxQmYSGxbEuA1ZzzYBwu7FJ4bPLZSYQwwgZDYsP4H4AEAYUfE=
  </data>
 </layer>
 <layer name="Top" width="20" height="15">
@@ -220,8 +220,14 @@
    <property name="place" value="north"/>
   </properties>
  </object>
+  <object name="east" type="mapchange" x="608" y="288" width="32" height="160">
+   <properties>
+    <property name="map" value="nor_city_road1"/>
+    <property name="place" value="west"/>
+   </properties>
+  </object>
 </objectgroup>
- <objectgroup name="Spawn">
+ <objectgroup name="Spawn" visible="0">
  <object name="yellow_tooth_spawn1" type="spawn" x="96" y="32" width="288" height="64">
   <properties>
    <property name="quantity" value="2"/>
--- a/AndorsTrail/res/xml/crossglen.tmx
+++ b/AndorsTrail/res/xml/crossglen.tmx
@@ -1,5 +1,5 @@
 <?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="15" nextobjectid="46">
+<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="30" tilewidth="32" tileheight="32" infinite="0" nextlayerid="15" nextobjectid="48">
 <properties>
  <property name="outdoors" value="1"/>
 </properties>
@@ -211,9 +211,9 @@
   eJztzUENACAMBLDxAgX494ISnEzGkdAaaNWf7sy8Y2XeszMvAADwrgasfQHL
  </data>
 </layer>
- <layer id="4" name="Walkable" width="30" height="30" visible="0">
+ <layer id="4" name="Walkable" width="30" height="30">
  <data encoding="base64" compression="zlib">
-   eJy9VFsOgDAM2im8/xW8ofHDxDTrA2jXZD9LhUKZ97XWDZy3kP4I58OKqmsey6ViVntQXttjvZjkjXaAYHj93l2FN+LfaWSKyUukSXkXu7kqM58oRhebAyavHk6Gx+yG5fV6T+hVsljlZQvNQvSPyDCmeLvyP8HLeFSZv+u9/7Xt7pQ8e7hVvZF3E2+JrWznFS8VThXTeq5wKt6zeUe51Uxn2ezmtN6glX3buceO/Xdni9WPvF/2PIaLdr4=
+   eJy9VFsOgDAI8xTe/wre0PhhYsiAPpgk+9mwhVK8zuO4iPMEk1/hvFhVTNUTuVxMNIfljTlRi5281QwYjCw/u0N4K/5Vj0oofql6cvZiVRdS8x+h9KX6QPFrhtPhKbNRebPcP/p1vIjyqsF6ofpHdBi7eKf8j/Ki/J0G2TtS/9S+f3ta3Tl+znDRfivtduySGt3MES0dThczau5wOtqrfme5XU933pzmjNqw0X07OceJ+U97S+2f2V/13KFCdfc=
  </data>
 </layer>
 <layer id="9" name="ratdom_Top" width="30" height="30" visible="0">
@@ -290,7 +290,7 @@
  <object id="43" name="gal_chk_h1" type="script" x="256" y="896" width="64" height="32"/>
  <object id="45" name="gal_chk_h2" type="script" x="896" y="416" width="32" height="64"/>
 </objectgroup>
- <objectgroup id="6" name="Spawn" visible="0">
+ <objectgroup id="6" name="Spawn">
  <object id="10" name="crossglen_wasp" type="spawn" x="736" y="160" width="192" height="160">
   <properties>
    <property name="quantity" value="3"/>
@@ -368,13 +368,13 @@
    <property name="spawngroup" value="oromir_behind_haystack"/>
   </properties>
  </object>
-  <object id="27" name="ratdom_mara" type="spawn" x="352" y="96" width="192" height="128">
+  <object id="27" name="ratdom_mara" type="spawn" x="352" y="96" width="160" height="128">
   <properties>
    <property name="active" value="false"/>
    <property name="spawngroup" value="ratdom_mara"/>
   </properties>
  </object>
-  <object id="28" name="ratdom_tharal" type="spawn" x="352" y="96" width="192" height="128">
+  <object id="28" name="ratdom_tharal" type="spawn" x="352" y="96" width="160" height="128">
   <properties>
    <property name="active" value="false"/>
    <property name="spawngroup" value="ratdom_tharal"/>
@@ -392,8 +392,24 @@
    <property name="spawngroup" value="ratdom_rat_crossglen"/>
   </properties>
  </object>
+  <object id="46" name="reindeer" type="spawn" x="96" y="32" width="448" height="128">
+   <properties>
+    <property name="active" value="false"/>
+    <property name="ignoreAreas" value="true"/>
+    <property name="spawngroup" value="reindeer"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup id="11" name="keys">
+  <object id="47" name="dummy_key" type="key" x="544" y="512" width="32" height="32">
+   <properties>
+    <property name="phrase" value="dummy_key"/>
+    <property name="requireId" value="andor"/>
+    <property name="requireType" value="questProgress"/>
+    <property name="requireValue" value="1"/>
+   </properties>
+  </object>
 </objectgroup>
- <objectgroup id="11" name="keys"/>
 <objectgroup id="12" name="ratdom_keys" visible="0">
  <properties>
   <property name="active" value="false"/>
--- a/AndorsTrail/res/xml/crossroads.tmx
+++ b/AndorsTrail/res/xml/crossroads.tmx
@@ -1,186 +1,187 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" tiledversion="1.1.5" orientation="orthogonal" renderorder="right-down" width="30" height="30" tilewidth="32" tileheight="32" infinite="0" nextobjectid="27">
+<!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>
 <layer name="Ground" width="30" height="30">
@@ -190,7 +191,7 @@
 </layer>
 <layer name="Objects" width="30" height="30">
  <data encoding="base64" compression="zlib">
-   eJydVk1rFEEQbRB12IvTCzuw4O/IzXjLLRAD4imCnr1oTv4FL170qv4C9eSAJ1HYmUlc40KQNbmLXwuCIPFmVbrLqa7t6pnsg6J7unv61auq7pnd3JiJNadosB0aM4X2T2HMceHG5/D8HfrfwNYzY66C3QB7OjDm2WC1FnkQe56bsJOF3AjiRiDvC3j/5WC1djv3OgHVGbivw9xawjbAHg6cxfTezts9UTPFfGqXued2WXcNY1+g/6OI+7WhxAX1Sp0SMd0aZiPH/bUjLqh3T9QVjznNbSW43yr+kPZPYK+Ebfs4T6XmYfiIvDyeiCeX47xztlcNc5v+DPwfs2F+Zbyp3jYFJ+37XOHl4LWAtYMcB9bp3c3DtfJModYqsremVwI1o4ba77s/ZnqHzp+acV7L07xc7xvo/77gWsQ7tr72fYrn+3FYzzzOl1h+tXrmej9C/9xF18b0En6OXXuql3HI+mpYPVdKfh+dN+Yx2C8/fjgK1yEvamrY3qj3Vh6OEbh+LdaIWSK/RzD3NzIv7ytEI84u4ix3Bwdq3RHnCHEvd/7ezeN9BH9G7hOFn59beadSXgnyHuljn4u49tkorlnjlrnlZ2nC+pjvK5n7Bq8n4n4UiYnGLRGrM4nYnU11NLH6N1TjPujByUE5P/GcN7PWb+2/BbkX49AH+SzHY+snRRuD2ra+a7o/dMRbQvtWl4Xj28ri86ucQcLC+yjzgOOl31OLR22X/1toLhXzRUdcyiKsfQ3ETXtW4q7Sak7LO9erAdc1Xjfl9w7c6w/8nVlH/OZ6eVxonPLL13edVVxzP29N8/t14g7b76E3pqGy4Xcf4yF1lSvUo1Y3Eql/2lI57ylOOstd/8qpPWJ6+/og0feewhyQ3pRvMjda+w+N7GD6
+   eJydVr9rFUEQXhT1eI17D97Bg/wddsYuXSAGxCqC1jaaytrOxkZb9S9QKw+sROHdXeIzeSDyEnvx1wNBkNg5k93xZuft7F3ywbB7u3v7zTczu3fb1phJbo7RYDs0Zgrtn8KYz4Ubn8Pzd+h/A1vNjLkCdh3s6cCYZ4PTtciD2PHchK0s5EYQNwJ5X8D7Lwenazet1wmoTsB9DeYuJWwN7OHAWUzvLdvuiZop5tN8mXueL+uuYewL9H8Ucb/WlLigXqlTIqZbw2zkuL92xAX17oi64jGnuY0E91sYK84sj5P2T2CvhG36OE+l5mH4iLw8nognKy0vx5ztVcPcuj8D/8fyML8y3lRv64KT9n2u8HLwWsDaQY693OndtuFaeaZQaxXZW9MrgZpRQ+333R0zvUPnT804r9o0L9f7Bvq/z7sW8Y6tr32f4vl+HNYzj/NFll+tnrnefeifveDamF7Cz7Frj/UyDllfDavnSsnvo3PGPAb75cc/jsJ1yIuaGrY36r1pwzEC16/FGjFL5PcQ5v5G5uV9hWjE2UWc5O7gQK1b4hwh7lrn7x0b7yP4M3IfKfz83Mo7lfJKkPdIHzso4tpno7hmjVvmlp+lCetjvi9n7hu8moj7IYsJ3Z8at0SsziRidzbV0STXv6Ea914PTg7K+ZHnvJG1fmv/Lci9GIc+yGc5Hls/KdoY1Hnru6b7Q0e8JbRvdVk4vo0sPk/c9218PoWF91HmAcdLr0eLR50v/7fQXCrmi464lEVY+xqIm/asxF2l1ZyWd65XA65rvG7K72241x/42NcRv7leHhcap/zy9V1nFdfcs61pfr9O3GG7PfTGNFR5+N3HeEhdZRHfp4sjVjcSqX/aUjnvKU46y13/yqk9Ynr7+iDR957CHJDelG8yN1r7D6XUYb0=
  </data>
 </layer>
 <layer name="Above" width="30" height="30">
@@ -198,129 +199,129 @@
   eJxjYMAOAjgYGJayoorFcuBQTGXgRyd7Ru3GbvdDdlS5R2h8WgFGNP8zAfmXxehjNzI4LAbBtABxeOIYm73IYR+ApnePJHXchM1eJiS70O2lFsBm705R7PbeAfr1Lgn+xZeXsNl7CYlPbf8aA8tREyA+JIZqDzpA9y+9AMxecu20pyC86OnP4QZwpXFfDsJxAspLsDyFnrfQxXHR6IDcfAMzkxT1MOBLpJ37BiidIYcZDODyL3oc4BInJi7IdSu9ATHhgCv8kNURil9qhxW6+7CJk2seLkCOH0j1LzF5kRQziSlLiHETuvtIKZdIBZTkA1L9RYp6UgCxZqKHGQCEhXFa
  </data>
 </layer>
- <layer name="Walkable" width="30" height="30">
+ <layer name="Walkable" width="30" height="30" visible="0">
  <data encoding="base64" compression="zlib">
   eJzFlMsNwDAIQztF9l+hG/ZUKUEltsFRkbjkw8OBcI9rsXuszu6plt1HsU9xETtq//IK912vviniMzFRrVk+6h0mv25/ze+JOFWuoo+5V33DTu85uLvYp7k7jfHcjoW4WX6VflZnm9qTjrvq/+v+VaYuWT07psxut3W4TN7VPSUHZT2yUc3VGaHM3q5HrR3NqJbMTHTpze6geA69asydXnVd1avk7tLLxM5qyFqnT1ldVfZ85oQel//BdjMfzXc64w==
  </data>
 </layer>
- <objectgroup name="Mapevents">
-  <object id="1" name="south" type="mapchange" x="320" y="928" width="64" height="32">
+ <objectgroup name="Mapevents" visible="0">
+  <object name="south" type="mapchange" x="320" y="928" width="64" height="32">
   <properties>
    <property name="map" value="wild0"/>
    <property name="place" value="north"/>
   </properties>
  </object>
-  <object id="2" name="east" type="mapchange" x="928" y="160" width="32" height="64">
+  <object name="east" type="mapchange" x="928" y="160" width="32" height="64">
   <properties>
    <property name="map" value="loneford1"/>
    <property name="place" value="west"/>
   </properties>
  </object>
-  <object id="3" name="southeast" type="mapchange" x="928" y="576" width="32" height="224">
+  <object name="southeast" type="mapchange" x="928" y="576" width="32" height="224">
   <properties>
    <property name="map" value="roadbeforecrossroads"/>
    <property name="place" value="north"/>
   </properties>
  </object>
-  <object id="4" name="north" type="mapchange" x="256" y="0" width="96" height="32">
+  <object name="north" type="mapchange" x="256" y="0" width="96" height="32">
   <properties>
    <property name="map" value="fields0"/>
    <property name="place" value="south"/>
   </properties>
  </object>
-  <object id="5" name="west" type="mapchange" x="0" y="480" width="32" height="96">
+  <object name="west" type="mapchange" x="0" y="480" width="32" height="96">
   <properties>
    <property name="map" value="roadtocarntower0"/>
    <property name="place" value="east"/>
   </properties>
  </object>
-  <object id="6" name="middle" type="mapchange" x="608" y="320" width="32" height="32">
+  <object name="middle" type="mapchange" x="608" y="320" width="32" height="32">
   <properties>
    <property name="map" value="houseatcrossroads0"/>
    <property name="place" value="middle"/>
   </properties>
  </object>
-  <object id="7" name="change1" type="mapchange" x="480" y="0" width="448" height="32">
+  <object name="change1" type="mapchange" x="480" y="0" width="448" height="32">
   <properties>
    <property name="map" value="fields0"/>
    <property name="place" value="change1"/>
   </properties>
  </object>
-  <object id="8" name="change2" type="mapchange" x="928" y="0" width="32" height="128">
+  <object name="change2" type="mapchange" x="928" y="0" width="32" height="128">
   <properties>
    <property name="map" value="loneford1"/>
    <property name="place" value="change2"/>
   </properties>
  </object>
-  <object id="9" name="northwest" type="mapchange" x="32" y="0" width="96" height="32">
+  <object name="northwest" type="mapchange" x="32" y="0" width="96" height="32">
   <properties>
    <property name="map" value="fields0"/>
    <property name="place" value="southwest"/>
   </properties>
  </object>
-  <object id="10" name="sign_crossroadshouse" type="sign" x="672" y="352" width="32" height="32"/>
-  <object id="11" name="sign_crossroads_s" type="sign" x="608" y="480" width="32" height="32"/>
-  <object id="12" name="sign_crossroads_n" type="sign" x="640" y="128" width="32" height="32"/>
-  <object id="13" name="brv_patrol_check_stop_hero" type="script" x="352" y="448" width="480" height="64">
+  <object name="sign_crossroadshouse" type="sign" x="672" y="352" width="32" height="32"/>
+  <object name="sign_crossroads_s" type="sign" x="608" y="480" width="32" height="32"/>
+  <object name="sign_crossroads_n" type="sign" x="640" y="128" width="32" height="32"/>
+  <object name="brv_patrol_check_stop_hero" type="script" x="352" y="448" width="480" height="64">
   <properties>
    <property name="when" value="enter"/>
   </properties>
  </object>
-  <object id="14" name="achieve_road" type="script" x="576" y="608" width="64" height="32"/>
+  <object name="achieve_road" type="script" x="576" y="608" width="64" height="32"/>
 </objectgroup>
- <objectgroup name="Spawn uniques">
-  <object id="15" name="fieldwasp_unique" type="spawn" x="32" y="64" width="256" height="352">
+ <objectgroup name="Spawn uniques" visible="0">
+  <object name="fieldwasp_unique" type="spawn" x="32" y="64" width="256" height="352">
   <properties>
    <property name="spawngroup" value="fieldwasp_unique"/>
   </properties>
  </object>
-  <object id="16" name="fanamor" type="spawn" x="64" y="736" width="32" height="32">
+  <object name="fanamor" type="spawn" x="64" y="736" width="32" height="32">
   <properties>
    <property name="spawngroup" value="fanamor"/>
   </properties>
  </object>
-  <object id="17" name="benbyr" type="spawn" x="416" y="352" width="32" height="32">
+  <object name="benbyr" type="spawn" x="416" y="352" width="32" height="32">
   <properties>
    <property name="spawngroup" value="benbyr"/>
   </properties>
  </object>
-  <object id="18" name="crossroads_guard" type="spawn" x="544" y="384" width="32" height="32">
+  <object name="crossroads_guard" type="spawn" x="544" y="384" width="32" height="32">
   <properties>
    <property name="spawngroup" value="crossroads_guard"/>
   </properties>
  </object>
-  <object id="19" name="crossroads_guard_1" type="spawn" x="704" y="320" width="32" height="32">
+  <object name="crossroads_guard_1" type="spawn" x="704" y="320" width="32" height="32">
   <properties>
    <property name="spawngroup" value="crossroads_guard"/>
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Spawn monsters">
-  <object id="20" name="forestboar3" type="spawn" x="64" y="800" width="160" height="96">
+ <objectgroup name="Spawn monsters" visible="0">
+  <object name="forestboar3" type="spawn" x="64" y="800" width="160" height="96">
   <properties>
    <property name="quantity" value="2"/>
    <property name="spawngroup" value="forestboar3"/>
   </properties>
  </object>
-  <object id="21" name="forestboar3_1" type="spawn" x="288" y="864" width="32" height="32">
+  <object name="forestboar3_1" type="spawn" x="288" y="864" width="32" height="32">
   <properties>
    <property name="spawngroup" value="forestboar3"/>
   </properties>
  </object>
-  <object id="22" name="forestboar3_2" type="spawn" x="160" y="544" width="96" height="64">
+  <object name="forestboar3_2" type="spawn" x="160" y="544" width="96" height="64">
   <properties>
    <property name="spawngroup" value="forestboar3"/>
   </properties>
  </object>
-  <object id="23" name="fieldwasp_0" type="spawn" x="32" y="64" width="256" height="352">
+  <object name="fieldwasp_0" type="spawn" x="32" y="64" width="256" height="352">
   <properties>
    <property name="quantity" value="2"/>
    <property name="spawngroup" value="fieldwasp_0"/>
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Keys">
-  <object id="24" name="stop_hero" type="key" x="320" y="416" width="544" height="128">
+ <objectgroup name="Keys" visible="0">
+  <object name="stop_hero" type="key" x="320" y="416" width="544" height="128">
   <properties>
    <property name="phrase" value="brv_wait_patrol"/>
    <property name="requireId" value="brv_nondisplay"/>
@@ -330,16 +331,16 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Spawn_guild">
-  <object id="25" name="feygard_scout" type="spawn" x="128" y="736" width="32" height="32">
+ <objectgroup name="Spawn_guild" visible="0">
+  <object name="feygard_scout" type="spawn" x="128" y="736" width="32" height="32">
   <properties>
    <property name="active" value="false"/>
    <property name="spawngroup" value="feygard_scout"/>
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Spawn_knights">
-  <object id="26" name="knights" type="spawn" x="320" y="416" width="544" height="128">
+ <objectgroup name="Spawn_knights" visible="0">
+  <object name="knights" type="spawn" x="320" y="416" width="544" height="128">
   <properties>
    <property name="active" value="false"/>
    <property name="ignoreAreas" value="true"/>
--- a/AndorsTrail/res/xml/elm_3f.tmx
+++ b/AndorsTrail/res/xml/elm_3f.tmx
@@ -1,330 +1,331 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="15" height="21" tilewidth="32" tileheight="32" infinite="0" nextlayerid="18" nextobjectid="22">
+<!DOCTYPE map SYSTEM "https://mapeditor.org/dtd/1.0/map.dtd">
+<map version="1.0" orientation="orthogonal" width="15" height="21" tilewidth="32" tileheight="32">
 <properties>
  <property name="colorfilter" value="none"/>
 </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_6" tilewidth="32" tileheight="32" tilecount="144" columns="18">
+ <tileset firstgid="6449" name="map_transition_6" tilewidth="32" tileheight="32">
  <image source="../drawable/map_transition_6.png" width="576" height="256"/>
 </tileset>
- <tileset firstgid="6593" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6593" name="map_tree_1" tilewidth="32" tileheight="32">
  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="6721" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6721" name="map_tree_2" tilewidth="32" tileheight="32">
  <image source="../drawable/map_tree_2.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="6849" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6849" name="map_wall_1" tilewidth="32" tileheight="32">
  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="6977" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="6977" name="map_wall_2" tilewidth="32" tileheight="32">
  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
- <tileset firstgid="7097" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="7097" name="map_wall_3" tilewidth="32" tileheight="32">
  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
- <tileset firstgid="7217" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="7217" name="map_wall_4" tilewidth="32" tileheight="32">
  <image source="../drawable/map_wall_4.png" width="480" height="256"/>
 </tileset>
- <tileset firstgid="7337" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7337" name="map_window_1" tilewidth="32" tileheight="32">
  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="7465" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7465" name="map_window_2" tilewidth="32" tileheight="32">
  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="7593" name="map_cavewall_5" tilewidth="32" tileheight="32" tilecount="36" columns="6">
+ <tileset firstgid="7593" name="map_cavewall_5" tilewidth="32" tileheight="32">
  <image source="../drawable/map_cavewall_5.png" width="192" height="192"/>
 </tileset>
- <tileset firstgid="7629" name="map_sign_ladder_omi2" tilewidth="32" tileheight="32" tilecount="32" columns="8">
+ <tileset firstgid="7629" name="map_sign_ladder_omi2" tilewidth="32" tileheight="32">
  <image source="../drawable/map_sign_ladder_omi2.png" width="256" height="128"/>
 </tileset>
- <tileset firstgid="7661" name="map_rock_3" tilewidth="32" tileheight="32" tilecount="30" columns="6">
+ <tileset firstgid="7661" name="map_rock_3" tilewidth="32" tileheight="32">
  <image source="../drawable/map_rock_3.png" width="192" height="160"/>
 </tileset>
- <layer id="1" name="Ground" width="15" height="21">
+ <layer name="Ground" width="15" height="21">
  <data encoding="base64" compression="zlib">
   eJyVk7sOwjAMRSOxFcEfROL/R5amQ+kQumSHjcfC4ydAOJKt3rpOK4YjlDgntbETvHMNcSRq4mDQcRwJTI4lIy70xl7N3+zhHqHh+xLHk0LcAPlZbl5X64G8bvlMo3IRF89rN4KLuSy5J4qdwZV9y/1Uzn2rZbeFvsjehtiqnIPhRujLXL2Wm0lqvfcD2McOXF0X1r9bTWegB1fXha41A1Y/rBxxBkpu7ae5abdVNf/jRj9+C7q/1ju8EFfl4qxHX36HD+LJ58XV/cG3hq71/5f6k7lR/K5yw9kKftwXIZ950e+74FnzMncnxn6Bpszx
  </data>
 </layer>
- <layer id="2" name="Objects" width="15" height="21">
+ <layer name="Objects" width="15" height="21">
  <data encoding="base64" compression="zlib">
   eJydU0EOwVAQnXRhKZSkG9/FrFwAWwvqAuIEOAHCSsrSplESKxsnoFZibybtpDX+bxsveWn7Z97MdPo6cABWyKLoWMk96w6qmHZo5ecQepo8qT0aeo6sJO7hfA/kDtnS1OziWbUG0K5Ez5xPDJGBDbDH6wlrnUU/F7V91L3LAA7WCFI7rMe9dFovnoe0TNJe7Sj+VIlWgvLuzu+ZBGnXKj9Pnt1sc1+CH9ek3YZxjyleZ8i5wUO6vgwXY6UmwCRDy/u42N+xBcaWGu+yL7gv72GjIhaBnHmrIv6jNeGlqVdUK0HvLLW6+gxf+JG+Je3Xz9Ck/6W8edlDDet7Nj7P8kvaf/wfSi+PczxnwgcgSFR8
  </data>
 </layer>
- <layer id="15" name="Objects_0" width="15" height="21" visible="0">
+ <layer name="Objects_0" width="15" height="21" visible="0">
  <data encoding="base64" compression="zlib">
   eJxjYBgFIxWcEUfl3xFiYNgjjl0tMjgty8DwBqhuI5CeC6TnIeH5ROiHgXqgWjY5BoZaIL0OiNfj0XtRCMEG2dknDtGHTw8uO8nRBwJrydSHDXyWpY45o4B4AAAoSRPg
  </data>
 </layer>
- <layer id="14" name="Objects_1" width="15" height="21" visible="0">
+ <layer name="Objects_1" width="15" height="21" visible="0">
  <data encoding="base64" compression="zlib">
   eJxjYBgFIxWcEUfl3xFiYNgDFJsLxPPEsesBgdOyDAxvgPIbZRFqYbgPiBWYibO/HqiWTY6BoRZIr0PC2MBFIQR7LtQekL71eNyJDOYiuY8UfSCwFsltpOjDBz7LUsecUUA8AADSLhkh
  </data>
 </layer>
- <layer id="3" name="Objects_2" width="15" height="21" visible="0">
+ <layer name="Objects_2" width="15" height="21" visible="0">
  <data encoding="base64" compression="zlib">
   eJxjYBgFIxWcEUfl3xFiYNgDFJsLxPPEsesBgdOyDAxvgPIbZRFqYbgPiBWYibO/HqiWTY6BoRZIr0PC2MBFIQR7LtQekL71eNyJrB7ZfcTqg7kR5B8QJkUfCKxF8hO6vs+yxJszCqgDAHlvHAw=
  </data>
 </layer>
- <layer id="12" name="Objects_3" width="15" height="21" visible="0">
+ <layer name="Objects_3" width="15" height="21" visible="0">
  <data encoding="base64" compression="zlib">
   eJxjYBgFowAC7ggxMOwRZ2CYC8TzxHGrOy0LoTfKItTCcB8QKzATZ189UC2bHANDLZBeh4SxgYtCCPZcqD0gfevxuBNZPbL7iNUHcyPIPyBMij4QWIvkJ3R9n2WJN2cUUAcAACJmGiY=
  </data>
 </layer>
- <layer id="4" name="Above" width="15" height="21">
+ <layer name="Above" width="15" height="21">
  <data encoding="base64" compression="zlib">
   eJxjYBj6gFEYu/hbWeLNYMdhxkCDjWh+WMhKX/uIAnJUd8awB6xMmGKkpFdCIBmL+ZSAi0KYYofF8Ou5JYjKJyZtbSag5hcFYQQA8VsKaw==
  </data>
 </layer>
- <layer id="17" name="Above_1" width="15" height="21" visible="0">
+ <layer name="Above_1" width="15" height="21" visible="0">
  <data encoding="base64" compression="zlib">
   eJxjYBgFowABNsqSoUkOlfuFHDNGGGBlGmgXjDwAAG/ZAgU=
  </data>
 </layer>
- <layer id="5" name="Above_2" width="15" height="21" visible="0">
+ <layer name="Above_2" width="15" height="21" visible="0">
  <data encoding="base64" compression="zlib">
   eJxjYBgFowABNspCGXIkaEJTy0aCXlLUDhT4IktYDamAlYn6Zo4C/AAAmxcCaw==
  </data>
 </layer>
- <layer id="16" name="Above_3" width="15" height="21">
+ <layer name="Above_3" width="15" height="21">
  <data encoding="base64" compression="zlib">
   eJxjYBgFowABNspCGXIkaEJTy0aCXlLUUgQosIcWbmRlor6ZowA/AAAxOQGc
  </data>
 </layer>
- <layer id="6" name="Top" width="15" height="21">
+ <layer name="Top" width="15" height="21">
  <data encoding="base64" compression="zlib">
   eJxjYICAw2IMeAE+eXL1XgaKX8IidxlJDJs8PjMJuQWmBpu6kaYXV9gSo5cYQIneSxTohdlNrpqB0IsrLxCjl9hwokQvNrdtlsWvx0CIOLPpBQDd0Sbp
  </data>
 </layer>
- <layer id="7" name="Walkable" width="15" height="21" visible="0">
+ <layer name="Walkable" width="15" height="21" visible="0">
  <data encoding="base64" compression="zlib">
   eJzbKMbAsHEAMS5Ajl6YGDY1hMzBZx4+M3Cpw+UfbGahux2XndjcgAvgUkco/PCFMyG30CJ+sYULKfZSkibprZeYcCUlfklJA+T6DR8gN0xwmUMpBgBlkK1a
  </data>
 </layer>
- <objectgroup id="8" name="Mapevents" visible="0">
-  <object id="1" name="up" type="mapchange" x="448" y="128" width="32" height="64">
+ <objectgroup name="Mapevents" visible="0">
+  <object name="up" type="mapchange" x="448" y="128" width="32" height="64">
   <properties>
    <property name="map" value="elm_2f_3"/>
    <property name="place" value="down"/>
   </properties>
  </object>
-  <object id="2" name="down" type="mapchange" x="352" y="480" width="32" height="64">
+  <object name="down" type="mapchange" x="352" y="480" width="32" height="64">
   <properties>
    <property name="map" value="elm_4f_1"/>
    <property name="place" value="up"/>
   </properties>
  </object>
-  <object id="21" name="elm3f_grow" type="script" x="64" y="64" width="160" height="128">
+  <object name="elm3f_grow" type="script" x="64" y="64" width="160" height="128">
   <properties>
    <property name="when" value="always"/>
   </properties>
  </object>
 </objectgroup>
- <objectgroup id="9" name="Spawn" visible="0">
-  <object id="3" name="elm3f_monster1" type="spawn" x="224" y="128" width="192" height="160">
+ <objectgroup name="Spawn" visible="0">
+  <object name="elm3f_monster1" type="spawn" x="224" y="128" width="192" height="160">
   <properties>
    <property name="quantity" value="3"/>
    <property name="spawngroup" value="elm_mine3"/>
   </properties>
  </object>
-  <object id="4" name="elm3f_monster2" type="spawn" x="224" y="288" width="32" height="32">
+  <object name="elm3f_monster2" type="spawn" x="224" y="288" width="32" height="32">
   <properties>
    <property name="spawngroup" value="elm_mine2"/>
   </properties>
  </object>
-  <object id="5" name="elm3f_monster3" type="spawn" x="64" y="192" width="64" height="256">
+  <object name="elm3f_monster3" type="spawn" x="64" y="192" width="64" height="256">
   <properties>
    <property name="quantity" value="4"/>
    <property name="spawngroup" value="elm_mine1"/>
   </properties>
  </object>
-  <object id="6" name="elm3f_monster4" type="spawn" x="256" y="128" width="128" height="128">
+  <object name="elm3f_monster4" type="spawn" x="256" y="128" width="128" height="128">
   <properties>
    <property name="quantity" value="3"/>
    <property name="spawngroup" value="elm_mine1"/>
   </properties>
  </object>
-  <object id="7" name="elm3f_monster5" type="spawn" x="160" y="320" width="32" height="32">
+  <object name="elm3f_monster5" type="spawn" x="160" y="320" width="32" height="32">
   <properties>
    <property name="spawngroup" value="elm_mine3"/>
   </properties>
  </object>
-  <object id="8" name="elm3f_monster6" type="spawn" x="96" y="480" width="32" height="32">
+  <object name="elm3f_monster6" type="spawn" x="96" y="480" width="32" height="32">
   <properties>
    <property name="spawngroup" value="elm_mine2"/>
   </properties>
  </object>
-  <object id="9" name="elm3f_monster7" type="spawn" x="32" y="544" width="96" height="64">
+  <object name="elm3f_monster7" type="spawn" x="32" y="544" width="96" height="64">
   <properties>
    <property name="quantity" value="2"/>
    <property name="spawngroup" value="elm_mine1"/>
   </properties>
  </object>
-  <object id="10" name="elm3f_monster8" type="spawn" x="352" y="544" width="96" height="96">
+  <object name="elm3f_monster8" type="spawn" x="352" y="544" width="96" height="96">
   <properties>
    <property name="quantity" value="2"/>
    <property name="spawngroup" value="elm_mine3"/>
   </properties>
  </object>
-  <object id="11" name="ortholion_guard9" type="spawn" x="96" y="64" width="96" height="64">
+  <object name="ortholion_guard9" type="spawn" x="96" y="64" width="96" height="64">
   <properties>
    <property name="spawngroup" value="ortholion_guard9"/>
   </properties>
  </object>
 </objectgroup>
- <objectgroup id="10" name="Keys">
-  <object id="12" name="elm3f_grow" type="key" x="224" y="64" width="32" height="64">
+ <objectgroup name="Keys">
+  <object name="elm3f_grow" type="key" x="224" y="64" width="32" height="64">
   <properties>
    <property name="phrase" value="ortholion_guard9_look"/>
    <property name="requireId" value="bwm72_beginning"/>
@@ -333,7 +334,7 @@
    <property name="requireValue" value="34"/>
   </properties>
  </object>
-  <object id="13" name="elm3f_grow2" type="key" x="64" y="448" width="64" height="32">
+  <object name="elm3f_grow2" type="key" x="64" y="448" width="64" height="32">
   <properties>
    <property name="phrase" value="elm3f_locked"/>
    <property name="requireId" value="Omi2_bwm1"/>
@@ -342,8 +343,8 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup id="11" name="Replace" visible="0">
-  <object id="15" name="elm3f_grow0" type="replace" x="160" y="256" width="320" height="224">
+ <objectgroup name="Replace" visible="0">
+  <object name="elm3f_grow0" type="replace" x="160" y="256" width="320" height="224">
   <properties>
    <property name="Objects" value="Objects_0"/>
    <property name="requireId" value="elm3f_grow"/>
@@ -351,7 +352,7 @@
    <property name="requireValue" value="2"/>
   </properties>
  </object>
-  <object id="14" name="elm3f_grow1" type="replace" x="160" y="256" width="320" height="224">
+  <object name="elm3f_grow1" type="replace" x="160" y="256" width="320" height="224">
   <properties>
    <property name="Above" value="Above_1"/>
    <property name="Objects" value="Objects_1"/>
@@ -360,7 +361,7 @@
    <property name="requireValue" value="4"/>
   </properties>
  </object>
-  <object id="16" name="elm3f_grow2" type="replace" x="160" y="256" width="320" height="224">
+  <object name="elm3f_grow2" type="replace" x="160" y="256" width="320" height="224">
   <properties>
    <property name="Above" value="Above_2"/>
    <property name="Objects" value="Objects_2"/>
@@ -369,7 +370,7 @@
    <property name="requireValue" value="5"/>
   </properties>
  </object>
-  <object id="20" name="elm3f_grow3" type="replace" x="160" y="256" width="320" height="224">
+  <object name="elm3f_grow3" type="replace" x="160" y="256" width="320" height="224">
   <properties>
    <property name="Above" value="Above_3"/>
    <property name="Objects" value="Objects_3"/>
--- a/AndorsTrail/res/xml/elm_4f_1.tmx
+++ b/AndorsTrail/res/xml/elm_4f_1.tmx
@@ -1,352 +1,351 @@
 <?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="15" height="20" tilewidth="32" tileheight="32">
- <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
+<map version="1.8" tiledversion="1.8.4" orientation="orthogonal" renderorder="right-down" width="15" height="20" tilewidth="32" tileheight="32" infinite="0" nextlayerid="12" nextobjectid="26">
+ <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>
- <tileset firstgid="7593" name="map_cavewall_5" tilewidth="32" tileheight="32">
+ <tileset firstgid="7593" name="map_cavewall_5" tilewidth="32" tileheight="32" tilecount="36" columns="6">
  <image source="../drawable/map_cavewall_5.png" width="192" height="192"/>
 </tileset>
- <tileset firstgid="7629" name="map_sign_ladder_omi2" tilewidth="32" tileheight="32">
+ <tileset firstgid="7629" name="map_sign_ladder_omi2" tilewidth="32" tileheight="32" tilecount="32" columns="8">
  <image source="../drawable/map_sign_ladder_omi2.png" width="256" height="128"/>
 </tileset>
- <tileset firstgid="7661" name="map_rock_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="7661" name="map_rock_3" tilewidth="32" tileheight="32" tilecount="30" columns="6">
  <image source="../drawable/map_rock_3.png" width="192" height="160"/>
 </tileset>
- <layer name="Ground" width="15" height="20">
+ <layer id="1" name="Ground" width="15" height="20">
  <data encoding="base64" compression="zlib">
   eJydkzEOwjAMRSuxwRkicX8xZUmK1HZIy8BezoMjbPFx7bRieFJr+SVx7OTQdeMBJuJOPIhIZKLn+LzDwvniiVvjzx0kf1RuVlxPH3S85zMkw/VqRT8arqzpkcC33Fa9KXzruDHoni8+sleBsxxxsS8ZztJyY9h6WLfnFpWH7kq81BpejdKbaLgTuPUu0V3ZwRj2aGnsm4Ida9Xrud5stFy8q3/3rf9D2M651VfJk/c/wGzpN6L7iTO48H8Jv2/a8vQM4kzX7zeSg8/R
  </data>
 </layer>
- <layer name="Objects" width="15" height="20">
+ <layer id="2" name="Objects" width="15" height="20">
  <data encoding="base64" compression="zlib">
-   eJxbL87AsEOWgSSwEah+syxC33MhVHluJsL60cFcoDvmAbEUUO98cYT4aajaZcIMDMuFMcUDBRgY6oHqfwH5rHIMDP1AdiVQXRWS2jtAuYtCEDuQgS5QbC1QrA6Ia4F4PRB3AvV1CTNggLXimGIgALL7M9QtfkyofpmPQw+y3n6omjgmhBgb1B8gNwuiuWUXUPyNOMQ966F6zwDV7RbHDCN0cEYc4jaYu84C3X0OLS6wxQ1ML8zO1XjSC8jN6Ga+wREOr4FqU4Hu3SyE6Z7DYhAaOSxPymKqu4iW9pABLF30I9kP8x8oHF8jicPSxmWovSC/rkMK40tCCH3o/qmH8k8TyEegMEQPc1i6gvkXn96rQH3XsNiBTe8tJDeeArJvA/FpLPEA03seaO4FIP4OxD+A+Asev8DyOyE3o5cL2MBmLPacRBJDTq8gAAB/tl+N
+   eJxbL87AsEOWgSSwEah+syxC33MhVHluJsL60cFcoDvmAbEUUO98cYT4aajaZcIMDMuFUcV1gfYGCjAw1APV/wLyWeUYGPqB7EqguioktXeAcheFIHagg7VAsTogrgXi9UDcCdTXJYxdHTYAsvsz1I1+TKh+mY9DD7LefqiaOCaEGBvUHyA3C6K5ZRdQ/I04xD3roXrPQMMfPYzQwRlxiNtg7joLdPc5tLjAFjcwvTA7V+NJLyA3o5v5Bkc4vAaqTQW6d7MQpnsOi0Fo5LA8KYup7iJa2kMGsHTRj2Q/zH+gcHyNJA5LG5eh9oL8ug4pjC8JIfSh+6ceyj9NIB+BwhA9zGHpCuZffHqvAvVdw2IHNr23kNx4Csi+DcSnscQDTO95oLkXgPg7EP8A4i94/ALL74TcjF4uYAObsdhzEkkMOb2CAAAtH167
  </data>
 </layer>
- <layer name="Above" width="15" height="20">
+ <layer id="3" name="Above" width="15" height="20">
  <data encoding="base64" compression="zlib">
   eJxjYCANHBZjYHgohCp2WYw4vdOEGRimC6Pqu4Smd544hM4EqssSRpXbKAuhHfgh7sAFfJhwuy+AgN4YoN4AJuxyCTj09osjqYHplUOIMQL9UUDAXhj4Bw3b1bKo4sToxQYIhRU6OIlkL6GwwgbOQvXjCitiACisNssSVocMQGljExF6Pgnhl+fEEffIIBGHGkki9A4kIOT3jUSGuSzUn4TiiJWI8CBkxjZZ1DQJAF1cImo=
  </data>
 </layer>
- <layer name="Top" width="15" height="20">
+ <layer id="4" name="Top" width="15" height="20">
  <data encoding="base64" compression="zlib">
   eJxjYCAeHBYjQTEauESk3v+y5NtBT0BJWODTO02YgWE6EH8Uoq+9o3qHj96PwDz0icR8BNL7BUlPvzD57qAlAAAmAhQJ
  </data>
 </layer>
- <layer name="Walkable" width="15" height="20" visible="0">
+ <layer id="5" name="Walkable" width="15" height="20" visible="0">
  <data encoding="base64" compression="zlib">
-   eJzbKMbAsJFIDALEqsWmFwbI0YvLPHR5dDY2O/EBYvSS61dKww+X2ynRS8gcbHpx+RMfjU0vsWFGrL2E3E4o7eBLI7jMIVUvPn8SoxdX2BGrl9R8SYo8IbXE5BdCegHjOIsm
+   eJylk0EKACAIBHtF//+CP4wOXWR1p1qIAp10BWOOEfBs0VzFHr2wNJ7fqmYnwr56/Z1f1fsP6/5RbOWzuxVLZ0brut4z71hVp/NA2M4nYavZUfZ2L2/iLpfsi2MXC+mMtA==
  </data>
 </layer>
- <layer name="Walkable_2" width="15" height="20" visible="0">
+ <layer id="6" name="Walkable_2" width="15" height="20" visible="0">
  <data encoding="base64" compression="zlib">
   eJxjYBgFpIKNYhA8EHrJBaN6R/UOBwAAtUcK4w==
  </data>
 </layer>
- <layer name="Walkable_1" width="15" height="20" visible="0">
+ <layer id="7" name="Walkable_1" width="15" height="20" visible="0">
  <data encoding="base64" compression="zlib">
   eJxjYBgF5ICNYqN6R/UOH71DBQAAWewJVQ==
  </data>
 </layer>
- <objectgroup name="Mapevents">
-  <object name="elm4f_up" type="script" x="32" y="544" width="64" height="32">
+ <objectgroup id="8" name="Mapevents">
+  <object id="1" name="elm4f_up" type="script" x="32" y="544" width="64" height="32">
   <properties>
    <property name="when" value="enter"/>
   </properties>
  </object>
-  <object name="elm4f_down" type="script" x="96" y="544" width="32" height="32">
+  <object id="2" name="elm4f_down" type="script" x="96" y="544" width="32" height="32">
   <properties>
    <property name="when" value="enter"/>
   </properties>
  </object>
-  <object name="up" type="mapchange" x="448" y="288" width="32" height="64">
+  <object id="3" name="up" type="mapchange" x="448" y="288" width="32" height="64">
   <properties>
    <property name="map" value="elm_3f"/>
    <property name="place" value="down"/>
   </properties>
  </object>
-  <object name="elm2f_trap" type="script" x="128" y="96" width="128" height="64">
+  <object id="4" name="elm2f_trap" type="script" x="128" y="96" width="128" height="64">
   <properties>
    <property name="when" value="round"/>
   </properties>
  </object>
-  <object name="elm2f_trap" type="script" x="160" y="224" width="64" height="32">
+  <object id="5" name="elm2f_trap" type="script" x="160" y="224" width="64" height="32">
   <properties>
    <property name="when" value="round"/>
   </properties>
  </object>
-  <object name="elm2f_trap" type="script" x="128" y="256" width="64" height="64">
+  <object id="6" name="elm2f_trap" type="script" x="128" y="256" width="64" height="64">
   <properties>
    <property name="when" value="round"/>
   </properties>
  </object>
-  <object name="elm2f_trap" type="script" x="128" y="352" width="64" height="96">
+  <object id="7" name="elm2f_trap" type="script" x="128" y="352" width="64" height="96">
   <properties>
    <property name="when" value="round"/>
   </properties>
  </object>
-  <object name="elm2f_trap" type="script" x="320" y="160" width="96" height="32">
+  <object id="8" name="elm2f_trap" type="script" x="320" y="160" width="96" height="32">
   <properties>
    <property name="when" value="round"/>
   </properties>
  </object>
-  <object name="south" type="mapchange" x="128" y="608" width="128" height="32">
+  <object id="9" name="south" type="mapchange" x="128" y="608" width="128" height="32">
   <properties>
    <property name="map" value="elm_4f_2"/>
    <property name="place" value="north1"/>
   </properties>
  </object>
-  <object name="north" type="mapchange" x="352" y="0" width="32" height="32">
+  <object id="10" name="north" type="mapchange" x="352" y="0" width="32" height="32">
   <properties>
    <property name="map" value="elm_4f_4"/>
    <property name="place" value="south2"/>
   </properties>
  </object>
-  <object name="down" type="mapchange" x="384" y="96" width="32" height="32">
+  <object id="11" name="down" type="mapchange" x="384" y="96" width="32" height="32">
   <properties>
    <property name="map" value="elm5f_1"/>
    <property name="place" value="up"/>
   </properties>
  </object>
-  <object name="silver_bar" type="container" x="224" y="96" width="32" height="32"/>
-  <object name="lead_bar" type="container" x="224" y="576" width="32" height="32"/>
+  <object id="12" name="silver_bar" type="container" x="224" y="96" width="32" height="32"/>
+  <object id="13" name="lead_bar" type="container" x="224" y="576" width="32" height="32"/>
 </objectgroup>
- <objectgroup name="Spawn" visible="0">
-  <object name="elm4f_monster1" type="spawn" x="384" y="384" width="32" height="32">
+ <objectgroup id="9" name="Spawn">
+  <object id="14" name="elm4f_monster1" type="spawn" x="384" y="384" width="32" height="32">
   <properties>
    <property name="spawngroup" value="elm_mine3"/>
   </properties>
  </object>
-  <object name="elm4f_monster2" type="spawn" x="352" y="448" width="32" height="32">
+  <object id="15" name="elm4f_monster2" type="spawn" x="352" y="448" width="32" height="32">
   <properties>
    <property name="spawngroup" value="elm_mine3"/>
   </properties>
  </object>
-  <object name="elm4f_monster3" type="spawn" x="320" y="384" width="32" height="32">
+  <object id="16" name="elm4f_monster3" type="spawn" x="320" y="384" width="32" height="32">
   <properties>
    <property name="spawngroup" value="elm_mine2"/>
   </properties>
  </object>
-  <object name="elm4f_monster4" type="spawn" x="288" y="384" width="32" height="32">
+  <object id="17" name="elm4f_monster4" type="spawn" x="288" y="384" width="32" height="32">
   <properties>
    <property name="spawngroup" value="elm_mine1"/>
   </properties>
  </object>
-  <object name="elm4f_monster5" type="spawn" x="256" y="288" width="64" height="32">
+  <object id="18" name="elm4f_monster5" type="spawn" x="256" y="288" width="64" height="32">
   <properties>
    <property name="quantity" value="2"/>
    <property name="spawngroup" value="elm_mine1"/>
   </properties>
  </object>
-  <object name="elm4f_monster6" type="spawn" x="128" y="448" width="96" height="96">
+  <object id="19" name="elm4f_monster6" type="spawn" x="128" y="448" width="96" height="96">
   <properties>
    <property name="quantity" value="2"/>
    <property name="spawngroup" value="elm_mine3"/>
   </properties>
  </object>
-  <object name="elm4f_monster7" type="spawn" x="256" y="512" width="128" height="96">
+  <object id="20" name="elm4f_monster7" type="spawn" x="256" y="512" width="128" height="96">
   <properties>
    <property name="quantity" value="3"/>
    <property name="spawngroup" value="elm_mine1"/>
   </properties>
  </object>
-  <object name="elm4f_monster8" type="spawn" x="32" y="96" width="32" height="192">
+  <object id="21" name="elm4f_monster8" type="spawn" x="32" y="96" width="32" height="192">
   <properties>
    <property name="spawngroup" value="shadowfang1"/>
   </properties>
  </object>
-  <object name="elm4f_monster9" type="spawn" x="320" y="64" width="64" height="96">
+  <object id="22" name="elm4f_monster9" type="spawn" x="320" y="64" width="32" height="96">
   <properties>
    <property name="quantity" value="2"/>
    <property name="spawngroup" value="elm_mine5"/>
   </properties>
  </object>
-  <object name="elm4f_monster10" type="spawn" x="416" y="32" width="32" height="32">
+  <object id="23" name="elm4f_monster10" type="spawn" x="416" y="32" width="32" height="32">
   <properties>
    <property name="spawngroup" value="elm_mine2"/>
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Keys"/>
- <objectgroup name="Replace" visible="0">
-  <object name="height_up" type="replace" x="64" y="160" width="64" height="384">
+ <objectgroup id="10" name="Keys"/>
+ <objectgroup id="11" name="Replace" visible="0">
+  <object id="24" name="height_up" type="replace" x="64" y="160" width="64" height="384">
   <properties>
    <property name="Walkable" value="Walkable_1"/>
    <property name="requireId" value="bwm72_beginning"/>
@@ -354,7 +353,7 @@
    <property name="requireValue" value="36"/>
   </properties>
  </object>
-  <object name="height_down" type="replace" x="64" y="160" width="64" height="384">
+  <object id="25" name="height_down" type="replace" x="64" y="160" width="64" height="384">
   <properties>
    <property name="Walkable" value="Walkable_2"/>
    <property name="requireId" value="bwm72_beginning"/>
--- a/AndorsTrail/res/xml/fields0.tmx
+++ b/AndorsTrail/res/xml/fields0.tmx
@@ -1,217 +1,247 @@
-<?xml version="1.0" ?><map height="15" orientation="orthogonal" tileheight="32" tilewidth="32" version="1.0" width="30">
+<?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="15" tilewidth="32" tileheight="32">
 <properties>
  <property name="outdoors" value="1"/>
 </properties>
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- <tileset firstgid="1" name="map_bed_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_bed_1.png" width="512"/>
- </tileset><tileset firstgid="129" name="map_border_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_border_1.png" width="512"/>
- </tileset><tileset firstgid="257" name="map_bridge_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_bridge_1.png" width="512"/>
- </tileset><tileset firstgid="385" name="map_bridge_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_bridge_2.png" width="512"/>
- </tileset><tileset firstgid="513" name="map_broken_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_broken_1.png" width="512"/>
- </tileset><tileset firstgid="641" name="map_cavewall_1" tileheight="32" tilewidth="32">
-  <image height="192" source="../drawable/map_cavewall_1.png" width="576"/>
- </tileset><tileset firstgid="749" name="map_cavewall_2" tileheight="32" tilewidth="32">
-  <image height="192" source="../drawable/map_cavewall_2.png" width="576"/>
- </tileset><tileset firstgid="857" name="map_cavewall_3" tileheight="32" tilewidth="32">
-  <image height="192" source="../drawable/map_cavewall_3.png" width="576"/>
- </tileset><tileset firstgid="965" name="map_cavewall_4" tileheight="32" tilewidth="32">
-  <image height="192" source="../drawable/map_cavewall_4.png" width="576"/>
- </tileset><tileset firstgid="1073" name="map_chair_table_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_chair_table_1.png" width="512"/>
- </tileset><tileset firstgid="1201" name="map_chair_table_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_chair_table_2.png" width="512"/>
- </tileset><tileset firstgid="1329" name="map_crate_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_crate_1.png" width="512"/>
- </tileset><tileset firstgid="1457" name="map_cupboard_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_cupboard_1.png" width="512"/>
- </tileset><tileset firstgid="1585" name="map_curtain_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_curtain_1.png" width="512"/>
- </tileset><tileset firstgid="1713" name="map_entrance_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_entrance_1.png" width="512"/>
- </tileset><tileset firstgid="1841" name="map_entrance_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_entrance_2.png" width="512"/>
- </tileset><tileset firstgid="1969" name="map_fence_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_fence_1.png" width="512"/>
- </tileset><tileset firstgid="2097" name="map_fence_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_fence_2.png" width="512"/>
- </tileset><tileset firstgid="2225" name="map_fence_3" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_fence_3.png" width="512"/>
- </tileset><tileset firstgid="2353" name="map_fence_4" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_fence_4.png" width="512"/>
- </tileset><tileset firstgid="2481" name="map_ground_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_1.png" width="512"/>
- </tileset><tileset firstgid="2609" name="map_ground_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_2.png" width="512"/>
- </tileset><tileset firstgid="2737" name="map_ground_3" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_3.png" width="512"/>
- </tileset><tileset firstgid="2865" name="map_ground_4" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_4.png" width="512"/>
- </tileset><tileset firstgid="2993" name="map_ground_5" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_5.png" width="512"/>
- </tileset><tileset firstgid="3121" name="map_ground_6" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_6.png" width="512"/>
- </tileset><tileset firstgid="3249" name="map_ground_7" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_7.png" width="512"/>
- </tileset><tileset firstgid="3377" name="map_ground_8" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_8.png" width="512"/>
- </tileset><tileset firstgid="3505" name="map_house_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_house_1.png" width="512"/>
- </tileset><tileset firstgid="3633" name="map_house_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_house_2.png" width="512"/>
- </tileset><tileset firstgid="3761" name="map_indoor_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_indoor_1.png" width="512"/>
- </tileset><tileset firstgid="3889" name="map_indoor_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_indoor_2.png" width="512"/>
- </tileset><tileset firstgid="4017" name="map_kitchen_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_kitchen_1.png" width="512"/>
- </tileset><tileset firstgid="4145" name="map_outdoor_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_outdoor_1.png" width="512"/>
- </tileset><tileset firstgid="4273" name="map_pillar_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_pillar_1.png" width="512"/>
- </tileset><tileset firstgid="4401" name="map_pillar_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_pillar_2.png" width="512"/>
- </tileset><tileset firstgid="4529" name="map_plant_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_plant_1.png" width="512"/>
- </tileset><tileset firstgid="4657" name="map_plant_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_plant_2.png" width="512"/>
- </tileset><tileset firstgid="4785" name="map_rock_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_rock_1.png" width="512"/>
- </tileset><tileset firstgid="4913" name="map_rock_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_rock_2.png" width="512"/>
- </tileset><tileset firstgid="5041" name="map_roof_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_roof_1.png" width="512"/>
- </tileset><tileset firstgid="5169" name="map_roof_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_roof_2.png" width="512"/>
- </tileset><tileset firstgid="5297" name="map_roof_3" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_roof_3.png" width="512"/>
- </tileset><tileset firstgid="5425" name="map_shop_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_shop_1.png" width="512"/>
- </tileset><tileset firstgid="5553" name="map_sign_ladder_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_sign_ladder_1.png" width="512"/>
- </tileset><tileset firstgid="5681" name="map_table_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_table_1.png" width="512"/>
- </tileset><tileset firstgid="5809" name="map_trail_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_trail_1.png" width="512"/>
- </tileset><tileset firstgid="5937" name="map_transition_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_transition_1.png" width="512"/>
- </tileset><tileset firstgid="6065" name="map_transition_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_transition_2.png" width="512"/>
- </tileset><tileset firstgid="6193" name="map_transition_3" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_transition_3.png" width="512"/>
- </tileset><tileset firstgid="6321" name="map_transition_4" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_transition_4.png" width="512"/>
- </tileset><tileset firstgid="6449" name="map_transition_5" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_transition_5.png" width="512"/>
- </tileset><tileset firstgid="6577" name="map_tree_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_tree_1.png" width="512"/>
- </tileset><tileset firstgid="6705" name="map_tree_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_tree_2.png" width="512"/>
- </tileset><tileset firstgid="6833" name="map_wall_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_wall_1.png" width="512"/>
- </tileset><tileset firstgid="6961" name="map_wall_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_wall_2.png" width="480"/>
- </tileset><tileset firstgid="7081" name="map_wall_3" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_wall_3.png" width="480"/>
- </tileset><tileset firstgid="7201" name="map_wall_4" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_wall_4.png" width="480"/>
- </tileset><tileset firstgid="7321" name="map_window_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_window_1.png" width="512"/>
- </tileset><tileset firstgid="7449" name="map_window_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_window_2.png" width="512"/>
- </tileset><layer height="15" name="Ground" width="30">
-  <data compression="zlib" encoding="base64">eJzbyMnAsBEH3gzFuORphXHZK8tFOSbHXjkuyvFgsxdf3A5He0da/I7ai8C6XJRjctIzLTE+e2lZTuKzFxZW9I5faqQvADpiy0Y=</data>
+ <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">
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_bridge_2.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
+ </tileset>
+ <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">
+  <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">
+  <image source="../drawable/map_chair_table_2.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_fence_3.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_house_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_roof_3.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_transition_2.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_transition_4.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
+ </tileset>
+ <layer name="Ground" width="30" height="15">
+  <data encoding="base64" compression="zlib">
+   eJzbyMnAsBEH3gzFuORphXHZK8tFOSbHXjkuyvFgsxdf3A5He0da/I7ai8C6XJRjctIzLTE+e2lZTuKzFxZW9I5faqQvADpiy0Y=
+  </data>
 </layer>
- <layer height="15" name="Objects" width="30">
-  <data compression="zlib" encoding="base64">eJy1lL0KwjAQxw+n0sUmg+CLuLk6uonPoU76MvoGOrm419bJSarugroX3LyYHLmGFj9SD45cCs0v//sIgLZUQMG2LYDMfEswllLHwwBgFAGMI781cXnCcskSE8dCc3Ph78o2bctIHa7STNzkDff4BXcaFX2GfkHO3dFLeeDczEOvOm8SaQepuTzHJ4wfZr+vMc87Vl91B5d7w/jK9nXWF6Stn+LmyDk7/Uw98I4rGp9zqZcK2v/cz7GTa6VX3aOMW3ueocjlemmO+Lvx6+y4/cxrXDVHVP86+5nqS31VNUek94D7taeTUY05l79VqcmN4s5DgEXot7rvczcon99+YPUu8b9V6Lc2pdX7yre080uaOXuA3kHveep+AiPiOMw=</data>
+ <layer name="Objects" width="30" height="15">
+  <data encoding="base64" compression="zlib">
+   eJy1lL9uwjAQxk9hibIQe4jUF2FjZWSreI7CBC/TvgGIgYU9JJ2YWgpbh0rQPVK33uGcfLZA/HE46WQ7UvLL992dAUyUCpxYZQCb+lmBe63NfhADvKQAwzRsLXyeslyKuTJcilwZbqXCk2L5ZLmlx/3Wlltc4H7dwB2nbk4wf5Dzi9mKrM/sg+RuAvTS90apSdCGy1optrj/q8/rBn1+F/Wlf/C5B9zvxbnJ+oK29SNuhZyd18/cA5e4Krqey73kaBcaH9HPuec16aX/IO6ncrmN+wwuV+olr/17497Z8ftZ1ljOUSbmiOvfZD9zfbmvzs0R6/3A8yIwObjGkivvqrL2hrivCcBbErb693M3Pj2//djqneJ7syRsbWur9+i3tvPLfSXZz5gdzF6g7n+Mgjqq
+  </data>
 </layer>
- <layer height="15" name="Above" width="30">
-  <data compression="zlib" encoding="base64">eJxjYBgFQxWkCwyMveUDZO9wBeTEIzXinpx4HI37kQv8OFD5thzY1VEbxHJg2h1LZbsBOUQEtg==</data>
+ <layer name="Above" width="30" height="15">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgFQxWkCwyMveUDZO9wBeTEIzXinpx4HI37kQv8OFD5thzY1VEbxHJg2h1LZbsBOUQEtg==
+  </data>
 </layer>
- <layer height="15" name="Walkable" visible="0" width="30">
-  <data compression="zlib" encoding="base64">eJxjYCANbBSjDiYVkKOHGmZRy15Sw4Da/qWmvbSIP1rFLy5zYeLUtJcUQCt7SQlnasYjPeMX2Tx620usucPRXnSzkcWoWU5iswOfOLl1CjIAAIXNNBY=</data>
+ <layer name="Walkable" width="30" height="15" visible="0">
+  <data encoding="base64" compression="zlib">
+   eJxjYCANbBSjDiYVkKOHGmZRy15Sw4Da/qWmvbSIP1rFLy5zYeLUtJcUQCt7SQlnasYjPeMX2Tx620usucPRXnSzkcWoWU5iswOfOLl1CjIAAIXNNBY=
+  </data>
 </layer>
 <objectgroup name="Mapevents" visible="0">
-  <object height="32" name="south" type="mapchange" width="96" x="224" y="448">
+  <object name="south" type="mapchange" x="224" y="448" width="96" height="32">
   <properties>
    <property name="map" value="crossroads"/>
    <property name="place" value="north"/>
   </properties>
  </object>
-  <object height="32" name="north" type="mapchange" width="384" x="0" y="0">
+  <object name="north" type="mapchange" x="0" y="0" width="384" height="32">
   <properties>
    <property name="map" value="fields1"/>
    <property name="place" value="south"/>
   </properties>
  </object>
-  <object height="32" name="change1" type="mapchange" width="448" x="480" y="448">
+  <object name="change1" type="mapchange" x="480" y="448" width="448" height="32">
   <properties>
    <property name="map" value="crossroads"/>
    <property name="place" value="change1"/>
   </properties>
  </object>
-  <object height="448" name="change3" type="mapchange" width="32" x="928" y="32">
+  <object name="change3" type="mapchange" x="928" y="32" width="32" height="448">
   <properties>
    <property name="map" value="loneford1"/>
    <property name="place" value="change3"/>
   </properties>
  </object>
-  <object height="32" name="southwest" type="mapchange" width="96" x="32" y="448">
+  <object name="southwest" type="mapchange" x="32" y="448" width="96" height="32">
   <properties>
    <property name="map" value="crossroads"/>
    <property name="place" value="northwest"/>
   </properties>
  </object>
-  <object height="320" name="west2" type="mapchange" width="32" x="0" y="128">
+  <object name="west2" type="mapchange" x="0" y="128" width="32" height="320">
   <properties>
    <property name="map" value="fields8"/>
    <property name="place" value="east2"/>
   </properties>
  </object>
-  <object height="64" name="west1" type="mapchange" width="32" x="0" y="32">
+  <object name="west1" type="mapchange" x="0" y="32" width="32" height="64">
   <properties>
    <property name="map" value="fields8"/>
    <property name="place" value="east1"/>
@@ -219,8 +249,16 @@
  </object>
 </objectgroup>
 <objectgroup name="Spawn" visible="0">
-  <object height="256" name="fieldwasp_0" type="spawn" width="64" x="64" y="160"/>
-  <object height="416" name="rolwynn" type="spawn" width="512" x="416" y="32"/>
+  <object name="fieldwasp_0" type="spawn" x="64" y="160" width="64" height="256">
+   <properties>
+    <property name="spawngroup" value="fieldwasp_0"/>
+   </properties>
+  </object>
+  <object name="rolwynn" type="spawn" x="416" y="32" width="512" height="416">
+   <properties>
+    <property name="spawngroup" value="rolwynn"/>
+   </properties>
+  </object>
 </objectgroup>
 <objectgroup name="Keys" visible="0"/>
-</map>
+</map>
--- a/AndorsTrail/res/xml/fields1.tmx
+++ b/AndorsTrail/res/xml/fields1.tmx
@@ -1,249 +1,279 @@
-<?xml version="1.0" ?><!DOCTYPE map  SYSTEM 'https://mapeditor.org/dtd/1.0/map.dtd'><map height="30" orientation="orthogonal" tileheight="32" tilewidth="32" version="1.0" width="30">
+<?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="30" tilewidth="32" tileheight="32">
 <properties>
  <property name="outdoors" value="1"/>
 </properties>
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- <tileset firstgid="1" name="map_bed_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_bed_1.png" width="512"/>
- </tileset><tileset firstgid="129" name="map_border_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_border_1.png" width="512"/>
- </tileset><tileset firstgid="257" name="map_bridge_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_bridge_1.png" width="512"/>
- </tileset><tileset firstgid="385" name="map_bridge_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_bridge_2.png" width="512"/>
- </tileset><tileset firstgid="513" name="map_broken_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_broken_1.png" width="512"/>
- </tileset><tileset firstgid="641" name="map_cavewall_1" tileheight="32" tilewidth="32">
-  <image height="192" source="../drawable/map_cavewall_1.png" width="576"/>
- </tileset><tileset firstgid="749" name="map_cavewall_2" tileheight="32" tilewidth="32">
-  <image height="192" source="../drawable/map_cavewall_2.png" width="576"/>
- </tileset><tileset firstgid="857" name="map_cavewall_3" tileheight="32" tilewidth="32">
-  <image height="192" source="../drawable/map_cavewall_3.png" width="576"/>
- </tileset><tileset firstgid="965" name="map_cavewall_4" tileheight="32" tilewidth="32">
-  <image height="192" source="../drawable/map_cavewall_4.png" width="576"/>
- </tileset><tileset firstgid="1073" name="map_chair_table_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_chair_table_1.png" width="512"/>
- </tileset><tileset firstgid="1201" name="map_chair_table_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_chair_table_2.png" width="512"/>
- </tileset><tileset firstgid="1329" name="map_crate_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_crate_1.png" width="512"/>
- </tileset><tileset firstgid="1457" name="map_cupboard_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_cupboard_1.png" width="512"/>
- </tileset><tileset firstgid="1585" name="map_curtain_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_curtain_1.png" width="512"/>
- </tileset><tileset firstgid="1713" name="map_entrance_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_entrance_1.png" width="512"/>
- </tileset><tileset firstgid="1841" name="map_entrance_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_entrance_2.png" width="512"/>
- </tileset><tileset firstgid="1969" name="map_fence_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_fence_1.png" width="512"/>
- </tileset><tileset firstgid="2097" name="map_fence_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_fence_2.png" width="512"/>
- </tileset><tileset firstgid="2225" name="map_fence_3" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_fence_3.png" width="512"/>
- </tileset><tileset firstgid="2353" name="map_fence_4" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_fence_4.png" width="512"/>
- </tileset><tileset firstgid="2481" name="map_ground_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_1.png" width="512"/>
- </tileset><tileset firstgid="2609" name="map_ground_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_2.png" width="512"/>
- </tileset><tileset firstgid="2737" name="map_ground_3" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_3.png" width="512"/>
- </tileset><tileset firstgid="2865" name="map_ground_4" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_4.png" width="512"/>
- </tileset><tileset firstgid="2993" name="map_ground_5" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_5.png" width="512"/>
- </tileset><tileset firstgid="3121" name="map_ground_6" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_6.png" width="512"/>
- </tileset><tileset firstgid="3249" name="map_ground_7" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_7.png" width="512"/>
- </tileset><tileset firstgid="3377" name="map_ground_8" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_8.png" width="512"/>
- </tileset><tileset firstgid="3505" name="map_house_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_house_1.png" width="512"/>
- </tileset><tileset firstgid="3633" name="map_house_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_house_2.png" width="512"/>
- </tileset><tileset firstgid="3761" name="map_indoor_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_indoor_1.png" width="512"/>
- </tileset><tileset firstgid="3889" name="map_indoor_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_indoor_2.png" width="512"/>
- </tileset><tileset firstgid="4017" name="map_kitchen_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_kitchen_1.png" width="512"/>
- </tileset><tileset firstgid="4145" name="map_outdoor_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_outdoor_1.png" width="512"/>
- </tileset><tileset firstgid="4273" name="map_pillar_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_pillar_1.png" width="512"/>
- </tileset><tileset firstgid="4401" name="map_pillar_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_pillar_2.png" width="512"/>
- </tileset><tileset firstgid="4529" name="map_plant_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_plant_1.png" width="512"/>
- </tileset><tileset firstgid="4657" name="map_plant_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_plant_2.png" width="512"/>
- </tileset><tileset firstgid="4785" name="map_rock_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_rock_1.png" width="512"/>
- </tileset><tileset firstgid="4913" name="map_rock_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_rock_2.png" width="512"/>
- </tileset><tileset firstgid="5041" name="map_roof_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_roof_1.png" width="512"/>
- </tileset><tileset firstgid="5169" name="map_roof_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_roof_2.png" width="512"/>
- </tileset><tileset firstgid="5297" name="map_roof_3" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_roof_3.png" width="512"/>
- </tileset><tileset firstgid="5425" name="map_shop_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_shop_1.png" width="512"/>
- </tileset><tileset firstgid="5553" name="map_sign_ladder_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_sign_ladder_1.png" width="512"/>
- </tileset><tileset firstgid="5681" name="map_table_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_table_1.png" width="512"/>
- </tileset><tileset firstgid="5809" name="map_trail_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_trail_1.png" width="512"/>
- </tileset><tileset firstgid="5937" name="map_transition_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_transition_1.png" width="512"/>
- </tileset><tileset firstgid="6065" name="map_transition_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_transition_2.png" width="512"/>
- </tileset><tileset firstgid="6193" name="map_transition_3" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_transition_3.png" width="512"/>
- </tileset><tileset firstgid="6321" name="map_transition_4" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_transition_4.png" width="512"/>
- </tileset><tileset firstgid="6449" name="map_transition_5" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_transition_5.png" width="512"/>
- </tileset><tileset firstgid="6577" name="map_tree_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_tree_1.png" width="512"/>
- </tileset><tileset firstgid="6705" name="map_tree_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_tree_2.png" width="512"/>
- </tileset><tileset firstgid="6833" name="map_wall_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_wall_1.png" width="512"/>
- </tileset><tileset firstgid="6961" name="map_wall_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_wall_2.png" width="480"/>
- </tileset><tileset firstgid="7081" name="map_wall_3" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_wall_3.png" width="480"/>
- </tileset><tileset firstgid="7201" name="map_wall_4" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_wall_4.png" width="480"/>
- </tileset><tileset firstgid="7321" name="map_window_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_window_1.png" width="512"/>
- </tileset><tileset firstgid="7449" name="map_window_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_window_2.png" width="512"/>
- </tileset><layer height="30" name="Ground" width="30">
-  <data compression="zlib" encoding="base64">eJztz7ERAAAEBEGp/isxGpRoABEuuPBn501FrJhn1d20Ty5fcXH3uZ++4uLi7jRx75p8xe0WM62Ofw==</data>
+ <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">
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_bridge_2.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
+ </tileset>
+ <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">
+  <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">
+  <image source="../drawable/map_chair_table_2.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_fence_3.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_house_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_roof_3.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_transition_2.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_transition_4.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
+ </tileset>
+ <layer name="Ground" width="30" height="30">
+  <data encoding="base64" compression="zlib">
+   eJztz7ERAAAEBEGp/isxGpRoABEuuPBn501FrJhn1d20Ty5fcXH3uZ++4uLi7jRx75p8xe0WM62Ofw==
+  </data>
 </layer>
- <layer height="30" name="Objects" width="30">
-  <data compression="zlib" encoding="base64">eJytV7tuwzAM1NjVAWogP9I/6C93ye5HJncp0H5Al35Bt5pOD2ZOJCUZOSCIHVm840Okk1JKQ5c2nE63b9xbGPv9euppjfYtXb4mHJF9weWc24h4WzF1Nz2z4mHtovF75fkxePW+Se2bO/t3xlLwX/v6tV7/9rumCMgfa7E0YR02PV8jjs3O2X5OcAnWAM9XrdHjgnbwWPGBXuzFvVVP7BvnMMqp3j8EdWDx4hmuwRpYebZQe34Gp54F4l9tDFp5LZS4rNpbgnMr8GqyFHvv7Ol9US0L0PtKfgmic5VpOBhjPhMf6963/w+g88l1zbzvz/sz2dmlugLXp7Kx9eSK2DCvZQv2tE+8HnHpHCHHzKtj42mw7LXCyy9izbZb5kQ0i2rr6ur0ZdhnPag7a16KtkfwtkD0eD1Dx5ZnSWYn4Hf7R6FneCjNd51ja+57Meb+XULpee6rUW5Ri16svLiPRo1pRPOAz85snHtgqOxP0Hk0tyW7eoZpPd47q9fDPUS9iv2fjHo6UsdRHwJHy/+Cu3mDfDi5Hsm+l+O72qh4f2RY69EenkHWzIX216eUXh7w+QPFvsG/</data>
+ <layer name="Objects" width="30" height="30">
+  <data encoding="base64" compression="zlib">
+   eJytVztOw0AQXUFDhXAkLOUi3ICTcSeatJHtUIUmCLoglIYT0OFJ/JTJ25lZL+JJVuzs7rz5j51SSl2TjlgsTr94ttC35/uhpTU6t23yNeGI5AtWy1wGeHdNzluLoTnps1E8rLvoeBh5vsfrc/ILePW5QZ3bNPb/jG3Bfu3jj/H+pz3rFAHxY10snbAOmbC1vZr2Oj7WHEc5S3ufYBWsAZ6tWkePC7qDx/IP9MVZPFt5zLZxDKOY6vNdkAfCe00+xh7OwTmw4mwB9u4Xcf10Tj4LxL65PmBeQW3dlris3Nuqun1rcl4vJ0u+92pPn4tyWYDeV7JLENVVpsPEs67sjVwTu/Hs83QBOp6c18L7dDc9j/ev9+c9We1SXoHrXXEde/IM33BOWbIgT9vE6xGXjhFi3FN/1L7xdLDk1cKrIfiaZdfMiWgWCe+eZp+FF6cvQz7rg7yz5qXoNrdnRLw1EH3QM5hX+5ZnSSYn4Hf7R6FneCjNdx1ja+6DV/JZ+5j7dwml/dxXo9giFz1feX7vjRzTQGy/bnNerp2NUfdAN7M/QU/YKnOoJrYluXqGaX30O+tazT6vh3uIehXbP1A+Cf6Sx1EfAkf0XcB5fDFvEA8n1j3J92J8kRsz3h8Z1np0hmcQZq7mhe6PNyk9/MP1C9XGyuQ=
+  </data>
 </layer>
- <layer height="30" name="Above" width="30">
-  <data compression="zlib" encoding="base64">eJxjYBh4sFOSvvqGI6BnWFBi12icDT8wnOOUHn4bzuE3CugHSE1Hgy3dDTb3jALsYKjEE63cOVT8P9jAaLgNfgAA+HgMTw==</data>
+ <layer name="Above" width="30" height="30">
+  <data encoding="base64" compression="zlib">
+   eJxjYBh4sFOSvvqGI6BnWFBi12icDT8wnOOUHn4bzuE3CugHSE1Hgy3dDTb3jALsYKjEE63cOVT8P9jAaLgNfgAA+HgMTw==
+  </data>
 </layer>
- <layer height="30" name="Walkable" width="30">
-  <data compression="zlib" encoding="base64">eJxjYBh8YKPY4LaHXu4bCgBfWFA7nHCZR4w9o3E2/AA5cTpU0gE93DlUwmIUDG5AajqiVrobKHNG883AgKES7rRyJ8zcoRIO1Aa0bq8P5XAFuZ0aGACIQCCn</data>
+ <layer name="Walkable" width="30" height="30">
+  <data encoding="base64" compression="zlib">
+   eJxjYBh8YKPY4LaHXu4bCgBfWFA7nHCZR4w9o3E2/AA5cTpU0gE93DlUwmIUDG5AajqiVrobKHNG883AgKES7rRyJ8zcoRIO1Aa0bq8P5XAFuZ0aGACIQCCn
+  </data>
 </layer>
- <objectgroup name="Mapevents">
-  <object height="32" name="south" type="mapchange" width="384" x="0" y="928">
+ <objectgroup name="Mapevents" visible="0">
+  <object name="south" type="mapchange" x="0" y="928" width="384" height="32">
   <properties>
    <property name="map" value="fields0"/>
    <property name="place" value="north"/>
   </properties>
  </object>
-  <object height="128" name="southeast" type="mapchange" width="32" x="928" y="800">
+  <object name="southeast" type="mapchange" x="928" y="800" width="32" height="128">
   <properties>
    <property name="map" value="loneford1"/>
    <property name="place" value="northwest"/>
   </properties>
  </object>
-  <object height="896" name="west" type="mapchange" width="32" x="0" y="32">
+  <object name="west" type="mapchange" x="0" y="32" width="32" height="896">
   <properties>
    <property name="map" value="fields2"/>
    <property name="place" value="east"/>
   </properties>
  </object>
-  <object height="736" name="east" type="mapchange" width="32" x="928" y="32">
+  <object name="east" type="mapchange" x="928" y="32" width="32" height="736">
   <properties>
    <property name="map" value="fields4"/>
    <property name="place" value="west"/>
   </properties>
  </object>
-  <object height="32" name="north" type="mapchange" width="960" x="0" y="0">
+  <object name="north" type="mapchange" x="0" y="0" width="960" height="32">
   <properties>
    <property name="map" value="fields6"/>
    <property name="place" value="south"/>
   </properties>
  </object>
-  <object height="32" name="sign_fields1" type="sign" width="32" x="416" y="416"/>
+  <object name="sign_fields1" type="sign" x="416" y="416" width="32" height="32"/>
 </objectgroup>
- <objectgroup name="Spawn uniques">
-  <object height="832" name="tinlyn_lostsheep1" type="spawn" width="832" x="64" y="64">
+ <objectgroup name="Spawn uniques" visible="0">
+  <object name="tinlyn_lostsheep1" type="spawn" x="64" y="64" width="832" height="832">
   <properties>
    <property name="spawngroup" value="tinlyn_lostsheep1"/>
   </properties>
  </object>
 </objectgroup>
 <objectgroup name="Spawn monsters" visible="0">
-  <object height="544" name="fieldcritter_0" type="spawn" width="224" x="64" y="64">
+  <object name="fieldcritter_0" type="spawn" x="64" y="64" width="224" height="544">
   <properties>
    <property name="quantity" value="2"/>
    <property name="spawngroup" value="fieldcritter_0"/>
   </properties>
  </object>
-  <object height="320" name="fieldcritter_1" type="spawn" width="384" x="512" y="64">
+  <object name="fieldcritter_1" type="spawn" x="512" y="64" width="384" height="320">
   <properties>
    <property name="quantity" value="2"/>
    <property name="spawngroup" value="fieldcritter_1"/>
   </properties>
  </object>
-  <object height="416" name="fieldcritter_1_1" type="spawn" width="480" x="416" y="512">
+  <object name="fieldcritter_1_1" type="spawn" x="416" y="512" width="480" height="416">
   <properties>
    <property name="quantity" value="3"/>
    <property name="spawngroup" value="fieldcritter_1"/>
   </properties>
  </object>
-  <object height="448" name="fieldcritter_0_1" type="spawn" width="128" x="64" y="448">
+  <object name="fieldcritter_0_1" type="spawn" x="64" y="448" width="128" height="448">
   <properties>
    <property name="quantity" value="2"/>
    <property name="spawngroup" value="fieldcritter_0"/>
   </properties>
  </object>
-  <object height="192" name="fieldcritter_0_2" type="spawn" width="256" x="448" y="256">
+  <object name="fieldcritter_0_2" type="spawn" x="448" y="256" width="256" height="192">
   <properties>
    <property name="spawngroup" value="fieldcritter_0"/>
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Keys"/>
-</map>
+ <objectgroup name="Keys" visible="0"/>
+</map>
--- a/AndorsTrail/res/xml/fields5.tmx
+++ b/AndorsTrail/res/xml/fields5.tmx
@@ -1,186 +1,187 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" tiledversion="1.0.2" orientation="orthogonal" renderorder="right-down" width="30" height="30" tilewidth="32" tileheight="32" nextobjectid="12">
+<!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>
 <layer name="Ground" width="30" height="30">
@@ -190,7 +191,7 @@
 </layer>
 <layer name="Objects" width="30" height="30">
  <data encoding="base64" compression="zlib">
-   eJy1VkFuwkAMzBfCIVL+/4zeA8sp59Jeo5aWK2pvxWIHJsabXS/pSFGkxfHY44lD05Thvb/ev/vH3+TsFM+nrmk+4vV1uV4v12+Xzy/PW7lTcczDXD/xWuJEjlNvn1txU4Inx6UR2ut9aNM1CCw+D4+Vc2zv/ABqkPNpJT7Grs3HbB0+WcJU+DzmKb3unuDkGeX8y5y1vVqeWIJwis9q9U15cKSZpvqu0XfJ85vN3Euyj94MXm+vz3q+xktLPgixpyH2mvKUx0taV8SLnqIrwHMNtJ94B3o4U7oO7fwOSC1S56fK7Zkpx3I/L5ZXFP+xu/N7ZopYfl7v2f8EdDka2vE7s48aSN+HFXb7jCfmE823ar570v5M381DpZe4dtZcwH4O9N0TeN5V7XXJce4eddP8Gt73Rnsd87O4NT88Bw1K35ucJphZjr8kF4PrQ82BvIKzEv61etXA3FP8Nb0C+r8R70P+zeL37EPUp/etIGR2JPOXfh8tjcfCfYg4vZtLkNr9gqB6GxNa3+Id/NAY+vEOYlj644y1L+k952POwfXwue5R4v4ABB42vQ==
+   eJytVj1PxDAMrY6JMR0q9XfxS5nZ28tNnUCiMMBQ8XXrCTZqNebeGaeJc/ekqlLq5tnPL26rKg/P7XL/av8/o7V9WJ+aqnoL1+d8Pc7XT5Pen97X9o7FIQ9yfYdrjZP32Lf6uhY3RXhSXBLeLffOxXMgaHwWHm3PwR35GZwDrU8X4kNsXTqmN/hkDVPm+9xPqnV7Bif2KOVf5CytVfPEGoiTfFaqb8yDA/Q0VneJvmuer+tTL9E8elJ4rbWe6/kSL635wIeaulBrzFMWL0ldOZ70JF0Z2FcP8wlnoIUzpmvnTu8MyoXyfBd7W3qKsVjPneYVeN5squqjOfJbesqx+L6cs1bcbPT1VlmnWm/dwi+1wzOzCxpQ3eMc93BGjtciD9aJNO9Ff3eg/QG+m2Ohl8YQfyV6RkA/e/juESxnVXqd9jgAN0PyS1jPjfQ69w+576FvmudYg9xzk9KEe8b8r6CxrN9ybjA/ztmDV3hN8jfgPea/VK0S3Hfkx3NTUitD/hvhPMRnkv+lts1Dzk/OW4JPzEjkz/0+ahoPmbOG4/qC2RSb/QQvahsiWv/FG/hZY9YPZxBC05/XUPuc2lM+xj0wH1yXNVLcL+GMPM0=
  </data>
 </layer>
 <layer name="Above" width="30" height="30">
@@ -204,19 +205,19 @@
  </data>
 </layer>
 <objectgroup name="Mapevents" visible="0">
-  <object id="1" name="south" type="mapchange" x="288" y="928" width="672" height="32">
+  <object name="south" type="mapchange" x="288" y="928" width="672" height="32">
   <properties>
    <property name="map" value="fields2"/>
    <property name="place" value="north"/>
   </properties>
  </object>
-  <object id="2" name="east" type="mapchange" x="928" y="192" width="32" height="736">
+  <object name="east" type="mapchange" x="928" y="192" width="32" height="736">
   <properties>
    <property name="map" value="fields6"/>
    <property name="place" value="west"/>
   </properties>
  </object>
-  <object id="8" name="west" type="mapchange" x="0" y="416" width="32" height="384">
+  <object name="west" type="mapchange" x="0" y="416" width="32" height="384">
   <properties>
    <property name="map" value="guynmart_wood_11"/>
    <property name="place" value="east"/>
@@ -224,37 +225,37 @@
  </object>
 </objectgroup>
 <objectgroup name="Spawn" visible="0">
-  <object id="3" name="fieldcritter_1" type="spawn" x="256" y="704" width="352" height="192">
+  <object name="fieldcritter_1" type="spawn" x="256" y="704" width="352" height="192">
   <properties>
    <property name="spawngroup" value="fieldcritter_1"/>
   </properties>
  </object>
-  <object id="4" name="fieldcritter_0" type="spawn" x="512" y="800" width="352" height="96">
+  <object name="fieldcritter_0" type="spawn" x="512" y="800" width="352" height="96">
   <properties>
    <property name="spawngroup" value="fieldcritter_0"/>
   </properties>
  </object>
-  <object id="5" name="fieldcritter_1_1" type="spawn" x="640" y="224" width="256" height="192">
+  <object name="fieldcritter_1_1" type="spawn" x="640" y="224" width="256" height="192">
   <properties>
    <property name="spawngroup" value="fieldcritter_1"/>
   </properties>
  </object>
-  <object id="6" name="fieldcritter_0_1" type="spawn" x="704" y="288" width="192" height="288">
+  <object name="fieldcritter_0_1" type="spawn" x="704" y="288" width="192" height="288">
   <properties>
    <property name="spawngroup" value="fieldcritter_0"/>
   </properties>
  </object>
-  <object id="9" name="guynmart_robber1" type="spawn" x="320" y="512" width="32" height="32">
+  <object name="guynmart_robber1" type="spawn" x="320" y="512" width="32" height="32">
   <properties>
    <property name="spawngroup" value="guynmart_robber1"/>
   </properties>
  </object>
-  <object id="10" name="guynmart_robber2" type="spawn" x="192" y="512" width="128" height="32">
+  <object name="guynmart_robber2" type="spawn" x="192" y="512" width="128" height="32">
   <properties>
    <property name="spawngroup" value="guynmart_robber2"/>
   </properties>
  </object>
-  <object id="11" name="frog_3" type="spawn" x="288" y="64" width="256" height="256">
+  <object name="frog_3" type="spawn" x="288" y="64" width="256" height="256">
   <properties>
    <property name="quantity" value="2"/>
    <property name="spawngroup" value="frog_3"/>
--- a/AndorsTrail/res/xml/fields6.tmx
+++ b/AndorsTrail/res/xml/fields6.tmx
@@ -191,7 +191,7 @@
 </layer>
 <layer name="Objects" width="30" height="28">
  <data encoding="base64" compression="zlib">
-   eJy1VjFuwzAM9BcUoAb8/2dkt6RM7truQdruRrJVRMrmeiElp3YOEBJYMu9IUSd33XMw9113LuO9jM8yTmV89E8iW8h/Iv4jPLfGGr3KrwPjfpXxRvNnQ+8W9WKeC8TM4fq7293Xay33hd7fD9ffKdjr541zl5ws5AH+hxv3FrknyC07eVr6ts5dMYa2lv/mHsNtL7GmVt1xXoB14tzX5J8qeVp9h2eUNVg6JD7WkmNqvaPzHOe0TuwTNb/COHuqKQP3gXViDrLu+ONJj8Da59GpP2rVPUJO9Chdr/G5li3UeoA52aMseHuqOfHZEt26Vupe48ywrgU+Q6wP4XFm6j0rtucVE/WM8vC9xpyM1PCkydGo8HrV4pTaWOdEYqsOr2dxzutVvk81LtbK8hLeb+x3K8+lvSrgPmVP8/yVfUA5USufrUPDgxiWllbf4P5pbswr2tU7H4VyYv09zzk43zDs4Uu0pDL/+lJf83t/D/fPc7B9sqUF73iMy98K1nlnWO/retE2E3fq23Ej9Ruf3xH8IRpnWHs0Eu8f3bCedTO+ATzfB5I=
+   eJy1VkFuwkAMjPqDjdRI/P8HvXJPspzgREVP7QHR9h7BrWsRN5PB3tAmjLQCZRfPeOx1KIrHoKuK4pzWW1pfaZ3S+qweRHYn/4n4j/DcWnP0Kr8ujPud1oH2z4beJfxingvEjOH6WZa3fs3lvtDv16vr5zbY57uFc5ecLMQVfA8D9xK5t5BbdPK09C2du6IO01r+m3sThlqip5bvuC9Anzj3Ofm3mTytvsM7yhosHRIfveSY6nfjPMc99YnnRG5eYZw1ecrAOrBOzEHOHfuZ9BdYda4d/1Gr1gg5cUbpeY3PXk4h1wPMyTPKgldTzYnvlujWs+J7jjPCuSnwHWJ9COU8hDFnpN6zYnuzYks9ozz8XhPkvNX6TPF48xv93PdnX4PNKd5Y90Riqw6vZ3HP61V+n2pc9MqaJVxv7HfOs3q6v1cF3Kc807z5ynNAOVEr361NZgbtDV8tLdo3Xg2xfpob84p2nZ2Ij95T8VDxEsZ7yon+ezNn4/yH4RluaRGgJ23a3z3bPIrf9/fq9nkM9pzMaREf8B2Pcfm/gnXfGdbv9bxo68iHtpqO21C/8f2tYT40xh3WHm0S13s58I50w3nWzfgBOr4Q7Q==
  </data>
 </layer>
 <layer name="Above" width="30" height="28">
@@ -204,7 +204,7 @@
   eJztlskNACAIBKnC/luwQ/+G4MGxbuIk/IRZEh/0JtJ/lZdFlSfTr82scO/Mz/BHgPLe+Oe+1dwodyYor5XDesPCaVaG3RB/gnE2GobdGDJqVOT23BLRvOb15snsj7yJkAwe+a+v
  </data>
 </layer>
- <objectgroup name="Mapevents">
+ <objectgroup name="Mapevents" visible="0">
  <object name="south" type="mapchange" x="0" y="864" width="960" height="32">
   <properties>
    <property name="map" value="fields1"/>
@@ -230,7 +230,7 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Spawn">
+ <objectgroup name="Spawn" visible="0">
  <object name="tinlyn" type="spawn" x="384" y="640" width="32" height="32">
   <properties>
    <property name="ignoreAreas" value="true"/>
@@ -270,7 +270,7 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Keys">
+ <objectgroup name="Keys" visible="0">
  <object name="stop_hero" type="key" x="32" y="416" width="768" height="448">
   <properties>
    <property name="phrase" value="brv_wait_patrol"/>
--- a/AndorsTrail/res/xml/gamjee_well_1_2.tmx
+++ b/AndorsTrail/res/xml/gamjee_well_1_2.tmx
@@ -200,9 +200,9 @@
   eJxjYMAPDosRUICm7hIO9ejm4FJHqr0gcFmMsHnkmk2O+ipm4tUCABSxCTU=
  </data>
 </layer>
- <layer id="5" name="Walkable" width="12" height="8" visible="0">
+ <layer id="5" name="Walkable" width="12" height="8">
  <data encoding="base64" compression="zlib">
-   eJzbKMbAsJHKGAZIUUtIPTogVZ4abqR2OIEwAF0APWo=
+   eJzbKMbAsJHKGAaoqRYdkCpPDzeSgwEdwT4x
  </data>
 </layer>
 <objectgroup id="6" name="Mapevents">
--- a/AndorsTrail/res/xml/gamjee_well_jail_cells.tmx
+++ b/AndorsTrail/res/xml/gamjee_well_jail_cells.tmx
@@ -1,192 +1,191 @@
 <?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="27" height="13" tilewidth="32" tileheight="32">
- <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
+<map version="1.8" tiledversion="1.8.4" orientation="orthogonal" renderorder="right-down" width="27" height="13" tilewidth="32" tileheight="32" infinite="0" nextlayerid="12" nextobjectid="20">
+ <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_broken_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="385" 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="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="513" 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="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="621" 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="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="729" 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="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="837" 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="965" name="map_crate_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="965" 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="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1093" 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="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1221" 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="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1349" 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="1477" name="map_fence_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1477" 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="1605" name="map_fence_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="1605" 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="1733" name="map_ground_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1733" 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="1861" name="map_ground_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="1861" 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="1989" name="map_ground_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="1989" 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="2117" name="map_ground_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="2117" 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="2245" name="map_ground_5" tilewidth="32" tileheight="32">
+ <tileset firstgid="2245" 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="2373" name="map_ground_6" tilewidth="32" tileheight="32">
+ <tileset firstgid="2373" 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="2501" name="map_ground_7" tilewidth="32" tileheight="32">
+ <tileset firstgid="2501" 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="2629" name="map_ground_8" tilewidth="32" tileheight="32">
+ <tileset firstgid="2629" 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="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="2757" 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="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="2885" 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="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="3013" 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="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="3141" 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="3269" name="map_plant_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="3269" 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="3397" name="map_rock_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="3397" 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="3525" name="map_roof_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="3525" 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="3653" name="map_roof_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="3653" 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="3781" name="map_shop_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="3781" 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="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="3909" 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="4037" name="map_table_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4037" 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="4165" name="map_trail_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4165" 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="4293" name="map_tree_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4293" 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="4421" name="map_wall_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4421" 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="4549" name="map_wall_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="4549" 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="4669" name="map_wall_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="4669" 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="4789" name="map_window_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4789" 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="4917" name="map_window_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="4917" 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="5045" name="map_indoor_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="5045" 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="5173" name="map_transition_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5173" 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="5301" name="map_transition_5" tilewidth="32" tileheight="32">
+ <tileset firstgid="5301" 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="5429" name="map_transition_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="5429" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
  <image source="../drawable/map_transition_2.png" width="512" height="256"/>
 </tileset>
- <layer name="Base" width="27" height="13">
+ <layer id="1" name="Base" width="27" height="13">
  <data encoding="base64" compression="zlib">
   eJxjYBj+4DjbQLtg+AJQ2MLCl9hwxqWO2vGEz7zBnCZgYUprNyLbQw+7KJGnpT0DlRYAkjgQBQ==
  </data>
 </layer>
- <layer name="Ground" width="27" height="13">
+ <layer id="2" name="Ground" width="27" height="13">
  <data encoding="base64" compression="zlib">
   eJzjZWZguMPGwGAApGWBWA6KeZDYlPJ5kDDILhDWZ4bYSW0si2QXLxAfB9rlJQKhqY1BfuCG2iXPTBs7kDE31E+GBOwiN+yw2UXITU7M2Nn4sJUIdrsi8MTTCTLCKwqLebD4yqBRmsBmFzHhOBB2oQNS7eIh0S5S/QQqJ5DLDnz2weRA8QorY7CpU8QS7zA96HYhhyW6HHp5hss+fHoBXVXGCw==
  </data>
 </layer>
- <layer name="Objects" width="27" height="13">
+ <layer id="3" name="Objects" width="27" height="13">
  <data encoding="base64" compression="zlib">
   eJy1VLFOAzEM9bUSUyMVkTAzMcMGXaBlARa6tWUARmAAJr4ACXWFqZ/CByD6AyB2RiYGkEoZsGWbuLk7qCrxpKfL2bFf7PgOAKBVhR+81qAQly6uH0r2/IUhxnXqAE3U62cAbwvRZ9dluM7KfXcub3tCvXXPeq1/YIpj1DpFLvloq+P6IAAczsijwHmaBXpdzL3vuU7FZuAeE5bDJD9w77vP29XXDnxei60q6+wgt0WPQDXtiZbtx7S9a0tdHcezQLh1rLOGPJFeak1aV/+XGUh785LxnagWYSDxlEs1BibnGe7dMD0sgn4jGtfAHLtyVqtFSL+VYfKudS2G6agzNhei1mOSs+smZ4Kw4rm28xl5EbinvWQ+bJ+uHOsovipyHonrmfmxmC+wNcT2KTn0/zOuxD2jCvuJzzV+Wr+d13vpx43LxyrLMErOoKC7tXo0A5qL7Ks+xuq92xzfVBpiWw==
  </data>
 </layer>
- <layer name="Object_Rope" width="27" height="13">
+ <layer id="4" name="Object_Rope" width="27" height="13">
  <data encoding="base64" compression="zlib">
   eJxjYBgFwxlM56efXcvpaNd2Oto1CkYBLQAAxIkCIw==
  </data>
 </layer>
- <layer name="Above" width="27" height="13">
+ <layer id="5" name="Above" width="27" height="13">
  <data encoding="base64" compression="zlib">
   eJxjYGBgCBdgoBv4zYRfvpORuvalQ/3GKMLAMJ0RwUYG13gIm3MCqsadl4HBgxe7GmLDsR2HfgzzgOoisKgF+SkNj11fRSB4Fo6wfI3k33YsatyR7CTkJ3ZRTLHpaGZ2ofG/o4U/JXYRArjsIpQOqWkXCOBKMyDASoJdYqIQjA8MpvxMS3CViHxLKUgnISx/AsPiBgluAgCzaxh7
  </data>
 </layer>
- <layer name="Top" width="27" height="13">
+ <layer id="6" name="Top" width="27" height="13">
  <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AUjIJRQG8AAAV8AAE=
+   eJxjYBgFo2AU0BqkCwy0C0bBYAMA/LgAeA==
  </data>
 </layer>
- <layer name="Walkable" width="27" height="13" visible="0">
+ <layer id="7" name="Walkable" width="27" height="13" visible="0">
  <data encoding="base64" compression="zlib">
   eJxzFWBgcB3FVMHEAmLVIptLil3o6shxP73sIiX8SAljXHpI8Rc17cJnHjXSG7lpkRxAir+oaQ++tENqniQljCmJH3zyAKu/QxM=
  </data>
 </layer>
- <objectgroup name="Mapevents">
-  <object name="south" type="mapchange" x="128" y="384" width="32" height="32">
+ <objectgroup id="8" name="Mapevents">
+  <object id="1" name="south" type="mapchange" x="128" y="384" width="32" height="32">
   <properties>
    <property name="map" value="gamjee_well_2_1"/>
    <property name="place" value="north"/>
   </properties>
  </object>
-  <object name="troll_hollow_godelieve_selector" type="script" x="384" y="288" width="128" height="32">
+  <object id="2" name="troll_hollow_godelieve_selector" type="script" x="384" y="288" width="128" height="32">
   <properties>
    <property name="when" value="enter"/>
   </properties>
  </object>
-  <object name="gamjee_well_post_troll_selector" type="script" x="352" y="96" width="32" height="32">
+  <object id="3" name="gamjee_well_post_troll_selector" type="script" x="352" y="96" width="32" height="32">
   <properties>
    <property name="when" value="enter"/>
   </properties>
  </object>
-  <object name="gamjee_pit_dl" type="container" x="672" y="192" width="32" height="32"/>
-  <object name="Object" type="key" x="96" y="320" width="128" height="32">
+  <object id="4" name="gamjee_pit_dl" type="container" x="672" y="192" width="32" height="32"/>
+  <object id="5" name="Object" type="key" x="96" y="320" width="128" height="32">
   <properties>
    <property name="phrase" value="gamjee_well_discover_villagers_selector"/>
    <property name="requireId" value="echoes_of_enchantment"/>
@@ -195,72 +194,72 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Spawn" visible="0">
-  <object name="troll_hollow_prisoners" type="spawn" x="608" y="192" width="64" height="64">
+ <objectgroup id="9" name="Spawn" visible="0">
+  <object id="6" name="troll_hollow_prisoners" type="spawn" x="608" y="192" width="64" height="64">
   <properties>
    <property name="spawngroup" value="troll_hollow_philippa"/>
   </properties>
  </object>
-  <object name="troll_hollow_prisoners" type="spawn" x="672" y="192" width="32" height="64">
+  <object id="7" name="troll_hollow_prisoners" type="spawn" x="672" y="192" width="32" height="64">
   <properties>
    <property name="spawngroup" value="troll_hollow_odilia"/>
   </properties>
  </object>
-  <object name="troll_hollow_prisoners" type="spawn" x="416" y="192" width="64" height="64">
+  <object id="8" name="troll_hollow_prisoners" type="spawn" x="416" y="192" width="64" height="64">
   <properties>
    <property name="spawngroup" value="troll_hollow_godelieve"/>
   </properties>
  </object>
-  <object name="troll_hollow_prisoners" type="spawn" x="512" y="192" width="32" height="64">
+  <object id="9" name="troll_hollow_prisoners" type="spawn" x="512" y="192" width="32" height="64">
   <properties>
    <property name="spawngroup" value="troll_hollow_theodora"/>
   </properties>
  </object>
-  <object name="troll_hollow_prisoners" type="spawn" x="576" y="192" width="32" height="64">
+  <object id="10" name="troll_hollow_prisoners" type="spawn" x="576" y="192" width="32" height="64">
   <properties>
    <property name="spawngroup" value="troll_hollow_osric"/>
   </properties>
  </object>
-  <object name="troll_hollow_percival_spawn" type="spawn" x="480" y="192" width="32" height="64">
+  <object id="11" name="troll_hollow_percival_spawn" type="spawn" x="480" y="192" width="32" height="64">
   <properties>
    <property name="spawngroup" value="troll_hollow_percival"/>
   </properties>
  </object>
-  <object name="troll_hollow_prisoners" type="spawn" x="384" y="192" width="32" height="64">
+  <object id="12" name="troll_hollow_prisoners" type="spawn" x="384" y="192" width="32" height="64">
   <properties>
    <property name="spawngroup" value="troll_hollow_theobald"/>
   </properties>
  </object>
-  <object name="troll_hollow_prisoners" type="spawn" x="320" y="192" width="64" height="64">
+  <object id="13" name="troll_hollow_prisoners" type="spawn" x="320" y="192" width="64" height="64">
   <properties>
    <property name="spawngroup" value="troll_hollow_godwin"/>
   </properties>
  </object>
-  <object name="troll_hollow_osric_freed" type="spawn" x="288" y="96" width="32" height="32">
+  <object id="14" name="troll_hollow_osric_freed" type="spawn" x="288" y="96" width="32" height="32">
   <properties>
    <property name="active" value="false"/>
    <property name="spawngroup" value="troll_hollow_osric"/>
   </properties>
  </object>
-  <object name="hardershell_beetle_spawn1" type="spawn" x="736" y="128" width="96" height="160">
+  <object id="15" name="hardershell_beetle_spawn1" type="spawn" x="736" y="128" width="96" height="160">
   <properties>
    <property name="spawngroup" value="hardershell_beetle"/>
   </properties>
  </object>
-  <object name="hardershell_beetle_spawn2" type="spawn" x="64" y="96" width="192" height="256">
+  <object id="16" name="hardershell_beetle_spawn2" type="spawn" x="64" y="96" width="192" height="256">
   <properties>
    <property name="quantity" value="2"/>
    <property name="spawngroup" value="hardershell_beetle"/>
   </properties>
  </object>
-  <object name="burrowing_glow_worm_spawn" type="spawn" x="320" y="288" width="448" height="64">
+  <object id="17" name="burrowing_glow_worm_spawn" type="spawn" x="320" y="288" width="448" height="64">
   <properties>
    <property name="spawngroup" value="burrowing_glow_worm"/>
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Keys">
-  <object name="prevent_walk_into_pit_key" type="key" x="384" y="128" width="32" height="32">
+ <objectgroup id="10" name="Keys">
+  <object id="18" name="prevent_walk_into_pit_key" type="key" x="384" y="128" width="32" height="32">
   <properties>
    <property name="phrase" value="prevent_walk_into_pit"/>
    <property name="requireId" value="echoes_of_enchantment"/>
@@ -269,8 +268,8 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Replace">
-  <object name="gamjee_well_pit" type="replace" x="384" y="128" width="32" height="96">
+ <objectgroup id="11" name="Replace">
+  <object id="19" name="gamjee_well_pit" type="replace" x="384" y="128" width="32" height="96">
   <properties>
    <property name="Objects" value="Object_Rope"/>
    <property name="requireId" value="echoes_of_enchantment"/>
--- a/AndorsTrail/res/xml/guynmart_wood_11.tmx
+++ b/AndorsTrail/res/xml/guynmart_wood_11.tmx
@@ -1,331 +1,332 @@
 <?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="14" nextobjectid="25">
+<!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_guynmart" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7577" name="map_guynmart" tilewidth="32" tileheight="32">
  <image source="../drawable/map_guynmart.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">
   eJztlEEOgyAQRSfu6rrdemxPYFJZGlfFHqCJ9gr0KpX4JyFIjaGCJrJ4AQbCYxhCcyFqFrhnRDV4GH1NlU8xacS6kfeIwFhgvORwYbp6yy0QG+CWcJSY0+d6ejhdObNbYj+VTfDa0vL6Om0vuxVyk9ZcjVj3R56uu2b03X7Q2r7Bs6a/3NLYX3MtiG7F3Kc2cjJcS5M+oG/NeWL6EolEONoVxHRt5Q2ZxxF9sd9KDN9ZnHu/01DOGH/KEep3Rl47OFt4vzSFjkA=
  </data>
 </layer>
- <layer id="2" name="Objects" width="30" height="30">
+ <layer name="Objects" width="30" height="30">
  <data encoding="base64" compression="zlib">
-   eJydVstOwzAQjCL4ABupUi/9WT6FX0A5wL1pJLj00KoVr1MofVwqVYIbXhI328mu7TCS1dje7njWu7YP4yzbu3YQfj32JrtA4fofedd/dv0H17+7yVScbOtL4JhbxgXciA2s5SlvGuE9v5yj/ktAn7SW19ZHbbpvj8e8G3vLm0YcBVsTxeXeDOMsUNO4z412n6Y/75HCiXHmvj331STLrifN9zbANzVdjmg55FGy2HCN6P9W0E/we7xo7TF3+Le0jtJcaowBcwrh/afuNUclxFzis07jrLXdQW71alXg4mPHNl7G9uua4PehgrlKyRutH4oB7jXmv8dXJKdwvGJzlBehtZKtEWyG6JDsU9aunQEa11bxJfmsBD+hGFJuVVJsmZ/lAJ/iPKtRPL+nrI/7sTR9uxgnaSnZ/+qR40xoMW018+nHDNOFXLtRlgTvy1p9f7mN1/YfLg6vcwZxJUj5UEe41m78O6FtAnnOkcr3A/NzK9sTtDwm0PukVvi4NuTjZ87Zd6ReMD+RU9KG9yvd/7x2cB3cthJiK3Fq2kJvBdSO+jyftJeecyHkIHKchH3lMf7r23hdeM6jlfdOgzafUoNSbFPuEelspn4dqXfMHykXyU8x8I4qlTzltYHnr6RzJ8xL3IbVJPJoGPIe0u6QlWm0rhWe1Ld96pvhfMe0Wok3xdcqEMchayGtVDsz9/sLo2Tv2g==
+   eJyVVstOwzAQjAJ8gINUqZf+LJ/CHyDUA9zbRoJLDy1UvMQhlD4ulSrBjSzNNtPJ2nFGsho/uuPZh+1tP0k2Zdsav4qNS04wLPsfad1/LPt3Zf/6MvFin1W2DI5pBlzEzVjSXh7SQxO8p6dz0n8J6LP28lrZKFz9rbhP67G39NCEYwh7Er/cum6cQ9bUb3Lzui/XnFfEcLKf0bZynw+S5GJw+F4F+EauzhFfDinG4BvUyPavDP0CjfGsWs+5g9/WPsbuVGMbOKcYaj821ojc8LnFl5UaJ9XaNeVWo1YNLhzbVf5yWbOuBRqHnOZyT974+iEfcKw5/xXfLTnF4znMSV6E9iprnbGmiw5rfczefWeAj2vlsWXZzA07IR9KbuWWb8HOvINNcx5qlM/vEfQ5HnPXXNfGKVrG8L+iV3JGtDZtBdjUMQe6mGvdq8d7Rk3rmNrKMn98cY1qY645+XVG/U/aq+qckF/Vh5wPhaELsSjHfyLaMpDnli+Z78ad8v3S/JR0Inx5LJD3SQF8ZxAz1MZ8eOYcbbfUC+cna7S08f0q9z/WDu8D1+aGb5FT/LIIaAu9FVg761M+jOUTxFA4Z0YOMsfeiCv6+L+f+WtQoZy7zI6dD7555sJa15qzfBtzj1hns/QLTw2iRswfKxfFzrDjHTXuNXVhbQsfn7+WzrUxb3E7qEnm8aHLe8h3hzy7g9aFhyf2bR/7ZjjeMZVW4Y2x9RzwY5e9iFapnUn5+wfPK/dm
  </data>
 </layer>
- <layer id="3" name="Above" width="30" height="30">
+ <layer name="Above" width="30" height="30">
  <data encoding="base64" compression="zlib">
   eJzFl2EKwyAMhXuKwu5/isL+9Qb6t7vLKkzI5CV5ibI9KJ068uXZqO312LbXfY26lH6psuP+evefn6ur/e4xvTujCtiNUQS3t7PMJ+g/Abfs32O9zTBZz4hrjTH+IvMtVQe/KG4kjygP1V2Pv6q+PJ5kXiA2YrF8jdd0KHWjtWfnAOXvsQ7Ht2xrfrI+2DgRP5FxL76V/6H0Z2Jm9hiNaY1rnLEGWEXma6aWR1nMFWtHk+VJq4dV+oU/lj0rWW+RtZGVFmPMQ/43uya8PRLlNeMvOj9yjjPSnt2K3Dyx58i4FjPPEtUi8s7uf5a8M5jJbcW7gsWfZbLfE+w7A5NjNNbMWfIP5hsB/kmF
  </data>
 </layer>
- <layer id="4" name="Walkable" width="30" height="30" visible="0">
+ <layer name="Walkable" width="30" height="30" visible="0">
  <data encoding="base64" compression="zlib">
   eJy9VVsOwCAI8xS7/xV2w33tZ6EPiq6JiQtIAaW7r7VusV5Ue3WG+XR4OzFTzi+XG9Pph9snFAOhsiV1VucRn2uf+qBaKr9qzzjSO/ojjkI6K+8+QfVu2HfSA8bNalW2KldUT1qHG6dbj2tX8dUMOe/GiYnsLpS/w5kg6dcOMM4ds8N4nTxO4GR9Kg6brSlfZzZSMJ357qe97eS94x5TrUhmH2nrrty6/Cqvib6ht6jsqX6zetzcpjrO+Kf/EKXTrr4xLTq9UC4PPZw9/w==
  </data>
 </layer>
- <layer id="5" name="Walkable_1" width="30" height="30" visible="0">
+ <layer name="Walkable_1" width="30" height="30" visible="0">
  <data encoding="base64" compression="zlib">
   eJztksEJACAMA53C/VdwQ/EraVMVfN2B2IfxIthazuj5vPZoqZwjyu93OK/KnPhVF+c7fatyRx6XuXFFnTNnpVPV7Tzq7Is361D5x6+uah8AAAAAgF9MLWY9ag==
  </data>
 </layer>
- <layer id="6" name="Walkable_2" width="30" height="30" visible="0">
+ <layer name="Walkable_2" width="30" height="30" visible="0">
  <data encoding="base64" compression="zlib">
   eJztkkEKACAIBHtF//9CP4wOQYSrgtFpBqICdTaoNc3o+r7Pa1dLzfFQ/VYWz2v1ZP0qS+S7+194o3dUfGq+58xkqrjPGqu24vUyZP5x1ZXNAwAAAADwiwl8Gz1q
  </data>
 </layer>
- <layer id="7" name="Walkable_3" width="30" height="30" visible="0">
+ <layer name="Walkable_3" width="30" height="30" visible="0">
  <data encoding="base64" compression="zlib">
   eJxjYMANNorh5sPYIBobxqafGIBuBrIYLnXUsBfZXFxuwWcnrezF5nd0fZSGM66wJaSPXECM3/CFOTUArrikhX3EmENt/42CUTAKRsEoGAWjYBSMglFADAAA7FU7FQ==
  </data>
 </layer>
- <layer id="8" name="Walkable_4" width="30" height="30" visible="0">
+ <layer name="Walkable_4" width="30" height="30" visible="0">
  <data encoding="base64" compression="zlib">
   eJxjYMANNorh5sPYIBobxqafGIBuBrIYLnXUsBfZXFxuwWcnrezF5nd0fZSGM66wJaSPXECM3/CFOTUArrikhX3EmENt/42CUTAKRsEoGAWjYBSMglFADAAA7FU7FQ==
  </data>
 </layer>
- <layer id="9" name="Walkable_5" width="30" height="30" visible="0">
+ <layer name="Walkable_5" width="30" height="30" visible="0">
  <data encoding="base64" compression="zlib">
   eJxjYCAPbBRD0NgwrQE97R0ov9IzPLHZOwpGwSgYBaNgFIyCUTAKRsEoGN4AAMUQE3A=
  </data>
 </layer>
- <objectgroup id="10" name="Mapevents">
-  <object id="1" name="north" type="mapchange" x="256" y="0" width="544" height="32">
+ <objectgroup name="Mapevents">
+  <object name="north" type="mapchange" x="256" y="0" width="544" height="32">
   <properties>
    <property name="map" value="guynmart_wood_10"/>
    <property name="place" value="south"/>
   </properties>
  </object>
-  <object id="2" name="west1" type="mapchange" x="0" y="192" width="32" height="256">
+  <object name="west1" type="mapchange" x="0" y="192" width="32" height="256">
   <properties>
    <property name="map" value="guynmart_wood_1"/>
    <property name="place" value="east2"/>
   </properties>
  </object>
-  <object id="3" name="guynmart_s_hill1" type="script" x="736" y="64" width="64" height="64"/>
-  <object id="4" name="guynmart_s_hill2" type="script" x="288" y="32" width="64" height="32"/>
-  <object id="5" name="guynmart_s_hill3" type="script" x="448" y="160" width="32" height="32"/>
-  <object id="6" name="guynmart_s_hill4" type="script" x="448" y="32" width="64" height="32"/>
-  <object id="7" name="east" type="mapchange" x="928" y="416" width="32" height="384">
+  <object name="guynmart_s_hill1" type="script" x="736" y="64" width="64" height="64"/>
+  <object name="guynmart_s_hill2" type="script" x="288" y="32" width="64" height="32"/>
+  <object name="guynmart_s_hill3" type="script" x="448" y="160" width="32" height="32"/>
+  <object name="guynmart_s_hill4" type="script" x="448" y="32" width="64" height="32"/>
+  <object name="east" type="mapchange" x="928" y="416" width="32" height="384">
   <properties>
    <property name="map" value="fields5"/>
    <property name="place" value="west"/>
   </properties>
  </object>
-  <object id="8" name="west2" type="mapchange" x="0" y="512" width="32" height="416">
+  <object name="west2" type="mapchange" x="0" y="512" width="32" height="416">
   <properties>
    <property name="map" value="guynmart_wood_12"/>
    <property name="place" value="east"/>
   </properties>
  </object>
-  <object id="9" name="chk_wild_berry" type="script" x="32" y="192" width="32" height="736"/>
-  <object id="24" name="south" type="mapchange" x="768" y="928" width="128" height="32">
+  <object name="chk_wild_berry" type="script" x="32" y="192" width="32" height="736"/>
+  <object name="south" type="mapchange" x="768" y="928" width="128" height="32">
   <properties>
    <property name="map" value="swamp1"/>
    <property name="place" value="north"/>
   </properties>
  </object>
 </objectgroup>
- <objectgroup id="11" name="Spawn" visible="0">
-  <object id="10" name="forestboar4" type="spawn" x="448" y="704" width="384" height="160">
+ <objectgroup name="Spawn" visible="0">
+  <object name="forestboar4" type="spawn" x="448" y="704" width="384" height="160">
   <properties>
    <property name="quantity" value="3"/>
    <property name="spawngroup" value="forestboar4"/>
   </properties>
  </object>
-  <object id="11" name="forestbeetle" type="spawn" x="64" y="96" width="160" height="480">
+  <object name="forestbeetle" type="spawn" x="64" y="96" width="160" height="480">
   <properties>
    <property name="quantity" value="3"/>
    <property name="spawngroup" value="forestbeetle"/>
   </properties>
  </object>
-  <object id="12" name="guynmart_dog10" type="spawn" x="160" y="-224" width="96" height="64">
+  <object name="guynmart_dog10" type="spawn" x="160" y="-224" width="96" height="64">
   <properties>
    <property name="quantity" value="6"/>
    <property name="spawngroup" value="guynmart_dog10"/>
   </properties>
  </object>
-  <object id="13" name="forestserpent2" type="spawn" x="128" y="608" width="128" height="96">
+  <object name="forestserpent2" type="spawn" x="128" y="608" width="128" height="96">
   <properties>
    <property name="spawngroup" value="forestserpent2"/>
   </properties>
  </object>
-  <object id="14" name="forestboar3" type="spawn" x="512" y="416" width="384" height="64">
+  <object name="forestboar3" type="spawn" x="512" y="416" width="384" height="64">
   <properties>
    <property name="quantity" value="2"/>
    <property name="spawngroup" value="forestboar3"/>
   </properties>
  </object>
-  <object id="15" name="forestserpent2_1" type="spawn" x="672" y="576" width="160" height="224">
+  <object name="forestserpent2_1" type="spawn" x="672" y="576" width="160" height="224">
   <properties>
    <property name="quantity" value="2"/>
    <property name="spawngroup" value="forestserpent2"/>
   </properties>
  </object>
-  <object id="16" name="wild_berry" type="spawn" x="384" y="192" width="512" height="224">
+  <object name="wild_berry" type="spawn" x="384" y="192" width="512" height="224">
   <properties>
    <property name="active" value="false"/>
    <property name="quantity" value="3"/>
    <property name="spawngroup" value="wild_berry"/>
   </properties>
  </object>
-  <object id="17" name="wild_berry2" type="spawn" x="544" y="672" width="320" height="192">
+  <object name="wild_berry2" type="spawn" x="544" y="672" width="320" height="192">
   <properties>
    <property name="active" value="false"/>
    <property name="quantity" value="2"/>
    <property name="spawngroup" value="wild_berry"/>
   </properties>
  </object>
-  <object id="18" name="forestserpent2_2" type="spawn" x="320" y="512" width="128" height="32">
+  <object name="forestserpent2_2" type="spawn" x="320" y="512" width="128" height="32">
   <properties>
    <property name="spawngroup" value="forestserpent2"/>
   </properties>
  </object>
 </objectgroup>
- <objectgroup id="12" name="Replace" visible="0">
-  <object id="19" name="guynmart_r_hill1" type="replace" x="224" y="0" width="608" height="256">
+ <objectgroup name="Replace" visible="0">
+  <object name="guynmart_r_hill1" type="replace" x="224" y="0" width="608" height="256">
   <properties>
    <property name="Walkable" value="Walkable_1"/>
    <property name="requireId" value="guynmart_nondisplay"/>
@@ -333,7 +334,7 @@
    <property name="requireValue" value="41"/>
   </properties>
  </object>
-  <object id="20" name="guynmart_r_hill2" type="replace" x="224" y="0" width="608" height="256">
+  <object name="guynmart_r_hill2" type="replace" x="224" y="0" width="608" height="256">
   <properties>
    <property name="Walkable" value="Walkable_2"/>
    <property name="requireId" value="guynmart_nondisplay"/>
@@ -341,7 +342,7 @@
    <property name="requireValue" value="42"/>
   </properties>
  </object>
-  <object id="21" name="guynmart_r_hill3" type="replace" x="224" y="0" width="608" height="256">
+  <object name="guynmart_r_hill3" type="replace" x="224" y="0" width="608" height="256">
   <properties>
    <property name="Walkable" value="Walkable_3"/>
    <property name="requireId" value="guynmart_nondisplay"/>
@@ -349,7 +350,7 @@
    <property name="requireValue" value="43"/>
   </properties>
  </object>
-  <object id="22" name="guynmart_r_hill4" type="replace" x="224" y="0" width="608" height="256">
+  <object name="guynmart_r_hill4" type="replace" x="224" y="0" width="608" height="256">
   <properties>
    <property name="Walkable" value="Walkable_4"/>
    <property name="requireId" value="guynmart_nondisplay"/>
@@ -357,7 +358,7 @@
    <property name="requireValue" value="44"/>
   </properties>
  </object>
-  <object id="23" name="guynmart_r_hill5" type="replace" x="224" y="0" width="608" height="256">
+  <object name="guynmart_r_hill5" type="replace" x="224" y="0" width="608" height="256">
   <properties>
    <property name="Walkable" value="Walkable_5"/>
    <property name="requireId" value="guynmart_nondisplay"/>
@@ -366,5 +367,5 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup id="13" name="Keys" visible="0"/>
+ <objectgroup name="Keys" visible="0"/>
 </map>
--- a/AndorsTrail/res/xml/guynmart_wood_12.tmx
+++ b/AndorsTrail/res/xml/guynmart_wood_12.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="15" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="13">
+<map version="1.2" tiledversion="1.3.0" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="30" height="15" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="12">
 <properties>
  <property name="outdoors" value="1"/>
 </properties>
@@ -186,32 +186,32 @@
 <tileset firstgid="7577" name="map_guynmart" tilewidth="32" tileheight="32" tilecount="128" columns="16">
  <image source="../drawable/map_guynmart.png" width="512" height="256"/>
 </tileset>
- <layer id="9" name="Base" width="30" height="15">
+ <layer id="1" name="Base" width="30" height="15">
  <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AUjIJRMAoGHmzkJIxpAQCu5QaL
+   eAFjYBgFoyEwGgKjITAaAqMhMPAhsJGTgYEQpoUrAa7lBos=
  </data>
 </layer>
- <layer id="1" name="Ground" width="30" height="15">
+ <layer id="2" name="Ground" width="30" height="15">
  <data encoding="base64" compression="zlib">
-   eJzbyMnAsHEUD1u8GYoHyl5kPNLtp7c78LlhsLhjsMYJrdxJKE7oFT4DGQ/E4GuyuDEt7AMAJGxJDQ==
+   eAHbyMnAsHEUD9sw2AyMWxCmdxzD7EWm6ekGZHth7IG2n97ugNmHi6ZXeOCyHyROLzeA7CHFHehqqeVOdHMJ8allL7o56Paiyw80/5osAwMuTAu3AQAkbEkN
  </data>
 </layer>
- <layer id="2" name="Objects" width="30" height="15">
+ <layer id="3" name="Objects" width="30" height="15">
  <data encoding="base64" compression="zlib">
-   eJylVDsLAjEM7uqg0IrVm3T314ug/0C40UVFd62vVXwg2HiNjaHt3WkgtNe8vjTf9SSFyDPxkakWQir/fbK2c+ZXKkp9+6BMZPic5uJnUJfHxPZV/GLrymHLpe8XbUaG+/31jK5GF7q3Ou/4flEWtvYscm+pfvMEHiN9/MHV3zkMdE5leWDft7MeqDAOiH3KMG4qB3IHdAZvG9nH8qTyo+1qc2902AfrG4YD+L5EXmQFrhjvU//DRafrl+EACXEwhYHasH4VDBzHnvlzjlGuwD7GfYrh37vYMpvR6fun79g/OI5OUcaN9JtC+2+r77x1Z0IF6tbhH7WD5O5tr3IXa+bzruHiMSd/n+rwNMQN0BuZ6ahRxN27Qgx7YX10i3+1DANfm3YuLRW3vwBIZBhR
+   eAGVlL1OQzEMhS02BipaRIEJdh6TJ0JI8AIIqSMLIJhgKKWUFfEjJPwRn14T3VRgKbFz7Ngnce5dDM0me7aUs7HZcLRc2sJ9Lz6kO4/ZKOJq36nnRGpca7REGHURrVfZq3za39I3wW0SmrqKnTkmWzrX+i+mePTM6zCefFxum+m8R5tUMLvy2hfBSfuKp8wZy7Z6J0yaXZxHMo/6j8EBXH3CXpWHnPve6wMfOb9s9n6luyMf50Gmg6KZxYE7QNQD7HniqrzgWVo4MfK9ee67yP+Q3jExqp97Ac57v476nAVeyidNHKK1dEHL/Op1c/3xWvYWm363eBDR9wbrWlqjZbNX9cXhPM7Ux4P4zEM9AUdyXu4kvxXs+p+g+MxBPMiXe3Gf+pI56PsgHpn6fapX0qojXSLLrDfMqsUDX999ZB7PXpeBwPVk/fd5VVuaONlb6WzgmYfeJbi+D+xWn6irvMQhWksXtJszzjvmTjKH3JNul9ltvF38jJ/+xn7lrP9PwmutvDVe86DOuw/FHft5kY8ds8Pd/vHpPr5V7fmr3vC+DHy04r8BNkciEQ==
  </data>
 </layer>
- <layer id="3" name="Above" width="30" height="15">
+ <layer id="4" name="Above" width="30" height="15">
  <data encoding="base64" compression="zlib">
-   eJzFlNENgCAMRLsG+0/hLjqCO/hhYi6kvStU9P0ADYXzWjS72ZvZ0ewB19E8sy8aPVh+JYbjCJ7W6Hs3omcEdo6a97lV8JwzqDnLqaD8rPqcQfUuxlfp8HoMYT2yEua/p/Mt1D/lizrgOrqvj896grVXGqpvZcY7pSGr6Y+7kQuDd6XT
+   eAGtlIENwkAMA38N9p+CXWAEdqARnHSymudp+xKy4zhO+xId43MetzGe24/juuPl7XroHbLHiNe5V2hkFP5zmPOMNfP7NxsN9OwKn+U4c4/n7Mq+mcc7Xro76zk/66V3Vue7ZC41OMs62iM7kTzrcHpXoXO5E2fXf9Yec/uu5uwBnb/3nO6f4X5fdoOVa35mT85mLjX4y3/0Tvgm13zuou6QZ8o+eiK+1Gc1M6tIVuenv4JdRqeTSZ+68A2Dd6XT
  </data>
 </layer>
- <layer id="4" name="Walkable" width="30" height="15" visible="0">
+ <layer id="5" name="Walkable" width="30" height="15" visible="0">
  <data encoding="base64" compression="zlib">
-   eJy1VEEKwDAI6yv6/y/4w11WKM6o0RkQWklNBK3steQNDdnfqHAsns5bd3T2dK181hvyGdXM8BhYbzxN5JvVZPrXeeS7gmjWmDcV7bteNHcTiGaoO1+Mh3P2PGr+JLy+J/Wzuz+li3xk+FVdrYc8dHel80f+FQ/1QY17
+   eAGtjgEKgDAMA/cK//8FfygRT0LopmgLmiZtk+3bGPv1jSh0x1i5b1c7uvG5egq94j7zXrtwx5meO2SBzKv7SmPf8WmPrDeIr++iOZIJ5szvn3rdqtxjplW6355GP368IS1mene2+2UmHMw3dnC8E/FOXby7yJBv5c+cGbz7HelHDuhz3uJaV09ehcpA78rDJ33hIHtg6uJfijv84PJyrerJyxl6Inuprzg3XXgA9UGNew==
  </data>
 </layer>
- <objectgroup id="5" name="Mapevents" visible="0">
+ <objectgroup id="6" name="Mapevents" visible="0">
  <object id="1" name="east" type="mapchange" x="928" y="32" width="32" height="416">
   <properties>
    <property name="map" value="guynmart_wood_11"/>
@@ -232,7 +232,7 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup id="6" name="Spawn" visible="0">
+ <objectgroup id="7" name="Spawn" visible="0">
  <object id="5" name="forestboar4" type="spawn" x="768" y="256" width="128" height="32">
   <properties>
    <property name="spawngroup" value="forestboar4"/>
@@ -266,13 +266,13 @@
    <property name="spawngroup" value="forestboar3"/>
   </properties>
  </object>
-  <object id="12" name="forestserpent2_1" type="spawn" x="512" y="224" width="192" height="64">
+  <object id="11" name="forestserpent2_1" type="spawn" x="512" y="224" width="192" height="64">
   <properties>
    <property name="quantity" value="2"/>
    <property name="spawngroup" value="forestserpent2"/>
   </properties>
  </object>
 </objectgroup>
- <objectgroup id="7" name="Keys" visible="0"/>
- <objectgroup id="8" name="Replace" visible="0"/>
+ <objectgroup id="8" name="Keys" visible="0"/>
+ <objectgroup id="9" name="Replace" visible="0"/>
 </map>
--- a/AndorsTrail/res/xml/guynmart_wood_13.tmx
+++ b/AndorsTrail/res/xml/guynmart_wood_13.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="15" height="30" tilewidth="32" tileheight="32" infinite="0" nextlayerid="17" nextobjectid="48">
+<map version="1.2" tiledversion="1.3.0" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="15" height="30" tilewidth="32" tileheight="32" infinite="0" nextlayerid="15" nextobjectid="31">
 <properties>
  <property name="outdoors" value="1"/>
 </properties>
@@ -188,170 +188,170 @@
 </tileset>
 <layer id="1" name="Ground" width="15" height="30">
  <data encoding="base64" compression="zlib">
-   eJzbyMnAsHGI4c0U6kXG9NaPbgYl+ikNg4HSO5B2DyW9gyW8B4N+auRXcuNgFA9/DADGxUdk
+   eAHbyMnAsHGI4c0UuBekFxmT6ndkveS6A9kMUu0HqYfpJ0cvpfopsRumF0ST43aY/pGil1pxRWl4Dwb95MY9TB+5fiAnrY3qIS9/D2S4AQDGxUdk
  </data>
 </layer>
 <layer id="2" name="Objects" width="15" height="30">
  <data encoding="base64" compression="zlib">
-   eJyVVMFOwzAMzS/YlSr1AJ+4j4E/gAN/gMQP0A1x4jDBuDNWdZexIS6ViNV4cxy7gydFbdM8vxcn9rYJYREH46oK4TqOPs5tG//J2MD4RAzhJvJuq/F7ikdrP+vIrU9xPiBfc063q8cYOo61nvfXQSjQJf4g/q0gj8X899rnS1gevuOan7qMQfw9jvuf4nMMyZfaD2DnjLGGkj93fDPoXfpqHe3B8K7RKi1Puxf+L2JeLnHat96z1H6DUpu4d+mOAtq6hC+0uRqWLs9Z+XoVuRrSmR2S1n36R/dt6qwJdN7PMJ4rcxhPTZlvzUfMve6oJiHXfoSSv1e8hbFv7Z35XK9LVV+EOUzzNWZVObdL3rxa83qL7D0tvcMpBg/t9z/4S09biVxvjHrq4Lx+p3iW56N22udxHvNvz7OOWWHuoW9UXIenYfVrj7M2+ngv7uLS6IWU3xf0z+AX9Qz4Hg==
+   eAGNlMtKA0EQRRvdC0kg4EI/0Y/RP9CFexeCX5Aorlz4XCmiSUg2vnAjWIfuQ4ohEQtqqqf63lvVj5nFdinn4dr+oJSD8HnkFuHrovhpr476/VIOg3cUjv3FAzsZljIN115CRw45x90ofhZcNLo6q/CubxY1nqJ2NnTo46etg7n7NlZL/kPgsOs2fxNRfp2pT3lGsl/B/Q5XQzz8j+iJ9WvyjObRgP/Y1pBrnwVffI5yX2Ne/nCjZsehlU2eOc4/9zVK+Fw7711XQy257v+62vDV2Il17obbt1qZK9ZIz9pd21Nqc1YY3ON2R3uhLY/oGNx722P7lkvMJifXNZe57tdt6wMN9g3sZ6t12ua4b675pOXkW5vzvgznXDHvKOOL4Ofa5Lp8vkHMXt/ifRJaufZmuyecmXzuaublumrZe0WWwn2DP2nu9yMe3Dhq+97lq5PjXjvDnGMNGHy/teetmuPpGVnHmP89I/oIVwMdHBNf3/7/XFc36/nPQdV/KmMx/Lsck19lYDSwWJfjO2vEtXnsXX5f1zN4NRgP2p4zxpjLOhmbxxW9fOa5VXdqiVze+ZyDL4/7pZ6R/b1ijYFjbd34CyxB/7c=
  </data>
 </layer>
 <layer id="3" name="Above" width="15" height="30">
  <data encoding="base64" compression="zlib">
-   eJytlNENgCAMRLuC4YvlHEs3cAG/cBMT3MXwYUKgUO7wfkwMr70WciJtRS/y+PrbU36G4TUuKQxwvVooj3q2+HvhuEj6/jTjneUiuLdyZovbnMju7L6nUudw9T+tL+q/FPNec+YC+Nn7CuTc2nmEX5W7sNTKltHe7K5mMg31mHMaM1qD3VX5nhFOy2sk9zWuNf9fGZ30AjXDgLk=
+   eAGdktENwjAMRLMC4ovlGAs26AJ8wSZIsAs9VU+cjBOcWmrPTu7ZqdLW+vE6tfZen6h94uuVJ3LUIz7jtHZfz7EnmDnLw6Gzs+HQ56HWAb9rjdxccDC6v9mIPao8nJS8wuJF/535cmztuj4EnJRce7fk2xfjIu9zvQ++nsobY/Z/E+/MI+kZZ1DPnBVGCudzWXPfKI/+WI/Yc3IXI7/2uCPmoNrzXHUWFU/G9eZW+rnH82yOr8mriEysN9fvu3fmrKfTzGXN53nOPup7e/4p8RnnfTWLOirnqCq8/B81w4C5
  </data>
 </layer>
- <layer id="9" name="Top" width="15" height="30">
+ <layer id="4" name="Top" width="15" height="30" visible="0">
  <data encoding="base64" compression="zlib">
-   eJyTlGAgG7AD9UoC8RVR0vVu4oTol4CaQapeGGYnUT+yXlLdgK4Xhjkp0EuM+3HphdmNL/zx6SVkNz69hPxNa73ThcnTi8/PhPTiczcxenHZTYxeXHFNil5y7P0uzsCgSaZeSsJqIPTi8isxeqmRF7DlY1raS2lewFV2EpsmsbmBFL3o/idVL7L7ARU7sS0=
+   eAHFlFEKwyAQRP0r+S6lyRF64t6jZ+ld+lsXMrDIPKPNRwVZHWZ2Z9VkW8vP41K1W53v23yK11JK6Nc9x0yG0GrKw6heOsUZD9K0cak9HI1Wo/2If3FdjNq983caYUe1xaPY65s0ws9qn1d/4spPsdczaTJOvjOH1lSb+C3u7rrl0N75Jm7GP/dSHuZ9Zw6tXc24NeJn/B9a6nXEM/md0brvOJ+JW5+pS+9xxHN4Cb37fzufhLUeiEd47p84hGf/XxU7sS0=
  </data>
 </layer>
- <layer id="12" name="Top7" width="15" height="30" visible="0">
+ <layer id="5" name="Top7" width="15" height="30" visible="0">
  <data encoding="base64" compression="zlib">
-   eJzt1D0KwCAMBeBsxbkU0pN7j56lByoOgoT8Vzs14Pj5ng4BeD/3MeGSf8RBBDgxZ68CsCV9s1nfbTtlga27baO9RxvtTW0km9pI9mzr7c1Zr5esp7tmrWzNWtlfWG6PrszV/suy3XO7yWOlDhFL3x+1Y/8H6/dtog==
+   eAFjYKAcXBGl3IxRE3CHgIQEA4MkEJMDNnEyMLCTqR+kl1z9ML0gmpNEtxOjd7ow9tBA1kuqv5H1kupudL2k2I2ulxS7qa2XWHdjsxckRox+XHpB4oTSCj69hOzGp5eQ3fTQi60cpaW9+MKLkL0geZB+bGUTMXphatDdABMnlkZOL8TqgalDdj8A6/dtog==
  </data>
 </layer>
- <layer id="13" name="Top6" width="15" height="30" visible="0">
+ <layer id="6" name="Top6" width="15" height="30" visible="0">
  <data encoding="base64" compression="zlib">
-   eJyTlGAgG7AD9UoC8RVR0vVu4oTol4CaQapeGGYnUT+yXlLdgK4Xhjkp0EuM+3HphdmNL/zx6SVkNz69hPxNa73ThcnTi8/PhPTiczcxenHZTYxeXHFNil5y7P0uzsCgSaZeSsJqIPTi8isxeqmRF7DlY1raS2lewFV2EpsmsbmBFL3o/idVL7L7ARU7sS0=
+   eAHFlFEKwyAQRP0r+S6lyRF64t6jZ+ld+lsXMrDIPKPNRwVZHWZ2Z9VkW8vP41K1W53v23yK11JK6Nc9x0yG0GrKw6heOsUZD9K0cak9HI1Wo/2If3FdjNq983caYUe1xaPY65s0ws9qn1d/4spPsdczaTJOvjOH1lSb+C3u7rrl0N75Jm7GP/dSHuZ9Zw6tXc24NeJn/B9a6nXEM/md0brvOJ+JW5+pS+9xxHN4Cb37fzufhLUeiEd47p84hGf/XxU7sS0=
  </data>
 </layer>
- <layer id="10" name="Top0" width="15" height="30" visible="0">
+ <layer id="7" name="Top0" width="15" height="30" visible="0">
  <data encoding="base64" compression="zlib">
-   eJx7KcvA8HIUj+JRPIqHIIaBgXbHKB7aGABBFsqQ
+   eAF7KcvA8HIUj4bBaBoYTQNDMA0wQMFoGTZajlOSBgBBFsqQ
  </data>
 </layer>
- <layer id="4" name="Walkable" width="15" height="30" visible="0">
+ <layer id="8" name="Walkable" width="15" height="30" visible="0">
  <data encoding="base64" compression="zlib">
-   eJytlFEKwCAMQz2F97+CN9x+hFGSNNEFCqPzmc7WrTnGemNrTT+Qdl4xiu14xrL6a02JEl/FdXx996dvosqkPNoj5W773dWP1iQzqvyZh8N3OcZ2z66/+93ofta9Uu8TnvXWYVi/3VlL5fwTlV9SI2KdM2Zr0rNSs+xyJzPR3WuU+8YDHdaCmQ==
+   eAGVjokNwzAMxDJF918hG7ZCQYA4y4ojIDk9R8n357ru30dUfvrBWNm121FePOboM9vxzJOlTo69VrxP2u16YriT7PTunCV7cnN395Q1D5Pvoj8pb5883Qyu085Pb/LXLAM/fWprzToWxpoc7Fu+2+lel/vGLu849/L93mMfOfPkak4P75OmP+uJL29G17OHOXfQ8jg34/zEYz95cRXwqf/p+rfP/OpcO2YrJ+hTozsPfrT8zuFR70nvKecdE8PNvOPaPHmnXx3Wgpk=
  </data>
 </layer>
- <objectgroup id="16" name="Mapevents_dis" visible="0">
+ <objectgroup id="9" name="Mapevents_dis" visible="0">
  <properties>
   <property name="active" value="false"/>
  </properties>
-  <object id="36" name="dis1" type="mapchange" x="256" y="896" width="160" height="32">
+  <object id="1" name="dis1" type="mapchange" x="256" y="896" width="160" height="32">
   <properties>
    <property name="map" value="guynmart_wood_13"/>
    <property name="place" value="dis1b"/>
   </properties>
  </object>
-  <object id="37" name="dis1b" type="mapchange" x="256" y="864" width="160" height="32"/>
-  <object id="38" name="dis2" type="mapchange" x="64" y="896" width="32" height="32">
+  <object id="2" name="dis1b" type="mapchange" x="256" y="864" width="160" height="32"/>
+  <object id="3" name="dis2" type="mapchange" x="64" y="896" width="32" height="32">
   <properties>
    <property name="map" value="guynmart_wood_13"/>
    <property name="place" value="dis2b"/>
   </properties>
  </object>
-  <object id="39" name="dis2b" type="mapchange" x="64" y="864" width="32" height="32"/>
+  <object id="4" name="dis2b" type="mapchange" x="64" y="864" width="32" height="32"/>
 </objectgroup>
- <objectgroup id="5" name="Mapevents">
-  <object id="1" name="east" type="mapchange" x="448" y="512" width="32" height="224">
+ <objectgroup id="10" name="Mapevents" visible="0">
+  <object id="5" name="east" type="mapchange" x="448" y="512" width="32" height="224">
   <properties>
    <property name="map" value="guynmart_wood_12"/>
    <property name="place" value="west"/>
   </properties>
  </object>
-  <object id="2" name="north" type="mapchange" x="64" y="0" width="64" height="32">
+  <object id="6" name="north" type="mapchange" x="64" y="0" width="64" height="32">
   <properties>
    <property name="map" value="guynmart_wood_8"/>
    <property name="place" value="south"/>
   </properties>
  </object>
-  <object id="22" name="south" type="mapchange" x="32" y="928" width="224" height="32">
+  <object id="7" name="south" type="mapchange" x="32" y="928" width="224" height="32">
   <properties>
    <property name="map" value="swamp3"/>
    <property name="place" value="north"/>
   </properties>
  </object>
-  <object id="23" name="west2" type="mapchange" x="0" y="864" width="32" height="64">
+  <object id="8" name="west2" type="mapchange" x="0" y="864" width="32" height="64">
   <properties>
    <property name="map" value="guynmart_wood_14"/>
    <property name="place" value="east2"/>
   </properties>
  </object>
-  <object id="24" name="west1" type="mapchange" x="0" y="32" width="32" height="640">
+  <object id="9" name="west1" type="mapchange" x="0" y="32" width="32" height="640">
   <properties>
    <property name="map" value="guynmart_wood_14"/>
    <property name="place" value="east1"/>
   </properties>
  </object>
-  <object id="40" name="feygard_fogmonster_startquest" type="script" x="96" y="224" width="32" height="128">
+  <object id="10" name="feygard_fogmonster_startquest" type="script" x="96" y="224" width="32" height="128">
   <properties>
    <property name="when" value="step"/>
   </properties>
  </object>
-  <object id="41" name="feygard_fogmonster_startquest" type="script" x="160" y="448" width="64" height="128">
+  <object id="11" name="feygard_fogmonster_startquest" type="script" x="160" y="448" width="64" height="128">
   <properties>
    <property name="when" value="step"/>
   </properties>
  </object>
-  <object id="42" name="feygard_fogmonster_startquest" type="script" x="224" y="896" width="64" height="32">
+  <object id="12" name="feygard_fogmonster_startquest" type="script" x="224" y="896" width="64" height="32">
   <properties>
    <property name="when" value="step"/>
   </properties>
  </object>
-  <object id="43" name="feygard_fogmonster_startquest" type="script" x="160" y="608" width="32" height="288">
+  <object id="13" name="feygard_fogmonster_startquest" type="script" x="160" y="608" width="32" height="288">
   <properties>
    <property name="when" value="step"/>
   </properties>
  </object>
 </objectgroup>
- <objectgroup id="6" name="Spawn" visible="0">
-  <object id="13" name="forestboar4" type="spawn" x="256" y="64" width="224" height="288">
+ <objectgroup id="11" name="Spawn" visible="0">
+  <object id="14" name="forestboar4" type="spawn" x="256" y="64" width="224" height="288">
   <properties>
    <property name="quantity" value="2"/>
    <property name="spawngroup" value="forestboar4"/>
   </properties>
  </object>
-  <object id="14" name="forestwolf2" type="spawn" x="224" y="704" width="224" height="224">
+  <object id="15" name="forestwolf2" type="spawn" x="224" y="704" width="224" height="224">
   <properties>
    <property name="quantity" value="2"/>
    <property name="spawngroup" value="forestwolf2"/>
   </properties>
  </object>
-  <object id="15" name="forestwolf1" type="spawn" x="96" y="64" width="256" height="96">
+  <object id="16" name="forestwolf1" type="spawn" x="96" y="64" width="256" height="96">
   <properties>
    <property name="quantity" value="2"/>
    <property name="spawngroup" value="forestwolf1"/>
   </properties>
  </object>
-  <object id="16" name="forestbeetle" type="spawn" x="0" y="224" width="160" height="736">
+  <object id="17" name="forestbeetle" type="spawn" x="0" y="224" width="160" height="736">
   <properties>
    <property name="quantity" value="3"/>
    <property name="spawngroup" value="forestbeetle"/>
   </properties>
  </object>
-  <object id="17" name="guynmart_roadguard" type="spawn" x="320" y="576" width="32" height="32">
+  <object id="18" name="guynmart_roadguard" type="spawn" x="320" y="576" width="32" height="32">
   <properties>
    <property name="spawngroup" value="guynmart_roadguard"/>
   </properties>
  </object>
-  <object id="18" name="forestboar3" type="spawn" x="288" y="352" width="96" height="64">
+  <object id="19" name="forestboar3" type="spawn" x="288" y="352" width="96" height="64">
   <properties>
    <property name="quantity" value="2"/>
    <property name="spawngroup" value="forestboar3"/>
   </properties>
  </object>
-  <object id="19" name="forestserpent2_1" type="spawn" x="320" y="416" width="96" height="128">
+  <object id="20" name="forestserpent2_1" type="spawn" x="320" y="416" width="96" height="128">
   <properties>
    <property name="spawngroup" value="forestserpent2"/>
   </properties>
  </object>
-  <object id="20" name="forestserpent2_2" type="spawn" x="32" y="352" width="96" height="288">
+  <object id="21" name="forestserpent2_2" type="spawn" x="32" y="352" width="96" height="288">
   <properties>
    <property name="spawngroup" value="forestserpent2"/>
   </properties>
  </object>
-  <object id="21" name="forestboar4_2" type="spawn" x="96" y="544" width="160" height="192">
+  <object id="22" name="forestboar4_2" type="spawn" x="96" y="544" width="160" height="192">
   <properties>
    <property name="quantity" value="2"/>
    <property name="spawngroup" value="forestboar4"/>
   </properties>
  </object>
 </objectgroup>
- <objectgroup id="7" name="Keys">
-  <object id="44" name="guynmart_sign_fog_10a_0" type="key" x="320" y="736" width="32" height="32">
+ <objectgroup id="12" name="Keys">
+  <object id="23" name="guynmart_sign_fog_10a_0" type="key" x="320" y="736" width="32" height="32">
   <properties>
    <property name="phrase" value="guynmart_sign_fog_10a_0"/>
    <property name="requireId" value="andor"/>
@@ -360,7 +360,7 @@
    <property name="requireValue" value="1"/>
   </properties>
  </object>
-  <object id="45" name="guynmart_sign_fog_10a_0" type="key" x="352" y="480" width="32" height="32">
+  <object id="24" name="guynmart_sign_fog_10a_0" type="key" x="352" y="480" width="32" height="32">
   <properties>
    <property name="phrase" value="guynmart_sign_fog_10a_0"/>
    <property name="requireId" value="andor"/>
@@ -369,7 +369,7 @@
    <property name="requireValue" value="1"/>
   </properties>
  </object>
-  <object id="46" name="guynmart_sign_fog_10a_0" type="key" x="256" y="224" width="32" height="32">
+  <object id="25" name="guynmart_sign_fog_10a_0" type="key" x="256" y="224" width="32" height="32">
   <properties>
    <property name="phrase" value="guynmart_sign_fog_10a_0"/>
    <property name="requireId" value="andor"/>
@@ -378,7 +378,7 @@
    <property name="requireValue" value="1"/>
   </properties>
  </object>
-  <object id="47" name="guynmart_sign_fog_10a_0" type="key" x="64" y="32" width="32" height="32">
+  <object id="26" name="guynmart_sign_fog_10a_0" type="key" x="64" y="32" width="32" height="32">
   <properties>
    <property name="phrase" value="guynmart_sign_fog_10a_0"/>
    <property name="requireId" value="andor"/>
@@ -388,8 +388,8 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup id="14" name="Keys_fog" visible="0">
-  <object id="29" name="guynmart_fog:1" type="key" x="0" y="32" width="32" height="320">
+ <objectgroup id="13" name="Keys_fog" visible="0">
+  <object id="27" name="guynmart_fog:1" type="key" x="0" y="32" width="32" height="320">
   <properties>
    <property name="phrase" value="guynmart_fog"/>
    <property name="requireId" value="feygard_fog"/>
@@ -398,8 +398,8 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup id="8" name="Replace" visible="0">
-  <object id="31" name="feygard_fog7" type="replace" x="0" y="0" width="480" height="960">
+ <objectgroup id="14" name="Replace" visible="0">
+  <object id="28" name="feygard_fog7" type="replace" x="0" y="0" width="480" height="960">
   <properties>
    <property name="Top" value="Top7"/>
    <property name="requireId" value="feygard_fog"/>
@@ -407,7 +407,7 @@
    <property name="requireValue" value="7"/>
   </properties>
  </object>
-  <object id="35" name="feygard_fog6" type="replace" x="0" y="0" width="480" height="960">
+  <object id="29" name="feygard_fog6" type="replace" x="0" y="0" width="480" height="960">
   <properties>
    <property name="Top" value="Top6"/>
    <property name="requireId" value="feygard_fog"/>
@@ -415,7 +415,7 @@
    <property name="requireValue" value="6"/>
   </properties>
  </object>
-  <object id="34" name="feygard_fog0" type="replace" x="0" y="0" width="480" height="960">
+  <object id="30" name="feygard_fog0" type="replace" x="0" y="0" width="480" height="960">
   <properties>
    <property name="Top" value="Top0"/>
    <property name="requireId" value="feygard_fog"/>
--- a/AndorsTrail/res/xml/guynmart_wood_14.tmx
+++ b/AndorsTrail/res/xml/guynmart_wood_14.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.8" tiledversion="1.8.4" orientation="orthogonal" renderorder="right-down" width="14" height="30" tilewidth="32" tileheight="32" infinite="0" nextlayerid="20" nextobjectid="14">
+<map version="1.2" tiledversion="1.3.0" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="14" height="30" tilewidth="32" tileheight="32" infinite="0" nextlayerid="13" nextobjectid="9">
 <properties>
  <property name="outdoors" value="1"/>
 </properties>
@@ -188,45 +188,45 @@
 </tileset>
 <layer id="1" name="Ground" width="14" height="30">
  <data encoding="base64" compression="zlib">
-   eJzbyMnAsHEY4M04MKnqceml1FxS/TDQ4TmKR/EoHsX0xgAQTzFw
+   eAHbyMnAsHEY4M1AP2DDuPyGTS26GLJefHL41MH0IavBxYapBdG41IyKj4bNaBoYTQPDNQ0AABBPMXA=
  </data>
 </layer>
 <layer id="2" name="Objects" width="14" height="30">
  <data encoding="base64" compression="zlib">
-   eJyVVMEOgjAMbaJ3s6kkkuj/f4AXf0DEowcjeNIDis6DHozcHMJi6boBTZpKea97bYdqBvDQrnrG0vBv+jyXAAtp518SGmbeJQIgCwCuDs8Du5bB3wNw2g1xu+Apl+JzUcVU5z6Mu8zgC9KHicfAjz+juRlOpLW8yfkFo4HuiTsfY8q63J4Vec4E3yvmnpg7gA33lQq/1jbDOgchwDBschOidyXs/seaM9E+1R47+uPOc+nk5rgc+efftfe2Ghw3ZnZKuRnZA+X0Md+3j+dLa+/kP5cKG+O7nzGjkcNfmP3/3ovKOf6mzh+kvXcaoxpbxrXjmzJzofW76Of2sRV2/8qB3Wvs0/F/zOXa7qhPY9f4BSE78Mw=
+   eAGVlLlOA0EQRFtAjrgsgQT/HyMSfgAwIQGHiXBgLhNAgCCjSztPlJuxkFuarenq6prDu57vR7zlmK+IkUGP5grPD7cjjnJU/qNxQ+W3524rYjaKeFoynpOvXuhfWw1P4XX6KV6yRm/VT9teRmuDtj7Vq/24/03znST/1Rny6Pmh/84eBXcF3jdeteNco+rZq/eep+6z7AF/6QjWIBfCVVRNvvBV6/ms3YU4D+996LwDrvVzTcq66NwProfohOsHERs54KTXO+Zxauuh28me3Rx7OcZF772a0yP0fMj+cuhPNhd7/fvz3mWeaPCrWOvkwnHZa69Xvyt8r8f9/pu7T/32/X5dJ8+rfG/g9F4oyJfNVVdwxiEbnr3eRzvnQl18WxMP6heNv237U51aRX1HCuFZDurifK57IcdfGg/q4piDrrvMder5petp9R/53r5PPHo6OBAtCA+KZ74q/gAJ8POI
  </data>
 </layer>
 <layer id="3" name="Above" width="14" height="30">
  <data encoding="base64" compression="zlib">
-   eJxjYGBguCPJwHAXiGEAnU9InJAcNdQPVgDzBzn+oUaYoduPLy6R1RBjPz77KHErsXpB9Gcg/kJE+FIjHvCFC7ZwxGYvJXmHmDiEgZ1E2o/MR9dDCqBmvBMTlsjuxWUWvngg1X3YzCAmLoktO/HpxaUH3f93SEjfxJQVuPQQk74J0eQCAMk3lyM=
+   eAHNj+sNAjEMg7MG+0/BLjAFDMBZ0Scsk+qu/6jUOn5VbVXV41b1PDYr+Zkuf9Whm7ibz/6/cP4B7rxrtzPl0RJ5B7o4s9B5s9+TvDuT5j7zlJs08o7khK9jv4+N5jmf8UH3zmY6Qi14sz5dm2Y00LuaV7p7ZEDuSC79Hm8lA07d7JC5gnnvqjPlUnM+zdK0eG+zPqe8HHTQOz5PvjQtvMR2vye+d3DdQ3N0nxn0nOb8v3KrbHanHBq46rjPvIt591X+Ack3lyM=
  </data>
 </layer>
- <layer id="10" name="Top" width="14" height="30">
+ <layer id="4" name="Top" width="14" height="30" visible="0">
  <data encoding="base64" compression="zlib">
-   eJzVk2EKgCAMRvevPIF6Auv6nafOUf1LoaDMbR+FQQ+GJHt8Jo6oHtYRuayQ/jbWYK4lOaV+zVst73CelsV5WtafPeROSh6S9YU3x/0unn+xuJecfn/LYXcRz7h7D+I10fPuet854fQPuXueqRJP3wuXWWv+3njaWSWkTAkpU4NzEUouSnKleUCzE6Mnmjy/Hhzfyd0AFBuiMA==
+   eAHVk9ENwjAMRP0HnaDtBMD6zANzAH/4RE6k0TmOkEDCkhul8fM5TmL2PZsXs6Xxnhrj986cp61HHBgVTz7iHvM2P+M5Ki7TAqss0/pnbqQnan8jPfkFd/N7cPQ7dC/3oT0/VSeYkzOwQ2Ffs/dXcVNhGIWY1hS3c24tLPvdcqwDPasdLN4g30jLYa406xzqHMBFmjWLOGWZpmLw71MuqzXSyzR7XE+zx2EtYjMuYkc4sr33kOVh3Yi7rGZX92hkLq6DfQIUG6Iw
  </data>
 </layer>
- <layer id="15" name="Top7" width="14" height="30" visible="0">
+ <layer id="5" name="Top7" width="14" height="30" visible="0">
  <data encoding="base64" compression="zlib">
-   eJzVk0EKgCAQRd2ZJ9BOUF2/y1W7HDIQG2c+kkEPZhPz+vYxY/rhQ8eX/xzqJqQZlZ7y3SHO6q6xgueL3XJaHM5DHM47vO584W3x+RzPv3vcI2dJ3U/JRTwXnjuIZ7M7cvddMmXfULr5veFAOuWoZWoekvm2p51VQsqUkDI1ai4C56KQK/0PaHYL5J5rNXWl
+   eAHVk0EOwyAMBHNr84LQF6T5fj7X5FZW8arIMrYP5FAkhBAe77Ih03TfWMp9vf+9M7IpMl9BTm3ts9bu8zUfDgemrSXD1covYsDqkWEs7lx+96Ana9V6o7lP9fGuWR3iJ6MHZpPsV2Ez3CwMa3EXPaz74TvzjTBvzdGHzhAs3hnfguawtzR1H4vrabasxWU0R3OR155e5NXjPE2Pw1mPjbgem+HIev9D1Ie+ozrrHOwXazV1pQ==
  </data>
 </layer>
- <layer id="18" name="Top6" width="14" height="30" visible="0">
+ <layer id="6" name="Top6" width="14" height="30" visible="0">
  <data encoding="base64" compression="zlib">
-   eJzV000KgCAUBGB35Qm0E1jX73LVLgUXau9nMAwacBPvY0zUmHFx3hjfLGR+jmu39ZIMNa+5y/GGc1oX57SuPzvkTCiHdH3hjvh9jfs/He6S2fJdDtkizvrnDOKm6BZfn3ebUPxDa8s3RaX3vnCdo97fG6ftVYrUKUXq1MJZJJRFk6z0HtDuniR7A95LmJk=
+   eAHV02EOgjAMBeD9U04AnkC8vpdT/7kX98JoXtvFRBOaDDLot46xlfK7mJdSFtOiasw/V3Of9s1zMCqf3nOveT8+83lXLqsFqyKrdWQ3sibq+0bW5B/uUffBWvfQs+0H+//UPGFu1SCuzX5621W5qRlmIceGcqfqLs1yva3jPLBmfYPFGeQZsQ59VbMfQ/0HOK9mb5GnIqupDJ5967K5evWympGLakYO7zybOc+OONroPGTjcN5ZnnoP+wbeS5iZ
  </data>
 </layer>
- <layer id="11" name="Top0" width="14" height="30" visible="0">
+ <layer id="7" name="Top0" width="14" height="30" visible="0">
  <data encoding="base64" compression="zlib">
-   eJx7KcvA8HIUj+JRjBfDwEC7YxSP4uGMAf1Aq9w=
+   eAF7KcvA8HIUj4bBaBrAmwYYoGA0r4yWF6NpgHZpAAD9QKvc
  </data>
 </layer>
- <layer id="5" name="Walkable" width="14" height="30" visible="0">
+ <layer id="8" name="Walkable" width="14" height="30" visible="0">
  <data encoding="base64" compression="zlib">
-   eJzNU9sNACEIc4rbfwU2NP4RYl93P9eERE0rFbCetepFHPT13LN1x7xTIeH+Gbd6ptovfNbXqVHcJF/iNa2RM6+uxoGjVX9C5WV+kh72s1SL/rsDVX/k1Z1J9BblI50x5i/tpdsrpWV5kNblOp4RR/llsQHDDZVB
+   eAHNj8ENwzAMAz1F918hGzZscMVBkAM7rwhoKZHHND0+YxwPPuMcetkzvu/2i76+4aIrA7/Cvpnhf6A777rb6Xi8qrwHfm72qrBV4ex3nnN2c+wozEzhOk0nfp2O7bjay73ShTHvnRxN5pn5Yciq0sfnpoOSW2HxYNH4O9M9p+ubS87t38Nz7p3cneQZstnu/FcoXzXnvtPyiP87uAODx12VvNOOteeO/ezJPLB43FYy1Fn2TPVW7y/DDZVB
  </data>
 </layer>
- <objectgroup id="6" name="Mapevents">
+ <objectgroup id="9" name="Mapevents">
  <object id="1" name="east2" type="mapchange" x="416" y="864" width="32" height="64">
   <properties>
    <property name="map" value="guynmart_wood_13"/>
@@ -245,19 +245,18 @@
    <property name="place" value="east"/>
   </properties>
  </object>
-  <object id="11" name="feygard_fogmonster1_heart" type="script" x="352" y="480" width="32" height="32"/>
+  <object id="4" name="feygard_fogmonster1_heart" type="script" x="352" y="480" width="32" height="32"/>
 </objectgroup>
- <objectgroup id="12" name="Spawn" visible="0">
-  <object id="4" name="feygard_fogmonster1" type="spawn" x="352" y="480" width="32" height="32">
+ <objectgroup id="10" name="Spawn" visible="0">
+  <object id="5" name="feygard_fogmonster1" type="spawn" x="352" y="480" width="32" height="32">
   <properties>
-    <property name="quantity" value="1"/>
    <property name="spawngroup" value="feygard_fogmonster1"/>
   </properties>
  </object>
 </objectgroup>
- <objectgroup id="8" name="Keys" visible="0"/>
- <objectgroup id="13" name="Replace" visible="0">
-  <object id="7" name="feygard_fog7" type="replace" x="0" y="0" width="448" height="960">
+ <objectgroup id="11" name="Keys" visible="0"/>
+ <objectgroup id="12" name="Replace" visible="0">
+  <object id="6" name="feygard_fog7" type="replace" x="0" y="0" width="448" height="960">
   <properties>
    <property name="Top" value="Top7"/>
    <property name="requireId" value="feygard_fog"/>
@@ -265,7 +264,7 @@
    <property name="requireValue" value="7"/>
   </properties>
  </object>
-  <object id="12" name="feygard_fog6" type="replace" x="0" y="0" width="448" height="960">
+  <object id="7" name="feygard_fog6" type="replace" x="0" y="0" width="448" height="960">
   <properties>
    <property name="Top" value="Top6"/>
    <property name="requireId" value="feygard_fog"/>
@@ -273,7 +272,7 @@
    <property name="requireValue" value="6"/>
   </properties>
  </object>
-  <object id="13" name="feygard_fog0" type="replace" x="0" y="0" width="448" height="960">
+  <object id="8" name="feygard_fog0" type="replace" x="0" y="0" width="448" height="960">
   <properties>
    <property name="Top" value="Top0"/>
    <property name="requireId" value="feygard_fog"/>
--- a/AndorsTrail/res/xml/guynmart_wood_15.tmx
+++ b/AndorsTrail/res/xml/guynmart_wood_15.tmx
@@ -1,256 +1,256 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="22" height="30" tilewidth="32" tileheight="32" infinite="0" nextlayerid="11" nextobjectid="23">
+<!DOCTYPE map SYSTEM "https://mapeditor.org/dtd/1.0/map.dtd">
+<map version="1.0" orientation="orthogonal" width="22" 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_guynmart" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7577" name="map_guynmart" tilewidth="32" tileheight="32">
  <image source="../drawable/map_guynmart.png" width="512" height="256"/>
 </tileset>
- <layer id="1" name="Ground" width="22" height="30">
+ <layer name="Ground" width="22" height="30">
  <data encoding="base64" compression="zlib">
   eJzbyMnAsBGINyPhjWTinUwMDCugGFmcUnNBeDkecylxO8jNu5gwxbGZTapd97CYS207SMG0NJsa8Ywt7VAr/YDiGD0+BmMYDGUzaWkureKL1mYPRXNpbTYtyyB6+YEWZo/iUTzUMQB+xeAB
  </data>
 </layer>
- <layer id="2" name="Objects" width="22" height="30">
+ <layer name="Objects" width="22" height="30">
  <data encoding="base64" compression="zlib">
-   eJydlU1OwzAQha3ChqUT1Kg5B9wAOAFwAuiCe3AFjgA3AAH7JpXKvioCFkilpWXTRQULJMaKh0xebCdgaWTXmX7zPOOfs0iprKsqLbe/lz2lPnplL5trTrYVcdfEeRTsdxrPrM09MRa6PvfUKXxHYg41u2LIWAMd1s9j1BxquB7JZM0mD2lcsj+t/SUGsod2PNX1eRmD7aLjjpeLOeYcJkodgR0nhc+1yOEtMe/I7jv19RhuFFXruE+MfKtqe4J/RZxXW+sR2YPNXwZc1ItMth1i9pNSp2nn1L+QTYmzsKwJ9V+Q36WHy0zTjM5na8hkrcj06T1IqnWJo6KWyGStv3tDh/UyF/e6yWnWrTOHwsenV+YA2ZKL65e+Lr1G60TXmWNdPZN8Hmband/dxK3Vd5dJtmt/8fiEOKfW+lAvbG+6zAdzo7jqg+fW9w1/G04Gufh25A35Y/Bx5UOeNbxHTZwbXexN393P8wOIFbpTeQ2sc+nR6csN3nf43oTeLnNHuZgzeCsu4/oa2F/6juF/C0ddeJ0bqVKbaVG7tdDu8nWt3ZefmJjbaVWHqatrX7RhhvK3Br1z3bw32sRceeoi3/AmXqu16TK/bRhtv00bzuN/89I2ftuzE/L3fWvqfwCMEYaE
+   eJydlUtOwzAQhq2UDUsnkKg5B9wAOAFwAuiCe3AFjgBrugAB+z6kskVVESBAKn2x6aKCBRJjxYMnk3ESYWlk15l+83vGj5NQqW6scq1nfy+aSn02XU+bNEfbErgr4DwS9gzGE2tTT4y5Ls49BZnvgMyh5rbO+gddjEFjdXS5fhxzzdgaQXGOr4cyUbPJQxo59pc1HuMtdONXMp4J7L4dj3VxnsZAOwvkNfXIHHL2E6UOmB0mmc8VyeENMG/B7gK3nkvtuGGYr+MuMHrredsh/AvgvNtaD8Dubf7o3pT0cibaFjBbidNp2in0L2Bj4MzjbM+MoP9m+V14uMjE+j5bo0yqlTN9eveSfF2iMKslZ6LWv72hy/Uil+91k1NjcZBn9omPTy/NAWcjV1o/9ZX0Gq0jXWQOdf5M4nmYaDm/24ms1XeXIducP2l/4fgIOMfWWqxevH1olw/MRRjlffi59X3jvw2ny3LxI+SN84fMR8qH4bY996iJc62zvem7+3G+w2LR+sX2LOJ9h2tAnQuPTl9u+H3H35uytysMZeaEvRXnkVsD3s3oT32H7H9zoS64zkaq1Fqa1W5FtEu+0tp9+YmAuQG2mbo5U1dpX9RhluVvxfROdfXeqBNz6akLfcOreLXWpl1+6zDqfhtXnMf/5qVu/Lpnp8zf962q/wVHhI/A
  </data>
 </layer>
- <layer id="3" name="Above" width="22" height="30">
+ <layer name="Above" width="22" height="30">
  <data encoding="base64" compression="zlib">
-   eJytVUEOgjAQ3HD0ZkhI+nDhB/oGE2++AL3iycSTnPQB0hBCXXa3s+gkpM12OzsM20K0xL4kOpTjvA/j2A3jLcyjFos4CTELU40+LGOcB+W0oGnblP/lPgpeTfF/8CPYFUSPLVFT5Dk7gDfy1YzrWuW51+As8PL+W1P3Uum5Ob3P8N2n07e8Gx6kdSytqFdp/1h7Uq1WHl9D+wHV6/HX6wXaDygKdgdY51bzTeKJaCtZs8TPfUjzWqDXJH2IbgSWzrWcUr6Xsx48b5jvv2iI7/kanneY/4dWrrTm9Uc7JznOnH9ofW2PdS7Ru8Uz1/xFOLzvjtxPXr1IfbQ3rHxtLTd64OnhDx4J6jc=
+   eJytVUEOgjAQ3HD0ZkhI+nDhB/oGE2++AL3iycSTnPQB0hBCXXa3s+gkZMl2O50O20K0xL4kOpTjex/G2A3xFuao5SJOQs7CtEYfljnOg3Ja0LRtyv9yHwWvpvw/+BHsCqLHlqgp8pwdwBv5asZ1rfLca3AWeHn/rVn3Uum1Ob3P8N2n07e8Gx6k61haUa/S/rHmpFqtOj6G9gOq1+Ov1wu0H1AU7A6wzq3mm8QT0VayZomf+5DWtUCvSfoQ3QgsnWs5pXovZz143jDff9EQ9/kanneY/4dWrTTm7WftnOQ4c/6hXmpzrH2gd4vnXfMX4fDuHbmfvHqR9dGzY9VrY7nogeeMfwCtcehM
  </data>
 </layer>
- <layer id="4" name="Above_1" width="22" height="30">
+ <layer name="Above_1" width="22" height="30" visible="0">
  <data encoding="base64" compression="zlib">
   eJztwTEBAAAAwqD1T20Hb6AAAOA3ClAAAQ==
  </data>
 </layer>
- <layer id="5" name="Walkable" width="22" height="30">
+ <layer name="Walkable" width="22" height="30" visible="0">
  <data encoding="base64" compression="zlib">
   eJy1k1EOwCAIQ3cK73+F3XC/i2tpy5DExER5xYL3uj5xr5nlBMqZYie6k0zEP8FGe5ananD9Rr3qMv/0eJqbzt8J5p7rxtR/ZH125kG9f4rJ+Irb8aJip4H6y/5Q5Yfz36qc7my8OSyn28edj+r8w0z8TRjdGirf0V10lvrDeqeYyr9En80m0qxYDs/RYVru+5RXysduvUrPnY3qPjtT6wH4zwLr
  </data>
 </layer>
- <objectgroup id="7" name="Mapevents">
-  <object id="21" name="east" type="mapchange" x="672" y="512" width="32" height="256">
+ <objectgroup name="Mapevents">
+  <object name="east" type="mapchange" x="672" y="512" width="32" height="256">
   <properties>
    <property name="map" value="guynmart_wood_14"/>
    <property name="place" value="west1"/>
   </properties>
  </object>
-  <object id="22" name="north" type="mapchange" x="32" y="0" width="128" height="32">
+  <object name="north" type="mapchange" x="32" y="0" width="128" height="32">
   <properties>
    <property name="map" value="guynmart_wood_17"/>
    <property name="place" value="south"/>
   </properties>
  </object>
 </objectgroup>
- <objectgroup id="8" name="Spawn">
-  <object id="9" name="forestserpent2" type="spawn" x="544" y="64" width="128" height="192">
+ <objectgroup name="Spawn" visible="0">
+  <object name="forestserpent2" type="spawn" x="544" y="64" width="128" height="192">
   <properties>
    <property name="quantity" value="2"/>
    <property name="spawngroup" value="forestserpent2"/>
   </properties>
  </object>
-  <object id="10" name="forestserpent2_1" type="spawn" x="256" y="320" width="128" height="128">
+  <object name="forestserpent2_1" type="spawn" x="256" y="320" width="128" height="128">
   <properties>
    <property name="quantity" value="2"/>
    <property name="spawngroup" value="forestserpent2"/>
   </properties>
  </object>
-  <object id="11" name="forestboar4_1" type="spawn" x="416" y="608" width="224" height="96">
+  <object name="forestboar4_1" type="spawn" x="416" y="608" width="224" height="96">
   <properties>
-    <property name="quantity" value="1"/>
    <property name="spawngroup" value="forestboar4"/>
   </properties>
  </object>
-  <object id="12" name="forestboar4_2" type="spawn" x="480" y="320" width="192" height="224">
+  <object name="forestboar4_2" type="spawn" x="480" y="320" width="192" height="224">
   <properties>
    <property name="quantity" value="2"/>
    <property name="spawngroup" value="forestboar4"/>
   </properties>
  </object>
 </objectgroup>
- <objectgroup id="9" name="Keys" visible="0"/>
- <objectgroup id="10" name="Replace" visible="0"/>
+ <objectgroup name="Keys" visible="0"/>
+ <objectgroup name="Replace" visible="0"/>
 </map>
--- a/AndorsTrail/res/xml/guynmart_wood_17.tmx
+++ b/AndorsTrail/res/xml/guynmart_wood_17.tmx
@@ -1,266 +1,266 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="15" height="15" tilewidth="32" tileheight="32" infinite="0" nextlayerid="11" nextobjectid="29">
+<!DOCTYPE map SYSTEM "https://mapeditor.org/dtd/1.0/map.dtd">
+<map version="1.0" orientation="orthogonal" width="15" 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>
- <tileset firstgid="7577" name="map_guynmart" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7577" name="map_guynmart" tilewidth="32" tileheight="32">
  <image source="../drawable/map_guynmart.png" width="512" height="256"/>
 </tileset>
- <layer id="1" name="Ground" width="15" height="15">
+ <layer name="Ground" width="15" height="15">
  <data encoding="base64" compression="zlib">
   eJzbyMnAsBGINyPhjWRgaukfSLsHQv9gcftQ1DsU9WPTCwBAsqPN
  </data>
 </layer>
- <layer id="2" name="Objects" width="15" height="15">
+ <layer name="Objects" width="15" height="15">
  <data encoding="base64" compression="zlib">
-   eJyFU1EKwjAMzQUU2oHQi3sUJx7AdV7Agf/idEPZx/4EM9a47K3WQGiT5fW9JKyzRMWGZuY5bgzn2RtH1LoxlvtgBz5L9p5rLwp/53sd4rOZ8rnCn9g7O+ZTeLEV167Zj2bk1DpQu+D3gbt08++twiM38r/DGzWf1k643Cx7l159iCszf7cFHSntYqJdeJ/sr5CLaRdu7Pm7QzU3xHt466HmV0IvqH3A7qBGc2Fc/Nh3Zpf6BVeFmf+bmZ7RDTSl9n01SzzqTs1ccHLGdhb7z7YZ0QelyHQk
+   eJx1UkEKwjAQXLwrJIVCP+5DPFjxLLb1AwrePIhVi9KDN8ENzdjpVgeWZNOdzu4krRcpUpGNky9Kze+aFxr3TKTJuhz7gLWulcZLa49pz73qvo75nv6ZE3+n0frunPnpZMgHplo709i6TpP7KEwt+KuoXWXD7w3xob1wY37AO57Xunrf83I3nh2zljE/0D+ha/GvdwC9Q/eh8Yxn0D75vh7adubvHZJv4AfPmQvcyL/KzGJ7D9ylqWEtm/N745kTP+4fvEP0nHWD59Yz9uhierJvlfXPbsy3fVvPMDvzsP66M3vfgTtPRD4py3i1
  </data>
 </layer>
- <layer id="3" name="Above" width="15" height="15">
+ <layer name="Above" width="15" height="15">
  <data encoding="base64" compression="zlib">
   eJzbKclAErgDVH+XRD2UmrMTTR1IH7nuQNaHbi4hQI59MDtg9t4H4gdEmIPuNph+cvxNqj/R7cTFJ9ZOUsOc2DAiVj+x7obpg9Gkxhk+wCvEwMAnhF0OAEqXK2Y=
  </data>
 </layer>
- <layer id="5" name="Walkable" width="15" height="15">
+ <layer name="Walkable" width="15" height="15">
  <data encoding="base64" compression="zlib">
   eJzbKMaAE2wUQ2B0PrI4sYBcvbjcQKxeXG4gFaC7g1S95NiHbC+x7kZWQ0mckRtO2PSSG2ekhjk13EyOu7GFMzFhDxIDAHRkMog=
  </data>
 </layer>
- <objectgroup id="7" name="Mapevents">
-  <object id="21" name="east" type="mapchange" x="448" y="96" width="32" height="352">
+ <objectgroup name="Mapevents">
+  <object name="east" type="mapchange" x="448" y="96" width="32" height="352">
   <properties>
    <property name="map" value="guynmart_wood_16"/>
    <property name="place" value="west"/>
   </properties>
  </object>
-  <object id="22" name="north" type="mapchange" x="32" y="0" width="192" height="32">
+  <object name="north" type="mapchange" x="32" y="0" width="192" height="32">
   <properties>
    <property name="map" value="guynmart_wood_17b"/>
    <property name="place" value="south"/>
   </properties>
  </object>
-  <object id="28" name="north2" type="mapchange" x="320" y="0" width="32" height="32">
+  <object name="north2" type="mapchange" x="320" y="0" width="32" height="32">
   <properties>
    <property name="map" value="guynmart_wood_17b"/>
    <property name="place" value="south2"/>
   </properties>
  </object>
-  <object id="23" name="south" type="mapchange" x="320" y="448" width="128" height="32">
+  <object name="south" type="mapchange" x="320" y="448" width="128" height="32">
   <properties>
    <property name="map" value="guynmart_wood_15"/>
    <property name="place" value="north"/>
   </properties>
  </object>
-  <object id="24" name="guynmart18_passage0" type="script" x="32" y="32" width="352" height="32"/>
-  <object id="25" name="tobby4_mce" type="script" x="32" y="32" width="352" height="32"/>
-  <object id="26" name="tobby5" type="script" x="288" y="128" width="96" height="320"/>
+  <object name="guynmart18_passage0" type="script" x="32" y="32" width="352" height="32"/>
+  <object name="tobby4_mce" type="script" x="32" y="32" width="352" height="32"/>
+  <object name="tobby5" type="script" x="288" y="128" width="96" height="320"/>
 </objectgroup>
- <objectgroup id="8" name="Spawn" visible="0">
-  <object id="9" name="forestserpent2" type="spawn" x="288" y="32" width="128" height="128">
+ <objectgroup name="Spawn" visible="0">
+  <object name="forestserpent2" type="spawn" x="288" y="32" width="128" height="128">
   <properties>
    <property name="quantity" value="2"/>
    <property name="spawngroup" value="forestserpent2"/>
   </properties>
  </object>
-  <object id="10" name="forestserpent2_1" type="spawn" x="32" y="64" width="96" height="128">
+  <object name="forestserpent2_1" type="spawn" x="32" y="64" width="96" height="128">
   <properties>
    <property name="quantity" value="2"/>
    <property name="spawngroup" value="forestserpent2"/>
   </properties>
  </object>
-  <object id="11" name="forestboar4_1" type="spawn" x="32" y="288" width="128" height="160">
+  <object name="forestboar4_1" type="spawn" x="32" y="288" width="128" height="160">
   <properties>
    <property name="quantity" value="2"/>
    <property name="spawngroup" value="forestboar4"/>
   </properties>
  </object>
-  <object id="12" name="forestboar4_2" type="spawn" x="352" y="192" width="64" height="128">
+  <object name="forestboar4_2" type="spawn" x="352" y="192" width="64" height="128">
   <properties>
-    <property name="quantity" value="1"/>
    <property name="spawngroup" value="forestboar4"/>
   </properties>
  </object>
-  <object id="27" name="tobby5" type="spawn" x="64" y="0" width="96" height="32">
+  <object name="tobby5" type="spawn" x="64" y="0" width="96" height="32">
   <properties>
    <property name="active" value="false"/>
    <property name="ignoreAreas" value="true"/>
@@ -268,6 +268,6 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup id="9" name="Keys" visible="0"/>
- <objectgroup id="10" name="Replace" visible="0"/>
+ <objectgroup name="Keys" visible="0"/>
+ <objectgroup name="Replace" visible="0"/>
 </map>
--- a/AndorsTrail/res/xml/guynmart_wood_17b.tmx
+++ b/AndorsTrail/res/xml/guynmart_wood_17b.tmx
@@ -1,267 +1,267 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="14" tilewidth="32" tileheight="32" infinite="0" nextlayerid="11" nextobjectid="33">
+<!DOCTYPE map SYSTEM "https://mapeditor.org/dtd/1.0/map.dtd">
+<map version="1.0" orientation="orthogonal" width="30" height="14" 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_guynmart" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7577" name="map_guynmart" tilewidth="32" tileheight="32">
  <image source="../drawable/map_guynmart.png" width="512" height="256"/>
 </tileset>
- <layer id="1" name="Ground" width="30" height="14">
+ <layer name="Ground" width="30" height="14">
  <data encoding="base64" compression="zlib">
-   eJy10sENgCAMBdCmN/cfQj0aTuICJuIKzGIaJTZNRapw+CeF96FMHcBkTI8Ag5IFz+/uSu5fq0l5MveGrrbPyEzpzg1duQ93N9TXWF3q7wtm69iaGuel/gFv3z/Mlrtazy/vKuLth8xsZU/urh9c7sfMbGVPfkfk/rE1U7ry7KGRW3JHya3hl7gp0pW+pU8N962PdbZ/Xc22mpQDoIozqg==
+   eJy10j0OgCAMBWDSzfsfQh2Jk3oBE/EKnMU0SmiaipSf4U0K34NiB2OsMiMYMwnZ4fm+vEn9qzUxX+bV0ZX2mYnJ3bWjy/eh7gnyGq2L/beM2S5kTYvzYn8H0d8Ssw2Repa8Kw/Rd4nZ8p7UPQpc6vvEbHlPekfo1tiSyV1+dtfJzbmj4Lbwc9wQ7nJf06eF+9dHO9taV7K1JuYGmMozqA==
  </data>
 </layer>
- <layer id="2" name="Objects" width="30" height="14">
+ <layer name="Objects" width="30" height="14">
  <data encoding="base64" compression="zlib">
-   eJytlFFOAkEMhpu9wc4kbPY+wgnEGL0AnsMz8CA3wANwBNcjGBNiDIRVhBfffDChA9PQ6bYTJDbZ7FC6/Tr9OwMAsKkBtviQfTuApxJUc073f0Z/0zv6nntpzJJ9S0z5JlsxfovrcXFYvxt84n64LndfH+Ze1zqb+3LGcwR7K/L7pXjvuvl/y9P4izrNFZgr5HwpXKs3Vm6r9+uYZyHyNYITuPOoy9bpPbb43PdqzJrk7mNx/YPPfZHGEHtYAVxVp2s7L3S/pm0r6pTzcBHZwW6wH7cuX8esTPk5bbU6ud6D6rjexDqvlbnjxv9rxOwSl2KsPoU9U89fIneE3DvlrHPzyn1B2sp4iy35l3E9ZDok/Wf65c7tX+6FwO9X6W/O57NN2rbs/Jx7F2l10DuwHzzAxHfnie/3v9hkYQanyHz03XmS2lrMHQkSqZc=
+   eJytlNFNAzEMhq0wwSXSnW4fYAKKECwAczADD7ABDMAIlA1ASBVqi3pQ2hfeeEAiKbbO8dlRQVg6Xeo6/hz/zgEArFqAdXzIPjzAXQWqea/739A/rnvffZ3HvLC9xJRvsgXjd3F94X7WU4NP3Fc/5G7qi7mXrc7mvpLxHMmeXfm8FB/8MP9XtR1/3ua5EnMROe8K1+qNldvq/RLzzEW+seAk7gR1WXu9xxaf+56MWZPcTWxcf8bn3OUxxB41AIfN9tpOnO7n2s5wpjpRp5yHXWQnO457Tny5jtsq55e01erkeu83/XqFdR4pc8eN/5fO+oD7dlzPpRirT+nM1PNH3H8auWfKXecWlO8FaSvjLbbkH+B6xHTI+s/0K93b33wXEn+vyX9zPp9t0rZj9+ev3yKtDnon9mUAuArDeeLn/S82WZrB68i8CX1/a9ROamsxvwGksquQ
  </data>
 </layer>
- <layer id="3" name="Above" width="30" height="14">
+ <layer name="Above" width="30" height="14">
  <data encoding="base64" compression="zlib">
   eJy7I8nAcBeI76DR5ILDYvjlbwLNvgU1H5udxNiPbAYIXBbDby82O5EBKfbDzILZeYmAf3HZg02cGL9PZyJsJy7/EvI7IXCZCL+ixw2pcYvNTlLSFC5AqjtIjVtCAJ+dyHK47KQ0X5JjBrHqS4Wobze6HkL6W4lwAzF2UZpeh4rdg8G/2OwEAPHWY14=
  </data>
 </layer>
- <layer id="5" name="Walkable" width="30" height="14" visible="0">
+ <layer name="Walkable" width="30" height="14" visible="0">
  <data encoding="base64" compression="zlib">
   eJy1VMENACEMcgr3X8EN72saoKBeEx+2pNBKXHOMBY4KVkd5hU14WV3lGQ5xOn1e41V9z1fNKG52V3Uk/Z15u9mrlk430qPes+uTeJHh1DzOHlz/O3tzakyPM+/Jf9FhFD7RkHjI4Xe5k30grhecruf/5D7x8X7/ALGdong=
  </data>
 </layer>
- <objectgroup id="7" name="Mapevents" visible="0">
-  <object id="22" name="north" type="mapchange" x="192" y="0" width="576" height="32">
+ <objectgroup name="Mapevents" visible="0">
+  <object name="north" type="mapchange" x="192" y="0" width="576" height="32">
   <properties>
    <property name="map" value="guynmart_wood_18"/>
    <property name="place" value="south"/>
   </properties>
  </object>
-  <object id="32" name="south2" type="mapchange" x="832" y="416" width="32" height="32">
+  <object name="south2" type="mapchange" x="832" y="416" width="32" height="32">
   <properties>
    <property name="map" value="guynmart_wood_17"/>
    <property name="place" value="north2"/>
   </properties>
  </object>
-  <object id="23" name="south" type="mapchange" x="512" y="416" width="192" height="32">
+  <object name="south" type="mapchange" x="512" y="416" width="192" height="32">
   <properties>
    <property name="map" value="guynmart_wood_17"/>
    <property name="place" value="north"/>
   </properties>
  </object>
-  <object id="24" name="guynmart18_passage0" type="script" x="160" y="64" width="608" height="32"/>
-  <object id="27" name="tobby3_mcea" type="script" x="224" y="32" width="160" height="32"/>
-  <object id="28" name="tobby3_mceb" type="script" x="640" y="32" width="128" height="32"/>
+  <object name="guynmart18_passage0" type="script" x="160" y="64" width="608" height="32"/>
+  <object name="tobby3_mcea" type="script" x="224" y="32" width="160" height="32"/>
+  <object name="tobby3_mceb" type="script" x="640" y="32" width="128" height="32"/>
 </objectgroup>
- <objectgroup id="8" name="Spawn">
-  <object id="9" name="forestserpent2" type="spawn" x="704" y="192" width="96" height="192">
+ <objectgroup name="Spawn" visible="0">
+  <object name="forestserpent2" type="spawn" x="704" y="192" width="96" height="192">
   <properties>
    <property name="quantity" value="2"/>
    <property name="spawngroup" value="forestserpent2"/>
   </properties>
  </object>
-  <object id="10" name="forestserpent2_1" type="spawn" x="448" y="288" width="128" height="96">
+  <object name="forestserpent2_1" type="spawn" x="448" y="288" width="128" height="96">
   <properties>
    <property name="quantity" value="3"/>
    <property name="spawngroup" value="forestserpent2"/>
   </properties>
  </object>
-  <object id="11" name="forestboar4_1" type="spawn" x="192" y="64" width="192" height="160">
+  <object name="forestboar4_1" type="spawn" x="192" y="64" width="192" height="160">
   <properties>
    <property name="quantity" value="2"/>
    <property name="spawngroup" value="forestboar4"/>
   </properties>
  </object>
-  <object id="12" name="forestboar4_2" type="spawn" x="320" y="224" width="128" height="96">
+  <object name="forestboar4_2" type="spawn" x="320" y="224" width="128" height="96">
   <properties>
-    <property name="quantity" value="1"/>
    <property name="spawngroup" value="forestboar4"/>
   </properties>
  </object>
-  <object id="25" name="tobby4a" type="spawn" x="256" y="0" width="128" height="32">
+  <object name="tobby4a" type="spawn" x="256" y="0" width="128" height="32">
   <properties>
    <property name="active" value="false"/>
    <property name="ignoreAreas" value="true"/>
    <property name="spawngroup" value="tobby4a"/>
   </properties>
  </object>
-  <object id="26" name="tobby4b" type="spawn" x="672" y="0" width="64" height="32">
+  <object name="tobby4b" type="spawn" x="672" y="0" width="64" height="32">
   <properties>
    <property name="active" value="false"/>
    <property name="ignoreAreas" value="true"/>
@@ -269,6 +269,6 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup id="9" name="Keys" visible="0"/>
- <objectgroup id="10" name="Replace" visible="0"/>
+ <objectgroup name="Keys" visible="0"/>
+ <objectgroup name="Replace" visible="0"/>
 </map>
--- a/AndorsTrail/res/xml/guynmart_wood_18.tmx
+++ b/AndorsTrail/res/xml/guynmart_wood_18.tmx
@@ -1,340 +1,346 @@
 <?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="16" nextobjectid="67">
+<!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_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7577" name="map_tree_4" tilewidth="32" tileheight="32">
  <image source="../drawable/map_tree_4.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="7705" name="map_tree_3" tilewidth="32" tileheight="32" tilecount="544" columns="32">
+ <tileset firstgid="7705" name="map_tree_3" tilewidth="32" tileheight="32">
  <image source="../drawable/map_tree_3.png" width="1024" height="544"/>
 </tileset>
- <layer id="12" name="Base" width="30" height="30">
+ <layer name="Base" width="30" height="30">
  <data encoding="base64" compression="zlib">
   eJzt1jEKgDAMBVDJ5v3BK1jH4OQZvJR0KJRUtNHfxIIfOqaPBEzlcfhTGQbM6skdCPdPmTjXdNbsnM07UBuXDd1410R1bqvkNhvaXj0vhHO1tahZ9+Lms07uBvx+riJ73p3cN++Lphbpamvk7rTYI4FKt9c9oo2ctYdr+V54ucmWrlXPX+nXw51v9jXq31/rolLrHgFHanE=
  </data>
 </layer>
- <layer id="1" name="Ground" width="30" height="30">
+ <layer name="Ground" width="30" height="30">
  <data encoding="base64" compression="zlib">
   eJy1lj1PwzAQhq1sLEhh8MbPpmystGyIAYWwVaJFbfoHULOTH8DEQK361OvlPd9FosMpX7af3NdrhxDC85XfXpjRu8cqhPlEm8K8FLc5PL9la5V/QtxGWXsmDHF/r4/XbXU0j89DPD5vqrHP8lnj/nesG3C/yHZJroxBk3Pn5VJu0v1Qh/BziO1XPGev4zjHexDruZMr59zn8ZKduNK/5Q2uN4ur9cYs81eCq8V6KlfrB5rLfU51/R19fVzilubTvGUc+4ziyjWBdMHiWnzJRX2c3m2ZdYD7EX1c6kMeay3HyXpmSDde47nuWflKY1cix5pmlvT5U+ietYYWaw+71EcoX5IrY72vfGyrfy0u1851jrW2V2hcqquH29N3i5usq09s2qOsfkT59e7jXAOQjlDveuNM3NI8sqQf6Yq0k3oX+VHi0jypOchnVNtprV6pMUsn+2qsOXydVuHyPKMaQ1z0f1xzqE8Ss2NctD8ONa4ZxKV1S7ndMCbSLx5rL5fYMrdWfbdKjtMZgMY8GVyqCZ7bkgYtsv/WeeDdweV8nteSdknunRi3m8CV8dfOa4iraRCtR+d2j5XWmsqdYqXzgJf7B34vhZk=
  </data>
 </layer>
- <layer id="2" name="Objects" width="30" height="30">
+ <layer name="Objects" width="30" height="30">
  <data encoding="base64" compression="zlib">
-   eJyNV0tuE0EQbXkVL0CaQRrJIIecgDNwhEgcgT0SF4gEdzC5BGFDZIklGAEhJgsixU4QMoktE/82LLyxItEv06V+U64Z50mj8fR016uqrno9ds65ecO5hb+AaRKf9f1r5gr4pp41LlPnXm0793p7/R1ztmrOvQnXfm39vcU7SeLzxM+b+uvcXxcN25dhmt+vk6Jtjas0/mZexFIWr/BrSCw6nt80Pgi/+xTP0vP8UlwT/9yoFf0TvAw2WrXIa3HPQuxPt+w4ACvX7C/QpVh7SfEOjI0aAna3inOPaA14j7MY6zTL7xa6Rh4ZzPkhi7ySnzrlZ5kW9+/GyC/wXo2De1Cyv8DfDXWWenuztLx2gI4av1Q+zD3HvzB24ud+yaJtoMo20Avz+ml5LhlT2i+O7SjwtsiG/B6HNfsl9iWvHBt8GdLzKcUwVnk9oXfCeVoR8zLY7ZD9Z2Ed1/WcYhW8bTp34K93zTg2Cna4/qUfO0b9Nh+sj7XD2hdGjhDfPc9x39j7YUmtAof+3YW/FmGO1ccAxvYMPeIcS9wa0KOR8uFzmsctOoJ8P1Ixj1VuJe91g7ur9rJNaxE/1yRqjPXL0mtrXzWn4C49IXjyML9Lz5Wt5Z6cNIrc4ttZksfNNnQeBBLzKi1yNwx+5hZO0Y+bpNi/el+fq95CffE5dcuvakzr1S0/5V/XFfiRg17JHgFSX2VxVaFKjxnab4D1a0nvV+G35Fv7gv5l3fipbNcrakzO+u8l+dA1xrWN7wlw/0jyMxD46J8/GbVp6Q4De90nv7HPmaFjqJlNuoH+Ff69DbzYa9SX6Mcq9Ptdzv1jlWfRSu4j6zsMYP0CREfkrOI8g++xH99J4/lbpRuzJM5hTumLGfkNXtRaS9m7StfPX3zTLSp0ZxP4W6Cqn0R/5dzdpW/JWcXeANruwNBrHauczXzunyeRV+t5W/lgxYI11v7y3D+1/P9EYR3nPFkfu1bcI5VLqaszOpMFojnwf2L897K0q2/oQrtEK6x4p8bc/zDeQrY=
+   eJyNV81qE1EUvmTVLBRmhIEoqT6Bz+AjFHwE94IvUNB3iH0J68JKwKVGjLWxCwtNWpHYJsROfjYusgkF79e5x/nm5MykHwyTuXPv+c7/mTjn3Lzh3MJfwDTKn/W9mzj3LnL/8TVxlbiInXu57dyr7fV3zNmqOfc6XHu19fddxQPelPRI/b6pv878dd6wdRnF2f0qKsrWuIzz3+CVZ9hSZq/wa4gt2p5ftD4Mvwdkz9Lz/PRXQvtS/9yoFfUTvAj7WrWc1+KeBdufbNl2AOxrxBo2s75Aj2ztR8U7MDFyCNjZKu49pDPgPUpyW6dJdrfQM/zIYM4PSc4r/qmTf5ZxMX7Xhn+BA7UO7mFJfIE/G/Is9vJmcXnuAB21fqF0mHuOv2Ht2O/9kuSygSrZQD/sG8TlvmRMKV5s22HgbZEM+T0JZ/ZK5B9QfQmgy4ieT8iGifLrMb0TzpMKm5dBbofkPw3nOK/nZKvgTdO5fX+9beZr4yCH81/qsWPkb/Pe+lo7nH1u+Aj23fEcd43Yj0pyFXjv3537axH2WHUMYG3X6EfsY7FbA/1orHT4HGd2d0P/gr8fKJsnyrfi97rB3VOxbNNZ2M85iRzj/mX1ayuumlNwm5oQPL6f3aXmys5yTaaNIrfodhpldrMM7QeB2LyKi9wNg5+5hVP6x3VUrF8d12eqtpBfMqeAG36VY7pf3fCT/3VegR8+6JfECJD8KrOrClX9mKH1Brh/IadlNq/CXvG31gX1y33jh5Jdr8gxmfXfIntd5xjnNr4nwP09ymYg8NE/fzJy0+o7DMR6QHojzonRx5Azm/oG6lf4dzfwItbIL+kfq1Dvt5n7R8rP0iu5jqzvMED6l0D6iMwq9jP4Hvr1R3E+f6v6xizK9zCn1MWM9AYvcq2l5F3G6/MX33SLir6zCfwtUFVP0n9l7u7Qt+SsIjaAljs0+rW2VWYzz/2zKOfV/bytdLBswRmZT8Kr9/6uZf8nCufY59H62pXiHitfSl6d0kwWSM+B/qnx38vqXQOjT7ZLeqeVz1Nj7z/NlkaE
  </data>
 </layer>
- <layer id="9" name="Objects0" width="30" height="30">
+ <layer name="Objects0" width="30" height="30">
  <data encoding="base64" compression="zlib">
   eJxjYBgFo4C24K0khA7goL/dLwQHxt7nQHvfSNLXzmNiEFpIiL72noTaO5WJvvaCwDk6hzEIrJOlv50DCdYA/bt2gPx8ZgDiFwbu0jk9vxGE0NcE6WsvCPwVpH/+Hch0NRAAVG5conPZDAI7oeXzQTrnpYGM39MDEM6w+pfe5Qao/nXgQLSz6AkGom11c4DadCMBAACDXRyS
  </data>
 </layer>
- <layer id="10" name="Objects1" width="30" height="30">
+ <layer name="Objects1" width="30" height="30">
  <data encoding="base64" compression="zlib">
   eJxjYBgFo4C24K3kwNn9QnAA7BRiYHgOtPcNnf19TAxCCwnR196TUHunMtHXXhA4NwBpa50s/e0EgRd0jlcYWAP079oB8vOZAYhfWDjfpXN6fgMtq64NQJn1V5D++Xeg0tVA5SNQuXFpAOzeCS2fD9I5Lw1k/J4egHCG1b/0LjdA9a8Dx8C2s+gJbg5A+ThSAAA8oiAU
  </data>
 </layer>
- <layer id="3" name="Above" width="30" height="30">
+ <layer name="Above" width="30" height="30">
  <data encoding="base64" compression="zlib">
   eJy1VkGOwjAMrPaK9rBCqgRSeQVP4IuIPQB/2OVacemVU3sqKj9g/0Cj1pI16zR2UkaKCmqaiZ3xxN0qyx798KELvOdo+3l35Vzr2nNhirPJ49fdf9i4+e86krdU5I54ON/fTDmX+F0OKY/W87Xqh6PKhyFxavYxxX2Z+LYeeQlXmOt0kRLXFHzxvhuVcL4Ytw+aGvPpmniPRZad+nEu9JwHqM/Ppe5b4tXGx0Gcsb6C50txa9CALh0WgZhL8CPOrfEaBxcz5tqCVD1v1sMzVHP8fSt48vZreGLcIW1auTHe3ch7U+YAz1iDFta26Irzoq61PpdyxpVQyxJwL65+rb4xF9A7fvr/v4b4Kc8WH4n1DQ7SFj1D/iFx++CrI+5bFm2n3oGOi3xPo6/vcQ7GatU29n6Nwkcaod94JvRZ0l0hQbr3YzlpPan3xbm4t5gej6+p1VWd/++fU7zLei/O2dtpveMFEbKhKw==
  </data>
 </layer>
- <layer id="11" name="Top" width="30" height="30">
+ <layer name="Top" width="30" height="30">
  <data encoding="base64" compression="zlib">
   eJztzkEJADAIAEBTDOxfx5+FVkKQsbsEFwEA7+uzPZhRuT0A4CcXcS0Bzw==
  </data>
 </layer>
- <layer id="4" name="Walkable" width="30" height="30" visible="0">
+ <layer name="Walkable" width="30" height="30" visible="0">
  <data encoding="base64" compression="zlib">
-   eJyllNENhTAMA5mC/VdgQ35RFNvnUumJB016ToJ57ut64E+ttLftJ05ifrkkVnFJDYqrzlTnT72NbqVxq0Gx5l7DVbUkDSe8yZ5cx3BMEj+v83/S4nhEq+ql6ouKIV5OPUtcx9xW69Htvu3hlp/0b5qTp0kdLqetr+ll0uO4MzdxT/Jaj5NzlB6qm2qfucprJHbWQL9BhOvim3qdt0/838x31tDo3nIbroonvplXMquNTfRQrVS3uyd+az3gfKC0pnpVHaQPaZE+uzz6LPVAzbb1hcpL74PT4ThOy+T8qafRreLIzMi7kPT8mSN9rmJfLLkvOg==
+   eJyllNENhTAMA5mC/VdgQ35RFNvnUumJB016ToJ57ut64E+ttLftJ05ifrkkVnFJDYqrzlTnT72NbqVxq0Gx5l7DVbUkDSe8yZ5cx3BMEj+v83/S4nhEq+ql6ouKIV5OPUtcx9xW69Htvu3hlp/0b5qTp0kdLqetr+ll0uO4MzdxT/Jaj5NzlB6qm2qfucprJHbWQL9BhOvim3qdt0/838x31tDo3nIbroonvplXMquNTfRQrVS3uyd+az3gfKC0bvU6/2057my3SJ9dHn2WeqBm2/pC5aX3welwHKdlcv7U0+hWcWRm5F1Iev7MkT5XsS+tSTAB
  </data>
 </layer>
- <layer id="14" name="Walkable0" width="30" height="30" visible="0">
+ <layer name="Walkable0" width="30" height="30" visible="0">
  <data encoding="base64" compression="zlib">
   eJztlMENwCAMA5mi+6/QDfuNEETnmPJoscSjJPgSGtHa0dE/dF/aGp3L9nZwY2w1t/d0uGo9o7zZt8qvcrNeaB2EO8t9g0vuZge3P0f9q3xHDjebMeKb1aDet/JeZTH1HSG+NF6dMYdL+TFH9XO4at/Ex/nPDl9ZVbZbh9onjdH5otwV8xVzjr6vB2mSyVY=
  </data>
 </layer>
- <layer id="15" name="Walkable1" width="30" height="30" visible="0">
+ <layer name="Walkable1" width="30" height="30" visible="0">
  <data encoding="base64" compression="zlib">
   eJztldkNgDAMQ5mC/VdgQ76QSmQ7TtMvqCXE1eTl6HEcW1v/0HW+r/jteR/v8Rn5qnIZm3EZf4bLckW5dLid76gmDtfxF3NWXBWzG4fDQHF1uNFfFs9qLmIqvy4zG6fWaUcOF9Ux638lnyy3jBvHu1z2j+WlGDP9Q2MUe0aV+ZfN70oc1TOkY8/sWNxov0Q+ZuTM2yyWFb126qDsHZZaC+75U9kzoo1TK9WPcczW93UDph+P0A==
  </data>
 </layer>
- <layer id="13" name="Walkable2" width="30" height="30" visible="0">
+ <layer name="Walkable2" width="30" height="30" visible="0">
  <data encoding="base64" compression="zlib">
   eJztVUEOgCAM4xX+/wv+0JMJLmvXOk7KEiMwWFs2YIxt2/5h5/H84tjdn/+xncVycRE2wkX4b3CR1kxLB9cZR7xR38VnmhmuwxnxUDAyXh3cLC7jsxIX5Y7FderC9a/SVPmzfazy7+iptFW4cb6Kq/rYuVLiKn4Uv1u77r3E6tvh4b4hnfVoHeJd3YPd/a7qlr2Dq3Kt7EPHqrOgvj/OnRHXKHpYPuY5275vF4OviyY=
  </data>
 </layer>
- <objectgroup id="5" name="Mapevents">
-  <object id="15" name="south" type="mapchange" x="192" y="928" width="576" height="32">
+ <objectgroup name="Mapevents" visible="0">
+  <object name="south" type="mapchange" x="192" y="928" width="576" height="32">
   <properties>
    <property name="map" value="guynmart_wood_17b"/>
    <property name="place" value="north"/>
   </properties>
  </object>
-  <object id="16" name="north" type="mapchange" x="192" y="0" width="352" height="32">
+  <object name="north" type="mapchange" x="192" y="0" width="352" height="32">
   <properties>
    <property name="map" value="guynmart_wood_19"/>
    <property name="place" value="south"/>
   </properties>
  </object>
-  <object id="30" name="guynmart18_s1" type="script" x="160" y="832" width="256" height="128">
+  <object name="guynmart18_s1" type="script" x="160" y="832" width="256" height="128">
   <properties>
    <property name="when" value="always"/>
   </properties>
  </object>
-  <object id="34" name="guynmart18_s2" type="script" x="192" y="64" width="192" height="160">
+  <object name="guynmart18_s2" type="script" x="192" y="64" width="192" height="160">
   <properties>
    <property name="when" value="always"/>
   </properties>
  </object>
-  <object id="35" name="guynmart18_s3" type="script" x="0" y="64" width="160" height="800">
+  <object name="guynmart18_s3" type="script" x="0" y="64" width="160" height="800">
   <properties>
    <property name="when" value="step"/>
   </properties>
  </object>
-  <object id="38" name="guynmart18_x1" type="mapchange" x="160" y="864" width="32" height="32"/>
-  <object id="39" name="guynmart18_x2" type="mapchange" x="192" y="160" width="32" height="32"/>
-  <object id="43" name="guynmart18_c1" type="container" x="64" y="96" width="32" height="32"/>
-  <object id="44" name="guynmart18_c2" type="container" x="64" y="896" width="32" height="32"/>
-  <object id="55" name="guynmart18_passage1" type="script" x="640" y="896" width="128" height="32"/>
-  <object id="56" name="guynmart18_passage1" type="script" x="320" y="160" width="256" height="32"/>
-  <object id="57" name="guynmart18_passage2" type="script" x="544" y="512" width="32" height="32"/>
-  <object id="63" name="tobby2_mce" type="script" x="320" y="32" width="224" height="32"/>
-  <object id="65" name="cave_exit" type="mapchange" x="160" y="512" width="32" height="32"/>
-  <object id="66" name="cave_entry" type="mapchange" x="192" y="512" width="32" height="32">
+  <object name="guynmart18_x1" type="mapchange" x="160" y="864" width="32" height="32"/>
+  <object name="guynmart18_x2" type="mapchange" x="192" y="160" width="32" height="32"/>
+  <object name="guynmart18_c1" type="container" x="64" y="96" width="32" height="32"/>
+  <object name="guynmart18_c2" type="container" x="64" y="896" width="32" height="32"/>
+  <object name="guynmart18_passage1" type="script" x="640" y="896" width="128" height="32"/>
+  <object name="guynmart18_passage1" type="script" x="320" y="160" width="256" height="32"/>
+  <object name="guynmart18_passage2" type="script" x="544" y="512" width="32" height="32"/>
+  <object name="tobby2_mce" type="script" x="320" y="32" width="224" height="32"/>
+  <object name="cave_exit" type="mapchange" x="160" y="512" width="32" height="32"/>
+  <object name="cave_entry" type="mapchange" x="192" y="512" width="32" height="32">
   <properties>
    <property name="map" value="guynmart_wood_18b"/>
    <property name="place" value="entry"/>
   </properties>
  </object>
 </objectgroup>
- <objectgroup id="6" name="Spawn" visible="0">
-  <object id="36" name="godoe1" type="spawn" x="224" y="832" width="32" height="64">
+ <objectgroup name="Spawn" visible="0">
+  <object name="godoe1" type="spawn" x="224" y="832" width="32" height="64">
   <properties>
    <property name="active" value="false"/>
+    <property name="spawngroup" value="godoe1"/>
   </properties>
  </object>
-  <object id="37" name="godoe2" type="spawn" x="256" y="128" width="32" height="64"/>
-  <object id="51" name="forestwolf1" type="spawn" x="0" y="384" width="320" height="96">
+  <object name="godoe2" type="spawn" x="256" y="128" width="32" height="64">
+   <properties>
+    <property name="spawngroup" value="godoe2"/>
+   </properties>
+  </object>
+  <object name="forestwolf1" type="spawn" x="0" y="384" width="320" height="96">
   <properties>
    <property name="quantity" value="2"/>
    <property name="spawngroup" value="forestwolf1"/>
   </properties>
  </object>
-  <object id="45" name="kobold1" type="spawn" x="224" y="192" width="736" height="640">
+  <object name="kobold1" type="spawn" x="224" y="192" width="736" height="640">
   <properties>
    <property name="ignoreAreas" value="true"/>
    <property name="quantity" value="4"/>
    <property name="spawngroup" value="kobold1"/>
   </properties>
  </object>
-  <object id="58" name="kobold2" type="spawn" x="224" y="192" width="736" height="640">
+  <object name="kobold2" type="spawn" x="224" y="192" width="736" height="640">
   <properties>
    <property name="ignoreAreas" value="true"/>
    <property name="quantity" value="8"/>
    <property name="spawngroup" value="kobold2"/>
   </properties>
  </object>
-  <object id="59" name="kobold3" type="spawn" x="224" y="192" width="736" height="640">
+  <object name="kobold3" type="spawn" x="224" y="192" width="736" height="640">
   <properties>
    <property name="ignoreAreas" value="true"/>
    <property name="quantity" value="3"/>
    <property name="spawngroup" value="kobold3"/>
   </properties>
  </object>
-  <object id="60" name="kobold4b" type="spawn" x="512" y="256" width="32" height="32">
+  <object name="kobold4b" type="spawn" x="512" y="256" width="32" height="32">
   <properties>
    <property name="active" value="false"/>
    <property name="spawngroup" value="kobold4"/>
   </properties>
  </object>
-  <object id="61" name="kobold4a" type="spawn" x="672" y="800" width="32" height="32">
+  <object name="kobold4a" type="spawn" x="672" y="800" width="32" height="32">
   <properties>
    <property name="active" value="false"/>
    <property name="spawngroup" value="kobold4"/>
   </properties>
  </object>
-  <object id="64" name="tobby3" type="spawn" x="384" y="0" width="96" height="32">
+  <object name="tobby3" type="spawn" x="384" y="0" width="96" height="32">
   <properties>
    <property name="active" value="false"/>
    <property name="ignoreAreas" value="true"/>
@@ -342,8 +348,8 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup id="7" name="Keys" visible="0">
-  <object id="32" name="guynmart18_k1" type="key" x="128" y="832" width="32" height="64">
+ <objectgroup name="Keys" visible="0">
+  <object name="guynmart18_k1" type="key" x="128" y="832" width="32" height="64">
   <properties>
    <property name="phrase" value="guynmart18_k1"/>
    <property name="requireId" value="feygard_nondisplayed"/>
@@ -351,7 +357,7 @@
    <property name="requireValue" value="80"/>
   </properties>
  </object>
-  <object id="33" name="guynmart18_k2" type="key" x="160" y="160" width="32" height="64">
+  <object name="guynmart18_k2" type="key" x="160" y="160" width="32" height="64">
   <properties>
    <property name="phrase" value="guynmart18_k2"/>
    <property name="requireId" value="feygard_nondisplayed"/>
@@ -359,7 +365,7 @@
    <property name="requireValue" value="80"/>
   </properties>
  </object>
-  <object id="46" name="dummy_key_noPhrase1" type="key" x="576" y="672" width="64" height="64">
+  <object name="dummy_key_noPhrase1" type="key" x="576" y="672" width="64" height="64">
   <properties>
    <property name="phrase" value="dummy_key_noPhrase"/>
    <property name="requireId" value="andor"/>
@@ -368,7 +374,7 @@
    <property name="requireValue" value="1"/>
   </properties>
  </object>
-  <object id="47" name="dummy_key_noPhrase2" type="key" x="800" y="736" width="32" height="32">
+  <object name="dummy_key_noPhrase2" type="key" x="800" y="736" width="32" height="32">
   <properties>
    <property name="phrase" value="dummy_key_noPhrase"/>
    <property name="requireId" value="andor"/>
@@ -377,7 +383,7 @@
    <property name="requireValue" value="1"/>
   </properties>
  </object>
-  <object id="48" name="dummy_key_noPhrase3" type="key" x="512" y="544" width="64" height="32">
+  <object name="dummy_key_noPhrase3" type="key" x="512" y="544" width="64" height="32">
   <properties>
    <property name="phrase" value="dummy_key_noPhrase"/>
    <property name="requireId" value="andor"/>
@@ -386,7 +392,7 @@
    <property name="requireValue" value="1"/>
   </properties>
  </object>
-  <object id="49" name="dummy_key_noPhrase4" type="key" x="448" y="384" width="64" height="32">
+  <object name="dummy_key_noPhrase4" type="key" x="448" y="384" width="64" height="32">
   <properties>
    <property name="phrase" value="dummy_key_noPhrase"/>
    <property name="requireId" value="andor"/>
@@ -395,7 +401,7 @@
    <property name="requireValue" value="1"/>
   </properties>
  </object>
-  <object id="50" name="dummy_key_noPhrase5" type="key" x="576" y="288" width="32" height="32">
+  <object name="dummy_key_noPhrase5" type="key" x="576" y="288" width="32" height="32">
   <properties>
    <property name="phrase" value="dummy_key_noPhrase"/>
    <property name="requireId" value="andor"/>
@@ -405,8 +411,8 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup id="8" name="Replace" visible="0">
-  <object id="40" name="guynmart18_k_open" type="replace" x="96" y="160" width="96" height="736">
+ <objectgroup name="Replace" visible="0">
+  <object name="guynmart18_k_open" type="replace" x="96" y="160" width="96" height="736">
   <properties>
    <property name="Objects" value="Objects1"/>
    <property name="requireId" value="feygard_nondisplayed"/>
@@ -414,7 +420,7 @@
    <property name="requireValue" value="80"/>
   </properties>
  </object>
-  <object id="42" name="guynmart18_k_close" type="replace" x="96" y="160" width="96" height="736">
+  <object name="guynmart18_k_close" type="replace" x="96" y="160" width="96" height="736">
   <properties>
    <property name="Objects" value="Objects0"/>
    <property name="requireId" value="feygard_nondisplayed"/>
@@ -423,7 +429,7 @@
    <property name="requireValue" value="80"/>
   </properties>
  </object>
-  <object id="54" name="guynmart18_passage0" type="replace" x="224" y="192" width="736" height="640">
+  <object name="guynmart18_passage0" type="replace" x="224" y="192" width="736" height="640">
   <properties>
    <property name="Walkable" value="Walkable0"/>
    <property name="requireId" value="feygard_nondisplayed"/>
@@ -431,7 +437,7 @@
    <property name="requireValue" value="90"/>
   </properties>
  </object>
-  <object id="52" name="guynmart18_passage1" type="replace" x="224" y="192" width="736" height="640">
+  <object name="guynmart18_passage1" type="replace" x="224" y="192" width="736" height="640">
   <properties>
    <property name="Walkable" value="Walkable1"/>
    <property name="requireId" value="feygard_nondisplayed"/>
@@ -439,7 +445,7 @@
    <property name="requireValue" value="91"/>
   </properties>
  </object>
-  <object id="53" name="guynmart18_passage2" type="replace" x="224" y="192" width="736" height="640">
+  <object name="guynmart18_passage2" type="replace" x="224" y="192" width="736" height="640">
   <properties>
    <property name="Walkable" value="Walkable2"/>
    <property name="requireId" value="feygard_nondisplayed"/>
--- a/AndorsTrail/res/xml/guynmart_wood_19.tmx
+++ b/AndorsTrail/res/xml/guynmart_wood_19.tmx
@@ -1,277 +1,277 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="15" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="13">
+<!DOCTYPE map SYSTEM "https://mapeditor.org/dtd/1.0/map.dtd">
+<map version="1.0" orientation="orthogonal" width="30" 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_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6577" name="map_tree_2" tilewidth="32" tileheight="32">
  <image source="../drawable/map_tree_2.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="6705" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6705" name="map_wall_1" tilewidth="32" tileheight="32">
  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="6833" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="6833" name="map_wall_2" tilewidth="32" tileheight="32">
  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
- <tileset firstgid="6953" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="6953" name="map_wall_3" tilewidth="32" tileheight="32">
  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
- <tileset firstgid="7073" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="7073" name="map_wall_4" tilewidth="32" tileheight="32">
  <image source="../drawable/map_wall_4.png" width="480" height="256"/>
 </tileset>
- <tileset firstgid="7193" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7193" name="map_window_1" tilewidth="32" tileheight="32">
  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="7321" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7321" name="map_window_2" tilewidth="32" tileheight="32">
  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="7449" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7449" name="map_tree_1" tilewidth="32" tileheight="32">
  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="7577" name="map_tree_3" tilewidth="32" tileheight="32" tilecount="544" columns="32">
+ <tileset firstgid="7577" name="map_tree_3" tilewidth="32" tileheight="32">
  <image source="../drawable/map_tree_3.png" width="1024" height="544"/>
 </tileset>
- <layer id="1" name="Ground" width="30" height="15">
+ <layer name="Ground" width="30" height="15">
  <data encoding="base64" compression="zlib">
   eJzbyMnAsBGKrwgj8EZOTLwZCSOL72RiYNgFxbuB+B4Un0HCO5HkQXxk/U+EEZgUe08jmX8WyV5kfBpqL0weWT+fNAMDPxALSGO3F5/d6GZh04dLjSzQPjkglifDXmIwufqopZ9SewfS7pFmL73tHmh70cWnMUEwueaehpYtxPoVZNcKKIaxkfWcgGJq+hXkxuVI9q6AlsMrKfA3sWG8HK3sP4tmLyVhj8/eFUyI+uEsljBH5oMwAMJvRmg=
  </data>
 </layer>
- <layer id="2" name="Objects" width="30" height="15">
+ <layer name="Objects" width="30" height="15">
  <data encoding="base64" compression="zlib">
-   eJyNVLFKA0EQHS4YY5dLJGm8dH6AELSwVbGWmMpKjJWlfyB+gvghgq2CmEtEUWwEJaYQYhLtBCGF4Aw3w81udk8fDHszuzdvZnZmAQAaEcA2Sm0eDIi9GwLEFXOvw3q5BF4MQv+eoB6Z+lbR1G3eMeojy+bDXZCst7yOMJ53jumQeb7yADsLALtFM5Zv5Hjx5NwLEl+NKtYHpVlN6rQUJTWjmOkM8fZRzuYANgspNyE3C3CAvI+K4x7/fYjSnDfKJi+BONdR6ij7KNd4vh1Nx0yxPOP3NvKuFBJbqZTGYNfdlbPUms7uIVeLOdvWvV7g/iXn3kSZVJJ6uLDIduktga+/XHEOw/R/vTajab8aspd1zx1Hb9k+s3TpeV8cY1W72FFrwnmYnYf0ic3TZd9d1G/Y5ppPV63lXnR84numBpCvpTxXbJd7/w9+Mt4Qu580d4PnS3Ky6/LE/x7hnB3znH8qfwPk+FC8NBMT1k+C1K57QmZsjblzKnfNP8x431y5Uoyvocl9GiRC/MvV9Lxw+2rc47dFIPnHnlw1p7wrApntlppxnatdc4pVcpc4YmuG6ExPxWeD+k3XwJ7fv1byL3f7xj3uuldB37KtWjX9BXOLkVk=
+   eJyFVL1KA0EQHhKMsQm5iySNl84HEIIWtirWkqSyEmNl6RsEH0F8EMFWQc2PKIqNoMSASkyinSCkEJxhZ9i5zd05MOzt3u583zc7swAA1QCghl6eh5DJetcDaBfD/zo8L/gQawMv/p9YJQjPt/LhueAWU2Yc43zkcImzWz5zw+MI+XwwpwPG+c4AbC8A7OTDXH4Q41nhvPpWcy9lYlVLmB/0esnkaSkwOSPOtIdw++gncwCbWYtNlp4F2EfcB4Vxh2fvA6t5o2DGjtpDmOvoFfQ99Cvc3wqmOROXJ/yuIe5K1qz5vuXg5j1Ks+Sa9u4iVoMxW869nuH/c9ZeR58UTT6ibJHXpbbERPOjF9YcxXPo2fN6rAfTcbXJv6R77kTUlhszaS41H8djrHLXjsg12amXrEPqxMXpcuwuzq95Lao/CTfNPdHMG81yL5qfxJ4pA2TKFueC1+Xek+w9Z8bfhDfErSeNXeX+Ek1uXqRemqjnkDV9qXgDxPhUuNQTE54fpey6rgnpsTXGTivtGn+Y8L6J1kHOaiWOL14Y+zhlnPCXS/a8YMfluMdvi5joJ9xLb1qrxpR3RUx6u6F6XGt1c05cRbvwaDs9RHt6ip9rVG86B27//jdSfLnbN67xqHsV6ztrq05O/wCXgpag
  </data>
 </layer>
- <layer id="3" name="Above" width="30" height="15">
+ <layer name="Above" width="30" height="15">
  <data encoding="base64" compression="zlib">
   eJybJMzAMBmIVWQZUMAjdgaywWExVP5ZJkz5RUA7FwPxRzR7PrFjuoVY4ALU5wrEirIINgicYULY68GBqucvG6ab1wP1bSDCDfeA5t4H4hCg2qVAvAyqJxRJL8gtjrKY9vJC/U2KXwmpnQ+UX4Dk90CkMMAFXIhQg89umH5kc9D5uPSQGs/oZmKzA51PrP+ItRMZIKcTbOpWAvmrKLAb3Q1PgfgZkj2LoWxYvNMCwOwOgZoP8xOl4YoLYEsT0lCxx0h2Utv+6UyY9vcgsQmF8WUx3HLEAmk0813Q/IruZ5BbLxGwF18eA7kZhLXR8pSbLKaduGiY+Y+J9D/IvsNimHUEMsCVz3GFAzEAZB8orB4C9T3CohcAAiFJJg==
  </data>
 </layer>
- <layer id="4" name="Top" width="30" height="15">
+ <layer name="Top" width="30" height="15">
  <data encoding="base64" compression="zlib">
   eJxjYICAh+wMdAWuHAwMZlBMLXBYjHpmkQIuEbCXkPwoGAXEAhfZgXbBKBgFww8AAGfKBLw=
  </data>
 </layer>
- <layer id="5" name="Walkable" width="30" height="15">
+ <layer name="Walkable" width="30" height="15">
  <data encoding="base64" compression="zlib">
   eJytlEsOACEIQz2F97+CN5zMzkUpLZWExE/kUUTPXusA/+0eM0PnE1ctiZ+wU113DiiuymZnOl1Jnbt9pmPSW0pOKtvtMZRrN6/WEibaq/RMNSqc5L26+TjM5F6r+2T/xoTrsFy9Sr8w7ZP/i3FZ7V65UmfVP0asrug=
  </data>
 </layer>
- <objectgroup id="6" name="Mapevents">
-  <object id="1" name="south" type="mapchange" x="192" y="448" width="352" height="32">
+ <objectgroup name="Mapevents">
+  <object name="south" type="mapchange" x="192" y="448" width="352" height="32">
   <properties>
    <property name="map" value="guynmart_wood_18"/>
    <property name="place" value="north"/>
   </properties>
  </object>
-  <object id="2" name="north" type="mapchange" x="288" y="0" width="256" height="32">
+  <object name="north" type="mapchange" x="288" y="0" width="256" height="32">
   <properties>
    <property name="map" value="wayto_feygard_duleian_1"/>
    <property name="place" value="south"/>
   </properties>
  </object>
-  <object id="3" name="guynmart18_passage0" type="script" x="160" y="416" width="352" height="32"/>
-  <object id="11" name="tobby_help" type="script" x="352" y="64" width="192" height="96"/>
+  <object name="guynmart18_passage0" type="script" x="160" y="416" width="352" height="32"/>
+  <object name="tobby_help" type="script" x="352" y="64" width="192" height="96"/>
 </objectgroup>
- <objectgroup id="7" name="Spawn">
-  <object id="4" name="tobby" type="spawn" x="96" y="192" width="288" height="128">
+ <objectgroup name="Spawn" visible="0">
+  <object name="tobby" type="spawn" x="96" y="192" width="288" height="128">
   <properties>
    <property name="spawngroup" value="tobby"/>
   </properties>
  </object>
-  <object id="5" name="tobby2" type="spawn" x="128" y="96" width="32" height="32">
+  <object name="tobby2" type="spawn" x="128" y="96" width="32" height="32">
   <properties>
    <property name="active" value="false"/>
    <property name="ignoreAreas" value="true"/>
    <property name="spawngroup" value="tobby2"/>
   </properties>
  </object>
-  <object id="6" name="beetle_spawn" type="spawn" x="224" y="96" width="64" height="64">
+  <object name="beetle_spawn" type="spawn" x="224" y="96" width="64" height="64">
   <properties>
    <property name="spawngroup" value="beetle"/>
   </properties>
  </object>
-  <object id="7" name="black_ant_spawn" type="spawn" x="544" y="224" width="224" height="96">
+  <object name="black_ant_spawn" type="spawn" x="544" y="224" width="224" height="96">
   <properties>
    <property name="quantity" value="2"/>
    <property name="spawngroup" value="black_ant"/>
   </properties>
  </object>
-  <object id="8" name="black_ant_spawn_2" type="spawn" x="256" y="224" width="128" height="160">
+  <object name="black_ant_spawn_2" type="spawn" x="256" y="224" width="128" height="160">
   <properties>
    <property name="quantity" value="2"/>
    <property name="spawngroup" value="black_ant"/>
   </properties>
  </object>
-  <object id="9" name="beetle_spawn" type="spawn" x="512" y="96" width="256" height="128">
+  <object name="beetle_spawn" type="spawn" x="512" y="96" width="256" height="128">
   <properties>
    <property name="quantity" value="2"/>
    <property name="spawngroup" value="beetle"/>
   </properties>
  </object>
-  <object id="12" name="tobby_trainingrat" type="spawn" x="32" y="64" width="64" height="64">
+  <object name="tobby_trainingrat" type="spawn" x="32" y="64" width="64" height="64">
   <properties>
-    <property name="quantity" value="1"/>
    <property name="spawngroup" value="tobby_trainingrat"/>
   </properties>
  </object>
 </objectgroup>
- <objectgroup id="8" name="Keys" visible="0">
-  <object id="10" name="dummy_key_noPhrase" type="key" x="128" y="96" width="32" height="32">
+ <objectgroup name="Keys" visible="0">
+  <object name="dummy_key_noPhrase" type="key" x="128" y="96" width="32" height="32">
   <properties>
    <property name="phrase" value="dummy_key_noPhrase"/>
    <property name="requireId" value="andor"/>
@@ -281,5 +281,5 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup id="9" name="Replace" visible="0"/>
+ <objectgroup name="Replace" visible="0"/>
 </map>
--- a/AndorsTrail/res/xml/guynmart_wood_6.tmx
+++ b/AndorsTrail/res/xml/guynmart_wood_6.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="15" height="15" tilewidth="32" tileheight="32" infinite="0" nextlayerid="24" nextobjectid="13">
+<map version="1.8" tiledversion="1.8.4" orientation="orthogonal" renderorder="right-down" width="15" height="15" tilewidth="32" tileheight="32" infinite="0" nextlayerid="24" nextobjectid="12">
 <properties>
  <property name="outdoors" value="1"/>
 </properties>
@@ -276,9 +276,9 @@
   eJx7JcnAcFiMAQzuANl3JRlQALIYOhsEQHrR5XeimQECHMKY5mOzF8ZGNgtdDF0cmz5c7sZlBzLYScBMfP7Eph8EiNGHy33Y/IQLoIcLjN5FQB+625HdsZMMN4MwkzBxfkaWewtkMwsTH9bIdmNzBzYxXGbhS/vEAHLSIAgAAIt4b9Y=
  </data>
 </layer>
- <layer id="19" name="Walkable" width="15" height="15" visible="0">
+ <layer id="19" name="Walkable" width="15" height="15">
  <data encoding="base64" compression="zlib">
-   eJzbKMbAsBGKQQCZjQ1sFMPEuPThksenH5vduOzEJUctjM1d+NwCkyfWXbjCl5B+fICQfkJ6ccUXMYDYMMJlLzl+JjUtkGI3KX6hJI0BAJcKbNU=
+   eJzbKMbAsBGKQQCZjQ1sFMPEuPThksenH5vduOzEJUctjM1d+NwCkyfWXbjCl5B+fIAcOwmFMyF9xLidEjcTSo+UmENK/BOKN3LTGAAE625j
  </data>
 </layer>
 <objectgroup id="20" name="Mapevents">
--- a/AndorsTrail/res/xml/haunted_house.tmx
+++ b/AndorsTrail/res/xml/haunted_house.tmx
@@ -187,7 +187,7 @@
 </layer>
 <layer id="2" name="Objects" width="17" height="10">
  <data encoding="base64" compression="zlib">
-   eJxjYKAu4GVC5V/lY2CIZmNguC/DwBADpSOhNEguig2h9hE/A8NDfgiNDCSBZmYD1b0H6smB0plQGgSykMz4xI/AK0HiULlWFgYGLyAtBTTLE0i3AflaQPqxEESNJJq70fkwEAXVEwmk/wFpKyQ5LjHsei4CxRuB9ukKY5fHBd6xAv3IijADBNhwuGsq0HxOJgQbHYgzIcwAgTnA8OFGCmeYXmR/y0DZOayYciDwmRNC9yKZA7J7ItCeyWLY3YELzOXHLw8AW4QlGg==
+   eJxjYKAOOCwGoXmZUMWv8jEwRLMxMNyXYWCIgdKRUBokF8WGUPuIn4HhIT+ERgaSQDOzgereA/XkQOlMKA0CWUhmfOJH4JUgcahcKwsDgxeQlgKa5Qmk24B8LSD9WAiiRhLN3eh8GIiC6okE0v+AtBWSHJcYdj0XgeKNQPt0hbHL4wLvWIF+ZEWYAQJsONw1FWg+JxOCjQ7EmRBmgMAcYPhwI4UzTC+yv2Wg7BxWTDkQ+MwJoXuRzAHZPRFoz2Qx7O7ABeby45cHAF7sJfM=
  </data>
 </layer>
 <layer id="3" name="Above" width="17" height="10">
--- a/AndorsTrail/res/xml/lake_shore_road_1.tmx
+++ b/AndorsTrail/res/xml/lake_shore_road_1.tmx
@@ -204,12 +204,12 @@
 </layer>
 <layer id="3" name="Objects" width="23" height="30">
  <data encoding="base64" compression="zlib">
-   eJzVVL1KA0EQHlPYJ43gnZerbc7aQiURxERiEi1SSDAERBAL4w9RUPAvIgo2WqmtL+Aj+Ca2PoPgDLvjzU02MYIg+WC4292Zb76d2d1WCND24Bs7ON5Fa6K1QjP+7ZfjJd7TMb/0Z8x4MBCYfz90r58HABdoi7heUD6RyMH70xp3evBKyFjWw/tr2jFhw+rstbdZNc+xXJtm2F1XHh8onVp3EWuwFCQ10vcBc75MAHxkABqouYLWTCf7sWd1Sw4C1Y+5dG6KXUWeAtob8m/g9x79r+0eR7IAqWx3jVg310KfCxqv+IaHbG0cYDMF8DkKcIfjih/XqqVq1A/sn/cND9k2creReyxlck353b2W/y5wfTq416us4X+dMGsUW0PenKijrrE+Ey5+1lS3+tZ9Y8RN33410Lpn1J2QsfKe1nr0R+MS/TpqD/rsEk5xz2doy57hdvHynXLp1ms/9XsQRAO+QVrDX+Un6P4XQze/flNK2Peyb+6D1qeh+yHPYCT6zDkiy0n3gd4Gfnv4nXDxS738Jm+JubLVS3c7sneNOeXbVrJ7usG5W5VLviN8nig334e85axajunAvMklkZvyPuLcE9pzmNR/iP5HAThRt/w5tIatC/HO25rNeSZvWfTlGLlOgrhHk15SiwTVXMbLda57zmqoCh8dk7O1KKn5hSCOJ7AfG+2prubyftKv4ce14PVKGNdEnpufUBd8vdZdOfvFDCvSmf9WMHz4An7Ip5k=
+   eJzVVLtKA1EQHVPYx0ZwN5utbdbaQmUjiA9iEi0sJBgCQRCLxAdRsPCNKNhopbb+gJ/gn9j6DYIz3Dvu7ORujCCIB4bde+/MmTNzH50QoOvBF9o43kFronVCM/7pl+Ml3vIJv/RnTHkwEJh/L3SvnwYAZ2jzuL6gfCKRg+vTGtsZvBIylvVwfU07JrSszqzaptU8x3JvmmFvX3m8r3Rq3YvYg6UgrZG+95jzuQDwPgLQQM1VtGY+vR+7VrfkIFD/mEvnpthV5FlAe0X+Fn7v0P/K1jhUBMgVe3vEurkX+lzQeMU3PGTrYwCbOYCPYYBbHFf9pFcd1aN+YP+Sb3jItpG7i9yjOZNrwu/da/nvAvfnAmu9LBr+l4JZo9g15I1FH3WP9Zlw8bOmutW34Rsjbvr264HWPaXuhIyV93QtY380ztHvQtWgzy7hGGs+QVv2DLeLl++US7de+26/B0E04BukNfxWfoLe/8XQza/flDLue8U390Hr09D7Ic9gJPaZc0SWk+4DvQ389vA74eKXevlN3hJzFauX7nZk7xpzyretbGu6xrkblUu+I3yeKDffh5LlrFmOycC8yWWRm/I+4Nwj2lOY1n+A/ocBOFG3/DFaw/aFeGdtz2Y8k7ci9uUoSOohjHtpLRLUcxkv17nvsdVQEz46Jra9KKv5uSCJJ7AfG9VUV3MlP+3X8JNe8Ho1THoiz813qAu+rHVXzn4x/xX5kb9W8P/wCdeLp2c=
  </data>
 </layer>
 <layer id="4" name="Above" width="23" height="30">
  <data encoding="base64" compression="zlib">
-   eJzVlLFOxDAMhgPLzSAxQEXOCzDACxQmJDgxMSKBdEjpHTC3wAQjO0/HA3CPcE+Ao9bC58Zpr2ol+KUoaex8dtwkH9aocmBMBro9ts7rQVk7w5hzbCnaTyP8rvHlWslxbDwHPU+NG2L6sRPf2lrSMdbgxNZtnFWINd72Us35vDmDxwnFj9VyMTLmGzkLlg+vX4ylxZN26df0b8mf12C0WfafSdnn8JtfDqtcmg9xvR7HxjyN6/GkX6jGTeIsP55BuA5tzom0FYLxDOXeC6jXYJ18SVnFcbjnjO37Omn+zzF1vct9yMFw8c+gfz7xqNfueUj8TYu9bzxfepPbKsR8w7l3Me+A3YPqPDkln1207VmdL7let+h/1yLv1Ja18HqNsKfod6/wKKbUAfof2lVurO4XSX2O7i3XETIvsU3WfHuadF7FuuqZS1puDcP9S9rYHo79tdPO72a///Zf2T96DGgn
+   eJzVlLFOwzAQhg1L5yIxQFT3FmCAFyhMlQB1YkRqJZCcFpgbYKJiYufpeAD6CDxBz0pOXC8+J60SCX7JsuM7f3e+2P6wRpUDY1LQ7bF1Xg/K2inGnGEboP08wt82vlwrOY6NZ6DnqXFDTD924ltbSzrFGpzZso2zMrHG216KOZ83Z/A4ofixWi47xnwjZ8ny4fWLsbR40i79qv4t+fMadHbz/jPJ+zn85jeHdS7Nh7hej31jnvrleNIvVOMqcZYfTyFchzrnRNoywXiGfO8ZlGuwSb6ktOA43HPK9n2TVP/nmLa9y03IQXvxL6B5PvGo1+55SPxNi71vPF96k+sqxHzDuYWYd8DuQXGenJLPAdoOrc6XXK8x+k9q5D2weS28XiPsO/S7V3gUU+oI/Y/tOler+zv6XSblebq3XCfoe4XtesO3p0rDItaoYS7pp9sO9y9pZ6899td+Pb/bXvPtv7JXg6xoww==
  </data>
 </layer>
 <layer id="5" name="Top" width="23" height="30">
--- a/AndorsTrail/res/xml/road1.tmx
+++ b/AndorsTrail/res/xml/road1.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.8" tiledversion="1.8.4" orientation="orthogonal" renderorder="right-down" width="25" height="25" tilewidth="32" tileheight="32" infinite="0" nextlayerid="15" nextobjectid="20">
+<map version="1.2" tiledversion="1.3.0" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="25" height="25" tilewidth="32" tileheight="32" infinite="0" nextlayerid="15" nextobjectid="20">
 <properties>
  <property name="outdoors" value="1"/>
 </properties>
@@ -185,42 +185,42 @@
 </tileset>
 <layer id="1" name="Ground" width="25" height="25">
  <data encoding="base64" compression="zlib">
-   eJy7J8nA8A6IN3Ki4s1QjCwGUncPSe09SYQYMo0sj6yPWHvAWJhEjMV9hOw4KEwaRg4HDPfisMdEmoHBFIjNpAn7AaQWPWyJscMZqM8FiF2lCfvBWRoz7oj1C7qfsGEzJD/gi3dCdsD8xMwOoZExyJ9BrLjTJSn2UAsPFzvIsQdfHFPDHkJplVh7iLGPHH/gsode6WEo24WvjKOWXfQoGyhJN6N4FFOCAVqdySY=
+   eAHtksENAjEMBCMhhHjzQrQBNAA0QKeICmjkSqAG7IMRJnISEpHPicfKSWzv3vo8rEO4Cy7LT1zlrrDvWjeYWj3zZiM91Ho5ajydMbcS7RrIt6IDNzGlcRP+GsCnOpxt9HS2mxB2gr2g5Edr4WO23ImexkH6joKToORHa5ULfv4R/ERPhxye1FeM0edrb/gfNfNCA0+zxdOb+gPq8zx/zwodeuOY8xLXtt6noqH+a72wS7Wz+1YH/tSulnTRIebqU7ua6yEHv43kekSro+ceGnD20vLm/Wut3N6ghc/W6Plo5fr39d3lqc33AVqdySY=
  </data>
 </layer>
 <layer id="2" name="Objects" width="25" height="25">
  <data encoding="base64" compression="zlib">
-   eJyNVb1Ow0AMtioVdUIk0EiVyiMwAhM8DMzsLGwg8QDwKoQdFCidClX6k4mlIqVdQEJMiHMb93yur40li9xx/j5/tu8K4FovAHiK7HpsvnPjk4bdmzagtPnO/hjMjPE8F9/Iw2P+tsvxyPySYP6taXkP3djNnXIcaeDyDAsOnxbK4aEJ8Nhcj4/nINT/l0S6luvqfP1mYrslOPCc7AmtW5GrBfWRlkvDc2X8xvhZBeClDvC9YbVxjSdVt05cA1rumTGyWxN/UbFr5ENtmkbZ95jh+PrSNbl32D7mtbe7rJNsFLhzGUd23am7WpAjNX4nvB3ZeSA73QI4ry6fRb9n3wNP73sCD+2oBnCs+ExnYGum3UtZL+JpCx6KH4r9L8/s8hjsvcbzUTjyjRRdZLnB+Gy46zFbpyxW8kg+mjnKbSJwOc/Yk1Oi6FnFRXyUcyZ4NE1cz2/h63RhXuiEJTH57PB6413AmeZ8q7gQk+JfQ1uTVRazukttvjpSnTKlNqSNz2lL4EzXcOUefF8vaM4S8dvYF28F58Ka834Tdr/A8s1YXMRyXP7GDCLLxfst54ob14X9o57g/UwZ5kyjmJVFnUNdj/YukQ6JLY1qwPvB+6LNFt+LFexMYHGuzFMvbd4ot0WtxBktZ47bV+4j/d03b/RB4Ye1OQftyRmUsf8TJSMs
+   eAGNlLtuFUEMhi0iEFXENRISPAIloYKHgZqehgqQeAB4EJpADwqXVIHocEkFQohzgAakiArhTzsfx0x2Qyx5Z8Zj+/fvmdmIf+XNyYhna0vbIufz1G/nlrbvZb60js+mfPcy527q+ukh7nnOEXBqzO+2P+xOf/v6NpMHIpfbJyLk8uHUsOd39Yyzg8dZ5qw47xuGXB62tVys4cn5iKep/xP8oqvNmM3sj1w+po9c7h0dPF5n7M4hMPCr/SXa9YvEkAt2+MnlTuLcTb2feuNIxMuzET+PRcjNkbhr6VP7hA2BAzLPvHJhLRfmyIOMv5UYCnhwG+NYceDxqGEQK5e1lksuO1n7dvGjrosXBrTKU/zPWS849gkM19uZq3IBY5a60elWrr0P5r2ed/Jmcu19WT8u8e9yXjHsF2+1lyvHI66OKH7iW3sfu5c4vEmEnomz1eEY7/0fIiJ+TNxd9o3h7CsO7x+cL03519DvKZnnOXxNVVgvypo3qlQcbYzigYVYG6PS4yxKXn0Y6WmPw/tEPq3ux8IOjjXv5rzyYb/nhA0B51dTz8n/J/uVF3Wh5nLED6l3p/abt8CdRsQTyxj/P5wZPIx/1XiDe5D4Rmu/eyziV8o/wD4x2jsx5FbvKf+yKr5dbGNY5OAc+vzmrrmYe8/oV+XxNrmzFq9i0T95kMPcxCBTd4x+EVvzztK20ZT/AwKWOeUz7Oz/6scO5+eZ8D7JbU7263ni+7fPed5jfLwnxFYBo89d95nbA+s3v+dSazG22uThHmPNUd8aWOYVz7ga432zNjGM6XPUWH3IyzmzJl8/Xsp/9nrTyzmCoU1fa3Pt+AfYMCpH
  </data>
 </layer>
 <layer id="3" name="Above" width="25" height="25">
  <data encoding="base64" compression="zlib">
-   eJzFVVsKwkAMXIXS/guC4D28mJ7QG+jXSlvQk9ilBsJ2s500Aeenj3RnMpNAQ5gxnIIK/fT9eCjXElcv8CE671bXyxbsOtt5bV6Ip0+7zA7RuTYh3BrM076TZ+OF+3H5TpsXx/M8X8lnwqOgQUj+LHr/hLX3/DzCZ9HkuxSn+1fl2crPYeWtgXPnOh6eOJek4wELp2YnKJNSNkheazpRqCPc+f6gvrbMWeOjxu25Y8Tjvbc071zHwoVyIGdKPfJe40rNG5bsL7//uuT7C6IoWX0=
+   eAHFVkEKAjEMrILoXRAE/+HH9IX+QE+KCvoSG+rAkI3rrFkwsKRJk5lM28OW0uy2fi9Ed63192VcbFi2H5nC85hHnePmJoscnqKDGRRNz6rbn53Cs5uVsq+fomladX+6G543sz6sut2Kjm5Xy5w2zUOnRceAo1U1fRk+4PzD291kZvf9Po40KTVRn+WsF3au60tPjLohnvG5j3k4P8aasXlt2F5jhs+wYJ4H+YzPYA55EzgTeJ45yvG+rb+9dz4n7lWw/ftRdSnYPMtQHX138wu3nwUxeMbEBJZ5GHgQq56xVAylh2v8LMZj+/Z5w57PZ2NVW8Szff+rsCbGewGiKFl9
  </data>
 </layer>
 <layer id="4" name="Above_replace" width="25" height="25" visible="0">
  <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AUDAbQIjD07bglSR9/jIJRMApGwShgYAAAUygCsA==
+   eAFjYBgFoyEwGgKDIQRaBGjvClrbcUuSgYHWdtA+lEZtGA2B0RAYDYGhEQIAUygCsA==
  </data>
 </layer>
 <layer id="5" name="Walkable" width="25" height="25" visible="0">
  <data encoding="base64" compression="zlib">
-   eJzdlN0NACEIg53C/Vdgw3MAfgqtl8s14cEY+gmitteyE5Vsa+IrHJaF6i/9euM+PFbG9vamqvyq9ZTJekSeWV8mM5zlI/1nas3qUd4DO7cMz9u/zVFI8c67jKhfkRfCYeYLzYn+LlRMHRMvlDGtp8tQnTdjVDnIGRXR8X8A6PbPjg==
+   eAHNjwEKwzAMA/uK/f8L/eEmxoEwcew0GczQypYlub1f13V/nqqkOfH8yx19x87/VP/BfueGvFXt5uP/9Z0q3/d8E//vs/fy+Izes7o93iwPnrw4w6/giYx4j8yIrmPn3KyX3iv6maNu5vFd1Xs+PZ44w68gGSNcyelqqzvsu3mZjhzHTPuU92z1K4W38qBzdE/Go2HPPEI0IJo4wztGTZzRwgtVzN+pfnf0aMAstdpnPvF4HZ2febs7z/a+63ed+9VTkZ/t8DiO/Kc43elmvQHo9s+O
  </data>
 </layer>
 <layer id="6" name="Walkable_replace" width="25" height="25" visible="0">
  <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AUDAawUWzo2wEynx7+GAWjYBSMglHAwAAA3vsDHQ==
+   eAFjYBgFoyEwGgKDIQQ2itHeFbS2A2Q+re2gfSiN2jAaAqMhMBoCQyMEAN77Ax0=
  </data>
 </layer>
 <layer id="7" name="Above_replace2" width="25" height="25">
  <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AUjALqgFuSA+2CUTAKRsEoGDkAADcSAPQ=
+   eAFjYBgFoyEwGgKjIUCdELglSR1zRk0ZDYHREBgNgdEQIBwCADcSAPQ=
  </data>
 </layer>
 <layer id="8" name="Walkable_replace2" width="25" height="25" visible="0">
  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20ON6AAAHgzCcQAAQ==
+   eAFjYBgFoyEwGgKjITAaAqMhMBoCoyEwGgJDLQQACcQAAQ==
  </data>
 </layer>
 <objectgroup id="9" name="Mapevents" visible="0">
--- a/AndorsTrail/res/xml/road2.tmx
+++ b/AndorsTrail/res/xml/road2.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.8" tiledversion="1.8.4" orientation="orthogonal" renderorder="right-down" width="20" height="19" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="9">
+<map version="1.2" tiledversion="1.3.0" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="20" height="19" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="9">
 <properties>
  <property name="outdoors" value="1"/>
 </properties>
@@ -188,30 +188,30 @@
 </tileset>
 <layer id="1" name="Base" width="20" height="19">
  <data encoding="base64" compression="zlib">
-   eJxjYBheYCPnQLtgFIyCUTAKBicAAL9UALs=
+   eAFjYBheYCPn8PLPqG9GQ2A0BEZDgFohAAC/VAC7
  </data>
 </layer>
 <layer id="2" name="Ground" width="20" height="19">
  <data encoding="base64" compression="zlib">
-   eJzbyMnAsBGI30lCaBC+h8RGFkfGIHGQOmQaWR6fGYTMxKYO3X24zDgphl0c3U2UYmqahS9MKMWbaWAeOqa2eYQwPeygxG/UNm8Uj2JqYQCuvhoj
+   eAHbyMnAsBGI30lCaBD7HhIbWRwkB8MgcZA6ZBomR8gMQmbCzEFWh8yG2QtTh0yfFEO4EVkcxEb2F7ocqXxqmgWyG9l/pLoFn/rNSHGGTx2xciDz0DGxerGpQzeLGD42c/CJEWMmLjX4zMUlh8sskDguPaPio2FDjzQAAK6+GiM=
  </data>
 </layer>
 <layer id="3" name="Objects" width="20" height="19">
  <data encoding="base64" compression="zlib">
-   eJyVU8tOwzAQXJDK3Qci5eD+/y+UC49KBdRIlAtFJOcqDvSKOLKreuXx2m1hJCv2vma83hARfbVUYN/m9kdP9MRr0dTjMe9YDapwrZrSjnmDS/sF89/4FHfP+wd/8EuOxG54Bd5PbbJbfR347PfDldoQWltrrWL8zuW+Gp6bXNPWlXcfOSYAr8R0puZsTnQ1T+db7sGdz/Uiz9Qc6uoKoGOMGpYV3aJX7vXCtTe+9CtsfbuEb4C+vl6XNd7d32zn+H7M6itv+B/sjIbvCscpvmN3kDndVnyBbWuX3uccH2Jw9ZnHuVQ9nZlBxdTmb6WwM2gxmpwA555zP2P+Bc/tZZxd7G2tFxir0NkPsabViv9GAF7p95tLNtWkcy8978EnfbAca/jHUTvWtLl6Vl3KYe+GukfQibHYx2D0nvoKlvH8C2A7v94=
+   eAGFk81KQ0EMRkdF9woWXOj7v0Ld+AdVUbBuVKwrF9JW3YpLc+gcGkOrgdzMJF++ZGZyW2vt4yA+RT7Dl/2Xh61dhQ4Hv/0lrZGnVA78mZP9KPiQ7M95L7vL2DDqH4cqZ7E+DyWXHLDj0Fms56H6xWPB3aaYGO1z5Cv25h4rN2u4Rh3/luoSWyXX/e7IQx57LrWVaWBm/U7wgaHfLNtHre2EKidxB6ehuV/PA2YefPCq8Buf9h4uSg3y6Jdz3QX3OHSdVH7raKnH2yj3+66W9inir3vLPSt8q+Svet9RK+sk9vlN4RtsLlhrPd+D6FbHcP4sX4U/12JNPcQa687AnOZ6i6x4+/DfhPo+/9UzD+u/4nwZyzNrP85U7YH/Jr+VHOLdV+sc6eccyiQ43/t8bcTcbvbZzXdb+yA3Y+Vy9jkTnLVX4+DFsOa+H0L12ZNzz53rw3IPYq0BBh+x3Ls48mque/tiT9/1bMbplbuUM2PNBcP9uv/Pguec4H4Aaz/Dzg==
  </data>
 </layer>
 <layer id="4" name="Above" width="20" height="19">
  <data encoding="base64" compression="zlib">
-   eJztUzEOwjAMzDc6+OFlAfoBkLr2I6B2AAnegTOYHuZsIiQ2bqkTn+1zdVm68sSi8QxnvG+B8axHL6VsZM3tNR7klVtx0vgczKi8qeP6WnRZb7ZXNtdQ6/wc1gsxufxNd77Let5qvJPyhmwfr2NMuAftfST9//gdmE++rWO+9J4yRP6N+C3A+Rf10bXRS4yL3mdaMc/2tjv7et9jLnrP2RvH2ky3382/aUT0z3AG0436R8KNzp+A/AfqRlue
+   eAHtk0sKAkEMRPsaLjy4bvxcQMHtXERxFgp6DlM4T4qQllm4tEHyqUol0Tgu2ueN4V8tBlB+zoOHxmrZ2jo+esJ24e8tfiOtnQO7dHqobpgw+WijiUbPou11cMGIK6s69gKvtMBkh2leco/Y+Tntrdwm/K3F8HIf8rJ5jlPq4dxDaB8Lfef8/d9+A/n3mate1VV3mW8K/d7/psen7pv1/re4o/vMW6q4fvvVrI57X+Yjh813L00wLLXYqi8YNbL+fC7V590c9zr5mQvuPaq5mUV83xMuOjkm37POfwHqRlue
  </data>
 </layer>
 <layer id="5" name="Walkable" width="20" height="19" visible="0">
  <data encoding="base64" compression="zlib">
-   eJzbKMbAsJEEDAKkqCdkFgxQ00xquQkbIMYPxOjHZSYuPfjMIMct2Mwgxc2kAkr1jyRASnokRh8uMXxmYBMnB+DKm6ToxWUeIb9Ss5zB5hdKzcSXh6lVHqK7HQAaToQn
+   eAHlkUEKhUAMQ+cU3v8K3vD/LB6EkhaLSwvSTvoSZbyvc+7Fc/614SdWWdTEbXbK2/CV5Xu6PvHsOq/0xKCpp6o6PGw9S08afNrXd0ys757OU/7TjK9w/LvtnXU+dL+/Ljux8nW8Z6aZPPycE1u1xKJ5dx+6NJ9h0Lbd8+T12mY5Tw5aPaO/6crE/wMaToQn
  </data>
 </layer>
- <objectgroup id="6" name="Mapevents">
+ <objectgroup id="6" name="Mapevents" visible="0">
  <object id="1" name="west" type="mapchange" x="0" y="128" width="32" height="288">
   <properties>
    <property name="map" value="road1"/>
@@ -237,7 +237,7 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup id="7" name="Spawn">
+ <objectgroup id="7" name="Spawn" visible="0">
  <object id="6" name="forestserpent2" type="spawn" x="192" y="384" width="352" height="192">
   <properties>
    <property name="spawngroup" value="forestserpent2"/>
--- a/AndorsTrail/res/xml/road3.tmx
+++ b/AndorsTrail/res/xml/road3.tmx
@@ -1,239 +1,238 @@
 <?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="25" height="15" tilewidth="32" tileheight="32">
+<map version="1.2" tiledversion="1.3.0" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="25" height="15" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="6">
 <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>
- <layer name="Ground" width="25" height="15">
+ <layer id="1" name="Ground" width="25" height="15">
  <data encoding="base64" compression="zlib">
-   eJzbyMnAsBGK30ki2PckIXx0GlktNjF0/Rs5MTG6udjUoKsl1l3kYFx+w8UnhIlRj02eUn8QMh+GNyNhatmHzw5iMb3to5Wb6OnvUTyKcWEAb0Earg==
+   eAHbyMnAsBGK30ki2PeAbBAfnUZWC5NDFoOx0eVg4iAa3VxkOXQ2TC1MHGYuOg2TJ4eGmQXTi24nOh+mDhdNjHqQnej6QfrQxcjlYzMfZtZmYBzAMEyM2jTMfFJoStxAij2kqCXHTaSYD1JLjh2jekbDjVAaAABvQRqu
  </data>
 </layer>
- <layer name="Objects" width="25" height="15">
+ <layer id="2" name="Objects" width="25" height="15">
  <data encoding="base64" compression="zlib">
-   eJylVMsOgjAQ5BfqoYkn/P/fIOEgHDihsZ6NBbkaj3Z1Nw5LC6ibTBr2MTtLH/kmy3YBt2222mK5c/UUGwLOJp5HMcmRtVK5wxf6GjPlu5hp3iHi0z213lbVCMfexOvFh1p0/ASzXu0HPqBmf6F0aK7SvOcmq8yYPzUfWWfHPVMgLan+Be9tGfmfS3aEmrVaBA+Gs1OuXzWk7A795uDsMlesZ+os6j2k87BWC0LMh/qeORvYM/J3AZ6/aU9bONOiQ+usQR+eUQd9/jHRJX17fhtkDsdxMrzjBzOeVeIe8lMa0S8cFXAjxxLP65+CVr1qLbLSfcr5bZ6rl76kT/M+AWnMtjs=
+   eAGdlL1Ow0AQhE/wBFBYogrvX/IKSBQhBRWJSOoIm9AiSnbwftJkdREWK13W3p+Z2btzVret3cc63bXF1qvtxQBU7jPW4abPoxw1+OdSq5ql9pK9jnuMWLVtJ+Zz0O99r6UHjHXGa796mQkPHjO9RS9970NrrDGeNzn3Y5m/Yj0FhuaWae9k4M9v8y88xCbjg7fnpcXN+aVNZysN1TSbW92/neWXakHfd2jS2qc2xxLncOXM58/XlvM+zvO8urWv5ILzkpeWB5vJcVyPc6qmx+t7DM4m9nqpFtdI/xj9H3mXdF84M8WnWGNq15lyVq6j6pQezO/oPuLwkP+PRxe8wtT9Zg7xSLfMv3HVUzNn5zx4il3S6HEw+KbU5xh/4fzuae4FuO7R7jHNqO9plf/NaKg1vEuD9PEuL9wfutu57Q==
  </data>
 </layer>
- <layer name="Above" width="25" height="15">
+ <layer id="3" name="Above" width="25" height="15">
  <data encoding="base64" compression="zlib">
-   eJztktENgCAMRFmD/Ufwl0UwZRcxsUlTrpXaXy8xgdI7nxWqpYz5sO41ib3WAGeeH/V/lce162c+5sqwtqf/CPqy3xHJj7L92hPV9b605Kz79J8gQ9flP0UciEffA/SeqDQXrzuovXl1zZqFl2n5rJnKc/ZZ7LInmmMJzctj9nJQxgWfcD+9
+   eAHlktEJgEAMQ13D/Ufw10UU3UULPgghHqd+KkivaZPGets4DPv58tR5kxycqL0Jc37qh/c0tnz1aBUff/hSTbAereqZrz1NjX0lLZ2Z6l8x1X/q7evsv/Brx35fuA9vd7Ccmmu4S47rP00+mK9+lFP1NAdeb3RfaBbOA0ZOdG7hiukZDvFO0zVa/e6ReY6rBj1gzCMvX/SoDnWPfEfqpeaclDPXawefcD+9
  </data>
 </layer>
- <layer name="Walkable" width="25" height="15">
+ <layer id="4" name="Walkable" width="25" height="15">
  <data encoding="base64" compression="zlib">
-   eJzbKMbAsHEYYHRASB6fWmLtIMYsQuaj68NmHjJNSD26fbjMoxRg898ooC7AFq6UhjOh/ILNHkJpjVQ9pABc+YSYvIkr/AilW1LzKqnm0AsDACCge5o=
+   eAHlkVEKgDAMQ3cK73+F3VCKPMxCq4OJHzoYWdokdbNvrfUP7GbL72Ttgbq24oOpIO4NmdeUE0MNDkY9FniwMxOuSJZ7QpPV1Dt7ZgaZT+XOzv+DTt+Y+66+c5aZ/UOdU3nwZd925UE/g54Dd8yy0GhPa3rONPRBNHfcdejfxh0goHua
  </data>
 </layer>
- <objectgroup name="Mapevents" visible="0">
-  <object name="west" type="mapchange" x="0" y="64" width="32" height="288">
+ <objectgroup id="5" name="Mapevents" visible="0">
+  <object id="1" name="west" type="mapchange" x="0" y="64" width="32" height="288">
   <properties>
    <property name="map" value="road2"/>
    <property name="place" value="east"/>
   </properties>
  </object>
-  <object name="east" type="mapchange" x="768" y="160" width="32" height="256">
+  <object id="2" name="east" type="mapchange" x="768" y="160" width="32" height="256">
   <properties>
    <property name="map" value="road4"/>
    <property name="place" value="west"/>
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Spawn" visible="0">
-  <object name="beetle2" type="spawn" x="160" y="320" width="512" height="128">
+ <objectgroup id="6" name="Spawn" visible="0">
+  <object id="3" name="beetle2" type="spawn" x="160" y="320" width="512" height="128">
   <properties>
    <property name="spawngroup" value="beetle2"/>
   </properties>
  </object>
-  <object name="forestboar3" type="spawn" x="512" y="128" width="32" height="32">
+  <object id="4" name="forestboar3" type="spawn" x="512" y="128" width="32" height="32">
   <properties>
    <property name="spawngroup" value="forestboar3"/>
   </properties>
  </object>
-  <object name="forestserpent2" type="spawn" x="96" y="64" width="192" height="96">
+  <object id="5" name="forestserpent2" type="spawn" x="96" y="64" width="192" height="96">
   <properties>
    <property name="spawngroup" value="forestserpent2"/>
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Keys" visible="0"/>
+ <objectgroup id="7" name="Keys" visible="0"/>
 </map>
--- a/AndorsTrail/res/xml/road4.tmx
+++ b/AndorsTrail/res/xml/road4.tmx
@@ -1,260 +1,259 @@
 <?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="25" height="20" tilewidth="32" tileheight="32">
+<map version="1.2" tiledversion="1.3.0" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="25" height="20" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="10">
 <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>
- <layer name="Ground" width="25" height="20">
+ <layer id="1" name="Ground" width="25" height="20">
  <data encoding="base64" compression="zlib">
-   eJy7J8nAsJGTMH6HRd09SYj4PSxyMHFkfdjU4TIPncalnpA7cZmHjSbV37jUExseuPQh68elnhyMbD96vOBzHz5344o3XOFPSrzgC1di3I/PXnzpBVv6IjWd40v3xNqPLx3jcxep+Y6UdENquqY23owF08MOYvBA2Utt99DTz6OYuhgAmDyI+A==
+   eAHtkMENg0AMBPmmBPqvIEo/lEANYR8jjSwfOZHwywPZXnvHPrZ1WZ6Pz9/ezG2HFj2xMtDt6+bsM8/+ka/TvS/syjmrfQt55UXnTmYc4VtLjt7x3E/ud43mK3+m9t3mohMra6QzR9+Rnt+d/kivc74vHvr2k3uvfdaZPeOwh9nuXnpEeN1eZsyJ5tq+9GoNw3uq3zV8c2of5myM3zz7fJf1u/LX8Y/q9+tdlT9bf3vH7J7Zuav3zPIzd3XH33fPv3sDmDyI+A==
  </data>
 </layer>
- <layer name="Objects" width="25" height="20">
+ <layer id="2" name="Objects" width="25" height="20">
  <data encoding="base64" compression="zlib">
-   eJydVcsKwjAQzC/EQ6AH/QU/3w8oFEQPnqzUnqupehVv2sUGt9NJHw6EpMk+ZicbNcaYR2LMPeHzxn3XAjzTQF88Y+uArevvIcTvaPm+5icobfd7LlKIp3MdgENmed1DemgUlp8zv0LVhTrmdvh+NHTc9E+NxlDOqGsImeW6hnUMO7in2P1oMF67SP65dWD/Yh0pxMta26k6yndB3ofGUP940j/rBY8Tq//q+sO7fo/hGxrrW8x3Av+a5GU8ctBUYgadhWM1ot8YpvAI4wXj7HhtDFNsBLmqTfAkeWM85uTUuom20uei6z75cdCYwkMPjXMT8xZ5d/rMt3k92F9aXvhfUjd7b/uLgbP8DkgsscM5TTivCuJpjrE5+CFvD3bL5m2uFl1/4fIBwSPmMg==
+   eAGdlDFOA0EMRUfcAIpIFHAFjs8BkJAQFFSACBUFsAFaRAd+mvni43XICkuzXtvf9rd3ktZaez9s7S1OpU9XPRawGQafJOfKjyYm8Xf5LqLHLiHvZn+OUl8izIA8DJzs7l3+PBt1cj69rhOH87B9d+oiXtLyZ30/8rO/ygOLqF+3+vM28SB/m/hcmnUb9r9+voH3UZ1qLsUqrf0q5vl/zXg5dlXl4fM6wlR8qeN+5Ukrd5cG7/fX83nnO3gf5kaW7pEauh89c/5UnD7gXaYxp3ihTw4c8fOufOdL9CV+x/lM4ct3LP+GvF7mRV2PY98FV+67ZFP0rXgoRzull/YMxyerqdro1Z5b/f2x2M0SHuL1GZz9rMNGmA3xu5L7C9ORv5+ep3m1/4/U0/vrXTxUVb3Vs5rb98Zu4cBer2Kn4qB66CU8xAftso6ar3Eq8Rj3GZkS/nnw8j2B2wTuK2KqkTX/A9QClzX7FZ5aEvYiPxpxmzmyDYa8zFu28Edx/47jyEbD7Rv/0+sY
  </data>
 </layer>
- <layer name="Above" width="25" height="20">
+ <layer id="3" name="Above" width="25" height="20">
  <data encoding="base64" compression="zlib">
-   eJzVUlsOgCAM8xrc/wj+ehEM3EUwLplLmzEjMfZH3KMrZTUtJ0r71uvM0PNSV5xaC1uveSJ8q9JrtaFzBKxP6ysT51h+uav2CdV7fMxfL27zSAd7t6feRDnYu0T2087R/f28DnIxv5DeiJ4Ioj54d3tj36OwOzbq/x/x1d22CXNz49wJL8qhGNIlNTndY7qf5cRfpEtqMuBgGpBuOxvFPX7Uj/51HPEd3WZh/g==
+   eAHFlEsOwjAMRLlG738EtlykiN6FDvRJI9du3EUhCyax5+MEqct0+6zXisu2/1b2v+rDE55Zke8++Hb87ltu9PPZfd/xhFPpfD7Prfj4VXikc3/uSn6m4x2rLPruCxdfziB1MKtTy3zVy2ZF08WOB/kg2X4e5cUcv7f2/A8dH891H7TepxYxzhP7R2f3z/KjdnS36Bf1V5yV6W8wmvGKGX7l+a+7PU5+vzvvMa+ez8I362W1bC48xWep5vqqx/vigV6IHi3oHPauR0fPdZEHR+g8r/ve9arHM1zVM7833WZh/g==
  </data>
 </layer>
- <layer name="Walkable" width="25" height="20">
+ <layer id="4" name="Walkable" width="25" height="20">
  <data encoding="base64" compression="zlib">
-   eJzbKMbAsBEPBgF88uRgXIBUfdR2N7K5pLiHUv+Tq56QOaTaQ6p95PqfnPigJR5s9pAbtvj0UJJ+iHU/vvSBD5CSbqkBcPlxuAJ6+o3WYYovHRCb1olJ+5TmcWqbSywGAI/g2Bs=
+   eAHNjwkKwEAIA/cV/f8X9oetlAERjx72EEpqEqM7lzFm8o2tMv2KJpleVVl2JvOLN9M9jXzRpDyP5nZX7dMzZDN7Zg8z5NGD8CA8CF8hfhA/vUX0bmRPd67N+9se7hG0t2Y9c54HTWdqTvPMo0c9PIjfouhZMQ9aL3yVY+ei3svryo52fsm/+Ta9S/93vV8yo1xPizh7D767+FTu0btWj+DYGw==
  </data>
 </layer>
- <objectgroup name="Mapevents">
-  <object name="west" type="mapchange" x="0" y="320" width="32" height="256">
+ <objectgroup id="5" name="Mapevents">
+  <object id="1" name="west" type="mapchange" x="0" y="320" width="32" height="256">
   <properties>
    <property name="map" value="road3"/>
    <property name="place" value="east"/>
   </properties>
  </object>
-  <object name="east" type="mapchange" x="768" y="384" width="32" height="192">
+  <object id="2" name="east" type="mapchange" x="768" y="384" width="32" height="192">
   <properties>
    <property name="map" value="road5"/>
    <property name="place" value="west"/>
   </properties>
  </object>
-  <object name="north" type="mapchange" x="256" y="0" width="32" height="32">
+  <object id="3" name="north" type="mapchange" x="256" y="0" width="32" height="32">
   <properties>
    <property name="map" value="road4_gargoylecave"/>
    <property name="place" value="south"/>
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Spawn">
-  <object name="forestboar3" type="spawn" x="640" y="352" width="64" height="64">
+ <objectgroup id="6" name="Spawn">
+  <object id="4" name="forestboar3" type="spawn" x="640" y="352" width="64" height="64">
   <properties>
    <property name="spawngroup" value="forestboar3"/>
   </properties>
  </object>
-  <object name="forestserpent2" type="spawn" x="160" y="320" width="320" height="64">
+  <object id="5" name="forestserpent2" type="spawn" x="160" y="320" width="320" height="64">
   <properties>
    <property name="spawngroup" value="forestserpent2"/>
   </properties>
  </object>
-  <object name="cavesnake2_boss" type="spawn" x="352" y="128" width="32" height="32">
+  <object id="6" name="cavesnake2_boss" type="spawn" x="352" y="128" width="32" height="32">
   <properties>
    <property name="spawngroup" value="cavesnake2_boss"/>
   </properties>
  </object>
-  <object name="shadowgarg1" type="spawn" x="256" y="128" width="32" height="32">
+  <object id="7" name="shadowgarg1" type="spawn" x="256" y="128" width="32" height="32">
   <properties>
    <property name="spawngroup" value="shadowgarg1"/>
   </properties>
  </object>
-  <object name="beetle2" type="spawn" x="544" y="64" width="192" height="128">
+  <object id="8" name="beetle2" type="spawn" x="544" y="64" width="192" height="128">
   <properties>
    <property name="spawngroup" value="beetle2"/>
   </properties>
  </object>
-  <object name="shadowgarg1_1" type="spawn" x="128" y="64" width="32" height="32">
+  <object id="9" name="shadowgarg1_1" type="spawn" x="128" y="64" width="32" height="32">
   <properties>
    <property name="spawngroup" value="shadowgarg1"/>
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Keys" visible="0"/>
+ <objectgroup id="7" name="Keys" visible="0"/>
 </map>
--- a/AndorsTrail/res/xml/road5.tmx
+++ b/AndorsTrail/res/xml/road5.tmx
@@ -1,244 +1,245 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.8" tiledversion="1.8.4" orientation="orthogonal" renderorder="right-down" width="20" height="15" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="7">
+<!DOCTYPE map SYSTEM "https://mapeditor.org/dtd/1.0/map.dtd">
+<map version="1.0" orientation="orthogonal" width="20" 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="Ground" width="20" height="15">
+ <layer name="Ground" width="20" height="15">
  <data encoding="base64" compression="zlib">
   eJy7J8nAsJETgu8hsd9JYvKxsUFqYGqxicP4KFgYB+ZENeseLv1o+KAwdoyuDqd70PBuKeyYGL3Y8GkpBGZmR7DJNQ8bTmPFLr4ZDybHHnzmkYOpbRc1w3QUDz4MAKax4Dg=
  </data>
 </layer>
- <layer id="2" name="Objects" width="20" height="15">
+ <layer name="Objects" width="20" height="15">
  <data encoding="base64" compression="zlib">
-   eJxjYGBgeCvJAAcg9hsc/LtoctgASP0FQVSx04IQfSC5U0hy/4RR1WEz+xSSXmxmXEdi84mg6k0WQNULc99hXH4QYmCwY4EwZ8pA6M9sEFqSiYEhCGjeLaB9/EKo7r0GFDsDZT9Dci8IxEHNWymDsCaPCUInCaBaDwqnF2K48UsxiDqY+wOB+j8g+f+iGMQtxIJXeOzChWHgBgF7iJX/IYYd3xYjrBcfgKULWLx8w2EPIfxKEhIv2AB6WIPS5Qs0MZj9MPeA0sdtoNhrqDhI/UtJiD0g8BJJDgZuQ+WfoZkNSgcw9chmoqtDN/8VFvPBeoUgefc2kpkgtdeRxNDzNgicRtODTGNzH7oYPvoVmhkAXcWbCQ==
+   eJyFUztuwkAQHTmIMsEGrWSJs+QOcAAK6LkPR0jLFdJBiqSBCIsCCst2goSEhFKh7DCeeHbYJU9azXo+7z3buwAAhxT+gPvvwPNW1XzA/vfYzS1jmsPaQtQuXbfPx70Qsz6Otdg/9tzZScedZX+voXdIAJ5btJ31KZ7aFNMIYGj5NlbvKXH9rmzurd7nwi9iVPO99BuZaURx3HHl8TsVJrxKQ33sf2Dnj+L9Pwx5kZjHjUeEiZpadUcrtBifQmefwA24Pld+2AfXf4x/ZUJrp/h59iGCIPhc8H85B3T+W1VK/8UH/a3xXBYqx/rsB89HZnNfdR77y5R0EKWoMbK6nituPAfcLzl1n+avPPzX2YTubiY4sXctcvpuI5ZqRkafP527FyvF8QtbzKBh
  </data>
 </layer>
- <layer id="3" name="Above" width="20" height="15">
+ <layer name="Above" width="20" height="15">
  <data encoding="base64" compression="zlib">
   eJy7K8kABnegND5wTxjBviuJWw+y+F00NQ/ZcZv/CIscSP9mPG5j5MAtx4RHbg+SmSD3orsTGzgsRlgNNoDL/ZfING84gz1ExAM+cItC/djsvymJai4yH10OlxgIgNLBTSRxfG5FNp+Qe3Dpw2c+TB7dPTex2ItNDTqNDxDrZ2IAALSvMV4=
  </data>
 </layer>
- <layer id="4" name="Walkable" width="20" height="15">
+ <layer name="Walkable" width="20" height="15">
  <data encoding="base64" compression="zlib">
   eJzbKMbAsJGOGASoYQYyoIYZxJoFU4NMY2Pj8iu6GLrdxABC9o8CBKA0XAilF1Ltxxb32NIGMW4gNl0Taz4xeRaf+fTI/wDD8WwO
  </data>
 </layer>
- <objectgroup id="5" name="Mapevents">
-  <object id="1" name="west" type="mapchange" x="0" y="128" width="32" height="192">
+ <objectgroup name="Mapevents">
+  <object name="west" type="mapchange" x="0" y="128" width="32" height="192">
   <properties>
    <property name="map" value="road4"/>
    <property name="place" value="east"/>
   </properties>
  </object>
-  <object id="2" name="house" type="mapchange" x="384" y="128" width="32" height="32">
+  <object name="house" type="mapchange" x="384" y="128" width="32" height="32">
   <properties>
    <property name="map" value="road5_house"/>
    <property name="place" value="entrance"/>
   </properties>
  </object>
-  <object id="3" name="east" type="mapchange" x="608" y="160" width="32" height="192">
+  <object name="east" type="mapchange" x="608" y="160" width="32" height="192">
   <properties>
    <property name="map" value="cabin_norcity_road1"/>
    <property name="place" value="west"/>
   </properties>
  </object>
-  <object id="4" name="road5_daw_selector" type="script" x="128" y="448" width="32" height="32">
+  <object name="road5_daw_selector" type="script" x="128" y="448" width="32" height="32">
   <properties>
    <property name="when" value="enter"/>
   </properties>
  </object>
 </objectgroup>
- <objectgroup id="6" name="Spawn">
-  <object id="5" name="beetle2" type="spawn" x="64" y="288" width="288" height="160">
+ <objectgroup name="Spawn">
+  <object name="beetle2" type="spawn" x="64" y="288" width="288" height="160">
   <properties>
    <property name="spawngroup" value="beetle2"/>
   </properties>
  </object>
-  <object id="6" name="forestboar3" type="spawn" x="288" y="320" width="288" height="128">
+  <object name="forestboar3" type="spawn" x="288" y="320" width="288" height="128">
   <properties>
    <property name="spawngroup" value="forestboar3"/>
   </properties>
  </object>
 </objectgroup>
- <objectgroup id="7" name="Keys" visible="0"/>
+ <objectgroup name="Keys" visible="0"/>
 </map>
--- a/AndorsTrail/res/xml/roadbeforecrossroads.tmx
+++ b/AndorsTrail/res/xml/roadbeforecrossroads.tmx
@@ -1,234 +1,264 @@
-<?xml version="1.0" ?><!DOCTYPE map  SYSTEM 'https://mapeditor.org/dtd/1.0/map.dtd'><map height="21" orientation="orthogonal" tileheight="32" tilewidth="32" version="1.0" width="21">
+<?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="21" height="21" tilewidth="32" tileheight="32">
 <properties>
  <property name="outdoors" value="1"/>
 </properties>
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- <tileset firstgid="1" name="map_bed_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_bed_1.png" width="512"/>
- </tileset><tileset firstgid="129" name="map_border_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_border_1.png" width="512"/>
- </tileset><tileset firstgid="257" name="map_bridge_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_bridge_1.png" width="512"/>
- </tileset><tileset firstgid="385" name="map_bridge_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_bridge_2.png" width="512"/>
- </tileset><tileset firstgid="513" name="map_broken_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_broken_1.png" width="512"/>
- </tileset><tileset firstgid="641" name="map_cavewall_1" tileheight="32" tilewidth="32">
-  <image height="192" source="../drawable/map_cavewall_1.png" width="576"/>
- </tileset><tileset firstgid="749" name="map_cavewall_2" tileheight="32" tilewidth="32">
-  <image height="192" source="../drawable/map_cavewall_2.png" width="576"/>
- </tileset><tileset firstgid="857" name="map_cavewall_3" tileheight="32" tilewidth="32">
-  <image height="192" source="../drawable/map_cavewall_3.png" width="576"/>
- </tileset><tileset firstgid="965" name="map_cavewall_4" tileheight="32" tilewidth="32">
-  <image height="192" source="../drawable/map_cavewall_4.png" width="576"/>
- </tileset><tileset firstgid="1073" name="map_chair_table_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_chair_table_1.png" width="512"/>
- </tileset><tileset firstgid="1201" name="map_chair_table_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_chair_table_2.png" width="512"/>
- </tileset><tileset firstgid="1329" name="map_crate_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_crate_1.png" width="512"/>
- </tileset><tileset firstgid="1457" name="map_cupboard_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_cupboard_1.png" width="512"/>
- </tileset><tileset firstgid="1585" name="map_curtain_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_curtain_1.png" width="512"/>
- </tileset><tileset firstgid="1713" name="map_entrance_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_entrance_1.png" width="512"/>
- </tileset><tileset firstgid="1841" name="map_entrance_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_entrance_2.png" width="512"/>
- </tileset><tileset firstgid="1969" name="map_fence_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_fence_1.png" width="512"/>
- </tileset><tileset firstgid="2097" name="map_fence_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_fence_2.png" width="512"/>
- </tileset><tileset firstgid="2225" name="map_fence_3" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_fence_3.png" width="512"/>
- </tileset><tileset firstgid="2353" name="map_fence_4" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_fence_4.png" width="512"/>
- </tileset><tileset firstgid="2481" name="map_ground_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_1.png" width="512"/>
- </tileset><tileset firstgid="2609" name="map_ground_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_2.png" width="512"/>
- </tileset><tileset firstgid="2737" name="map_ground_3" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_3.png" width="512"/>
- </tileset><tileset firstgid="2865" name="map_ground_4" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_4.png" width="512"/>
- </tileset><tileset firstgid="2993" name="map_ground_5" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_5.png" width="512"/>
- </tileset><tileset firstgid="3121" name="map_ground_6" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_6.png" width="512"/>
- </tileset><tileset firstgid="3249" name="map_ground_7" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_7.png" width="512"/>
- </tileset><tileset firstgid="3377" name="map_ground_8" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_8.png" width="512"/>
- </tileset><tileset firstgid="3505" name="map_house_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_house_1.png" width="512"/>
- </tileset><tileset firstgid="3633" name="map_house_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_house_2.png" width="512"/>
- </tileset><tileset firstgid="3761" name="map_indoor_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_indoor_1.png" width="512"/>
- </tileset><tileset firstgid="3889" name="map_indoor_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_indoor_2.png" width="512"/>
- </tileset><tileset firstgid="4017" name="map_kitchen_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_kitchen_1.png" width="512"/>
- </tileset><tileset firstgid="4145" name="map_outdoor_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_outdoor_1.png" width="512"/>
- </tileset><tileset firstgid="4273" name="map_pillar_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_pillar_1.png" width="512"/>
- </tileset><tileset firstgid="4401" name="map_pillar_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_pillar_2.png" width="512"/>
- </tileset><tileset firstgid="4529" name="map_plant_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_plant_1.png" width="512"/>
- </tileset><tileset firstgid="4657" name="map_plant_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_plant_2.png" width="512"/>
- </tileset><tileset firstgid="4785" name="map_rock_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_rock_1.png" width="512"/>
- </tileset><tileset firstgid="4913" name="map_rock_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_rock_2.png" width="512"/>
- </tileset><tileset firstgid="5041" name="map_roof_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_roof_1.png" width="512"/>
- </tileset><tileset firstgid="5169" name="map_roof_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_roof_2.png" width="512"/>
- </tileset><tileset firstgid="5297" name="map_roof_3" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_roof_3.png" width="512"/>
- </tileset><tileset firstgid="5425" name="map_shop_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_shop_1.png" width="512"/>
- </tileset><tileset firstgid="5553" name="map_sign_ladder_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_sign_ladder_1.png" width="512"/>
- </tileset><tileset firstgid="5681" name="map_table_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_table_1.png" width="512"/>
- </tileset><tileset firstgid="5809" name="map_trail_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_trail_1.png" width="512"/>
- </tileset><tileset firstgid="5937" name="map_transition_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_transition_1.png" width="512"/>
- </tileset><tileset firstgid="6065" name="map_transition_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_transition_2.png" width="512"/>
- </tileset><tileset firstgid="6193" name="map_transition_3" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_transition_3.png" width="512"/>
- </tileset><tileset firstgid="6321" name="map_transition_4" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_transition_4.png" width="512"/>
- </tileset><tileset firstgid="6449" name="map_transition_5" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_transition_5.png" width="512"/>
- </tileset><tileset firstgid="6577" name="map_tree_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_tree_1.png" width="512"/>
- </tileset><tileset firstgid="6705" name="map_tree_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_tree_2.png" width="512"/>
- </tileset><tileset firstgid="6833" name="map_wall_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_wall_1.png" width="512"/>
- </tileset><tileset firstgid="6961" name="map_wall_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_wall_2.png" width="480"/>
- </tileset><tileset firstgid="7081" name="map_wall_3" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_wall_3.png" width="480"/>
- </tileset><tileset firstgid="7201" name="map_wall_4" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_wall_4.png" width="480"/>
- </tileset><tileset firstgid="7321" name="map_window_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_window_1.png" width="512"/>
- </tileset><tileset firstgid="7449" name="map_window_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_window_2.png" width="512"/>
- </tileset><layer height="21" name="Ground" width="21">
-  <data compression="zlib" encoding="base64">eJy9VNsJwCAMzK8juP8E4j6O0BmkFEHCeXnQ9iMETLxHiLYiclWRUZ/cSj6Gun/CXWd7/96r86ozXo1n8ei6xY/6tVfLx0knwrH0IT+e+UR8MkyvLq9vptNbz8yN1ZFfa7ejc2X3Ga5njtb7YDoi+9MT/4S1jzdmFJe9h+Wvg4hyoEC4f3O8wf8FZjQy/yaLCdmPbSI=</data>
+ <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">
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_bridge_2.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
+ </tileset>
+ <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">
+  <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">
+  <image source="../drawable/map_chair_table_2.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_fence_3.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_house_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_roof_3.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_transition_2.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_transition_4.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
+ </tileset>
+ <layer name="Ground" width="21" height="21">
+  <data encoding="base64" compression="zlib">
+   eJy9VNsJwCAMzK8juP8E4j6O0BmkFEHCeXnQ9iMETLxHiLYiclWRUZ/cSj6Gun/CXWd7/96r86ozXo1n8ei6xY/6tVfLx0knwrH0IT+e+UR8MkyvLq9vptNbz8yN1ZFfa7ejc2X3Ga5njtb7YDoi+9MT/4S1jzdmFJe9h+Wvg4hyoEC4f3O8wf8FZjQy/yaLCdmPbSI=
+  </data>
 </layer>
- <layer height="21" name="Objects" width="21">
-  <data compression="zlib" encoding="base64">eJyNVcsOgjAQbPSsST2Q8P//IhATuRL8ATV4NR5lUyYd1+1jkgZY2Jl9tSyt+0PvnVtW+6uNz4MP97Dj2vn4jQC2xeAFBwNcOcBv8Gl95rtU6LwKmoy7wSc4nJw7niJvn/jOAufAV8G88twKXFY+M/XCqnUNZvIDx5lsfaK3qbis9+BhnVztUOcczpX51sSH94OPM5fzH7Z+leaYwXUU39HwfzQhL4vXmh/wMvTsPpvAK9Bzh1xGmh+9v1IAL+tzXILaHgGTD7x3Woi9M3SsPrH91qRjtzT0mcf7C/Z3E3knlR8/a43cEgjvh5YVu9bL4dqG+ndbfyWHGg3BfverhXupSemc0hqlVTpDuQ/634N+SUx8ZnwBrh+vpQ==</data>
+ <layer name="Objects" width="21" height="21">
+  <data encoding="base64" compression="zlib">
+   eJyNVcsOgjAQbPSssR5I+F7/TSAmepTA1YMavBqPuqGTDnX7mKQBlu7MvihTbf7QWmOmn/1V++fOzvew49pYv0cA26TwgoMBrhTg19m4PvOdCnReGU3GXeETbPbGbPeet43s08A58FUw/HjGDJeWz0C90GpdgoH8wHEkWxvpbSwu7T14WCdVO9Q5hWNhviXx4X1n/cyl/DvXr9wcM7iO4ntR/B/VnJfGq80PeBnh7D6rmVcQzh1yudD8hN+Xhqv1vKzPcQlKewT0jvdOC7E3io7WJ7aPzvewW+rENMIzj78v2N+V5+2dvVotnzWN1BII74cWNML6sN6V9G7b5d5zPde/cf2VHEo0BOvVMhfcS01y51SokVu5M5T7EP570C+Jic+ML2edsyo=
+  </data>
 </layer>
- <layer height="21" name="Above" width="21">
-  <data compression="zlib" encoding="base64">eJxjYEAFdyVR+XckIWLE0LjMQBa7g0WOEIDpJWQvurupBXDZg+5PbP6mpn3kAFLMISYeqQ0IxSM2d2GTRzYPXYxcQKwZhNQRCldqhjO6PaTGPz7zqAGobd5wBPtoEEa0ysuE6gVyzKOWm2AAACdwPzA=</data>
+ <layer name="Above" width="21" height="21">
+  <data encoding="base64" compression="zlib">
+   eJxjYEAFdyVR+XckIWLE0LjMQBa7g0WOEIDpJWQvurupBXDZg+5PbP6mpn3kAFLMISYeqQ0IxSM2d2GTRzYPXYxcQKwZhNQRCldqhjO6PaTGPz7zqAGobd5wBPtoEEa0ysuE6gVyzKOWm2AAACdwPzA=
+  </data>
 </layer>
- <layer height="21" name="Walkable" width="21">
-  <data compression="zlib" encoding="base64">eJzbKMbAsHEUDwuMCwwW8+jlTmqHJ63iidr2E6MeXzghi5MSnoTik5z4IQVQmu6INR+b+FAB+OKXEjOpHQbUiEd0tQCroNXG</data>
+ <layer name="Walkable" width="21" height="21">
+  <data encoding="base64" compression="zlib">
+   eJzbKMbAsHEUDwuMCwwW8+jlTmqHJ63iidr2E6MeXzghi5MSnoTik5z4IQVQmu6INR+b+FAB+OKXEjOpHQbUiEd0tQCroNXG
+  </data>
 </layer>
 <objectgroup name="Mapevents">
-  <object height="224" name="north" type="mapchange" width="32" x="0" y="352">
+  <object name="north" type="mapchange" x="0" y="352" width="32" height="224">
   <properties>
    <property name="map" value="crossroads"/>
    <property name="place" value="southeast"/>
   </properties>
  </object>
-  <object height="160" name="east" type="mapchange" width="32" x="640" y="512">
+  <object name="east" type="mapchange" x="640" y="512" width="32" height="160">
   <properties>
    <property name="map" value="roadbeforecrossroads1"/>
    <property name="place" value="west"/>
   </properties>
  </object>
-  <object height="32" name="south" type="mapchange" width="256" x="288" y="640">
+  <object name="south" type="mapchange" x="288" y="640" width="256" height="32">
   <properties>
    <property name="map" value="woodcave0"/>
    <property name="place" value="north"/>
   </properties>
  </object>
-  <object height="192" name="sign_wolf_pack_jakrar" type="script" width="256" x="256" y="160">
+  <object name="sign_wolf_pack_jakrar" type="script" x="256" y="160" width="256" height="192">
   <properties>
    <property name="when" value="always"/>
   </properties>
  </object>
 </objectgroup>
 <objectgroup name="Spawn">
-  <object height="64" name="fox2" type="spawn" width="192" x="224" y="384">
+  <object name="fox2" type="spawn" x="224" y="384" width="192" height="64">
   <properties>
    <property name="spawngroup" value="fox2"/>
   </properties>
  </object>
-  <object height="32" name="forestserpent1" type="spawn" width="96" x="512" y="480">
+  <object name="forestserpent1" type="spawn" x="512" y="480" width="96" height="32">
   <properties>
    <property name="spawngroup" value="forestserpent1"/>
   </properties>
  </object>
-  <object height="64" name="forestserpent1_1" type="spawn" width="192" x="64" y="576">
+  <object name="forestserpent1_1" type="spawn" x="64" y="576" width="192" height="64">
   <properties>
    <property name="spawngroup" value="forestserpent1"/>
   </properties>
  </object>
-  <object height="128" name="forestwolf1" type="spawn" width="224" x="288" y="160">
+  <object name="forestwolf1" type="spawn" x="288" y="160" width="224" height="128">
   <properties>
    <property name="quantity" value="3"/>
    <property name="spawngroup" value="forestwolf1"/>
   </properties>
  </object>
-  <object height="96" name="wolf_leader" type="spawn" width="128" x="320" y="160">
+  <object name="wolf_leader" type="spawn" x="320" y="160" width="128" height="96">
   <properties>
    <property name="spawngroup" value="wolf_leader"/>
   </properties>
  </object>
 </objectgroup>
 <objectgroup name="Keys">
-  <object height="32" name="pathway_fallhaven:30" type="key" width="64" x="352" y="320">
+  <object name="pathway_fallhaven:30" type="key" x="352" y="320" width="64" height="32">
   <properties>
    <property name="phrase" value="key_wolf_pack_jakrar"/>
    <property name="requireId" value="pathway_fallhaven"/>
@@ -237,4 +267,4 @@
   </properties>
  </object>
 </objectgroup>
-</map>
+</map>
--- a/AndorsTrail/res/xml/roadbeforecrossroads1.tmx
+++ b/AndorsTrail/res/xml/roadbeforecrossroads1.tmx
@@ -1,186 +1,187 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="29" height="28" tilewidth="32" tileheight="32" nextobjectid="18">
+<!DOCTYPE map SYSTEM "https://mapeditor.org/dtd/1.0/map.dtd">
+<map version="1.0" orientation="orthogonal" width="29" height="28" 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 name="Ground" width="29" height="28">
@@ -190,7 +191,7 @@
 </layer>
 <layer name="Objects" width="29" height="28">
  <data encoding="base64" compression="zlib">
-   eJydVk1r20AQFek5patSwd76D5r/2J/UQ89NwZKwcQsBy04cQwJ1ZVc2PQX3ENodawY9zY4c04Fl7dXuvJk3H7uNT5JdGM1/ziJjlySr8H/vu5nWPmf2Gdx/69q1yzRJXqe2PjmP+q2Z9hHm2CU90bZrvdZcBR3LAXy9r8xaHLSlDmubMCbh+8jFnNVh7TmMq+DztzDf+w5vD/tWcG6k/NKckGyzFlvGJutj5y629VRsBYfW5CziksyVXVvGLV0XX8tW0bcO89qwW84WSschfLtjzh84Z15ddLgkU9+es3CPmGHfL95bub7dKGvWQfKUtdiIT77LuQp40PlGOZmHPV/C72vWd8W2F6zrhtelFqZg78y1+Hdgn+BS/uRGbhxjxvuJy/RtF6sC7EVbF+AvyRJwP77pcIfyq1Z2ZheMH/7/gZiSjLnG6GwJsbL0oFhxIsnVWqH4xpyXerv3fdydwn1Mh3HXrp8TB/bxfdrxirmn81DXms4v4U5wKcYT8AXPNobe5ox+eYyN6/AJd67qQWJj9SFdV59O4OE+FOS7cn2ed4B1a9Qzxe/rGX5SLf1WOWbVU53Ffahycf8/2ubjOpfvlBs3Pu63iCu9a6h/5oBLfk54pvVS3U8ktD6D+wZ7tOUvyYyxvwPvY4j3EvD3ir8faRIJ8r4Cfw9qWH0MdYhfueHnlOOp8wHjQPIMvFKv1bxL322Un/oelvvn6V3LO/qJ++U9gDaMXL8vEeYCdJyqE8qhD2nMq85DfT+SCCbeT+jn0LvKiqN+F1Ae1ny3TyBXdH4Jv+in5nfl+/EWXVITM4ih5L0W8ZV6dWH4+VI/kv5Xgf4t+zbnnqv50DEVP899p4ovG8aTXP1pvM+EN40pfmo+h/JE6nVhcDhop+KWpPFxvHQf/AuczuEd+JKdJdeLvE0Ic8r+/wOphU4B
+   eJydVk2L2zAQNdtzS+WlBt36D7r/sT+ph563hdgmIS0sxEk2G2ihqZM6oaclPSytJp7Bz6NxNnRAKJGleTNvPqTGJ8k+jOY/Z5GxS5J1+H/w3UxrHzP7DO5funbtZZokr1Jbn5xH/dZM+whz7JKeaNu1Xmuugo7VAL7eV2YtDtpSh7VtGJPwfeRizuqw9hTGTfD5S5gffId3gH1rODdSfmlOSHZZiy1jm/Wxcxfbei62gkNrchZxSebKrh3jlq6Lr2Wr6NuEeWPYLWcLpeMYvt0z5+9ft/OLqw6XZOrbcxbuCTPs+8V7K9e3G2XDOkgesxYb8cl3OVcBDzrfKCfzsOc2/P7E+m443wvWdcfrUgtTsHfmWvx7sE9wKX9yIzdOMeP9xGV63cWqAHvR1gX4S7IC3Oyqwx3Kr1rZKWeW4f8fiCnJmGuMzpYQK0sPihUnklytFYpvzHmptwffx90r3O/pMO7G9XPiyD6+TTteMfd0Hupa0/mFfBMuxXgCvuDZxtDbXNAvT7FxHT7hzlU9SGysPqTr6sMZPNyHgnxXrs/zHrCWRj1T/D5f4CfV0m+VY1Y91VnchyoX9/+TbT6uc/lOuXHn436LuN84T4b6Zw645OeEZ1ov1f1EQuszuG+wR1v+kswY+yvwPoZ4rwD/oPj7kSaRIO9r8PeohtXHUIf4lRt+TjmeOh8wDiRPwCv1Ws279N1G+anvYbl/Ht+0vKOfuF/eA2jDyPX7EmEuQMe5OqEcepfGvOo81PcjiWDi/YR+Dr2rrDjqdwHlYc13+wRyReeX8It+an7Xvh9v0SU1MYMYSt5rEV+pVxeGn8/1I+l/FejfsW9z7rmaDx1T8fPSd6r4smU8ydWfxvtMeNOY4qfmcyhPpF4XBoeDdipuSRofx0v3wb/A6Rzegc/ZWXK9yNuEMKfs/z/bHU0m
  </data>
 </layer>
 <layer name="Objects_after" width="29" height="28">
@@ -214,62 +215,62 @@
  </data>
 </layer>
 <objectgroup name="Mapevents">
-  <object id="1" name="west" type="mapchange" x="0" y="96" width="32" height="160">
+  <object name="west" type="mapchange" x="0" y="96" width="32" height="160">
   <properties>
    <property name="map" value="roadbeforecrossroads"/>
    <property name="place" value="east"/>
   </properties>
  </object>
-  <object id="2" name="south2" type="mapchange" x="704" y="864" width="160" height="32">
+  <object name="south2" type="mapchange" x="704" y="864" width="160" height="32">
   <properties>
    <property name="map" value="roadbeforecrossroads2"/>
    <property name="place" value="north2"/>
   </properties>
  </object>
-  <object id="3" name="south1" type="mapchange" x="288" y="864" width="128" height="32">
+  <object name="south1" type="mapchange" x="288" y="864" width="128" height="32">
   <properties>
    <property name="map" value="roadbeforecrossroads2"/>
    <property name="place" value="north1"/>
   </properties>
  </object>
-  <object id="4" name="down south" type="mapchange" x="256" y="640" width="32" height="32">
+  <object name="down south" type="mapchange" x="256" y="640" width="32" height="32">
   <properties>
    <property name="map" value="roadcave0"/>
    <property name="place" value="up north"/>
   </properties>
  </object>
-  <object id="5" name="north" type="mapchange" x="768" y="0" width="32" height="32">
+  <object name="north" type="mapchange" x="768" y="0" width="32" height="32">
   <properties>
    <property name="map" value="lodar0"/>
    <property name="place" value="south"/>
   </properties>
  </object>
-  <object id="6" name="sign_roadbeforecrossroads1" type="sign" x="608" y="192" width="96" height="160"/>
+  <object name="sign_roadbeforecrossroads1" type="sign" x="608" y="192" width="96" height="160"/>
 </objectgroup>
 <objectgroup name="Spawn">
-  <object id="7" name="fox2" type="spawn" x="192" y="96" width="160" height="64">
+  <object name="fox2" type="spawn" x="192" y="96" width="160" height="64">
   <properties>
    <property name="spawngroup" value="fox2"/>
   </properties>
  </object>
-  <object id="8" name="jelly1" type="spawn" x="160" y="448" width="192" height="288">
+  <object name="jelly1" type="spawn" x="160" y="448" width="192" height="288">
   <properties>
    <property name="quantity" value="3"/>
    <property name="spawngroup" value="jelly1"/>
   </properties>
  </object>
-  <object id="9" name="forestserpent1" type="spawn" x="512" y="608" width="160" height="128">
+  <object name="forestserpent1" type="spawn" x="512" y="608" width="160" height="128">
   <properties>
    <property name="quantity" value="2"/>
    <property name="spawngroup" value="forestserpent1"/>
   </properties>
  </object>
-  <object id="10" name="forestfly1" type="spawn" x="768" y="128" width="128" height="192">
+  <object name="forestfly1" type="spawn" x="768" y="128" width="128" height="192">
   <properties>
    <property name="spawngroup" value="forestfly1"/>
   </properties>
  </object>
-  <object id="11" name="forestwolf2" type="spawn" x="640" y="384" width="128" height="96">
+  <object name="forestwolf2" type="spawn" x="640" y="384" width="128" height="96">
   <properties>
    <property name="spawngroup" value="forestwolf2"/>
   </properties>
@@ -277,32 +278,32 @@
 </objectgroup>
 <objectgroup name="Keys"/>
 <objectgroup name="Replace">
-  <object id="12" name="lodar2:50" type="replace" x="736" y="192" width="32" height="64">
+  <object name="lodar2:50" type="replace" x="736" y="192" width="32" height="64">
   <properties>
    <property name="Above" value="Above_after"/>
   </properties>
  </object>
-  <object id="13" name="lodar2:50" type="replace" x="640" y="128" width="32" height="64">
+  <object name="lodar2:50" type="replace" x="640" y="128" width="32" height="64">
   <properties>
    <property name="Above" value="Above_after"/>
   </properties>
  </object>
-  <object id="14" name="lodar2:50" type="replace" x="544" y="192" width="32" height="64">
+  <object name="lodar2:50" type="replace" x="544" y="192" width="32" height="64">
   <properties>
    <property name="Above" value="Above_after"/>
   </properties>
  </object>
-  <object id="15" name="lodar2:50" type="replace" x="576" y="288" width="32" height="64">
+  <object name="lodar2:50" type="replace" x="576" y="288" width="32" height="64">
   <properties>
    <property name="Above" value="Above_after"/>
   </properties>
  </object>
-  <object id="16" name="lodar2:50" type="replace" x="704" y="288" width="32" height="64">
+  <object name="lodar2:50" type="replace" x="704" y="288" width="32" height="64">
   <properties>
    <property name="Above" value="Above_after"/>
   </properties>
  </object>
-  <object id="17" name="lodar2:50" type="replace" x="640" y="224" width="32" height="64">
+  <object name="lodar2:50" type="replace" x="640" y="224" width="32" height="64">
   <properties>
    <property name="Above" value="Above_after"/>
    <property name="Objects" value="Objects_after"/>
--- a/AndorsTrail/res/xml/roadbeforecrossroads2.tmx
+++ b/AndorsTrail/res/xml/roadbeforecrossroads2.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="29" height="30" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="22">
+<!DOCTYPE map SYSTEM "https://mapeditor.org/dtd/1.0/map.dtd">
+<map version="1.0" orientation="orthogonal" width="29" 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>
- <layer id="1" name="Ground" width="29" height="30">
+ <layer name="Ground" width="29" height="30">
  <data encoding="base64" compression="zlib">
   eJzbyMnAsJGGeDMU09KOgbRvpNg5Evw4UuwcCX4cKDtHkl9H7Rx+9o76dfjZOdB+Haj6bSDCeRQPX/xGkn52AQBtXXjs
  </data>
 </layer>
- <layer id="2" name="Objects" width="29" height="30">
+ <layer name="Objects" width="29" height="30">
  <data encoding="base64" compression="zlib">
-   eJyVVl1r21AMNd3zyq5hhvyK9D/ud/WhG8QJCyVjLHHTbqWD5qN18li2h5DdM0tYliU7EVzs+EpX0tGRbvaDJPkZ11WaJOuQJA/0G89fce3ieop7LPOoU8Zve9rXT+hPo84qS5LXrLYbZ2077acU9hD+PhG/94b+kfZz8lfE38v4/jeuu9DW5+c4JA3h81l0vHz2muyuB7XP7KLKUZ6D/N5H7C7jGqa1nYfb2NmXcgqu2s7zl4eq7n315BznAlfvXMu+FPF8N+pr4Qyfy1BxDzlODT3PXvMKMhR5yn0rT8Z15PDui2Gv+Y945z285VouQu3TwtXqE43XItj8gv5NXJ8Fru8uqneuZan0rXyL0NZDLSfG9w3x6jmuXWj2JXK8Stt9Iu21SL7+j1vlCUEcsp9lLV/i+9bpE5w7E30g6wNBDk/UuxbuK6o1+PUWfdyT39/EW40P2+E85PMYap5APn2oZpbO3+pr6G0JX82hLju9DxlRHjujnqVhr3vl1unPrrkAKQiHu9Dsz2HajkPzaNYxT715uBY8mSp7PRdknpjvfTyS/NF+0RPol8cT7k/JI8b3aNgh3kOosIJovDjHhchTx+fdn5yrxhf6P6gn8tCcS+A6enOm/BVKb5lWffPto52rN8/1HFw5fQK9PLR5y/XOjZ7puwflOehXi+8Wf4DJteISsGN8D6GbR3jekr2emx5/tpTXS2jjC7+brHl+QXUDLph3I5pLkw7eaJ4htiPZca7PlzWfGHfGREshvsn7xbqn5bwE9zcUv8514fCDzxka95B1r0PWVPPciB1+/4jVx5+u/0nevLXspJw6d/W9B/kaKh6eO7/P0bf62MPb8/dwhn4fvl3zWsZbDpr3Ut858nkwuCLFs4P8A25np2w=
+   eJyVVl1r21AMNd1zx66hhvyK9D/ud/VhK8QJCyVjLHGzrqWD5aN18li2h5DdM0tYliU7EVzs+EpX0tGRbvaDJPkZ13WaJOuQJA/0G8/HuHZxPcc9lnnUKeO3Pe3rJ/SnUWeVJclrVtuNs7ad9lMKewh/n4jfe0P/SPs5+Svi72V8/xvXfWjr83Mckobw+Sw6Xj57TXY3g9pndlHlKM9BfpcRu/dxDdPazsNt7OxLOQVXbef5y0NV9756co5zgat3rmVfini+GfW1cIbPZai4hxynhp5nr3kFGYo85b6VJ+M6cnh3a9hr/iPeeQ9vuZaLUPu0cLX6ROO1CDa/oP8prs8C13cX1TvXslT6Vr5FaOuhlhPj+4Z49TuuXWj2JXK8Ttt9Iu21SL7+j1vlCUEcsp9lLV/i+9bpE5w7E30g6wNBDs/UuxbuK6o1+PUWffwgv7+ItxoftsN5yOcp1DyBfPxQzSydv9XX0NsSvppDXXZ6HzKiPHZGPUvDXvfKndOfXXMBUhAO96HZn8O0HYfm0axjnnrzcC14MlX2ei7IPDHf+3gk+aP9oifQL08n3J+SR4zv0bBDvIdQYQXReHGOC5Gnjs+7PzlXjS/0v1NP5KE5l8B19OZM+SuU3jKt+ubrlZ2rN8/1HFw5fQK9PLR5y/XOjZ7puwflOehXi+8Wf4DJjeISsGN8D6GbR3jekb2emx5/tpTXS2jjC7+brHl+QXUDLph3I5pLkw7eaJ4htiPZyVyZT4w7Y6KlEN/k/WLd03Jegvsbil/nunD4wecMjXvIutcha6p5bsQOv3/E6uNP1/8kb95adlJOnbv63oN8CRUPz53f5+hbfezh7fl7OEO/D9+ueS3jLQfNe6nvHPk8GFyR4tlB/gFcVKZ5
  </data>
 </layer>
- <layer id="3" name="Above" width="29" height="30">
+ <layer name="Above" width="29" height="30">
  <data encoding="base64" compression="zlib">
   eJztVkkOgCAM5Bv8/wXqlfAS/Yt6IGlIp3ZBw8G5EVpgpmUgJR32nNKRlcEDsGd57F2Hm7950TjEU8OfOzfN05yH29ejf89rFIpzXa0OFp6bIrYENIjq1+cv13gV1nzaj+Nr6a9Z4LmXKJ/yj9TaCq8fcnn9/W48kB9IqEA36iMav5PyZ4Gl35HulngPZtDrrfdzdJ4HqN8bRtaxBvstiq/9/a39qA953i9tHSzvCILk1xY/tP7HkF9z8z/mAFcPrsfbGPXRCdP7Zt8=
  </data>
 </layer>
- <layer id="4" name="Walkable" width="29" height="30">
+ <layer name="Walkable" width="29" height="30">
  <data encoding="base64" compression="zlib">
   eJztktEJwDAIRDNF918hG5Z+FIKYeHca2kIFPxK9PDX2o7UeuLUo39OgulE7O6M8VhPxvHyUidSEctEes/HMbJn/rdydN/R5a5Q+VR6iz/Bmed49amw/6L3KY+c63jNcG/Pyd3PHuH2P3Z+VBt1bZc9ZNquv6rWizux8ozdW9nUearv2taJftU6EOYuzPHbeSG2Z/4zeZXnKbBUeut8I8/fnXN2Ty0/jQqbw
  </data>
 </layer>
- <objectgroup id="5" name="Mapevents">
-  <object id="1" name="north1" type="mapchange" x="288" y="0" width="128" height="32">
+ <objectgroup name="Mapevents">
+  <object name="north1" type="mapchange" x="288" y="0" width="128" height="32">
   <properties>
    <property name="map" value="roadbeforecrossroads1"/>
    <property name="place" value="south1"/>
   </properties>
  </object>
-  <object id="2" name="north2" type="mapchange" x="704" y="0" width="160" height="32">
+  <object name="north2" type="mapchange" x="704" y="0" width="160" height="32">
   <properties>
    <property name="map" value="roadbeforecrossroads1"/>
    <property name="place" value="south2"/>
   </properties>
  </object>
-  <object id="3" name="east" type="mapchange" x="896" y="640" width="32" height="192">
+  <object name="east" type="mapchange" x="896" y="640" width="32" height="192">
   <properties>
    <property name="map" value="roadbeforecrossroads3"/>
    <property name="place" value="west"/>
   </properties>
  </object>
-  <object id="4" name="west" type="mapchange" x="0" y="736" width="32" height="64">
+  <object name="west" type="mapchange" x="0" y="736" width="32" height="64">
   <properties>
    <property name="map" value="woodsettlement0"/>
    <property name="place" value="east"/>
   </properties>
  </object>
-  <object id="20" name="south1" type="mapchange" x="448" y="928" width="64" height="32">
+  <object name="south1" type="mapchange" x="448" y="928" width="64" height="32">
   <properties>
    <property name="map" value="fallhaven_ne"/>
    <property name="place" value="north1"/>
   </properties>
  </object>
-  <object id="21" name="south2" type="mapchange" x="672" y="928" width="32" height="32">
+  <object name="south2" type="mapchange" x="672" y="928" width="32" height="32">
   <properties>
    <property name="map" value="fallhaven_ne"/>
    <property name="place" value="north2"/>
   </properties>
  </object>
-  <object id="5" name="sign_rbfcr2" type="sign" x="672" y="576" width="32" height="32"/>
-  <object id="6" name="brv_patrol_check_stop_hero" type="script" x="672" y="192" width="160" height="32">
+  <object name="sign_rbfcr2" type="sign" x="672" y="576" width="32" height="32"/>
+  <object name="brv_patrol_check_stop_hero" type="script" x="672" y="192" width="160" height="32">
   <properties>
    <property name="when" value="enter"/>
   </properties>
  </object>
 </objectgroup>
- <objectgroup id="6" name="Spawn">
-  <object id="7" name="forestwolf1" type="spawn" x="320" y="64" width="160" height="128">
+ <objectgroup name="Spawn">
+  <object name="forestwolf1" type="spawn" x="320" y="64" width="160" height="128">
   <properties>
    <property name="quantity" value="2"/>
    <property name="spawngroup" value="forestwolf1"/>
   </properties>
  </object>
-  <object id="8" name="forestfox2" type="spawn" x="96" y="32" width="192" height="128">
+  <object name="forestfox2" type="spawn" x="96" y="32" width="192" height="128">
   <properties>
    <property name="spawngroup" value="forestfox2"/>
   </properties>
  </object>
-  <object id="9" name="fox2" type="spawn" x="320" y="224" width="96" height="64">
+  <object name="fox2" type="spawn" x="320" y="224" width="96" height="64">
   <properties>
    <property name="quantity" value="2"/>
    <property name="spawngroup" value="fox2"/>
   </properties>
  </object>
-  <object id="10" name="forestwolf1_1" type="spawn" x="288" y="288" width="128" height="96">
+  <object name="forestwolf1_1" type="spawn" x="288" y="288" width="128" height="96">
   <properties>
    <property name="spawngroup" value="forestwolf1"/>
   </properties>
  </object>
-  <object id="11" name="fox2_1" type="spawn" x="256" y="384" width="192" height="288">
+  <object name="fox2_1" type="spawn" x="256" y="384" width="192" height="288">
   <properties>
    <property name="quantity" value="3"/>
    <property name="spawngroup" value="fox2"/>
   </properties>
  </object>
-  <object id="12" name="forestserpent1" type="spawn" x="256" y="736" width="64" height="32">
+  <object name="forestserpent1" type="spawn" x="256" y="736" width="64" height="32">
   <properties>
    <property name="spawngroup" value="forestserpent1"/>
   </properties>
  </object>
-  <object id="13" name="forestwolf1_2" type="spawn" x="64" y="704" width="192" height="128">
+  <object name="forestwolf1_2" type="spawn" x="64" y="704" width="192" height="128">
   <properties>
    <property name="quantity" value="3"/>
    <property name="spawngroup" value="forestwolf1"/>
   </properties>
  </object>
-  <object id="14" name="fox2_2" type="spawn" x="480" y="256" width="160" height="192">
+  <object name="fox2_2" type="spawn" x="480" y="256" width="160" height="192">
   <properties>
    <property name="quantity" value="2"/>
    <property name="spawngroup" value="fox2"/>
   </properties>
  </object>
-  <object id="15" name="forestboar3" type="spawn" x="544" y="608" width="192" height="224">
+  <object name="forestboar3" type="spawn" x="544" y="608" width="192" height="224">
   <properties>
    <property name="quantity" value="2"/>
    <property name="spawngroup" value="forestboar3"/>
   </properties>
  </object>
-  <object id="16" name="fox2_3" type="spawn" x="544" y="64" width="160" height="64">
+  <object name="fox2_3" type="spawn" x="544" y="64" width="160" height="64">
   <properties>
    <property name="spawngroup" value="fox2"/>
   </properties>
  </object>
-  <object id="17" name="forestfox2_1" type="spawn" x="32" y="288" width="224" height="160">
+  <object name="forestfox2_1" type="spawn" x="32" y="288" width="224" height="160">
   <properties>
    <property name="quantity" value="2"/>
    <property name="spawngroup" value="forestfox2"/>
   </properties>
  </object>
-  <object id="18" name="knights" type="spawn" x="640" y="128" width="224" height="192">
+  <object name="knights" type="spawn" x="640" y="128" width="224" height="192">
   <properties>
    <property name="active" value="false"/>
    <property name="ignoreAreas" value="true"/>
@@ -319,8 +320,8 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup id="7" name="Keys">
-  <object id="19" name="stop_hero" type="key" x="640" y="128" width="224" height="192">
+ <objectgroup name="Keys">
+  <object name="stop_hero" type="key" x="640" y="128" width="224" height="192">
   <properties>
    <property name="phrase" value="brv_wait_patrol"/>
    <property name="requireId" value="brv_nondisplay"/>
--- a/AndorsTrail/res/xml/roadbeforecrossroads3.tmx
+++ b/AndorsTrail/res/xml/roadbeforecrossroads3.tmx
@@ -1,186 +1,187 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" tiledversion="1.0.2" orientation="orthogonal" renderorder="right-down" width="30" height="15" tilewidth="32" tileheight="32" nextobjectid="7">
+<!DOCTYPE map SYSTEM "https://mapeditor.org/dtd/1.0/map.dtd">
+<map version="1.0" orientation="orthogonal" width="30" 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 name="Ground" width="30" height="15">
@@ -190,7 +191,7 @@
 </layer>
 <layer name="Objects" width="30" height="15">
  <data encoding="base64" compression="zlib">
-   eJyVVF1OwzAMrsoFSB8icQp2II7ALTgZILEi/iYhdaOMTeyhjLLuEZUHJPIptuKE9GeWLM+ZY3/+7GZ/kiQro/uRtjG6OyC+y47JKc/fjC5HYmI/llfGzFWSTLL/dx/pv11PLvj3ASbGGMM6FNMnEmMsd4hRYu3jYshCStU9m7WyMYWx1+CD/JXop6CzQ2o3dP8hMoPcnDVGp5R3G+Tfaqef2sb17Ya0z9QD575Tdg9elOMCckv2NPP73ZBfU+1K4Efe2uil+X1l9ENZbirtY5bYJX/YyZnAwj0tlB9XD+QrqeYX+eepte8BdsiNcnMEJ5WYb6utvmqbE/c15VoIfiQe1ASf+P8s9Xfk4tjFoj74wTyAby5myFi+qTZkRnOSfRQC+4TOSu1wt+I+5Cj1e5f40C/zXlPtNqIyH3OBmj/a7in6ASeMHVgZd278345vLXwf8F3wDj514EFN7rum2HXA2ybzex7zHsi4UOQ5878U+ylrw0fPYb9d32bfWxxixN6WtBP8Jk2128s80u8fOSphSg==
+   eJyVVEtOwzAQjcIJnIUlTkEPxBG4JCDRVPwqIYUS+hFdpCU0XaKwQMJPnpHHxvl0pJFjZzzz3vPYx/MkWRs/jhwb44cT4rvGMTnl+sr4ciQmnsfyyphXlSST7P/eJ/p36MmF+UOAiTHGsA7F9JnEGMsdYpRY+7QYGmGl6j6bjbIxhRlvoQfN14JPQWun1G5o/2PkDHKz1hifUt59kH+vnX9qG9fXG3J8IQ6c+17ZPnhTTgvYjMaLzOe7pXlNtSuBH3lr49fm+8b4TlltKu1jltilfujJucDCnBbKj6sH8pVU80v7PfYRYIfdKfcfmlTifFtt/V07Xdh06vSReFATei6C+BA76kMfnMdV6u4i9ySwfFNt2JzOSfIoRI0JrZXa4W7FfthZ6nO/TN0/8GXda6rdRlzmYw1Q80fbPgUfaMLYgZVx52b+23HXwvcB94J78LkDD2oy75piN4Fu28znPOY9kHGhyXXWfyn6U9bGHJxDvl13s+8tDjGib0vqCX6Tptr1XR7h+wd4Nl4P
  </data>
 </layer>
 <layer name="Above" width="30" height="15">
@@ -204,32 +205,38 @@
  </data>
 </layer>
 <objectgroup name="Mapevents">
-  <object id="1" name="west" type="mapchange" x="0" y="160" width="32" height="192">
+  <object name="west" type="mapchange" x="0" y="160" width="32" height="192">
   <properties>
    <property name="map" value="roadbeforecrossroads2"/>
    <property name="place" value="east"/>
   </properties>
  </object>
-  <object id="2" name="south" type="mapchange" x="544" y="448" width="288" height="32">
+  <object name="south" type="mapchange" x="544" y="448" width="288" height="32">
   <properties>
    <property name="map" value="roadbeforecrossroads4"/>
    <property name="place" value="north"/>
   </properties>
  </object>
-  <object id="3" name="fct_highwayman1" type="script" x="64" y="224" width="672" height="192"/>
+  <object name="fct_highwayman1" type="script" x="64" y="224" width="672" height="192"/>
 </objectgroup>
- <objectgroup name="Spawn">
-  <object id="4" name="forestboar3" type="spawn" x="704" y="128" width="224" height="160">
+ <objectgroup name="Spawn" visible="0">
+  <object name="forestboar3" type="spawn" x="704" y="128" width="224" height="160">
   <properties>
    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="forestboar3"/>
   </properties>
  </object>
-  <object id="5" name="fox2" type="spawn" x="256" y="64" width="288" height="96">
+  <object name="fox2" type="spawn" x="256" y="64" width="288" height="96">
   <properties>
    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="fox2"/>
+   </properties>
+  </object>
+  <object name="highwayman1" type="spawn" x="96" y="256" width="608" height="128">
+   <properties>
+    <property name="spawngroup" value="highwayman1"/>
   </properties>
  </object>
-  <object id="6" name="highwayman1" type="spawn" x="96" y="256" width="608" height="128"/>
 </objectgroup>
 <objectgroup name="Keys" visible="0"/>
 </map>
--- a/AndorsTrail/res/xml/roadbeforecrossroads4.tmx
+++ b/AndorsTrail/res/xml/roadbeforecrossroads4.tmx
@@ -1,261 +1,262 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="20" height="20" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="8">
+<!DOCTYPE map SYSTEM "https://mapeditor.org/dtd/1.0/map.dtd">
+<map version="1.0" orientation="orthogonal" width="20" height="20" 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_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7577" name="map_tree_4" tilewidth="32" tileheight="32">
  <image source="../drawable/map_tree_4.png" width="512" height="256"/>
 </tileset>
- <layer id="1" name="Ground" width="20" height="20">
+ <layer name="Ground" width="20" height="20">
  <data encoding="base64" compression="zlib">
   eJzbyMnAsJFEvBmKSdU3lMwaaeYNVrOGgnlDwY0jzbyh4MbhkOcAn6EjAA==
  </data>
 </layer>
- <layer id="2" name="Objects" width="20" height="20">
+ <layer name="Objects" width="20" height="20">
  <data encoding="base64" compression="zlib">
-   eJyFVNtKw0AQ3R+wuHkI5KHfoP/o1+gHCD4Ub9BUFC0Iaa1RUWhia+Kj4EPRmWYOO5mmOrDsZnfn5MyZmZ1456rEuU8az2quaexHbm2lb+Yidu6Dxqvsj+JNXxgwKrV/RTgjg8U2ob0Zrb/j4AvMSvgx1g+th4rvgw/+qfhO/8Dimf13iH+PRk7fT0kzW/7AQ5yDpB0rYmPr0k/fu1b8xr7BS31bJ44tFzxeW/10TqBd5gO/hdKFY3qR79K3c3Cj9Hz37Txo7YaKHzBzpbnGLDvywAas2vhofWCV4bnwIQ8Hu03NQTeuo9st2iM2bTr2VNXcknWTb9aV9+6N5szjtO/cGY1DGkf9kIsZnX2R/6OpFeZW0NleFPZtfQELfFn7QRJiflM9xgbddT4Z8zLZxFpjyP2hxKxrJffNOe+d0/0LU/8nvsFlW9F6HoW3YOk3e6NU/0KsqN1C8dV6IIe2d5ET/A9YS+mPY1OXmvdYznROUDcT0x/oecvXYqZSE+CYSf8y/7uOt1P/Y9Vxzoaem/faOZ51xAaezK+WvNg3gblNxRc9x9pm//Db9v7pHgE35Njy+wWO5Cm+
+   eJyFVNtKw0AQ3R9Q2D4U8tBv0N/WDxB8KN6gqShaEJpao6JgY2vqo+BD0ZlmDjmZpjqw7GZ35+TMmZnNYghlEsKnjCealzL2O2FtRazmWTeEDxkvtj/sbvrCgFHS/qXgDB2WWiZ7U1l/d2tfYJbGT7F+ZD0gvvex9k/Nd/IHls7qvyP8d2Xk8v2YVLPnDzzE2U+asSI2tTb9+N4V8RvFCi+NTZ00ttzwdO3145xAu3Gs+c1JF43p2b6L2MzBNen5Hpt5YO0GxA+YOWnOmEVLHtSAtXQ+rA+sdDznsZkHrTnopnV0s0V7xMbGsadUcwvVzb5VV927c5orj5NeCKcyDmQc9upcTOXsS/wfXK0ot5mc7XXqfV9fwAJf1b6f1DG/Uo+pQXfOp2JeJJtYawy7P7CYuVbyWJ3r3pncP3f1fxwrXLWVrN869VuwiJu9UdC/ECtqd0Z8WQ/k0PcucoL/AWth/XHk6pJ5j+yMc4K6yVx/oOc9X4+ZWk2A49j6V/nftryd/I9Vy7ka9xzneNoSG3gqv6Xlxb8Jym1ivug51Xb8D79t7x/3CLghx57fL8I1KDg=
  </data>
 </layer>
- <layer id="3" name="Above" width="20" height="20">
+ <layer name="Above" width="20" height="20">
  <data encoding="base64" compression="zlib">
   eJy1lMsRgCAMBdMGhxSuluDBD3cr0V6EAyMyCSRB94YzWV/CB+B7Tgdwufe3cl2rldJyci4qn9T5JZZ8PWidkr2QOg9Fr729LwiwotzJZcsZgm9E297kc/TucU3I13BsoX4n/h+9s8FX5ktrqkfJnGpnJjo186vdD8ptoZW3Fy8822m2mvfvD7Rv6g3IpTG6
  </data>
 </layer>
- <layer id="8" name="Top" width="20" height="20">
+ <layer name="Top" width="20" height="20">
  <data encoding="base64" compression="zlib">
   eJxjYBgFo2BgwXxZBoYFstQ3dybQzFlAPJsGZlMD3JFkYLgrOdCuGAWjgHwAAApfBYo=
  </data>
 </layer>
- <layer id="4" name="Walkable" width="20" height="20" visible="0">
+ <layer name="Walkable" width="20" height="20" visible="0">
  <data encoding="base64" compression="zlib">
   eJytk8ENACAIxJjC/VdwQ/8EuAKS+BJriZ6Z2T3xIhWdmbIiZsajXOqneFV/xetyN/MqP99HijI3rKlXxtx4Zoxsr3KLuOQexVR/hsxYsZQL4ZM3+JnfrhfJm/Ikuf/l2WWSfEwcfe8DOMWYXQ==
  </data>
 </layer>
- <objectgroup id="5" name="Mapevents">
-  <object id="1" name="north" type="mapchange" x="224" y="0" width="288" height="32">
+ <objectgroup name="Mapevents">
+  <object name="north" type="mapchange" x="224" y="0" width="288" height="32">
   <properties>
    <property name="map" value="roadbeforecrossroads3"/>
    <property name="place" value="south"/>
   </properties>
  </object>
-  <object id="2" name="south" type="mapchange" x="288" y="608" width="224" height="32">
+  <object name="south" type="mapchange" x="288" y="608" width="224" height="32">
   <properties>
    <property name="map" value="roadbeforecrossroads5"/>
    <property name="place" value="north"/>
   </properties>
  </object>
-  <object id="6" name="west1" type="mapchange" x="0" y="0" width="32" height="64">
+  <object name="west1" type="mapchange" x="0" y="0" width="32" height="64">
   <properties>
    <property name="map" value="fallhaven_ne"/>
    <property name="place" value="east1"/>
   </properties>
  </object>
-  <object id="7" name="west2" type="mapchange" x="0" y="512" width="32" height="32">
+  <object name="west2" type="mapchange" x="0" y="512" width="32" height="32">
   <properties>
    <property name="map" value="fallhaven_ne"/>
    <property name="place" value="east2"/>
   </properties>
  </object>
 </objectgroup>
- <objectgroup id="6" name="Spawn" visible="0">
-  <object id="3" name="forestserpent2" type="spawn" x="96" y="192" width="160" height="160">
+ <objectgroup name="Spawn" visible="0">
+  <object name="forestserpent2" type="spawn" x="96" y="192" width="160" height="160">
   <properties>
    <property name="quantity" value="2"/>
    <property name="spawngroup" value="forestserpent2"/>
   </properties>
  </object>
-  <object id="4" name="forestboar3" type="spawn" x="96" y="352" width="192" height="224">
+  <object name="forestboar3" type="spawn" x="96" y="352" width="192" height="224">
   <properties>
    <property name="quantity" value="3"/>
    <property name="spawngroup" value="forestboar3"/>
   </properties>
  </object>
-  <object id="5" name="forestserpent2_1" type="spawn" x="416" y="224" width="160" height="224">
+  <object name="forestserpent2_1" type="spawn" x="416" y="224" width="160" height="224">
   <properties>
    <property name="quantity" value="2"/>
    <property name="spawngroup" value="forestserpent2"/>
   </properties>
  </object>
 </objectgroup>
- <objectgroup id="7" name="Keys" visible="0"/>
+ <objectgroup name="Keys" visible="0"/>
 </map>
--- a/AndorsTrail/res/xml/roadbeforecrossroads6.tmx
+++ b/AndorsTrail/res/xml/roadbeforecrossroads6.tmx
@@ -1,277 +1,278 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.2" tiledversion="1.3.0" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="20" height="31" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="16">
+<!DOCTYPE map SYSTEM "https://mapeditor.org/dtd/1.0/map.dtd">
+<map version="1.0" orientation="orthogonal" width="20" height="31" 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="Ground" width="20" height="31">
+ <layer name="Ground" width="20" height="31">
  <data encoding="base64" compression="zlib">
-   eAHbyMnAsHEUj4bBaBogKw1spnK4DXbzhltZAQpvaoY5zDxqmgkKc5i51Az/oWYmzL3UCFtks2Ds0bClTlsAFp7INLXCFtlMEJva5lLLPFqZAwDbisLe
+   eJzbyMnAsHEUj+JRTBbePMLMG254M5XDaDMNzKSFO4eimdQMW1qYORzCdrDGFy3dS6uwpQUGANuKwt4=
  </data>
 </layer>
- <layer id="2" name="Objects" width="20" height="31">
+ <layer name="Objects" width="20" height="31">
  <data encoding="base64" compression="zlib">
-   eAGtlc1qVEEQhRuD4MqokIB79+oj+CjBrRtXeQBXwbWvoqC4UMEkMqIiRI0/oBBNgslKxE1Izuf0xxSXmYRACmqq+3b1qVM/987+1db2o9/OyJ6EtZc4v08RC17H3fma8y/R4/jX+/CrdzzTyt+9tj5/UWLWuPgun29t6UJrd6O3o+TK8zs8j2IfRK0BXFYvT/bGwa7ED5m/MrZr8UM+xu72NftRX1dMazKsH/7r3X8vdulSa/ejiLmwvslPxGdacrkRPq9z13jkS66Ia/21t3Kmv8+w9kLrGVhvE+OgxPEMCw8ETNbaWr+h/8/F1rajO9HKhfv09GVibUSpL0JfKkbF/n8enD8XW1uL3YyvHB5n/3CGVq6VA9iruXMtOODBAzmMfZQ9Qv+pPfIpa/voXLAfYuILHsL5hyh45PYripgja/IAe6vHuR47xKz+3AHPGfRMS/8Q5pVcFM6thXVlT+3Nd1pc+ofSQ4Q66fcs959H3XO+3fGMPYyLD7LbMfFHxJg2l6/i+yRafZgf9sj31AxeYlIb8tff2mi5Yw31Me6/xPkcVcSkR4j+YpkfePQSqWfs/3bMuXPsJjz5HjhD9ga7k+fgMWfDePSOO2IyX2LaK/tFXRBmzx6zr/xck5+Yi+HJXJjPvXyvrMPTxGdW18MP/tP4icl9MYlLj350TvAWkzPngN5VTLGw1IZ7YNInlX75DamY7xYm7zWY3Hf2sQi1fJ817yb1HmVdOVNDMK0t7wH9se6Vn5jgUnOEvHinKyb1RZxZ+wUX52DI803H872vMwCW+W/l+4jIGX//myqmvMfe41/yqrWlrs6AfZuFNYs3tVXE9v2ihvbV/mjJj2+v+6EdBRdu+IjLPMADjr7PJ1m/YX6v4EodEGp6BNDv9ew=
+   eJytVcFqFEEQbSILOWl6wIa5e3f9BD9l8erFk98gnv0VA4qHGHCzMqIS2NlNNBBBnVmcnCTkEtZ66Sq6urdnloAFRfX0dL96XfV65qI05oL87D/FbWs68j+3wNy25zv5t1vkTPfIuzTH0Pyh2p/meT4yZrJrzDPyJ7sB4ynmRz6+GgVMcJnamJ9gvqB1sHuFj0fWxwXFFY9hFY81puanzwCb8fqO4mTPmJd7/vlMrXlk4jmJwBoTn0+K84TPCpNxuu+xyfdQuKZ9hH2hHNc2v68rw5l1r4Y08MsZ05C3Lt/TD5Rrbn19YehLn65u3hPO37vUF4onNnB4Q8+ve7xPV4jAe2A93pw5rCnuu9D/MWthaUMfRRezTK1u3rvwvmY8nO233ew7zgHsn5znYdF/98SAVyVYEq95HnpdK83m7jWeF+q8ubyN6iFsrs58QP4+0XrDeGubzyu2Ysxm4C7J+o+07q2L1xwyJuy88LwEs+L7OlRHqWGa94rmT90mz2XCM9X6Pmsy7QnskjHv7MSYnQ0a0jptuYZHmTPAsUcwaxswGxf365w1NVU9TvnJeKkw3U7QZlqHd6XX6oz55/jJ+ERhinZ+MKda9Ut0A6sSzLTONWNeKQf+wsY8YV/vh3ud+17BUMvj0t9N1LsqY86o4Sqpa2tD3fvu6NSGc+FOa0ypr2hWcMEl952CfVb1Ed4ac6F6pfWA9UP/a21tUttTpWnpWx9WH+9jlePSxfertvl/f8caHxeb8xIr1te4iDl3Zfx/2xblG6a/la367/8DGOfzfQ==
  </data>
 </layer>
- <layer id="3" name="Above" width="20" height="31">
+ <layer name="Above" width="20" height="31">
  <data encoding="base64" compression="zlib">
-   eAHdVEEKgDAM2ysE//8C9eonxKv+xQ0JlNKt20phukuwjWnajoXw/7PNY/R4TK8PoObqVnxfMa9xeI0cP2nhgENjyEkIPnLSf5wDbg41fs9OT9Jjrm5tXPNXq0N5tZote0+aJT7dVW19eOZ8qgWOhOAt0dvquJOSv577k3rhmlJ/rTEPTXjArPHtUcuiyf2N6hO+NNwN99kyx5wvL820ty9rW/ZEZ+3xhmG2Ej48gjzO
+   eJxjYBj+YLPkQLsAAi6KodKEwF0C7r4jSVgNsWbekcRUc4dIs9HNxKaPWu6EAXLi9DIV0wGp/qGmmaTEO0gdPvXY4p1YQEy847NzI5DeRMM4wec+csuEgYx3cgB6nAw29+NKM4PNncSCPRTYMVT8TKhMGQpmUxJPyIAWZRjMjdhoADyCPM4=
  </data>
 </layer>
- <layer id="4" name="Walkable" width="20" height="31" visible="0">
+ <layer name="Walkable" width="20" height="31" visible="0">
  <data encoding="base64" compression="zlib">
-   eAHtkcENw0AIBK+K9N+CO0x4jLRa4YXInzyCZMHBMGfZ1+uc6//87Dc4n6j/s4nNf+w8+NlXht4m194dl2bdzuYdvnXWPcR0Z+LUA1cZp/a8hukyDt1JdylH7V76KbMD43cy9wyvOTHqdY5zcun+xDmL37N6tHaO88To3GscnpVLM+fq7DxnZ7u+MlrDktOsmKfBPZ43Xr/fHXre+DpGHV53/KbnnjoTdzXzlN2b2M3MfbwbeeNQpvNpT9lNrbtTXb5iUkyONO+8iZ9mne8NA7QUBQ==
+   eJztlEsKwCAMRD1F738Fb1i6KIQSMp+E0kUHgkL0ZYziPtbaf3w2Lt0jEsvL9sX9KvPpVc0hn1PMyFV6o66tpN41ujPEZ5T1hvGs1kf9Z+oyNdU3NMms5DArlsNkNHlmp57qlWF1fL7FjLls7nC7Yv+pDq/jF/FU3wqv8ze5vBMDtBQF
  </data>
 </layer>
- <objectgroup id="5" name="Mapevents">
-  <object id="1" name="west" type="mapchange" x="0" y="384" width="32" height="256">
+ <objectgroup name="Mapevents" visible="0">
+  <object name="west" type="mapchange" x="0" y="384" width="32" height="256">
   <properties>
    <property name="map" value="roadbeforecrossroads5"/>
    <property name="place" value="east"/>
   </properties>
  </object>
-  <object id="2" name="east1" type="mapchange" x="608" y="768" width="32" height="224">
+  <object name="east1" type="mapchange" x="608" y="768" width="32" height="224">
   <properties>
    <property name="map" value="roadbeforecrossroads7"/>
    <property name="place" value="west"/>
   </properties>
  </object>
-  <object id="3" name="east2" type="mapchange" x="608" y="288" width="32" height="128">
+  <object name="east2" type="mapchange" x="608" y="288" width="32" height="128">
   <properties>
    <property name="map" value="waytominingtown0"/>
    <property name="place" value="west"/>
   </properties>
  </object>
-  <object id="4" name="sign_rbfcr6" type="sign" x="480" y="736" width="32" height="32"/>
-  <object id="5" name="sign_rbfcr6_grave1" type="sign" x="256" y="320" width="32" height="32"/>
-  <object id="6" name="brv_patrol_check_stop_hero" type="script" x="256" y="640" width="288" height="256">
+  <object name="sign_rbfcr6" type="sign" x="480" y="736" width="32" height="32"/>
+  <object name="sign_rbfcr6_grave1" type="sign" x="256" y="320" width="32" height="32"/>
+  <object name="brv_patrol_check_stop_hero" type="script" x="256" y="640" width="288" height="256">
   <properties>
    <property name="when" value="enter"/>
   </properties>
  </object>
 </objectgroup>
- <objectgroup id="6" name="Spawn">
-  <object id="7" name="forestserpent2" type="spawn" x="352" y="288" width="128" height="288">
+ <objectgroup name="Spawn" visible="0">
+  <object name="forestserpent2" type="spawn" x="352" y="288" width="128" height="288">
   <properties>
    <property name="quantity" value="2"/>
    <property name="spawngroup" value="forestserpent2"/>
   </properties>
  </object>
-  <object id="8" name="forestfox2" type="spawn" x="384" y="512" width="160" height="192">
+  <object name="forestfox2" type="spawn" x="384" y="512" width="160" height="192">
   <properties>
    <property name="ignoreAreas" value="true"/>
    <property name="quantity" value="2"/>
    <property name="spawngroup" value="forestfox2"/>
   </properties>
  </object>
-  <object id="9" name="forestboar3" type="spawn" x="64" y="384" width="160" height="96">
+  <object name="forestboar3" type="spawn" x="64" y="384" width="160" height="96">
   <properties>
    <property name="spawngroup" value="forestboar3"/>
   </properties>
  </object>
-  <object id="10" name="fox2" type="spawn" x="96" y="768" width="192" height="128">
+  <object name="fox2" type="spawn" x="96" y="768" width="192" height="128">
   <properties>
    <property name="ignoreAreas" value="true"/>
    <property name="spawngroup" value="fox2"/>
   </properties>
  </object>
-  <object id="11" name="agthor" type="spawn" x="128" y="160" width="32" height="32">
+  <object name="agthor" type="spawn" x="128" y="160" width="32" height="32">
   <properties>
    <property name="spawngroup" value="agthor"/>
   </properties>
  </object>
-  <object id="12" name="forestfox2_1" type="spawn" x="416" y="288" width="160" height="128">
+  <object name="forestfox2_1" type="spawn" x="416" y="288" width="160" height="128">
   <properties>
    <property name="quantity" value="2"/>
    <property name="spawngroup" value="forestfox2"/>
   </properties>
  </object>
-  <object id="13" name="agthor_guard" type="spawn" x="224" y="160" width="32" height="32">
+  <object name="agthor_guard" type="spawn" x="224" y="160" width="32" height="32">
   <properties>
    <property name="spawngroup" value="agthor_guard"/>
   </properties>
  </object>
-  <object id="14" name="knights" type="spawn" x="224" y="608" width="352" height="352">
+  <object name="knights" type="spawn" x="224" y="608" width="352" height="352">
   <properties>
    <property name="active" value="false"/>
    <property name="ignoreAreas" value="true"/>
@@ -280,8 +281,8 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup id="7" name="Keys">
-  <object id="15" name="stop_hero" type="key" x="224" y="608" width="352" height="352">
+ <objectgroup name="Keys" visible="0">
+  <object name="stop_hero" type="key" x="224" y="608" width="352" height="352">
   <properties>
    <property name="phrase" value="brv_wait_patrol"/>
    <property name="requireId" value="brv_nondisplay"/>
--- a/AndorsTrail/res/xml/roadbeforecrossroads7.tmx
+++ b/AndorsTrail/res/xml/roadbeforecrossroads7.tmx
@@ -1,187 +1,217 @@
-<?xml version="1.0" ?><!DOCTYPE map  SYSTEM 'https://mapeditor.org/dtd/1.0/map.dtd'><map height="20" orientation="orthogonal" tileheight="32" tilewidth="32" version="1.0" width="20">
+<?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="20" height="20" tilewidth="32" tileheight="32">
 <properties>
  <property name="outdoors" value="1"/>
 </properties>
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- <tileset firstgid="1" name="map_bed_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_bed_1.png" width="512"/>
- </tileset><tileset firstgid="129" name="map_border_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_border_1.png" width="512"/>
- </tileset><tileset firstgid="257" name="map_bridge_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_bridge_1.png" width="512"/>
- </tileset><tileset firstgid="385" name="map_bridge_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_bridge_2.png" width="512"/>
- </tileset><tileset firstgid="513" name="map_broken_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_broken_1.png" width="512"/>
- </tileset><tileset firstgid="641" name="map_cavewall_1" tileheight="32" tilewidth="32">
-  <image height="192" source="../drawable/map_cavewall_1.png" width="576"/>
- </tileset><tileset firstgid="749" name="map_cavewall_2" tileheight="32" tilewidth="32">
-  <image height="192" source="../drawable/map_cavewall_2.png" width="576"/>
- </tileset><tileset firstgid="857" name="map_cavewall_3" tileheight="32" tilewidth="32">
-  <image height="192" source="../drawable/map_cavewall_3.png" width="576"/>
- </tileset><tileset firstgid="965" name="map_cavewall_4" tileheight="32" tilewidth="32">
-  <image height="192" source="../drawable/map_cavewall_4.png" width="576"/>
- </tileset><tileset firstgid="1073" name="map_chair_table_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_chair_table_1.png" width="512"/>
- </tileset><tileset firstgid="1201" name="map_chair_table_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_chair_table_2.png" width="512"/>
- </tileset><tileset firstgid="1329" name="map_crate_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_crate_1.png" width="512"/>
- </tileset><tileset firstgid="1457" name="map_cupboard_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_cupboard_1.png" width="512"/>
- </tileset><tileset firstgid="1585" name="map_curtain_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_curtain_1.png" width="512"/>
- </tileset><tileset firstgid="1713" name="map_entrance_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_entrance_1.png" width="512"/>
- </tileset><tileset firstgid="1841" name="map_entrance_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_entrance_2.png" width="512"/>
- </tileset><tileset firstgid="1969" name="map_fence_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_fence_1.png" width="512"/>
- </tileset><tileset firstgid="2097" name="map_fence_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_fence_2.png" width="512"/>
- </tileset><tileset firstgid="2225" name="map_fence_3" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_fence_3.png" width="512"/>
- </tileset><tileset firstgid="2353" name="map_fence_4" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_fence_4.png" width="512"/>
- </tileset><tileset firstgid="2481" name="map_ground_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_1.png" width="512"/>
- </tileset><tileset firstgid="2609" name="map_ground_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_2.png" width="512"/>
- </tileset><tileset firstgid="2737" name="map_ground_3" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_3.png" width="512"/>
- </tileset><tileset firstgid="2865" name="map_ground_4" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_4.png" width="512"/>
- </tileset><tileset firstgid="2993" name="map_ground_5" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_5.png" width="512"/>
- </tileset><tileset firstgid="3121" name="map_ground_6" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_6.png" width="512"/>
- </tileset><tileset firstgid="3249" name="map_ground_7" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_7.png" width="512"/>
- </tileset><tileset firstgid="3377" name="map_ground_8" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_8.png" width="512"/>
- </tileset><tileset firstgid="3505" name="map_house_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_house_1.png" width="512"/>
- </tileset><tileset firstgid="3633" name="map_house_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_house_2.png" width="512"/>
- </tileset><tileset firstgid="3761" name="map_indoor_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_indoor_1.png" width="512"/>
- </tileset><tileset firstgid="3889" name="map_indoor_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_indoor_2.png" width="512"/>
- </tileset><tileset firstgid="4017" name="map_kitchen_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_kitchen_1.png" width="512"/>
- </tileset><tileset firstgid="4145" name="map_outdoor_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_outdoor_1.png" width="512"/>
- </tileset><tileset firstgid="4273" name="map_pillar_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_pillar_1.png" width="512"/>
- </tileset><tileset firstgid="4401" name="map_pillar_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_pillar_2.png" width="512"/>
- </tileset><tileset firstgid="4529" name="map_plant_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_plant_1.png" width="512"/>
- </tileset><tileset firstgid="4657" name="map_plant_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_plant_2.png" width="512"/>
- </tileset><tileset firstgid="4785" name="map_rock_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_rock_1.png" width="512"/>
- </tileset><tileset firstgid="4913" name="map_rock_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_rock_2.png" width="512"/>
- </tileset><tileset firstgid="5041" name="map_roof_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_roof_1.png" width="512"/>
- </tileset><tileset firstgid="5169" name="map_roof_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_roof_2.png" width="512"/>
- </tileset><tileset firstgid="5297" name="map_roof_3" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_roof_3.png" width="512"/>
- </tileset><tileset firstgid="5425" name="map_shop_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_shop_1.png" width="512"/>
- </tileset><tileset firstgid="5553" name="map_sign_ladder_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_sign_ladder_1.png" width="512"/>
- </tileset><tileset firstgid="5681" name="map_table_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_table_1.png" width="512"/>
- </tileset><tileset firstgid="5809" name="map_trail_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_trail_1.png" width="512"/>
- </tileset><tileset firstgid="5937" name="map_transition_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_transition_1.png" width="512"/>
- </tileset><tileset firstgid="6065" name="map_transition_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_transition_2.png" width="512"/>
- </tileset><tileset firstgid="6193" name="map_transition_3" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_transition_3.png" width="512"/>
- </tileset><tileset firstgid="6321" name="map_transition_4" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_transition_4.png" width="512"/>
- </tileset><tileset firstgid="6449" name="map_transition_5" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_transition_5.png" width="512"/>
- </tileset><tileset firstgid="6577" name="map_tree_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_tree_1.png" width="512"/>
- </tileset><tileset firstgid="6705" name="map_tree_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_tree_2.png" width="512"/>
- </tileset><tileset firstgid="6833" name="map_wall_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_wall_1.png" width="512"/>
- </tileset><tileset firstgid="6961" name="map_wall_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_wall_2.png" width="480"/>
- </tileset><tileset firstgid="7081" name="map_wall_3" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_wall_3.png" width="480"/>
- </tileset><tileset firstgid="7201" name="map_wall_4" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_wall_4.png" width="480"/>
- </tileset><tileset firstgid="7321" name="map_window_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_window_1.png" width="512"/>
- </tileset><tileset firstgid="7449" name="map_window_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_window_2.png" width="512"/>
- </tileset><layer height="20" name="Ground" width="20">
-  <data compression="zlib" encoding="base64">eJzbyMnAsHEUj+IRgjejYWqaRYyZ2OTx6SVkJi43EKOHmmFEzXDF5zdqp4OBTo9DHQMAZrEjAA==</data>
+ <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">
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_bridge_2.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
+ </tileset>
+ <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">
+  <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">
+  <image source="../drawable/map_chair_table_2.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_fence_3.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_house_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_roof_3.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_transition_2.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_transition_4.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
+ </tileset>
+ <layer name="Ground" width="20" height="20">
+  <data encoding="base64" compression="zlib">
+   eJzbyMnAsHEUj+IRgjejYWqaRYyZ2OTx6SVkJi43EKOHmmFEzXDF5zdqp4OBTo9DHQMAZrEjAA==
+  </data>
 </layer>
- <layer height="20" name="Objects" width="20">
-  <data compression="zlib" encoding="base64">eJytVNtKxEAMHdZnxelDoV+h/+h/+bJgXaxVENybu6KgvWj7uOw+iOYwCZNOu6JiIKRJkzPJmUubGLMmbf/J/ia3IX1XNoy3e2JDtbATa0xBmpKeRD5/Rfqg+kPulfUx+Mj/pBhkTH7F31qAHfYb4sOHTLl+Zl1fkHD2S+vW/CC9+4a/hjEz62oES/cBwdw16WnU509jXVDOvZpviCfkZQEH64E9aJhvSE7+gr7ntr8346S7lvT0FPVzCubsNTamDLSKXQ7+3/Ksej740veL2lNgvXEtZp9xvGbMwg73J2umCqdkLPQucnbsLGJ1UKMxZc1S4UwVzwvyt6zL2McFs7Tu7ApnByN/zkTAQTxyWLvYn78NY2I9/K8DXlEna0pPz5Hvacc5stfgTDDD9QV7o+bZKpyK55D9Fq7mClP2SvqAgMeb4D5Brm3X11LZbh+a17+8V23ie54E2D9962DPE8djeOaEy9Tur835zcJ5yPmuwh5S7Cjq55eM2fAdz9ni3VlE/u4/8rsovrYZW+zRiu/6F7PSQXY=</data>
+ <layer name="Objects" width="20" height="20">
+  <data encoding="base64" compression="zlib">
+   eJytVE1Lw0AQDfWssHsI5FfY/3/wUjAWYxQE20ZbUdB8aHIs7UF0HjvDTjapqDgwTGYy+2bm7UeXRNGGtPsn+5vclvRd2TDeHYiNrYWdmygqSVPSU+vz16QPqj/kXhofg4/8T4pBZuTX/K0F2GG/IT58yILXL43rCxLOfmFczQ/S22/4axkzM26NYOk+IJi7IZ3aIX8a65xy7tR8YzwhLws42IzsQct8Q3LyC/pemeHezJJ+LenpyQ5zSubsNY6iKtA6djn4f8Oz6vngS98vak+B9cZrMfuS4w1jlma8P6mZKpyKsVArFMzTBGs0ptSsFM5C8VyQv2O9j31cMCvjzq5wdjTx50xLPHFY+9ifvy1joh7+NwGvmEdqSk/P1ve0VzNjr8GZYOr6U+uxt2qencKpeQ7Zb+FqpTBlr6QPCHi8Du4T5Mr0fS216fehef3Le9Ulvud5gP3Ttw72LHE8hmdOuEzN4bU5v1k4DznfVdhjip3YYX7FmC3f8Zwt3p3C+rv/yO+i+NpmbLFHa77rX0m0P/A=
+  </data>
 </layer>
- <layer height="20" name="Above" width="20">
-  <data compression="zlib" encoding="base64">eJxjYBj6YLMkbcy9AzT3riSCJhZgU3uHgH5C8oTUkuI+GNiHRw8sTJHDAJeagQSkhNtIBvjimpYAOV2i5yNS8xWymcjxjotPTt4lBGDhSKrZyOFPKC6wmUlO/O3Bo+cumj/w2Q0DMHXINACdXiy1</data>
+ <layer name="Above" width="20" height="20">
+  <data encoding="base64" compression="zlib">
+   eJxjYBj6YLMkbcy9AzT3riSCJhZgU3uHgH5C8oTUkuI+GNiHRw8sTJHDAJeagQSkhNtIBvjimpYAOV2i5yNS8xWymcjxjotPTt4lBGDhSKrZyOFPKC6wmUlO/O3Bo+cumj/w2Q0DMHXINACdXiy1
+  </data>
 </layer>
- <layer height="20" name="Walkable" width="20">
-  <data compression="zlib" encoding="base64">eJzbKMbAsHGYYHRAql50Ghsgxx249KLbSYnfSHEnsWqJUYcuT8g8QmLkAEJuJtcsct1DivsGg3nkuoEWZhAyF1u6QWZTGt/kljWUmocvT1HTTGqZB8MAUqWnIg==</data>
+ <layer name="Walkable" width="20" height="20">
+  <data encoding="base64" compression="zlib">
+   eJzbKMbAsHGYYHRAql50Ghsgxx249KLbSYnfSHEnsWqJUYcuT8g8QmLkAEJuJtcsct1DivsGg3nkuoEWZhAyF1u6QWZTGt/kljWUmocvT1HTTGqZB8MAUqWnIg==
+  </data>
 </layer>
 <objectgroup name="Mapevents">
-  <object height="224" name="west" type="mapchange" width="32" x="0" y="256">
+  <object name="west" type="mapchange" x="0" y="256" width="32" height="224">
   <properties>
    <property name="map" value="roadbeforecrossroads6"/>
    <property name="place" value="east1"/>
   </properties>
  </object>
-  <object height="224" name="east" type="mapchange" width="32" x="608" y="384">
+  <object name="east" type="mapchange" x="608" y="384" width="32" height="224">
   <properties>
    <property name="map" value="roadbeforecrossroads8"/>
    <property name="place" value="west"/>
@@ -189,28 +219,28 @@
  </object>
 </objectgroup>
 <objectgroup name="Spawn">
-  <object height="160" name="beetle2" type="spawn" width="192" x="128" y="96">
+  <object name="beetle2" type="spawn" x="128" y="96" width="192" height="160">
   <properties>
    <property name="quantity" value="2"/>
    <property name="spawngroup" value="beetle2"/>
   </properties>
  </object>
-  <object height="64" name="forestboar3" type="spawn" width="128" x="352" y="64">
+  <object name="forestboar3" type="spawn" x="352" y="64" width="128" height="64">
   <properties>
    <property name="spawngroup" value="forestboar3"/>
   </properties>
  </object>
-  <object height="192" name="beetle2_1" type="spawn" width="160" x="448" y="128">
+  <object name="beetle2_1" type="spawn" x="448" y="128" width="160" height="192">
   <properties>
    <property name="quantity" value="3"/>
    <property name="spawngroup" value="beetle2"/>
   </properties>
  </object>
-  <object height="96" name="forestboar3_1" type="spawn" width="128" x="256" y="416">
+  <object name="forestboar3_1" type="spawn" x="256" y="416" width="128" height="96">
   <properties>
    <property name="spawngroup" value="forestboar3"/>
   </properties>
  </object>
 </objectgroup>
 <objectgroup name="Keys" visible="0"/>
-</map>
+</map>
--- a/AndorsTrail/res/xml/roadbeforecrossroads9.tmx
+++ b/AndorsTrail/res/xml/roadbeforecrossroads9.tmx
@@ -1,259 +1,288 @@
-<?xml version="1.0" ?><!DOCTYPE map  SYSTEM 'https://mapeditor.org/dtd/1.0/map.dtd'><map height="24" orientation="orthogonal" tileheight="32" tilewidth="32" version="1.0" width="25">
+<?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="24" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="15">
 <properties>
  <property name="outdoors" value="1"/>
 </properties>
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- <tileset firstgid="1" name="map_bed_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_bed_1.png" width="512"/>
- </tileset><tileset firstgid="129" name="map_border_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_border_1.png" width="512"/>
- </tileset><tileset firstgid="257" name="map_bridge_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_bridge_1.png" width="512"/>
- </tileset><tileset firstgid="385" name="map_bridge_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_bridge_2.png" width="512"/>
- </tileset><tileset firstgid="513" name="map_broken_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_broken_1.png" width="512"/>
- </tileset><tileset firstgid="641" name="map_cavewall_1" tileheight="32" tilewidth="32">
-  <image height="192" source="../drawable/map_cavewall_1.png" width="576"/>
- </tileset><tileset firstgid="749" name="map_cavewall_2" tileheight="32" tilewidth="32">
-  <image height="192" source="../drawable/map_cavewall_2.png" width="576"/>
- </tileset><tileset firstgid="857" name="map_cavewall_3" tileheight="32" tilewidth="32">
-  <image height="192" source="../drawable/map_cavewall_3.png" width="576"/>
- </tileset><tileset firstgid="965" name="map_cavewall_4" tileheight="32" tilewidth="32">
-  <image height="192" source="../drawable/map_cavewall_4.png" width="576"/>
- </tileset><tileset firstgid="1073" name="map_chair_table_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_chair_table_1.png" width="512"/>
- </tileset><tileset firstgid="1201" name="map_chair_table_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_chair_table_2.png" width="512"/>
- </tileset><tileset firstgid="1329" name="map_crate_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_crate_1.png" width="512"/>
- </tileset><tileset firstgid="1457" name="map_cupboard_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_cupboard_1.png" width="512"/>
- </tileset><tileset firstgid="1585" name="map_curtain_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_curtain_1.png" width="512"/>
- </tileset><tileset firstgid="1713" name="map_entrance_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_entrance_1.png" width="512"/>
- </tileset><tileset firstgid="1841" name="map_entrance_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_entrance_2.png" width="512"/>
- </tileset><tileset firstgid="1969" name="map_fence_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_fence_1.png" width="512"/>
- </tileset><tileset firstgid="2097" name="map_fence_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_fence_2.png" width="512"/>
- </tileset><tileset firstgid="2225" name="map_fence_3" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_fence_3.png" width="512"/>
- </tileset><tileset firstgid="2353" name="map_fence_4" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_fence_4.png" width="512"/>
- </tileset><tileset firstgid="2481" name="map_ground_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_1.png" width="512"/>
- </tileset><tileset firstgid="2609" name="map_ground_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_2.png" width="512"/>
- </tileset><tileset firstgid="2737" name="map_ground_3" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_3.png" width="512"/>
- </tileset><tileset firstgid="2865" name="map_ground_4" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_4.png" width="512"/>
- </tileset><tileset firstgid="2993" name="map_ground_5" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_5.png" width="512"/>
- </tileset><tileset firstgid="3121" name="map_ground_6" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_6.png" width="512"/>
- </tileset><tileset firstgid="3249" name="map_ground_7" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_7.png" width="512"/>
- </tileset><tileset firstgid="3377" name="map_ground_8" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_8.png" width="512"/>
- </tileset><tileset firstgid="3505" name="map_house_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_house_1.png" width="512"/>
- </tileset><tileset firstgid="3633" name="map_house_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_house_2.png" width="512"/>
- </tileset><tileset firstgid="3761" name="map_indoor_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_indoor_1.png" width="512"/>
- </tileset><tileset firstgid="3889" name="map_indoor_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_indoor_2.png" width="512"/>
- </tileset><tileset firstgid="4017" name="map_kitchen_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_kitchen_1.png" width="512"/>
- </tileset><tileset firstgid="4145" name="map_outdoor_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_outdoor_1.png" width="512"/>
- </tileset><tileset firstgid="4273" name="map_pillar_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_pillar_1.png" width="512"/>
- </tileset><tileset firstgid="4401" name="map_pillar_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_pillar_2.png" width="512"/>
- </tileset><tileset firstgid="4529" name="map_plant_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_plant_1.png" width="512"/>
- </tileset><tileset firstgid="4657" name="map_plant_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_plant_2.png" width="512"/>
- </tileset><tileset firstgid="4785" name="map_rock_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_rock_1.png" width="512"/>
- </tileset><tileset firstgid="4913" name="map_rock_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_rock_2.png" width="512"/>
- </tileset><tileset firstgid="5041" name="map_roof_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_roof_1.png" width="512"/>
- </tileset><tileset firstgid="5169" name="map_roof_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_roof_2.png" width="512"/>
- </tileset><tileset firstgid="5297" name="map_roof_3" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_roof_3.png" width="512"/>
- </tileset><tileset firstgid="5425" name="map_shop_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_shop_1.png" width="512"/>
- </tileset><tileset firstgid="5553" name="map_sign_ladder_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_sign_ladder_1.png" width="512"/>
- </tileset><tileset firstgid="5681" name="map_table_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_table_1.png" width="512"/>
- </tileset><tileset firstgid="5809" name="map_trail_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_trail_1.png" width="512"/>
- </tileset><tileset firstgid="5937" name="map_transition_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_transition_1.png" width="512"/>
- </tileset><tileset firstgid="6065" name="map_transition_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_transition_2.png" width="512"/>
- </tileset><tileset firstgid="6193" name="map_transition_3" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_transition_3.png" width="512"/>
- </tileset><tileset firstgid="6321" name="map_transition_4" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_transition_4.png" width="512"/>
- </tileset><tileset firstgid="6449" name="map_transition_5" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_transition_5.png" width="512"/>
- </tileset><tileset firstgid="6577" name="map_tree_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_tree_1.png" width="512"/>
- </tileset><tileset firstgid="6705" name="map_tree_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_tree_2.png" width="512"/>
- </tileset><tileset firstgid="6833" name="map_wall_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_wall_1.png" width="512"/>
- </tileset><tileset firstgid="6961" name="map_wall_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_wall_2.png" width="480"/>
- </tileset><tileset firstgid="7081" name="map_wall_3" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_wall_3.png" width="480"/>
- </tileset><tileset firstgid="7201" name="map_wall_4" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_wall_4.png" width="480"/>
- </tileset><tileset firstgid="7321" name="map_window_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_window_1.png" width="512"/>
- </tileset><tileset firstgid="7449" name="map_window_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_window_2.png" width="512"/>
- </tileset><layer height="24" name="Ground" width="25">
-  <data compression="zlib" encoding="base64">eJztlDEOwCAMAyN14uHlPxEfZOgWidYmjroweEL4FBPjzcyPbARlfVa+K6kZ/Xr0xWHPo3+UguEFjJjb2xxMFsg+3aA/si/Mm+/4s0xVBxR9ZDnZzqv6jHa9iofmk+Wxf4wqQ3Z/1RzVvv0xI+KR5aD3K3Or4kwzu7C0</data>
+ <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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" 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" tilecount="128" columns="16">
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
+ </tileset>
+ <layer id="1" name="Ground" width="25" height="24">
+  <data encoding="base64" compression="zlib">
+   eAHtkUsOwjAMRCOx4uBwn4oLFks8aTRyjGmyZBGN7fk4TY/7GMf/jNf7DfRcfRMy8NN/Q/QdJAstveLzNkYcnUWNB/yVR0++444dcbfI8Wz6KzvIxBs42wHHG4HMFeEcVfP4/Au9f/DuiV59WY0n43bkZ7nVTjhFMpjRV4gWdC3zCt2T9ep3XrlO7X7tO/6OhszQUmfYyZppNE81Ovdadd2aDNczd3Tdau/50a9mZn7fg2Y2h9+BvmP1G8mr7tbR7PCv7qnuoNzOPSczu7C0
+  </data>
 </layer>
- <layer height="24" name="Objects" width="25">
-  <data compression="zlib" encoding="base64">eJytVdtKw0AQDfUH3CCBPukfxH/0yzRgFQQLhdZGq1RQ22oLvpT6UHCGzDHTcSdGcWDYbHYz58w1q26S3JOuZF2SsvRDkjylSTIw539d2e6b7FmmZPs9rZ7/y/41cb5T+4vQ3j74aZ723qRb2+f9mOxvw+59+722e0p6RpqT30ULPF5nWa0ej4myzXJDnEq6f5vVsS4cHOT7OPXPwTOXfLGw/Q/SNelGFHjWj0LlPHZu5St/Yu+gU2E/0/4183kCx4snznG/DBUG/IL93OHJ33NsR8GPJ1YW2FmQzbnYZfteHMBLx3kc4nWCnLHAr4Xw13GM2R+H3XgzH8ZEDQFvaPqHRdeZ5/+gu/tdoWyBdykxnDbUnebTZg5ofiOFlzv1H6u7n/rYw4MMQ3u+uo+XEreXhnlSKJy9Trv5EcOLzY9VhDdyZevCm2+xtWl+ahz0RC7/HK5RnJ+Hql7Ag/d8r9eiD21dZp14nvScnUm/cg1xv19FcJr89OoKPXAjK+YC3m8NzkQ4D4VDGz8RR/azNDg9iVvf9DXj8PuH8D0/Mf82ZuZPzZzz+sDLf+w955h7gf/ha8E52d/FuRQ/ftsHNk/zUMUGOI9plXv8fw5pf5TWvdOEY3l8Ajze8XI=</data>
+ <layer id="2" name="Objects" width="25" height="24">
+  <data encoding="base64" compression="zlib">
+   eAGVldtKHFEQRZv4AyoykKf4B/Ef/TIjGANChID3JPjgNXEgL0EfBPeiZzHF4bRoQU3Nue29q+p09/zjMPyKzxfxIRE7XBuGq/Vh+NGsu++9Edy/cc5hl8H+F8cq/3tx3Q/+92i+SASP8X7Gb8VXn1HcGn8GU3zmT4P/HDcveXtjcHfiX+Kfk/duIvte4wPvdrZ069TqYCw2+Z5E01nOnccxai1fzUe97NnKnqrbfeojolsD/yn+P/64cPnUaYQbQwfmvHGcXf4yD99+cLGNDyP3dcZ/4lM65emtk4/r4p+lTnCYl/iO1WfkPLU9jvN/iof9mDj34bhb8KB/qg7q8hwY3DF47IN9YY2eYeYFD/iaumsEB8xq6IHTOyTf0WKf5znjHv5P5c87A/Mc+sRiHt3Unnm4ezjolKu3bh1qBNsz9Egjt16/XDeql9jWux3Di8k3jsY836q3PsfgU7eb6K7nK699hmslzwT76nrVX+vivHzGOj9veM2PXpljj0/+qVh1tLzyk4/PBL2iDtxR1/fyn/uiDsbs+5rY66vn2gjuLHXDuI+1zvU9y3+eV+4Qz/tBh6fNt+Y5Mix/1VGfAVZ9LzjPt6TmQ73QzDoaqt7KJz5RI09qhslDvagb33bMc/Aw/zvz9fvGunlWPt/3RN759k4esNv6cn6q/715esyzwDecbww826sgL/P5ljWsdy+rXvNs43g6vQ4OtZGHeXrv9+dTarMZpzZofa0Pbb1eALjr7qI=
+  </data>
 </layer>
- <layer height="24" name="Above" width="25">
-  <data compression="zlib" encoding="base64">eJzNVUEOgCAM4xv+/wXKd/QJ/EFJWLKQsg0GxF480K3tWDAEGfehEAbwsJ4r+nNY+58f7yrcaKx5BnojSHqpnK2akzUrIfuQciOfmR+FHNq5BTxHK1PWsfZv+bQiKbvUm7PeIb4X5ItztP5U1/KH7oPml7/STtdzRv6Qlhfcn6SH+CN7x+tnZbDqEbSMXj0rkA/PO9pzH7Pf6xk6nr3agb/62gntX9bLQ3gB3KhS+A==</data>
+ <layer id="3" name="Above" width="25" height="24">
+  <data encoding="base64" compression="zlib">
+   eAHNk9ENwjAMRLsG+08ArAMjdAew1CedoovjBKjoj137fHdO2m3Ln8cl7690n8L5C371VOW/vj3dDl938adcba57tD19V26tk2d6++Glugec1ZhpO47wke3tfAYenZW+89HW4I+65ooLH05fMeQOl+3NHJF763lx/My62H5D8AcPvhQz4meu54+68nB+EVWr9QuOuvNHLyJaWlvJ0R3pwa143ZP+KOr8t3bINFUPXHYPYFYj51iZdz6qZ+J0Zu7jE53KbmBmdPi/ZvZA54z4r77O2B0N7oj3Xqzi3PwL3KhS+A==
+  </data>
 </layer>
- <layer height="24" name="Walkable" width="25">
-  <data compression="zlib" encoding="base64">eJzdUkEOwCAI8xX7/xf84U5LDJEUS+thTUiMQGvB+YwxQ6yIOUWs3C6NqOPUcPec+Mig4K8C9SLerpdqvuOjswvEceL1q2HmhOrjfXZmZ8HwsLtVaVT0HFq3dXb7v+Gp+g/Zt2W9CAo/Fahn6dBy8//JxwvG1Ejh</data>
+ <layer id="4" name="Walkable" width="25" height="24">
+  <data encoding="base64" compression="zlib">
+   eAG1kAsKxDAIRHuKvf8VesPFXR4Mg9ZEUqGd6Hxsen+u67bnknLuRE98ZEWdyMwy/unv5U+/f/fOO/dA65j9H2Zo6StE12HmV4/zysUZ3uf08Bmqv+PJq7DydzvwVbnM0TnCd3vQhT8rz9V+RY8GX/TZmdkTkqUY+qgn3w6nWb9gee3krGqrfav+iU6udOy/Vd/Broo/NWcP6Lk+pw90bddXXp1n5y5XeffD+Tzr0U4xy6xmb++Y5odvp6Z7VndM88P3BcbUSOE=
+  </data>
 </layer>
- <objectgroup name="Mapevents">
-  <object height="224" name="west" type="mapchange" width="32" x="0" y="544">
+ <objectgroup id="5" name="Mapevents">
+  <object id="1" name="west" type="mapchange" x="0" y="544" width="32" height="224">
   <properties>
    <property name="map" value="roadbeforecrossroads8"/>
    <property name="place" value="east"/>
   </properties>
  </object>
-  <object height="32" name="south" type="mapchange" width="256" x="64" y="736">
+  <object id="2" name="south" type="mapchange" x="64" y="736" width="256" height="32">
   <properties>
    <property name="map" value="road1"/>
    <property name="place" value="north"/>
   </properties>
  </object>
-  <object height="32" name="north" type="mapchange" width="96" x="160" y="0">
+  <object id="3" name="north" type="mapchange" x="160" y="0" width="96" height="32">
   <properties>
    <property name="map" value="waytominingtown1"/>
    <property name="place" value="south2"/>
   </properties>
  </object>
-  <object height="32" name="down oldcave0" type="mapchange" width="32" x="608" y="192">
+  <object id="4" name="down oldcave0" type="mapchange" x="608" y="192" width="32" height="32">
   <properties>
    <property name="map" value="oldcave0"/>
    <property name="place" value="up oldcave0"/>
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Spawn">
-  <object height="64" name="forestserpent2" type="spawn" width="96" x="256" y="640">
+ <objectgroup id="6" name="Spawn">
+  <object id="5" name="forestserpent2" type="spawn" x="256" y="640" width="96" height="64">
   <properties>
    <property name="spawngroup" value="forestserpent2"/>
   </properties>
  </object>
-  <object height="32" name="ccentip" type="spawn" width="32" x="288" y="352">
+  <object id="6" name="ccentip" type="spawn" x="288" y="352" width="32" height="32">
   <properties>
    <property name="spawngroup" value="ccentip"/>
   </properties>
  </object>
-  <object height="192" name="zombie2" type="spawn" width="320" x="416" y="416">
+  <object id="7" name="zombie2" type="spawn" x="416" y="416" width="320" height="192">
   <properties>
    <property name="quantity" value="2"/>
    <property name="spawngroup" value="zombie2"/>
   </properties>
  </object>
-  <object height="32" name="zombie2_1" type="spawn" width="32" x="416" y="352">
+  <object id="8" name="zombie2_1" type="spawn" x="416" y="352" width="32" height="32">
   <properties>
    <property name="spawngroup" value="zombie2"/>
   </properties>
  </object>
-  <object height="96" name="zombie2_2" type="spawn" width="160" x="352" y="160">
+  <object id="9" name="zombie2_2" type="spawn" x="352" y="160" width="160" height="96">
   <properties>
    <property name="spawngroup" value="zombie2"/>
   </properties>
  </object>
-  <object height="256" name="zombie2_3" type="spawn" width="256" x="512" y="96">
+  <object id="10" name="zombie2_3" type="spawn" x="512" y="96" width="256" height="256">
   <properties>
    <property name="quantity" value="3"/>
    <property name="spawngroup" value="zombie2"/>
   </properties>
  </object>
-  <object height="64" name="forestserpent2_1" type="spawn" width="128" x="128" y="544">
+  <object id="11" name="forestserpent2_1" type="spawn" x="128" y="544" width="128" height="64">
   <properties>
    <property name="spawngroup" value="forestserpent2"/>
   </properties>
  </object>
-  <object height="32" name="redft2" type="spawn" width="32" x="160" y="96">
+  <object id="12" name="redft2" type="spawn" x="160" y="96" width="32" height="32">
   <properties>
    <property name="spawngroup" value="redft2"/>
   </properties>
  </object>
-  <object height="32" name="ccentip_1" type="spawn" width="32" x="160" y="224">
+  <object id="13" name="ccentip_1" type="spawn" x="160" y="224" width="32" height="32">
   <properties>
    <property name="spawngroup" value="ccentip"/>
   </properties>
  </object>
-  <object height="160" name="ccentip_2" type="spawn" width="160" x="128" y="256">
+  <object id="14" name="ccentip_2" type="spawn" x="128" y="256" width="160" height="160">
   <properties>
    <property name="quantity" value="2"/>
    <property name="spawngroup" value="ccentip"/>
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Keys"/>
-</map>
+ <objectgroup id="7" name="Keys"/>
+</map>
--- a/AndorsTrail/res/xml/stoutford_ne.tmx
+++ b/AndorsTrail/res/xml/stoutford_ne.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" tiledversion="1.1.5" orientation="orthogonal" renderorder="right-down" width="20" height="20" tilewidth="32" tileheight="32" infinite="0" nextobjectid="20">
+<map version="1.8" tiledversion="1.8.4" orientation="orthogonal" renderorder="right-down" width="20" height="20" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="19">
 <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="20" height="20">
+ <layer id="1" name="Ground" width="20" height="20">
  <data encoding="base64" compression="zlib">
   eJzbyMnAsHEU0wXvFsbElJh3WhgTU2JekDQDQzASDpHGVCPHBcG4/ISsNhGoPwkJJxNhHqX+QTcviIB/SDUvkYB/SDWPnDSDHM6kmoctzZzGYh4uTCjNoIczqeahpxn0cCbVPGLjY9Q88swDAPxH9xo=
  </data>
 </layer>
- <layer name="Objects" width="20" height="20">
+ <layer id="2" name="Objects" width="20" height="20">
  <data encoding="base64" compression="zlib">
   eJyVlM1Kw0AQx4dCaw+adoNNWdGrV/EBFF9A6dWDIHjyefQN1CcoaMFe/KAfGjzWthShB0uTgvQNdMadNZN+xoFhk83ub+f/380GGiDE/A0XoI/ZUAAB99u2qmf3B2J+IFrb54s5A/HsT8x9Eu+f3PeC49ewHseFpbGXBdhfkEdZw5frUzxg+2hrFd87uHaT6x1hdrWp8SIDcIlZyhq/yBMbpM9ybX8X25oYQ+GlAHbWATS2V8i6Zh6tdestz3vMujKcyTjLAzwrw6MapH6KcIbWO4/7Cug3Mj+wnhVsq5uGFzKPvEq7JumdvlGQFhu7ecNr4thVZBQxvzKmVh95OfaM5vdUnJcT+yy1VZDXZu0dzDH7KX21/lneKeu1OkgT1XOejvRa/aGDz5hDzJZjvCHeuzL/A/FozZoX6SBNW/h8w7zDBOfPF3oP8L2J81pCE/lCLfFo/a6K+6tTcb0jwTtZsK7lHacjxuTZoe91wZuXJcEjL8sF46/H58Zy6bsv9qOfgDdQkb+az01R8BoL6murOM/uP53RvGu0jcX9Q+O+E+qtzPkPX724fxRJ/Ruq6I4YqPh57PD/UdbT+ihbapqX5P7b3vjf/v7Vw/ffG98dVR3p/QGMHboP
  </data>
 </layer>
- <layer name="Above" width="20" height="20">
+ <layer id="3" name="Above" width="20" height="20">
  <data encoding="base64" compression="zlib">
   eJxjYGBguCnJwHALiGEAmY+LvVkSUx+1wU0kO/ZA7dkIpDdB2XuwuAHdjc1sDAwtbLjt2EOB+2+SoPchO3bxRzjEYebfwuFXRg7sepiQxDeiue8lHvfuxCF3WAy3Hmx+AvnnIh49l5Dk0MMPm58iWVHVY0tvuOKwRABTDOQffO4jFcD844AjPmAggIA8NoArzYAAvnSDC+BKMyAASjeU5AV0gC/dkAJgcX4Ji3kZWOKXGLCPSv6Eue0cDctAYgEo/aHnD2R/kpP+0MFnoHlf0PwKALbTPTQ=
  </data>
 </layer>
- <layer name="Walkable" width="20" height="20" visible="0">
+ <layer id="4" name="Walkable" width="20" height="20" visible="0">
  <data encoding="base64" compression="zlib">
-   eJzNkskNACAIBK3C/lugQ30agjqwMZGEBx4DC1hvzaZ7s17z9a9nqdyTKUyltqgOpcaMkRnQc8ojWvz9KSa5M71Y46re23wjDdWdu+nJ8LL7UOn3S57nRnmiv4S36xOtj7xTeb/Ng/gAsRC2rg==
+   eJzNkssNACAIQ5nC/VdgQz0aUrGFmEjCwQ/PFvRh5itj+KjlXhtZXW4WHeZJG8NFOjoalWBmgPbjucJjvCB+laf2Yl9nfbh5yOaLPFT/3M2PwlP/Q6XfL3mRi95BtQzv1CdWH3Ovy/ttHkxOWsO1IA==
  </data>
 </layer>
- <objectgroup name="Mapevents">
+ <objectgroup id="5" name="Mapevents">
  <object id="1" name="west" type="mapchange" x="0" y="128" width="32" height="64">
   <properties>
    <property name="map" value="stoutford_gate"/>
@@ -246,52 +246,71 @@
    <property name="place" value="fieldnorth2"/>
   </properties>
  </object>
-  <object id="10" name="north" type="mapchange" x="64" y="0" width="128" height="32">
+  <object id="8" name="north" type="mapchange" x="64" y="0" width="128" height="32">
   <properties>
    <property name="map" value="wild19"/>
    <property name="place" value="south"/>
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Spawn">
-  <object id="8" name="stoutford_farmer_jen" type="spawn" x="64" y="416" width="160" height="160"/>
-  <object id="9" name="stoutford_commoner2" type="spawn" x="32" y="128" width="320" height="64"/>
-  <object id="19" name="stn_boralla" type="spawn" x="256" y="256" width="160" height="320"/>
-  <object id="13" name="stn_boralla1" type="spawn" x="256" y="64" width="64" height="32">
+ <objectgroup id="6" name="Spawn">
+  <object id="9" name="stoutford_farmer_jen" type="spawn" x="64" y="416" width="160" height="160">
   <properties>
-    <property name="active" value="false"/>
+    <property name="spawngroup" value="stoutford_farmer_jen"/>
   </properties>
  </object>
-  <object id="12" name="stn_boralla2" type="spawn" x="256" y="256" width="32" height="32">
+  <object id="10" name="stoutford_commoner2" type="spawn" x="32" y="128" width="320" height="64">
   <properties>
-    <property name="active" value="false"/>
+    <property name="spawngroup" value="stoutford_commoner2"/>
   </properties>
  </object>
-  <object id="11" name="stn_boralla3" type="spawn" x="544" y="512" width="32" height="32">
+  <object id="11" name="stn_boralla" type="spawn" x="256" y="256" width="160" height="320">
   <properties>
-    <property name="active" value="false"/>
+    <property name="spawngroup" value="stn_boralla"/>
   </properties>
  </object>
-  <object id="14" name="stn_boralla4" type="spawn" x="128" y="96" width="32" height="32">
+  <object id="12" name="stn_boralla1" type="spawn" x="256" y="64" width="64" height="32">
   <properties>
    <property name="active" value="false"/>
+    <property name="spawngroup" value="stn_boralla1"/>
   </properties>
  </object>
-  <object id="15" name="stn_boralla5" type="spawn" x="320" y="192" width="32" height="32">
+  <object id="13" name="stn_boralla2" type="spawn" x="256" y="256" width="32" height="32">
   <properties>
    <property name="active" value="false"/>
+    <property name="spawngroup" value="stn_boralla2"/>
   </properties>
  </object>
-  <object id="16" name="stn_boralla6" type="spawn" x="96" y="192" width="32" height="32">
+  <object id="14" name="stn_boralla3" type="spawn" x="544" y="512" width="32" height="32">
   <properties>
    <property name="active" value="false"/>
+    <property name="spawngroup" value="stn_boralla3"/>
+   </properties>
+  </object>
+  <object id="15" name="stn_boralla4" type="spawn" x="128" y="96" width="32" height="32">
+   <properties>
+    <property name="active" value="false"/>
+    <property name="spawngroup" value="stn_boralla4"/>
+   </properties>
+  </object>
+  <object id="16" name="stn_boralla5" type="spawn" x="320" y="192" width="32" height="32">
+   <properties>
+    <property name="active" value="false"/>
+    <property name="spawngroup" value="stn_boralla5"/>
+   </properties>
+  </object>
+  <object id="17" name="stn_boralla6" type="spawn" x="96" y="192" width="32" height="32">
+   <properties>
+    <property name="active" value="false"/>
+    <property name="spawngroup" value="stn_boralla6"/>
   </properties>
  </object>
  <object id="18" name="stn_boralla7" type="spawn" x="96" y="288" width="32" height="32">
   <properties>
    <property name="active" value="false"/>
+    <property name="spawngroup" value="stn_boralla7"/>
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Keys"/>
+ <objectgroup id="7" name="Keys"/>
 </map>
--- a/AndorsTrail/res/xml/sullengard_west_ravine.tmx
+++ b/AndorsTrail/res/xml/sullengard_west_ravine.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<map version="1.8" tiledversion="1.8.4" orientation="orthogonal" renderorder="right-down" width="30" height="26" tilewidth="32" tileheight="32" infinite="0" nextlayerid="12" nextobjectid="19">
 <properties>
  <property name="outdoors" value="1"/>
 </properties>
@@ -183,26 +183,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 id="1" name="Ground" width="30" height="26">
+ <layer id="11" name="Base" width="30" height="26">
  <data encoding="base64" compression="zlib">
-   eJzt1T0OgCAMBWDD5rG9hGdwNWxwBbiCZ1GHJk1TfiytE8PbyPugED3XZTlnZmbECc6m93DlxCfJ0A1MtifZwMVGYpIVXXAi6bdya5aFi72SpeXSWWZDl7s32ov7/arj1josXbC5+Y247zrfcbdS9yJJyOxxuXO0XNxfSs97hrWcC+fpsb66+LuL3a+W1OVm8Ld7uLE9SN3RWWib8H9v7cHCpNmZ3MdBQ9I=
+   eJztziEBAAAIA7Bb+iehIRVQYLYESwAAuNb1PYCdAf0uALs=
  </data>
 </layer>
- <layer id="2" name="Breadcrumb" width="30" height="26" visible="0">
+ <layer id="1" name="Ground" width="30" height="26">
  <data encoding="base64" compression="zlib">
-   eJxjYKA9UOSijhnomFb24rOHkJnEuo1UfdjcRGp44DIXBqS4IBiXPKV2kWsvNQE2c6kRjuTaSyuALb/Q2o8we+kJ6OEnXPbS276R4M+BtHOk+BVm70DaPWrvqL20sBdbe40eaR1XHUuoHqZXWJHajsUFAAwWDy4=
+   eJzt1b0NgCAQBWBDxwSu4nou4Qy2xE5XgBWcRSwuXi7HP2dF8TryPjiIGj1NZmRkpDqnkundVTiXjxV0TyarjxNwsWGZuI4uOBfpl3JjloSLvZDVy6WzdIIud2+0F/cfuo8b65B0webm1+K+646Mu611bxKLzByXO0fKxf2h5LxnWMu5cJ4cq9Rd5u+7i91Sq9SNzeBvd1dte6h1W2fR24T/e2oPEibNxuQBqUBDZw==
  </data>
 </layer>
 <layer id="3" name="Objects" width="30" height="26">
-  <data encoding="base64" compression="zlib">eJyNVsFq1FAUHd7OXZOCnamfoIhLu3YtMnRRNyJ1YxlwL4K/0f5C/8GVupQJWY20FMQsrC0zzNClK3PIPeTk5s50Djxe8vLePfec3PeS5WgwWNXtpm630i9tHOD1Xd60eX29kDm8X9cDWKdx0F9mbavypgduJA+MFRbDQ9dzfpV3cy+MD+OcM5fcOFbWbVzPebbf52G8ctTmpxwam9B7XF9k7ZrjvLn3awDmVZh29VAReeJ9B4dqVD6NC12zrJ878vRzvSe+XqhrNerrK5xv/rn30ddXYTFV33XWvDfWz8L5xhiRX1hHjQrvl9bNwmqMONobDB4P+z5gTun2wFxijfOuxqf73TpG/89iR+3JsPWUe2BsdbUNdH/xGlpeW4vwJTX977zR9LVu34I65bU/C3SPKie1MP46TFJ7bkQ1qX4rd2m1crTX94/gOz2RHCZ2/Sm1dRXtIb8XEGtmtRlxIe6x0/oxNb6SD3iQ4tpdBrWp+pRv4nh+ZvH9i9Qdi/ahniWbvFQNU9PF+K9cPodyD094xpaimT56LsSmvkq8Q/7T1I3/Vvyt3J6fOU/4Xg9qjWcuX+hAbOp7J89f2jPG815HXMp3Yd9B8J6nlhsaD6UWFdD0JrU+E4gDfuY3sv6XW1/ZGYj+fc37XLi/P+zO85owNnXxIygn3yvj0Q/PrfoiTGUO41+tOfuusu5Zod8TflPIfeq0fxAe5Or9uw/+TCzsPNIzcGe34Qao/XNquK63PM+Bv8FcfzZdyhz1XLVHPnIs392cg/536bfXn5XgPhF+4FRyiHC74f0q8A8XfR+i/9KV5cNcmIPPgxx/HNfCvt0Rfmz57rDv1QfgPi/0fzr6f0dO+hzw95z7aLh9+w9ICY1g</data>
+  <data encoding="base64" compression="zlib">
+   eJyNVsFq1FAUHd7OXZOCnamfoIhLu3YtMnRRNyJ1YxlwL4K/0f5C/8GVupQJWY20FMQsrC0zzNClK3PIPeTk5s50Djxe8vLePfec3PeS5WgwWNXtpm630i9tHOD1Xd60eX29kDm8X9cDWKdx0F9mbavypgduJA+MFRbDQ9dzfpV3cy+MD+OcM5fcOFbWbVzPebbf52G8ctTmpxwam9B7XF9k7ZrjvLn3awDmVZh29VAReeJ9B4dqVD6NC12zrJ878vRzvSe+XqhrNerrK5xv/rn30ddXYTFV33XWvDfWz8L5xhiRX1hHjQrvl9bNwmqMONobDB4P+z5gTun2wFxijfOuxqf73TpG/89iR+3JsPWUe2BsdbUNdH/xGlpeW4vwJTX977zR9LVu34I65bU/C3SPKie1MP46TFJ7bkQ1qX4rd2m1crTX94/gOz2RHCZ2/Sm1dRXtIb8XEGtmtRlxIe6x0/oxNb6SD3iQ4tpdBrWp+pRv4nh+ZvH9i9Qdi/ahniWbvFQNU9PF+K9cPodyD094xpaimT56LsSmvkq8Q/7T1I3/Vvyt3J6fOU/4Xg9qjWcuX+hAbOp7J89f2jPG815HXMp3Yd9B8J6nlhsaD6UWFdD0JrU+E4gDfuY3sv6XW1/ZGYj+fc37XLi/P+zO85owNnXxIygn3yvj0Q/PrfoiTGUO41+tOfuusu5Zod8TflPIfeq0fxAe5Or9uw/+TCzsPOIZCN07uw03QO2fU8N1veV5DvwN5vqz6VLmqOeqPfKRY/nu5hz0v0u/vf6sBPeJ8AOnkkOE2w3vV4F/uOj7EP2Xriwf5sIcfB7k+OO4FvbtjvBjy3eHfa8+APd5of/T0f87ctLngL/n3EfD7dt/4n2M2w==
+  </data>
 </layer>
 <layer id="4" name="Above" width="30" height="26">
-  <data encoding="base64" compression="zlib">eJy1lmFqwzAMhcdOsHUQcH90u8AOuSNtByiB3CCFQUZD+7chY1dYTCz69vpsJ20mMG4ayZ8ky1aO7i4qjRvHV9DZJnTRxvQPw3wUtqazD6MFThn0OsGy9UzH2yCD+fzcCL+UjRfzy/y2Z5NOxMW2aIMxIg91SlqL/WIfMBbTxdgaemeyFXocv9pHzEnjtD8m9r/p2BpTaoh94LmLcLFeMb6SfN2LnJj+61qzOVa0P82I6zuRZ/7t4+zdX5uTO9ferhh9eh/Gh6gnPF84x5i8vhLPrIpzblUNYL6RzbHH1ldSBW4r/OYa60U951hVhqtq9xA503NYOS6fQ74vc7wYK8e1vbI7qc/kk3nXclFi94vK5RLc1H0WW2/JeFPcz8fluHVx2Wum+HALtw7/Y35Td+pcbp3JJfcjf5bxOyJ25ylujqWE+/RUibHun9J2+N2FvZfvyv+Ul7U+U9yTzJe3h+tZLfRuJRvx7seN41Yx/3F/bfY+4XvW92K6OKbWCfqvvjs5Pn62fs/z82rYv9Ul7xeC3DHb</data>
+  <data encoding="base64" compression="zlib">
+   eJy1lmFKw0AQhcUTaIVC+kO9gIf0SHqAEsgNIgiRhvZvQ8UrmCV59Pn6drdp48CyTTOz38zs7Gx2xU1UmmIYX6POOqHLNtDf9vPO2EJnM46WOOWo1xkW1oNOsGGG8vW5MX45myDwC37jGdKZuNSWbThG5rFOKWupX+oDxwJdjq2Rd5C10dP43T5yTprC+wPB/9DBGufUkPqgcxfhcr1yfKX4ujE5gf7LyrM1VrbfT4jrO5Fn/R3iPBR/bfbFsfY+loNPb/14N/XE54vnGFPXdxKY1fKYW1cDnG9ma+yx9Z1UI7c1fmuNHUw951hVhutqdxs501NYOa6eQ+2XOV6MleNir9CTDpl8Ku9SLkusv7hczsFN9bPYenPGm+J+3s/HrZend805PlzDrcf/Ob+pnjqVW2dyqfdROMv8HRHreY6bYznRexqS6rUp1u1D2o6/u/ju1V75n/K88mdK7yT48np3Oaulu9vJo3n3UwzjWoH/vL+Yg0/8XvWDQJdHrr9zDBD33anx6TPue52fFv3+LU55vzsAMt4=
+  </data>
 </layer>
 <layer id="5" name="Top" width="30" height="26">
-  <data encoding="base64" compression="zlib">eJxjYMAPbkkSUEAhuIvDfAUp4vTT2n0jHcjhiQdahr0uHnvvUMFeXOlusICbktQJX2z+pJff0ePpAJ3svUnHuH1A53QEs+8Dje1Fjyta2zcKRi7YJwnBAwmGYzsCX91NS4Cv7sYF7kvSvyylJrhPwO3o8uh8UJ0Fw/QGL4F2viLSXgC1vR62</data>
+  <data encoding="base64" compression="zlib">
+   eJxjYMAPbkkSUEAhuIvDfAUp4vTT2n0jHcjhiQdahr0uHnvvUMFeXOlusICbktQJX2z+pJff0ePpAJ3svUnHuH1A53QEs+8Dje1Fjyta2zcKRi7YJwnBAwmGYzsCX91NS4Cv7sYF7kvSvyylJrhPwO3o8uh8UJ0Fw/QGL4F2viLSXgC1vR62
+  </data>
 </layer>
- <layer id="6" name="Walkable" width="30" height="26">
+ <layer id="6" name="Walkable" width="30" height="26" visible="0">
  <data encoding="base64" compression="zlib">
   eJzFlV0KgDAMg3cK73+F3VB8Lf350m4YGCgjTVI7t5+1drI+ZPtkRTUieNwKnlb0XPkkfmyG7L3qB9HyPGU+6ffwalXZMq0oL82mzp3CpVA0My1lbqrMWUbrRclIaipZswx0rrv86Xfr9orU6cxiNefkLChzH3HVXnZhNYm/iR7xYfVugPT1D9zQns7+CV3l/JzS7f6XTutSbteDcgdE3IiveFDvB1JLPZ9Kv6v96bJ1aF2LF92MEOk=
  </data>
--- a/AndorsTrail/res/xml/swamp6.tmx
+++ b/AndorsTrail/res/xml/swamp6.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="25" height="25" tilewidth="32" tileheight="32" infinite="0" nextlayerid="21" nextobjectid="39">
+<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="25" height="25" tilewidth="32" tileheight="32" infinite="0" nextlayerid="18" nextobjectid="28">
 <properties>
  <property name="outdoors" value="1"/>
 </properties>
@@ -186,126 +186,142 @@
 <tileset firstgid="7577" name="map_guynmart" tilewidth="32" tileheight="32" tilecount="128" columns="16">
  <image source="../drawable/map_guynmart.png" width="512" height="256"/>
 </tileset>
- <layer id="9" name="Base" width="25" height="25">
+ <layer id="1" name="Base" width="25" height="25">
  <data encoding="base64" compression="zlib">
   eJzbyMnAsHEUj+JRPIpH8SgexaN4FA8pDABNFsYq
  </data>
 </layer>
- <layer id="1" name="Ground" width="25" height="25">
+ <layer id="2" name="Ground" width="25" height="25">
  <data encoding="base64" compression="zlib">
   eJxjYKAtuCZLW7NhmNbm08IOdPNH7Rg4O7CZP2rHwNmBy55ROwbODmz2DFU70O2hJaCHHaNg5AIAM7dQsA==
  </data>
 </layer>
- <layer id="2" name="Objects" width="25" height="25">
+ <layer id="3" name="Objects" width="25" height="25">
  <data encoding="base64" compression="zlib">
   eJyVVUkOwjAM9BmxKOVSBD+A56Pe4cATAPEACgj+QCNaybgzTjJSVUjtsT2OExGRUEk23iuRz4q/rd2uFqkU/z3kcVg+Fj/yW8y6ePOK858C541o+++W+wFyZxwDBm3Rt2nPf+jWjw7XkvSHaYRi5PiyHur1cxjb6RhDLdamdbRD2uv12Icd0IrVjuJcEj1P6aRt9bycgB4MLIbNJYWnExP1gvGzPtxADxoVk+1bzXUHOe4X43y9ujfOfJSC1Yp6kjvb3lrJ3mJ+njbWHvVE+1/7njZgDnL4z73fxtTC5itXG4RJ/R+n5F6IuJFc7Jmq+4L40e8GzIb9H7XWd8y6/j0aW3OmV84dXHI2pGwfYWyH7kPG2QL/kvxyfXPXX4lz3e4FZot4LBiX1dSrb+BA95EFy0nvlcj3BYWZ7oY=
  </data>
 </layer>
- <layer id="14" name="Objects4" width="25" height="25">
+ <layer id="4" name="Objects4" width="25" height="25">
  <data encoding="base64" compression="zlib">
   eJxjYGBgEBRioCkQQjL/mSBt7SIGHCPghuc45F+Q4XZqhK0wjeOHFHCNzPjDFabkqiMVXKeiuchxSigt0QK8pLGdt7CYv41EO7Hl8y385LlnFFAObkDjg9R4BIG3koh8LyOBXQ018xeXBG57iAHY0i8IvJGE+AUEQGUqDxl24As/mPmgsEYuF6QlIBgZaKOV6UJ0KuOx1WGEyjDkcKNG+YxsHjKbHPAKh3tgZuJKC8SagwxwmQULU5hf8PkJZgYx+QWXm5DTCsg8ALWxMbw=
  </data>
 </layer>
- <layer id="18" name="Objects4_b" width="25" height="25">
+ <layer id="5" name="Objects4_b" width="25" height="25">
  <data encoding="base64" compression="zlib">
   eJxjYGBgEBRioCkQQjL/mSBt7SIGHCPghuc45F+Q4XZqhK0wjeOHFHCNzPjDFabkqiMVXKeiuchxSigt0QK8pLGdt7CYv41EO7Hl8y385LlnFFAObkDjg9R4BIG3koh8LyOBXQ018xeXBG57iAHY0i8IvJGE+AUEQGUqDxl24As/mPmgsEYuF6QlIBgZaKOV6UJ0KuOx1WGEyjDkcKNG+YxsHjKbHPAKh3tgZuJKC8SagwxwmQULU5hf8PkJZgYx+QWXm5DTCsg8ALWxMbw=
  </data>
 </layer>
- <layer id="15" name="Objects5" width="25" height="25">
+ <layer id="6" name="Objects5" width="25" height="25">
  <data encoding="base64" compression="zlib">
   eJyVVVsOwjAMywF4qOMHJG4Ax0f7h48dAdAOsA0Ed4BKqxRldtr6Z1OXOKndrCIioZFifA4i3wN/2rjzXqRR/EMo47B8rH7kt1j/620azt8Fzhsxzt8t9wR6ZxwJSVv0bTXzX//rN4drR/xhGqEaJbnMQ71+D8s4XSPtxcaMjnZIe70efTgDrdjeUZ1HxvOcTjpWz0sH9GBgNWwvObycmsgLxs986IEHrarJzq3mGkCPl+2yX2/fR2c+asH2ijwpnW1vreZssTxPGxuPPNH5z9nTFsxBjj/iTvLYfJVqU9ML47XrfUEv9p+K+NF7C2bDImqN7hiNk6nfOHdwjV652Cks43K9aowgv9bPEpT4HPEm//UEexYYH+KxYFyTk2v7TRzoPrJgPemzEvl+j87dGQ==
  </data>
 </layer>
- <layer id="17" name="Objects5_b" width="25" height="25">
+ <layer id="7" name="Objects5_b" width="25" height="25">
  <data encoding="base64" compression="zlib">
   eJyVVUkOwjAM9ANYlHABiR/Q56Pe4dAnAOIBtCC49AU0UiNZ7kyWubRK7bEz46QiIs5LMb4Hkd+BP21csxfxiv/l8hyjX/Kx+oHfYj3lbzzn7xznDejn75Z7AL0zjoioLfq2mvkv0/o1wbUj/jCNUI2SXOahXr+5ZZyuEfdiY/qEdkh7vR58aIBWbO+ozj3jeU4nHavPSwf0YGA1bC85vBM1kReMn/nwBB60qiabW831Aj2et8t+U/s+gjpjxV2VqmP3kuupdq1mtlheShsbjzzR+Y/Z0xacgxx/wI3ksfNVqk1NL4zXrj8LerF3KuJH7y04GxZBa/SP0bN7MvV9Yq5r9MrFDm4Zh3pl6EF+rZ8lKPE54EPu9Qg7C4wP8VgwriGRa/uNHOh/ZMF60rMS+P5vB+Al
  </data>
 </layer>
- <layer id="3" name="Above" width="25" height="25">
+ <layer id="8" name="Above" width="25" height="25">
  <data encoding="base64" compression="zlib">
   eJy1VUkSgCAM4xv8/wV69qJnn6B/cTgwA5luAcxFxZjSppWUejw5pTfr15aDkLibwLPiWFwNJ+xL4o/ql/3vhBbDYb7FNS1XfG73X+8tfU9PWi/1v3Ify6u1Vx/sIfQgqhX1oeYwo8Hw25wYvzWO5XsBMw+jeYwi2nPaO3aNzZ35B1pxPM+jiOYxUkNPE/1mzoVoLjiLkr4Xl+mpGTC6Ue6sZrRPPT3Wz9Xn4krP2BkuOH7oF8S9IMYHSnHBGg==
  </data>
 </layer>
- <layer id="11" name="Top" width="25" height="25" visible="0">
+ <layer id="9" name="Top" width="25" height="25" visible="0">
  <data encoding="base64" compression="zlib">
   eJy1lVEOwyAMQ/nrOAHsBFuvv8u1+xtIi2ShJrgEIuWrqh92UhqCXSmHkMl+5o6Yovso/YlcbyQz3dTtMVvOTH3kYH3TXH3plR5axioPwljpQRgrPdS2PByF/S7PTucZNA9Vf//v3cvJ0Rhx0l7Xs2rv4jc6uhOShXW+beDOwjnOyho1pfeLu9C7uzi7q3+B14tknoxcpUY4uN9WFp7MIrl3WHe8YEa9vRudfyQy0hiMF3YOGkM42l2I+h5Gy7K+Ly+DKYbxA3m4XPw=
  </data>
 </layer>
- <layer id="16" name="Top0_b" width="25" height="25" visible="0">
+ <layer id="10" name="Top0_b" width="25" height="25" visible="0">
  <data encoding="base64" compression="zlib">
   eJy1lVEOwyAMQ/nrOAHsBFuvv8u1+xtIi2ShJrgEIuWrqh92UhqCXSmHkMl+5o6Yovso/YlcbyQz3dTtMVvOTH3kYH3TXH3plR5axioPwljpQRgrPdS2PByF/S7PTucZNA9Vf//v3cvJ0Rhx0l7Xs2rv4jc6uhOShXW+beDOwjnOyho1pfeLu9C7uzi7q3+B14tknoxcpUY4uN9WFp7MIrl3WHe8YEa9vRudfyQy0hiMF3YOGkM42l2I+h5Gy7K+Ly+DKYbxA3m4XPw=
  </data>
 </layer>
- <layer id="12" name="Top0" width="25" height="25">
+ <layer id="11" name="Top0" width="25" height="25">
  <data encoding="base64" compression="zlib">
   eJx7KcvA8HIUj+JRPIpHMRzDwEC7YxRTB9+RZGC4Kznw7hjseDTdDz0MAF9ke4w=
  </data>
 </layer>
- <layer id="4" name="Walkable" width="25" height="25">
+ <layer id="12" name="Walkable" width="25" height="25">
  <data encoding="base64" compression="zlib">
   eJytlMEVwCAIQ52i+6/QDXvqLZr8IO95UCEEiK7F7H3OS/lRDBL7nzUcVQytP8WgdwmflHOb081W7ZP+OLyUo+un64/i3WBN5tBiUH2QeacYaj/hmNbRGNVcUgvRuOO0+9eoxtN4Z+QNneJbTFpT0ytVxy5X+35UDmpkjqnvFHOis8k8b/0pjW+KRXpzI/cHKkmnIg==
  </data>
 </layer>
- <objectgroup id="19" name="Mapevents_dis" visible="0">
+ <objectgroup id="13" name="Mapevents_dis" visible="0">
  <properties>
   <property name="active" value="false"/>
  </properties>
-  <object id="35" name="dis1" type="mapchange" x="704" y="160" width="32" height="576">
+  <object id="1" name="dis1" type="mapchange" x="704" y="480" width="32" height="256">
   <properties>
    <property name="map" value="swamp6"/>
    <property name="place" value="dis1b"/>
   </properties>
  </object>
-  <object id="36" name="dis1b" type="mapchange" x="672" y="192" width="32" height="544"/>
-  <object id="37" name="dis2" type="mapchange" x="672" y="64" width="32" height="96">
+  <object id="2" name="dis1b" type="mapchange" x="672" y="480" width="32" height="256"/>
+  <object id="3" name="dis2" type="mapchange" x="672" y="64" width="32" height="96">
   <properties>
    <property name="map" value="swamp6"/>
    <property name="place" value="dis2b"/>
   </properties>
  </object>
-  <object id="38" name="dis2b" type="mapchange" x="640" y="64" width="32" height="96"/>
+  <object id="4" name="dis2b" type="mapchange" x="640" y="64" width="32" height="96"/>
+  <object id="24" name="dis3" type="mapchange" x="736" y="384" width="32" height="64">
+   <properties>
+    <property name="map" value="swamp6"/>
+    <property name="place" value="dis3b"/>
+   </properties>
+  </object>
+  <object id="25" name="dis3b" type="mapchange" x="704" y="384" width="32" height="64"/>
+  <object id="26" name="dis4" type="mapchange" x="736" y="224" width="32" height="64">
+   <properties>
+    <property name="map" value="swamp6"/>
+    <property name="place" value="dis4b"/>
+   </properties>
+  </object>
+  <object id="27" name="dis4b" type="mapchange" x="704" y="224" width="32" height="64"/>
 </objectgroup>
- <objectgroup id="5" name="Mapevents">
-  <object id="19" name="east1" type="mapchange" x="768" y="64" width="32" height="384">
+ <objectgroup id="14" name="Mapevents">
+  <object id="5" name="east1" type="mapchange" x="768" y="64" width="32" height="384">
   <properties>
    <property name="map" value="swamp3"/>
    <property name="place" value="west"/>
   </properties>
  </object>
-  <object id="20" name="east2" type="mapchange" x="768" y="544" width="32" height="224">
+  <object id="6" name="east2" type="mapchange" x="768" y="544" width="32" height="224">
   <properties>
    <property name="map" value="swamp4"/>
    <property name="place" value="west1"/>
   </properties>
  </object>
-  <object id="21" name="south" type="mapchange" x="32" y="768" width="736" height="32">
+  <object id="7" name="south" type="mapchange" x="32" y="768" width="736" height="32">
   <properties>
    <property name="map" value="swamp5"/>
    <property name="place" value="north"/>
   </properties>
  </object>
-  <object id="22" name="feygard_fogmonster_check" type="script" x="0" y="0" width="800" height="800">
+  <object id="8" name="feygard_fogmonster_check" type="script" x="32" y="0" width="800" height="800">
   <properties>
    <property name="when" value="step"/>
   </properties>
  </object>
-  <object id="34" name="feygard_fogmonster5_heart" type="script" x="256" y="352" width="32" height="32"/>
+  <object id="9" name="feygard_fogmonster5_heart" type="script" x="256" y="352" width="32" height="32"/>
 </objectgroup>
- <objectgroup id="7" name="Spawn" visible="0">
-  <object id="4" name="fieldcritter_2" type="spawn" x="64" y="96" width="192" height="224">
+ <objectgroup id="15" name="Spawn" visible="0">
+  <object id="10" name="fieldcritter_2" type="spawn" x="64" y="96" width="192" height="224">
   <properties>
    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="fieldcritter_2"/>
   </properties>
  </object>
-  <object id="6" name="feygard_fogmonster5" type="spawn" x="256" y="352" width="32" height="32">
+  <object id="11" name="feygard_fogmonster5" type="spawn" x="256" y="352" width="32" height="32">
   <properties>
    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="feygard_fogmonster5"/>
   </properties>
  </object>
 </objectgroup>
- <objectgroup id="8" name="Keys" visible="0"/>
- <objectgroup id="13" name="Replace" visible="0">
-  <object id="15" name="swamp5c" type="replace" x="0" y="576" width="512" height="224">
+ <objectgroup id="16" name="Keys" visible="0"/>
+ <objectgroup id="17" name="Replace" visible="0">
+  <object id="12" name="swamp5c" type="replace" x="0" y="576" width="512" height="224">
   <properties>
    <property name="Objects" value="Objects5"/>
    <property name="Top" value="Top0"/>
@@ -314,7 +330,7 @@
    <property name="requireValue" value="5"/>
   </properties>
  </object>
-  <object id="11" name="swamp5b" type="replace" x="0" y="480" width="576" height="96">
+  <object id="13" name="swamp5b" type="replace" x="0" y="480" width="576" height="96">
   <properties>
    <property name="Objects" value="Objects5"/>
    <property name="Top" value="Top0"/>
@@ -323,7 +339,7 @@
    <property name="requireValue" value="5"/>
   </properties>
  </object>
-  <object id="7" name="swamp5a" type="replace" x="0" y="0" width="800" height="480">
+  <object id="14" name="swamp5a" type="replace" x="0" y="0" width="800" height="480">
   <properties>
    <property name="Objects" value="Objects5"/>
    <property name="Top" value="Top0"/>
@@ -332,7 +348,7 @@
    <property name="requireValue" value="5"/>
   </properties>
  </object>
-  <object id="33" name="swamp5c_b" type="replace" x="0" y="576" width="512" height="224">
+  <object id="15" name="swamp5c_b" type="replace" x="0" y="576" width="512" height="224">
   <properties>
    <property name="Objects" value="Objects5_b"/>
    <property name="Top" value="Top0_b"/>
@@ -342,7 +358,7 @@
    <property name="requireValue" value="5"/>
   </properties>
  </object>
-  <object id="32" name="swamp5b_b" type="replace" x="0" y="480" width="576" height="96">
+  <object id="16" name="swamp5b_b" type="replace" x="0" y="480" width="576" height="96">
   <properties>
    <property name="Objects" value="Objects5_b"/>
    <property name="Top" value="Top0_b"/>
@@ -352,7 +368,7 @@
    <property name="requireValue" value="5"/>
   </properties>
  </object>
-  <object id="31" name="swamp5a_b" type="replace" x="0" y="0" width="800" height="480">
+  <object id="17" name="swamp5a_b" type="replace" x="0" y="0" width="800" height="480">
   <properties>
    <property name="Objects" value="Objects5_b"/>
    <property name="Top" value="Top0_b"/>
@@ -362,7 +378,7 @@
    <property name="requireValue" value="5"/>
   </properties>
  </object>
-  <object id="13" name="swamp4c" type="replace" x="512" y="576" width="32" height="224">
+  <object id="18" name="swamp4c" type="replace" x="512" y="576" width="32" height="224">
   <properties>
    <property name="Objects" value="Objects4"/>
    <property name="Top" value="Top0"/>
@@ -371,7 +387,7 @@
    <property name="requireValue" value="4"/>
   </properties>
  </object>
-  <object id="27" name="swamp4b" type="replace" x="544" y="576" width="32" height="224">
+  <object id="19" name="swamp4b" type="replace" x="544" y="576" width="32" height="224">
   <properties>
    <property name="Objects" value="Objects4"/>
    <property name="Top" value="Top0"/>
@@ -380,7 +396,7 @@
    <property name="requireValue" value="4"/>
   </properties>
  </object>
-  <object id="9" name="swamp4a" type="replace" x="576" y="480" width="224" height="320">
+  <object id="20" name="swamp4a" type="replace" x="576" y="480" width="224" height="320">
   <properties>
    <property name="Objects" value="Objects4"/>
    <property name="Top" value="Top0"/>
@@ -389,7 +405,7 @@
    <property name="requireValue" value="4"/>
   </properties>
  </object>
-  <object id="30" name="swamp4c_b" type="replace" x="512" y="576" width="32" height="224">
+  <object id="21" name="swamp4c_b" type="replace" x="512" y="576" width="32" height="224">
   <properties>
    <property name="Objects" value="Objects4_b"/>
    <property name="Top" value="Top0_b"/>
@@ -399,7 +415,7 @@
    <property name="requireValue" value="4"/>
   </properties>
  </object>
-  <object id="29" name="swamp4b_b" type="replace" x="544" y="576" width="32" height="224">
+  <object id="22" name="swamp4b_b" type="replace" x="544" y="576" width="32" height="224">
   <properties>
    <property name="Objects" value="Objects4_b"/>
    <property name="Top" value="Top0_b"/>
@@ -409,7 +425,7 @@
    <property name="requireValue" value="4"/>
   </properties>
  </object>
-  <object id="28" name="swamp4a_b" type="replace" x="576" y="480" width="224" height="320">
+  <object id="23" name="swamp4a_b" type="replace" x="576" y="480" width="224" height="320">
   <properties>
    <property name="Objects" value="Objects4_b"/>
    <property name="Top" value="Top0_b"/>
--- a/AndorsTrail/res/xml/way_to_sullengard_east5.tmx
+++ b/AndorsTrail/res/xml/way_to_sullengard_east5.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="16" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="16">
+<map version="1.8" tiledversion="1.8.4" orientation="orthogonal" renderorder="right-down" width="40" height="16" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="16">
 <properties>
  <property name="outdoors" value="1"/>
 </properties>
@@ -205,7 +205,7 @@
 </layer>
 <layer id="5" name="Walkable" width="40" height="16" visible="0">
  <data encoding="base64" compression="zlib">
-   eJzFlVEOgCAMQz0F978CN/TDkBCylnZTXEI0uNG3Ktjb9Un09ozs85FzMma9lW/cR3NVTdcHxDlfET/SjjjmdZReUT6qzfjHNBT+qAbNMW8UNrYW4o24dvkKA+tv7dH9FjKevaHBwvEbMTnfMfNcYXX2DWN2NZxgewnlO6zqvma1Tl3Fi6pmti82l2GO6tX3+3c454CS55yvytq7/8GJseO7AfjXqLA=
+   eJzFlV0OgCAMgz0F978CN/TBkBCydu0UXEI0uK3fJj+9XVust2dUvw+fkzbrrXzjPZp7q+n2AXHOT8SPtCOOOY9SK/JHsZX+MQ2FP4pBc6w3ChvLhXgjrsxfYWD1rTW6a6HSsy80mDn9RkzOOmY9V1idfcOYXQ3H2F5S2NQ14cRUtZzcOzSrdbG5CnMUr/7fv805BxQ/53xVcmf3wYmR8d3KTql3
  </data>
 </layer>
 <objectgroup id="6" name="Mapevents">
@@ -228,7 +228,7 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup id="7" name="Spawn">
+ <objectgroup id="7" name="Spawn" visible="0">
  <object id="4" name="poisonous_jitterfly_spawn1" type="spawn" x="64" y="64" width="192" height="96">
   <properties>
    <property name="quantity" value="2"/>
--- a/AndorsTrail/res/xml/way_to_wexlow2.tmx
+++ b/AndorsTrail/res/xml/way_to_wexlow2.tmx
@@ -1,291 +1,292 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.8" tiledversion="1.8.4" orientation="orthogonal" renderorder="right-down" width="15" height="31" tilewidth="32" tileheight="32" infinite="0" nextlayerid="11" nextobjectid="12">
+<!DOCTYPE map SYSTEM "https://mapeditor.org/dtd/1.0/map.dtd">
+<map version="1.0" orientation="orthogonal" width="15" height="31" 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_3" tilewidth="32" tileheight="32" tilecount="544" columns="32">
+ <tileset firstgid="7577" name="map_tree_3" tilewidth="32" tileheight="32">
  <image source="../drawable/map_tree_3.png" width="1024" height="544"/>
 </tileset>
- <tileset firstgid="8121" name="map_plant_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="8121" name="map_plant_3" tilewidth="32" tileheight="32">
  <image source="../drawable/map_plant_3.png" width="512" height="256"/>
 </tileset>
- <layer id="1" name="Base" width="15" height="31">
+ <layer name="Base" width="15" height="31">
  <data encoding="base64" compression="zlib">
   eJxjYMAO1Ljw89HlYBifmuEMhov/BsIfMDsHMgw3cg6c3ZQCerudEvvI1TuU42coAVA4j4Y1aQAAVFgG9w==
  </data>
 </layer>
- <layer id="2" name="Ground" width="15" height="31">
+ <layer name="Ground" width="15" height="31">
  <data encoding="base64" compression="zlib">
   eJy1kzEOgzAMRSO2snWJGDr3yFwBGKNMwBEKc6VW6lip7Qm6NVawsIyTEiSGP8Txk51vxxyUOudLXY/xM8gcvPJCqVMh54R4ZE2gfkyUTeU5m8JLLOql968v8XYjb4n+zZnzVaZU7VROSqmNLKrPZu9itYFtXW43CbhxZW1gLy53mAScZT5+9ZKhXj0yL87xGcZ2ZA+B/28tx2NnEPjfsDidT8n8xpyn9nmcbdlc0TOa89E+rxf6CcWRq7N5Z9d4Y6d3Y08pvvI93cp2iWxL/B4SWdzxUfB9jVfA3JzPd2GfQgyX5L8Ux7syMFP0kO4DnyfeS2xD/rllu1mze0N6oX8CWfC1Yix98w9D4A48
  </data>
 </layer>
- <layer id="3" name="Objects" width="15" height="31">
+ <layer name="Objects" width="15" height="31">
  <data encoding="base64" compression="zlib">
   eJxtVEtOHDEUNC0REpAiNYsOM0m3suU3HIO7sGHPJqdAOUtOwJwANKDJSLMYej4gsRmBIBGv8Ctc46SkJ7tt13O5nt297yFs7oTwzeKyDGHPvvctDixqi0OLnsVR1h/YWuAq4+z6HHKhjxZ5gIGPEePt2HL/ns9pPu0jF3L8quK6T41xm8Qf+HzO0e+Z62YOaCAfoIZaWtWN9ZeiAf1JlebZ5p7tW/7nL+ns5F9YO7OYVnEf9YrnffPB+R+buF9rMfcc5NPzWnyjdvKXtu7G4rwI4WcR+f1qVTNz8A681dj50DsvwwrgXS31QQuO3pcX56qHkzJ6n9851oB3R7k5Zu5Fm3nQtbxfLbZ2VrknfuaRtdc2/ujBfbvOoU5wh845KxLvqUo1PG7SXhtNrBFrq3s8Ou9K/EOOB/eDuC1jnbB2JZ+vwR3m2wFQx2mV8p0XaRzIvwHknXut+pm36zb3oUmadC/WmACX7zBfC/wQbRPRRi4xlPGR9/k2Wufh3EOvQV/OSz7G9V3pXtB8U6XavWsokx/wGXxwF2XyAVhmvIl4oO/hokq+3Xr7WTyhP1pX5Sp4V393QrjvhH+gvpN7KmcG785i4S0w9X8XdOh/ZCjvYurrOa/vq+//u3mmdc10FE30iXr03qFeytPaYH7hZ4SXPEvL++485QD6ZnDW9j+6cmhNgYV4O5Z3CB/+1CH8rdNa1g615x0F/xV+CNmh
  </data>
 </layer>
- <layer id="4" name="Above" width="15" height="31">
+ <layer name="Above" width="15" height="31">
  <data encoding="base64" compression="zlib">
   eJyllM9ugzAMxq1equ62CxIdoNyqHSiP28fY7jvyBuNUiW7qpI1uT1Fbq4UxdgD1J0Xk3xc7XxIAAKoAkGMh6Jve6gTXdZ9sS56wP8OyDXadYzC/OcAflvLWx7lIjW7H0DoZz8uZOD4Oc7Dy9yDdPvzruK3hvDvc6yUfjz8LDfsr41J7Xfg5EDJnXiObyJ0pg+3PHN8Pq3FsqYnFf0Ntk4xjV8GaPYR0ddJ7R2c4544QpHtP+vau6OPqM+I7ykjdVL4bXPehsM/8XrrImt849jMzJvmo9+jN09RGnx77XNmeedomsedLrHHrbS3xYSneW7ZoU4BTOu6P+U7+tEJj6T2OC+YyZ8zjK5/23sPb473oe6fPtHViku6E8z4cf/n/YfGCmtfI2cr/xxV55FGZ
  </data>
 </layer>
- <layer id="5" name="Top" width="15" height="31">
+ <layer name="Top" width="15" height="31">
  <data encoding="base64" compression="zlib">
   eJxjYIAAKQUGBmkgllFgoAqQpLI5lJhHjF6Q/0HqZBTIt4sabh0FEDAQYUittI8OnsvSxtxRMApwgcNiA+0C+oHLePxKbjiQog8ATwAH3Q==
  </data>
 </layer>
- <layer id="6" name="Walkable" width="15" height="31" visible="0">
+ <layer name="Walkable" width="15" height="31" visible="0">
  <data encoding="base64" compression="zlib">
   eJydU1sKACEI7BR7/yt0w/0KQuaZEGE6OvnY31r78TCZtqPPm+Fm/Ftn78iPxUtyM13hEZcEy/K6HI6H8kc2xFnxSOYi1VXvW2zKGdmRuF6qmjezp3I7Xuod+bH+Jn1VdW+xLK/6a7obzQ6q/W3FzTzje/u6eXWcEzyK9fpv1utmH92cpDkY9vZ3HJLan/sHynen6Q==
  </data>
 </layer>
- <objectgroup id="7" name="Mapevents" visible="0">
-  <object id="1" name="east" type="mapchange" x="448" y="448" width="32" height="32">
+ <objectgroup name="Mapevents">
+  <object name="east" type="mapchange" x="448" y="448" width="32" height="32">
   <properties>
    <property name="map" value="way_to_wexlow3"/>
    <property name="place" value="west"/>
   </properties>
  </object>
-  <object id="2" name="southwest" type="mapchange" x="0" y="640" width="32" height="320">
+  <object name="southwest" type="mapchange" x="0" y="672" width="32" height="288">
   <properties>
    <property name="map" value="wayto_feygard_duleian_1"/>
    <property name="place" value="east"/>
   </properties>
  </object>
-  <object id="3" name="west" type="mapchange" x="0" y="32" width="32" height="192">
+  <object name="west" type="mapchange" x="0" y="32" width="32" height="192">
   <properties>
    <property name="map" value="way_to_wexlow1"/>
    <property name="place" value="east"/>
   </properties>
  </object>
 </objectgroup>
- <objectgroup id="8" name="Spawn" visible="0">
-  <object id="4" name="grass_spider_spawn1" type="spawn" x="64" y="32" width="32" height="64">
+ <objectgroup name="Spawn" visible="0">
+  <object name="grass_spider_spawn1" type="spawn" x="64" y="32" width="32" height="64">
   <properties>
    <property name="spawngroup" value="grass_spider"/>
   </properties>
  </object>
-  <object id="5" name="grass_spider_spawn2" type="spawn" x="64" y="128" width="128" height="96">
+  <object name="grass_spider_spawn2" type="spawn" x="64" y="128" width="128" height="96">
   <properties>
    <property name="quantity" value="2"/>
    <property name="spawngroup" value="grass_spider"/>
   </properties>
  </object>
-  <object id="6" name="murkcrawler_spawn1" type="spawn" x="352" y="608" width="32" height="32">
+  <object name="murkcrawler_spawn1" type="spawn" x="352" y="608" width="32" height="32">
   <properties>
    <property name="spawngroup" value="murkcrawler"/>
   </properties>
  </object>
-  <object id="7" name="murkcrawler_spawn2" type="spawn" x="64" y="576" width="32" height="32">
+  <object name="murkcrawler_spawn2" type="spawn" x="64" y="576" width="32" height="32">
   <properties>
    <property name="spawngroup" value="murkcrawler"/>
   </properties>
  </object>
-  <object id="8" name="young_murkcrawler_spawn1" type="spawn" x="32" y="224" width="160" height="160">
+  <object name="young_murkcrawler_spawn1" type="spawn" x="32" y="224" width="160" height="160">
   <properties>
    <property name="quantity" value="2"/>
    <property name="spawngroup" value="young_murkcrawler"/>
   </properties>
  </object>
-  <object id="9" name="grass_spider_spawn3" type="spawn" x="32" y="416" width="384" height="128">
+  <object name="grass_spider_spawn3" type="spawn" x="32" y="416" width="384" height="128">
   <properties>
    <property name="quantity" value="3"/>
    <property name="spawngroup" value="grass_spider"/>
   </properties>
  </object>
-  <object id="10" name="murkcrawler_spawn3" type="spawn" x="192" y="64" width="192" height="224">
+  <object name="murkcrawler_spawn3" type="spawn" x="192" y="64" width="192" height="224">
   <properties>
    <property name="quantity" value="2"/>
    <property name="spawngroup" value="murkcrawler"/>
   </properties>
  </object>
-  <object id="11" name="murkcrawler_spawn4" type="spawn" x="64" y="672" width="288" height="192">
+  <object name="murkcrawler_spawn4" type="spawn" x="64" y="672" width="288" height="192">
   <properties>
    <property name="quantity" value="2"/>
    <property name="spawngroup" value="murkcrawler"/>
   </properties>
  </object>
 </objectgroup>
- <objectgroup id="9" name="Keys"/>
- <objectgroup id="10" name="Replace"/>
+ <objectgroup name="Keys"/>
+ <objectgroup name="Replace"/>
 </map>
--- a/AndorsTrail/res/xml/wayto_feygard_duleian_1.tmx
+++ b/AndorsTrail/res/xml/wayto_feygard_duleian_1.tmx
@@ -1,283 +1,284 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.8" tiledversion="1.8.4" orientation="orthogonal" renderorder="right-down" width="30" height="15" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="14">
+<!DOCTYPE map SYSTEM "https://mapeditor.org/dtd/1.0/map.dtd">
+<map version="1.0" orientation="orthogonal" width="30" 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_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6449" name="map_tree_1" tilewidth="32" tileheight="32">
  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="6577" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6577" name="map_tree_2" tilewidth="32" tileheight="32">
  <image source="../drawable/map_tree_2.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="6705" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6705" name="map_wall_1" tilewidth="32" tileheight="32">
  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="6833" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="6833" name="map_wall_2" tilewidth="32" tileheight="32">
  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
- <tileset firstgid="6953" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="6953" name="map_wall_3" tilewidth="32" tileheight="32">
  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
- <tileset firstgid="7073" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="7073" name="map_wall_4" tilewidth="32" tileheight="32">
  <image source="../drawable/map_wall_4.png" width="480" height="256"/>
 </tileset>
- <tileset firstgid="7193" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7193" name="map_window_1" tilewidth="32" tileheight="32">
  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="7321" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7321" name="map_window_2" tilewidth="32" tileheight="32">
  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="7449" name="map_tree_3" tilewidth="32" tileheight="32" tilecount="544" columns="32">
+ <tileset firstgid="7449" name="map_tree_3" tilewidth="32" tileheight="32">
  <image source="../drawable/map_tree_3.png" width="1024" height="544"/>
 </tileset>
- <layer id="1" name="Base" width="30" height="15">
+ <layer name="Base" width="30" height="15">
  <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AUjAJMsJGTNPFRQD0w1MN4qLkfAL/vAuk=
+   eJxjYBgFo2AUjAJMsJGTNPFRQD1AahiLMdHGHeSCoZZGAN3tAwE=
  </data>
 </layer>
- <layer id="2" name="Ground" width="30" height="15">
+ <layer name="Ground" width="30" height="15">
  <data encoding="base64" compression="zlib">
   eJzbyMnAsBGKNyPhjXTEm+lk904m/PbT088jIbwHs5/paf9Qtfe4GELfNCaEOS/FaB/WID2g/LoCiFfiyLeU+nsz1F/IfgPh00D+chrYC7NvBRTD2Mh6QPbuBuITBMKYFHth/gHZBQrTXVA7ViLZvQrIPkuif/HZ/U0M4R+Yf+8hsZH9S6xdMIDNbnQ3rUAL52lY2Mh8AKwbRHg=
  </data>
 </layer>
- <layer id="3" name="Objects" width="30" height="15">
+ <layer name="Objects" width="30" height="15">
  <data encoding="base64" compression="zlib">
-   eJx9Vb1KA0EQPq6zELwFL6SI+iIptNGEgP9RGyGaBAV9AAPa2NqKr5BW9AVEMGltFBURLc6Y9EE7Z9z92Lm9jQPD7c7uzjfz7cxeqxAEwzgIXkil9GneorWjgv5C5mm8YOZXkf6WaF4mXSRdMmudSOs16ftUEGzng+CQ9Inm56He01S0x+A+RBajS7a60mPpE9ireT0/MD5ZZsk+J+KU66W8tdWMX87528mbc/6Kra9p2juj0j7LnriQP+PIOID/Gmbj7Xj4Zuz7ST1PiI8VZX1DdlT6DqRPKSWHI8QF3A+RV9fYGk6ukIrxVaX1DdJulF5HPMAqiphuaO+6ytYYjznnnsmbBTEuiziA3RS2u8hi4duP/Hygxk4nsnl1nTtYy1GspFXSXYHn+sQ8EbFjXdaFr6+Ai3tlbuqE1yBt5vQ694177xJzEGsf48qpKXCg0vXFvZXEtsZYeuIOudeKxgfutqbSHH+S/SK0cUnu5X25dc3CNSCxWcBdYmpA6sDj45lsP3G69pEbuHb7WfKNcx3DA2PwO/Rozlc8PYSzo96ZTcp7S/nzTuJ0X/3VYGjX8QYyp8fk76Rg3wmWM1Ovvv7eI3/7I3C5ryXXvvsYRFmbzBcCbJdz5uq/2gauzAfjN/q2SW/FWbbhLUB9ARv/H8wvx/zYwB3GltvEk2dbxCT/Ob/Jva99
+   eJx9VT1LA0EQPa6zELwFL6SI+kdSaKMJAb+jNkI0CQr6AwxoY2sr/oW0fvwBUcy1NoqKBC3OmPQhds64+9i5zZmBYW+/5s17O7vXyHleP/S8N3K2+0C3Xeo3aO4op1vYPH0vmP61WVugfpF8kXzJzLUC7TfkH1Oet531vEPyF+qf+3pNXdEag/sUWIyIxqpKf8uYwF7N6v6Bick2S+NzIk85X8jasYqJy5wHhnfoW87foY01TWtnVDJmMSUv8GccmQfw3/3hfMEbBuzHSd2PSY8VZWPDdlTyDGRMaQVHI+QF3E/BKzJjNYcrrGRilWl+gzwKkvPIB1h5kdMtrV1XyRpjY82Zc8fwZkOOyyIPYNfF2ENgsdB2g3Q9UGOnE8O8IucM1jKUK3mZfFfguTHRj0XumJd14XKWuDhX1qZKeDXyekbP871xz11i9kIdY1w5NQUNVLK++G7xvq7ItyPOkO9a3sTA2VZUUuMvGr/wbV5Se3lewL0S8bkGJDYbtItNDUjvpWj2SmM/YbL2wQ1aD0bojX0towNj8Dv0bPaXUu4Q9v73zmwS7y2V5C35yXv1V4O+nccbyJoeU7yTnH0n2M5Mvabd7z2Kt+/g4g3jey21dvNi6wXDY5IvDNiu5qzVqNoGruSD7za1TfI7sbct3gLUF7Dx/0H/ciwdG7j90Gobp/BsipzkP+cXcq6wbA==
  </data>
 </layer>
- <layer id="4" name="Above" width="30" height="15">
+ <layer name="Above" width="30" height="15">
  <data encoding="base64" compression="zlib">
   eJxjYMAOKmVR+fpAvgFUTB1IayDJx0gyMMRKQtiKQHElNL0weUtJHJbhANjMQgfI7tIE0lqyEHuQ9SK7DxufGAAzGxnAwiFHEreZMD/D5An5SZQJt5wNATfD3IPsFlL9CQLY3IjLbphd1AhjQoAYO2B85HSBD2CLV3zyyHbqCOF3C7UAtjCGuQtb2FMbTMWSJtHLAGIBIX240tllMcLlDCVgOtCPsUDz4tDMPCwGoWkZxtOxhC/MXmS70cOOUHlACIDC9LIYqhjMXlj6gtkdCWRHyRIfDp+EcMtdEkP1M4h9CYt/0QEt4wAAOJEzWQ==
  </data>
 </layer>
- <layer id="5" name="Walkable" width="30" height="15" visible="0">
+ <layer name="Walkable" width="30" height="15" visible="0">
  <data encoding="base64" compression="zlib">
   eJy1VNsJACEMcwr3X8EN70uQ0jxavYBwStuk2suaI8WaerFYVcvFGR/z0XfGu/cVTqYV6XL1umB9sZpIWwcqT81HhSfr1eFkNW7B5j3qdPlVnNPX7bvGWkiD6wOvEf/bP2ZLvWXM7fhJxoc0vPCMjFedVTy9M9/Iiyv3UfFvN26vDzcOf30=
  </data>
 </layer>
- <objectgroup id="6" name="Mapevents">
-  <object id="1" name="south" type="mapchange" x="288" y="448" width="256" height="32">
+ <objectgroup name="Mapevents">
+  <object name="south" type="mapchange" x="288" y="448" width="256" height="32">
   <properties>
    <property name="map" value="guynmart_wood_19"/>
    <property name="place" value="north"/>
   </properties>
  </object>
-  <object id="2" name="north" type="mapchange" x="32" y="0" width="160" height="32">
+  <object name="north" type="mapchange" x="32" y="0" width="160" height="32">
   <properties>
    <property name="map" value="wayto_feygard_duleian_2"/>
    <property name="place" value="south"/>
   </properties>
  </object>
-  <object id="3" name="way_to_wexlow" type="mapchange" x="480" y="0" width="64" height="32">
+  <object name="way_to_wexlow" type="mapchange" x="480" y="0" width="64" height="32">
   <properties>
    <property name="map" value="way_to_wexlow1"/>
    <property name="place" value="southwest"/>
   </properties>
  </object>
-  <object id="4" name="east" type="mapchange" x="928" y="160" width="32" height="288">
+  <object name="east" type="mapchange" x="928" y="160" width="32" height="288">
   <properties>
    <property name="map" value="way_to_wexlow2"/>
    <property name="place" value="southwest"/>
   </properties>
  </object>
-  <object id="5" name="northeast" type="mapchange" x="704" y="0" width="96" height="32">
+  <object name="northeast" type="mapchange" x="704" y="0" width="96" height="32">
   <properties>
    <property name="map" value="way_to_wexlow1"/>
    <property name="place" value="southeast"/>
   </properties>
  </object>
-  <object id="6" name="gold100" type="container" x="896" y="288" width="32" height="32"/>
+  <object name="gold100" type="container" x="896" y="288" width="32" height="32"/>
 </objectgroup>
- <objectgroup id="7" name="Spawn">
-  <object id="7" name="road_rondel_spawn" type="spawn" x="544" y="96" width="32" height="32">
+ <objectgroup name="Spawn">
+  <object name="road_rondel_spawn" type="spawn" x="544" y="96" width="32" height="32">
   <properties>
    <property name="active" value="false"/>
    <property name="spawngroup" value="road_rondel"/>
   </properties>
  </object>
-  <object id="8" name="road_rondel_blocker_spawn" type="spawn" x="512" y="32" width="32" height="32">
+  <object name="road_rondel_blocker_spawn" type="spawn" x="512" y="32" width="32" height="32">
   <properties>
    <property name="spawngroup" value="road_rondel_blocker"/>
   </properties>
  </object>
-  <object id="9" name="duleian_hornet_spawn1" type="spawn" x="0" y="64" width="64" height="32">
+  <object name="duleian_hornet_spawn1" type="spawn" x="0" y="64" width="64" height="32">
   <properties>
    <property name="spawngroup" value="duleian_hornet"/>
   </properties>
  </object>
-  <object id="10" name="duleian_hornet_spawn3" type="spawn" x="64" y="160" width="96" height="256">
+  <object name="duleian_hornet_spawn3" type="spawn" x="64" y="160" width="96" height="256">
   <properties>
    <property name="quantity" value="3"/>
    <property name="spawngroup" value="duleian_hornet"/>
   </properties>
  </object>
-  <object id="11" name="duleian_hornet_spawn4" type="spawn" x="384" y="128" width="352" height="160">
+  <object name="duleian_hornet_spawn4" type="spawn" x="384" y="128" width="352" height="160">
   <properties>
    <property name="quantity" value="4"/>
    <property name="spawngroup" value="duleian_hornet"/>
   </properties>
  </object>
-  <object id="12" name="murkcrawler_spawn" type="spawn" x="864" y="224" width="32" height="32">
+  <object name="murkcrawler_spawn" type="spawn" x="864" y="224" width="32" height="32">
   <properties>
    <property name="spawngroup" value="murkcrawler"/>
   </properties>
  </object>
 </objectgroup>
- <objectgroup id="8" name="Keys" visible="0">
-  <object id="13" name="sign_feygard_wexlow" type="key" x="320" y="96" width="32" height="32">
+ <objectgroup name="Keys" visible="0">
+  <object name="sign_feygard_wexlow" type="key" x="320" y="96" width="32" height="32">
   <properties>
    <property name="phrase" value="sign_feygard_wexlow"/>
    <property name="requireId" value="andor"/>
@@ -287,5 +288,5 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup id="9" name="Replace" visible="0"/>
+ <objectgroup name="Replace" visible="0"/>
 </map>
--- a/AndorsTrail/res/xml/wayto_feygard_duleian_2.tmx
+++ b/AndorsTrail/res/xml/wayto_feygard_duleian_2.tmx
@@ -1,260 +1,261 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="15" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="8">
+<!DOCTYPE map SYSTEM "https://mapeditor.org/dtd/1.0/map.dtd">
+<map version="1.0" orientation="orthogonal" width="30" 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_cupboard_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1329" name="map_cupboard_1" tilewidth="32" tileheight="32">
  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="1457" name="map_curtain_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1457" name="map_curtain_1" tilewidth="32" tileheight="32">
  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="1585" name="map_entrance_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1585" name="map_entrance_1" tilewidth="32" tileheight="32">
  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="1713" name="map_entrance_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1713" name="map_entrance_2" tilewidth="32" tileheight="32">
  <image source="../drawable/map_entrance_2.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="1841" name="map_fence_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1841" name="map_fence_1" tilewidth="32" tileheight="32">
  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="1969" name="map_fence_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1969" name="map_fence_2" tilewidth="32" tileheight="32">
  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="2097" name="map_fence_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2097" name="map_fence_3" tilewidth="32" tileheight="32">
  <image source="../drawable/map_fence_3.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="2225" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2225" name="map_fence_4" tilewidth="32" tileheight="32">
  <image source="../drawable/map_fence_4.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="2353" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2353" name="map_ground_1" tilewidth="32" tileheight="32">
  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="2481" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2481" name="map_ground_2" tilewidth="32" tileheight="32">
  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="2609" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2609" name="map_ground_3" tilewidth="32" tileheight="32">
  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="2737" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2737" name="map_ground_4" tilewidth="32" tileheight="32">
  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="2865" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2865" name="map_ground_5" tilewidth="32" tileheight="32">
  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="2993" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2993" name="map_ground_6" tilewidth="32" tileheight="32">
  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="3121" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3121" name="map_ground_7" tilewidth="32" tileheight="32">
  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="3249" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3249" name="map_ground_8" tilewidth="32" tileheight="32">
  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="3377" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3377" name="map_house_1" tilewidth="32" tileheight="32">
  <image source="../drawable/map_house_1.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="3505" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3505" name="map_house_2" tilewidth="32" tileheight="32">
  <image source="../drawable/map_house_2.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="3633" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3633" name="map_indoor_1" tilewidth="32" tileheight="32">
  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="3761" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3761" name="map_indoor_2" tilewidth="32" tileheight="32">
  <image source="../drawable/map_indoor_2.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="3889" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3889" name="map_kitchen_1" tilewidth="32" tileheight="32">
  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="4017" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4017" name="map_outdoor_1" tilewidth="32" tileheight="32">
  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="4145" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4145" name="map_pillar_1" tilewidth="32" tileheight="32">
  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="4273" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4273" name="map_pillar_2" tilewidth="32" tileheight="32">
  <image source="../drawable/map_pillar_2.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="4401" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4401" name="map_plant_1" tilewidth="32" tileheight="32">
  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="4529" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4529" name="map_plant_2" tilewidth="32" tileheight="32">
  <image source="../drawable/map_plant_2.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="4657" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4657" name="map_rock_1" tilewidth="32" tileheight="32">
  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="4785" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4785" name="map_rock_2" tilewidth="32" tileheight="32">
  <image source="../drawable/map_rock_2.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="4913" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4913" name="map_roof_1" tilewidth="32" tileheight="32">
  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="5041" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5041" name="map_roof_2" tilewidth="32" tileheight="32">
  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="5169" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5169" name="map_roof_3" tilewidth="32" tileheight="32">
  <image source="../drawable/map_roof_3.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="5297" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5297" name="map_shop_1" tilewidth="32" tileheight="32">
  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="5425" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5425" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="5553" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5553" name="map_table_1" tilewidth="32" tileheight="32">
  <image source="../drawable/map_table_1.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="5681" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5681" name="map_trail_1" tilewidth="32" tileheight="32">
  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="5809" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5809" name="map_transition_1" tilewidth="32" tileheight="32">
  <image source="../drawable/map_transition_1.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="5937" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5937" name="map_transition_2" tilewidth="32" tileheight="32">
  <image source="../drawable/map_transition_2.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="6065" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6065" name="map_transition_3" tilewidth="32" tileheight="32">
  <image source="../drawable/map_transition_3.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="6193" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6193" name="map_transition_4" tilewidth="32" tileheight="32">
  <image source="../drawable/map_transition_4.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="6321" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6321" name="map_tree_2" tilewidth="32" tileheight="32">
  <image source="../drawable/map_tree_2.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="6449" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6449" name="map_wall_1" tilewidth="32" tileheight="32">
  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="6577" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="6577" name="map_wall_2" tilewidth="32" tileheight="32">
  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
 </tileset>
- <tileset firstgid="6697" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="6697" name="map_wall_3" tilewidth="32" tileheight="32">
  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
 </tileset>
- <tileset firstgid="6817" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="6817" name="map_wall_4" tilewidth="32" tileheight="32">
  <image source="../drawable/map_wall_4.png" width="480" height="256"/>
 </tileset>
- <tileset firstgid="6937" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6937" name="map_window_1" tilewidth="32" tileheight="32">
  <image source="../drawable/map_window_1.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="7065" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7065" name="map_window_2" tilewidth="32" tileheight="32">
  <image source="../drawable/map_window_2.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="7193" name="map_tree_3" tilewidth="32" tileheight="32" tilecount="544" columns="32">
+ <tileset firstgid="7193" name="map_tree_3" tilewidth="32" tileheight="32">
  <image source="../drawable/map_tree_3.png" width="1024" height="544"/>
 </tileset>
- <tileset firstgid="7737" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7737" name="map_tree_1" tilewidth="32" tileheight="32">
  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="7865" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7865" name="map_crate_1" tilewidth="32" tileheight="32">
  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
 </tileset>
- <tileset firstgid="7993" name="map_transition_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7993" name="map_transition_5" tilewidth="32" tileheight="32">
  <image source="../drawable/map_transition_5.png" width="512" height="256"/>
 </tileset>
- <layer id="1" name="Base" width="30" height="15">
+ <layer name="Base" width="30" height="15">
  <data encoding="base64" compression="zlib">
   eJxjYBgFo2AUjIJRMFSAIScEDwcwWPwBAL7lAK8=
  </data>
 </layer>
- <layer id="2" name="Ground" width="30" height="15">
+ <layer name="Ground" width="30" height="15">
  <data encoding="base64" compression="zlib">
   eJwz5GRgMBzFdMcJwoQxLewtECaMaWGvMRF4KNtLrHnU9icl/qBWWJASttSOB2LiF5/5tEwHxKQFcuwuE2NgqBQbmDRD7fSaSYE/qBkvAMmibAk=
  </data>
 </layer>
- <layer id="3" name="Objects" width="30" height="15">
+ <layer name="Objects" width="30" height="15">
  <data encoding="base64" compression="zlib">
-   eJyVVT1LnEEQXi5gTLkGXlK8nD/CKjYm8eNOMWh18SNNUlz01Uouh18n/gFBuB+SSlBbDUQ7RcGPShNFQQvLNOIz7kx2dnOKDgwzu7M7zzMz7+1V88aUodXIfodWHtl/bjxey533qTEfUh/rgP8u/T+XyABig6nfl/s71pgz687sWR+fQWxW5dc5N6DrEV+yL1uNaYa+xb32NOSwitxrjHNuPa8j+Me83mX7h21F8XyOHOZ9vl/QLetyrnDebYV/wv4B7KH1fSTe1I8a/IUn4jeh9t9RDZuwP214TuoswV5AL3m9pM5RbBMcFl+7fpOQ/6bVn5H9RO2RnEd411gXo96PqR7TfMcSr+PQZWDtYv8273yRvbzjRXt0juQKufqhBc55ah3OMK/32fZGHCrM/2uLsyPIN91AR5MwPgMtJyFnzV36d88XdlBxKWCWRTVPOpc9kGsicZiEN2Id5kQS9vYLc88Udo/qP/WkDC2h1qmWsCbKKfdJhvjej4gTYX6KZqprzFTt36zr/2TOmLr18z3l+VRVP0kkr/AoNcCJ56Lvv8iFtX/O+VhN9Tlj7H+1P5BPY1Lfb5hPPeIuvItY12z4/lG93fB7ot/tR+u/wQHFRythym83Y0tvZEFxpO9V16zfcRLpeS/w+xQHOReL/ial/3/ZxvO655V4jE7c60p9Dnlz5+DPp+H/RKP/Hi3xWyU1t73yvS4mYa47Y5+u/Q==
+   eJyVVU1Lm0EQfolQ60XYCEsPL/FHeLKXVm1NFEVP0aa9tEiMsaeSBr8i/gFB8If0VGh7rYJ6Uyw07alpDQp68OhF+ow7053dqujAMLM7s888M/tmU88lSRlaj+x7aO2W/fvG47WcGUiTZDD1sSfwn6b/Y4lMIDaZ+n05v2+S5Mi4nEPj44uILSl8jfkV+iXiS7azN0keQvtx7nEacvgE7M9cp208rx/wf/L6gO0ftjXF8z7SzHm8HeiucZgfGXdP1f/F/nfYpvFzJN40jwb81TvWf4Def0c9bMFumzBP+izCHkNPeL2u8ii2BQ5rPW7eJOQ/6vU5sm/VHkk7qneGdSGafUXNmO63Yr3OQTdQ6wD7lznnixzmHC/aozySU2CNQfOM2TKuzgtef2M7EnGoMf83WWdLwFu4Rl/aML4ILduQs+Yu87viCzupuORxlwV1n5RXvQFr3rqaVK9kXM15G872NXOvqtrDav40kzK0iF7fZcOeCJPO24zLneZzHyJOVHOKYzPdIXepLb3PGjf/t8DcNP5+W3w/dTVPEsGVPoqKu/CK70Wf78iEvb/K+FhDzbnKtf/1fgOeiMz9nPlsRtyFdwHrhgnfP+r3Ofzh6Hc7bvw3OKH4aKWa8tutsqU3Mq840veqe9bvOInMfAT1RxUHyYtFf5My/wu28X1d8bK+xhDOPUs9hry5y/BX0vB/4rr/Hi3xWyU993X5WRdsiPUX/Lyvnw==
  </data>
 </layer>
- <layer id="4" name="Above" width="30" height="15">
+ <layer name="Above" width="30" height="15">
  <data encoding="base64" compression="zlib">
   eJxjYIAARRkGBiUZBjiQB7IVkPjoQB8oZ4Akj64fHUQC5aKwyKfKYfJTkMRKgGxJoD4pGYg4unpSASF3wgCHPAODJRHqCAFYOMLcHQtkxxFpbrAY5faTA5wpsBdfHC0QhuB+YQQbhhuEKbMXG7gCdUc/1E5kNgxHAeM5iAJ71YFxqUGFdEIqcKMwH5ALqJEHyQWxdAxnWL6F+VcVyFajk/0pcph8kBs0gfZryWCKowNy0iTMTmWgPhUZVDNAdkQD2TEyqOUnrKxGpskF6OU+MQBWL8D0o8cRrjoHWQ5GAwBGVSnD
  </data>
 </layer>
- <layer id="5" name="Walkable" width="30" height="15">
+ <layer name="Walkable" width="30" height="15">
  <data encoding="base64" compression="zlib">
   eJwzFGNgMBzEGARgNIyNSx0yoIa96OYg83HZhw0QMpcYdxAL0N2JjU8Le7G5gVS/UmIvNv2kxCsp/iFVnpqAUDqkh/0jyV56201MvkBPx7S2G1fewaUfl1vJsZMaZTcx9gIAnrUx7Q==
  </data>
 </layer>
- <objectgroup id="6" name="Mapevents">
-  <object id="1" name="south" type="mapchange" x="672" y="448" width="160" height="32">
+ <objectgroup name="Mapevents">
+  <object name="south" type="mapchange" x="672" y="448" width="160" height="32">
   <properties>
    <property name="map" value="wayto_feygard_duleian_1"/>
    <property name="place" value="north"/>
   </properties>
  </object>
 </objectgroup>
- <objectgroup id="7" name="Spawn">
-  <object id="2" name="rosmara_spawn" type="spawn" x="288" y="192" width="32" height="32">
+ <objectgroup name="Spawn">
+  <object name="rosmara_spawn" type="spawn" x="288" y="192" width="32" height="32">
   <properties>
    <property name="spawngroup" value="rosmara"/>
   </properties>
  </object>
-  <object id="3" name="cat_spawn" type="spawn" x="256" y="192" width="32" height="32">
+  <object name="cat_spawn" type="spawn" x="256" y="192" width="32" height="32">
   <properties>
    <property name="spawngroup" value="rosmara_cat"/>
   </properties>
  </object>
-  <object id="4" name="rat_spawn" type="spawn" x="320" y="32" width="64" height="64">
+  <object name="rat_spawn" type="spawn" x="320" y="32" width="64" height="64">
   <properties>
    <property name="spawngroup" value="crossroads_rat"/>
   </properties>
  </object>
-  <object id="5" name="duleian_hornet_spawn1" type="spawn" x="480" y="384" width="160" height="64">
+  <object name="duleian_hornet_spawn1" type="spawn" x="480" y="384" width="160" height="64">
   <properties>
    <property name="spawngroup" value="duleian_hornet"/>
   </properties>
  </object>
-  <object id="6" name="duleian_hornet_spawn2" type="spawn" x="480" y="64" width="128" height="160">
+  <object name="duleian_hornet_spawn2" type="spawn" x="480" y="64" width="128" height="160">
   <properties>
    <property name="quantity" value="2"/>
    <property name="spawngroup" value="duleian_hornet"/>
   </properties>
  </object>
-  <object id="7" name="duleian_hornet_spawn3" type="spawn" x="672" y="64" width="224" height="224">
+  <object name="duleian_hornet_spawn3" type="spawn" x="672" y="64" width="224" height="224">
   <properties>
    <property name="quantity" value="3"/>
    <property name="spawngroup" value="duleian_hornet"/>
   </properties>
  </object>
 </objectgroup>
- <objectgroup id="8" name="Keys">
-  <object id="26" name="road_to_feygard_closed" type="key" x="0" y="160" width="32" height="192">
+ <objectgroup name="Keys">
+  <object name="road_to_feygard_closed" type="key" x="0" y="160" width="32" height="192">
   <properties>
    <property name="phrase" value="rosmara_road_closed"/>
    <property name="requireId" value="feygard_nondisplayed"/>