diff --git a/AndorsTrail/AndroidManifest.xml b/AndorsTrail/AndroidManifest.xml
index 3ed0403cc..3c9cb754e 100644
--- a/AndorsTrail/AndroidManifest.xml
+++ b/AndorsTrail/AndroidManifest.xml
@@ -4,7 +4,7 @@
 	xmlns:android="http://schemas.android.com/apk/res/android" 
 	package="com.gpl.rpg.AndorsTrail"
 	android:versionCode="55"
-	android:versionName="0.7.12beta"
+	android:versionName="0.7.12"
 	android:installLocation="auto"
 	>
 	<uses-sdk 
diff --git a/AndorsTrail/res/raw/conversationlist_arulir_mountain.json b/AndorsTrail/res/raw/conversationlist_arulir_mountain.json
index ddc89e27b..ea6d24241 100644
--- a/AndorsTrail/res/raw/conversationlist_arulir_mountain.json
+++ b/AndorsTrail/res/raw/conversationlist_arulir_mountain.json
@@ -2066,5 +2066,39 @@
     {
         "id":"arulircave_trap10_30",
         "message":"Maybe the current will wash you ashore somewhere?"
+    },
+    {
+        "id":"arulircave_trap101",
+        "message":"The ground over there is very slippery. You don't want to fall into the water again."
+    },
+    {
+        "id":"arulircave_trap101_chk",
+        "replies":[
+            {
+                "nextPhraseID":"arulircave_trap101_chk_2",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"arulircave_trap",
+                        "value":10
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        "id":"arulircave_trap101_chk_2",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"arulircave_trap",
+                "value":101
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"arulircave_trap",
+                "value":10
+            }
+        ]
     }
 ]
\ No newline at end of file
diff --git a/AndorsTrail/res/raw/conversationlist_brimhaven.json b/AndorsTrail/res/raw/conversationlist_brimhaven.json
index 00743f68b..82d9bc274 100644
--- a/AndorsTrail/res/raw/conversationlist_brimhaven.json
+++ b/AndorsTrail/res/raw/conversationlist_brimhaven.json
@@ -1626,7 +1626,24 @@
     },
     {
         "id":"brv_tavern1_guest2",
-        "message":"I hate myself, because I'm drinking..."
+        "message":"I'm drinking because my wife left me and took my beagle with her.  Now how am I supposed to hunt?",
+        "replies":[
+            {
+                "text":"I'm so sorry to hear about your problems.  I love dogs too.",
+                "nextPhraseID":"X"
+            },
+            {
+                "text":"Hey, speaking of killing, I'm wondering if you know anything about Lawellyn's death?",
+                "nextPhraseID":"brv_tavern1_guest2_asd_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":130
+                    }
+                ]
+            }
+        ]
     },
     {
         "id":"brv_tavern1_landlord",
@@ -2678,7 +2695,21 @@
     },
     {
         "id":"brimhaven_church_guard",
-        "message":"Stop! You are not allowed to go any further."
+        "message":"Stop! You are not allowed to go any further.",
+        "replies":[
+            {
+                "text":"I'm on a mission.",
+                "nextPhraseID":"brimhaven_church_guard_1"
+            },
+            {
+                "text":"OK, I'll leave.",
+                "nextPhraseID":"X"
+            },
+            {
+                "text":"OK. I'll leave [lie].",
+                "nextPhraseID":"X"
+            }
+        ]
     },
     {
         "id":"arlish_0",
@@ -2719,6 +2750,87 @@
                         "value":42
                     }
                 ]
+            },
+            {
+                "text":"What can you tell me about Lawellyn's dagger?",
+                "nextPhraseID":"arlish_asd_0",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":110
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":115,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":120,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":200,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":230,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"I want to talk about the investigation.",
+                "nextPhraseID":"arlish_asd_100",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":130,
+                        "negate":false
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":200,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":230,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"I need to find a large empty bottle. Do you have one?",
+                "nextPhraseID":"arlish_bottle_1",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"cat_and_mouse",
+                        "value":20
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"cat_and_mouse",
+                        "value":30
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"cat_and_mouse",
+                        "value":40,
+                        "negate":true
+                    }
+                ]
             }
         ]
     },
@@ -2848,7 +2960,32 @@
     },
     {
         "id":"blackjack_gambler2",
-        "message":"I already made a fortune. Want to join us? Then take a seat in the empty chair and talk to the dealer."
+        "message":"I already made a fortune. Want to join us? Then take a seat in the empty chair and talk to the dealer.",
+        "replies":[
+            {
+                "text":"Excuse me sir, but you look like someone that may be able to help me.",
+                "nextPhraseID":"blackjack_gambler2_asd_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":130
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":200,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":230,
+                        "negate":true
+                    }
+                ]
+            }
+        ]
     },
     {
         "id":"blackjack_left_seat",
@@ -3138,7 +3275,7 @@
                 "nextPhraseID":"blackjack_bet_select"
             },
             {
-                "text":"I have enough.",
+                "text":"I have had enough.",
                 "nextPhraseID":"X"
             },
             {
@@ -3182,7 +3319,32 @@
     },
     {
         "id":"brv_tavern_west_guest",
-        "message":"Go away and let me eat."
+        "message":"Go away and let me eat.",
+        "replies":[
+            {
+                "text":"I'm wondering, do you know anything about Lawellyn's death?",
+                "nextPhraseID":"brv_tavern_west_guest_asd_inquiry_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":130
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":200,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":230,
+                        "negate":true
+                    }
+                ]
+            }
+        ]
     },
     {
         "id":"brv_laundry_worker_0",
@@ -3324,6 +3486,29 @@
             {
                 "text":"I have to go.",
                 "nextPhraseID":"X"
+            },
+            {
+                "text":"I'm wondering, do you know anything about Lawellyn's death?",
+                "nextPhraseID":"brv_asd_no_info_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":130
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":200,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":230,
+                        "negate":true
+                    }
+                ]
             }
         ]
     },
@@ -3354,7 +3539,7 @@
                     {
                         "requireType":"questProgress",
                         "requireID":"brv_nondisplay_multipurpose",
-                        "value":10
+                        "value":15
                     }
                 ]
             },
@@ -3372,6 +3557,22 @@
             {
                 "text":"I am looking for my brother, Andor. He looks a bit like me.",
                 "nextPhraseID":"brv_laundry_boss_0b"
+            },
+            {
+                "text":"Have you ever seen a glove like this? [Shows Venanra the glove.]",
+                "nextPhraseID":"brv_laundry_boss_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":170
+                    },
+                    {
+                        "requireType":"inventoryKeep",
+                        "requireID":"ogea_glove",
+                        "value":1
+                    }
+                ]
             }
         ]
     },
@@ -3393,6 +3594,11 @@
                 "rewardType":"questProgress",
                 "rewardID":"brv_nondisplay_multipurpose",
                 "value":10
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"brv_nondisplay_multipurpose",
+                "value":15
             }
         ]
     },
@@ -3686,7 +3892,7 @@
     },
     {
         "id":"brv_brothers_3",
-        "message":"HEH HEH yEa",
+        "message":"HEH HEH. Yeah!",
         "switchToNPC":"brv_attohead",
         "replies":[
             {
@@ -4455,6 +4661,16 @@
                     }
                 ]
             },
+            {
+                "nextPhraseID":"brv_prison_guard_30",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":220
+                    }
+                ]
+            },
             {
                 "nextPhraseID":"brv_prison_guard_10"
             }
@@ -4462,7 +4678,7 @@
     },
     {
         "id":"brv_prison_guard_20",
-        "message":"Are you looking for the captain? He has been gone for a while now, arresting the person that destroyed the dam."
+        "message":"Are you looking for the captain? She has been gone for a while now, arresting the person that destroyed the dam."
     },
     {
         "id":"brv_prison_guard_10",
@@ -4502,7 +4718,21 @@
     },
     {
         "id":"brv2_grave_9",
-        "message":"Here lies Connat, who spent his life complaining that he was dying. In the end, he was right."
+        "replies":[
+            {
+                "nextPhraseID":"brv2_grave_9_1",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":105
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"brv2_grave_9_0"
+            }
+        ]
     },
     {
         "id":"brv2_grave_10",
@@ -5002,7 +5232,32 @@
     },
     {
         "id":"brv_villager1",
-        "message":"Hello"
+        "message":"Hello",
+        "replies":[
+            {
+                "text":"I'm wondering, do you know anything about Lawellyn's death?",
+                "nextPhraseID":"brv_asd_no_info_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":130
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":200,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":230,
+                        "negate":true
+                    }
+                ]
+            }
+        ]
     },
     {
         "id":"brv_villager2",
@@ -5010,7 +5265,59 @@
     },
     {
         "id":"brv_villager3",
-        "message":"You are not from Brimhaven, are you? If you need a place to stay, visit the inn in the eastern part of the town. There are beds available for rent. But it is bit untidy there."
+        "message":"You are not from Brimhaven, are you? If you need a place to stay, visit the inn in the eastern part of the town. There are beds available for rent. But it is a bit untidy there.",
+        "replies":[
+            {
+                "text":"I suspect that you killed Lawellyn or that you were at the very least at the scene of the murder at the time of his death.",
+                "nextPhraseID":"brv_villager3_asd_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":180
+                    },
+                    {
+                        "requireType":"inventoryKeep",
+                        "requireID":"ogea_glove",
+                        "value":1
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":190,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":210,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"No need to pretend we've never met. I do believe you are innocent.",
+                "nextPhraseID":"X",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":190
+                    }
+                ]
+            },
+            {
+                "text":"Don't pretend we've never met. Soon you will be in jail.",
+                "nextPhraseID":"X",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":210
+                    }
+                ]
+            }
+        ]
     },
     {
         "id":"brv_villager4",
@@ -5380,7 +5687,7 @@
     },
     {
         "id":"tamarukh_10",
-        "message":"Sure. We had built this dam in Brimhaven to get more space for arable land, but someone must have sabotated it.",
+        "message":"Sure. We had built this dam in Brimhaven to get more space for arable land, but someone must have sabotaged it.",
         "replies":[
             {
                 "text":"Would you like to repair the dam again?",
@@ -5612,7 +5919,7 @@
     },
     {
         "id":"quiet_thief_2_3",
-        "message":"I think 1000gp would be fair. Is that acceptable?",
+        "message":"I think 1000 gold would be fair. Is that acceptable?",
         "replies":[
             {
                 "text":"No. That's too much for me.",
@@ -5668,7 +5975,7 @@
     },
     {
         "id":"quiet_thief_3_3",
-        "message":"I think 1500gp would be fair. Is that acceptable?",
+        "message":"I think 1500 gold would be fair. Is that acceptable?",
         "replies":[
             {
                 "text":"No, that's too much for me.",
@@ -5705,7 +6012,7 @@
     },
     {
         "id":"edrin_2_1",
-        "message":"I recognize this. I made it, many years ago. See this recess in the pommel? There used to be an unusual gem in that. It gave the dagger some special properties. If you can find the gem, I can repair it for you.",
+        "message":"I recognize this. I made it, many years ago, for a man called Lawellyn. Alas, I hear he is now dead. See this recess in the pommel? There used to be an unusual gem in that. It gave the dagger some special properties. If you can find the gem, I can repair it for you.",
         "replies":[
             {
                 "text":"I think I know where to find that. I'll go and get it.",
@@ -5730,7 +6037,7 @@
     },
     {
         "id":"edrin_3_1",
-        "message":"I recognize this. It was used in something I made, many years ago. It was set into the pommel of a dagger. It gave the dagger some special properties. If you can find the dagger, I can repair it for you.",
+        "message":"I recognize this. It was used in something I made, many years ago. It was set into the pommel of a dagger I made for a man called Lawellyn. Alas, I hear he is now dead. It gave the dagger some special properties. If you can find the dagger, I can repair it for you.",
         "replies":[
             {
                 "text":"I think I know where to find that. I'll be right back.",
@@ -5755,7 +6062,7 @@
     },
     {
         "id":"edrin_4_1",
-        "message":"I recognize these. I made the dagger, many years ago. See this recess in the pommel? The gem you have fits in that. It gave the dagger some special properties. If you wish, I can repair it for you.",
+        "message":"I recognize these. I made the dagger, many years ago, for a man called Lawellyn. Alas, I hear he is now dead. See this recess in the pommel? The gem you have fits in that. It gave the dagger some special properties. If you wish, I can repair it for you.",
         "replies":[
             {
                 "text":"How much will that cost?",
@@ -5967,7 +6274,7 @@
     },
     {
         "id":"edrin_4_2",
-        "message":"The best I can offer is 800gp. The repair is quite delicate, and if done incorrectly it will just be a dagger with a gem in the pommel, and no more.",
+        "message":"The best I can offer is 800 gold. The repair is quite delicate, and if done incorrectly it will just be a dagger with a gem in the pommel, and no more.",
         "replies":[
             {
                 "text":"That's expensive. I'll think about it.",
@@ -6068,7 +6375,7 @@
     },
     {
         "id":"edrin_7_1a",
-        "message":"Yes, it is done. Here is the repaired dagger.",
+        "message":"Yes, it is done. Here is the repaired dagger.  It's nice to see Lawellyn's dagger brought back to its original glory. There is some mystery about his death. I don't know anything about it though. Maybe someone else in town can tell you more.",
         "rewards":[
             {
                 "rewardType":"giveItem",
@@ -6084,11 +6391,11 @@
     },
     {
         "id":"edrin_7_1b",
-        "message":"Yes, it is done. Here is the repaired dagger.",
+        "message":"Yes, it is done. Here is the repaired dagger.  It's nice to see Lawellyn's dagger brought back to its original glory. There is some mystery about his death. I don't know anything about it though. Maybe someone else in town can tell you more.",
         "rewards":[
             {
                 "rewardType":"giveItem",
-                "rewardID":"strange_dagger",
+                "rewardID":"dagger_assassin",
                 "value":1
             },
             {
@@ -6115,7 +6422,7 @@
     },
     {
         "id":"edrin_5_1",
-        "message":"The best I can offer is 800gp. The repair is quite delicate, and if done incorrectly it will just be a dagger with a gem in the pommel, and no more.",
+        "message":"The best I can offer is 800 gold. The repair is quite delicate, and if done incorrectly it will just be a dagger with a gem in the pommel, and no more.",
         "replies":[
             {
                 "text":"That's expensive. I'll think about it.",
@@ -6150,7 +6457,7 @@
     },
     {
         "id":"edrin_6_1",
-        "message":"The best I can offer is 800gp. The repair is quite delicate, and if done incorrectly it will just be a dagger with a gem in the pommel, and no more.",
+        "message":"The best I can offer is 800 gold. The repair is quite delicate, and if done incorrectly it will just be a dagger with a gem in the pommel, and no more.",
         "replies":[
             {
                 "text":"That's expensive. I'll think about it.",
@@ -6289,7 +6596,7 @@
     },
     {
         "id":"brv_shop_owner_2",
-        "message":"Are you lookng for something in particular?",
+        "message":"Are you looking for something in particular?",
         "replies":[
             {
                 "text":"[You point to a very expensive looking necklace] How much is this?",
@@ -6500,7 +6807,7 @@
     },
     {
         "id":"mikhail_present_20",
-        "message":"Oh, you are such a good son.",
+        "message":"Oh, you are such a nice child.",
         "replies":[
             {
                 "text":"[Give him the cheap necklace]",
@@ -6580,7 +6887,7 @@
     },
     {
         "id":"mikhail_present_20_2",
-        "message":"Thank you my son for this wonderful necklace. Oh and it is in our family colors!",
+        "message":"Thank you my child for this wonderful necklace. Oh and it is in our family colors!",
         "replies":[
             {
                 "text":"N",
@@ -6748,7 +7055,7 @@
     },
     {
         "id":"mikhail_news_50",
-        "message":"Thank you my son. Keep on searching for Andor.",
+        "message":"Thank you my child. Keep on searching for Andor.",
         "replies":[
             {
                 "text":"N",
@@ -8041,7 +8348,7 @@
                 ]
             },
             {
-                "text":"Explain to me the rules, please.",
+                "text":"Please explain the rules to me.",
                 "nextPhraseID":"blackjack_rules"
             }
         ],
@@ -8103,7 +8410,7 @@
     },
     {
         "id":"thelry_1",
-        "message":"No, sorry, I haven't seen onyone like that.",
+        "message":"No, sorry, I haven't seen anyone like that.",
         "replies":[
             {
                 "text":"OK. Thanks. What do you have to sell?",
diff --git a/AndorsTrail/res/raw/conversationlist_brimhaven2.json b/AndorsTrail/res/raw/conversationlist_brimhaven2.json
index 7008f2627..b77291562 100644
--- a/AndorsTrail/res/raw/conversationlist_brimhaven2.json
+++ b/AndorsTrail/res/raw/conversationlist_brimhaven2.json
@@ -464,7 +464,7 @@
     },
     {
         "id":"brv_school_history_30",
-        "message":"Just imagine all those mighty churches and splendid palaces! It was a merry time, down under Mt. Galmor, the highest mountain in whole Dhayavar.",
+        "message":"Just imagine all those mighty churches and splendid palaces! It was a merry time, down under Mt. Galmore, the highest mountain in whole of Dhayavar.",
         "replies":[
             {
                 "text":"Sigh.",
@@ -538,7 +538,7 @@
     },
     {
         "id":"brv_school_history_46",
-        "message":"The cultists worshipped the blinding and cleansing light of Elythara. Clever and sneaky as they were, they have gained people's trust.",
+        "message":"The cultists worshipped the blinding and cleansing light of Elythara. Clever and sneaky as they were, they gained people's trust.",
         "replies":[
             {
                 "text":"N",
@@ -620,7 +620,7 @@
     },
     {
         "id":"brv_school_history_60",
-        "message":"However Elythara and her cultists failed to completely annihilate the old ways. Many true men managed to hide in remote places in the total darkness, unknown to the Elytharans. Also Elythara's power is diminished underground.",
+        "message":"However Elythara and her cultists failed to completely annihilate the old ways. Many true men managed to hide in remote places in the total darkness, unknown to the Elytharans. Also, Elythara's power is diminished underground.",
         "switchToNPC":"brv_teacher",
         "replies":[
             {
@@ -653,7 +653,7 @@
     },
     {
         "id":"brv_school_history_71",
-        "message":"The Elytharans built several towns and cities, dedicated to their goddess. Several aristocratic houses were formed by that time.",
+        "message":"The Elytharans built several towns and cities, dedicated to their goddess. Several aristocratic houses were formed at that time.",
         "replies":[
             {
                 "text":"N",
@@ -673,7 +673,7 @@
     },
     {
         "id":"brv_school_history_73",
-        "message":"The town of Loneford was founded and it soon became famous for its fertile fields and healthy vegetable which fed the northern parts of the Forgotten Kingdom.",
+        "message":"The town of Loneford was founded and it soon became famous for its fertile fields and healthy vegetables which fed the northern parts of the Forgotten Kingdom.",
         "replies":[
             {
                 "text":"N",
@@ -874,7 +874,7 @@
     },
     {
         "id":"brv_school_history_200",
-        "message":"And now we get to a completely different thing. Let's have some practice with fighting.",
+        "message":"And now we will do something completely different. Let's practice fighting, so that you learn how to defend yourselves.",
         "replies":[
             {
                 "text":"Finally. I thought her talking would never cease.",
@@ -4392,6 +4392,29 @@
                         "requireID":"20"
                     }
                 ]
+            },
+            {
+                "text":"I'm wondering, do you know anything about Lawellyn's death?",
+                "nextPhraseID":"guard_advent_asd_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":130
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":200,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":230,
+                        "negate":true
+                    }
+                ]
             }
         ]
     },
diff --git a/AndorsTrail/res/raw/conversationlist_brimhaven_2.json b/AndorsTrail/res/raw/conversationlist_brimhaven_2.json
new file mode 100644
index 000000000..929bd72be
--- /dev/null
+++ b/AndorsTrail/res/raw/conversationlist_brimhaven_2.json
@@ -0,0 +1,3021 @@
+[
+    {
+        "id":"sign_waytobrim3_grave3_0",
+        "message":"Here lies Connat, who spent his life complaining that he was dying. In the end, he was right."
+    },
+    {
+        "id":"brv2_grave_9_1",
+        "message":"Here lies Lawellyn the weak.\nSurvived by Arlish",
+        "replies":[
+            {
+                "text":"Hmm, interesting.",
+                "nextPhraseID":"X"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"brv_dagger",
+                "value":110
+            }
+        ]
+    },
+    {
+        "id":"arlish_asd_0",
+        "message":"Why?  What do you know about it?",
+        "replies":[
+            {
+                "text":"Well, I have it right here.",
+                "nextPhraseID":"arlish_asd_20",
+                "requires":[
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"dagger_assassin",
+                        "value":1
+                    }
+                ]
+            },
+            {
+                "text":"Well, I have it right here.",
+                "nextPhraseID":"arlish_asd_20",
+                "requires":[
+                    {
+                        "requireType":"wearRemove",
+                        "requireID":"dagger_assassin",
+                        "value":1
+                    }
+                ]
+            },
+            {
+                "text":"You have looked at the dagger. Can you tell me more?",
+                "nextPhraseID":"arlish_asd_30",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_nondisplay_multipurpose",
+                        "value":50
+                    }
+                ]
+            },
+            {
+                "text":"I was just curious, I was told that a dagger I had was Lawellyn's, but I no longer have it.",
+                "nextPhraseID":"arlish_asd_15",
+                "requires":[
+                    {
+                        "requireType":"inventoryKeep",
+                        "requireID":"dagger_assassin",
+                        "value":1,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"wear",
+                        "requireID":"dagger_assassin",
+                        "value":1,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_nondisplay_multipurpose",
+                        "value":50,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"Nothing. I was just curious. Bye.",
+                "nextPhraseID":"X"
+            }
+        ]
+    },
+    {
+        "id":"arlish_asd_20",
+        "message":"Arlish takes the dagger and examines it while you continue to talk.",
+        "switchToNPC":"none",
+        "replies":[
+            {
+                "text":"I was able to acquire the dagger and its gem. Then Edrin repaired it for me.",
+                "nextPhraseID":"arlish_asd_30"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"brv_nondisplay_multipurpose",
+                "value":50
+            }
+        ]
+    },
+    {
+        "id":"arlish_asd_30",
+        "message":"This can't be it. It looks like my father's dagger, but his dagger has been missing for a couple of years now. I believe this is stolen property!",
+        "switchToNPC":"arlish",
+        "replies":[
+            {
+                "text":"Tell me more.",
+                "nextPhraseID":"arlish_asd_40"
+            },
+            {
+                "text":"So what.  You said it has been missing for years, so how would you know?",
+                "nextPhraseID":"X"
+            }
+        ]
+    },
+    {
+        "id":"arlish_asd_40",
+        "message":"You see, this was my father Lawellyn's most prized possesion. He kept it with him always.",
+        "replies":[
+            {
+                "text":"Please go on.",
+                "nextPhraseID":"arlish_asd_50"
+            }
+        ]
+    },
+    {
+        "id":"arlish_asd_50",
+        "message":"Then one night, father did not come to my place for dinner as was the custom.  I quickly became worried that something terrible had happened to him. So I went to Mustura for help, but she quickly pushed it off as 'Lawellyn simply went on a trip'.",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"arlish_asd_60"
+            }
+        ]
+    },
+    {
+        "id":"arlish_asd_70",
+        "message":"Indeed it does.  In fact, I fear he was murdered. Will you help?",
+        "replies":[
+            {
+                "text":"Yes.  Of course I will go investigate a little.  You are in need.",
+                "nextPhraseID":"arlish_asd_80"
+            },
+            {
+                "text":"I'm sorry, but I just don't have the time.",
+                "nextPhraseID":"arlish_asd_90",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":130,
+                        "negate":true
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        "id":"arlish_asd_60",
+        "message":"But I tried to explain to her that Lawellyn would not do so without telling me.",
+        "replies":[
+            {
+                "text":"That sounds suspicious.",
+                "nextPhraseID":"arlish_asd_70"
+            }
+        ]
+    },
+    {
+        "id":"arlish_asd_80",
+        "message":"Oh thank you so much.",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"brv_dagger",
+                "value":130
+            }
+        ]
+    },
+    {
+        "id":"arlish_asd_90",
+        "message":"I'm sorry to hear this.",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"brv_dagger",
+                "value":120
+            }
+        ]
+    },
+    {
+        "id":"arlish_asd_15",
+        "message":"Well, he did have a dagger, but I can't say if the one you had was his if I can't look at it.",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"brv_dagger",
+                "value":115
+            }
+        ]
+    },
+    {
+        "id":"brv_asd_no_info_10",
+        "message":"No, I am sorry, I don't"
+    },
+    {
+        "id":"brv_tavern1_guest2_asd_10",
+        "message":"I may.  Who's asking?",
+        "replies":[
+            {
+                "text":"Well, I've been asked by Lawellyn's daughter, Arlish, to investigate his death.",
+                "nextPhraseID":"brv_tavern1_guest2_asd_20"
+            }
+        ]
+    },
+    {
+        "id":"brv_tavern1_guest2_asd_20",
+        "message":"Oh, OK.  Arlish helped me a lot in school when we were kids, so I feel like I owe it to her to help you.",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"brv_tavern1_guest2_asd_30"
+            }
+        ]
+    },
+    {
+        "id":"brv_tavern1_guest2_asd_30",
+        "message":"Don't tell the bartender, but I like to frequent the tavern in Loneford a lot, and as such, I've developed quite a friendship with the owner Kizzo. One day we were talking about how scary the woods between Loneford and Brimhaven can be at nighttime.  After sharing some not so scary stories, Kizzo told me a crazy murder story.  Now I can't remember the details because...well, I had been drinking.",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"brv_tavern1_guest2_asd_40"
+            }
+        ]
+    },
+    {
+        "id":"brv_tavern1_guest2_asd_40",
+        "message":"I suggest that you go talk to Kizzo.",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"brv_dagger",
+                "value":140
+            }
+        ]
+    },
+    {
+        "id":"kizzo_asd_10",
+        "message":"Oh, yes. A couple of years ago, a customer that I've never seen before nor have I seen since, sits down at the bar with a terrified look on his face.",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"kizzo_asd_20"
+            }
+        ]
+    },
+    {
+        "id":"kizzo_asd_20",
+        "message":"He begins to tell me that he just witnessed two men in the woods between here and Brimhaven embroiled in a violent altercation and fears that one killed the other.",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"kizzo_asd_30"
+            }
+        ]
+    },
+    {
+        "id":"kizzo_asd_30",
+        "message":"That's all I know.  Maybe you could find out more if you can find the scene of the murder?",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"brv_dagger",
+                "value":150
+            }
+        ]
+    },
+    {
+        "id":"kizzo_asd_40",
+        "message":"Wow!  This glove looks like it's been through a lot.",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"kizzo_asd_50"
+            }
+        ]
+    },
+    {
+        "id":"kizzo_asd_50",
+        "message":"This does however look like it used to be a high quality item.",
+        "replies":[
+            {
+                "text":"Really?",
+                "nextPhraseID":"kizzo_asd_60"
+            }
+        ]
+    },
+    {
+        "id":"kizzo_asd_60",
+        "message":"Yes.  If that was my glove, I would have tried to get a new one made instead of buying a new set as it would be cheaper.",
+        "replies":[
+            {
+                "text":"Where would someone get just one glove?",
+                "nextPhraseID":"kizzo_asd_70"
+            }
+        ]
+    },
+    {
+        "id":"kizzo_asd_70",
+        "message":"Well, I know Venanra in Brimhaven does some great work with cloth and leather items.",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"brv_dagger",
+                "value":170
+            }
+        ]
+    },
+    {
+        "id":"brv_crime_scene",
+        "replies":[
+            {
+                "nextPhraseID":"brv_crime_scene_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":150
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":160,
+                        "negate":true
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        "id":"brv_crime_scene_20",
+        "message":"[Upon inspection, you notice what appears to be leather peeking out from under some leaves. You pull at it, and find a glove. It has what looks like old blood stains on it.]",
+        "rewards":[
+            {
+                "rewardType":"giveItem",
+                "rewardID":"ogea_glove",
+                "value":1
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"brv_dagger",
+                "value":160
+            }
+        ]
+    },
+    {
+        "id":"brv_crime_scene_10",
+        "message":"What's that on the ground?",
+        "replies":[
+            {
+                "text":"Look closer.",
+                "nextPhraseID":"brv_crime_scene_20"
+            },
+            {
+                "text":"Ignore it.",
+                "nextPhraseID":"X"
+            }
+        ]
+    },
+    {
+        "id":"brv_laundry_boss_10",
+        "message":"Well, yes, I have. In fact, I made one exactly like it a couple of years ago for a customer. I remember because it is a very unique looking glove.",
+        "replies":[
+            {
+                "text":"Can you remember who the customer was?",
+                "nextPhraseID":"brv_laundry_boss_20"
+            }
+        ]
+    },
+    {
+        "id":"brv_laundry_boss_20",
+        "message":"Um, let me think for a second...ah, yes, it was for Ogea.",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"brv_laundry_boss_30"
+            }
+        ]
+    },
+    {
+        "id":"brv_laundry_boss_30",
+        "message":"He came to me with a story that he lost his glove while hunting one night and how he wanted me to make him a replacement as he could not afford to purchase a new pair.",
+        "replies":[
+            {
+                "text":"Are you sure?",
+                "nextPhraseID":"brv_laundry_boss_40"
+            }
+        ]
+    },
+    {
+        "id":"brv_laundry_boss_40",
+        "message":"Oh, absolutely. I'm sure.",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"brv_dagger",
+                "value":180
+            }
+        ]
+    },
+    {
+        "id":"brv_villager3_asd_10",
+        "message":"I'm sure you think that, but do you have any proof?",
+        "replies":[
+            {
+                "text":"In fact, I do! I have physical evidence that puts you at the scene of Lawellyn's death.",
+                "nextPhraseID":"brv_villager3_asd_20"
+            }
+        ]
+    },
+    {
+        "id":"brv_villager3_asd_20",
+        "message":"What?! What do you have on me that would even make the authorities listen to you?",
+        "replies":[
+            {
+                "text":"I have a blood-stained glove and a witness stating that it was indeed your glove. [Show Ogea his glove.]",
+                "nextPhraseID":"brv_villager3_asd_30"
+            }
+        ]
+    },
+    {
+        "id":"brv_villager3_asd_30",
+        "message":"What can I say?  You have me.",
+        "replies":[
+            {
+                "text":"Well, you can start by explaining what happened.",
+                "nextPhraseID":"brv_villager3_asd_40"
+            }
+        ]
+    },
+    {
+        "id":"brv_villager3_asd_40",
+        "message":"Yes, I'd like to.",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"brv_villager3_asd_50"
+            }
+        ]
+    },
+    {
+        "id":"brv_villager3_asd_50",
+        "message":"The story starts many years ago. I was a struggling woodcutter in need of land to build my home on.",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"brv_villager3_asd_60"
+            }
+        ]
+    },
+    {
+        "id":"brv_villager3_asd_60",
+        "message":"I approached Lawellyn about it because he was responsible for land deeds, so I asked him about acquiring some empty land where Alkapoan's house now stands. He informed me that he was giving it to Alkapoan.",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"brv_villager3_asd_70"
+            }
+        ]
+    },
+    {
+        "id":"brv_villager3_asd_70",
+        "message":"I thought that that land was too large for just one house, but Lawellyn said 'no'.  We argued about it for many months, until one day our paths crossed just outside of town.",
+        "replies":[
+            {
+                "text":"Get to the point where you killed the man and left his daughter without a father.",
+                "nextPhraseID":"brv_villager3_asd_80"
+            }
+        ]
+    },
+    {
+        "id":"brv_villager3_asd_80",
+        "message":"In another attempt to change Lawellyn's mind on giving me land to build my house, things got real ugly real fast.  I don't know why he reached for his dagger, but I saw this and drew my weapon in self-defense.  I had no intention of killing him!  I was trying to defend myself.  Do you believe me?",
+        "replies":[
+            {
+                "text":"Yes",
+                "nextPhraseID":"brv_villager3_asd_90"
+            },
+            {
+                "text":"No.  In fact, I want to know more.  Like, what did you do with Lawellyn's dagger?",
+                "nextPhraseID":"brv_villager3_asd_100"
+            }
+        ]
+    },
+    {
+        "id":"brv_villager3_asd_90",
+        "message":"I'm glad to hear it.  Thank you.",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"brv_dagger",
+                "value":190
+            }
+        ]
+    },
+    {
+        "id":"brv_villager3_asd_100",
+        "message":"Well, after the fight, I noticed that the gem broke off of it. I took both the gem and the dagger and sold them to a thief.  So all I'm guilty of is selling stolen property.",
+        "replies":[
+            {
+                "text":"I don't think so.  You should expect a visit from Mustura real soon.",
+                "nextPhraseID":"X"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"brv_dagger",
+                "value":210
+            }
+        ]
+    },
+    {
+        "id":"arlish_asd_100",
+        "message":"What about it?",
+        "replies":[
+            {
+                "text":"I'm sorry, but I was not able to find any new information that would determine what happened to your father.",
+                "nextPhraseID":"arlish_asd_110",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":190
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":200,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":230,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"I'm still investigating. I'll come back when I have more information.",
+                "nextPhraseID":"X",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":190,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":220,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"I have some good news for you.",
+                "nextPhraseID":"arlish_asd_140",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":220
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        "id":"arlish_asd_110",
+        "message":"I'm sorry too. Thank you for trying.",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"brv_dagger",
+                "value":200
+            }
+        ]
+    },
+    {
+        "id":"arlish_asd_120",
+        "message":"I should have known that it was Ogea!  He never agreed with my father's decision about the land.",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"arlish_asd_130"
+            }
+        ]
+    },
+    {
+        "id":"arlish_asd_130",
+        "message":"It would be my honor if you take Lawellyn's dagger.  He would want you to have it.",
+        "replies":[
+            {
+                "text":"Thank you, but it was my honor to help bring you closure and justice.",
+                "nextPhraseID":"X"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"brv_dagger",
+                "value":230
+            },
+            {
+                "rewardType":"giveItem",
+                "rewardID":"dagger_assassin",
+                "value":1
+            }
+        ]
+    },
+    {
+        "id":"brv_guard_deputy_asd_10",
+        "message":"Let me hear it.",
+        "replies":[
+            {
+                "text":"I found his glove at the scene of the murder covered in dried blood and a witness that says the glove is Ogea's. Ogea also admitted that he stole the dagger.",
+                "nextPhraseID":"brv_guard_deputy_asd_20",
+                "requires":[
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"ogea_glove",
+                        "value":1
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        "id":"brv_guard_deputy_asd_20",
+        "message":"Wow. You did a great job! Do you want a job on our team?",
+        "replies":[
+            {
+                "text":"No, thanks. I just want Ogea punished.",
+                "nextPhraseID":"brv_guard_deputy_asd_30"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"brv_nondisplay_multipurpose",
+                "value":60
+            }
+        ]
+    },
+    {
+        "id":"brv_guard_deputy_asd_30",
+        "message":"That is as good as done",
+        "replies":[
+            {
+                "text":"Thanks.",
+                "nextPhraseID":"X"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"brv_dagger",
+                "value":220
+            },
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"brv_villager3",
+                "mapName":"brimhaven4"
+            },
+            {
+                "rewardType":"spawnAll",
+                "rewardID":"brv_prisoner",
+                "mapName":"brimhaven_prison"
+            }
+        ]
+    },
+    {
+        "id":"arlish_asd_140",
+        "message":"I know you do.  I heard that you found my father's murderer.",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"arlish_asd_120"
+            }
+        ]
+    },
+    {
+        "id":"blackjack_gambler2_asd_10",
+        "message":"What do you mean by \"I look like someone that may be able to help\"?",
+        "replies":[
+            {
+                "text":"Um...I mean let's be honest, you may be someone who likes to play on the other side of the law.",
+                "nextPhraseID":"blackjack_gambler2_asd_20"
+            }
+        ]
+    },
+    {
+        "id":"blackjack_gambler2_asd_20",
+        "message":"You got that right, kid. Now what do you want to know?",
+        "replies":[
+            {
+                "text":"I'm wondering, do you know anything about Lawellyn's death?",
+                "nextPhraseID":"blackjack_gambler2_asd_30"
+            }
+        ]
+    },
+    {
+        "id":"blackjack_gambler2_asd_30",
+        "message":"If you want to know about a murder, you should probably ask on the east side of town."
+    },
+    {
+        "id":"guard_advent_asd_10",
+        "message":"Death? The last I knew was that Arlish reported him missing."
+    },
+    {
+        "id":"brv_tavern_west_guest_asd_inquiry_10",
+        "message":"Lawellyn? I don't know any 'Lawellyn'. I'm just passing through town."
+    },
+    {
+        "id":"brv_guard_deputy_10",
+        "message":"Hello. I am Ito. I help Mustura keep the law around here.",
+        "replies":[
+            {
+                "text":"I'll bear that in mind.",
+                "nextPhraseID":"X"
+            },
+            {
+                "text":"I have proof that Ogea murdered Lawellyn and stole his prize dagger.",
+                "nextPhraseID":"brv_guard_deputy_asd_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":210
+                    },
+                    {
+                        "requireType":"inventoryKeep",
+                        "requireID":"ogea_glove",
+                        "value":1
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":220,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"I want to discuss Ogea again.",
+                "nextPhraseID":"brv_guard_deputy_asd_20",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_nondisplay_multipurpose",
+                        "value":60
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":220,
+                        "negate":true
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        "id":"brv_prison_guard_30",
+        "message":"After all this long time I finally have a resident here again."
+    },
+    {
+        "id":"inspiring_snake_master_10",
+        "message":"Hello, young adventurer. I am Ewmondold, a world famous traveler.",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"inspiring_snake_master_select"
+            }
+        ]
+    },
+    {
+        "id":"inspiring_snake_master_20",
+        "message":"Thanks for killing the Snake master, sucker - the way for me to rule is now free...",
+        "rewards":[
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"inspiring_snake_master",
+                "mapName":"wild2"
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"new_snake_master",
+                "value":10
+            },
+            {
+                "rewardType":"spawnAll",
+                "rewardID":"cavesnake_master_ewmondold",
+                "mapName":"snakecave3"
+            }
+        ]
+    },
+    {
+        "id":"inspiring_snake_master_30",
+        "message":"Are you looking to help a man in need?",
+        "replies":[
+            {
+                "text":"Not right now.  Bye.",
+                "nextPhraseID":"X"
+            },
+            {
+                "text":"Yes, of course I am.  What can I do for you?",
+                "nextPhraseID":"inspiring_snake_master_40"
+            }
+        ]
+    },
+    {
+        "id":"ewmondold_snake_master_10",
+        "message":"My new powers have enhanced my appearance, don't you agree? ",
+        "replies":[
+            {
+                "text":"You are too dangerous to be kept alive.",
+                "nextPhraseID":"ewmondold_snake_master_20"
+            }
+        ]
+    },
+    {
+        "id":"inspiring_snake_master_40",
+        "message":"I too am an adventurer.  I recently attempted to make my way through this here cave.",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"inspiring_snake_master_50"
+            }
+        ]
+    },
+    {
+        "id":"inspiring_snake_master_50",
+        "message":"In the beginning it was relatively easy.  It wasn't until I ran into the Snake master's minions.",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"inspiring_snake_master_60"
+            }
+        ]
+    },
+    {
+        "id":"inspiring_snake_master_60",
+        "message":"I was quickly ambushed and was forced to flee in order to save my life. But of course, during my attempt to flee, I dropped my map.",
+        "replies":[
+            {
+                "text":"I could retrieve the map for you.",
+                "nextPhraseID":"inspiring_snake_master_70"
+            }
+        ]
+    },
+    {
+        "id":"inspiring_snake_master_70",
+        "message":"Please do and hurry back to me.",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"new_snake_master",
+                "value":5
+            }
+        ]
+    },
+    {
+        "id":"inspiring_snake_master_80",
+        "message":"Ah, my 'map'. Good!",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"inspiring_snake_master_20"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"new_snake_master",
+                "value":20
+            }
+        ]
+    },
+    {
+        "id":"ewmondold_snake_master_defeted_script_10",
+        "replies":[
+            {
+                "nextPhraseID":"ewmondold_snake_master_defeted_script_15",
+                "requires":[
+                    {
+                        "requireType":"killedMonster",
+                        "requireID":"ewmondold_snake_master",
+                        "value":1
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"new_snake_master",
+                        "value":30,
+                        "negate":true
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        "id":"ewmondold_snake_master_defeted_script_20",
+        "message":"You've destroyed Ewmondold and eliminated his threat to Crossglen and the surrounding area.",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"new_snake_master",
+                "value":30
+            },
+            {
+                "rewardType":"dropList",
+                "rewardID":"gold100"
+            }
+        ]
+    },
+    {
+        "id":"inspiring_snake_master_select",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"inspiring_snake_master_30",
+                "requires":[
+                    {
+                        "requireType":"killedMonster",
+                        "requireID":"snake_master",
+                        "value":1,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"new_snake_master",
+                        "value":5,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"N",
+                "nextPhraseID":"inspiring_snake_master_25",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"new_snake_master",
+                        "value":5
+                    },
+                    {
+                        "requireType":"killedMonster",
+                        "requireID":"snake_master",
+                        "value":1,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"N",
+                "nextPhraseID":"inspiring_snake_master_20",
+                "requires":[
+                    {
+                        "requireType":"killedMonster",
+                        "requireID":"snake_master",
+                        "value":1
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"new_snake_master",
+                        "value":5,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"N",
+                "nextPhraseID":"inspiring_snake_master_20",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"new_snake_master",
+                        "value":20
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"new_snake_master",
+                        "value":25,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"N",
+                "nextPhraseID":"inspiring_snake_master_25",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"new_snake_master",
+                        "value":5
+                    },
+                    {
+                        "requireType":"inventoryKeep",
+                        "requireID":"inspiring_snake_master_map",
+                        "value":1,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"N",
+                "nextPhraseID":"inspiring_snake_master_80",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"new_snake_master",
+                        "value":5
+                    },
+                    {
+                        "requireType":"killedMonster",
+                        "requireID":"snake_master",
+                        "value":1
+                    },
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"inspiring_snake_master_map",
+                        "value":1
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        "id":"inspiring_snake_master_25",
+        "message":"Have you found my map yet?",
+        "replies":[
+            {
+                "text":"No, not yet.",
+                "nextPhraseID":"X"
+            }
+        ]
+    },
+    {
+        "id":"ewmondold_snake_master_20",
+        "message":"Oh, you think you can stop me, do you?  Come and try!",
+        "replies":[
+            {
+                "text":"I won't try, I'll succeed!",
+                "nextPhraseID":"F"
+            }
+        ]
+    },
+    {
+        "id":"ewmondold_snake_master_defeted_script_15",
+        "message":"You hear Ewmondold gasp his last breath.",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"ewmondold_snake_master_defeted_script_20"
+            }
+        ]
+    },
+    {
+        "id":"oromir_trees_help_10",
+        "message":"Thank you, friend.",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"leta",
+                "value":25
+            }
+        ]
+    },
+    {
+        "id":"leta_oromir1_trees_help",
+        "message":"If you see him, tell him to hurry back here and help me with the housework.\nNow get out of here!",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"leta",
+                "value":10
+            },
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"oromir",
+                "mapName":"crossglen"
+            },
+            {
+                "rewardType":"spawnAll",
+                "rewardID":"oromir_behind_inn_help",
+                "mapName":"crossglen"
+            }
+        ]
+    },
+    {
+        "id":"oromir_behind_inn_help_10",
+        "message":"I had a feeling that Leta was close to finding me, so I moved here.",
+        "replies":[
+            {
+                "text":"That's a wise move because she has asked me to inform her of your whereabouts.  But I won't do so.",
+                "nextPhraseID":"oromir_behind_inn_help_20"
+            }
+        ]
+    },
+    {
+        "id":"oromir_behind_inn_help_20",
+        "message":"Thank you, friend.",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"leta",
+                "value":35
+            }
+        ]
+    },
+    {
+        "id":"leta_oromir1_behind_inn_help",
+        "message":"If you see him, tell him to hurry back here and help me with the housework.\nNow get out of here!",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"leta",
+                "value":10
+            },
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"oromir_behind_inn_help",
+                "mapName":"crossglen"
+            },
+            {
+                "rewardType":"spawnAll",
+                "rewardID":"oromir_behind_haystack_help",
+                "mapName":"crossglen"
+            }
+        ]
+    },
+    {
+        "id":"oromir_behind_haystack_help_10",
+        "message":"I had a feeling that Leta was close to finding me, so I moved here.",
+        "replies":[
+            {
+                "text":"That's a wise move because she has asked me to inform her of your whereabouts.  But I won't do so.",
+                "nextPhraseID":"oromir_behind_haystack_help_20"
+            }
+        ]
+    },
+    {
+        "id":"oromir_behind_haystack_help_20",
+        "message":"Thank you, friend.",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"leta",
+                "value":45
+            }
+        ]
+    },
+    {
+        "id":"leta_oromir1_behind_haystack_help",
+        "message":"If you see him, tell him to hurry back here and help me with the housework.\nNow get out of here!",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"leta",
+                "value":10
+            },
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"oromir_behind_haystack_help",
+                "mapName":"crossglen"
+            },
+            {
+                "rewardType":"spawnAll",
+                "rewardID":"oromir_basement_help",
+                "mapName":"crossglen_farmhouse_basement"
+            }
+        ]
+    },
+    {
+        "id":"oromir_basement_help_10",
+        "message":"Thank you for not telling my wife where I've been.",
+        "replies":[
+            {
+                "text":"Why are you back in the house?",
+                "nextPhraseID":"oromir_basement_help_20",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"leta",
+                        "value":45,
+                        "negate":false
+                    }
+                ]
+            },
+            {
+                "text":"You're welcome.",
+                "nextPhraseID":"oromir_basement_help_15",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"leta",
+                        "value":105
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        "id":"oromir_basement_help_20",
+        "message":"That mysterious looking man in the inn saw me and ratted me out and now I'm down here cleaning as a punishment.",
+        "replies":[
+            {
+                "text":"I'm sorry to hear that.",
+                "nextPhraseID":"oromir_basement_help_30",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"leta",
+                        "value":105,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"I'm sorry to hear that.",
+                "nextPhraseID":"X"
+            }
+        ]
+    },
+    {
+        "id":"oromir_basement_help_30",
+        "message":"While cleaning, I found your kid brother's boots.  Please take them as my gift to you for all of your help.",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"leta",
+                "value":105
+            },
+            {
+                "rewardType":"giveItem",
+                "rewardID":"kids_boots",
+                "value":1
+            }
+        ]
+    },
+    {
+        "id":"falothen1_7_pa",
+        "message":"Polearms are a spike or a blade, or both, on the end of a long pole. Wielding one with one hand is not practical, but they make up for that with their defensive capabilities. ",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"falothan1_7_pa1"
+            }
+        ]
+    },
+    {
+        "id":"falothan1_7_pa1",
+        "message":"You can attack your foe from a great distance with a polearm, making it difficult for your foe to attack you.",
+        "replies":[
+            {
+                "text":"Let's go back to the other types of weapons.",
+                "nextPhraseID":"falothen1_6"
+            },
+            {
+                "text":"Sounds good. Teach me how to fight with polearms.",
+                "nextPhraseID":"falothen_1_pa2"
+            }
+        ]
+    },
+    {
+        "id":"falothen_1_pa2",
+        "message":"[Falothen teaches you the polearm skill]",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"falothen1_8"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"charwood1",
+                "value":76
+            },
+            {
+                "rewardType":"skillIncrease",
+                "rewardID":"weaponProficiencyPole"
+            }
+        ]
+    },
+    {
+        "id":"falothen1_2nd_pa",
+        "replies":[
+            {
+                "nextPhraseID":"falothen1_2nd_no",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"charwood1",
+                        "value":76
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"falothen1_2nd_pa0"
+            }
+        ]
+    },
+    {
+        "id":"falothen1_2nd_pa0",
+        "message":"Polearms are a spike or a blade, or both, on the end of a long pole. Wielding one with one hand is not practical, but they make up for that with their defensive capabilities. ",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"falothen1_2nd_pa1"
+            }
+        ]
+    },
+    {
+        "id":"falothen1_2nd_pa1",
+        "message":"You can attack your foe from a great distance with a polearm, making it difficult for your foe to attack you.",
+        "replies":[
+            {
+                "text":"Sounds good. Teach me how to better fight with polearms. Here are two Oegyth crystals and 5000 gold as payment.",
+                "nextPhraseID":"falothen1_2nd_pa3",
+                "requires":[
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"oegyth",
+                        "value":2
+                    },
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"gold",
+                        "value":5000
+                    }
+                ]
+            },
+            {
+                "text":"Let's go back to the other types of weapons.",
+                "nextPhraseID":"falothen1_14"
+            }
+        ]
+    },
+    {
+        "id":"falothen1_2nd_pa3",
+        "message":"[Falothen teaches you the polearm skill]",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"falothen1_15"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"charwood1",
+                "value":76
+            },
+            {
+                "rewardType":"skillIncrease",
+                "rewardID":"weaponProficiencyPole"
+            }
+        ]
+    },
+    {
+        "id":"leta_oromir1_trees",
+        "message":"Hiding is he? That's not surprising. Tell him to hurry back here and help me with the housework.",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"leta",
+                "value":30
+            },
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"oromir",
+                "mapName":"crossglen"
+            },
+            {
+                "rewardType":"spawnAll",
+                "rewardID":"oromir_behind_inn",
+                "mapName":"crossglen"
+            }
+        ]
+    },
+    {
+        "id":"oromir_behind_inn_10",
+        "message":"Why did you tell Leta where I was?",
+        "replies":[
+            {
+                "text":"You are needed at home.",
+                "nextPhraseID":"oromir_behind_inn_20"
+            }
+        ]
+    },
+    {
+        "id":"oromir_behind_inn_20",
+        "message":"I see.",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"leta",
+                "value":40
+            }
+        ]
+    },
+    {
+        "id":"leta_oromir1_behind_inn_10",
+        "message":"Where?",
+        "replies":[
+            {
+                "text":"Tucked away between the back of the inn and the woods.",
+                "nextPhraseID":"leta_oromir1_behind_inn_20"
+            }
+        ]
+    },
+    {
+        "id":"leta_oromir1_behind_inn_20",
+        "message":"Hiding is he? That's not surprising. Tell him to hurry back here and help me with the housework.",
+        "rewards":[
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"oromir_behind_inn",
+                "mapName":"crossglen"
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"leta",
+                "value":50
+            },
+            {
+                "rewardType":"spawnAll",
+                "rewardID":"oromir_behind_haystack",
+                "mapName":"crossglen"
+            }
+        ]
+    },
+    {
+        "id":"oromir_behind_haystack_10",
+        "message":"You did it again? Stop telling Leta where I am.",
+        "replies":[
+            {
+                "text":"A happy wife is a happy life.  Go home.",
+                "nextPhraseID":"oromir_behind_haystack_20"
+            }
+        ]
+    },
+    {
+        "id":"oromir_behind_haystack_20",
+        "message":"No thanks. I'm staying here.",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"leta",
+                "value":60
+            }
+        ]
+    },
+    {
+        "id":"leta_oromir1_behind_haystack_10",
+        "message":"Where?",
+        "replies":[
+            {
+                "text":"Hiding behind a haystack.",
+                "nextPhraseID":"leta_oromir1_behind_haystack_20"
+            }
+        ]
+    },
+    {
+        "id":"leta_oromir1_behind_haystack_20",
+        "message":"Hiding is he? That's not surprising. Tell him to hurry back here and help me with the housework.",
+        "rewards":[
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"oromir_behind_haystack",
+                "mapName":"crossglen"
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"leta",
+                "value":70
+            },
+            {
+                "rewardType":"spawnAll",
+                "rewardID":"oromir_basement",
+                "mapName":"crossglen_farmhouse_basement"
+            }
+        ]
+    },
+    {
+        "id":"oromir_basement_10",
+        "message":"You did it again? Stop telling Leta where I am.",
+        "replies":[
+            {
+                "text":"I'm sorry, but I think that it's better if I'm on Leta's side.",
+                "nextPhraseID":"oromir_basement_20"
+            }
+        ]
+    },
+    {
+        "id":"oromir_basement_20",
+        "message":"Yep. That's something that I've not learnt to do.",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"leta",
+                "value":80
+            }
+        ]
+    },
+    {
+        "id":"leta_oromir1_basement_10",
+        "message":"What?! How? Oh, it doesn't matter.  Thank you for finding him.",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"leta",
+                "value":100
+            }
+        ]
+    },
+    {
+        "id":"brv2_grave_9_0",
+        "message":"Here lies Lawellyn the weak.\nSurvived by Arlish"
+    },
+    {
+        "id":"quasi_0",
+        "message":"Hello. I'm Quasi. I like to dig.",
+        "replies":[
+            {
+                "text":"Dig?",
+                "nextPhraseID":"quasi_1"
+            },
+            {
+                "text":"I think I'll leave now.",
+                "nextPhraseID":"X"
+            }
+        ]
+    },
+    {
+        "id":"quasi_1",
+        "message":"Yes. Holes. To put people in. ",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"quasi_2"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"nondisplay_bhvt",
+                "value":30
+            }
+        ]
+    },
+    {
+        "id":"quasi_2",
+        "message":"But Zorvan only lets me put dead people in the holes. ",
+        "replies":[
+            {
+                "text":"You find that surprising?",
+                "nextPhraseID":"quasi_3"
+            },
+            {
+                "text":"Time to leave!",
+                "nextPhraseID":"X"
+            },
+            {
+                "text":"I think he's right. Bye.",
+                "nextPhraseID":"X"
+            }
+        ]
+    },
+    {
+        "id":"quasi_3",
+        "message":"He says living people don't like it. I suggested burying living people once. Zorvan was very angry about it, so I will not suggest that again.",
+        "replies":[
+            {
+                "text":"I didn't need to know that. I'll be leaving now.",
+                "nextPhraseID":"X"
+            },
+            {
+                "text":"I'm outta here!",
+                "nextPhraseID":"X"
+            }
+        ]
+    },
+    {
+        "id":"zorvan_0",
+        "message":"You shouldn't be down here. What do you want?",
+        "replies":[
+            {
+                "text":"Who are you?",
+                "nextPhraseID":"zorvan_1_0"
+            },
+            {
+                "text":"Can you tell me anything about what happened to Lawellyn?",
+                "nextPhraseID":"zorvan_2_0",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":100
+                    }
+                ]
+            },
+            {
+                "text":"Can you tell me anything about what happened to Lawellyn?",
+                "nextPhraseID":"zorvan_2_0",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":90
+                    }
+                ]
+            },
+            {
+                "text":"Sorry. I'll leave.",
+                "nextPhraseID":"X"
+            }
+        ]
+    },
+    {
+        "id":"zorvan_1_0",
+        "message":"My name is Zorvan. I perform several duties at the church, but the most important is that I am the undertaker for Brimhaven. ",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"zorvan_1_1"
+            }
+        ]
+    },
+    {
+        "id":"zorvan_1_1",
+        "message":"As such, I prepare dead bodies for burial, make the funeral arrangements, etc. I am also responsible for preparation of the grave. ",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"zorvan_1_2"
+            }
+        ]
+    },
+    {
+        "id":"zorvan_1_2",
+        "message":"I don't actually dig the grave of course. Quasi, over there, does that. He's not very pretty, but he's strong, and he enjoys digging. Oddly, he seems to enjoy filling the soil back in on top of the casket even more. He's useful, so I prefer not to think about his motives. ",
+        "replies":[
+            {
+                "text":"[Sarcasm] It sounds like you have a really fun job. Can you tell me anything about what happened to Lawellyn?",
+                "nextPhraseID":"zorvan_2_0",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":90
+                    }
+                ]
+            },
+            {
+                "text":"[Sarcasm] It sounds like you have a really fun job. Can you tell me anything about what happened to Lawellyn?",
+                "nextPhraseID":"zorvan_2_0",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":100
+                    }
+                ]
+            },
+            {
+                "text":"[Sarcasm] It sounds like you have a really fun job. I'll be leaving now.",
+                "nextPhraseID":"X"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"nondisplay_bhvt",
+                "value":30
+            }
+        ]
+    },
+    {
+        "id":"zorvan_2_0",
+        "message":"Not really. I buried him some time ago. The circumstances of his death were apparently suspicious, but I don't know anything more. My job is to put them in the ground, not to worry about how they died.",
+        "replies":[
+            {
+                "text":"What is it that you do?",
+                "nextPhraseID":"zorvan_1_0"
+            },
+            {
+                "text":"OK. Thanks. I'll be going now.",
+                "nextPhraseID":"X"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"brv_dagger",
+                "value":105
+            }
+        ]
+    },
+    {
+        "id":"oromir_basement_help_15",
+        "message":"Goodbye."
+    },
+    {
+        "id":"brimhaven_church_guard_1",
+        "message":"Well, in that case I suppose it's OK. You can proceed."
+    },
+    {
+        "id":"leta_oromir_complete2_helped_oromir",
+        "message":"What about him?",
+        "replies":[
+            {
+                "text":"Nevermind. I have to be on my way.",
+                "nextPhraseID":"X"
+            },
+            {
+                "text":"I'm wondering, how long are you going to make him stay in the basement for?",
+                "nextPhraseID":"leta_oromir_complete2_helped_oromir_10"
+            }
+        ]
+    },
+    {
+        "id":"leta_oromir_complete2_helped_oromir_10",
+        "message":"This is my house!  I don't have to answer to you.\nNow get out of here!"
+    },
+    {
+        "id":"brv_churchcat",
+        "message":"Purr.",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"brv_churchcat_1",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"cat_and_mouse",
+                        "value":70
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        "id":"brv_churchcat_1",
+        "message":"Purrrrrrrrr."
+    },
+    {
+        "id":"brv_churchmouse",
+        "message":"Peep."
+    },
+    {
+        "id":"brv_ring_bells",
+        "replies":[
+            {
+                "nextPhraseID":"brv_ring_bells_10",
+                "requires":[
+                    {
+                        "requireType":"random",
+                        "requireID":"75"
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"brv_ring_bells_20"
+            }
+        ]
+    },
+    {
+        "id":"brv_ring_bells_10",
+        "message":"D  O  N  G !",
+        "switchToNPC":"none",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"brv_ring_bells"
+            }
+        ]
+    },
+    {
+        "id":"brv_ring_bells_20",
+        "replies":[
+            {
+                "nextPhraseID":"brv_ring_bells_90",
+                "requires":[
+                    {
+                        "requireType":"factionScore",
+                        "requireID":"brv_ring_bells",
+                        "value":6
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"cat_and_mouse",
+                        "value":60
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"brv_ring_bells_70",
+                "requires":[
+                    {
+                        "requireType":"factionScore",
+                        "requireID":"brv_ring_bells",
+                        "value":5
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"brv_ring_bells_60",
+                "requires":[
+                    {
+                        "requireType":"factionScore",
+                        "requireID":"brv_ring_bells",
+                        "value":4
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"brv_ring_bells_50",
+                "requires":[
+                    {
+                        "requireType":"factionScore",
+                        "requireID":"brv_ring_bells",
+                        "value":3
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"brv_ring_bells_40",
+                "requires":[
+                    {
+                        "requireType":"factionScore",
+                        "requireID":"brv_ring_bells",
+                        "value":2
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"brv_ring_bells_30"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"alignmentChange",
+                "rewardID":"brv_ring_bells",
+                "value":1
+            }
+        ]
+    },
+    {
+        "id":"brv_ring_bells_30",
+        "message":"Dear child, these bells are no toy. Don't ring them, otherwise people might think of danger, like fire or foe.",
+        "switchToNPC":"brv_churchman",
+        "replies":[
+            {
+                "text":"Oh, I didn't know. Sorry.",
+                "nextPhraseID":"X"
+            },
+            {
+                "text":"Really? Then it is even more fun!",
+                "nextPhraseID":"brv_ring_bells_10"
+            }
+        ]
+    },
+    {
+        "id":"brv_ring_bells_40",
+        "message":"What do you think you are doing?",
+        "switchToNPC":"brv_churchman",
+        "replies":[
+            {
+                "text":"Eh - nothing.",
+                "nextPhraseID":"X"
+            }
+        ]
+    },
+    {
+        "id":"brv_ring_bells_50",
+        "message":"Leave the bells alone, or I will get angry!",
+        "switchToNPC":"brv_churchman",
+        "replies":[
+            {
+                "text":"But it's such a nice sound ...",
+                "nextPhraseID":"X"
+            }
+        ]
+    },
+    {
+        "id":"brv_ring_bells_60",
+        "message":"Leave the bells alone, or I will get really angry!",
+        "switchToNPC":"brv_churchman",
+        "replies":[
+            {
+                "text":"Well, I will try ...",
+                "nextPhraseID":"X"
+            },
+            {
+                "text":"Pleeease, only one more time, or two ...",
+                "nextPhraseID":"brv_ring_bells_10"
+            }
+        ]
+    },
+    {
+        "id":"brv_ring_bells_70",
+        "message":"Leave the bells alone, or I will get REALLY angry!",
+        "switchToNPC":"brv_churchman",
+        "replies":[
+            {
+                "text":"I just cannot resist ...",
+                "nextPhraseID":"X"
+            }
+        ]
+    },
+    {
+        "id":"brv_ring_bells_90",
+        "message":"That does it! Leave this tower immediately! And don't you ever dare come back!",
+        "switchToNPC":"brv_churchman",
+        "replies":[
+            {
+                "text":"Oh my.",
+                "nextPhraseID":"X"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"brv_nondisplay2",
+                "value":60
+            }
+        ]
+    },
+    {
+        "id":"brv_ring_bells_key",
+        "message":"No, you are not permitted to enter the tower anymore!",
+        "switchToNPC":"brv_churchman"
+    },
+    {
+        "id":"brv_ring_bells_random",
+        "replies":[
+            {
+                "nextPhraseID":"brv_ring_bells_random_10",
+                "requires":[
+                    {
+                        "requireType":"random",
+                        "requireID":"5"
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        "id":"brv_ring_bells_random_10",
+        "message":"D  O  N  G !",
+        "switchToNPC":"none",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"brv_ring_bells_random_12"
+            }
+        ]
+    },
+    {
+        "id":"brv_ring_bells_random_12",
+        "replies":[
+            {
+                "nextPhraseID":"brv_ring_bells_random_10",
+                "requires":[
+                    {
+                        "requireType":"random",
+                        "requireID":"75"
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"brv_ring_bells_random_20",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_nondisplay2",
+                        "value":60
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"X"
+            }
+        ]
+    },
+    {
+        "id":"brv_ring_bells_random_20",
+        "message":"Quasi must have found a way to the tower again..."
+    },
+    {
+        "id":"brv_churchman",
+        "message":"Hello. I am Seviron. You are not supposed to be up here.",
+        "replies":[
+            {
+                "text":"What is this room used for?",
+                "nextPhraseID":"brv_churchman_01"
+            },
+            {
+                "text":"I'm looking for my brother, Andor. He looks a bit like me. Have you seen him?",
+                "nextPhraseID":"brv_churchman_01a"
+            },
+            {
+                "text":"Sorry, I'll leave.",
+                "nextPhraseID":"X"
+            }
+        ]
+    },
+    {
+        "id":"brv_churchman_01",
+        "message":"This is the church bell tower. ",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"brv_churchman_02"
+            }
+        ]
+    },
+    {
+        "id":"brv_churchman_01a",
+        "message":"No. Irritating children do not usually come up here. You are an exception.",
+        "replies":[
+            {
+                "text":"Hmm. OK. What is this room?",
+                "nextPhraseID":"brv_churchman_01"
+            },
+            {
+                "text":"Sorry. I'll leave.",
+                "nextPhraseID":"X"
+            }
+        ]
+    },
+    {
+        "id":"brv_churchman_02",
+        "message":"We use the bells to both notify townsfolk when there is a service, and to warn of danger to the town. ",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"brv_churchman_03"
+            }
+        ]
+    },
+    {
+        "id":"brv_churchman_03",
+        "message":"I am the bell-ringer. Unfortunately, I also have to guard the bells from Quasi. He likes to ring them even when there is no reason to do so.",
+        "replies":[
+            {
+                "text":"Who is Quasi?",
+                "nextPhraseID":"brv_churchman_04a",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"nondisplay_bhvt",
+                        "value":30,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"cat_and_mouse",
+                        "value":10,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"Quasi is...interesting.",
+                "nextPhraseID":"brv_churchman_04b",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"nondisplay_bhvt",
+                        "value":30
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"cat_and_mouse",
+                        "value":10,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"OK. Thanks. I'm looking for my brother, Andor. Have you seen him?",
+                "nextPhraseID":"brv_churchman_01a"
+            }
+        ]
+    },
+    {
+        "id":"brv_churchman_04a",
+        "message":"Quasi is the grave digger. He is usually in the basement. Sometimes he is trouble, but mostly he is useful. Anyway, he has nowhere else to go, so he lives in the church.",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"brv_churchman_05"
+            }
+        ]
+    },
+    {
+        "id":"brv_churchman_04b",
+        "message":"Yes, that is one way to put it. \t\nHe is useful, so he lives here in the church. He has nowhere else to go anyway, so we accommodate him.",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"brv_churchman_05"
+            }
+        ]
+    },
+    {
+        "id":"brv_churchman_05",
+        "message":"Is there anything else I can help you with? You are distracting me from watching the cat and the mouse on the other side of the room.",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"brv_churchman_06"
+            }
+        ]
+    },
+    {
+        "id":"brv_churchman_06",
+        "message":"The mice like to chew the bell rope, which is a problem. So we brought in the cat to control them. That particular mouse seems to be very good at evading the cat though. It knows just when to turn, and just where to hide where the cat cannot reach it. If the cat cannot get rid of it, I will have to think of something else.",
+        "replies":[
+            {
+                "text":"Can I help in some way?",
+                "nextPhraseID":"brv_churchman_07"
+            },
+            {
+                "text":"I need to find my brother. Bye.",
+                "nextPhraseID":"X"
+            },
+            {
+                "text":"Good luck with that! I have more important things to deal with. Bye.",
+                "nextPhraseID":"X"
+            }
+        ]
+    },
+    {
+        "id":"brv_churchman_07",
+        "message":"You could help me trap it. I need some cheese, a large empty bottle, and some rocks that we can use to prop up the bottle at an angle. If the mouse crawls in to get the cheese, it will not be able to get out again.",
+        "replies":[
+            {
+                "text":"OK. I'll help.",
+                "nextPhraseID":"brv_churchman_08"
+            },
+            {
+                "text":"Sorry. I don't have time for that. I have to go.",
+                "nextPhraseID":"X"
+            }
+        ]
+    },
+    {
+        "id":"brv_churchman_08",
+        "message":"Thanks. Just bring me the items. I think three rocks should be enough. ",
+        "replies":[
+            {
+                "text":"I have the rocks.",
+                "nextPhraseID":"brv_churchman_09a",
+                "requires":[
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"rock",
+                        "value":3
+                    },
+                    {
+                        "requireType":"inventoryKeep",
+                        "requireID":"cheese",
+                        "value":1,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"I have the cheese.",
+                "nextPhraseID":"brv_churchman_09b",
+                "requires":[
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"cheese",
+                        "value":1
+                    },
+                    {
+                        "requireType":"inventoryKeep",
+                        "requireID":"rock",
+                        "value":3,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"I have the rocks and the cheese.",
+                "nextPhraseID":"brv_churchman_09c",
+                "requires":[
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"rock",
+                        "value":3
+                    },
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"cheese",
+                        "value":1
+                    }
+                ]
+            },
+            {
+                "text":"I'll go and get the items you asked for.",
+                "nextPhraseID":"X"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"cat_and_mouse",
+                "value":10
+            }
+        ]
+    },
+    {
+        "id":"brv_churchman_09a",
+        "message":"Thanks. Now we just need the cheese and the bottle.",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"cat_and_mouse",
+                "value":20
+            }
+        ]
+    },
+    {
+        "id":"brv_churchman_09b",
+        "message":"Thanks. Now we just need the rocks and the bottle.",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"cat_and_mouse",
+                "value":30
+            }
+        ]
+    },
+    {
+        "id":"brv_churchman_09c",
+        "message":"Thanks. Now we just need the bottle. You should ask around town. Someone must have one.",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"cat_and_mouse",
+                "value":20
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"cat_and_mouse",
+                "value":30
+            }
+        ]
+    },
+    {
+        "id":"brv_churchman_start",
+        "replies":[
+            {
+                "nextPhraseID":"brv_churchman_b1",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"cat_and_mouse",
+                        "value":20
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"cat_and_mouse",
+                        "value":30
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"cat_and_mouse",
+                        "value":50,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"brv_churchman_i1",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"cat_and_mouse",
+                        "value":10,
+                        "negate":false
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"cat_and_mouse",
+                        "value":20
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"cat_and_mouse",
+                        "value":30,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"brv_churchman_i1",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"cat_and_mouse",
+                        "value":10
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"cat_and_mouse",
+                        "value":20,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"cat_and_mouse",
+                        "value":30
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"brv_churchman_i1",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"cat_and_mouse",
+                        "value":10
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"cat_and_mouse",
+                        "value":20,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"cat_and_mouse",
+                        "value":30,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"brv_churchman_trap1",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"cat_and_mouse",
+                        "value":50
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"cat_and_mouse",
+                        "value":60,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"brv_churchman_banned",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_nondisplay2",
+                        "value":60
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"brv_churchman",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"cat_and_mouse",
+                        "value":10,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"brv_churchman_default1"
+            }
+        ]
+    },
+    {
+        "id":"brv_churchman_b1",
+        "message":"Do you have the bottle?",
+        "replies":[
+            {
+                "text":"Yes. Here it is.",
+                "nextPhraseID":"brv_churchman_b2",
+                "requires":[
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"large_bottle",
+                        "value":1
+                    }
+                ]
+            },
+            {
+                "text":"No, not yet. I'm still looking for one.",
+                "nextPhraseID":"X"
+            }
+        ]
+    },
+    {
+        "id":"brv_churchman_i1",
+        "message":"Do you have the items we need for the trap?",
+        "replies":[
+            {
+                "text":"I have the rocks.",
+                "nextPhraseID":"brv_churchman_09a",
+                "requires":[
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"rock",
+                        "value":3
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"cat_and_mouse",
+                        "value":30,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"inventoryKeep",
+                        "requireID":"cheese",
+                        "value":1,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"I have the rocks.",
+                "nextPhraseID":"brv_churchman_09c",
+                "requires":[
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"rock",
+                        "value":3
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"cat_and_mouse",
+                        "value":30
+                    }
+                ]
+            },
+            {
+                "text":"I have the cheese.",
+                "nextPhraseID":"brv_churchman_09b",
+                "requires":[
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"cheese",
+                        "value":1
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"cat_and_mouse",
+                        "value":20,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"inventoryKeep",
+                        "requireID":"rock",
+                        "value":3,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"I have the cheese.",
+                "nextPhraseID":"brv_churchman_09c",
+                "requires":[
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"cheese",
+                        "value":1
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"cat_and_mouse",
+                        "value":20
+                    }
+                ]
+            },
+            {
+                "text":"I have the rocks and the cheese.",
+                "nextPhraseID":"brv_churchman_09c",
+                "requires":[
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"rock",
+                        "value":3
+                    },
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"cheese",
+                        "value":1
+                    }
+                ]
+            },
+            {
+                "text":"No, not yet.",
+                "nextPhraseID":"X"
+            }
+        ]
+    },
+    {
+        "id":"brv_churchman_b2",
+        "message":"Excellent. I'll set the trap. This will require some patience though, so you should come back later to see if it worked.",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"cat_and_mouse",
+                "value":50
+            },
+            {
+                "rewardType":"createTimer",
+                "rewardID":"mouse_trap"
+            }
+        ]
+    },
+    {
+        "id":"arlish_bottle_1",
+        "message":"Well, that's an unusual request. What would you need such a thing for?",
+        "replies":[
+            {
+                "text":"Seviron at the church needs it. I'm just helping out.",
+                "nextPhraseID":"arlish_bottle_2"
+            },
+            {
+                "text":"Nevermind. If you don't have one you should just say so. I'll look elsewhere.",
+                "nextPhraseID":"X"
+            }
+        ]
+    },
+    {
+        "id":"arlish_bottle_2",
+        "message":"Well, I do happen to have one. I don't display it as shop inventory because I've never been asked for such a thing before. Since it's for the church, you can have it for free.",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"cat_and_mouse",
+                "value":40
+            },
+            {
+                "rewardType":"dropList",
+                "rewardID":"arlish_bottle"
+            }
+        ]
+    },
+    {
+        "id":"brv_churchman_trap1",
+        "replies":[
+            {
+                "nextPhraseID":"brv_churchman_trap2",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"nondisplay_bhvt",
+                        "value":40
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"brv_churchman_trap3"
+            }
+        ]
+    },
+    {
+        "id":"brv_churchman_trap2",
+        "message":"We caught the mouse! Here it is, in the bottle. You can decide what to do with it. And here's a little gold for your help.",
+        "replies":[
+            {
+                "text":"I'll give it to the cat. That should solve the problem!",
+                "nextPhraseID":"brv_churchman_trap3a",
+                "requires":[
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"trapped_mouse",
+                        "value":1
+                    }
+                ]
+            },
+            {
+                "text":"I'll release it outside.",
+                "nextPhraseID":"brv_churchman_trap3b"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"cat_and_mouse",
+                "value":60
+            },
+            {
+                "rewardType":"dropList",
+                "rewardID":"trapped_mouse"
+            }
+        ]
+    },
+    {
+        "id":"brv_churchman_trap3",
+        "message":"Sorry, the mouse is still running around. We will get it though. Be patient."
+    },
+    {
+        "id":"brv_churchman_trap3a",
+        "message":"Hmm. I'm sure the cat will be happy, but I doubt the mouse will!",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"cat_and_mouse",
+                "value":70
+            },
+            {
+                "rewardType":"dropList",
+                "rewardID":"arlish_bottle"
+            }
+        ]
+    },
+    {
+        "id":"brv_churchman_trap3b",
+        "message":"Well, don't release it in the town. It will just go into another building.",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"cat_and_mouse",
+                "value":80
+            }
+        ]
+    },
+    {
+        "id":"brv_churchman_default1",
+        "message":"Hello again. Is there something I can help you with?",
+        "replies":[
+            {
+                "text":"I'm looking for my brother, Andor. He looks a bit like me.",
+                "nextPhraseID":"Brv_churchman_default2"
+            },
+            {
+                "text":"No thanks. I'll be going.",
+                "nextPhraseID":"X"
+            }
+        ]
+    },
+    {
+        "id":"Brv_churchman_default2",
+        "message":"Sorry, I haven't seen anyone like that."
+    },
+    {
+        "id":"brv_churchman_banned",
+        "message":"Go away, naughty kid!"
+    },
+    {
+        "id":"release_mouse0",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"release_mouse1",
+                "requires":[
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"trapped_mouse",
+                        "value":1
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        "id":"release_mouse1",
+        "message":"This looks like a good place to release the mouse.",
+        "switchToNPC":"none",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"release_mouse2"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"dropList",
+                "rewardID":"arlish_bottle"
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"cat_and_mouse",
+                "value":90
+            }
+        ]
+    },
+    {
+        "id":"release_mouse2",
+        "message":"Hopefully it will find something to eat other than bell ropes!"
+    },
+    {
+        "id":"brv_church_timer",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"brv_church_timer_1",
+                "requires":[
+                    {
+                        "requireType":"timerElapsed",
+                        "requireID":"mouse_trap",
+                        "value":15
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        "id":"brv_church_timer_1",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"nondisplay_bhvt",
+                "value":40
+            },
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"brv_churchmouse",
+                "mapName":"brimhaven_church_upstairs"
+            }
+        ]
+    },
+    {
+        "id":"graveyardday2a",
+        "message":"The defeat of the undead master seems to have lifted the spell animating the remaining corpses and they return to their graves.",
+        "rewards":[
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"graveyard_corpse_0",
+                "mapName":"graveyard1"
+            },
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"graveyard_corpse_1",
+                "mapName":"graveyard1"
+            },
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"graveyard_corpse_2",
+                "mapName":"graveyard1"
+            },
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"graveyard_corpse_3",
+                "mapName":"graveyard1"
+            },
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"graveyard_corpse_4",
+                "mapName":"graveyard1"
+            },
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"graveyard_corpse_5",
+                "mapName":"graveyard1"
+            },
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"graveyard_corpse_6",
+                "mapName":"graveyard1"
+            },
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"graveyard_corpse_7",
+                "mapName":"graveyard1"
+            },
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"graveyard_corpse_8",
+                "mapName":"graveyard1"
+            },
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"graveyard_corpse_9",
+                "mapName":"graveyard1"
+            },
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"graveyard_corpse2_0",
+                "mapName":"graveyard1"
+            },
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"graveyard_corpse2_1",
+                "mapName":"graveyard1"
+            },
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"graveyard_corpse2_2",
+                "mapName":"graveyard1"
+            },
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"graveyard_corpse2_3",
+                "mapName":"graveyard1"
+            },
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"graveyard_corpse2_4",
+                "mapName":"graveyard1"
+            },
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"graveyard_corpse2_5",
+                "mapName":"graveyard1"
+            },
+            {
+                "rewardType":"changeMapFilter",
+                "rewardID":"none",
+                "mapName":"graveyard1"
+            },
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"graveyard_corpse2",
+                "mapName":"graveyard0"
+            },
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"graveyard_corpse_entrance",
+                "mapName":"graveyard1"
+            },
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"graveyard_corpse_boss_patrol",
+                "mapName":"graveyard1"
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"nondisplay_2",
+                "value":240
+            }
+        ]
+    },
+    {
+        "id":"boss_killed",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"boss_killed1",
+                "requires":[
+                    {
+                        "requireType":"killedMonster",
+                        "requireID":"graveyardking",
+                        "value":1
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        "id":"boss_killed1",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"nondisplay_2",
+                "value":240
+            }
+        ]
+    },
+    {
+        "id":"despawn_fix0",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"despawn_fix1",
+                "requires":[
+                    {
+                        "requireType":"killedMonster",
+                        "requireID":"graveyardking",
+                        "value":1,
+                        "negate":false
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"nondisplay_2",
+                        "value":240,
+                        "negate":true
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        "id":"despawn_fix1",
+        "message":"The defeat of the undead master seems to have lifted the spell animating the remaining corpses and they return to their graves.",
+        "rewards":[
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"graveyard_corpse_0",
+                "mapName":"graveyard1"
+            },
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"graveyard_corpse_1",
+                "mapName":"graveyard1"
+            },
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"graveyard_corpse_2",
+                "mapName":"graveyard1"
+            },
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"graveyard_corpse_3",
+                "mapName":"graveyard1"
+            },
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"graveyard_corpse_4",
+                "mapName":"graveyard1"
+            },
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"graveyard_corpse_5",
+                "mapName":"graveyard1"
+            },
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"graveyard_corpse_6",
+                "mapName":"graveyard1"
+            },
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"graveyard_corpse_7",
+                "mapName":"graveyard1"
+            },
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"graveyard_corpse_8",
+                "mapName":"graveyard1"
+            },
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"graveyard_corpse_9",
+                "mapName":"graveyard1"
+            },
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"graveyard_corpse2_0",
+                "mapName":"graveyard1"
+            },
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"graveyard_corpse2_1",
+                "mapName":"graveyard1"
+            },
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"graveyard_corpse2_2",
+                "mapName":"graveyard1"
+            },
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"graveyard_corpse2_3",
+                "mapName":"graveyard1"
+            },
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"graveyard_corpse2_4",
+                "mapName":"graveyard1"
+            },
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"graveyard_corpse2_5",
+                "mapName":"graveyard1"
+            },
+            {
+                "rewardType":"changeMapFilter",
+                "rewardID":"none",
+                "mapName":"graveyard1"
+            },
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"graveyard_corpse2",
+                "mapName":"graveyard0"
+            },
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"graveyard_corpse_entrance",
+                "mapName":"graveyard1"
+            },
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"graveyard_corpse_boss_patrol",
+                "mapName":"graveyard1"
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"nondisplay_2",
+                "value":240
+            }
+        ]
+    }
+]
\ No newline at end of file
diff --git a/AndorsTrail/res/raw/conversationlist_brimhaven_2b.json b/AndorsTrail/res/raw/conversationlist_brimhaven_2b.json
new file mode 100644
index 000000000..549cfc431
--- /dev/null
+++ b/AndorsTrail/res/raw/conversationlist_brimhaven_2b.json
@@ -0,0 +1,586 @@
+[
+    {
+        "id":"hettar",
+        "replies":[
+            {
+                "nextPhraseID":"hettar_90",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"hettar_dog",
+                        "value":90
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"hettar_80",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"hettar_dog",
+                        "value":80
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"hettar_50",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"hettar_dog",
+                        "value":50
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"hettar_30",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"hettar_dog",
+                        "value":30
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"hettar_20",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"hettar_dog",
+                        "value":20
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"hettar_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"hettar_dog",
+                        "value":10
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"hettar_1"
+            }
+        ]
+    },
+    {
+        "id":"hettar_1",
+        "message":"Norry!  Nooorryyyy!",
+        "replies":[
+            {
+                "text":"Hush! Don't make such noise with all these monsters around!",
+                "nextPhraseID":"hettar_1_4"
+            },
+            {
+                "text":"Who is Norry?",
+                "nextPhraseID":"hettar_1_2"
+            }
+        ]
+    },
+    {
+        "id":"hettar_1_2",
+        "message":"Norry is my little doggie. He fell down the steep slope and has not found his way back yet.",
+        "replies":[
+            {
+                "text":"Oh dear.",
+                "nextPhraseID":"hettar_10"
+            },
+            {
+                "text":"A dog! He will be back soon... I better go now.",
+                "nextPhraseID":"X"
+            },
+            {
+                "text":"I have seen a great wolfhound down there a short while ago. But you say you are missing a little doggie.",
+                "nextPhraseID":"hettar_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"hettar_dog_nd",
+                        "value":1
+                    }
+                ]
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"hettar_dog",
+                "value":10
+            }
+        ]
+    },
+    {
+        "id":"hettar_1_4",
+        "message":"I can see these Gornauds myself. That's why I must find Norry urgently.\nNooorryyyy!",
+        "replies":[
+            {
+                "text":"Who is Norry?",
+                "nextPhraseID":"hettar_1_2"
+            }
+        ]
+    },
+    {
+        "id":"hettar_10",
+        "message":"Please help to find Norry. He is my only friend, and he is helpless without me.",
+        "replies":[
+            {
+                "text":"How can I help you?",
+                "nextPhraseID":"hettar_20"
+            },
+            {
+                "text":"The wolfhound down there had brown fur with a white patch on the breast. He was enjoying himself gnawing some huge bones.",
+                "nextPhraseID":"hettar_10_4",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"hettar_dog_nd",
+                        "value":1
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        "id":"hettar_10_4",
+        "message":"This must be him! Go and get him here - be quick!",
+        "replies":[
+            {
+                "text":"That would be of no use. This brute had attacked me, so I had to kill it.",
+                "nextPhraseID":"hettar_10_6",
+                "requires":[
+                    {
+                        "requireType":"killedMonster",
+                        "requireID":"hettar_dog3",
+                        "value":1
+                    }
+                ]
+            },
+            {
+                "text":"This brute growled at me, but I got away unharmed.",
+                "nextPhraseID":"hettar_20",
+                "requires":[
+                    {
+                        "requireType":"killedMonster",
+                        "requireID":"hettar_dog3",
+                        "value":1,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"Eh, I have to leave.",
+                "nextPhraseID":"X"
+            }
+        ]
+    },
+    {
+        "id":"hettar_10_6",
+        "message":"[Hettar fell on the floor]\nNooo! What did you do?!",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"hettar_dog",
+                "value":90
+            }
+        ]
+    },
+    {
+        "id":"hettar_20",
+        "message":"Please go down there and look for my doggie. Maybe he is injured? Bring him back! You must!",
+        "replies":[
+            {
+                "text":"OK, I'll do it.",
+                "nextPhraseID":"hettar_20_10",
+                "requires":[
+                    {
+                        "requireType":"killedMonster",
+                        "requireID":"hettar_dog3",
+                        "value":1,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"This brute attacked me, so I had to kill it.",
+                "nextPhraseID":"hettar_10_6",
+                "requires":[
+                    {
+                        "requireType":"killedMonster",
+                        "requireID":"hettar_dog3",
+                        "value":1
+                    }
+                ]
+            },
+            {
+                "text":"Eh, I have to leave.",
+                "nextPhraseID":"X"
+            }
+        ]
+    },
+    {
+        "id":"hettar_20_10",
+        "message":"Great! Go immediately, as long as he might be alive still.",
+        "replies":[
+            {
+                "text":"I hope he will follow me.",
+                "nextPhraseID":"hettar_20_30",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"hettar_dog",
+                        "value":30,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"I hope he will follow me.",
+                "nextPhraseID":"hettar_20_20",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"hettar_dog",
+                        "value":30
+                    }
+                ]
+            },
+            {
+                "text":"I have no time just now. I'll be back soon.",
+                "nextPhraseID":"X"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"hettar_dog",
+                "value":20
+            },
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"hettar_dog3",
+                "mapName":"blackwater_mountain55"
+            },
+            {
+                "rewardType":"spawnAll",
+                "rewardID":"hettar_dog",
+                "mapName":"blackwater_mountain55"
+            }
+        ]
+    },
+    {
+        "id":"hettar_20_20",
+        "message":"I gave you my last piece of Wyrm meat for Norry. Did you lose it?"
+    },
+    {
+        "id":"hettar_20_30",
+        "message":"Good that you have mentioned it. I'll give you a nice raw piece of Wyrm meat that I have as food for Norry. He loves them.",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"hettar_dog",
+                "value":30
+            },
+            {
+                "rewardType":"giveItem",
+                "rewardID":"hettar_bone",
+                "value":1
+            }
+        ]
+    },
+    {
+        "id":"hettar_30",
+        "message":"I can read it in your face - there is no hope for Norry.",
+        "replies":[
+            {
+                "text":"This brute attacked me, so I had to kill it.",
+                "nextPhraseID":"hettar_10_6",
+                "requires":[
+                    {
+                        "requireType":"killedMonster",
+                        "requireID":"hettar_dog3",
+                        "value":1
+                    }
+                ]
+            },
+            {
+                "text":"This brute growled at me, but I got away and let it live.",
+                "nextPhraseID":"hettar_20",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"hettar_dog_nd",
+                        "value":1
+                    },
+                    {
+                        "requireType":"killedMonster",
+                        "requireID":"hettar_dog3",
+                        "value":1,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"I am still searching.",
+                "nextPhraseID":"X"
+            }
+        ]
+    },
+    {
+        "id":"hettar_50",
+        "message":"Haha! You know what? Norry has come back all alone! You have made all the way down unnecessarily.",
+        "replies":[
+            {
+                "text":"Now guess who had persuaded him to do so? He was absorbed by a pile of monster bones.",
+                "nextPhraseID":"hettar_50_10"
+            }
+        ]
+    },
+    {
+        "id":"hettar_50_10",
+        "message":"Oh. Thank you then.",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"hettar_dog",
+                "value":80
+            }
+        ]
+    },
+    {
+        "id":"hettar_80",
+        "message":"Thank you again a thousand times for rescuing my little Norry!"
+    },
+    {
+        "id":"hettar_90",
+        "message":"My poor Norry! Why did you have to die so young?\n* Sob *",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"hettar_90_10"
+            }
+        ]
+    },
+    {
+        "id":"hettar_90_10",
+        "message":"Go away! I hate you!"
+    },
+    {
+        "id":"hettar_bones",
+        "replies":[
+            {
+                "nextPhraseID":"hettar_bones_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"hettar_dog_nd",
+                        "value":2,
+                        "negate":true
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        "id":"hettar_bones_10",
+        "message":"You see several huge bones of a monstrous skeleton. Good that this creature is dead now and not attacking you.",
+        "replies":[
+            {
+                "text":"Take the bones.",
+                "nextPhraseID":"hettar_bones_20"
+            },
+            {
+                "text":"Leave the bones where they are.",
+                "nextPhraseID":"X"
+            }
+        ]
+    },
+    {
+        "id":"hettar_bones_20",
+        "message":"GROWL!",
+        "switchToNPC":"hettar_dog",
+        "replies":[
+            {
+                "text":"The wolfhound doesn't want you to take 'his' bones.\nTake them nevertheless.",
+                "nextPhraseID":"hettar_bones_30"
+            },
+            {
+                "text":"Leave the bones where they are.",
+                "nextPhraseID":"X"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"hettar_dog_nd",
+                "value":1
+            }
+        ]
+    },
+    {
+        "id":"hettar_bones_30",
+        "replies":[
+            {
+                "nextPhraseID":"hettar_bones_40",
+                "requires":[
+                    {
+                        "requireType":"inventoryKeep",
+                        "requireID":"hettar_bone",
+                        "value":1,
+                        "negate":true
+                    }
+                ]
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"giveItem",
+                "rewardID":"bwm_bones",
+                "value":1
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"hettar_dog_nd",
+                "value":2
+            }
+        ]
+    },
+    {
+        "id":"hettar_bones_40",
+        "rewards":[
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"hettar_dog",
+                "mapName":"blackwater_mountain55"
+            },
+            {
+                "rewardType":"spawnAll",
+                "rewardID":"hettar_dog3",
+                "mapName":"blackwater_mountain55"
+            }
+        ]
+    },
+    {
+        "id":"hettar_dog",
+        "message":"Growl!",
+        "replies":[
+            {
+                "text":"Hey Norry, look here! I have some much better food for you from Hettar.",
+                "nextPhraseID":"hettar_dog_10",
+                "requires":[
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"hettar_bone",
+                        "value":1
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"hettar_dog_nd",
+                        "value":2
+                    }
+                ]
+            },
+            {
+                "text":"Hey Norry, look here! I have a Wyrm steak for you from Hettar.",
+                "nextPhraseID":"hettar_dog_50",
+                "requires":[
+                    {
+                        "requireType":"inventoryKeep",
+                        "requireID":"hettar_bone",
+                        "value":1
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"hettar_dog_nd",
+                        "value":2,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"Now run to Hettar! He is waiting for you.",
+                "nextPhraseID":"hettar_dog_20",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"hettar_dog",
+                        "value":40
+                    }
+                ]
+            },
+            {
+                "text":"OK, I go. Stupid dog.",
+                "nextPhraseID":"X"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"hettar_dog_nd",
+                "value":1
+            }
+        ]
+    },
+    {
+        "id":"hettar_dog_10",
+        "message":"The wolfhound fetched the meat from your hand and devoured it greedily in a few seconds.",
+        "switchToNPC":"none",
+        "replies":[
+            {
+                "text":"There, there. And now run to Hettar! He is waiting for you.",
+                "nextPhraseID":"hettar_dog_20"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"hettar_dog_nd",
+                "value":2
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"hettar_dog",
+                "value":40
+            }
+        ]
+    },
+    {
+        "id":"hettar_dog_20",
+        "message":"A moment later the huge wolfhound was gone.",
+        "switchToNPC":"none",
+        "rewards":[
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"hettar_dog",
+                "mapName":"blackwater_mountain55"
+            },
+            {
+                "rewardType":"spawnAll",
+                "rewardID":"hettar_dog2",
+                "mapName":"blackwater_mountain55"
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"hettar_dog",
+                "value":50
+            }
+        ]
+    },
+    {
+        "id":"hettar_dog_50",
+        "message":"Grrrowl.",
+        "replies":[
+            {
+                "text":"Ah, I see. These monstrous bones here on the ground are delicious too.",
+                "nextPhraseID":"X"
+            }
+        ]
+    },
+    {
+        "id":"hettar_dog2",
+        "message":"Growl!"
+    }
+]
\ No newline at end of file
diff --git a/AndorsTrail/res/raw/conversationlist_burhczyd.json b/AndorsTrail/res/raw/conversationlist_burhczyd.json
index e7861da10..3e894fd73 100644
--- a/AndorsTrail/res/raw/conversationlist_burhczyd.json
+++ b/AndorsTrail/res/raw/conversationlist_burhczyd.json
@@ -1798,7 +1798,7 @@
     },
     {
         "id":"burhczydx_3a_2",
-        "message":"Don't ask. Still no orders. And I have now idea why.",
+        "message":"Don't ask. Still no orders. And I have no idea why.",
         "replies":[
             {
                 "text":"That's horrible! What did you call your company? It should be short and memorable.",
diff --git a/AndorsTrail/res/raw/conversationlist_crossglen_leta.json b/AndorsTrail/res/raw/conversationlist_crossglen_leta.json
index ddb748e77..f2171f40d 100644
--- a/AndorsTrail/res/raw/conversationlist_crossglen_leta.json
+++ b/AndorsTrail/res/raw/conversationlist_crossglen_leta.json
@@ -67,7 +67,31 @@
                 ]
             },
             {
-                "nextPhraseID":"leta_oromir1"
+                "nextPhraseID":"leta_oromir1",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"leta",
+                        "value":105,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"leta",
+                        "value":100,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"leta_oromir_complete2_helped_oromir",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"leta",
+                        "value":105
+                    }
+                ]
             }
         ]
     },
@@ -81,12 +105,150 @@
             },
             {
                 "text":"Yes, I found him. He is hiding among some trees to the east.",
-                "nextPhraseID":"leta_oromir_complete",
+                "nextPhraseID":"leta_oromir1_trees",
                 "requires":[
                     {
                         "requireType":"questProgress",
                         "requireID":"leta",
                         "value":20
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"leta",
+                        "value":35,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"leta",
+                        "value":45,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"leta",
+                        "value":40,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"leta",
+                        "value":60,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"leta",
+                        "value":80,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"leta",
+                        "value":25,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"[Lie] I have no idea.",
+                "nextPhraseID":"leta_oromir1_trees_help",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"leta",
+                        "value":25
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"leta",
+                        "value":35,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"leta",
+                        "value":45,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"[Lie] I have no idea.",
+                "nextPhraseID":"leta_oromir1_behind_inn_help",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"leta",
+                        "value":35
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"leta",
+                        "value":45,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"[Lie] I have no idea.",
+                "nextPhraseID":"leta_oromir1_behind_haystack_help",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"leta",
+                        "value":45
+                    }
+                ]
+            },
+            {
+                "text":"He's found a new hiding spot.",
+                "nextPhraseID":"leta_oromir1_behind_inn_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"leta",
+                        "value":40
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"leta",
+                        "value":60,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"leta",
+                        "value":80,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"He's found another new hiding spot. Give him credit, he is great at avoiding work.",
+                "nextPhraseID":"leta_oromir1_behind_haystack_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"leta",
+                        "value":60
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"leta",
+                        "value":80,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"He's in your basement.",
+                "nextPhraseID":"leta_oromir1_basement_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"leta",
+                        "value":80
                     }
                 ]
             }
@@ -133,8 +295,20 @@
         "message":"I'm hiding here from my wife Leta. She is always getting angry at me for not helping out on the farm. Please don't tell her that I'm here.",
         "replies":[
             {
-                "text":"OK.",
+                "text":"[Lie] OK.",
                 "nextPhraseID":"X"
+            },
+            {
+                "text":"Your secret is safe with me.",
+                "nextPhraseID":"oromir_trees_help_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"leta",
+                        "value":100,
+                        "negate":true
+                    }
+                ]
             }
         ],
         "rewards":[
diff --git a/AndorsTrail/res/raw/conversationlist_erinith.json b/AndorsTrail/res/raw/conversationlist_erinith.json
index d93c6b149..dfe8c375c 100644
--- a/AndorsTrail/res/raw/conversationlist_erinith.json
+++ b/AndorsTrail/res/raw/conversationlist_erinith.json
@@ -368,7 +368,7 @@
                 ]
             },
             {
-                "text":"Here, take this potion of major health.",
+                "text":"Here, take this major potion of health.",
                 "nextPhraseID":"erinith_gavepotion_major_1",
                 "requires":[
                     {
@@ -379,7 +379,7 @@
                 ]
             },
             {
-                "text":"Here, take this potion of major health.",
+                "text":"Here, take this major flask of health.",
                 "nextPhraseID":"erinith_gavepotion_major_1",
                 "requires":[
                     {
diff --git a/AndorsTrail/res/raw/conversationlist_fallhaven_tavern.json b/AndorsTrail/res/raw/conversationlist_fallhaven_tavern.json
index 2bc1eaaed..c0b090287 100644
--- a/AndorsTrail/res/raw/conversationlist_fallhaven_tavern.json
+++ b/AndorsTrail/res/raw/conversationlist_fallhaven_tavern.json
@@ -45,6 +45,17 @@
                     }
                 ]
             },
+            {
+                "text":"Umar sent me.",
+                "nextPhraseID":"bela_room_2",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"misc_nondisplay ",
+                        "value":20
+                    }
+                ]
+            },
             {
                 "text":"No thanks.",
                 "nextPhraseID":"bela"
@@ -53,7 +64,7 @@
     },
     {
         "id":"bela_room_2",
-        "message":"Thanks. Take the last room down at the end of the hall.",
+        "message":"OK. Take the last room down at the end of the hall.",
         "replies":[
             {
                 "text":"Thank you. There was something else I wanted to talk about.",
diff --git a/AndorsTrail/res/raw/conversationlist_falothen.json b/AndorsTrail/res/raw/conversationlist_falothen.json
index 9b4a7725b..1a0b2ceb7 100644
--- a/AndorsTrail/res/raw/conversationlist_falothen.json
+++ b/AndorsTrail/res/raw/conversationlist_falothen.json
@@ -62,6 +62,16 @@
                     }
                 ]
             },
+            {
+                "nextPhraseID":"falothen1_0",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"charwood1",
+                        "value":76
+                    }
+                ]
+            },
             {
                 "nextPhraseID":"falothen1_1"
             }
@@ -109,7 +119,7 @@
     },
     {
         "id":"falothen1_5",
-        "message":"I can teach you about swords, either one-handed or two-handed ones. I know a bit about daggers, axes and blunt weapons. I also know a fair deal about fighting with your bare fists.",
+        "message":"I can teach you about swords, either one-handed or two-handed ones. I know a bit about daggers, axes, polearms, and blunt weapons. I also know a fair deal about fighting with your bare fists.",
         "replies":[
             {
                 "text":"N",
@@ -145,6 +155,10 @@
                 "text":"Tell me more about blunt weapons.",
                 "nextPhraseID":"falothen1_7_b"
             },
+            {
+                "text":"Tell me more about polearms.",
+                "nextPhraseID":"falothen1_7_pa"
+            },
             {
                 "text":"I'll be right back.",
                 "nextPhraseID":"X"
@@ -658,6 +672,10 @@
                 "text":"Tell me more about blunt weapons.",
                 "nextPhraseID":"falothen1_2nd_b"
             },
+            {
+                "text":"Tell me more about polearms.",
+                "nextPhraseID":"falothen1_2nd_pa"
+            },
             {
                 "text":"I'll be right back.",
                 "nextPhraseID":"X"
diff --git a/AndorsTrail/res/raw/conversationlist_gandoren.json b/AndorsTrail/res/raw/conversationlist_gandoren.json
index 8c3d05a8d..4195e5508 100644
--- a/AndorsTrail/res/raw/conversationlist_gandoren.json
+++ b/AndorsTrail/res/raw/conversationlist_gandoren.json
@@ -476,6 +476,18 @@
                         "value":60
                     }
                 ]
+            },
+            {
+                "text":"I'd rather talk about the troubles in Loneford that you had mentioned.",
+                "nextPhraseID":"cr_loneford_st_1",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"loneford",
+                        "value":21,
+                        "negate":true
+                    }
+                ]
             }
         ]
     },
diff --git a/AndorsTrail/res/raw/conversationlist_graveyard1.json b/AndorsTrail/res/raw/conversationlist_graveyard1.json
index 4a02a1349..424f0ce92 100644
--- a/AndorsTrail/res/raw/conversationlist_graveyard1.json
+++ b/AndorsTrail/res/raw/conversationlist_graveyard1.json
@@ -1072,8 +1072,8 @@
                     },
                     {
                         "requireType":"questProgress",
-                        "requireID":"graveyard_quest",
-                        "value":80,
+                        "requireID":"nondisplay_2",
+                        "value":240,
                         "negate":true
                     },
                     {
@@ -1082,6 +1082,23 @@
                         "value":1
                     }
                 ]
+            },
+            {
+                "text":"N",
+                "nextPhraseID":"graveyardday2a",
+                "requires":[
+                    {
+                        "requireType":"killedMonster",
+                        "requireID":"graveyardking",
+                        "value":1
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"nondisplay_2",
+                        "value":240,
+                        "negate":true
+                    }
+                ]
             }
         ]
     },
@@ -1391,6 +1408,11 @@
                 "rewardType":"removeSpawnArea",
                 "rewardID":"graveyard_corpse_boss_patrol",
                 "mapName":"graveyard1"
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"nondisplay_2",
+                "value":240
             }
         ]
     },
@@ -1746,7 +1768,7 @@
         "message":"What's a kid like you doing around here? It's a dangerous place to be.",
         "replies":[
             {
-                "text":"I'm looking for my Brother, Andor. He looks a bit like me.",
+                "text":"I'm looking for my brother, Andor. He looks a bit like me.",
                 "nextPhraseID":"cithurn_65"
             },
             {
diff --git a/AndorsTrail/res/raw/conversationlist_guynmart2_npc.json b/AndorsTrail/res/raw/conversationlist_guynmart2_npc.json
index 295c3892f..65432c8c8 100644
--- a/AndorsTrail/res/raw/conversationlist_guynmart2_npc.json
+++ b/AndorsTrail/res/raw/conversationlist_guynmart2_npc.json
@@ -265,7 +265,8 @@
     },
     {
         "id":"guynmart_dog10_10",
-        "message":"Grrrrrr"
+        "message":"Grrrrrr",
+        "switchToNPC":"guynmart_dog10"
     },
     {
         "id":"guynmart_cguard_10",
diff --git a/AndorsTrail/res/raw/conversationlist_lodar.json b/AndorsTrail/res/raw/conversationlist_lodar.json
index fb9932dc8..77d96d47b 100644
--- a/AndorsTrail/res/raw/conversationlist_lodar.json
+++ b/AndorsTrail/res/raw/conversationlist_lodar.json
@@ -1569,7 +1569,7 @@
     },
     {
         "id":"lodar_andor0",
-        "message":"Oh, you must be referring to that other boy that was here recently.",
+        "message":"Oh, you must be referring to that older boy that was here recently.",
         "replies":[
             {
                 "text":"You've seen him? Andor has been here?",
diff --git a/AndorsTrail/res/raw/conversationlist_loneford_2.json b/AndorsTrail/res/raw/conversationlist_loneford_2.json
index e3068684b..9e174ec8e 100644
--- a/AndorsTrail/res/raw/conversationlist_loneford_2.json
+++ b/AndorsTrail/res/raw/conversationlist_loneford_2.json
@@ -225,7 +225,7 @@
     },
     {
         "id":"landa_16",
-        "message":"Also, isn't it strange how Buceth has not gotten ill, while all the others in the village has gotten ill?",
+        "message":"Also, isn't it strange how Buceth has not gotten ill, while all the others in the village have gotten ill?",
         "replies":[
             {
                 "text":"N",
diff --git a/AndorsTrail/res/raw/conversationlist_loneford_4.json b/AndorsTrail/res/raw/conversationlist_loneford_4.json
index 206f47609..b3cf4fdf0 100644
--- a/AndorsTrail/res/raw/conversationlist_loneford_4.json
+++ b/AndorsTrail/res/raw/conversationlist_loneford_4.json
@@ -189,6 +189,48 @@
     },
     {
         "id":"loneford_tavern_patron",
-        "message":"This is no place for a kid like you. I think you better leave now."
+        "message":"This is no place for a kid like you. I think you had better leave now.",
+        "replies":[
+            {
+                "text":"I met a man named Forlin who recomended that I speak with you in regards to a possible murder investigation that I am conducting.",
+                "nextPhraseID":"kizzo_asd_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":140
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":150,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"I did as you suggested and found the scene of a murder and I found this glove.",
+                "nextPhraseID":"kizzo_asd_40",
+                "requires":[
+                    {
+                        "requireType":"inventoryKeep",
+                        "requireID":"ogea_glove",
+                        "value":1
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":190,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_dagger",
+                        "value":210,
+                        "negate":true
+                    }
+                ]
+            }
+        ]
     }
 ]
\ No newline at end of file
diff --git a/AndorsTrail/res/raw/conversationlist_mikhail.json b/AndorsTrail/res/raw/conversationlist_mikhail.json
index 45a9dcd27..5535b31e6 100644
--- a/AndorsTrail/res/raw/conversationlist_mikhail.json
+++ b/AndorsTrail/res/raw/conversationlist_mikhail.json
@@ -533,7 +533,7 @@
     },
     {
         "id":"mikhail_rats_complete",
-        "message":"Oh you did? Wow, thanks a lot for your help!\n\nIf you are hurt, use your bed over there to rest and regain your strength.",
+        "message":"Oh you did? Wow, thanks a lot for your help! Please take Andor's training shield - you're going to need it.\n\nIf you are hurt, use your bed over there to rest and regain your strength.",
         "replies":[
             {
                 "text":"N",
@@ -545,6 +545,11 @@
                 "rewardType":"questProgress",
                 "rewardID":"mikhail_rats",
                 "value":100
+            },
+            {
+                "rewardType":"giveItem",
+                "rewardID":"kids_shield",
+                "value":1
             }
         ]
     },
diff --git a/AndorsTrail/res/raw/conversationlist_minarra.json b/AndorsTrail/res/raw/conversationlist_minarra.json
index 6cd2b70a2..7df3e81e3 100644
--- a/AndorsTrail/res/raw/conversationlist_minarra.json
+++ b/AndorsTrail/res/raw/conversationlist_minarra.json
@@ -392,6 +392,18 @@
                         "value":45
                     }
                 ]
+            },
+            {
+                "text":"I'd rather talk about the troubles in Loneford that you had mentioned.",
+                "nextPhraseID":"cr_loneford_st_1",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"loneford",
+                        "value":21,
+                        "negate":true
+                    }
+                ]
             }
         ]
     },
diff --git a/AndorsTrail/res/raw/conversationlist_omicronrg9.json b/AndorsTrail/res/raw/conversationlist_omicronrg9.json
index 4e25b19a1..1a776c0c5 100644
--- a/AndorsTrail/res/raw/conversationlist_omicronrg9.json
+++ b/AndorsTrail/res/raw/conversationlist_omicronrg9.json
@@ -1964,7 +1964,7 @@
     },
     {
         "id":"guild02_hatchlever_2b",
-        "message":"Looking around the room, you see an unusual mechanism. A crowbar with a locked chain that prevents a lever from beng moved.",
+        "message":"Looking around the room, you see an unusual mechanism. A crowbar with a locked chain that prevents a lever from being moved.",
         "replies":[
             {
                 "text":"Try to break the chain.",
@@ -4760,6 +4760,13 @@
                 "text":"I'll do that.",
                 "nextPhraseID":"X"
             }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"misc_nondisplay ",
+                "value":20
+            }
         ]
     },
     {
diff --git a/AndorsTrail/res/raw/conversationlist_stoutford.json b/AndorsTrail/res/raw/conversationlist_stoutford.json
index e2c3e2453..e5165449a 100644
--- a/AndorsTrail/res/raw/conversationlist_stoutford.json
+++ b/AndorsTrail/res/raw/conversationlist_stoutford.json
@@ -883,7 +883,7 @@
     },
     {
         "id":"glasforn_rumblings20_2",
-        "message":"OK, I can believe that you are Andor's brother. You should have told me earlier!",
+        "message":"OK, I can believe that you are Andor's sibling. You should have told me earlier!",
         "replies":[
             {
                 "text":"Why?",
diff --git a/AndorsTrail/res/raw/conversationlist_stoutford_combined.json b/AndorsTrail/res/raw/conversationlist_stoutford_combined.json
index 56e07b222..2acc4202c 100644
--- a/AndorsTrail/res/raw/conversationlist_stoutford_combined.json
+++ b/AndorsTrail/res/raw/conversationlist_stoutford_combined.json
@@ -9688,7 +9688,7 @@
                     {
                         "requireType":"killedMonster",
                         "requireID":"erwyn_soldier",
-                        "value":12
+                        "value":13
                     },
                     {
                         "requireType":"killedMonster",
diff --git a/AndorsTrail/res/raw/droplists_brimhaven.json b/AndorsTrail/res/raw/droplists_brimhaven.json
index eff16efa9..68e40e07a 100644
--- a/AndorsTrail/res/raw/droplists_brimhaven.json
+++ b/AndorsTrail/res/raw/droplists_brimhaven.json
@@ -181,6 +181,14 @@
                     "min":1,
                     "max":1
                 }
+            },
+            {
+                "itemID":"fauchard_steel",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
             }
         ]
     },
diff --git a/AndorsTrail/res/raw/droplists_brimhaven_2.json b/AndorsTrail/res/raw/droplists_brimhaven_2.json
new file mode 100644
index 000000000..51955fbf5
--- /dev/null
+++ b/AndorsTrail/res/raw/droplists_brimhaven_2.json
@@ -0,0 +1,36 @@
+[
+    {
+        "id":"arlish_bottle",
+        "items":[
+            {
+                "itemID":"large_bottle",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            }
+        ]
+    },
+    {
+        "id":"trapped_mouse",
+        "items":[
+            {
+                "itemID":"trapped_mouse",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            },
+            {
+                "itemID":"gold",
+                "chance":"100",
+                "quantity":{
+                    "min":20,
+                    "max":20
+                }
+            }
+        ]
+    }
+]
\ No newline at end of file
diff --git a/AndorsTrail/res/raw/droplists_brimhaven_2b.json b/AndorsTrail/res/raw/droplists_brimhaven_2b.json
new file mode 100644
index 000000000..a1b132984
--- /dev/null
+++ b/AndorsTrail/res/raw/droplists_brimhaven_2b.json
@@ -0,0 +1,15 @@
+[
+    {
+        "id":"hettar_dog3",
+        "items":[
+            {
+                "itemID":"meat",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            }
+        ]
+    }
+]
\ No newline at end of file
diff --git a/AndorsTrail/res/raw/droplists_crossglen.json b/AndorsTrail/res/raw/droplists_crossglen.json
index 430391736..bae7582ec 100644
--- a/AndorsTrail/res/raw/droplists_crossglen.json
+++ b/AndorsTrail/res/raw/droplists_crossglen.json
@@ -54,6 +54,22 @@
                     "min":12,
                     "max":12
                 }
+            },
+            {
+                "itemID":"kids_shirt",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            },
+            {
+                "itemID":"kids_gloves",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
             }
         ]
     },
@@ -126,17 +142,17 @@
         ]
     },
     {
-      "id":"gold20",
-      "items":[
-        {
-          "itemID":"gold",
-          "chance":"100",
-          "quantity":{
-            "min":20,
-            "max":20
-          }
-        }
-      ]
+        "id":"gold20",
+        "items":[
+            {
+                "itemID":"gold",
+                "chance":"100",
+                "quantity":{
+                    "min":20,
+                    "max":20
+                }
+            }
+        ]
     },
     {
         "id":"canine",
diff --git a/AndorsTrail/res/raw/droplists_crossglen_outside.json b/AndorsTrail/res/raw/droplists_crossglen_outside.json
index 04d33cfaa..9a2adcab8 100644
--- a/AndorsTrail/res/raw/droplists_crossglen_outside.json
+++ b/AndorsTrail/res/raw/droplists_crossglen_outside.json
@@ -244,6 +244,14 @@
                     "min":1,
                     "max":1
                 }
+            },
+            {
+                "itemID":"inspiring_snake_master_map",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
             }
         ]
     }
diff --git a/AndorsTrail/res/raw/droplists_trader_teksin.json b/AndorsTrail/res/raw/droplists_trader_teksin.json
index 206a0b167..950c6e54f 100644
--- a/AndorsTrail/res/raw/droplists_trader_teksin.json
+++ b/AndorsTrail/res/raw/droplists_trader_teksin.json
@@ -129,6 +129,14 @@
                     "min":1,
                     "max":1
                 }
+            },
+            {
+                "itemID":"brandistock",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
             }
         ]
     }
diff --git a/AndorsTrail/res/raw/droplists_v0610_shops.json b/AndorsTrail/res/raw/droplists_v0610_shops.json
index 5d8efce93..1be04b185 100644
--- a/AndorsTrail/res/raw/droplists_v0610_shops.json
+++ b/AndorsTrail/res/raw/droplists_v0610_shops.json
@@ -169,6 +169,22 @@
                     "min":1,
                     "max":1
                 }
+            },
+            {
+                "itemID":"spear_iron",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            },
+            {
+                "itemID":"spear_rusty",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
             }
         ]
     },
@@ -395,6 +411,14 @@
                     "min":1,
                     "max":1
                 }
+            },
+            {
+                "itemID":"spear_steel",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
             }
         ]
     },
@@ -738,6 +762,14 @@
                     "min":1,
                     "max":1
                 }
+            },
+            {
+                "itemID":"halberd_iron",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
             }
         ]
     },
diff --git a/AndorsTrail/res/raw/droplists_v0611_shops.json b/AndorsTrail/res/raw/droplists_v0611_shops.json
index 05019517e..392df70dd 100644
--- a/AndorsTrail/res/raw/droplists_v0611_shops.json
+++ b/AndorsTrail/res/raw/droplists_v0611_shops.json
@@ -261,6 +261,14 @@
                     "min":1,
                     "max":1
                 }
+            },
+            {
+                "itemID":"spear_steel_remgard",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
             }
         ]
     },
diff --git a/AndorsTrail/res/raw/droplists_v070_shops.json b/AndorsTrail/res/raw/droplists_v070_shops.json
index 99fbd3145..01d733eb6 100644
--- a/AndorsTrail/res/raw/droplists_v070_shops.json
+++ b/AndorsTrail/res/raw/droplists_v070_shops.json
@@ -150,6 +150,14 @@
                     "min":1,
                     "max":5
                 }
+            },
+            {
+                "itemID":"glaive_steel",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
             }
         ]
     },
@@ -326,7 +334,7 @@
                     "max":5
                 }
             }
-		]
+        ]
     },
     {
         "id":"shop_lodar",
diff --git a/AndorsTrail/res/raw/itemlist_brimhaven_2.json b/AndorsTrail/res/raw/itemlist_brimhaven_2.json
new file mode 100644
index 000000000..0ed724453
--- /dev/null
+++ b/AndorsTrail/res/raw/itemlist_brimhaven_2.json
@@ -0,0 +1,221 @@
+[
+    {
+        "id":"ogea_glove",
+        "iconID":"items_armours_2:1",
+        "name":"Suspect's glove",
+        "displaytype":"quest",
+        "category":"hnd_lthr",
+        "description":"Is that dried up human blood on there or something less sinister?"
+    },
+    {
+        "id":"kids_shirt",
+        "iconID":"items_japozero:150",
+        "name":"Kid's shirt",
+        "displaytype":"ordinary",
+        "hasManualPrice":1,
+        "baseMarketCost":50,
+        "category":"bdy_clth",
+        "description":"Part of Andor's training equipment.",
+        "equipEffect":{
+            "increaseMaxHP":1,
+            "increaseBlockChance":3
+        }
+    },
+    {
+        "id":"kids_gloves",
+        "iconID":"items_japozero:224",
+        "name":"Kid's gloves",
+        "displaytype":"ordinary",
+        "hasManualPrice":1,
+        "baseMarketCost":50,
+        "category":"hnd_cloth",
+        "description":"Part of Andor's training equipment.",
+        "equipEffect":{
+            "increaseMaxHP":1,
+            "increaseBlockChance":2
+        }
+    },
+    {
+        "id":"kids_shield",
+        "iconID":"items_japozero:181",
+        "name":"Kid's shield",
+        "displaytype":"rare",
+        "hasManualPrice":1,
+        "baseMarketCost":100,
+        "category":"shld_wd_li",
+        "description":"Part of Andor's training equipment.",
+        "equipEffect":{
+            "increaseBlockChance":1,
+            "increaseDamageResistance":1
+        }
+    },
+    {
+        "id":"inspiring_snake_master_map",
+        "iconID":"items_japozero:422",
+        "name":"Ewmondold's map",
+        "displaytype":"quest",
+        "hasManualPrice":1,
+        "baseMarketCost":0,
+        "category":"other",
+        "description":"Written in a language you do not understand, this appears to be a map.  But to where? You do not know."
+    },
+    {
+        "id":"spear_iron",
+        "iconID":"items_weapons:28",
+        "name":"Iron spear",
+        "displaytype":"ordinary",
+        "category":"pole",
+        "equipEffect":{
+            "increaseAttackDamage":{
+                "min":2,
+                "max":3
+            },
+            "increaseAttackCost":6,
+            "increaseBlockChance":4,
+            "setNonWeaponDamageModifier":150
+        }
+    },
+    {
+        "id":"spear_steel",
+        "iconID":"items_reterski_1:21",
+        "name":"Steel spear",
+        "displaytype":"ordinary",
+        "category":"pole",
+        "equipEffect":{
+            "increaseAttackDamage":{
+                "min":2,
+                "max":5
+            },
+            "increaseAttackCost":6,
+            "increaseBlockChance":5,
+            "setNonWeaponDamageModifier":155
+        }
+    },
+    {
+        "id":"halberd_iron",
+        "iconID":"items_weapons_3:56",
+        "name":"Iron halberd",
+        "displaytype":"ordinary",
+        "category":"pole",
+        "equipEffect":{
+            "increaseAttackDamage":{
+                "min":5,
+                "max":9
+            },
+            "increaseAttackCost":8,
+            "increaseBlockChance":7,
+            "setNonWeaponDamageModifier":205
+        }
+    },
+    {
+        "id":"brandistock",
+        "iconID":"items_weapons:34",
+        "name":"Brandistock",
+        "displaytype":"ordinary",
+        "category":"pole",
+        "equipEffect":{
+            "increaseAttackDamage":{
+                "min":3,
+                "max":4
+            },
+            "increaseAttackCost":5,
+            "increaseCriticalSkill":2,
+            "increaseBlockChance":4,
+            "setCriticalMultiplier":1.2,
+            "setNonWeaponDamageModifier":115
+        }
+    },
+    {
+        "id":"fauchard_steel",
+        "iconID":"items_weapons_3:53",
+        "name":"Steel fauchard",
+        "displaytype":"ordinary",
+        "category":"pole",
+        "equipEffect":{
+            "increaseAttackDamage":{
+                "min":5,
+                "max":7
+            },
+            "increaseAttackCost":7,
+            "increaseBlockChance":5,
+            "setNonWeaponDamageModifier":160
+        }
+    },
+    {
+        "id":"glaive_steel",
+        "iconID":"items_weapons:33",
+        "name":"Steel glaive",
+        "displaytype":"ordinary",
+        "category":"pole",
+        "equipEffect":{
+            "increaseAttackDamage":{
+                "min":1,
+                "max":7
+            },
+            "increaseAttackCost":7,
+            "increaseBlockChance":6,
+            "setNonWeaponDamageModifier":165
+        }
+    },
+    {
+        "id":"spear_steel_remgard",
+        "iconID":"items_weapons:40",
+        "name":"Remgard steel spear",
+        "displaytype":"ordinary",
+        "category":"pole",
+        "equipEffect":{
+            "increaseAttackDamage":{
+                "min":6,
+                "max":8
+            },
+            "increaseAttackCost":5,
+            "increaseCriticalSkill":5,
+            "increaseBlockChance":6,
+            "setCriticalMultiplier":1.5,
+            "setNonWeaponDamageModifier":120
+        }
+    },
+    {
+        "id":"kids_boots",
+        "iconID":"items_japozero:210",
+        "name":"Kid's boots",
+        "displaytype":"rare",
+        "category":"feet_clth",
+        "description":"Part of Andor's training equipment.",
+        "equipEffect":{
+            "increaseMaxHP":1,
+            "increaseAttackChance":1,
+            "increaseBlockChance":2
+        }
+    },
+    {
+        "id":"large_bottle",
+        "iconID":"items_consumables:58",
+        "name":"Large empty bottle",
+        "displaytype":"ordinary",
+        "category":"other"
+    },
+    {
+        "id":"trapped_mouse",
+        "iconID":"items_rijackson_1:15",
+        "name":"Trapped mouse",
+        "displaytype":"ordinary",
+        "category":"other"
+    },
+    {
+        "id":"spear_rusty",
+        "iconID":"items_weapons_3:54",
+        "name":"Rusty iron spear",
+        "displaytype":"ordinary",
+        "category":"pole",
+        "equipEffect":{
+            "increaseAttackDamage":{
+                "min":1,
+                "max":2
+            },
+            "increaseAttackCost":6,
+            "increaseBlockChance":4,
+            "setNonWeaponDamageModifier":130
+        }
+    }
+]
\ No newline at end of file
diff --git a/AndorsTrail/res/raw/itemlist_brimhaven_2b.json b/AndorsTrail/res/raw/itemlist_brimhaven_2b.json
new file mode 100644
index 000000000..9fffc8419
--- /dev/null
+++ b/AndorsTrail/res/raw/itemlist_brimhaven_2b.json
@@ -0,0 +1,21 @@
+[
+    {
+        "id":"bwm_bones",
+        "iconID":"items_misc:44",
+        "name":"Huge bones from the Blackwater Mountains",
+        "hasManualPrice":1,
+        "baseMarketCost":20,
+        "category":"animal",
+        "description":"Good that this creature is dead now and not attacking you."
+    },
+    {
+        "id":"hettar_bone",
+        "iconID":"items_consumables:25",
+        "name":"Wyrm meat",
+        "displaytype":"quest",
+        "hasManualPrice":1,
+        "baseMarketCost":2,
+        "category":"animal",
+        "description":"Norry's food."
+    }
+]
\ No newline at end of file
diff --git a/AndorsTrail/res/raw/itemlist_v0610_2.json b/AndorsTrail/res/raw/itemlist_v0610_2.json
index c22e47228..49fb58830 100644
--- a/AndorsTrail/res/raw/itemlist_v0610_2.json
+++ b/AndorsTrail/res/raw/itemlist_v0610_2.json
@@ -58,8 +58,8 @@
                 "max":5
             },
             "increaseAttackCost":5,
-            "setNonWeaponDamageModifier":112,
-            "increaseAttackChance":10
+            "increaseAttackChance":10,
+            "setNonWeaponDamageModifier":112
         }
     },
     {
@@ -72,8 +72,8 @@
         "category":"lsword",
         "equipEffect":{
             "increaseAttackCost":5,
-            "setNonWeaponDamageModifier":120,
-            "increaseAttackChance":-50
+            "increaseAttackChance":-50,
+            "setNonWeaponDamageModifier":120
         }
     },
     {
@@ -99,8 +99,10 @@
                 "max":2
             },
             "increaseAttackCost":4,
-			"setNonWeaponDamageModifier":102,
-            "increaseAttackChance":-30
+            "increaseAttackChance":-10,
+            "increaseCriticalSkill":1,
+            "setCriticalMultiplier":1.5,
+            "setNonWeaponDamageModifier":102
         },
         "hitEffect":{
             "conditionsTarget":[
@@ -163,8 +165,8 @@
             },
             "increaseMaxHP":-20,
             "increaseAttackCost":4,
-			"setNonWeaponDamageModifier":96,
-            "increaseAttackChance":40
+            "increaseAttackChance":40,
+            "setNonWeaponDamageModifier":96
         },
         "hitEffect":{
             "conditionsSource":[
diff --git a/AndorsTrail/res/raw/itemlist_v069.json b/AndorsTrail/res/raw/itemlist_v069.json
index 5dc702f3a..8e2fe6abf 100644
--- a/AndorsTrail/res/raw/itemlist_v069.json
+++ b/AndorsTrail/res/raw/itemlist_v069.json
@@ -14,8 +14,8 @@
             },
             "increaseMaxHP":5,
             "increaseAttackCost":5,
-            "setNonWeaponDamageModifier":131,
-            "increaseAttackChance":21
+            "increaseAttackChance":21,
+            "setNonWeaponDamageModifier":131
         },
         "hitEffect":{
             "increaseCurrentHP":{
@@ -40,9 +40,9 @@
         "category":"dagger",
         "equipEffect":{
             "increaseAttackCost":4,
-			"setNonWeaponDamageModifier":107,
             "increaseAttackChance":15,
-            "increaseBlockChance":5
+            "increaseBlockChance":5,
+            "setNonWeaponDamageModifier":107
         },
         "hitEffect":{
             "conditionsTarget":[
@@ -70,9 +70,9 @@
             },
             "increaseMaxAP":2,
             "increaseAttackCost":5,
-            "setNonWeaponDamageModifier":123,
             "increaseAttackChance":25,
             "increaseBlockChance":5,
+            "setNonWeaponDamageModifier":123,
             "addedConditions":[
                 {
                     "condition":"bless",
@@ -95,9 +95,9 @@
                 "max":6
             },
             "increaseAttackCost":5,
-            "setNonWeaponDamageModifier":115,
             "increaseAttackChance":21,
-            "increaseBlockChance":5
+            "increaseBlockChance":5,
+            "setNonWeaponDamageModifier":115
         },
         "killEffect":{
             "conditionsSource":[
@@ -125,10 +125,10 @@
             },
             "increaseMaxAP":2,
             "increaseAttackCost":7,
-            "setNonWeaponDamageModifier":185,
             "increaseAttackChance":25,
             "increaseCriticalSkill":10,
-            "setCriticalMultiplier":2.0
+            "setCriticalMultiplier":2.0,
+            "setNonWeaponDamageModifier":185
         },
         "killEffect":{
             "increaseCurrentHP":{
@@ -225,9 +225,9 @@
                 "max":7
             },
             "increaseAttackCost":4,
-			"setNonWeaponDamageModifier":95,
             "increaseAttackChance":50,
             "increaseBlockChance":5,
+            "setNonWeaponDamageModifier":115,
             "addedConditions":[
                 {
                     "condition":"blackwater_misery",
@@ -340,8 +340,8 @@
                 "max":12
             },
             "increaseAttackCost":6,
-            "setNonWeaponDamageModifier":140,
-            "increaseAttackChance":9
+            "increaseAttackChance":9,
+            "setNonWeaponDamageModifier":140
         }
     },
     {
@@ -368,10 +368,10 @@
                 "max":15
             },
             "increaseAttackCost":7,
-            "setNonWeaponDamageModifier":160,
             "increaseAttackChance":15,
             "increaseCriticalSkill":5,
-            "setCriticalMultiplier":3.0
+            "setCriticalMultiplier":3.0,
+            "setNonWeaponDamageModifier":160
         }
     },
     {
diff --git a/AndorsTrail/res/raw/monsterlist_brimhaven.json b/AndorsTrail/res/raw/monsterlist_brimhaven.json
index b6c51bb52..b2336baab 100644
--- a/AndorsTrail/res/raw/monsterlist_brimhaven.json
+++ b/AndorsTrail/res/raw/monsterlist_brimhaven.json
@@ -85,7 +85,7 @@
     },
     {
         "id":"brv_tavern1_guest2",
-        "name":"Customer",
+        "name":"Forlin",
         "iconID":"monsters_ld1:64",
         "moveCost":5,
         "monsterClass":"humanoid",
@@ -346,7 +346,7 @@
     },
     {
         "id":"brv_laundry_boss",
-        "name":"Laundry owner",
+        "name":"Venanra",
         "iconID":"monsters_ld1:187",
         "phraseID":"brv_laundry_boss_0",
         "droplistID":"brv_laundry"
@@ -427,7 +427,7 @@
     },
     {
         "id":"quiet_thief",
-        "name":"Shady thief",
+        "name":"Pixtumn",
         "iconID":"monsters_rogue1:0",
         "unique":1,
         "monsterClass":"humanoid",
@@ -437,16 +437,16 @@
     },
     {
         "id":"quiet_thief_1",
-        "name":"Shady thief",
+        "name":"Pixtumn",
         "iconID":"monsters_rogue1:0",
         "unique":1,
         "monsterClass":"humanoid",
         "movementAggressionType":"none",
-        "droplistID":"quiet_thief"
+        "droplistID":"quiet_thief_1"
     },
     {
         "id":"quiet_thief_2",
-        "name":"Shady thief",
+        "name":"Pixtumn",
         "iconID":"monsters_rogue1:0",
         "unique":1,
         "monsterClass":"humanoid",
@@ -455,7 +455,7 @@
     },
     {
         "id":"quiet_thief_3",
-        "name":"Shady thief",
+        "name":"Pixtumn",
         "iconID":"monsters_rogue1:0",
         "unique":1,
         "monsterClass":"humanoid",
@@ -517,7 +517,7 @@
     },
     {
         "id":"brv_villager3",
-        "name":"Commoner",
+        "name":"Ogea",
         "iconID":"monsters_tometik2:63",
         "monsterClass":"humanoid",
         "spawnGroup":"brv_villager3",
diff --git a/AndorsTrail/res/raw/monsterlist_brimhaven_2.json b/AndorsTrail/res/raw/monsterlist_brimhaven_2.json
new file mode 100644
index 000000000..0966ee5dd
--- /dev/null
+++ b/AndorsTrail/res/raw/monsterlist_brimhaven_2.json
@@ -0,0 +1,159 @@
+[
+    {
+        "id":"brv_guard_deputy",
+        "name":"Ito",
+        "iconID":"monsters_ld1:109",
+        "monsterClass":"humanoid",
+        "spawnGroup":"brv_guard_deputy",
+        "phraseID":"brv_guard_deputy_10"
+    },
+    {
+        "id":"inspiring_snake_master",
+        "name":"Ewmondold",
+        "iconID":"monsters_rltiles2:82",
+        "monsterClass":"humanoid",
+        "movementAggressionType":"none",
+        "spawnGroup":"inspiring_snake_master",
+        "phraseID":"inspiring_snake_master_10"
+    },
+    {
+        "id":"ewmondold_snake_master",
+        "name":"Ewmondold",
+        "iconID":"monsters_tometik1:18",
+        "maxHP":70,
+        "unique":1,
+        "monsterClass":"humanoid",
+        "attackDamage":{
+            "min":2,
+            "max":5
+        },
+        "phraseID":"ewmondold_snake_master_10",
+        "droplistID":"gold200",
+        "attackCost":5,
+        "attackChance":67,
+        "criticalSkill":200,
+        "criticalMultiplier":3.0,
+        "blockChance":13,
+        "damageResistance":4
+    },
+    {
+        "id":"oromir_behind_inn_help",
+        "name":"Oromir",
+        "iconID":"monsters_man1:0",
+        "unique":1,
+        "movementAggressionType":"none",
+        "spawnGroup":"oromir_behind_inn_help",
+        "phraseID":"oromir_behind_inn_help_10"
+    },
+    {
+        "id":"oromir_behind_haystack_help",
+        "name":"Oromir",
+        "iconID":"monsters_man1:0",
+        "unique":1,
+        "monsterClass":"humanoid",
+        "movementAggressionType":"none",
+        "spawnGroup":"oromir_behind_haystack_help",
+        "phraseID":"oromir_behind_haystack_help_10"
+    },
+    {
+        "id":"oromir_basement_help",
+        "name":"Oromir",
+        "iconID":"monsters_man1:0",
+        "monsterClass":"humanoid",
+        "phraseID":"oromir_basement_help_10"
+    },
+    {
+        "id":"oromir_behind_inn",
+        "name":"Oromir",
+        "iconID":"monsters_man1:0",
+        "unique":1,
+        "monsterClass":"humanoid",
+        "movementAggressionType":"none",
+        "spawnGroup":"oromir_behind_inn",
+        "phraseID":"oromir_behind_inn_10"
+    },
+    {
+        "id":"oromir_behind_haystack",
+        "name":"Oromir",
+        "iconID":"monsters_man1:0",
+        "unique":1,
+        "monsterClass":"humanoid",
+        "movementAggressionType":"none",
+        "spawnGroup":"oromir_behind_haystack",
+        "phraseID":"oromir_behind_haystack_10"
+    },
+    {
+        "id":"oromir_basement",
+        "name":"Oromir",
+        "iconID":"monsters_man1:0",
+        "unique":1,
+        "monsterClass":"humanoid",
+        "spawnGroup":"oromir_basement",
+        "phraseID":"oromir_basement_10"
+    },
+    {
+        "id":"brv_undertaker",
+        "name":"Zorvan",
+        "iconID":"monsters_rltiles1:83",
+        "unique":1,
+        "monsterClass":"humanoid",
+        "movementAggressionType":"none",
+        "spawnGroup":"zorvan",
+        "phraseID":"zorvan_0"
+    },
+    {
+        "id":"hunchback",
+        "name":"Quasi",
+        "iconID":"monsters_ld2:58",
+        "unique":1,
+        "monsterClass":"humanoid",
+        "movementAggressionType":"none",
+        "phraseID":"quasi_0"
+    },
+    {
+        "id":"brv_churchman",
+        "name":"Seviron",
+        "iconID":"monsters_rltiles2:136",
+        "monsterClass":"humanoid",
+        "spawnGroup":"brv_churchman",
+        "phraseID":"brv_churchman_start"
+    },
+    {
+        "id":"brv_churchcat",
+        "name":"Cat",
+        "iconID":"monsters_ld2:103",
+        "maxHP":50,
+        "maxAP":30,
+        "moveCost":2,
+        "monsterClass":"animal",
+        "attackDamage":{
+            "min":3,
+            "max":5
+        },
+        "spawnGroup":"brv_churchcat",
+        "phraseID":"brv_churchcat",
+        "attackCost":3,
+        "attackChance":80,
+        "blockChance":50
+    },
+    {
+        "id":"brv_churchmouse",
+        "name":"Mouse",
+        "iconID":"monsters_rats:0",
+        "maxHP":5,
+        "maxAP":10,
+        "moveCost":2,
+        "unique":1,
+        "monsterClass":"animal",
+        "attackDamage":{
+            "min":1,
+            "max":1
+        },
+        "spawnGroup":"brv_churchmouse",
+        "phraseID":"brv_churchmouse",
+        "droplistID":"rat",
+        "attackCost":5,
+        "attackChance":50,
+        "blockChance":30
+    }
+]
\ No newline at end of file
diff --git a/AndorsTrail/res/raw/monsterlist_brimhaven_2b.json b/AndorsTrail/res/raw/monsterlist_brimhaven_2b.json
new file mode 100644
index 000000000..92e50bf28
--- /dev/null
+++ b/AndorsTrail/res/raw/monsterlist_brimhaven_2b.json
@@ -0,0 +1,44 @@
+[
+    {
+        "id":"hettar",
+        "name":"Little Hettar",
+        "iconID":"monsters_ld1:20",
+        "monsterClass":"humanoid",
+        "spawnGroup":"hettar",
+        "phraseID":"hettar"
+    },
+    {
+        "id":"hettar_dog",
+        "name":"Wolfhound",
+        "iconID":"monsters_dogs:3",
+        "monsterClass":"animal",
+        "spawnGroup":"hettar_dog",
+        "phraseID":"hettar_dog"
+    },
+    {
+        "id":"hettar_dog2",
+        "name":"Wolfhound",
+        "iconID":"monsters_dogs:3",
+        "monsterClass":"animal",
+        "spawnGroup":"hettar_dog2",
+        "phraseID":"hettar_dog2"
+    },
+    {
+        "id":"hettar_dog3",
+        "name":"Wolfhound",
+        "iconID":"monsters_dogs:3",
+        "maxHP":40,
+        "unique":1,
+        "monsterClass":"animal",
+        "attackDamage":{
+            "min":1,
+            "max":8
+        },
+        "spawnGroup":"hettar_dog3",
+        "droplistID":"hettar_dog3",
+        "attackCost":4,
+        "attackChance":80,
+        "blockChance":150,
+        "damageResistance":5
+    }
+]
\ No newline at end of file
diff --git a/AndorsTrail/res/raw/monsterlist_graveyard1.json b/AndorsTrail/res/raw/monsterlist_graveyard1.json
index b2f94d0cf..d3ee68749 100644
--- a/AndorsTrail/res/raw/monsterlist_graveyard1.json
+++ b/AndorsTrail/res/raw/monsterlist_graveyard1.json
@@ -125,7 +125,6 @@
             "max":19
         },
         "spawnGroup":"graveyard_corpse2",
-        "phraseID":"graveyard_corpse1",
         "droplistID":"gold200",
         "attackCost":3,
         "attackChance":170,
@@ -440,14 +439,52 @@
         "name":"Angry graveyard corpse",
         "iconID":"monsters_zombie2:0",
         "maxHP":90,
+        "maxAP":10,
         "moveCost":3,
         "monsterClass":"undead",
-        "movementAggressionType":"none",
         "attackDamage":{
             "min":6,
             "max":19
         },
         "spawnGroup":"graveyard_corpse3",
+        "phraseID":"graveyard_corpse1",
+        "droplistID":"gold200",
+        "attackCost":3,
+        "attackChance":170,
+        "criticalSkill":10,
+        "criticalMultiplier":2.0,
+        "blockChance":165,
+        "damageResistance":11,
+        "hitEffect":{
+            "increaseCurrentHP":{
+                "min":1,
+                "max":3
+            },
+            "conditionsTarget":[
+                {
+                    "condition":"putrefaction",
+                    "magnitude":2,
+                    "duration":3,
+                    "chance":"30"
+                }
+            ]
+        }
+    },
+    {
+        "id":"graveyard_corpse3",
+        "name":"Angry graveyard corpse",
+        "iconID":"monsters_zombie2:0",
+        "maxHP":90,
+        "maxAP":10,
+        "moveCost":3,
+        "monsterClass":"undead",
+        "attackDamage":{
+            "min":6,
+            "max":19
+        },
+        "spawnGroup":"graveyard_corpse3",
+        "phraseID":"graveyard_corpse1",
+        "droplistID":"gold200",
         "attackCost":3,
         "attackChance":170,
         "criticalSkill":10,
diff --git a/AndorsTrail/res/raw/monsterlist_v0610_npcs1.json b/AndorsTrail/res/raw/monsterlist_v0610_npcs1.json
index a6b6efa84..758c8550a 100644
--- a/AndorsTrail/res/raw/monsterlist_v0610_npcs1.json
+++ b/AndorsTrail/res/raw/monsterlist_v0610_npcs1.json
@@ -304,7 +304,7 @@
     },
     {
         "id":"loneford_tavern_patron",
-        "name":"Tavern owner",
+        "name":"Kizzo",
         "iconID":"monsters_karvis2:2",
         "monsterClass":"humanoid",
         "spawnGroup":"loneford_tavern_patron",
diff --git a/AndorsTrail/res/raw/questlist.json b/AndorsTrail/res/raw/questlist.json
index 8940d0489..e58340a8f 100644
--- a/AndorsTrail/res/raw/questlist.json
+++ b/AndorsTrail/res/raw/questlist.json
@@ -132,11 +132,59 @@
                 "logText":"I have found Oromir in Crossglen village, hiding from his wife Leta.",
                 "finishesQuest":0
             },
+            {
+                "progress":25,
+                "logText":"I have found Oromir in Crossglen village, hiding from his wife Leta, but I promised him that I would not tell Leta of his whereabouts.",
+                "rewardExperience":50
+            },
+            {
+                "progress":30,
+                "logText":"Leta asked me to tell Oromir to come home and help her with the housework.",
+                "rewardExperience":80
+            },
+            {
+                "progress":35,
+                "logText":"I have found Oromir behind the Crossglen village inn, hiding from his wife Leta, but I promised him that I would not tell Leta of his whereabouts.",
+                "rewardExperience":50
+            },
+            {
+                "progress":40,
+                "logText":"I have found Oromir behind the Crossglen village inn, hiding from his wife Leta, but I should tell Leta of his whereabouts."
+            },
+            {
+                "progress":45,
+                "logText":"I have found Oromir in Crossglen village behind a haystack, hiding from his wife Leta, but I promised him that I would not tell Leta of his whereabouts.",
+                "rewardExperience":50
+            },
+            {
+                "progress":50,
+                "logText":"Leta asked me to tell Oromir to come home and help her with the housework.",
+                "rewardExperience":80
+            },
+            {
+                "progress":60,
+                "logText":"I have found Oromir in Crossglen village behind a haystack, hiding from his wife Leta, I should tell Leta of his whereabouts."
+            },
+            {
+                "progress":70,
+                "logText":"Leta asked me to tell Oromir to come home and help her with the housework.",
+                "rewardExperience":80
+            },
+            {
+                "progress":80,
+                "logText":"I have found Oromir in the basement of his house, hiding from his wife Leta, I should tell Leta of his whereabouts."
+            },
             {
                 "progress":100,
-                "logText":"I have told Leta that Oromir is hiding in Crossglen village.",
+                "logText":"I have told Leta that Oromir is hiding in their basement.",
                 "rewardExperience":80,
                 "finishesQuest":1
+            },
+            {
+                "progress":105,
+                "logText":"Even after all my help, Oromir was still brought back home to Leta.",
+                "rewardExperience":50,
+                "finishesQuest":1
             }
         ]
     },
diff --git a/AndorsTrail/res/raw/questlist_arulir_mountain.json b/AndorsTrail/res/raw/questlist_arulir_mountain.json
index 7a5ecf10f..2e9c45613 100644
--- a/AndorsTrail/res/raw/questlist_arulir_mountain.json
+++ b/AndorsTrail/res/raw/questlist_arulir_mountain.json
@@ -68,6 +68,10 @@
             {
                 "progress":10,
                 "logText":"10=Slippery ground"
+            },
+            {
+                "progress":101,
+                "logText":"10=Slippery ground second time"
             }
         ]
     },
@@ -148,6 +152,10 @@
             {
                 "progress":10,
                 "logText":"Found silver bar at bwm"
+            },
+            {
+                "progress":20,
+                "logText":"Told by Umar to say he sent you at the inn."
             }
         ]
     }
diff --git a/AndorsTrail/res/raw/questlist_brimhaven.json b/AndorsTrail/res/raw/questlist_brimhaven.json
index f4d0378d2..a3049a702 100644
--- a/AndorsTrail/res/raw/questlist_brimhaven.json
+++ b/AndorsTrail/res/raw/questlist_brimhaven.json
@@ -6,7 +6,7 @@
         "stages":[
             {
                 "progress":10,
-                "logText":"You found two not very bright brothers in a cellar of their house. They seemed to be talking about some sinister plan."
+                "logText":"I found two not very bright brothers in a cellar of their house. They seemed to be talking about some sinister plan."
             },
             {
                 "progress":20,
@@ -14,19 +14,19 @@
             },
             {
                 "progress":30,
-                "logText":"They asked you to help them."
+                "logText":"They asked me to help them."
             },
             {
                 "progress":50,
-                "logText":"You agreed to destroy the dam for them."
+                "logText":"I have agreed to destroy the dam for them."
             },
             {
                 "progress":52,
-                "logText":"They gave you a hand axe that could weaken the dam in a vulnerable place."
+                "logText":"The brothers gave me a hand axe that could weaken the dam in a vulnerable place."
             },
             {
                 "progress":54,
-                "logText":"You found the weak spot in the dam and started hacking at the wood.",
+                "logText":"I found the weak spot in the dam and started hacking at the wood.",
                 "rewardExperience":500
             },
             {
@@ -35,11 +35,11 @@
             },
             {
                 "progress":70,
-                "logText":"You refused to destroy the dam for them."
+                "logText":"I refused to destroy the dam for the brothers."
             },
             {
                 "progress":72,
-                "logText":"Given what you knew, you were not allowed to leave. The two brothers attacked you."
+                "logText":"Given what I overheard, I was not allowed to leave. The two brothers attacked me."
             },
             {
                 "progress":80,
@@ -47,11 +47,11 @@
             },
             {
                 "progress":100,
-                "logText":"You were not allowed to leave the city until it was investigated who destroyed the dam."
+                "logText":"The Brimhaven guards have informed me that I may not leave the city until they have investigated who destroyed the dam."
             },
             {
                 "progress":110,
-                "logText":"You promised to track down the real perpetrators. However, you should not leave the city."
+                "logText":"I have promised to track down the real perpetrators. However, I still cannot not leave the city."
             },
             {
                 "progress":120,
@@ -67,7 +67,7 @@
             },
             {
                 "progress":200,
-                "logText":"You gave the letters as a piece of evidence to the captain of the guard. Now it is up to them to deal with the rich man. ",
+                "logText":"I gave the letters as a piece of evidence to the captain of the guard. Now it is up to them to deal with the rich man.",
                 "rewardExperience":1000,
                 "finishesQuest":1
             }
@@ -84,27 +84,27 @@
             },
             {
                 "progress":10,
-                "logText":"Stebbarik was ill at home in bed. He could not work and feared that he would lose his job. Because of his high debts, he feared that Gnossath would then take his house away.\nYou offered to do the work for Stebbarik."
+                "logText":"Stebbarik was ill at home in bed. He could not work and feared that he would lose his job. Because of his high debts, he feared that Gnossath would then take his house away.\nI have offered to do the work for Stebbarik."
             },
             {
                 "progress":30,
-                "logText":"Gnossath told you to carry 25 heavy boulders from the stock to the dam."
+                "logText":"Gnossath has asked me to carry 25 heavy boulders from the stock to the dam."
             },
             {
                 "progress":40,
-                "logText":"You carried the first boulder to the dam."
+                "logText":"I have carried the first boulder to the dam."
             },
             {
                 "progress":41,
-                "logText":"You have carried 5 boulders to the dam."
+                "logText":"I have carried 5 boulders to the dam."
             },
             {
                 "progress":42,
-                "logText":"You have moved 10 boulders."
+                "logText":"I have moved 10 boulders."
             },
             {
                 "progress":43,
-                "logText":"You have moved 15 boulders. You are getting tired!"
+                "logText":"I have moved 15 boulders. This work is exhausting!"
             },
             {
                 "progress":44,
@@ -112,7 +112,7 @@
             },
             {
                 "progress":90,
-                "logText":"Finally - that was the last boulder! Gnossath was very pleased with your work.",
+                "logText":"Finally - that was the last boulder! Gnossath was very pleased with my work.",
                 "finishesQuest":1
             }
         ]
@@ -272,7 +272,7 @@
             },
             {
                 "progress":15,
-                "logText":"I denied to help Anaksi to find his sister, Juttarka."
+                "logText":"I denied to help Anakis to find his sister, Juttarka."
             },
             {
                 "progress":20,
@@ -301,7 +301,7 @@
             },
             {
                 "progress":77,
-                "logText":"Fangwurm told me that the Basilisk's blood has special properties. It can protect against damage if applied to the skin. Fresh, warm, Basilisk's blood might even be able to heal a person that has been turned to stone.  "
+                "logText":"Fangwurm told me that the Basilisk's blood has special properties. It can protect against damage if applied to the skin. Fresh, warm, Basilisk's blood might even be able to heal a person that has been turned to stone."
             },
             {
                 "progress":78,
@@ -309,7 +309,7 @@
             },
             {
                 "progress":79,
-                "logText":"I should search the other rooms in this cave for a mirror that I can use to protect me from the glance of the Basilisk. "
+                "logText":"I should search the other rooms in this cave for a mirror that I can use to protect me from the glance of the Basilisk."
             },
             {
                 "progress":80,
@@ -479,6 +479,10 @@
                 "progress":10,
                 "logText":"Knows about laundry offering upgrades"
             },
+            {
+                "progress":15,
+                "logText":"Knows about dresses"
+            },
             {
                 "progress":20,
                 "logText":"brother2_door_opened"
@@ -490,25 +494,33 @@
             {
                 "progress":40,
                 "logText":"told father about andor"
+            },
+            {
+                "progress":50,
+                "logText":"Arlish took the dagger"
+            },
+            {
+                "progress":60,
+                "logText":"Gave Ito the glove"
             }
         ]
     },
     {
         "id":"brv_dagger",
-        "name":"A strange-looking dagger",
+        "name":"A strange looking dagger",
         "showInLog":1,
         "stages":[
             {
                 "progress":10,
-                "logText":"I asked Edrin about the strange-looking dagger I purchased. He told me he recognizes it because he made it many years ago, and it used to have a gem mounted in the pommel. If I can find the gem he can remount it in the dagger, and the dagger will have special properties."
+                "logText":"I asked Edrin about the strange-looking dagger I purchased. He told me he recognizes it because he made it many years ago, and it used to have a gem mounted in the pommel. If I can find the gem he can remount it in the dagger, and the dagger will have special properties. Apparently it used to belong to someone named Lawellyn."
             },
             {
                 "progress":20,
-                "logText":"I asked Edrin about the strange-looking gem I purchased, and whether he has any idea what it might have been mounted in. He told me he recognizes it, and it used to be mounted in the pommel of a dagger that he made many years ago. If I can find the dagger he can remount the gem, and the dagger will have special properties."
+                "logText":"I asked Edrin about the strange-looking gem I purchased, and whether he has any idea what it might have been mounted in. He told me he recognizes it, and it used to be mounted in the pommel of a dagger that he made many years ago. If I can find the dagger he can remount the gem, and the dagger will have special properties. Apparently it used to belong to someone named Lawellyn."
             },
             {
                 "progress":25,
-                "logText":"I asked Edrin about the strange-looking dagger and the strange-looking gem I purchased. He told me he recognizes them because he made the dagger many years ago. The gem was originally mounted in the pommel, giving the dagger special properties. He offered to repair it for me."
+                "logText":"I asked Edrin about the strange-looking dagger and the strange-looking gem I purchased. He told me he recognizes them because he made the dagger many years ago. The gem was originally mounted in the pommel, giving the dagger special properties. He offered to repair it for me. Apparently it used to belong to someone named Lawellyn."
             },
             {
                 "progress":30,
@@ -524,27 +536,93 @@
             },
             {
                 "progress":60,
-                "logText":"Edrin wants 800gp to repair the dagger. I told him I will think about it."
+                "logText":"Edrin wants 800 gold to repair the dagger. I told him I will think about it."
             },
             {
                 "progress":70,
-                "logText":"Edrin wants 800gp to repair the dagger. I told him that was too expensive. I will keep the strange-looking dagger and the strange-looking gem.",
+                "logText":"Edrin wants 800 gold to repair the dagger. I told him that was too expensive. I will keep the strange-looking dagger and the strange-looking gem.",
                 "rewardExperience":500,
                 "finishesQuest":1
             },
             {
                 "progress":80,
-                "logText":"Edrin wants 800gp to repair the dagger. I agreed. Edrin took the dagger and the gem and told me to come back later."
+                "logText":"Edrin wants 800 gold to repair the dagger. I agreed. Edrin took the dagger and the gem and told me to come back later."
             },
             {
                 "progress":90,
-                "logText":"I collected the repaired dagger from Edrin.",
-                "rewardExperience":2000,
-                "finishesQuest":1
+                "logText":"I collected the repaired dagger from Edrin. Apparently there was something mysterious about Lawellyn's death. I should ask people in town to find out more.",
+                "rewardExperience":600
             },
             {
                 "progress":100,
-                "logText":"I collected the repaired dagger from Edrin.",
+                "logText":"I collected the repaired dagger from Edrin. Apparently there was something mysterious about Lawellyn's death. I should ask people in town to find out more.",
+                "rewardExperience":300
+            },
+            {
+                "progress":105,
+                "logText":"Zorvan told me Lawellyn is dead and buried, but could tell me little more other than that his death was suspicious."
+            },
+            {
+                "progress":110,
+                "logText":"I've found a gravestone that told me that Lawellyn was related to Arlish. I should try to find her.",
+                "rewardExperience":100
+            },
+            {
+                "progress":115,
+                "logText":"Arlish couldn't tell me anything about the dagger because I no longer have it.",
+                "finishesQuest":1
+            },
+            {
+                "progress":120,
+                "logText":"I decided to not help Arlish by investigating Lawellyn's disappearance.",
+                "finishesQuest":1
+            },
+            {
+                "progress":130,
+                "logText":"I decided to help Arlish by investigating Lawellyn's disappearance."
+            },
+            {
+                "progress":140,
+                "logText":"In Brimhaven's western tavern, I met a man named Forlin who recommended that I speak to Kizzo in the Loneford tavern."
+            },
+            {
+                "progress":150,
+                "logText":"Kizzo suggested that I look for the scene of the murder in the woods between Loneford and Brimhaven."
+            },
+            {
+                "progress":160,
+                "logText":"I should take the evidence to Kizzo.",
+                "rewardExperience":200
+            },
+            {
+                "progress":170,
+                "logText":"Kizzo recommended that I ask Venanra in Brimhaven about the glove."
+            },
+            {
+                "progress":180,
+                "logText":"After speaking with Venanra, I learned that the glove belonged to Ogea."
+            },
+            {
+                "progress":190,
+                "logText":"I accepted Ogea's side of the story."
+            },
+            {
+                "progress":200,
+                "logText":"I was not able to help Arlish find out more about the death of her father.",
+                "rewardExperience":300,
+                "finishesQuest":1
+            },
+            {
+                "progress":210,
+                "logText":"I decided that Ogea should be punished."
+            },
+            {
+                "progress":220,
+                "logText":"I informed the authorities of the results of my investigation."
+            },
+            {
+                "progress":230,
+                "logText":"Arlish thanked me for finding her father's murderer, and gave me his dagger as a gift.",
                 "rewardExperience":1000,
                 "finishesQuest":1
             }
@@ -557,31 +635,31 @@
         "stages":[
             {
                 "progress":10,
-                "logText":"You thought it would be a good idea to give a necklace to your father, in your family colors of red, green, and white. "
+                "logText":"I have decided to give a necklace to my father Mikhail, in our family colors of red, green, and white."
             },
             {
                 "progress":20,
-                "logText":"You bought a necklace."
+                "logText":"I have purchased a necklace."
             },
             {
                 "progress":30,
-                "logText":"Your father didn't want to take the necklace. He was angry because you didn't focus on finding your brother Andor. "
+                "logText":"Mikhail didn't want to take the necklace. He was angry because I didn't focus on finding Andor."
             },
             {
                 "progress":40,
-                "logText":"Your father didn't seem very happy with the cheap necklace.",
+                "logText":"My father didn't seem very happy with the cheap necklace.",
                 "rewardExperience":50,
                 "finishesQuest":1
             },
             {
                 "progress":50,
-                "logText":"Your father was very happy with the nice necklace.",
+                "logText":"My father was very happy with the nice necklace.",
                 "rewardExperience":500,
                 "finishesQuest":1
             },
             {
                 "progress":60,
-                "logText":"Your father was disappointed with your pretentious necklace.",
+                "logText":"My father was disappointed with the pretentious necklace I bought.",
                 "rewardExperience":50,
                 "finishesQuest":1
             }
diff --git a/AndorsTrail/res/raw/questlist_brimhaven2.json b/AndorsTrail/res/raw/questlist_brimhaven2.json
index ec34fa2f6..697710860 100644
--- a/AndorsTrail/res/raw/questlist_brimhaven2.json
+++ b/AndorsTrail/res/raw/questlist_brimhaven2.json
@@ -6,15 +6,15 @@
         "stages":[
             {
                 "progress":10,
-                "logText":"You entered a classroom in Brimhaven's school. The teacher told you to sit down."
+                "logText":"I entered a classroom in Brimhaven's school. The teacher told me to sit down."
             },
             {
                 "progress":12,
-                "logText":"You noticed an evil-looking statue in a corner. Who on earth puts such an ugly, hideous thing in a school?"
+                "logText":"I noticed an evil-looking statue in a corner. Who on earth puts such an ugly, hideous thing in a school?"
             },
             {
                 "progress":20,
-                "logText":"You found a free place next to Golin."
+                "logText":"I found a free place next to a student named Golin."
             },
             {
                 "progress":30,
@@ -30,78 +30,78 @@
             },
             {
                 "progress":60,
-                "logText":"You should look for a dueling partner."
+                "logText":"I should look for a dueling partner."
             },
             {
                 "progress":100,
-                "logText":"You started a fight with Golin."
+                "logText":"I started a fight with Golin."
             },
             {
                 "progress":102,
-                "logText":"You started a fight with Golin and killed him."
+                "logText":"I started a fight with Golin and killed him."
             },
             {
                 "progress":104,
-                "logText":"You started a fight with Golin, but you broke off the duel. Very good.",
+                "logText":"I started a fight with Golin, but I broke off the duel. Very good.",
                 "rewardExperience":500
             },
             {
                 "progress":110,
-                "logText":"You tried to fight a pupil, but they all ran away screaming."
+                "logText":"I tried to fight a pupil, but they all ran away screaming."
             },
             {
                 "progress":120,
-                "logText":"You started a fight with the teacher."
+                "logText":"I started a fight with the teacher."
             },
             {
                 "progress":122,
-                "logText":"You started a fight with the teacher and killed her.",
+                "logText":"I started a fight with the teacher and killed her.",
                 "rewardExperience":1000
             },
             {
                 "progress":124,
-                "logText":"You started a fight with the teacher, but you broke off the duel. Very good.",
+                "logText":"I started a fight with the teacher, but I broke off the duel. Very good.",
                 "rewardExperience":500
             },
             {
                 "progress":130,
-                "logText":"You feel the evil stare of the statue."
+                "logText":"I feel the evil stare of the statue."
             },
             {
                 "progress":150,
-                "logText":"The evil grinning statue suddenly grew to an incredible size and attacked you!"
+                "logText":"The evil grinning statue suddenly grew to an incredible size and attacked me!"
             },
             {
                 "progress":152,
-                "logText":"You killed the evil statue."
+                "logText":"I killed the evil statue."
             },
             {
                 "progress":200,
-                "logText":"The teacher thanked you for saving him. School is over for you. You could go to the general store and get a cake for good performance.",
+                "logText":"The teacher thanked me for saving her. School is over for me. I can go to the general store and get a cake for good performance.",
                 "rewardExperience":5000,
                 "finishesQuest":1
             },
             {
                 "progress":210,
-                "logText":"You cheated during the duel. The teacher noticed it and banned you from the school.",
+                "logText":"I cheated during the duel. The teacher noticed it and banned me from the school.",
                 "rewardExperience":500,
                 "finishesQuest":1
             },
             {
                 "progress":220,
-                "logText":"The teacher was very satisfied with your performance in the duel. School is over for you. You could go to the general store and get a cake for good performance.",
+                "logText":"The teacher was very satisfied with my performance in the duel. School is over for me. I can go to the general store and get a cake for good performance.",
                 "rewardExperience":1000,
                 "finishesQuest":1
             },
             {
                 "progress":230,
-                "logText":"The teacher sent you away, because you killed Golin in the duel.",
+                "logText":"The teacher sent me away, because I killed Golin in the duel.",
                 "rewardExperience":500,
                 "finishesQuest":1
             },
             {
                 "progress":240,
-                "logText":"Golin was horrified by your murder of the teacher and attacked you to avenge her.",
+                "logText":"Golin was horrified by my murder of the teacher and attacked me to avenge her.",
                 "rewardExperience":500,
                 "finishesQuest":1
             }
@@ -114,47 +114,47 @@
         "stages":[
             {
                 "progress":10,
-                "logText":"Facutloni asked you to help him check the storage. You should check if there is a pair of every item."
+                "logText":"Facutloni asked me to help him check the storage. I should check if there is a pair of every item."
             },
             {
                 "progress":100,
-                "logText":"You have found a pair of crystal globes."
+                "logText":"I have found a pair of crystal globes."
             },
             {
                 "progress":101,
-                "logText":"You have found a pair of plush pillows."
+                "logText":"I have found a pair of plush pillows."
             },
             {
                 "progress":102,
-                "logText":"You have found a pair of lyras."
+                "logText":"I have found a pair of lyras."
             },
             {
                 "progress":103,
-                "logText":"You have found a pair of boots."
+                "logText":"I have found a pair of boots."
             },
             {
                 "progress":104,
-                "logText":"You have found a pair of chandeliers."
+                "logText":"I have found a pair of chandeliers."
             },
             {
                 "progress":105,
-                "logText":"You have found a pair of mysterious green somethings."
+                "logText":"I have found a pair of mysterious green somethings."
             },
             {
                 "progress":106,
-                "logText":"You have found a pair of old, worn capes."
+                "logText":"I have found a pair of old, worn capes."
             },
             {
                 "progress":107,
-                "logText":"You have found a pair of pretty porcelain figures."
+                "logText":"I have found a pair of pretty porcelain figures."
             },
             {
                 "progress":108,
-                "logText":"You have found a pair of striped hammers."
+                "logText":"I have found a pair of striped hammers."
             },
             {
                 "progress":109,
-                "logText":"You have found a pair of dusty old books."
+                "logText":"I have found a pair of dusty old books."
             },
             {
                 "progress":900,
@@ -200,6 +200,10 @@
             {
                 "progress":50,
                 "logText":"Pupils ran out"
+            },
+            {
+                "progress":60,
+                "logText":"60=banned fromtower"
             }
         ]
     }
diff --git a/AndorsTrail/res/raw/questlist_brimhaven_2.json b/AndorsTrail/res/raw/questlist_brimhaven_2.json
new file mode 100644
index 000000000..8d420503d
--- /dev/null
+++ b/AndorsTrail/res/raw/questlist_brimhaven_2.json
@@ -0,0 +1,79 @@
+[
+    {
+        "id":"new_snake_master",
+        "name":"Perception is not reality",
+        "showInLog":1,
+        "stages":[
+            {
+                "progress":25,
+                "logText":"I must stop Ewmondold from getting stronger."
+            },
+            {
+                "progress":5,
+                "logText":"A traveler named Ewmondold had asked me to venture into the Snake Cave to retrieve his map."
+            },
+            {
+                "progress":10,
+                "logText":"Ewmondold had thanked me for killing the Snake master, and that his way to rule would be free. I should better find him."
+            },
+            {
+                "progress":30,
+                "logText":"I've destroyed Ewmondold and eliminated his threat to Crossglen and the surrounding area.",
+                "rewardExperience":250,
+                "finishesQuest":1
+            },
+            {
+                "progress":20,
+                "logText":"I've returned Ewmondold's map to him.",
+                "rewardExperience":450
+            }
+        ]
+    },
+    {
+        "id":"cat_and_mouse",
+        "name":"A cat and mouse game",
+        "showInLog":1,
+        "stages":[
+            {
+                "progress":10,
+                "logText":"I agreed to help Seviron trap the mouse that the cat cannot catch. I need to get some cheese, a large empty bottle, and three rocks."
+            },
+            {
+                "progress":20,
+                "logText":"I have given Seviron the rocks."
+            },
+            {
+                "progress":30,
+                "logText":"I have given Seviron the cheese."
+            },
+            {
+                "progress":40,
+                "logText":"I obtained a suitable bottle from Arlish."
+            },
+            {
+                "progress":50,
+                "logText":"I have given Seviron the bottle. Seviron will set the trap, but it may take some time to catch the mouse. I should come back later."
+            },
+            {
+                "progress":60,
+                "logText":"The mouse has been caught! Seviron gave it to me in the bottle. He said I can decide what to do with it."
+            },
+            {
+                "progress":70,
+                "logText":"I decided to give the mouse to the cat. The cat would have eventually killed it anyway.",
+                "rewardExperience":1000,
+                "finishesQuest":1
+            },
+            {
+                "progress":80,
+                "logText":"I decided to release the mouse outside. Seviron told me to do that outside the town."
+            },
+            {
+                "progress":90,
+                "logText":"I released the mouse.",
+                "rewardExperience":1500,
+                "finishesQuest":1
+            }
+        ]
+    }
+]
\ No newline at end of file
diff --git a/AndorsTrail/res/raw/questlist_brimhaven_2b.json b/AndorsTrail/res/raw/questlist_brimhaven_2b.json
new file mode 100644
index 000000000..4bc0a9fe1
--- /dev/null
+++ b/AndorsTrail/res/raw/questlist_brimhaven_2b.json
@@ -0,0 +1,56 @@
+[
+    {
+        "id":"hettar_dog_nd",
+        "name":"hettar_dog_nd",
+        "showInLog":0,
+        "stages":[
+            {
+                "progress":1,
+                "logText":"1=found dog"
+            },
+            {
+                "progress":2,
+                "logText":"2=picked up bones"
+            }
+        ]
+    },
+    {
+        "id":"hettar_dog",
+        "name":"Where is Norry?",
+        "showInLog":1,
+        "stages":[
+            {
+                "progress":10,
+                "logText":"I found Hettar, a tough boy about my age, on top of Blackwater mountain. He kept calling for a certain Norry."
+            },
+            {
+                "progress":20,
+                "logText":"Hettar's little dog Norry has run away. He was very anxious to find him. I promised to get Norry back."
+            },
+            {
+                "progress":30,
+                "logText":"Hettar has given me a piece of Norry's favourite food."
+            },
+            {
+                "progress":40,
+                "logText":"I have offered Hettar's piece of Wyrm meat to Norry, who took it eagerly."
+            },
+            {
+                "progress":50,
+                "logText":"Norry ran off to reunite with Hettar."
+            },
+            {
+                "progress":80,
+                "logText":"Hettar thanked me a thousand times for my help in finding Norry.",
+                "rewardExperience":2000,
+                "finishesQuest":1
+            },
+            {
+                "progress":90,
+                "logText":"I explained to Hettar that I killed Norry. Hettar broke down on the floor in agony.",
+                "rewardExperience":200,
+                "finishesQuest":1
+            }
+        ]
+    }
+]
\ No newline at end of file
diff --git a/AndorsTrail/res/raw/questlist_graveyard1.json b/AndorsTrail/res/raw/questlist_graveyard1.json
index 59aec4507..8b3e76520 100644
--- a/AndorsTrail/res/raw/questlist_graveyard1.json
+++ b/AndorsTrail/res/raw/questlist_graveyard1.json
@@ -229,6 +229,10 @@
             {
                 "progress":230,
                 "logText":"bought Brimhaven bed"
+            },
+            {
+                "progress":240,
+                "logText":"Despawned monsters in graveyard"
             }
         ]
     }
diff --git a/AndorsTrail/res/raw/questlist_guynmart.json b/AndorsTrail/res/raw/questlist_guynmart.json
index ee9547388..c353bb465 100644
--- a/AndorsTrail/res/raw/questlist_guynmart.json
+++ b/AndorsTrail/res/raw/questlist_guynmart.json
@@ -166,7 +166,7 @@
             },
             {
                 "progress":210,
-                "logText":"Lovis prepared a surprise for me west of the castle.",
+                "logText":"Lovis prepared a surprise for me east of the castle.",
                 "finishesQuest":1
             },
             {
diff --git a/AndorsTrail/res/raw/questlist_v070_charwood.json b/AndorsTrail/res/raw/questlist_v070_charwood.json
index a5bbc6f53..32e5b5266 100644
--- a/AndorsTrail/res/raw/questlist_v070_charwood.json
+++ b/AndorsTrail/res/raw/questlist_v070_charwood.json
@@ -88,6 +88,10 @@
                 "progress":75,
                 "logText":"Falothen has taught me how to be better at fighting unarmed, without weapons."
             },
+            {
+                "progress":76,
+                "logText":"Falothen has taught me how to better handle polearms."
+            },
             {
                 "progress":80,
                 "logText":"Falothen offered me the chance to learn about the other weapon types, but to teach me, he needs 5000 gold and two Oegyth crystals for each skill that I want to get better at."
diff --git a/AndorsTrail/res/values/loadresources.xml b/AndorsTrail/res/values/loadresources.xml
index 29912dc3a..8a94d19c4 100644
--- a/AndorsTrail/res/values/loadresources.xml
+++ b/AndorsTrail/res/values/loadresources.xml
@@ -75,6 +75,9 @@
         <!--Added by ATCS v0.6.16 for project Brimhaven-->
         <item>@raw/itemlist_brimhaven</item>
         <item>@raw/itemlist_brimhaven2</item>
+        <!--Added by ATCS v0.6.16 for project brimhaven_2-->
+        <item>@raw/itemlist_brimhaven_2</item>
+        <item>@raw/itemlist_brimhaven_2b</item>
     </array>
         
     <array name="loadresource_droplists">
@@ -113,6 +116,9 @@
         <!--Added by ATCS v0.6.16 for project Brimhaven-->
         <item>@raw/droplists_brimhaven</item>
         <item>@raw/droplists_brimhaven2</item>
+        <!--Added by ATCS v0.6.16 for project brimhaven_2-->
+        <item>@raw/droplists_brimhaven_2</item>
+        <item>@raw/droplists_brimhaven_2b</item>
     </array>
         
     <array name="loadresource_quests">
@@ -131,7 +137,8 @@
         <item>@raw/questlist_shortcut_lodar</item>
         <item>@raw/questlist_pathway_fallhaven</item>
         <item>@raw/questlist_halvor_surprise</item>
-                                        -		
+                                                -		
+        
         
         
         
@@ -150,6 +157,9 @@
         <!--Added by ATCS v0.6.16 for project Brimhaven-->
         <item>@raw/questlist_brimhaven</item>
         <item>@raw/questlist_brimhaven2</item>
+        <!--Added by ATCS v0.6.16 for project brimhaven_2-->
+        <item>@raw/questlist_brimhaven_2</item>
+        <item>@raw/questlist_brimhaven_2b</item>
     </array>
         
     <array name="loadresource_conversationlists">
@@ -332,6 +342,9 @@
         <item>@raw/conversationlist_brimhaven2</item>
         <item>@raw/conversationlist_brimhaven_blackjack</item>
         <item>@raw/conversationlist_brimhaven_blackjack_game</item>
+        <!--Added by ATCS v0.6.16 for project brimhaven_2-->
+        <item>@raw/conversationlist_brimhaven_2</item>
+        <item>@raw/conversationlist_brimhaven_2b</item>
     </array>
         
     <array name="loadresource_monsters">
@@ -377,6 +390,9 @@
         <!--Added by ATCS v0.6.16 for project Brimhaven-->
         <item>@raw/monsterlist_brimhaven</item>
         <item>@raw/monsterlist_brimhaven2</item>
+        <!--Added by ATCS v0.6.16 for project brimhaven_2-->
+        <item>@raw/monsterlist_brimhaven_2</item>
+        <item>@raw/monsterlist_brimhaven_2b</item>
     </array>
         
     <array name="loadresource_maps">
@@ -944,6 +960,12 @@
         <item>@xml/brimhaven_tavern_west_back</item>
         <item>@xml/brimhaven_warehouse</item>
         <item>@xml/brimhaven_weapon1</item>
+        <!--Added by ATCS v0.6.16 for project brimhaven_2-->
+        <item>@xml/blackwater_mountain55</item>
+        <item>@xml/blackwater_mountain56</item>
+        <item>@xml/brimhaven_church_basement</item>
+        <item>@xml/brimhaven_church_upstairs</item>
+        <item>@xml/brimhaven_exit</item>
     </array>
         
 </resources>
diff --git a/AndorsTrail/res/xml/arulircave3.tmx b/AndorsTrail/res/xml/arulircave3.tmx
index 7d3880eaf..565b9b97c 100644
--- a/AndorsTrail/res/xml/arulircave3.tmx
+++ b/AndorsTrail/res/xml/arulircave3.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="15" height="15" tilewidth="32" tileheight="32" infinite="0" nextobjectid="14">
+<map version="1.0" tiledversion="1.1.5" orientation="orthogonal" renderorder="right-down" width="15" height="15" tilewidth="32" tileheight="32" infinite="0" nextobjectid="17">
  <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>
@@ -200,7 +200,7 @@
    eJxjYCAfZAmTr7cKTW8SE/F6u3DYKwg046EQ+W6iBIDcf0kMt/wsPGGFTx8IrCIynFPEGRiuCxKnNhmHe3Hpd4bGjyQJ8XQNalYwCXrwAXYmBAYBV3HKzXw9QOkFGQAA8aoNWA==
   </data>
  </layer>
- <layer name="Walkable" width="15" height="15" visible="0">
+ <layer name="Walkable" width="15" height="15">
   <data encoding="base64" compression="zlib">
    eJzbKMbAsHEAMQzA2KTqQwbk6iNWPza1pNiNzY/oZpHrdlL1EhInJd7IiW966x3MGACNIIpf
   </data>
@@ -239,6 +239,11 @@
     <property name="place" value="trapexit"/>
    </properties>
   </object>
+  <object id="16" name="arulircave_trap101_chk" type="script" x="224" y="224" width="32" height="32">
+   <properties>
+    <property name="when" value="enter"/>
+   </properties>
+  </object>
  </objectgroup>
  <objectgroup name="Spawn" visible="0">
   <object id="6" name="arulir_2" type="spawn" x="64" y="64" width="160" height="224">
@@ -267,6 +272,15 @@
     <property name="requireValue" value="10"/>
    </properties>
   </object>
+  <object id="14" name="arulircave_trap:101" type="key" x="192" y="320" width="96" height="32">
+   <properties>
+    <property name="phrase" value="arulircave_trap101"/>
+    <property name="requireId" value="arulircave_trap"/>
+    <property name="requireNegation" value="true"/>
+    <property name="requireType" value="questProgress"/>
+    <property name="requireValue" value="101"/>
+   </properties>
+  </object>
  </objectgroup>
  <objectgroup name="Replace" visible="0">
   <object id="8" name="arulircave_trap:07" type="replace" x="160" y="224" width="32" height="64">
diff --git a/AndorsTrail/res/xml/arulirmountain1.tmx b/AndorsTrail/res/xml/arulirmountain1.tmx
index 0b288b7cf..486c43e28 100644
--- a/AndorsTrail/res/xml/arulirmountain1.tmx
+++ b/AndorsTrail/res/xml/arulirmountain1.tmx
@@ -1,184 +1,183 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
-<map version="1.0" orientation="orthogonal" width="30" height="30" tilewidth="32" tileheight="32">
+<map version="1.0" tiledversion="1.1.5" orientation="orthogonal" renderorder="right-down" width="30" height="30" tilewidth="32" tileheight="32" infinite="0" nextobjectid="36">
  <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_tree_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="6449" 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="6577" name="map_tree_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="6577" 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="6705" name="map_wall_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="6705" 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="6833" name="map_wall_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="6833" 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="6953" name="map_wall_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="6953" 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="7073" name="map_wall_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="7073" 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="7193" name="map_window_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="7193" 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="7321" name="map_window_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="7321" 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="30" height="30">
@@ -203,149 +202,154 @@
  </layer>
  <layer name="Walkable" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJztk7sRwCAMQ5ki+6/AhrQuCNbHQIPv3HDBT1hK/1rrr692LOTbbA7LjPf+ZszOZ/cZHlvIHETDSjvKZ3eeaZ3pWnnPclFdbOaUnCL7cP4jNoMOi51RxWPZFVxljuur6lNVnio8cnXsyEVlDuP5Dj+zUvTv3C26s8wbheX4fJvr8pRyuY7O09zTb7353tdaD6nfJbQ=
+   eJztk7sRwCAMQ5ki+6/AhrQUBOtjTIPv3HDBT1hK/1rrr6/2XMi30RyWOd/7m7E6X91neGwhcxANO+0on915pHWla+c9y0V1sZlTcorsw/mP2Aw6LHZOJq+aq8xxfVV9yspThkeujhO5yMzhfH7Cz6gU/Sd3i+4s8kZhOT7f5ro8pVyuo7OaW/3Wm+99rfUA1hQk7Q==
+  </data>
+ </layer>
+ <layer name="Walkable_replace" width="30" height="30">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgFIxlsFBtoF4yCwQRA6WEg0gQ17R3q7h8Fo2AUjIJRMApGwSigJwAAmgQGOQ==
   </data>
  </layer>
  <objectgroup name="Mapevents" visible="0">
-  <object name="west2" type="mapchange" x="0" y="544" width="32" height="64">
+  <object id="1" name="west2" type="mapchange" x="0" y="544" width="32" height="64">
    <properties>
     <property name="map" value="mountainlake5"/>
     <property name="place" value="east2"/>
    </properties>
   </object>
-  <object name="west" type="mapchange" x="0" y="736" width="32" height="32">
+  <object id="2" name="west" type="mapchange" x="0" y="736" width="32" height="32">
    <properties>
     <property name="map" value="mountainlake5"/>
     <property name="place" value="east"/>
    </properties>
   </object>
-  <object name="east" type="mapchange" x="928" y="160" width="32" height="96">
+  <object id="3" name="east" type="mapchange" x="928" y="160" width="32" height="96">
    <properties>
     <property name="map" value="arulirmountain2"/>
     <property name="place" value="west"/>
    </properties>
   </object>
-  <object name="cave" type="mapchange" x="576" y="96" width="32" height="32">
+  <object id="4" name="cave" type="mapchange" x="576" y="96" width="32" height="32">
    <properties>
     <property name="map" value="arulircave1"/>
     <property name="place" value="exit"/>
    </properties>
   </object>
-  <object name="arulirmountain_trap03" type="script" x="256" y="128" width="32" height="32">
+  <object id="5" name="arulirmountain_trap03" type="script" x="256" y="128" width="32" height="32">
    <properties>
     <property name="when" value="enter"/>
    </properties>
   </object>
-  <object name="arulirmountain_trap04" type="script" x="640" y="288" width="32" height="32">
+  <object id="6" name="arulirmountain_trap04" type="script" x="640" y="288" width="32" height="32">
    <properties>
     <property name="when" value="enter"/>
    </properties>
   </object>
-  <object name="arulirmountain_trap05" type="script" x="256" y="352" width="32" height="32">
+  <object id="7" name="arulirmountain_trap05" type="script" x="256" y="352" width="32" height="32">
    <properties>
     <property name="when" value="enter"/>
    </properties>
   </object>
-  <object name="bernhar_reminder" type="script" x="576" y="448" width="32" height="32">
+  <object id="8" name="bernhar_reminder" type="script" x="576" y="448" width="32" height="32">
    <properties>
     <property name="when" value="enter"/>
    </properties>
   </object>
-  <object name="bernhar_remove" type="script" x="576" y="352" width="32" height="32">
+  <object id="9" name="bernhar_remove" type="script" x="576" y="352" width="32" height="32">
    <properties>
     <property name="when" value="enter"/>
    </properties>
   </object>
-  <object name="arulir_gem2" type="container" x="128" y="160" width="32" height="32"/>
-  <object name="arulir_gem1" type="container" x="160" y="480" width="32" height="32"/>
+  <object id="10" name="arulir_gem2" type="container" x="128" y="160" width="32" height="32"/>
+  <object id="11" name="arulir_gem1" type="container" x="160" y="480" width="32" height="32"/>
  </objectgroup>
  <objectgroup name="Spawn" visible="0">
-  <object name="arulir_1" type="spawn" x="64" y="736" width="192" height="32">
+  <object id="12" name="arulir_1" type="spawn" x="64" y="736" width="192" height="32">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="arulir_1"/>
    </properties>
   </object>
-  <object name="arulir_1b" type="spawn" x="320" y="736" width="96" height="32">
+  <object id="13" name="arulir_1b" type="spawn" x="320" y="736" width="96" height="32">
    <properties>
     <property name="spawngroup" value="arulir_1"/>
    </properties>
   </object>
-  <object name="arulir_1c" type="spawn" x="416" y="576" width="128" height="192">
+  <object id="14" name="arulir_1c" type="spawn" x="416" y="576" width="128" height="192">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="arulir_1"/>
    </properties>
   </object>
-  <object name="arulir_1d" type="spawn" x="512" y="480" width="224" height="160">
+  <object id="15" name="arulir_1d" type="spawn" x="512" y="480" width="224" height="160">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="arulir_1"/>
    </properties>
   </object>
-  <object name="arulir_1e" type="spawn" x="576" y="448" width="32" height="32">
+  <object id="16" name="arulir_1e" type="spawn" x="576" y="448" width="32" height="32">
    <properties>
     <property name="spawngroup" value="arulir_1"/>
    </properties>
   </object>
-  <object name="arulir_1f" type="spawn" x="576" y="288" width="32" height="96">
+  <object id="17" name="arulir_1f" type="spawn" x="576" y="288" width="32" height="96">
    <properties>
     <property name="spawngroup" value="arulir_1"/>
    </properties>
   </object>
-  <object name="arulir_1g" type="spawn" x="768" y="96" width="128" height="192">
+  <object id="18" name="arulir_1g" type="spawn" x="768" y="96" width="128" height="192">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="arulir_1"/>
    </properties>
   </object>
-  <object name="arulir_1h" type="spawn" x="448" y="160" width="288" height="160">
+  <object id="19" name="arulir_1h" type="spawn" x="448" y="160" width="288" height="160">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="arulir_1"/>
    </properties>
   </object>
-  <object name="arulir_1i" type="spawn" x="256" y="288" width="32" height="32">
+  <object id="20" name="arulir_1i" type="spawn" x="256" y="288" width="32" height="32">
    <properties>
     <property name="spawngroup" value="arulir_1"/>
    </properties>
   </object>
-  <object name="gornaud_4" type="spawn" x="64" y="384" width="224" height="128">
+  <object id="21" name="gornaud_4" type="spawn" x="64" y="384" width="224" height="128">
    <properties>
     <property name="spawngroup" value="gornaud_4"/>
    </properties>
   </object>
-  <object name="arulir_1j" type="spawn" x="128" y="352" width="160" height="96">
+  <object id="22" name="arulir_1j" type="spawn" x="128" y="352" width="160" height="96">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="arulir_1"/>
    </properties>
   </object>
-  <object name="arulir_1k" type="spawn" x="128" y="96" width="320" height="128">
+  <object id="23" name="arulir_1k" type="spawn" x="128" y="96" width="320" height="128">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="arulir_1"/>
    </properties>
   </object>
-  <object name="arulir_1l" type="spawn" x="32" y="576" width="160" height="96">
+  <object id="24" name="arulir_1l" type="spawn" x="32" y="576" width="160" height="96">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="arulir_1"/>
    </properties>
   </object>
-  <object name="arulir_2" type="spawn" x="544" y="160" width="96" height="64">
+  <object id="25" name="arulir_2" type="spawn" x="544" y="160" width="96" height="64">
    <properties>
     <property name="spawngroup" value="arulir_2"/>
    </properties>
   </object>
-  <object name="bernhar" type="spawn" x="416" y="832" width="64" height="32">
+  <object id="26" name="bernhar" type="spawn" x="416" y="832" width="64" height="32">
    <properties>
     <property name="spawngroup" value="bernhar"/>
    </properties>
   </object>
  </objectgroup>
  <objectgroup name="Keys" visible="0">
-  <object name="arulirmountain_trap:03" type="key" x="256" y="128" width="32" height="32">
+  <object id="27" name="arulirmountain_trap:03" type="key" x="256" y="128" width="32" height="32">
    <properties>
     <property name="phrase" value="do_nothing_but_leave"/>
     <property name="requireId" value="arulirmountain_trap"/>
@@ -354,7 +358,7 @@
     <property name="requireValue" value="3"/>
    </properties>
   </object>
-  <object name="arulirmountain_trap:04" type="key" x="640" y="288" width="32" height="32">
+  <object id="28" name="arulirmountain_trap:04" type="key" x="640" y="288" width="32" height="32">
    <properties>
     <property name="phrase" value="do_nothing_but_leave"/>
     <property name="requireId" value="arulirmountain_trap"/>
@@ -363,7 +367,7 @@
     <property name="requireValue" value="4"/>
    </properties>
   </object>
-  <object name="arulirmountain_trap:05" type="key" x="256" y="352" width="32" height="32">
+  <object id="29" name="arulirmountain_trap:05" type="key" x="256" y="352" width="32" height="32">
    <properties>
     <property name="phrase" value="do_nothing_but_leave"/>
     <property name="requireId" value="arulirmountain_trap"/>
@@ -372,7 +376,7 @@
     <property name="requireValue" value="5"/>
    </properties>
   </object>
-  <object name="andor:1c" type="key" x="32" y="576" width="32" height="32">
+  <object id="30" name="andor:1c" type="key" x="32" y="576" width="32" height="32">
    <properties>
     <property name="phrase" value="do_nothing_but_leave"/>
     <property name="requireId" value="andor"/>
@@ -380,7 +384,7 @@
     <property name="requireValue" value="1"/>
    </properties>
   </object>
-  <object name="base_nondisplay:2" type="key" x="576" y="160" width="32" height="32">
+  <object id="31" name="base_nondisplay:2" type="key" x="576" y="160" width="32" height="32">
    <properties>
     <property name="phrase" value="sign_arulir2"/>
     <property name="requireId" value="base_nondisplay"/>
@@ -388,7 +392,7 @@
     <property name="requireValue" value="2"/>
    </properties>
   </object>
-  <object name="base_nondisplay:2b" type="key" x="544" y="544" width="32" height="32">
+  <object id="32" name="base_nondisplay:2b" type="key" x="544" y="544" width="32" height="32">
    <properties>
     <property name="phrase" value="sign_arulir1"/>
     <property name="requireId" value="base_nondisplay"/>
@@ -398,19 +402,22 @@
   </object>
  </objectgroup>
  <objectgroup name="Replace" visible="0">
-  <object name="arulirmountain_trap:3" type="replace" x="256" y="128" width="32" height="32">
+  <object id="33" name="arulirmountain_trap:3" type="replace" x="256" y="128" width="32" height="32">
    <properties>
     <property name="Objects" value="Objects_replace"/>
+    <property name="Walkable" value="Walkable_replace"/>
    </properties>
   </object>
-  <object name="arulirmountain_trap:4" type="replace" x="640" y="256" width="64" height="64">
+  <object id="34" name="arulirmountain_trap:4" type="replace" x="640" y="256" width="64" height="64">
    <properties>
     <property name="Objects" value="Objects_replace"/>
+    <property name="Walkable" value="Walkable_replace"/>
    </properties>
   </object>
-  <object name="arulirmountain_trap:5" type="replace" x="256" y="320" width="64" height="64">
+  <object id="35" name="arulirmountain_trap:5" type="replace" x="256" y="320" width="64" height="64">
    <properties>
     <property name="Objects" value="Objects_replace"/>
+    <property name="Walkable" value="Walkable_replace"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/blackwater_mountain16.tmx b/AndorsTrail/res/xml/blackwater_mountain16.tmx
index e5fadc04e..e88c7de80 100644
--- a/AndorsTrail/res/xml/blackwater_mountain16.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain16.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="15" height="30" tilewidth="32" tileheight="32" infinite="0" nextobjectid="15">
+<map version="1.0" tiledversion="1.1.5" orientation="orthogonal" renderorder="right-down" width="15" height="30" tilewidth="32" tileheight="32" infinite="0" nextobjectid="16">
  <properties>
   <property name="outdoors" value="1"/>
  </properties>
@@ -190,7 +190,7 @@
  </layer>
  <layer name="Objects" width="15" height="30">
   <data encoding="base64" compression="zlib">
-   eJx9VcFKAzEQDbl5km5pYK+e+8fiF9hjcdl6rAdrbxWqi562Kgo9eRAFEfPYDDt5O+2D0Gwyb2YymZc6l6MOzj2M3AD7wrmtsW6twcdzkX/vyv5b+8ce8KfsgSbZvMT130k3X4ach9EoX49pPldrwtmQfx17Tmdoi6GNhUXcu0rjms6MvNbk99L380r59QdiSJ3Ev8UtiCsx5dzIvzrArYiLu5xSnWAjeVeqlswFGjrvKthz4bK9xlu0eVfjI/TcT8qRe3BJud2mPuGcpSf4npgrcW9Gw1iT004bgqeQc/3YrhWAnLAv+Ip232n8xFEQd+dzfjF2R1EpfeiazXx39nPf3feFz/fQ12vShvUm3Jc5D5B7ljpp/WyC7UvbiE9Z2xu6hT5nVAvJU/eUzF9LdxR8pyfkG36gAcRkW61d2JTEZdQx90U6k2hXvzeiNbwlU7qzVfy+S2tnRk/xWyU5A9abi18do1Ux2yPvJSC1Fe3IvaGvYLdV+7Blf1xHq0/RlzpmnfRUU49pX9b/kQB60XXQuv8Hd3mLxQ==
+   eJx9VU1Lw0AQXdYfIE1pIFe99h+Lv8AeiyH1WA/W3iq0Bj2lKgo9eRAFEfeRHTL7Ms2DpZvd+dqZeVPnUlS5c7uR6+GQObc1zq0z2HjO0u990X1r+7gD/pQ8UEeZl3D+O2n3yzzVw6qVrce4n6sz0dmQfe17Tm9osr6MhUW4u47rht6MuNZk98p3+1LZ9Ud8SJ7EvqWbka74lHcj/vKIbkm6qOWU8gQZibtUuWRdoKb3rnJ7L7osr/EWZN7V+sg73U+KkXtwSbHdxT7hmKUnuE6sK35vR31fk9OWG4KnPNX1YztXAGLCveAryH3H9RNWRrp7n+pnYzeIUvFD52zm27df+Lbelz69Q1+viRvWTHgoUj1A6ix50vzZ5LYtLSM25exg8Bb8nFEuJE7dU3L2WrhBcE1PqF6wCQ7AJ8tq7kJmPDAvgCrEvohvEu7KvDlXXMMsmVLNVuH7Pp6dGX54VknMgDVz8at9NMpnMzAvAcmzcEfqhr6C3FbdQ5btcR6tPkVfap9V5FNFPaZtWf9HAvBF50Hz/h+u44v1
   </data>
  </layer>
  <layer name="Above" width="15" height="30">
@@ -200,7 +200,7 @@
  </layer>
  <layer name="Walkable" width="15" height="30" visible="0">
   <data encoding="base64" compression="zlib">
-   eJy9k9EJACEMQ53i9l/BDe/rfiRpkvZQEFR8SVp0P2ttc36je5+xaKBz5cN0nIwOj/aub6XFdJ0+dr1QXpS/Wp8su8N8mZZilV7qU72JpFeJr3qLXVb1L/m3qO6US5lpzkl9Lo/+1pTt5HfZv3qU1HVmTHtze74Q49s3
+   eJydU8kNACEItAr7b8EOffkxc0JiVo1zwMLZa51wvZi+Z1gU6N7pMJ7EY4JH51RXcTHepI5TLeQX+Vf7H8veMF3G5bCOr9VRPdHUqtF1vTjFuvo1c4vybnEtJpmHRE95UMH6Tfln3war8lf/GmF/PMpR+Ulqm+TufCSekpyaeWLrAnBBwZA=
   </data>
  </layer>
  <objectgroup name="Mapevents">
@@ -223,6 +223,12 @@
     <property name="place" value="south"/>
    </properties>
   </object>
+  <object id="15" name="south" type="mapchange" x="128" y="928" width="96" height="32">
+   <properties>
+    <property name="map" value="blackwater_mountain56"/>
+    <property name="place" value="north"/>
+   </properties>
+  </object>
  </objectgroup>
  <objectgroup name="Spawn" visible="0">
   <object id="4" name="gornaud_1" type="spawn" x="192" y="672" width="96" height="32">
diff --git a/AndorsTrail/res/xml/blackwater_mountain32.tmx b/AndorsTrail/res/xml/blackwater_mountain32.tmx
index 0899f355c..78619223b 100644
--- a/AndorsTrail/res/xml/blackwater_mountain32.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain32.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="30" height="30" tilewidth="32" tileheight="32" nextobjectid="16">
+<map version="1.0" tiledversion="1.1.5" orientation="orthogonal" renderorder="right-down" width="30" height="30" tilewidth="32" tileheight="32" infinite="0" nextobjectid="18">
  <properties>
   <property name="outdoors" value="1"/>
  </properties>
@@ -190,17 +190,17 @@
  </layer>
  <layer name="Objects" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJy9VltS20AQ3IIUBXxFCokLrsNJuAinyBlyAFyGD8tVdlL4H9AfP0pKR/ABcMc7qNWaXct80FUqax+e3pnpmVUIIawmIbxsn/vL8B+bMrwD7xffQqjL7h2/bdnt5/88be38nnTzdZxfFsO9gbixPi92Nhdxbyuc+AXWl7v9TdyvnIy27I9nx0Nus6l76xPfJs6pnLfHO1/XFBO8M5/H3RTDtZZ4b+M8+J4dTvVTfQAQz5TfwOPX/n6M2xjvqcQVnIg981QYf++f06AxMG77f0W6MHixZXCMDTjnQmyl/DZ/7QwYexqy9YWj3bXozot7LuaW92nGz0biDH3pOZ8n/QccGtPVpG+HbRjnphzG1cb78sH+zZy1FE6PuneNX66mU9zAzKkJ9QtxrIouB8jv0qlphvU6+O7ldV6kfffiZchx4n969pSmVCsAj81O62gIPFPRgwF2K6dHrTIaTD2ehqYxdl9ib7feMhcNe3ndB60D9s38RY+DvRfJAd8H4L53eg7W68RZWC9s8++W5277/Pmxm7Mcau+qM9pV1E6eAbtzUWeIhflsPYz1gzmrB45bI+fCPju78qViAV7ssxwrt2Jffnldz8drnGOvbp5GaPZQNMXwzlTuMX1tbE159fWP9DSmH3t38KGAzu27EDHAO3Nj3Wr6NfNNtg9WV3xmzHlaMp0vExqxdbbFe7km+TsGvizifcHfrwyuC63tMeC7kcG926sh1jTfDQz4y/eB7rFvG7ajml5leruufUTDZseg98FnAHmuMvf6A30L5HrWRtZ+ij22A07V57Vo4SqhDcOZrN/E8S/iPY9zJe0F3xuu4Tut
+   eJy9VktOG0EUbAUUBVYZk2DBdXISLsIpcoYcAMvOAluyE8EemF02TjRH8AEyJXeJmvLr9pBFShrN9GdevX93Siltpim99A+xmwy/P12k1E5ev/Hu+mdxldK6Gf7z1Mv5IbLaPM99Lp/cWL+XPUBnnHgDj1f797aJOV2GYn5yyE2Zvrd9H8uEns55e7K3lbpRpvJF3LRB1zrhvc3z4HsOON1OtwFYNWW7gYePw/0Yd9nfM/MrOBEr5Vli/HmoJ+E+IDf/X1rMKaNkJ2U6oOfKZJXspr3UAeMoh7i+CnIXOug/kd9rPmfcZxU7t+Zn5Jfr+TwdPuBwn26mQzkqg5y7yaFfOT4WD7VvHqyV8OHd67f7r1bTJW5gHtSE2wU/wkeMAeK7DmpascgyYHsU1/umbHvkL6LGif9c91JOea4AOqacLsgh8MwsHwjIXQY9alPJwdIT5dAs++4093b2Fj8Lorgeg9eB2kZ70eMg78VioOcBuBdBz8F6W9BF80Vl/u557vrn5+V+jjH03tVWctfRBnEGeOaizuAL2swepvmDOdaD+m1remEfdXe+ki/Ai32MsXM7jsVX110/XdMYR3XzNCJn34ptc3hmOveYvja2pqL6+iP5NKYfR2fwW4E8570QPsC3cmOdNf2rcic7BtaV6oy5KJeY5+tCjnBdZelerUm9x8CWVT4v9P6q0Lrw2h4DPRsV2rujGtKc1rNBAXv1PPA9vNuoHM/pTaW3+9q/5DDlEH4e/A8gzsvKuf5d7gK1nrWzta8mT+WA0/Pzi+XCdSE3iDNbv8njb8J7nucmshd8fwExfDhy
   </data>
  </layer>
  <layer name="Above" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJytV1tuwkAMjJQeAKhUiVNyAnqr8lP1KyoHIPzx24MUS7UytcZre5OREGyy6xmP98Uw5PHy+v97emv3j94rrseCiCDu/Hx3e34uEPNSjO/hBryoWTnX4mPH2+o3osqJHvwcarruh8Vz5Fzrq5cvIppDW9VW8PjzZat6WrTyRU6bk5fjnNT4vfPb2TWKqIyZnfmSifG1z/Naj1jfSl1Rd4tX9gHkZvGnYM187rm+SGu0b2ZytZzZOcX6nsdheB+XfLKcAs9j5pfXlz2fiJ/ePIz2Es/PiJfhNC6/q+cf41DtUc2lX6XGDKi9gsr69dCjnfEqX8v7M+RpfW3dL7TNeKNa6xhdSwLcB3G8jXU99p9dPeeAQOvRO773nGX3EYYt7weWr3fdIlr6Ktozfbf2QiAe3M190u7/nk/2fPfOjcyaX7unsTituTUH84/pwWf2fYZL0POfayqM/wWQZ3wv
+   eJytV0mOwkAMbCk8gEVC4pXzAvgVXBCniDwg4TbXechgiVYcq7w1qctMEndXuexeKGXG7VRMbA7Lv/3Rjve+VwyM19Mg55Xx0/vbeFy+j8wZwch4uebK+S2uW/xc/ebIcnIP/vY5Xa/97PloeJ+Fli+H10Nr1Zbw+/FlrXpKWPlyTpmTluMU1Pjc6s/RNcqRGTMp/RKZ47GL80qPUGymrly3xUv7AOdG81v7FeG+w/o8rYPT+5FcJWe0p1DsuSvl0s35RDkJmsfILy0Wve+Bn1ofenuJ5qfHi/DTzf97ddSAtHs1p7hMjRG49gwy61dDi3bEW/ks788sT+mrdb+oz4jXq3UdU9cSge+DfLycazi1n10t5wCh1qN1fOs5i+4jCGveDyRf67rlsPRltEdi1/aCQB68xH1S7v+aT/J8186NyJr/dk9D81i9NTn9h/Twd/J7hIvQ8purT4z/B5V3fpw=
   </data>
  </layer>
- <layer name="Walkable" width="30" height="30">
+ <layer name="Walkable" width="30" height="30" visible="0">
   <data encoding="base64" compression="zlib">
-   eJztlMENwzAMAzNF918hG/bVj2CSx9j9FDVgoIUlnkXJuV/Xdf/YXq0U9/lPdCm/ueM8a2LdomzlBdUgXJKnNNx9E3PVl5UeiZ/eEG6qu4lr6nX+qXlzvJNcslqPKVedP2Xt1rvbO6WnvHS+OG3KdfWq90V71PQp1ZTOZtxT7tSkfW58SL9dvooluYm3yiUscuc2t637NLeZe/UWnN9k/uk7obvlknvvcKfuiqf8S16neonOiUVmcufc+aVm2OVT/9P36r+/v99lH47X
+   eJztlMENhTAMQ5mC/VdgQ65QYueZlhuRKvHV2E6c9B/79ohjv393Z8RQ3BV7/U3wVZA7xVHVovJV7UkPrj7licp1QbWVF5SD6BKc4nD1dprVXCo+kl/tO93ztM8qL+nX+af2zemt1CWRekx11f1brdl+Z2en+JSXzhfHTXVdv+p90Rklc+p66u7GvLe6Iyedc+JD9+3wKpdgO70KS7RIzSk27Xu1brL36i04v8n+03dCT6pL6p7RHXkrPeVf53XXL+FZEWQnZ+6dX2qHHZ763/1f/ef7cwIF+oAS
   </data>
  </layer>
  <objectgroup name="Mapevents">
@@ -217,6 +217,18 @@
    </properties>
   </object>
   <object id="3" name="sign_blackwater32" type="sign" x="832" y="128" width="32" height="32"/>
+  <object id="16" name="north1" type="mapchange" x="32" y="0" width="224" height="32">
+   <properties>
+    <property name="map" value="blackwater_mountain55"/>
+    <property name="place" value="south1"/>
+   </properties>
+  </object>
+  <object id="17" name="north2" type="mapchange" x="544" y="0" width="160" height="32">
+   <properties>
+    <property name="map" value="blackwater_mountain55"/>
+    <property name="place" value="south2"/>
+   </properties>
+  </object>
  </objectgroup>
  <objectgroup name="Spawn" visible="0">
   <object id="4" name="wyrm_2" type="spawn" x="832" y="672" width="32" height="32">
diff --git a/AndorsTrail/res/xml/blackwater_mountain55.tmx b/AndorsTrail/res/xml/blackwater_mountain55.tmx
new file mode 100644
index 000000000..50ae4882b
--- /dev/null
+++ b/AndorsTrail/res/xml/blackwater_mountain55.tmx
@@ -0,0 +1,275 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" tiledversion="1.1.5" orientation="orthogonal" renderorder="right-down" width="23" height="19" tilewidth="32" tileheight="32" infinite="0" nextobjectid="21">
+ <properties>
+  <property name="outdoors" value="1"/>
+ </properties>
+ <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 name="Ground" width="23" height="19">
+  <data encoding="base64" compression="zlib">
+   eJy9ktENQDAQhoU3E5jSCtjDCmoEjIAVDEIfLv78OdVK6+FL2l7uu/+SmjzLDDEDXHOxwHmA/hnqGzApjp6wb+PFTm7pF6etH8BK3ol22sBtyC394tR2xewr7GSgR3NrZ4azH/lzjpT0yp3fYqD9gxCq8hnfPxbidLm/5vRxh/S7iO1jdwrvH9RFGm9b3P4UMxpPp8yPmcG6WqJ78dv6W+ZG8fq6T1nTu/I=
+  </data>
+ </layer>
+ <layer name="Objects" width="23" height="19">
+  <data encoding="base64" compression="zlib">
+   eJyNVEtOw0AMHRGpi7KiqRo1LLgAN8oZWtZwAz43QByhQgXRHRIIqQdou6mUTUl7g65gw1iMlRfPxBNLo0li+9nv2Yoxte0GJmoPaTwmZB8n4e8bqPkoYkrru2/J62Izm7s9879/Osy1uw+RGuQ/QJ+Vi7+2WtyAHpuej8n1L9JmPvlXit63Nv4urWvte36fq9H/LXXTjPBmEF9CD+txM7YUs3l2HJ4C9TiWsb8VbvvInoXwmeOlyC0SY6bKkdpUHXacMeeZ5aEczVgr1lRiVlk9/8U4jIFcNZ6ISfZj8X4d5hKwsU4RyA8dwsS8fm7Mad7sk/xL4DmHXiQ3en+zvBYDv7/c4p4LbPQzLteYwt12rhJfV9w//v8USV2DamqYXeuwxsiD8Fnv2H7xeVE4fmVNbdpsIvqjfnlPdi01J2KWOAvaXXo/Ov2GYt9De0K+V+iResdZID7P5Qh+fsY9eYf/O2P/AYtNlAQ=
+  </data>
+ </layer>
+ <layer name="Above" width="23" height="19">
+  <data encoding="base64" compression="zlib">
+   eJxjYGBguCzJQDVwWIx8+YviDAyXoPiyOKrcZTHcemHiIHoPml8yhRkYsoD4IdC8R1D8WByhB2buJQJmg+TPSGKaT0gPPv+i23mGCLOR9cxlIqyeGPeSC4hxL6XgMZXsoEYap2Y+GaxgqPjxihCirNgmiWAj420k+gWmPpqZMrdhs5cUM0l1Nz69lJiVi8XNyOZhk4eBywTqAUoAoToGAMcyMuo=
+  </data>
+ </layer>
+ <layer name="Walkable" width="23" height="19" visible="0">
+  <data encoding="base64" compression="zlib">
+   eJytk8sNACAIQ53C/VdgQ714IaW0KokXlUf5xRwj9jkWsz+VIU5+ZywWz9WY/V7ZCkthZ39UP4WF/ivG/jo1RnqqO0VTpU+p2a85QEyWm5Ir09/tktsP1Zh/x6ri3cxijtfV3N0/pU7dzjl5/OyRE/dWn8t25lHt5Qu/0rgAv0WjPw==
+  </data>
+ </layer>
+ <objectgroup name="Mapevents">
+  <object id="5" name="south1" type="mapchange" x="32" y="576" width="224" height="32">
+   <properties>
+    <property name="map" value="blackwater_mountain32"/>
+    <property name="place" value="north1"/>
+   </properties>
+  </object>
+  <object id="6" name="south2" type="mapchange" x="544" y="576" width="160" height="32">
+   <properties>
+    <property name="map" value="blackwater_mountain32"/>
+    <property name="place" value="north2"/>
+   </properties>
+  </object>
+  <object id="11" name="north" type="mapchange" x="416" y="0" width="288" height="32">
+   <properties>
+    <property name="map" value="blackwater_mountain56"/>
+    <property name="place" value="south"/>
+   </properties>
+  </object>
+  <object id="14" name="hettar_bones" type="script" x="672" y="96" width="32" height="32"/>
+ </objectgroup>
+ <objectgroup name="Spawn">
+  <object id="7" name="wyrm_2" type="spawn" x="32" y="448" width="512" height="96">
+   <properties>
+    <property name="spawngroup" value="wyrm_2"/>
+   </properties>
+  </object>
+  <object id="8" name="wyrm_2_1" type="spawn" x="352" y="288" width="384" height="128">
+   <properties>
+    <property name="quantity" value="3"/>
+    <property name="spawngroup" value="wyrm_2"/>
+   </properties>
+  </object>
+  <object id="9" name="wyrm_3" type="spawn" x="32" y="448" width="512" height="96">
+   <properties>
+    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="wyrm_3"/>
+   </properties>
+  </object>
+  <object id="10" name="wyrm_3_1" type="spawn" x="32" y="352" width="608" height="64">
+   <properties>
+    <property name="quantity" value="3"/>
+    <property name="spawngroup" value="wyrm_3"/>
+   </properties>
+  </object>
+  <object id="13" name="hettar" type="spawn" x="576" y="480" width="96" height="32">
+   <properties>
+    <property name="spawngroup" value="hettar"/>
+   </properties>
+  </object>
+  <object id="12" name="hettar_dog" type="spawn" x="640" y="64" width="64" height="96">
+   <properties>
+    <property name="spawngroup" value="hettar_dog"/>
+   </properties>
+  </object>
+  <object id="15" name="hettar_dog2" type="spawn" x="576" y="480" width="96" height="32">
+   <properties>
+    <property name="active" value="false"/>
+    <property name="spawngroup" value="hettar_dog2"/>
+   </properties>
+  </object>
+  <object id="16" name="hettar_dog3" type="spawn" x="640" y="64" width="64" height="96">
+   <properties>
+    <property name="active" value="false"/>
+    <property name="spawngroup" value="hettar_dog3"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Keys" visible="0"/>
+</map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain56.tmx b/AndorsTrail/res/xml/blackwater_mountain56.tmx
new file mode 100644
index 000000000..cb8bf61ea
--- /dev/null
+++ b/AndorsTrail/res/xml/blackwater_mountain56.tmx
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" tiledversion="1.1.5" orientation="orthogonal" renderorder="right-down" width="21" height="20" tilewidth="32" tileheight="32" infinite="0" nextobjectid="8">
+ <properties>
+  <property name="outdoors" value="1"/>
+ </properties>
+ <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 name="Ground" width="21" height="20">
+  <data encoding="base64" compression="zlib">
+   eJyllO0JwzAMREP2HyEr2BnBaTdw2xEySGuIQDxOtkN/PAjIPn2cnLwuS74oPw7Bw51pJPfdYi/gz1YRb7xxrrhcLXYC5mb8hJ7PzVyzqFlkp3kE91KgpWalKOI+vTEtNStFFbr0xrTYf29GVfQbeeL7Vz2OZki4K6qWO5r7qnfF7m0XM14be6eWhNzUpNfGM/AlYa5Kk14bn06dtjv8F/Atzr4ru6fe52gvZmAto70g9PifHb2L19wCopqj+N06Z/qnZlTr7CxN8wuOLDAW
+  </data>
+ </layer>
+ <layer name="Objects" width="21" height="20">
+  <data encoding="base64" compression="zlib">
+   eJxjYMANHgnhkSQCzGYirMZMGL/8TqAbdqG54zEOc5/isQ9Z7iTQvFNC2N0YSsA9uOxGB2EEzIEBJjHs4oTcgQ8IQc3cDvTjDjLiEBZWT5D0KkHNPA4UOwEVxxYW6GIws94gmQXzMxcjpn5QuIHMuEaiu4VwhCMu4I4UvuhhDXJzvzDEzyC3mAtD0skzqJvm4kgD4TjiDF+6hIFbgqh8cvMeNn1fSTRLB6qeUN6EAVgeRffnMxz+ThVGpBP09A9zPyyP6iC5/SZaGMEAKG5KgWaWQc0FpQVsYY4cb3fQwgTEPywJMQtkz0UgvxVoXpswploQQE7nuNIDzG34AEgepN8NLazXQ/XpoNk9CahuMpLa10LY7YDpR4/Dw1jyySKgmsXC2N17Ccn+9USk4y9YwuqyJIQ2xZKe0M0EAC03Rg8=
+  </data>
+ </layer>
+ <layer name="Above" width="21" height="20">
+  <data encoding="base64" compression="zlib">
+   eJxjYCAOHBZD5UcJ45YjFuDSBxIn18xLeMzEJUcuIMc8cv2FzyxamEnNsEI2i5puBYHLFKQVfOZR0//EmncZjxp0PxLrZ3zqaGEmuj+JDUdS43CzJGE11M7v9Ab40gO5+ucyUWYmtfMvupkAINUi9Q==
+  </data>
+ </layer>
+ <layer name="Walkable" width="21" height="20" visible="0">
+  <data encoding="base64" compression="zlib">
+   eJy1k8EJACAMA53C/VdwQ/HnwyaXggWhaE3TaNYcY4F1B6n/helqFabbJ6HuOTw6D+nX0YjcpTO8cjrjXe90UlH1INxTTKelmon8lep9CAeHmfrRcXmdVX+00qODSfAcporEC4lfSE/HoePlhCvxaYdnos/JN2Jgt3U=
+  </data>
+ </layer>
+ <objectgroup name="Mapevents">
+  <object id="5" name="north" type="mapchange" x="320" y="0" width="96" height="32">
+   <properties>
+    <property name="map" value="blackwater_mountain16"/>
+    <property name="place" value="south"/>
+   </properties>
+  </object>
+  <object id="6" name="south" type="mapchange" x="352" y="608" width="288" height="32">
+   <properties>
+    <property name="map" value="blackwater_mountain55"/>
+    <property name="place" value="north"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Spawn" visible="0">
+  <object id="3" name="gornaud_2" type="spawn" x="416" y="192" width="192" height="224">
+   <properties>
+    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="gornaud_2"/>
+   </properties>
+  </object>
+  <object id="4" name="gornaud_1" type="spawn" x="0" y="96" width="640" height="512">
+   <properties>
+    <property name="quantity" value="6"/>
+    <property name="spawngroup" value="gornaud_1"/>
+   </properties>
+  </object>
+  <object id="7" name="kazaul_1" type="spawn" x="544" y="352" width="32" height="32">
+   <properties>
+    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="kazaul_1"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Keys"/>
+</map>
diff --git a/AndorsTrail/res/xml/brimhaven2.tmx b/AndorsTrail/res/xml/brimhaven2.tmx
index dac646045..6aeed5da7 100644
--- a/AndorsTrail/res/xml/brimhaven2.tmx
+++ b/AndorsTrail/res/xml/brimhaven2.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.2" tiledversion="1.3.0" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="30" height="28" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="30">
+<map version="1.0" tiledversion="1.1.5" orientation="orthogonal" renderorder="right-down" width="30" height="28" tilewidth="32" tileheight="32" infinite="0" nextobjectid="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>
@@ -177,32 +177,32 @@
  <tileset firstgid="7321" 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="28">
+ <layer name="Ground" width="30" height="28">
   <data encoding="base64" compression="zlib">
-   eAG1lL1tQzEMhB/cpXaXSTJChvQKTmB4gBSZIOuksg7IBx8IkrIdqyCO4t89SuQ7vWzb9/4qp3H+HSJ0e6YTq/iZHHfb9mGi3LfXq1Ar2j0GndgZZ+ZX7vvgRagV7fgdic3qRtuX9aq+lUt+pmNzVE3OsX51/hlcftf35ld1Z3bxeM8reFXzPGY1ive8ireaf3pexcvMO4qLnqs7iXfkZ+V07ym/zz267BLNlzC7k86mnBkvHIpDB+GlF78TbBnOeOM3wQeyv/TGfQixZVjxyp59p2zOCW8VW9k73uw7ZVNO/G9UsZW94/W3cl057BD9uv8WveP1t3JdOdohuHV2/y16xysffnRH31+3Zzrz6T5sHXq86+yR8PC3y+5Hr2rjFyrGz53uvHrrz4a7q+O83Q5Qg7livp/B2+2AeMW5grfaB3HS3wreah8yXnp/xj3zhtmceb9wCv/LG+eebwBX8FJb+1jt5KO8XU3xxrp8C+h3G3Vi4AA9rnoPj0HP8vE9gtQD761xAQmlgas=
+   eJy1ls0NwjAMhaPeOPfWSRiBIbsCQRUD9MAErMMJImTVPGzHadzDUyF/X5z6OV1OKT3GTcvn/+v0ffJ2STTWo+uQUmYqc8/TJs7l7ZJauKgy9zJtWpR2SS3cVYiXs/C3JBzr0XP4PevW+T3nuh7MLevdx3/xmHFMFFfL/5VxeV8UV8t/ihnHSOeDqr0XzQv0TonL+2q1wlMvtNxHbnS81j6KcnC8Wh7TXokp5XNPvFZNp/PNSj73xmvVcqwbtfrvvQ+smk4e4v6t1X/vfVDLY/RvTdq6rXmMPirP2djDXp96uOXMb874rbux5iPu30iu5QH0byTX8gD6N5JreQC5OZBr5Rl+U0Zxaz46gkuaDU/u5VprSutiv8TEscQgefYnrSfN75G1L4/eZHd+Rw==
   </data>
  </layer>
- <layer id="2" name="Objects" width="30" height="28">
+ <layer name="Objects" width="30" height="28">
   <data encoding="base64" compression="zlib">
-   eAGllr1rVFEQxZ9J1HSJgoGIlZ02KjYWNkmsRCSJXygq7EatgrAbUGsLGytLEQW19M8I+NGKiIVNFvQfEFN7frw5OLm83c1uBmbnfpyZc+fO3JcsT1c75MuhHdNdT+YmmqE/FO/J/npvS1y90GXZl8eq6s+B2oIgxsfgX9LeBSniMVhk0Bl9jvm5qjoqLQVeZPJgbcvfBXEuBq/HTVjyapIT4jwZvGW+63EPb2U/hX+Zi+N+O1JHN66Jq1z7ebhcqSryfR+8edc8eW2Ucen/oag/vK7lKHEHYVdnB+3We/C+i3x9RvdE6e19rz+WXxO23Yc35wzvKLUyp+1NcdyScgYL+ebe93gjnQfevUjmcxzyzb3vMbzOcRzestfNZ9tR/K70c7wNczFvaR0pedvxVuvd/r9NdS3RxszoHc1KV8T5Kvq65O3ugndYviU/c/I0J/OSl7VhMg5vGXMcXterfFfUz73rb7jnmff2/P98qasVTB5/1d8BdJjw/XHv+hvuefZdT7zU1QrG41+qy5Y4e9Lf0Ys5hnuHNfKdEmZ7pka09EY3pB3pmvRqeuPnxf1GPea7Oy5f6oclzl/F8X1ua8yesZnfY2M5z3PxEMMCr7kvidfyWlhw99Xz3Flb1j2U8zK+n7WPOZkzzrybmiM9cSDk2c/iyz75Glejh//iA++9uGvy+i61tIL/YthVWfiuy96QrsS68c7N80GW93uq8DfeeWT7oAHrO7QfdZgSzu+m6R35TtdU29MR80qqs2NdS3z+G21rTLbw+t0Mekf45G8X88vB73xZy/zMEfd0vucJ8e4LBcM5UORcvEHX1PftO6hRem+BZ57vNPMYW9rc+9n3bOTE92qvQlzfPXfH+c8oLm+yG737TPaRdCn4+F4hPgdj3zPjLK4HfUDMTsTMGI8XhFkM3NPgtD/95Hw5h/trU//rgmHvjpR6uAb2Yf1F4uX/M3xcM/M7Bvau9KEUX+cLzhiPM857pb/j24eYTVjHsgX3D5k+qnM=
+   eJylVs9rE1EQXmPS9NbNggsre/KmCCpeFLy08aJIia1VlCokUU9BSArWswcvnjxKUVCP/hmFJr2KSA9eGtB/QOzZ+XgzvNm3b5Pd+MHwfuy8+d68mXlvO8tBBoetYCHENf/8Edl71TD9Y+KasnRI3qdB8GfJtGLjgPnbNHczzfahO2+Pso8kDoKzcf57h/093fSvXyWetTTb9+keFezhPHFeiP3+DvgcPlE7bvl9Ebvfz5h2XCEeP6P8HHi/NMrvvyzc9V+d+IP34D85XGyE83U6y/m5Wbmpsdvw6/YKeLXPPt4qeEgcj0KzBwH81bkv/R21H/CmTStVsevJDfirc1/64JV8BO/FppUymHe3DMn+iGTCesKFcTe0vMD1tBynoCgHfDorVEchyV3i3KtleW9V4F3kLu0qTs1bBYve4RqL8Eq83LpC/Nw7XN/vgu3E8vZSK3oMfFsyMg+4f9w7XN/vgoHiHaVW9PgXxeWYOKckvz33gc4v+FsnnZMVM+6S7R2SIUmf5J6quRvE/bFmz+5cy8QPLez8De15noTm26w3QXSxn7cNW0sAeIX7TmLnP9SM3rPInFkvsjlUpm4Eh6peZYy+5t3nb9PI+lvUTvgcxi07XxZj5n3KvPDrh7LRZf7b3G5Ehu8+tQ9Q+85bWqWmwHnJ8xYDPj+fe3QnDh/iUI9m15GcaZ9ie5n7m0mQw5bikzd61lsN3jJ1BOw5+bLO/Dp+Wx5/ff9DNdI7xSL7qHP/GtegxFTOe+rY7quxPtMy8XRrWnCVfdr2nG1VwK6cPc4O+7+SmJocce6+ofYlSZv5Bkl2H8B6wV4kHptsc+h57wWrpLPGeq+ZU9Yjn8Tftsqv/djo4NvjxMRDYiBrMP9O8X5mu26NiC7aJyQveDxI8jrS13pF64s4XF23xfd/BaKohw==
   </data>
  </layer>
- <layer id="3" name="Above" width="30" height="28">
+ <layer name="Above" width="30" height="28">
   <data encoding="base64" compression="zlib">
-   eAHtVs0OAUEM3l0HbsiGxGu4cXDnGXgqR/E0zi7cJTyCBxDTzDbpdLfzsypITLI6037Tr+20ibyXOauozjnTO6DqgNgmW6ruOIq/cRjHY0PIU4KvFGyIN2Tf9kOI77JfSt14ZoMsm5uPrmuXnuz+YXhvDfo6Mk6zNJwrxivNgmb/x0VnUbT/sSYo0Y9Uk86wfb1o/2NNUCKvVJPS8Eo2vBsjeZ54h9YEdSAh33tkf0APS33M80QOWhPUgfTly3OAHoYPFn83jrUo/6+Ur5QDeONv48NK7NyHhKN66d0oJrRv40N6txAXtWv4oP5+fS/NzrvywtnA2aE8OEe7gmp19r7ZaDMDGlGFZmAx0WCp+/jPgFsTrTpPX3gvrRggs7WJY+OJZR85X+eE/9luRT97egJN5CiT
+   eJxj5GBAAUxQPiOaODbARIQaYsFZUeLVHhajnr2XSDCLFLWUgsn89LOLGuCeMHXNsxRgYLASQBV7yI6p7h/Q3kfsuNU8wqIHH/AE2umFZi+uvICc/tHVUDNvoAN86Z9Q3mAWJD1MYABf+idkr7AgbcKEGP9+ItK/oDRMbDomVBbg8y96GgWl4X9Qe9HjBluaJwRw+RdfmY7uVmLKf0JmEAOoUZaTYwY1ynJ61gdDAVC7DiAEYHnjHxZ7YfloNhP17SWUj2hhJyFAKA/YSdLG3tE8gAqoFc5GFJhDzbiOAZoVi8e8uUSm9ctDNJ0AACyNKQA=
   </data>
  </layer>
- <layer id="4" name="Top" width="30" height="28">
+ <layer name="Top" width="30" height="28">
   <data encoding="base64" compression="zlib">
-   eAFjYBgc4LDY4HDHqCtGQ2A0BEZDYDQEBm8IHATWFaP1xeCNH1JcdnmA6v2BSj+j9pKSOshXOxrO5IfdqE5ECAAAFTgJYg==
+   eJxjYBgc4LDYQLtgFIyCUTAKRsFgBwfFRuuL4QIuD1A8DlT6GbV31N7hZO9wBwAVOAli
   </data>
  </layer>
- <layer id="5" name="Walkable" width="30" height="28">
+ <layer name="Walkable" width="30" height="28" visible="0">
   <data encoding="base64" compression="zlib">
-   eAHtkOsNhDAMg5ni9l+BDU8Wss5YaZoU+u8qQV7O56rn5zhO+Q452o9ykaZptOs9BfjMa9V2c7Kwh1wPZx6hca3uee77WndZzs5q9fE823tj5n6o3z6Rx6i34j2688jD+yue3FFW1NP505x8RLD8KB8zrZ/k7uM12d5nzXk3cr8au/yRPvMb7bzR//v+XoDviQ7z1Ugq91lHUTXMqxE8aDV6fk3zPxlUZf7U7IiZL+9YjX6/GXs0d063HnErfXhBp/Gq5v8KP9LMybmCTKiYVyN3cofedObdo/XUmXePdFdHXCiiftS7066qoos0O3q83w72LuYX07dgMw==
+   eJztk1EOwCAIQz2F97+CN9yXiTEMsLRmHyMh8wN5LbLRWxtLrjG6n9mI+qi4npZ5znCt2gyD0eskVDND2TcYzF15q1dzd0aFi/xrkRYF15tBZka33kLlV/W2P9fmMjRYPRXceWf97udM7PXoDKuB+PXmcNJb5be6R5EvNpflF9GA+Mzq+do+s/tGvIidqavsMrKDt3iMfACwdmQW
   </data>
  </layer>
- <objectgroup id="6" name="Mapevents">
+ <objectgroup name="Mapevents">
   <object id="1" name="north1" type="mapchange" x="128" y="0" width="96" height="32">
    <properties>
     <property name="map" value="brimhaven4"/>
@@ -269,8 +269,9 @@
   <object id="19" name="brv2_grave_10" type="sign" x="448" y="608" width="32" height="32"/>
   <object id="20" name="brv2_grave_11" type="sign" x="256" y="672" width="32" height="32"/>
   <object id="21" name="brv2_grave_12" type="sign" x="192" y="736" width="32" height="32"/>
+  <object id="31" name="brv_ring_bells_random" type="script" x="416" y="64" width="256" height="416"/>
  </objectgroup>
- <objectgroup id="7" name="Spawn">
+ <objectgroup name="Spawn">
   <object id="22" name="woodcutter" type="spawn" x="800" y="288" width="96" height="32">
    <properties>
     <property name="spawngroup" value="brv_woodcutter"/>
@@ -306,9 +307,14 @@
     <property name="spawngroup" value="brv_villager10"/>
    </properties>
   </object>
+  <object id="29" name="brv_guard_deputy" type="spawn" x="32" y="160" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="brv_guard_deputy"/>
+   </properties>
+  </object>
  </objectgroup>
- <objectgroup id="8" name="Keys">
-  <object id="29" name="brv_sign_school" type="key" x="384" y="96" width="32" height="32">
+ <objectgroup name="Keys">
+  <object id="30" name="brv_sign_school" type="key" x="384" y="96" width="32" height="32">
    <properties>
     <property name="phrase" value="brv_sign_school"/>
     <property name="requireId" value="base_nondisplay"/>
diff --git a/AndorsTrail/res/xml/brimhaven6.tmx b/AndorsTrail/res/xml/brimhaven6.tmx
index d1d4b2566..896f39fd4 100644
--- a/AndorsTrail/res/xml/brimhaven6.tmx
+++ b/AndorsTrail/res/xml/brimhaven6.tmx
@@ -1,187 +1,186 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
-<map version="1.0" orientation="orthogonal" width="16" height="32" tilewidth="32" tileheight="32">
- <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
+<map version="1.0" tiledversion="1.1.5" orientation="orthogonal" renderorder="right-down" width="16" height="32" tilewidth="32" tileheight="32" infinite="0" nextobjectid="5">
+ <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_tree_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="6449" 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="6577" name="map_tree_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="6577" 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="6705" name="map_wall_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="6705" 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="6833" name="map_wall_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="6833" 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="6953" name="map_wall_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="6953" 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="7073" name="map_wall_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="7073" 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="7193" name="map_window_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="7193" 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="7321" name="map_window_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="7321" 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="7449" name="map_transition_5" tilewidth="32" tileheight="32">
+ <tileset firstgid="7449" 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="7577" name="map_guynmart" tilewidth="32" tileheight="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 name="Ground" width="16" height="32">
@@ -210,13 +209,13 @@
   </data>
  </layer>
  <objectgroup name="Mapevents">
-  <object name="north" type="mapchange" x="64" y="192" width="32" height="32">
+  <object id="1" name="north" type="mapchange" x="64" y="192" width="32" height="32">
    <properties>
     <property name="map" value="waterway12"/>
     <property name="place" value="entrance"/>
    </properties>
   </object>
-  <object name="south" type="mapchange" x="384" y="992" width="64" height="32">
+  <object id="2" name="south" type="mapchange" x="384" y="992" width="64" height="32">
    <properties>
     <property name="map" value="brimhaven3"/>
     <property name="place" value="north"/>
@@ -224,7 +223,7 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn">
-  <object name="brv_temple_entrance_guard" type="spawn" x="288" y="736" width="32" height="32">
+  <object id="4" name="brv_temple_entrance_guard" type="spawn" x="288" y="736" width="32" height="32">
    <properties>
     <property name="spawngroup" value="brv_temple_entrance_guard"/>
    </properties>
diff --git a/AndorsTrail/res/xml/brimhaven7.tmx b/AndorsTrail/res/xml/brimhaven7.tmx
index 566f339c4..53fc27894 100644
--- a/AndorsTrail/res/xml/brimhaven7.tmx
+++ b/AndorsTrail/res/xml/brimhaven7.tmx
@@ -201,7 +201,7 @@
    eJxjYBgFo4D6AAACWAAB
   </data>
  </layer>
- <layer name="Walkable" width="30" height="5" visible="0">
+ <layer name="Walkable" width="30" height="5">
   <data encoding="base64" compression="zlib">
    eJzbKMbAsHEAMQjAaBibXvYi24luN63cQwqgt73YwoFcDABD511J
   </data>
@@ -220,10 +220,16 @@
     <property name="place" value="entrance"/>
    </properties>
   </object>
+  <object name="release_mouse0" type="script" x="64" y="64" width="352" height="64">
+   <properties>
+    <property name="when" value="step"/>
+   </properties>
+  </object>
  </objectgroup>
  <objectgroup name="Spawn">
   <object name="anakis" type="spawn" x="96" y="64" width="64" height="32">
    <properties>
+    <property name="ignoreAreas" value="true"/>
     <property name="spawngroup" value="anakis"/>
    </properties>
   </object>
diff --git a/AndorsTrail/res/xml/brimhaven_church.tmx b/AndorsTrail/res/xml/brimhaven_church.tmx
index 7292b09aa..e4413a50e 100644
--- a/AndorsTrail/res/xml/brimhaven_church.tmx
+++ b/AndorsTrail/res/xml/brimhaven_church.tmx
@@ -1,233 +1,267 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.2" tiledversion="1.2.2" orientation="orthogonal" renderorder="right-down" width="24" height="16" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="5">
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
+<map version="1.0" orientation="orthogonal" width="24" height="16" 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_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1073" name="map_chair_table_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_chair_table_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1201" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1201" name="map_crate_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_crate_1.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_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1841" name="map_fence_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1969" name="map_fence_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1969" name="map_fence_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_fence_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2097" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2097" name="map_fence_4" tilewidth="32" tileheight="32">
   <image source="../drawable/map_fence_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2225" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2225" name="map_ground_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2353" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2353" name="map_ground_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2481" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2481" name="map_ground_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2609" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2609" name="map_ground_4" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2737" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2737" name="map_ground_5" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2865" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2865" name="map_ground_6" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2993" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2993" name="map_ground_7" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3121" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3121" name="map_ground_8" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3249" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3249" name="map_house_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_house_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3377" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3377" name="map_house_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_house_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3505" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3505" name="map_indoor_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_indoor_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3633" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3633" name="map_kitchen_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3761" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3761" name="map_outdoor_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3889" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3889" name="map_pillar_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_pillar_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4017" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4017" name="map_plant_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_plant_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4145" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4145" name="map_rock_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4273" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4273" name="map_rock_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_rock_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4401" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4401" name="map_roof_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4529" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4529" name="map_roof_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4657" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4657" name="map_roof_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_roof_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4785" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4785" name="map_shop_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4913" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4913" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5041" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5041" name="map_trail_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5169" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5169" name="map_transition_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_transition_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5297" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5297" name="map_transition_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_transition_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5425" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5425" name="map_transition_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_transition_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5553" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5553" name="map_transition_4" tilewidth="32" tileheight="32">
   <image source="../drawable/map_transition_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5681" name="map_transition_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5681" name="map_transition_5" tilewidth="32" tileheight="32">
   <image source="../drawable/map_transition_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5809" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5809" name="map_tree_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5937" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5937" name="map_tree_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_tree_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6065" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6065" name="map_wall_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6193" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="6193" name="map_wall_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="6313" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="6313" name="map_wall_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="6433" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="6433" name="map_wall_4" tilewidth="32" tileheight="32">
   <image source="../drawable/map_wall_4.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="6553" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6553" name="map_window_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6681" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6681" name="map_window_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6809" name="map_fence_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6809" name="map_fence_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6937" name="map_chair_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6937" name="map_chair_table_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7065" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7065" name="map_plant_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7193" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7193" name="map_pillar_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7321" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7321" name="map_table_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7449" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7449" name="map_indoor_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
- <layer id="1" name="Ground" width="24" height="16">
+ <layer name="Ground" width="24" height="16">
   <data encoding="base64" compression="zlib">
-   eJw7xsHAcIzGeIc4dTC6WTDzT4hTB6ObBTP/MA78UYaB4RMa/iyDWz26WYTMZ5RlYGBCw8yy5Jv/BIfbRGQhGJscsh5C5n/B43dcGFkPKE7xmc+Cx424/Ias5wQe8wWB6oRw4OcyEIxLXhhqx0OgmscyuN2PLwyICbuPaOmL2u7HZ/5QdT96mqKm+3eIY6YpXGkQV9rFZz7I7Kcc1MOM0PIDWQwABZgc7w==
+   eJzVlLsOgzAMRU3LkLUPKUvy/7/AXiniN6q26szjA4pFkCw3ThrkpUhnIeZwCReCAQgRPILRp7M6cNfm760O3LX5bwKDAxgZk5PnuavkbzzAgXH0+/1PIdvVr6TW6DUlf5vJJjETP77Tmv2hGaVno5n6gv+0zJ4TvN1Kag25xHvcl5mHq8+PezBnekP7Ngl+KXtN/pz/X/PzTmnm7+x3p6QO/vJtcD+6X0aPJv4/6LkPywYceA==
   </data>
  </layer>
- <layer id="2" name="Objects" width="24" height="16">
+ <layer name="Objects" width="24" height="16">
   <data encoding="base64" compression="zlib">
-   eJxjYKAPeCjJwKAkjWAji+9jhWB0cRAA6UEWxwU+AtUYSSPYWTII9jlWCP4INQckB2OD9HwkYL4h1FwnIH1RGMKukoGwi6VRcYk0Qu6wMEIPzIw4IDseiBOECfuJEDiMxYw8oFg+EBegyR0kwz6Y+eh6ZwL5s/CYzw30Kz8Q8wAxLxrmgcoJAPElHOavBPJXEeH+GBlEfOATI8fv1AaXpBgYHqPhK1KYbiVWnbY0/dxOirtG3T+0AABp1lWQ
+   eJxjYKAPeCjJwKAkjWAji+9jhWB0cRAA6UEWxwU+AtUYSSPYWTII9jlWCP4INQckB2OD9HwkYL4h1FwnIH1RGMKukoGwi6VRcYk0Qu6wMEIPzAwY6BYm7CdC4DAJZhwkwz6Y+YT0gvyGrIYbyOcHYh4g5kXDPFA5ASC+RKT5NTjkY2QQ8YFPjBj30xKAzL8kxcDwGA1fkcJ0K7HqtGnsZnQw6n5UdfR2P60AAIU2UR8=
   </data>
  </layer>
- <layer id="3" name="Above" width="24" height="16">
+ <layer name="Above" width="24" height="16">
   <data encoding="base64" compression="zlib">
-   eJxjYKA9OCxMW7PQxV5LQegkaQaGZDScIg2R+yBFuflFULOU+TD1UMN8fIBU858gqf8NZP8H4j9YzPgHlWOQRogh6yXGfBjwkSFOjBjzvxARJrgAst5LRIQ/tcGo+aPmD1YAAJYNJ/E=
+   eJxjYECAYxwMNAGHhWlrFrrYaykInSTNwJCMhlOkIXIfpCg3vwhqljIfph5qmI8PkGr+EyT1v4Hs/0D8B4sZ/6ByDNIIMWS9uMz/gsUsHxnixIgxnxKA7LZLNDCfEBg1f9T8wQoAFUUnwQ==
   </data>
  </layer>
- <layer id="4" name="Walkable" width="24" height="16" visible="0">
+ <layer name="Walkable" width="24" height="16">
   <data encoding="base64" compression="zlib">
-   eJzbKMzAsHEUE8QggExTUw86wCZGjBpi3EGO+YT8gE09Pr+hyxEKK3z+JUUMXQ6XG6kF0N1PbNyTqm7U/cPb/dQsw9DNBQBNcJz1
+   eJzbKMzAsBGKQWCj8CjGhmFhQ0oYYdODDLCJIevBB4jRh80d5JiPzQxk89H9gU0Mnxwh84lxIzFi+NxPC0BsGiFGDz51tALo6WfU/QPjfmqWYejmAgBY0JVN
   </data>
  </layer>
- <objectgroup id="5" name="Mapevents">
-  <object id="1" name="entrance" type="mapchange" x="608" y="480" width="64" height="32">
+ <objectgroup name="Mapevents">
+  <object name="entrance" type="mapchange" x="608" y="480" width="64" height="32">
    <properties>
     <property name="map" value="brimhaven2"/>
     <property name="place" value="church"/>
    </properties>
   </object>
+  <object name="down" type="mapchange" x="704" y="96" width="32" height="32">
+   <properties>
+    <property name="map" value="brimhaven_church_basement"/>
+    <property name="place" value="up"/>
+   </properties>
+  </object>
+  <object name="up" type="mapchange" x="32" y="224" width="32" height="32">
+   <properties>
+    <property name="map" value="brimhaven_church_upstairs"/>
+    <property name="place" value="down"/>
+   </properties>
+  </object>
+  <object name="brv_church_timer" type="script" x="64" y="224" width="96" height="64">
+   <properties>
+    <property name="when" value="step"/>
+   </properties>
+  </object>
  </objectgroup>
- <objectgroup id="6" name="Spawn">
-  <object id="2" name="fangwurm" type="spawn" x="256" y="128" width="128" height="64">
+ <objectgroup name="Spawn">
+  <object name="fangwurm" type="spawn" x="256" y="128" width="128" height="64">
    <properties>
     <property name="spawngroup" value="fangwurm"/>
    </properties>
   </object>
-  <object id="3" name="chapelgoer" type="spawn" x="32" y="256" width="704" height="224">
+  <object name="chapelgoer" type="spawn" x="96" y="256" width="640" height="192">
    <properties>
+    <property name="ignoreAreas" value="true"/>
     <property name="quantity" value="3"/>
     <property name="spawngroup" value="chapelgoer"/>
    </properties>
   </object>
-  <object id="4" name="guard" type="spawn" x="640" y="192" width="32" height="32">
+  <object name="guard" type="spawn" x="640" y="192" width="96" height="32">
    <properties>
     <property name="spawngroup" value="brimhaven_church_guard"/>
    </properties>
   </object>
+  <object name="brv_churchman" type="spawn" x="96" y="0" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="brv_churchman"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Keys">
+  <object name="brv_ring_bells_key" type="key" x="32" y="224" width="32" height="32">
+   <properties>
+    <property name="phrase" value="brv_ring_bells_key"/>
+    <property name="requireId" value="brv_nondisplay2"/>
+    <property name="requireNegation" value="true"/>
+    <property name="requireType" value="questProgress"/>
+    <property name="requireValue" value="60"/>
+   </properties>
+  </object>
  </objectgroup>
- <objectgroup id="7" name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/brimhaven_church_basement.tmx b/AndorsTrail/res/xml/brimhaven_church_basement.tmx
new file mode 100644
index 000000000..38d66ce5d
--- /dev/null
+++ b/AndorsTrail/res/xml/brimhaven_church_basement.tmx
@@ -0,0 +1,232 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.2" tiledversion="1.3.0" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="24" height="16" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="4">
+ <properties>
+  <property name="colorfilter" value="none"/>
+ </properties>
+ <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_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_chair_table_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1201" 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="1329" 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="1457" 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="1585" 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="1713" 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="1841" 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="1969" 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="2097" 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="2225" 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="2353" 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="2481" 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="2609" 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="2737" 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="2865" 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="2993" 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="3121" 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="3249" 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="3377" 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="3505" 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="3633" 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="3761" 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="3889" 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="4017" 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="4145" 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="4273" 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="4401" 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="4529" 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="4657" 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="4785" 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="4913" 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="5041" 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="5169" 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="5297" 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="5425" 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="5553" 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="5681" 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="5809" 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="5937" 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="6065" 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="6193" 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="6313" 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="6433" 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="6553" 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="6681" 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="6809" 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="6937" 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="7065" 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="7193" 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="7321" 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="7449" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
+ </tileset>
+ <layer id="1" name="Ground" width="24" height="16">
+  <data encoding="base64" compression="zlib">
+   eAHtkrENgDAMBF2yAftvwQQRizBEOvzFt+i+iIQQxSvN+WLZHlvVWJxjryJRH4Qz477P9pOIJ5wZ+2fXkYgnnJnf/zyvt81Hd+fdkTftX3dHvGZSv+vo+wV/ujM6G3FypztL/HJf/c/K3HItbNs=
+  </data>
+ </layer>
+ <layer id="2" name="Objects" width="24" height="16">
+  <data encoding="base64" compression="zlib">
+   eAFjYKAv8JNlYABhLiZUeycCxbABTqA6f6jcJBxqQPqi0eSkgPp2sDAw7ARiHxkGBiAFBjKsDAyyQAwDkmjugIkj075As7OBOAaKQXIgsRNAQ08CcQzQfBGoBh2g2bpArAfEhtIQDJI6CnMAkF0rzMBQDcTIIBZoHi4ACgMVXJJAcWcsfnBA8qMtkt3IxogD1UgAMSgMbkHVJGJxRzAW8wOQzPfFYb46UI0GVB3MfAUs5iO7CcZOIMJ8mFoQ/QrqBgMizUfWC3J/Kg4/gNSx8TMwsAMxCBDrfuQwxxU+EBMR5ssAw5kY97sC3YpsZiwet8PsIIUORTN/G5L52NIaKWbD1CK7+RiS+ZeB7CtQDFNLCo3NfW+QzH8MZD+BYmLN7QLmbxjAlhdgcqTSNVBzQebXAnEVEp9Us8hVDwB2zyU0
+  </data>
+ </layer>
+ <layer id="3" name="Above" width="24" height="16">
+  <data encoding="base64" compression="zlib">
+   eAFjYKA9OCxMWzsGk/nZMqT7lRT3V5Nhvq0s6W4iRcdKflJUk66WlPAh3XQGBlqbn0yD8BfiQ/iUFu5nprH5CNfTPvzJDZ8cpLyWC2RnIfHp6X5ku6jNBgCgng2r
+  </data>
+ </layer>
+ <layer id="4" name="Top" width="24" height="16">
+  <data encoding="base64" compression="zlib">
+   eAFjYBhc4LAwbd0zEs0nxc+kqIXFFCl6SFELM58UejCaT4qbLtE4/ZMSlqNqh38IAACIfgoY
+  </data>
+ </layer>
+ <layer id="5" name="Walkable" width="24" height="16">
+  <data encoding="base64" compression="zlib">
+   eAHtkFEKwDAIQ3uH3f8QveEQFngEax10fxPGUk1icF5jzP97dYPxVPduQQ+ul+t9zje57K8w+dnu0IlDvOL6Hmn19zk9iU/6c6dydP09U6Wjd8Vb5dlp3vo7f+fPXB38tX91e+7uZK04mVfWqzyUNePIK5t1eqGPkg/f3ifnJL4BlBaTAQ==
+  </data>
+ </layer>
+ <objectgroup id="6" name="Mapevents">
+  <object id="1" name="up" type="mapchange" x="704" y="96" width="32" height="32">
+   <properties>
+    <property name="map" value="brimhaven_church"/>
+    <property name="place" value="down"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup id="7" name="Spawn">
+  <object id="2" name="zorvan" type="spawn" x="384" y="96" width="352" height="384">
+   <properties>
+    <property name="spawngroup" value="zorvan"/>
+   </properties>
+  </object>
+  <object id="3" name="quasi" type="spawn" x="32" y="96" width="320" height="384">
+   <properties>
+    <property name="spawngroup" value="hunchback"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup id="8" name="Keys"/>
+</map>
diff --git a/AndorsTrail/res/xml/brimhaven_church_upstairs.tmx b/AndorsTrail/res/xml/brimhaven_church_upstairs.tmx
new file mode 100644
index 000000000..603d08cd4
--- /dev/null
+++ b/AndorsTrail/res/xml/brimhaven_church_upstairs.tmx
@@ -0,0 +1,251 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
+<map version="1.0" orientation="orthogonal" width="8" height="8" tilewidth="32" tileheight="32">
+ <properties>
+  <property name="colorfilter" value="none"/>
+ </properties>
+ <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_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_chair_table_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1201" name="map_crate_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_entrance_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1841" name="map_fence_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1969" name="map_fence_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_fence_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2097" name="map_fence_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_fence_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2225" name="map_ground_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2353" name="map_ground_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2481" name="map_ground_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2609" name="map_ground_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2737" name="map_ground_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2865" name="map_ground_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2993" name="map_ground_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3121" name="map_ground_8" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3249" name="map_house_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_house_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3377" name="map_house_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_house_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3505" name="map_indoor_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_indoor_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3633" name="map_kitchen_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3761" name="map_outdoor_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3889" name="map_pillar_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_pillar_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4017" name="map_plant_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_plant_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4145" name="map_rock_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4273" name="map_rock_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_rock_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4401" name="map_roof_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4529" name="map_roof_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4657" name="map_roof_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_roof_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4785" name="map_shop_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4913" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5041" name="map_trail_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5169" name="map_transition_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5297" name="map_transition_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5425" name="map_transition_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5553" name="map_transition_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5681" name="map_transition_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_5.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5809" name="map_tree_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5937" name="map_tree_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tree_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6065" name="map_wall_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6193" name="map_wall_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="6313" name="map_wall_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="6433" name="map_wall_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_wall_4.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="6553" name="map_window_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6681" name="map_window_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6809" name="map_fence_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6937" name="map_chair_table_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="7065" name="map_plant_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="7193" name="map_pillar_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="7321" name="map_table_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="7449" name="map_indoor_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="7577" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
+ </tileset>
+ <layer name="Ground" width="8" height="8">
+  <data encoding="base64" compression="zlib">
+   eJw7xsHAcIwA3iGOHcPkT4hjxzD5wzgwMfIge3DJ74Dag0seJPeUAz8GAG+WNME=
+  </data>
+ </layer>
+ <layer name="Objects" width="8" height="8">
+  <data encoding="base64" compression="zlib">
+   eJxjYECA17IMWMFdVoT8H0kIOxWL2t9AMR4p7GaAALccgv0ESd0XNLMMpVHlsQFC8l8IyMMAANnIC1Y=
+  </data>
+ </layer>
+ <layer name="Above" width="8" height="8">
+  <data encoding="base64" compression="zlib">
+   eJxjYKAcHBYmXd5WFr+8Eh9l+okFAGNfBRM=
+  </data>
+ </layer>
+ <layer name="Top" width="8" height="8">
+  <data encoding="base64" compression="zlib">
+   eJxjYCAMDgsToWiIAgC41QDX
+  </data>
+ </layer>
+ <layer name="Walkable" width="8" height="8" visible="0">
+  <data encoding="base64" compression="zlib">
+   eJzbKMzAsJFKGARwiaMDesrjwwBbzSDt
+  </data>
+ </layer>
+ <objectgroup name="Mapevents">
+  <object name="down" type="mapchange" x="32" y="128" width="32" height="32">
+   <properties>
+    <property name="map" value="brimhaven_church"/>
+    <property name="place" value="up"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Spawn">
+  <object name="brv_churchcat" type="spawn" x="64" y="160" width="128" height="64">
+   <properties>
+    <property name="spawngroup" value="brv_churchcat"/>
+   </properties>
+  </object>
+  <object name="brv_churchmouse" type="spawn" x="96" y="192" width="64" height="32">
+   <properties>
+    <property name="spawngroup" value="brv_churchmouse"/>
+   </properties>
+  </object>
+  <object name="brv_churchman" type="spawn" x="32" y="96" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="brv_churchman"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Keys" visible="0">
+  <object name="brv_ring_bells" type="key" x="96" y="64" width="32" height="32">
+   <properties>
+    <property name="phrase" value="brv_ring_bells_10"/>
+    <property name="requireId" value="andor"/>
+    <property name="requireNegation" value="true"/>
+    <property name="requireType" value="questProgress"/>
+    <property name="requireValue" value="1"/>
+   </properties>
+  </object>
+ </objectgroup>
+</map>
diff --git a/AndorsTrail/res/xml/brimhaven_exit.tmx b/AndorsTrail/res/xml/brimhaven_exit.tmx
new file mode 100644
index 000000000..9879b2443
--- /dev/null
+++ b/AndorsTrail/res/xml/brimhaven_exit.tmx
@@ -0,0 +1,222 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
+<map version="1.0" orientation="orthogonal" width="30" height="30" tilewidth="32" tileheight="32">
+ <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_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">
+  <image source="../drawable/map_tree_2.png" width="512" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_wall_4.png" width="480" height="256"/>
+ </tileset>
+ <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">
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="7449" name="map_transition_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_5.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="7577" name="map_guynmart" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_guynmart.png" width="512" height="256"/>
+ </tileset>
+ <layer name="Ground" width="30" height="30">
+  <data encoding="base64" compression="zlib">
+   eJztwzENAAAMA6C+86+kDitkkNBLqqqq6rsD3zGOBw==
+  </data>
+ </layer>
+ <layer name="Objects" width="30" height="30">
+  <data encoding="base64" compression="zlib">
+   eJztwQEBAAAAgiD/r25IQAEAAPBoDhAAAQ==
+  </data>
+ </layer>
+ <layer name="Above" width="30" height="30">
+  <data encoding="base64" compression="zlib">
+   eJztwQEBAAAAgiD/r25IQAEAAPBoDhAAAQ==
+  </data>
+ </layer>
+ <layer name="Top" width="30" height="30">
+  <data encoding="base64" compression="zlib">
+   eJztwQEBAAAAgiD/r25IQAEAAPBoDhAAAQ==
+  </data>
+ </layer>
+ <layer name="Walkable" width="30" height="30">
+  <data encoding="base64" compression="zlib">
+   eJztwQEBAAAAgiD/r25IQAEAAPBoDhAAAQ==
+  </data>
+ </layer>
+ <objectgroup name="Mapevents">
+  <object name="release_mouse0" type="script" x="448" y="0" width="512" height="224">
+   <properties>
+    <property name="when" value="step"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Replace"/>
+ <objectgroup name="Spawn"/>
+ <objectgroup name="Keys"/>
+</map>
diff --git a/AndorsTrail/res/xml/brimhaven_prison.tmx b/AndorsTrail/res/xml/brimhaven_prison.tmx
index eb1b3f861..7ce334d4f 100644
--- a/AndorsTrail/res/xml/brimhaven_prison.tmx
+++ b/AndorsTrail/res/xml/brimhaven_prison.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.2" tiledversion="1.2.2" orientation="orthogonal" renderorder="right-down" width="7" height="8" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="3">
+<map version="1.0" tiledversion="1.1.5" orientation="orthogonal" renderorder="right-down" width="7" height="8" tilewidth="32" tileheight="32" infinite="0" nextobjectid="4">
  <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>
@@ -180,27 +180,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 id="1" name="Ground" width="7" height="8">
+ <layer name="Ground" width="7" height="8">
   <data encoding="base64" compression="zlib">
    eJw7xsnAcAwP3iGFiWFyJ6QwMUzuMhZMSA5kNja5HVCzscmBxJ9yIvBlTlQ+ANniL64=
   </data>
  </layer>
- <layer id="2" name="Objects" width="7" height="8">
+ <layer name="Objects" width="7" height="8">
   <data encoding="base64" compression="zlib">
-   eJxjYMAPNPkZGJbKMDDkQml2JoScOJC9FShWy4+gYcCShYHBnAXBZ0QyM4gNIhfIBmELIsklAfkpQJzIBmG3syLknJDMA4HJaHxsAADYZQnp
+   eJxjYMAPNPkZGJbKMDDkQml2JoScOJC9FShWy4+gYcCShYHBnAXBZ0QyM4gNVU4QSS4JKJcCxIlsEHY7K0LOCUkPCExG42MDAJV1CTo=
   </data>
  </layer>
- <layer id="3" name="Above" width="7" height="8">
+ <layer name="Above" width="7" height="8">
   <data encoding="base64" compression="zlib">
-   eJxjYMAPDouh8nP5scuJM+HXhy4XwobgI7PR9aXgkSMGAAAwYgbK
+   eJxjYMAPDouh8nP5scuJM+HXhy4XwsbAEAjEQWwQNi59KXjkiAEAc1IHeQ==
   </data>
  </layer>
- <layer id="4" name="Walkable" width="7" height="8">
+ <layer name="Walkable" width="7" height="8">
   <data encoding="base64" compression="zlib">
-   eJzbKMbAsHEIYWSASx6ZDwDs+iht
+   eJzbKMbAsJGGGAZIlSNkHj4zkfkAkQMlUQ==
   </data>
  </layer>
- <objectgroup id="5" name="Mapevents">
+ <objectgroup name="Mapevents">
   <object id="1" name="entrance" type="mapchange" x="96" y="224" width="32" height="32">
    <properties>
     <property name="map" value="brimhaven2"/>
@@ -208,13 +208,19 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup id="6" name="Spawn">
+ <objectgroup name="Spawn">
   <object id="2" name="guard" type="spawn" x="32" y="192" width="160" height="32">
    <properties>
     <property name="spawngroup" value="brv_prison_guard"/>
    </properties>
   </object>
+  <object id="3" name="brv_prisoner" type="spawn" x="96" y="96" width="64" height="64">
+   <properties>
+    <property name="active" value="false"/>
+    <property name="spawngroup" value="brv_villager3"/>
+   </properties>
+  </object>
  </objectgroup>
- <objectgroup id="7" name="Keys"/>
- <objectgroup id="8" name="Replace"/>
+ <objectgroup name="Keys"/>
+ <objectgroup name="Replace"/>
 </map>
diff --git a/AndorsTrail/res/xml/crossglen.tmx b/AndorsTrail/res/xml/crossglen.tmx
index 9cbaf3e8a..2e85445d0 100644
--- a/AndorsTrail/res/xml/crossglen.tmx
+++ b/AndorsTrail/res/xml/crossglen.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="19">
+<!DOCTYPE map SYSTEM "http://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">
@@ -204,100 +205,124 @@
   </data>
  </layer>
  <objectgroup name="Mapevents">
-  <object id="1" name="cave" type="mapchange" x="576" y="32" width="32" height="32">
+  <object name="cave" type="mapchange" x="576" y="32" width="32" height="32">
    <properties>
     <property name="map" value="crossglen_cave"/>
     <property name="place" value="entrance"/>
    </properties>
   </object>
-  <object id="2" name="hall" type="mapchange" x="544" y="608" width="32" height="32">
+  <object name="hall" type="mapchange" x="544" y="608" width="32" height="32">
    <properties>
     <property name="map" value="crossglen_hall"/>
     <property name="place" value="entrance"/>
    </properties>
   </object>
-  <object id="3" name="burhczyd_check1" type="script" x="512" y="640" width="96" height="32"/>
-  <object id="4" name="farmhouse" type="mapchange" x="320" y="544" width="32" height="32">
+  <object name="burhczyd_check1" type="script" x="512" y="640" width="96" height="32"/>
+  <object name="farmhouse" type="mapchange" x="320" y="544" width="32" height="32">
    <properties>
     <property name="map" value="crossglen_farmhouse"/>
     <property name="place" value="entrance"/>
    </properties>
   </object>
-  <object id="5" name="home" type="mapchange" x="160" y="160" width="32" height="32">
+  <object name="home" type="mapchange" x="160" y="160" width="32" height="32">
    <properties>
     <property name="map" value="home"/>
     <property name="place" value="entrance"/>
    </properties>
   </object>
-  <object id="6" name="east" type="mapchange" x="928" y="416" width="32" height="64">
+  <object name="east" type="mapchange" x="928" y="416" width="32" height="64">
    <properties>
     <property name="map" value="wild1"/>
     <property name="place" value="west"/>
    </properties>
   </object>
-  <object id="7" name="smith" type="mapchange" x="128" y="800" width="32" height="32">
+  <object name="smith" type="mapchange" x="128" y="800" width="32" height="32">
    <properties>
     <property name="map" value="crossglen_smith"/>
     <property name="place" value="entrance"/>
    </properties>
   </object>
-  <object id="8" name="south" type="mapchange" x="256" y="928" width="32" height="32">
+  <object name="south" type="mapchange" x="256" y="928" width="32" height="32">
    <properties>
     <property name="map" value="wild2"/>
     <property name="place" value="north"/>
    </properties>
   </object>
-  <object id="9" name="crossglen_fortune_teller" type="script" x="96" y="64" width="32" height="32"/>
+  <object name="crossglen_fortune_teller" type="script" x="96" y="64" width="32" height="32"/>
  </objectgroup>
- <objectgroup name="Spawn" visible="0">
-  <object id="10" name="crossglen_wasp" type="spawn" x="736" y="160" width="192" height="160">
+ <objectgroup name="Spawn">
+  <object name="crossglen_wasp" type="spawn" x="736" y="160" width="192" height="160">
    <properties>
     <property name="quantity" value="3"/>
     <property name="spawngroup" value="crossglen_wasp"/>
    </properties>
   </object>
-  <object id="11" name="trainingrat" type="spawn" x="352" y="96" width="192" height="128">
+  <object name="trainingrat" type="spawn" x="320" y="96" width="192" height="128">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="trainingrat"/>
    </properties>
   </object>
-  <object id="12" name="crossglen_farmer1" type="spawn" x="192" y="320" width="256" height="128">
+  <object name="crossglen_farmer1" type="spawn" x="192" y="320" width="256" height="128">
    <properties>
     <property name="spawngroup" value="crossglen_farmer1"/>
    </properties>
   </object>
-  <object id="13" name="crossglen_farmer2" type="spawn" x="64" y="416" width="96" height="192">
+  <object name="crossglen_farmer2" type="spawn" x="64" y="416" width="96" height="192">
    <properties>
     <property name="spawngroup" value="crossglen_farmer2"/>
    </properties>
   </object>
-  <object id="14" name="crossglen_beetle" type="spawn" x="32" y="320" width="384" height="224">
+  <object name="crossglen_beetle" type="spawn" x="32" y="320" width="384" height="224">
    <properties>
     <property name="spawngroup" value="crossglen_beetle"/>
    </properties>
   </object>
-  <object id="15" name="crossglen_ant" type="spawn" x="512" y="832" width="384" height="96">
+  <object name="crossglen_ant" type="spawn" x="512" y="832" width="384" height="96">
    <properties>
     <property name="quantity" value="3"/>
     <property name="spawngroup" value="crossglen_ant"/>
    </properties>
   </object>
-  <object id="16" name="odair" type="spawn" x="896" y="32" width="32" height="32">
+  <object name="odair" type="spawn" x="896" y="32" width="32" height="32">
    <properties>
     <property name="spawngroup" value="odair"/>
    </properties>
   </object>
-  <object id="17" name="oromir" type="spawn" x="896" y="864" width="32" height="32">
+  <object name="oromir" type="spawn" x="896" y="864" width="32" height="32">
    <properties>
     <property name="spawngroup" value="oromir"/>
    </properties>
   </object>
-  <object id="18" name="halvor" type="spawn" x="736" y="608" width="32" height="32">
+  <object name="halvor" type="spawn" x="736" y="608" width="32" height="32">
    <properties>
     <property name="spawngroup" value="halvor"/>
    </properties>
   </object>
+  <object name="oromir_behind_inn_help" type="spawn" x="864" y="544" width="32" height="32">
+   <properties>
+    <property name="active" value="false"/>
+    <property name="spawngroup" value="oromir_behind_inn_help"/>
+   </properties>
+  </object>
+  <object name="oromir_behind_haystack_help" type="spawn" x="512" y="160" width="32" height="32">
+   <properties>
+    <property name="active" value="false"/>
+    <property name="spawngroup" value="oromir_behind_haystack_help"/>
+   </properties>
+  </object>
+  <object name="oromir_behind_inn" type="spawn" x="864" y="512" width="32" height="32">
+   <properties>
+    <property name="active" value="false"/>
+    <property name="spawngroup" value="oromir_behind_inn"/>
+   </properties>
+  </object>
+  <object name="oromir_behind_haystack" type="spawn" x="512" y="160" width="32" height="32">
+   <properties>
+    <property name="active" value="false"/>
+    <property name="spawngroup" value="oromir_behind_haystack"/>
+   </properties>
+  </object>
  </objectgroup>
  <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/crossglen_farmhouse_basement.tmx b/AndorsTrail/res/xml/crossglen_farmhouse_basement.tmx
index 7de9bcbba..40854403a 100644
--- a/AndorsTrail/res/xml/crossglen_farmhouse_basement.tmx
+++ b/AndorsTrail/res/xml/crossglen_farmhouse_basement.tmx
@@ -1,191 +1,234 @@
-<?xml version="1.0" ?><!DOCTYPE map  SYSTEM 'http://mapeditor.org/dtd/1.0/map.dtd'><map height="8" orientation="orthogonal" tileheight="32" tilewidth="32" version="1.0" width="10">
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- <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="8" name="Ground" width="10">
-  <data compression="zlib" encoding="base64">eJw7xsnAcFEKPz7GCcEPpfBjmLrNBDAp6kD2E6PuIRHqiDFrM9Ssp5zEYQAFdkGs</data>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
+<map version="1.0" orientation="orthogonal" width="10" height="8" tilewidth="32" tileheight="32">
+ <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="10" height="8">
+  <data encoding="base64" compression="zlib">
+   eJw7xsnAcFEKPz7GCcEPpfBjmLrNBDAp6kD2E6PuIRHqiDFrM9Ssp5zEYQAFdkGs
+  </data>
  </layer>
- <layer height="8" name="Objects" width="10">
-  <data compression="zlib" encoding="base64">eJxjYCAeBLNCMAiEQGkzIM3JxMDAxYRQl8wKwTlAnALENwQZGNyAtDsQXxRDqIOZgQ5A6pFBCha9ICDKj8ovFiDsh1+iqOZ7AM31RDIb3W5CAAAp8w1V</data>
+ <layer name="Objects" width="10" height="8">
+  <data encoding="base64" compression="zlib">
+   eJxjYCAeBLNCMAiEQGkzIM3JxMDAxYRQl8wKwTlAnALENwQZGNyAtDsQXxRDqIOZgQ5A6pFBCha9ICDKj8ovFiDsh1+iqOZ7AM31RDIb3W5CAAAp8w1V
+  </data>
  </layer>
- <layer height="8" name="Above" width="10">
-  <data compression="zlib" encoding="base64">eJxjYGBgOCzGQBRAV3cZhz6QOnEmBP8SHnXk2IsLINtjwcrAYMlKnD4QaCdBLTIAAGyBCBc=</data>
+ <layer name="Above" width="10" height="8">
+  <data encoding="base64" compression="zlib">
+   eJxjYGBgOCzGQBRAV3cZhz6QOnEmBP8SHnXk2IsLINtjwcrAYMlKnD4QaCdBLTIAAGyBCBc=
+  </data>
  </layer>
- <layer height="8" name="Walkable" visible="0" width="10">
-  <data compression="zlib" encoding="base64">eJzbKMbAsJHGGASwsWF8XACbOYTUETKPGL2k+A0AYQgobQ==</data>
+ <layer name="Walkable" width="10" height="8" visible="0">
+  <data encoding="base64" compression="zlib">
+   eJzbKMbAsJHGGASwsWF8XACbOYTUETKPGL2k+A0AYQgobQ==
+  </data>
  </layer>
  <objectgroup name="Mapevents">
-  <object height="32" name="stairs_up" type="mapchange" width="32" x="0" y="192">
+  <object name="stairs_up" type="mapchange" x="0" y="192" width="32" height="32">
    <properties>
     <property name="map" value="crossglen_farmhouse"/>
     <property name="place" value="stairs_down"/>
    </properties>
   </object>
-  <object height="32" name="note_lodars" type="sign" width="32" x="224" y="128"/>
+  <object name="note_lodars" type="sign" x="224" y="128" width="32" height="32"/>
  </objectgroup>
- <objectgroup name="Spawn" visible="0">
-  <object height="160" name="crossglen_beetle" type="spawn" width="224" x="64" y="64">
+ <objectgroup name="Spawn">
+  <object name="crossglen_beetle" type="spawn" x="64" y="64" width="224" height="160">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="crossglen_beetle"/>
+   </properties>
+  </object>
+  <object name="oromir_basement_help" type="spawn" x="96" y="64" width="192" height="160">
+   <properties>
+    <property name="active" value="false"/>
+    <property name="spawngroup" value="oromir_basement_help"/>
+   </properties>
+  </object>
+  <object name="oromir_basement" type="spawn" x="96" y="64" width="192" height="160">
+   <properties>
+    <property name="active" value="false"/>
+    <property name="spawngroup" value="oromir_basement"/>
    </properties>
   </object>
  </objectgroup>
  <objectgroup name="Keys"/>
-</map>
\ No newline at end of file
+</map>
diff --git a/AndorsTrail/res/xml/graveyard1.tmx b/AndorsTrail/res/xml/graveyard1.tmx
index acb6f0820..cda2b4c18 100644
--- a/AndorsTrail/res/xml/graveyard1.tmx
+++ b/AndorsTrail/res/xml/graveyard1.tmx
@@ -205,12 +205,12 @@
    eJzFlksOwiAQhicmLkxcVDeGc3gCGy+gx3OjR1A5ia7RRJP2HJYE4pQOMECN36aIMz/zYJoCADwEgBL9J8b+VqK/F/Lxcensro6tEn4brm5TfddtNfzfxuk7M8ZqErd5Gs1b97ybtUw4RxL+lldEpyFyxtQzgDczFjdmmzunBmOgY9W490RD1cbluBzubY2m2/eSnKxmKqEccjV1zTYe3z2xfyJqhBmr1zJyL0P48jkTsXPnjKpvaa65PQudm6LJrTHW5MxRqiaH2mOP3/k7hiY147EzctF9yu2xBvcH39MSTTwDa6RDzfo/mC7yfUO9xbjfEtw5GOvddpjTa67PL/kANJc76w==
   </data>
  </layer>
- <layer name="Walkable" width="21" height="30">
+ <layer name="Walkable" width="21" height="30" visible="0">
   <data encoding="base64" compression="zlib">
    eJzVk8ENwCAMA5mi+6/Ahn0h9UHsM1EfICFVYMw5pPMZY5q5htMtLdFRbXo31aeeNFPC2PFVo+O3+07r4Vi+65RdZSWD9kDl7eryNyfV0v5W+XZnSXbld5qdvlXiV2WnmdL/UfEpVnLO+ZPspMYkO91zjK4PKibqV9Wx2qM86Ug9FRPhrN7TrXU5k/xOe+JJe3l3z63zBeTIKpA=
   </data>
  </layer>
- <layer name="Layer2" width="21" height="30" visible="0">
+ <layer name="Layer2" width="21" height="30">
   <data encoding="base64" compression="zlib">
    eJzNklEKwCAMQz3F7n8Fb7gvfyRtXlDGhMIc8dnEzmeMaWotp1taoqPa9G6qT5nUU9LjCbdbJzz1neZRna2yp8zKK1l0Biq2y0V537UnTOqJznfXS5eLY+/nd2bqnb5Vkk96P9F1/lRfSv/lzCuNOqN6TmbNMdOqciQzVHlSe9qn4txgEhZ9Azfz7t8NpvKReqd503fvMnSsv9cLhdk9/w==
   </data>
@@ -235,7 +235,7 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" visible="0">
+ <objectgroup name="Spawn">
   <properties>
    <property name="active" value="false"/>
   </properties>
@@ -260,23 +260,22 @@
   <object name="graveyard_corpse_2" type="spawn" x="64" y="640" width="256" height="128">
    <properties>
     <property name="active" value="false"/>
-    <property name="quantity" value="2"/>
     <property name="spawngroup" value="graveyard_corpse"/>
    </properties>
   </object>
-  <object name="graveyard_corpse2_0" type="spawn" x="192" y="320" width="32" height="32">
+  <object name="graveyard_corpse2_0" type="spawn" x="160" y="320" width="96" height="64">
    <properties>
     <property name="active" value="false"/>
     <property name="spawngroup" value="graveyard_corpse2"/>
    </properties>
   </object>
-  <object name="graveyard_corpse2_1" type="spawn" x="192" y="512" width="32" height="32">
+  <object name="graveyard_corpse2_1" type="spawn" x="160" y="512" width="96" height="64">
    <properties>
     <property name="active" value="false"/>
     <property name="spawngroup" value="graveyard_corpse2"/>
    </properties>
   </object>
-  <object name="graveyard_corpse2_2" type="spawn" x="320" y="704" width="32" height="32">
+  <object name="graveyard_corpse2_2" type="spawn" x="288" y="704" width="96" height="64">
    <properties>
     <property name="active" value="false"/>
     <property name="spawngroup" value="graveyard_corpse2"/>
@@ -292,14 +291,13 @@
   <object name="graveyard_corpse_4" type="spawn" x="416" y="192" width="160" height="224">
    <properties>
     <property name="active" value="false"/>
-    <property name="quantity" value="2"/>
     <property name="spawngroup" value="graveyard_corpse"/>
    </properties>
   </object>
   <object name="graveyard_corpse_5" type="spawn" x="288" y="416" width="160" height="224">
    <properties>
     <property name="active" value="false"/>
-    <property name="quantity" value="4"/>
+    <property name="quantity" value="2"/>
     <property name="spawngroup" value="graveyard_corpse"/>
    </properties>
   </object>
@@ -328,19 +326,19 @@
     <property name="spawngroup" value="graveyard_corpse"/>
    </properties>
   </object>
-  <object name="graveyard_corpse2_3" type="spawn" x="416" y="512" width="32" height="32">
+  <object name="graveyard_corpse2_3" type="spawn" x="384" y="512" width="96" height="64">
    <properties>
     <property name="active" value="false"/>
     <property name="spawngroup" value="graveyard_corpse2"/>
    </properties>
   </object>
-  <object name="graveyard_corpse2_4" type="spawn" x="416" y="704" width="32" height="32">
+  <object name="graveyard_corpse2_4" type="spawn" x="384" y="704" width="96" height="32">
    <properties>
     <property name="active" value="false"/>
     <property name="spawngroup" value="graveyard_corpse2"/>
    </properties>
   </object>
-  <object name="graveyard_corpse2_5" type="spawn" x="416" y="320" width="32" height="32">
+  <object name="graveyard_corpse2_5" type="spawn" x="384" y="320" width="96" height="32">
    <properties>
     <property name="active" value="false"/>
     <property name="spawngroup" value="graveyard_corpse2"/>
@@ -349,7 +347,6 @@
   <object name="graveyard_corpse_entrance" type="spawn" x="224" y="160" width="160" height="64">
    <properties>
     <property name="active" value="false"/>
-    <property name="quantity" value="2"/>
     <property name="spawngroup" value="graveyard_corpse"/>
    </properties>
   </object>
@@ -382,6 +379,16 @@
     <property name="when" value="always"/>
    </properties>
   </object>
+  <object name="boss_killed" type="script" x="256" y="704" width="128" height="64">
+   <properties>
+    <property name="when" value="always"/>
+   </properties>
+  </object>
+  <object name="despawn_fix0" type="script" x="256" y="128" width="128" height="64">
+   <properties>
+    <property name="when" value="always"/>
+   </properties>
+  </object>
  </objectgroup>
  <objectgroup name="Replace" visible="0">
   <object name="graveyard_quest:50" type="replace" x="96" y="224" width="32" height="32">
@@ -480,12 +487,6 @@
     <property name="Walkable" value="Layer2"/>
    </properties>
   </object>
-  <object name="graveyard_quest:50" type="replace" x="192" y="608" width="32" height="32">
-   <properties>
-    <property name="Objects" value="Layer1"/>
-    <property name="Walkable" value="Layer2"/>
-   </properties>
-  </object>
   <object name="graveyard_quest:50" type="replace" x="320" y="608" width="32" height="32">
    <properties>
     <property name="Objects" value="Layer1"/>
diff --git a/AndorsTrail/res/xml/guynmart.tmx b/AndorsTrail/res/xml/guynmart.tmx
index 8029e4fc7..147f3e150 100644
--- a/AndorsTrail/res/xml/guynmart.tmx
+++ b/AndorsTrail/res/xml/guynmart.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.2" tiledversion="1.3.0" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="30" height="30" tilewidth="32" tileheight="32" infinite="0" nextlayerid="14" nextobjectid="78">
+<map version="1.0" tiledversion="1.1.6" orientation="orthogonal" renderorder="right-down" width="30" height="30" tilewidth="32" tileheight="32" infinite="0" nextobjectid="78">
  <properties>
   <property name="colorfilter" value="none"/>
   <property name="outdoors" value="1"/>
@@ -187,52 +187,52 @@
  <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="1" name="Ground" width="30" height="30">
+ <layer name="Ground" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eAHtlDFOBDEMRV0CDRLQUMDpOAEHgooWtB0FB6DjGlDRUpKn5Ut/rTDjiJ0FiS2+nExsv/nRjFeHEat/ppPLCNeu/L9fRLh2xb1pXHT7pb/CfT2NqGrkneVXnnPtR+NWlWu/2z8dr+9YTO6aZ64qkzyv83Xmcya/MB863IOziKqc5ese976xEEzk/xTrx/O6yPd/Q+weVz5h4/0u6blxq7o6WvcQG25msuc5HsmDD1f+FUf8Ovel9apw4cO6Tqp6JQ8u9fiY4/JO5GWe9iN+VUM/+k75neO+NR9VbZOrXiNxG35HeMrdczf/Y31zU9+z7m4k+j33vunf5PJuKM9l3/e8+nleq6d85VnJc+UQ82zWnvnpbOaaznL0flNczeG5mLlz+ZxPcXW2ZOzd85I89f4J12vVrxq9dr/enGVL3scnIGuObQ==
+   eJztlrEOgjAURRnVxURcOuDX+QV8UJlYS9gc/AA3f0MnVkfT0JeUZ1tuEVEDw1nIaw83TS/U6ySpZ8bu0GUqb5N1mcors5bC8CveW4ozxCs93keKgzrP29e8+plNjJevJfq8lcO72uPEeFXWUhn4vToJHD1v342Ql3Iqk7tkXATOcdPuYXt951uZmcJ4FSMmr+29gl7KnDNi8+agV9M4fERMXloTOlvUexc4Y3qHsHjn4/X11be81Gm8l21ce4fmkX62e5x3MyGZUwVm0e8C72Mf3IvQd76f5h+977xvzP/ewng8ASBrjm0=
   </data>
  </layer>
- <layer id="2" name="Objects" width="30" height="30">
+ <layer name="Objects" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eAGll8lrVEEQxisRNwRjjFtwwYv6FxgPHsWoZzEuQSQKLiQe4kHE5S8wCoqiJuOCF7eAelAPHlSMgiKIKyi4jGdDDB48CX4frz6nbF+GeZOCmuqurupfd7/ufm/6ms2+zzMbhra0mh1D/Xjwqe08fBeg23LaniF35Uz7K/cQE4XtS1vMlkHVP3l7QtyJUBZTdl1gsl/5xeCYqgn5ytmF2E8L86N7Eo6ilMt6LLPOvik7Q270cV6ss33Yub8azHpnZ3kcj0Tl594nx5MK1ywdg2LEVT215FIe5sw/9tnhXPk4dkn6LDhmjlNs5WjsD+Yr02zIuS98fpWW2kqbwGkPY1GW2LL0v0y4nIPG1Il9WETWOFNzY65YW7zt4NysxzjfG/BF7S7AjXkqH0J/PDfaH/tw5gady/m2NmZj0DpnteK/jYvMpMw+7AzOOa4B275M4u/Y8gTjegqVZeRj1IegsspuBpfy0/cJuToT9C/B/URh+wi4ox6Xt5/fof/3UFnmvUH9LVSWPkrJ+5kA/vIpZm1B21HW/te4yOW8xe3ydWdf6Zy+gkcpu1WdvvvOZX/XMddV2Eunod+gG8AlmyIuy5y3uKxTFiM/ndMP5426VZ3x/c7divuASjni+7gEuxbcEsYTuVnU/79xv5+ZbHYWeg4qie3y7QWTSuGZ5Jne7Ny+GrnxfF8B7yr0WuDG9oxkdhuMfvT/ClbP9FRBrvoqYh+BoTOkvMs53C6s+3boDn/uiq3X8n1Dbi9YK6Bca+4vPt+8dT4wsRhpfdj3MVPc/WBRT0JXg9kxBjfmjqdMbjy/u8Elk886zne86zxtxr+jJJfnl/dzJ1gboRLez7xXKOUmfGMhd5bnf0D9I7Re+e3nON1bejc1gTviMfUy8vLYL4XcNsxV7wR9hzV4O+etuzXLqPyWp1fKLL1O6rE19ke/5tsNtr4nFa93oO5W+Wuxeft5Ttjj5GptZdnvXayxdLDKet+ZaiYdqBKnvmgp5Op+1lpnLbX9iklbRMjlnRGZA/DVqpFbaw7jjkIlkc2zJdF6qE6rO/3mArNL0FtQCp9VOg/6o4/vH0lkyqe+VVdM3AefnVt2rmKjVby+G9Umf7RipJbfRPL1+P+ui87Uuqg9tTovqV/1PwpaKgk=
+   eJy1l89rE0EUxycpNhGhcYyahE3Ei/oXWA8exapnsVqDlCqklsZDPUhR+xdYBcWitvEHXtRaUA/qoQcVqxARxJ+g4I94tsTiwZPge+x7nbeT2diN7Rce82vnfebNzszOjmqlfmSVmgVL55Q6DeUzoo7Ty1B3BazX0VYF27pKzeuhVgFh+8a0UpvSxj/2GxDPnRV52/8uwZTtrF6LZ6sqfPXDs58L7ufKutG3zbPbq5Qv6eB8cB3GhWXMzxL3d0ypoTV+vl+MnfMvsmY8tgZCxijHEibkoh474pc+u3WwriTGYb8LHHNZGza38dgfeabvDHFf/mOcYdoHPrscc8JsGf8ri1vSZkzFdDTuDms+JGs/tR3P+KmM93YmaIMRuHZftBMZn8/r4yjsuSniYry5uIn3fxRfZwx1khhyH7G+tjf39QzG9dwzKeoppDOeSVmaeL8Khiv3x4acaa8Dd46ec63n9+D3g2dS1FtI33kmZVWofxvwNyeV6hTWlTTrn8eFXIybuX1x48uO6Rvla16wjJoW/iYh1m3AGQP7DraH2JKLqrc3xru+0BjTT8rPecEyapz6H4j5hhqhGCuQ7gRuJRPkhkmu9wsJpS6CXUq421lHYr6hyrSne4g7ukCu3N83gHcT7FbC3c66B4xx8P9am3d6PiK3FT3RZg+xrju4fVA+CHYouThc/N4gdwhYW+j8G2sS7/CyaP53x931zD2mfTsHth2Y3Us8z8iV+/ew9pn4rhdznlesbORO0vlcBNZecWbh+dxG51otBXcs6Lua+n+E8qdUa2NA/RHnpBR/m1LArS/BXKfEd6FT3Af4Hhajdoy7EsKvdQTLbzrcz9n+mIsa1OY+yeJv4HQLcbvW81pRh1zXXeNBwdhUE+795cYmmjwn/TGXz+ewu18zSW4UIde+E09kFm6BeCP0OyXWs2QXxXseEXkWn+l38kpdA7ub98vVrPtuL+t6HP8fLt/2M3IdfCFuLR8+p/a90a6Xqf0fJP9h5u/Z9N91NR+cl7C+Yf93nP4FCloqCQ==
   </data>
  </layer>
- <layer id="3" name="Above" width="30" height="30">
+ <layer name="Above" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eAG1lr1KA0EUhdcUJp2/xDT6XmLhM/gePoEIEkUEFQsrE63ExrS2pjA2FopE8af0HrIHz97MZEddFy537s+cb2biztpvZdHn1mp9M3o0xsZRESl0nJbX25j/blYOs5rTMerQ5sOa5lDzMfuHyxwVfVc0i5VRRI6vxTi+L8SlZtlZQIu9qku21ga2P7W3fL8Xtj/lqM5vxmTTT9K4q0+qjtcG0q97S2Gp2jDX2Y785tqL8YtwWSO/jH0lDHK3JEe9kPfc9bkse5S/R64hNFdzUw2Nyse1H/arou5X8ynjc3cuPReHNI7ynk5Cb2g+cuDey3zEB3bWsLZZ6CGPvlkLdU3OgfOac7EPv//NAPsp7z/M/WRCuKpc6B0naJEbVhxlz2aLVR+T+2y8FD2opfYVycUI7xvPGXqn+bk23Hp1VhVc6Cn3MvB7KhPjqrlePxb/B3c/sF+8U/p4bmcmy7pm+DY8LIybfgNUh+eMHN9bsui133Ovjdkzw13ZWBy32J2oXOjjjtbHfx88V3tP7G+zbbZrtmeG2N8J7Pdc5v03IfT/BXvpd4zzbvZh9mmGOMblHPDL7ufaCrvjftp66maNhF7qcW08W/o4ZbzSNN6SWSuBy9nkMvZnzXzVXu/nKph+H6nr/Ssb9zB/K2qtyvvCHNazluc1F1sne6gd6/P5WD/z8Ddm8GR4D03mvD5j1r0vq7Pf9zGG9z1aC61b66H5mPMFTMbIKQ==
+   eJy1l71OwzAQx0MGmq0NoJIlvBdi6DPwHjxBhYQKQpUoYoAFAxPqQldWOlAWBipUEB8jFyUnrleffUnav3Rqbd/dL+cktjNOAlFPMDZO/n9pH/+vkUkWY2h7f8Peb+vj48aS07B43kbNUnv/jac2qX6Jo+FiTt9cSP3GMj+TdN6+Cu4d49QVsjX1PzfK5Z4Qf1qbdq5RsyLPoXDPuT4s1yk9X1xDwkButyK3EwfBm/DeuLQW6XioUOF/JXCHytpsumWxI0WuQeFjanJf0vl2P86tF9tjDOO2w2rczyI+q4PXf2BhTwufs5r1IjfLd67INVX4XLfcbeS+p7p8Wq5PXVbvZTGvUUuOWQY3E+XeC8/SKrlarYJ7aqm3z/o41zRhz23me8Pr5qJNhD2DcvG9RRZn2rgPwBw187Uy2lo0aU3k89xhLL4/uOb5AsZ6YMdgJ2ne5muCxEXxPUE611Adgc832A/Yb5q3JS7l+9bncMfPXgefBlik8MV8eG1lzhpcbci1DZYouCg+J2XPvlVF1+dlMH33VlJddrYO87PpLnlfaP69WM/UnsW4JH/6XD0m898svu8h1/XZYl3jru8kVx+tQ8olxWcxfx6ayPQ=
   </data>
  </layer>
- <layer id="4" name="Above_1" width="30" height="30">
+ <layer name="Above_1" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eAHtVT1LA0EUXFNoOpVYCKI/JT8hPzAIklgICtZGK00aU5nY2qiNjUgU1NIZbh95t7dfh4qFtzC39/bNm7l93N0a04ymA7/fge5q2eN+rRynogfFv9tOsY252Sk4Pcd3YXX2d9MaZLwq37yKgsX9TpSH+PbVWkyvrm9ovyvtmEs111L84WY1H1vR+43xfLmLzL7o2hNbM8J8hGcVaI6+n+GdmAMyM0ffx5re9OOQuYjqXen7ZnVkHymFZ8s/tnOK78trX9Hz8fRaDu9sQ1cY48bi+4Jnz9GjWown73vZdRlJnt+b9Dmmt6yM+2pe6v6vfVPPJ/ncvgg/NMt+Q3l33fUdrRtzDvBseOpUoc8ArfVd32t4TgH+K9tbVeh/4k/6aq1TvKcDYAgcAoz5zfhG7n4XgXqteQDOO/ABfAKMQ75Sl/LnudHaK9jyT3ZnZi/hdQWMAQ6XIzFz1Kt7HrHON2bwmwO31tfHadaaDvzHDnwB499heg==
+   eJxjYBgFo4D2wI4Nlf+QnTT9j5DU35EgrP6CNIT2Q7P3I9ScObLE2fuJRHfCAMi/R5DsgNk7i0b24vIvIwdp5jAhqV8kSJreI0T6DRvYTYbe1VA9O4H0ckEExgUuAsPokjSChtn7mES7d8qi0uQAkL2fofpXE2nOW6i6VVSy9y2J9uIDOwTw82H2vpeljr2w9E5IfhaN/EsMGGh7iQWDxd6d/AwMu/ghdcMLYUz8CEeZSKm9J4F2nuKHlJUcIpiYCUcZSs1wXgeUWwjEi4B4sSyEj6tMJNbej0Somw9U8w2IvwPxD1kIn1BZTMh+UL3BJAdhI5fL6GX0QaA5h4D4sCxhtSDzSK2PcIGLQPsuAfFlKqX7UTAKhgsAAOPfYXo=
   </data>
  </layer>
- <layer id="5" name="Walkable" width="30" height="30" visible="0">
+ <layer name="Walkable" width="30" height="30" visible="0">
   <data encoding="base64" compression="zlib">
-   eAG9jwFuhEAMA3nIfby/vTOr0VpuFrLo2kjgxLEdOI7j+Hl95/lEnaU8r518+VLvXPbMwlV5njTV9+FFy4weT+7hXeccvKN6VeoGO/+fOTG/gf1dHj7X0bMjS1hxK77Kwe+IH/TdVS/9quRTOWbWUIx37q7myieOW9Xe8+72rvXefep9p77iUvPf8/iq+d65P12//7XK+db/kwNWt5zr6txT9eSAaDSrmEE4R/UqNB1M/RlgLzLQOZrsbNF2ML05kyFeveOY5hutI3rnPCd5dvgqnBefddzgtqc4lzpm1+/0+LnBTAbzCtHtouep51FO9nC7Nyr93V08lY7dDnqOfD7Tex6ckB6fz+656vGQx4yn4p3LHp8wdzmnJmf0K5690Mv5qs88vJX2r7n8lu49vvmJH2/3luvwPr27yvLcJ71yq3Ke25Wuy5FXZcGhUWbF5a2OJj1kX/Ge2+1XeV2/695VEW8D
+   eJzFlGsKxDAIhD1IL97b7q+FIKPjaNwNBIrR+XykMTN7nzv7u85vE/WR/2nz34jnF9Ly594XxTM26sXpk3EjnnLO9LJZsbqZPZtT1P/O3YrqY7qsHxVudoc2uShW1fvFrvRD6TPzv5WzorfNZfNGd6/DZTPLeNP5Zlpdrmr3va5w1eX5qAbkN+UzvajeDS7qwXafESvym/KQLsvvtHdyqMyXvSeV2Or7of53t7iVuI3d5Sr1RrH/4EZa0xXpoXpvcFg/MhvS7OTGap7OF+Wn7A9VEW8D
   </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">
-   eAHtkF0KxDAIhHOQvfjedvHhg2FQY0vbfWkgjDo/pl3rf+f7WcvvE6+JnXq8V+7K2vd4f+UuzYo9fpW/q/ad/r0ZX82OvDHLUH/GVzP17eosQz0ZX83Ut6urjDPz2KW+brfqovbjfNerN8vK+C5vykUu+0DdpTX8NLvTnd2rPt7W7XFO/cF1Bx50rWd3fXjJAT2PHh5kDsbcb3A+w+9IjuNU576qn+apLmr6Knc3xw9WenjHSr+bT3Omut0++Gme6qKmJ2eK+Bwrv+q8jl4vGTrL6tDFvDs7PrxkkzP1oM+QDLI7xN9pNA99hpqR8UdnV+cd3f/q3z/w9B/4AYOhtyA=
+   eJztlEEOwCAIBH1IP97f9r5FWQoiadiEg4IMEnGMc7qvt2VxV+s/ck/1ecWV/DNrro371TCfheupC89p3Kh7Y77qXCk+iyv5q3C1/QiuVZ53lc1l4ndxvcrus/ffwBqkeizzpHG1GOQyZxg/+y8wsSw3Yn525Wu1qusBg6G3IA==
   </data>
  </layer>
- <layer id="7" name="Walkable_1" width="30" height="30" visible="0">
+ <layer name="Walkable_1" width="30" height="30" visible="0">
   <data encoding="base64" compression="zlib">
-   eAHtkFkKwkAQBXMQL+5tpZGC4tE9iSHRHwfGXt42Ztt+d56PbfP91ksqk+Oe3V3VWe7vysO3svKC3VkzM/9zh0+7T97ZeVjf4dPOur2+87Cmw6eddXv95HFmX1nWrbLNqz5P4qvZ2s6rw1d+R7HyJY/qLPfgR71XvC4Xf2ce4a1yEsPPe+f5DfRU8zofe2af2pydQU/tuJ1/7tB773d3vuCJnZkz1x68zXkrvrV7Pd5ZU5c4c/KOzuhdq2fGh5nK/mzFhzr5gFflTtzV3j7FY5404JmZ86TPvf0S8wyvdmR1NTUdhx1e1mRf3DpopvpmvX8nDnv8rMkebtUrztV+V7zp7/H/And+gRdd177n
+   eJztlF0SgCAIhD1IF++2vRIDsvyoTQMzTGXKt23iGOfivt65kyvd/5l7wmuLK73Xsrk+bjR5PQ83o4uvs7hV383rneRqfGte5v/OvEd0Ve3nLBcdp8+aBkQvElZvSFzUL4srXaPzMtzZHqv0GalX5XP23KDjEQ1eLmVZvek5txB9u7kV/bOqXkfH1+MBXde+5w==
   </data>
  </layer>
- <layer id="8" name="Walkable_3" width="30" height="30" visible="0">
+ <layer name="Walkable_3" width="30" height="30" visible="0">
   <data encoding="base64" compression="zlib">
-   eAHtkNEGACAQBPdD+vH+NskS5zilniay1HVzjcTCAAYwIPW2LDh/OTHPCfeNAft1vqHEruY5Y0V+Mt/c7Nn5hJtPVL854d78dX9bn5JKDGAAAxjAgDQApVQh8Q==
+   eJztz7EJACAMRcE/iIu7rdhpJyqkuYOQKjySACS97VtXt7o7b17mtvtDxb/r3wBwagClVCHx
   </data>
  </layer>
- <layer id="9" name="Objects_1" width="30" height="30">
+ <layer name="Objects_1" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eAHt0MEJACAIBVD3aP9JaoMaKDt48tztCR9BROFFKAIECPwRmCNiZar/+dKv7vx5MtX7hgkBAgQIECBAgMATuO51BzU=
+   eJztzSEBACAQBMHr8f2TQAMIBA6DBTVjVm4C8EarpNfpL2O/Zp0CAHC3AO51BzU=
   </data>
  </layer>
- <objectgroup id="10" name="Mapevents" visible="0">
+ <objectgroup name="Mapevents" visible="0">
   <object id="1" name="guynmart_sign_flowers_1" type="sign" x="864" y="352" width="32" height="32"/>
   <object id="2" name="guynmart_sign_flowers_2" type="sign" x="896" y="512" width="32" height="32"/>
   <object id="3" name="guynmart_sign_flowers_3" type="sign" x="896" y="448" width="32" height="32"/>
@@ -331,7 +331,7 @@
   <object id="31" name="guynmart_sign_gatenodoor" type="sign" x="480" y="672" width="32" height="32"/>
   <object id="32" name="guynmart_s_clearing_10" type="script" x="0" y="480" width="32" height="128"/>
  </objectgroup>
- <objectgroup id="11" name="Spawn" visible="0">
+ <objectgroup name="Spawn" visible="0">
   <object id="33" name="guynmart_player" type="spawn" x="576" y="576" width="96" height="96">
    <properties>
     <property name="quantity" value="2"/>
@@ -435,7 +435,7 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup id="12" name="Keys" visible="0">
+ <objectgroup name="Keys" visible="0">
   <object id="51" name="guynmart_quest_gguard:1" type="key" x="768" y="416" width="32" height="32">
    <properties>
     <property name="phrase" value="guynmart_key_gguard"/>
@@ -493,7 +493,7 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup id="13" name="Replace" visible="0">
+ <objectgroup name="Replace" visible="0">
   <object id="58" name="guynmart_qRpl_main:1" type="replace" x="32" y="256" width="736" height="448">
    <properties>
     <property name="Walkable" value="Walkable_1"/>
diff --git a/AndorsTrail/res/xml/guynmart_wood_10.tmx b/AndorsTrail/res/xml/guynmart_wood_10.tmx
index b0cbb96da..a29a00f7e 100644
--- a/AndorsTrail/res/xml/guynmart_wood_10.tmx
+++ b/AndorsTrail/res/xml/guynmart_wood_10.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.2" tiledversion="1.2.2" orientation="orthogonal" renderorder="right-down" width="30" height="30" tilewidth="32" tileheight="32" infinite="0" nextlayerid="14" nextobjectid="23">
+<map version="1.0" tiledversion="1.1.5" orientation="orthogonal" renderorder="right-down" width="30" height="30" tilewidth="32" tileheight="32" infinite="0" nextobjectid="26">
  <properties>
   <property name="outdoors" value="1"/>
  </properties>
@@ -186,52 +186,57 @@
  <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="1" name="Ground" width="30" height="30">
+ <layer name="Ground" width="30" height="30">
   <data encoding="base64" compression="zlib">
    eJzt0TsOglAQheHjpVLoKNm3KzABSmpo3ABLoFY7tVA7KSxuJnMfwGCimeJPICHz5YRmCzTaz3RNgVtE99RzJ3fkcTcZYCJKMveNY863tnsqgDPpUqzvPkbjSXp9wZ2Tuur+k6tp2rT2Jpy0WZn4pHz75hDYa38raU7ZXc+0S49Jdw/Ek3A507XvsAM6Ide3m3P7hW7FuGXArcn7kn9rP3efTZzfErdl3DdpPEPk
   </data>
  </layer>
- <layer id="2" name="Objects" width="30" height="30">
+ <layer name="Objects" width="30" height="30">
   <data encoding="base64" compression="zlib">
    eJydVs1qFEEQbkNM9hLZmSULE/IOOYiaF1D2LCh7jQneFfRBFF/FDd4SRdmYk4d1BA+edkx2ggpG8SBYxXQx39ZUT69bUPTPVNdXf109ZebcBTFTacx/ptV6g8Zrfj5JnElJWs9Z5hzkTpJ5/blaj2Cd+3MzON/zuj/6vbd9586UHTmsx9n8WnTf7jh3c0m+Qzzq/78OPjfo2DEr0WYjru+S6izjhnSEaOBx94gfET8m3o/oQHvacH8k4bXg5oE6CdE0CeNqPMuegRHn/W41/l2rxtfbzr3ZtnXE4hyywcIV2livxiPCPFa4peFvzE8Ldy2tGInvB9PvVef+rNrnhx53uGR+EVfu56gft3tCMofEn1pkrTgI7kpaMRLiyj36Rvf9e1bv73p/dzthDMuGGO6HzXY9y9Qz4l5JK8a7Kf5iz5UciN+L9g1ti8ZFWiS/GnfRmmb5e0b/vOX13Yj02fteztIRO3dC8Tr1tYIj67P2Lbk24rdQ6vKAetJD35f4neK8cp9/RTpeej6EeRu/N3D53cTeK331CWE+Jb7bbeq4JDt+gR9T4/zMyKO8q720+Q1pjzAfdOv1xNt4dYt6yFY8fhpb6l7uxE46v4//F/K/In7kxj0S2cTwA9/lHfUd/2FwPQ3UvPyzCK5+8/GfRtuisfQezrmeC68LczOGOBeA9WKliWflW+sTTBnHmX1GE8sxJmOkRszRlkLZoTFjNuIZxmTiGjij9XnW1M8kNp0G4q2xQ/XJdSCYTIKJJHuce6ln7hchbE1t9Yn6pe5lPQMsyy724XNWzzFPPBd7MH6FwtA2iH/4lqGfl3KvW3IrdodkSmUDxuRr5C0qkvkcI46MHC/JL+ZWk/S4EH1RZ2dJEys0ov4yrXGk7xyRzDHxs55zz4mv92wbNOY/HJsoIw==
   </data>
  </layer>
- <layer id="3" name="Above" width="30" height="30">
+ <layer name="Above" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJxjYGBguCPJwHAXiGEAnU8J2IlmDjXNHgWkg4fsuOUe4ZGjFHzEYzYTB+3sxQcOiw2MvZdobO9GTlSaXgBk33YxTHvvA/P7gxGY50eqvykBoPpiDzTMyKXJtXcwAHLdMZjrVVLcRq4/aNmGIWQXuhgyexeV4hPGx+UvQvK4AKnpbToTZXZiU3sTyL8liaCxicHyNsx+cv2LbudUJkwxZACyD5fdlNqJz7/I9oHAZTxtBnzuwWUnsr9hdiGXnzD7QG0kQn7FZT8+OwOB/CAgDpZE9edhJHuR4xjZHlLCH92fxkB9t2UZGJwlMf2JTKPbhYsmBDYC1VwC4kQgTgLiZEmEPSC7L+HwLyV24ksrIHuQ273o/gUAAW6Z9A==
+   eJxjYGBguCPJwHAXiGEAnU8J2IlmDjXNHgWkg4fsuOUe4ZGjFHzEYzYTB+3sxQcOiw2MvZdobO9GTlSaXgBkHwwjg/vA/P5gBOb5kepvSgCovtgDDTNyaXLtHQyAXHcM5nqVFLeR6w9atmEI2YUuhszeRaX4hPFx+YuQPC5AanqbzkSZndjU3gTyb0kiaGxisLwNs59c/6LbOZUJUwwZgOzDZTelduLzL7J9IHAZT5sBn3tw2Ynsb5hdyOUnzD5QG4mQX3HZj8/OQCA/CIiDJVH9eRjJXuQ4RraHlPBH96cxUN9tWQYGZ0lMfyLT6HbhogmBjUA1l4A4EYiTgDhZEmEPyO5LOPxLiZ340grIHuR2L7p/AUgsmeE=
   </data>
  </layer>
- <layer id="4" name="Walkable" width="30" height="30">
+ <layer name="Top" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJy9lVEOwCAIQz3F7n+F3XDZh8lC0LYUR2JmFukTBbyvMW4wXvvOK4YYkeda1FH47FlUfJ1YVA13fztudr6Ry+6H4aLYV3pd8aL/SI/lKnd8Mq8q99tpu/xRNLIcYuuJvRdFh/VhuMhPjdPlRj21b3X0XXYd8q98lfOp+jqGepCTa9V1J3uJot0V/9/xZHk/5xVttkZ2firP3d8JHstnfR1j36ETXPTurWq6yvvqMu9WrD2Xm/GZ/O/gZiw37zNexp/jAZS+4W8=
+   eJztzkEJAAAIBLBLYf8W1jODIPjZEiwBuNH1PQAAYGMA3SMAzg==
   </data>
  </layer>
- <layer id="5" name="Walkable_1" width="30" height="30" visible="0">
+ <layer name="Walkable" width="30" height="30">
+  <data encoding="base64" compression="zlib">
+   eJy9ldENwCAIRJ2i+6/ghk0/TAxBueOgJKamkXuCiPMZYwbjs32esYhheapZHYaP5iLjq8TCaqj7u3G9/Fouuh+EG8V+0quKN/pfFS9zxp11lTnfSrvlk9Hwagi9T+i5MDqoD8KN/Ng4Va7VY/tWRd9F10X+mS+Tn6yvYlEPUmotu66zlzDaVfH/HY9X92ue0UbvyM2P5an76+ChfNRXMfQd6uBG797pTmd5uy7ybtm7p3I9PlL/FVyPpda9x/P4a7zj8OI2
+  </data>
+ </layer>
+ <layer name="Walkable_1" width="30" height="30" visible="0">
   <data encoding="base64" compression="zlib">
    eJxjYBgFo2AUjIJRMApGwSgYPmCjGATT0w5a2onNbGQxSuyG6SUG49NHjn2Uuo8W9hFrP7F6ybUTnSY1jCm1lxwzqGUvqeZQO5yJMY+SMEK3l1jzKE3H6Gxk/wIAy04+MQ==
   </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">
    eJxjYBgFo2AUjIJRMApGwSgYBQMFNoqRhqltJy3UU9sMSvUh6yU1nMmxm1wzsOkj1V5S7cSllxx7KQ0rUt1LzbCih72U6sXFRw9/UtMzALJXPWo=
   </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">
    eJzt0UsKACAIAFFP0f2v0A3biiAmflbzoE1IQyUCAAAA7LsnXlPN6kx3U89ONKM37uh6TW82msl0f5q2W2XP2OzaO+v97P8+r+AobQ==
   </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">
    eJzt0bsNACAIAFGmcP8V3NCe8DMo1b3EjnCJiAAAAADz9srfr2Z3ptv0Gq/aek/lj7tdr+nNZjM33UpTd7usm051rbtF9426B4R4KsI=
   </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">
    eJxjYBgFo2AUjIJRMApGwSgYBaNgFNALbBTDxPSyk5AYre2ktd3EmEsre6mhhhx7YeZiS1fEhAcAT7wU/g==
   </data>
  </layer>
- <objectgroup id="10" name="Mapevents" visible="0">
+ <objectgroup name="Mapevents" visible="0">
   <object id="1" name="guynmart_s_hill2" type="script" x="768" y="896" width="32" height="32"/>
   <object id="2" name="guynmart_s_hill4" type="script" x="704" y="864" width="32" height="32"/>
   <object id="3" name="guynmart_s_hill5" type="script" x="448" y="896" width="256" height="32"/>
@@ -255,7 +260,7 @@
   </object>
   <object id="7" name="guynmart_s_dog" type="script" x="224" y="384" width="32" height="32"/>
  </objectgroup>
- <objectgroup id="11" name="Spawn" visible="0">
+ <objectgroup name="Spawn" visible="0">
   <object id="8" name="forestboar4" type="spawn" x="768" y="544" width="128" height="128">
    <properties>
     <property name="spawngroup" value="forestboar4"/>
@@ -268,6 +273,7 @@
   </object>
   <object id="10" name="guynmart_dog10" type="spawn" x="160" y="256" width="96" height="64">
    <properties>
+    <property name="ignoreAreas" value="true"/>
     <property name="quantity" value="6"/>
     <property name="spawngroup" value="guynmart_dog10"/>
    </properties>
@@ -313,8 +319,18 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup id="12" name="Keys" visible="0"/>
- <objectgroup id="13" name="Replace" visible="0">
+ <objectgroup name="Keys" visible="0">
+  <object id="23" name="guynmart_dog10" type="key" x="160" y="256" width="96" height="64">
+   <properties>
+    <property name="phrase" value="guynmart_dog10_10"/>
+    <property name="requireId" value="andor"/>
+    <property name="requireNegation" value="true"/>
+    <property name="requireType" value="questProgress"/>
+    <property name="requireValue" value="1"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Replace" visible="0">
   <object id="18" name="guynmart_r_hill1" type="replace" x="224" y="640" width="640" height="320">
    <properties>
     <property name="Walkable" value="Walkable_1"/>
diff --git a/AndorsTrail/res/xml/lostmine2.tmx b/AndorsTrail/res/xml/lostmine2.tmx
index 544864cbc..defaab7a6 100644
--- a/AndorsTrail/res/xml/lostmine2.tmx
+++ b/AndorsTrail/res/xml/lostmine2.tmx
@@ -1,190 +1,219 @@
-<?xml version="1.0" ?><!DOCTYPE map  SYSTEM 'http://mapeditor.org/dtd/1.0/map.dtd'><map height="30" orientation="orthogonal" tileheight="32" tilewidth="32" version="1.0" width="30">
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- <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">eJytlj1uwzAMhQ1tvXrOkD1dbHfIkil1106Jc4QcpBEgAizz+Gd5eEBgx/wo8onSVIZhSuq7aXnp/DEMV/YMKRsfaX7p3rQ27o09Q7oG1uCprvHZVJmkZ9FV8xoBc3Hy5VoFLyrJnVssK18uHuuYyAFxe/KPfo98ItegrYPeHYN5y/9KabWw8vW4yEfat2gfHgL+7uV6+zDj7wzX24eev3u4e0mbnZq3IrI8T9J6huog442sFl/lvX5enVBfrPrPZR9upu98b/Rw+YxB8wadD2snN3Me8/Oht7/eHDg5MTyutQ+sPX9yYkS4aB94klwegzzAvU29i84f6SmNa839sf2uvdPYnIvqQu85V7vrkLd/yv97HPLskuRadx2K8xA1RJ5dN3Czcwd51ptLxLkYXu6V1f9fw8sRabMx4nfvbI6e29lzvoc7bYizFzejz6bK/QNgu5EA</data>
+<?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="29">
+ <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32" 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 name="Ground" width="30" height="30">
+  <data encoding="base64" compression="zlib">
+   eJytlj1uwzAMhQ1tvXrOkD1dbHfIkil1106Jc4QcpBEgAizz+Gd5eEBgx/wo8onSVIZhSuq7aXnp/DEMV/YMKRsfaX7p3rQ27o09Q7oG1uCprvHZVJmkZ9FV8xoBc3Hy5VoFLyrJnVssK18uHuuYyAFxe/KPfo98ItegrYPeHYN5y/9KabWw8vW4yEfat2gfHgL+7uV6+zDj7wzX24eev3u4e0mbnZq3IrI8T9J6huog442sFl/lvX5enVBfrPrPZR9upu98b/Rw+YxB8wadD2snN3Me8/Oht7/eHDg5MTyutQ+sPX9yYkS4aB94klwegzzAvU29i84f6SmNa839sf2uvdPYnIvqQu85V7vrkLd/yv97HPLskuRadx2K8xA1RJ5dN3Czcwd51ptLxLkYXu6V1f9fw8sRabMx4nfvbI6e29lzvoc7bYizFzejz6bK/QNgu5EA
+  </data>
  </layer>
- <layer height="30" name="Objects" width="30">
-  <data compression="zlib" encoding="base64">eJy9VstqFEEUHVpcJIFhuhp6yDj/YD7EbxnXgsSF4B+4krhzlXxCfIDoJg+IDTMTmPgIGBCiJqKC4MI61L3UnZuqmi4meKCo7nrcc6vq3FvV6SyHw3pJAxkYFFd5R9R2S/Sti+/rwpq1uWPLzPJu23qTOPpUrxZ+XArwjX1lPweR/xPL9ZzKBdUHVIBT0+m8seWtLePS+RUD/BvaYsSYofK5L9b4hNq2qP5kXL1L9aT0vhxENABbJ8pvLmM1H2O+KTv3eldLs+769krvo8a0dPqQ/VgHfAY2THwugLmmcvs77S0ez2jqcDyA+7KFDcy9bcd97rr/fbOYkzFbIg713P0MWzyXNT0SWl4V65WxyzrH3JuFW3dZ5eUSjsMVsoV47Kv4WRP9Q/KH9T3peb4c3q9Cz6g/BPQda/tYOx2A/283j7chbRzZsmd8jEJb2MOnKm4B9H2n3MH8G2b+vPnc7rbQ91YxP5d1EtIet2l+eWY4jweFz0MpyL06TPDKPsQ78+v8g/N50WL/c3hNNT+mTc7Q4PjJ4W1Iy8jRbTT1OODXpogNxrSM857X7i5A3w/BG7rToLFRgBN8u5HcH+Nt6O44F3vC956+i1fEPa1tIA5+dV3eYTzs+bWlgDh4GYhx+f8+I7bHpfdrEWa0/pC2dHwuQk7+wdizxPiQrRvUNhAxr8em3iw89ncmb1W7dw7ySlHNv2sAfEOz20Kjd5RuYfcocf9qXtjE/nyxpS5cLgDwXgHvmW07tuf2s+vyErhxP90X+W+H6uMyznuqfGpof/4EtMhvxprscjvKK6XXSeI9BUwSPrWF1Gfb3Ih9fnYN73nE9LuM9xTf88uiybgHkJdf1z4f/A/Iu+CR/f4Hd7brfA==</data>
+ <layer name="Objects" width="30" height="30">
+  <data encoding="base64" compression="zlib">
+   eJy9VstqFEEUHVpcJIFhuhp6yDj/YD7EbxnXgsSF4B+4krhzlXxCfIDoJg+IDTMTmPgIGBCiJqKC4MI61L3UnZuqmi4meKCo7nrcc6vq3FvV6SyHw3pJAxkYFFd5R9R2S/Sti+/rwpq1uWPLzPJu23qTOPpUrxZ+XArwjX1lPweR/xPL9ZzKBdUHVIBT0+m8seWtLePS+RUD/BvaYsSYofK5L9b4hNq2qP5kXL1L9aT0vhxENABbJ8pvLmM1H2O+KTv3eldLs+769krvo8a0dPqQ/VgHfAY2THwugLmmcvs77S0ez2jqcDyA+7KFDcy9bcd97rr/fbOYkzFbIg713P0MWzyXNT0SWl4V65WxyzrH3JuFW3dZ5eUSjsMVsoV47Kv4WRP9Q/KH9T3peb4c3q9Cz6g/BPQda/tYOx2A/283j7chbRzZsmd8jEJb2MOnKm4B9H2n3MH8G2b+vPnc7rbQ91YxP5d1EtIet2l+eWY4jweFz0MpyL06TPDKPsQ78+v8g/N50WL/c3hNNT+mTc7Q4PjJ4W1Iy8jRbTT1OODXpogNxrSM857X7i5A3w/BG7rToLFRgBN8u5HcH+Nt6O44F3vC956+i1fEPa1tIA5+dV3eYTzs+bWlgDh4GYhx+f8+I7bHpfdrEWa0/pC2dHwuQk7+wdizxPiQrRvUNhAxr8em3iw89ncmb1W7dw7ySlHNv2sAfEOz20Kjd5RuYfcocf9qXtjE/nyxpS5cLgDwXgHvmW07tuf2s+vyErhxP90X+W+H6uMyznuqfGpof/4EtMhvxprscjvKK6XXSeI9BUwSPrWF1Gfb3Ih9fnYN73nE9LuM9xTf88uiybgHkJdf1z4f/A/Iu+CR/f4Hd7brfA==
+  </data>
  </layer>
- <layer height="30" name="Above" width="30">
-  <data compression="zlib" encoding="base64">eJzVlt0NwyAMhGlGSKSu3qeO0SzABE0XqniwhBA/PnyAcq9J/GF8tuPcffR7ruF6BfezO3fu7feQHC5SvoHJioVIc281hXNvx3xu+v1XGe+9cbmILL0Rcx/gfVvObPGktcZB2rqyuT2yemuExHM577FndRxPapCrhe+cGSV5gMuQ5HmB3B4vx8xcL47OtzR3alxGH5Ri1LgjJTxNbsy+ivNsxW3dCTIDxGua/5IWN32uianZO+i5Znkm5czaC6v2Hnuuzuai9Xkt3vN/E4hDMQ==</data>
+ <layer name="Above" width="30" height="30">
+  <data encoding="base64" compression="zlib">
+   eJzVlt0NwyAMhGlGSKSu3qeO0SzABE0XqniwhBA/PnyAcq9J/GF8tuPcffR7ruF6BfezO3fu7feQHC5SvoHJioVIc281hXNvx3xu+v1XGe+9cbmILL0Rcx/gfVvObPGktcZB2rqyuT2yemuExHM577FndRxPapCrhe+cGSV5gMuQ5HmB3B4vx8xcL47OtzR3alxGH5Ri1LgjJTxNbsy+ivNsxW3dCTIDxGua/5IWN32uianZO+i5Znkm5czaC6v2Hnuuzuai9Xkt3vN/E4hDMQ==
+  </data>
  </layer>
- <layer height="30" name="Walkable" width="30">
-  <data compression="zlib" encoding="base64">eJztkl0KgDAMg3cK738Fbyh7G2VNf9IqioGBL+ZLm57HGCfxppj/fy5mWerIJb0kD+XIzODxiXSgeXk565x33kdmF1X9Z9lV80a9WG7kHtCeospy5cy7750fysHszuJq7G5uVJVcpts3c9ENeHgyt+UZ7RB5oJm8uTVldp7JzXh9kYvupiqjxl3z7u6J3aPFZVTVGdNnJ7czZ+V7ijvfBcQUGtI=</data>
+ <layer name="Walkable" width="30" height="30">
+  <data encoding="base64" compression="zlib">
+   eJztkksKwDAIRHOK3v8KuWHJLoj/0ZaUCkIX6bxxdF5jTKBXIf//XJ1lVYcvqkV5mo/MDB6dyA4kLS9nn/PJ+8hk0cGNaFVxo1ooN3IPVlaRynLpzNw3p6f5QLI7jZv1E+Eiuz2ZK73x8qhvSzO6Q01Dm8nrW6pM5hnfiNYXudrdVHmUuLtf7p7QHC0uUlU7Q/bZye30WdlvcVff9BIZRA==
+  </data>
  </layer>
  <objectgroup name="Mapevents">
-  <object height="32" name="south" type="mapchange" width="32" x="96" y="736">
+  <object id="1" name="south" type="mapchange" x="96" y="736" width="32" height="32">
    <properties>
     <property name="map" value="lostmine1"/>
     <property name="place" value="north"/>
    </properties>
   </object>
-  <object height="32" name="north" type="mapchange" width="32" x="512" y="0">
+  <object id="2" name="north" type="mapchange" x="512" y="0" width="32" height="32">
    <properties>
     <property name="map" value="lostmine3"/>
     <property name="place" value="south"/>
    </properties>
   </object>
-  <object height="64" name="east" type="mapchange" width="32" x="928" y="864">
+  <object id="3" name="east" type="mapchange" x="928" y="864" width="32" height="64">
    <properties>
     <property name="map" value="lostmine2a"/>
     <property name="place" value="west"/>
@@ -192,138 +221,138 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn">
-  <object height="64" name="mazarth2" type="spawn" width="32" x="224" y="768">
+  <object id="4" name="mazarth2" type="spawn" x="224" y="768" width="32" height="64">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="mazarth2"/>
    </properties>
   </object>
-  <object height="64" name="charwdg3" type="spawn" width="64" x="384" y="768">
+  <object id="5" name="charwdg3" type="spawn" x="384" y="768" width="64" height="64">
    <properties>
     <property name="spawngroup" value="charwdg3"/>
    </properties>
   </object>
-  <object height="160" name="ashs2" type="spawn" width="32" x="288" y="384">
+  <object id="6" name="ashs2" type="spawn" x="288" y="384" width="32" height="160">
    <properties>
     <property name="spawngroup" value="ashs2"/>
    </properties>
   </object>
-  <object height="96" name="ashs1" type="spawn" width="32" x="288" y="576">
+  <object id="7" name="ashs1" type="spawn" x="288" y="576" width="32" height="96">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="ashs1"/>
    </properties>
   </object>
-  <object height="64" name="charwdg2" type="spawn" width="32" x="288" y="704">
+  <object id="8" name="charwdg2" type="spawn" x="288" y="704" width="32" height="64">
    <properties>
     <property name="spawngroup" value="charwdg2"/>
    </properties>
   </object>
-  <object height="96" name="charwdg3_1" type="spawn" width="64" x="512" y="800">
+  <object id="9" name="charwdg3_1" type="spawn" x="512" y="800" width="64" height="96">
    <properties>
     <property name="spawngroup" value="charwdg3"/>
    </properties>
   </object>
-  <object height="64" name="charwdg2_1" type="spawn" width="64" x="608" y="768">
+  <object id="10" name="charwdg2_1" type="spawn" x="608" y="768" width="64" height="64">
    <properties>
     <property name="spawngroup" value="charwdg2"/>
    </properties>
   </object>
-  <object height="128" name="charwdg1" type="spawn" width="64" x="640" y="608">
+  <object id="11" name="charwdg1" type="spawn" x="640" y="608" width="64" height="128">
    <properties>
     <property name="spawngroup" value="charwdg1"/>
    </properties>
   </object>
-  <object height="416" name="ashs2_1" type="spawn" width="224" x="480" y="192">
+  <object id="12" name="ashs2_1" type="spawn" x="480" y="192" width="224" height="416">
    <properties>
     <property name="quantity" value="4"/>
     <property name="spawngroup" value="ashs2"/>
    </properties>
   </object>
-  <object height="32" name="charwdg3_2" type="spawn" width="160" x="736" y="608">
+  <object id="13" name="charwdg3_2" type="spawn" x="736" y="608" width="160" height="32">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="charwdg3"/>
    </properties>
   </object>
-  <object height="32" name="charwdg2_2" type="spawn" width="32" x="896" y="672">
+  <object id="14" name="charwdg2_2" type="spawn" x="896" y="672" width="32" height="32">
    <properties>
     <property name="spawngroup" value="charwdg2"/>
    </properties>
   </object>
-  <object height="96" name="charwdg3_3" type="spawn" width="32" x="896" y="736">
+  <object id="15" name="charwdg3_3" type="spawn" x="896" y="736" width="32" height="96">
    <properties>
     <property name="spawngroup" value="charwdg3"/>
    </properties>
   </object>
-  <object height="32" name="ashs1_1" type="spawn" width="192" x="704" y="448">
+  <object id="16" name="ashs1_1" type="spawn" x="704" y="448" width="192" height="32">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="ashs1"/>
    </properties>
   </object>
-  <object height="32" name="ashs2_2" type="spawn" width="160" x="320" y="352">
+  <object id="17" name="ashs2_2" type="spawn" x="320" y="352" width="160" height="32">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="ashs2"/>
    </properties>
   </object>
-  <object height="224" name="ashs1_2" type="spawn" width="32" x="352" y="416">
+  <object id="18" name="ashs1_2" type="spawn" x="352" y="416" width="32" height="224">
    <properties>
     <property name="spawngroup" value="ashs1"/>
    </properties>
   </object>
-  <object height="96" name="ashs1_3" type="spawn" width="128" x="160" y="352">
+  <object id="19" name="ashs1_3" type="spawn" x="160" y="352" width="128" height="96">
    <properties>
     <property name="spawngroup" value="ashs1"/>
    </properties>
   </object>
-  <object height="96" name="ash3" type="spawn" width="96" x="128" y="544">
+  <object id="20" name="ash3" type="spawn" x="128" y="544" width="96" height="96">
    <properties>
     <property name="spawngroup" value="ash3"/>
    </properties>
   </object>
-  <object height="32" name="ash1" type="spawn" width="32" x="192" y="480">
+  <object id="21" name="ash1" type="spawn" x="192" y="480" width="32" height="32">
    <properties>
     <property name="spawngroup" value="ash1"/>
    </properties>
   </object>
-  <object height="64" name="ashs2_3" type="spawn" width="64" x="64" y="352">
+  <object id="22" name="ashs2_3" type="spawn" x="64" y="352" width="64" height="64">
    <properties>
     <property name="spawngroup" value="ashs2"/>
    </properties>
   </object>
-  <object height="32" name="ashs1_4" type="spawn" width="64" x="32" y="192">
+  <object id="23" name="ashs1_4" type="spawn" x="32" y="192" width="64" height="32">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="ashs1"/>
    </properties>
   </object>
-  <object height="64" name="ashs2_4" type="spawn" width="160" x="192" y="160">
+  <object id="24" name="ashs2_4" type="spawn" x="192" y="160" width="160" height="64">
    <properties>
     <property name="spawngroup" value="ashs2"/>
    </properties>
   </object>
-  <object height="64" name="ashs2_5" type="spawn" width="64" x="384" y="128">
+  <object id="25" name="ashs2_5" type="spawn" x="384" y="128" width="64" height="64">
    <properties>
     <property name="spawngroup" value="ashs2"/>
    </properties>
   </object>
-  <object height="64" name="ash1_1" type="spawn" width="96" x="480" y="64">
+  <object id="26" name="ash1_1" type="spawn" x="480" y="64" width="96" height="64">
    <properties>
     <property name="spawngroup" value="ash1"/>
    </properties>
   </object>
-  <object height="32" name="ash1_2" type="spawn" width="32" x="640" y="96">
+  <object id="27" name="ash1_2" type="spawn" x="640" y="96" width="32" height="32">
    <properties>
     <property name="spawngroup" value="ash1"/>
    </properties>
   </object>
-  <object height="96" name="ash2" type="spawn" width="160" x="672" y="96">
+  <object id="28" name="ash2" type="spawn" x="672" y="96" width="160" height="96">
    <properties>
     <property name="spawngroup" value="ash2"/>
    </properties>
   </object>
  </objectgroup>
  <objectgroup name="Keys"/>
-</map>
\ No newline at end of file
+</map>
diff --git a/AndorsTrail/res/xml/lostmine3.tmx b/AndorsTrail/res/xml/lostmine3.tmx
index 90f173681..4f53f44c7 100644
--- a/AndorsTrail/res/xml/lostmine3.tmx
+++ b/AndorsTrail/res/xml/lostmine3.tmx
@@ -1,184 +1,218 @@
-<?xml version="1.0" ?><!DOCTYPE map  SYSTEM 'http://mapeditor.org/dtd/1.0/map.dtd'><map height="30" orientation="orthogonal" tileheight="32" tilewidth="32" version="1.0" width="19">
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- <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="19">
-  <data compression="zlib" encoding="base64">eJytlTsSwjAMRDPquH/LFZI09MZHMLkCB8EUHnY2+jlDsVXsh6XVik2WZTP0DGTdY+1dr0BlgvUO1LrWBKt2PW6xItb3TQew7vJThoU9xTfx2V18VqWeHhOsIud6sKfe7zKrgZ/8LeqHdn74GbGy/mos9Ix9qdRLj1XknA30xeJorEbZYF/4PtfANWI2vF5aM+75l+VsznmcBc8Pjcd5W5V76Gdm74yaB4vzNfzM7B1kafnS/LRYlVhXdxjOdZHr+5D3XwvmfDb/Wf2T5c2/tds1afPFc+VlAqXNl8XK1J5leW/jjGZYGi/6f/VYmH/r+weXKJ2c</data>
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" tiledversion="1.1.5" orientation="orthogonal" renderorder="right-down" width="19" height="30" tilewidth="32" tileheight="32" infinite="0" nextobjectid="16">
+ <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 name="Ground" width="19" height="30">
+  <data encoding="base64" compression="zlib">
+   eJytlTsSwjAMRDPquH/LFZI09MZHMLkCB8EUHnY2+jlDsVXsh6XVik2WZTP0DGTdY+1dr0BlgvUO1LrWBKt2PW6xItb3TQew7vJThoU9xTfx2V18VqWeHhOsIud6sKfe7zKrgZ/8LeqHdn74GbGy/mos9Ix9qdRLj1XknA30xeJorEbZYF/4PtfANWI2vF5aM+75l+VsznmcBc8Pjcd5W5V76Gdm74yaB4vzNfzM7B1kafnS/LRYlVhXdxjOdZHr+5D3XwvmfDb/Wf2T5c2/tds1afPFc+VlAqXNl8XK1J5leW/jjGZYGi/6f/VYmH/r+weXKJ2c
+  </data>
  </layer>
- <layer height="30" name="Objects" width="19">
-  <data compression="zlib" encoding="base64">eJy9VNtKAzEQjXloUaHubmXFyx/40H6Z/oGCfob0C+wn6FPxAtpCLfQiW6GCgg8KLVoRRJxDZtk0brK7Lx4I2WwyJzNzJiPE/2BeEuKztDhjTHldBKWyEOXy4oyxxOsiuPfVfB6q0dbGA41TWYzvxDjfoHWf7oiIa+Tn42iSzdBythYI0Qnd9ltkv89+3Pjq/jQMfMXlV9P3V4ljmcahVD7h7GNgvxf7aXfBFnk+8tSddY7Blo+JFqOZf/CPw0QvjLfwb971GAHcCVud75nsXhy2JmrM0aM4umT3XUn25rT+yqEL0NTuQ14GRh5k1a1xQPYbMuGBJrYYAuZKq2PYr8uk3usOHgC6ROzXU2WRsxWqOEZ0preZnVOcf2X9gJqjroqgIbPfB7C7JsRKDt1NLmi4x3bbPO/IRNsiXMABvzEAetxSHrpBdt/RuWA3NnpXm/WAZseemyvSuKAduGdkN/BUvYf8fodc9zbAj8jYB1fcyz6oZn5y6AyeOzr3zjWGNfyJ32vXS3pHi74vaO/SwjvW/NFzo79XM2+22o2MPdRaKJOeh74wYT+mnr3vAmm1AL4zLY443iy46h3+QLc43j59dxz1ZeNqGf9RW1lv3OUXYr0iP64zek4erjz4BaRhm/A=</data>
+ <layer name="Objects" width="19" height="30">
+  <data encoding="base64" compression="zlib">
+   eJy9VNtKAzEQjXloUaHubmXFyx/40H6Z/oGCfob0C+wn6FPxAtpCLfQiW6GCgg8KLVoRRJxDZtk0brK7Lx4I2WwyJzNzJiPE/2BeEuKztDhjTHldBKWyEOXy4oyxxOsiuPfVfB6q0dbGA41TWYzvxDjfoHWf7oiIa+Tn42iSzdBythYI0Qnd9ltkv89+3Pjq/jQMfMXlV9P3V4ljmcahVD7h7GNgvxf7aXfBFnk+8tSddY7Blo+JFqOZf/CPw0QvjLfwb971GAHcCVud75nsXhy2JmrM0aM4umT3XUn25rT+yqEL0NTuQ14GKXlwaRyQ/YZMeKCJLYagqrjS6hj26zKp97qDB4AuEfv1VFnkbIUqjhGd6W1m5xTnX1k/oOaoqyJoyOz3AeyuCbGSQ3eTCxrusd02zzsy0bYIF3DAbwyAHreUh26Q3Xd0LtiNjd7VZj2g2bHn5oo0LmgH7hnZDTxV7yG/3yHXvQ3wIzL2wRX3sg+qmZ8cOoPnjs69c41hDX/i99r1kt7Rou8L2ru08I41f/Tc6O/VzJutdiNjD7UWyqTnoS9M2I+pZ++7QFotgO9MiyOONwuueoc/0C2Ot0/fHUd92bhaxn/UVtYbd/mFWK/Ij+uMnpOHKw9+ATSQm9s=
+  </data>
  </layer>
- <layer height="30" name="Above" width="19">
-  <data compression="zlib" encoding="base64">eJxjYKAPuCzGwCDJBGFLQWlOKC3NRJpZh4FmcSHpAZkDMluGRHNgZlEDgPx3iUpm4XPTZagcozB+eRjA5yZC9pDiH3xmkRrGg9EsQuFByCzkeCEUrkMxXuaSmPdIVU9tgJ5PiFWHTR+x8YEcfpSWF8hmUVKGobsD3ayLJIQTun9w+W+zAAPDViEGhm1C2OWJ8Q+yu/C5kZSweSiAX36g3EUI4DLrMpFuIcYsWH7dDoyzHTjijVizyAGUmgUAT787Yw==</data>
+ <layer name="Above" width="19" height="30">
+  <data encoding="base64" compression="zlib">
+   eJzNlE0KwjAQhcfsdFUqCP5c3VNIbfeeQHMCb2KDCQyhmZlngvo2KUzy9c0bEqLvyO+I9u79fYjrOq5Hh7FuM2vDzgROYJ9ATmK1UOjv0YglefKxttrK9STJk/YfpB+JhWb8jywtD43F56Ll6gqztfhAfLXM8gzePXR/a+X3xLpv6Zx1Hjy/2veCs2resNxHzroDOeX9lPq7dERDT3Ttl+uWfrgvySOSzbOT67/ypanE8kYvFla6r+M8s6kwNyvrE9WyXjs2Op8=
+  </data>
  </layer>
- <layer height="30" name="Walkable" width="19">
-  <data compression="zlib" encoding="base64">eJzlkkEKwCAMBH1F//8Ff9hToUi62TGBHhQE0ThOYuY1xjx4ZoOy1BudLMLr8lLxmdez7/irGPpPKq6S/3p3l6Xcqn/isNw6OrEkf/o25Z7GygZlRVwnh6+7XV4rn/ZYxSk6i+rzXu/0QodX5OLWy/X6s9/pvAHqdE2L</data>
+ <layer name="Top" width="19" height="30">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgFo2AUDCZwWGygXTAKRsEoGAXDBwAAjUIA2g==
+  </data>
+ </layer>
+ <layer name="Walkable" width="19" height="30">
+  <data encoding="base64" compression="zlib">
+   eJzlkkEKgDAMBPsK//+F/tCTIGVNdtKAhxYKotvpJGZeY8yDd7YoK7qjk0V4XV5RPvN63jv+UYb+pyi3U/96tspSboTlZKv9oVlSP72bck9jZYuyFNep4etsl9fKpzO246S+qf68nyuz0OGlXNx+uV5/zjvdN8YCTMQ=
+  </data>
  </layer>
  <objectgroup name="Mapevents">
-  <object height="32" name="south" type="mapchange" width="32" x="96" y="928">
+  <object id="1" name="south" type="mapchange" x="96" y="928" width="32" height="32">
    <properties>
     <property name="map" value="lostmine2"/>
     <property name="place" value="north"/>
    </properties>
   </object>
-  <object height="32" name="down lostmine3" type="mapchange" width="32" x="288" y="416">
+  <object id="2" name="down lostmine3" type="mapchange" x="288" y="416" width="32" height="32">
    <properties>
     <property name="map" value="lostmine4"/>
     <property name="place" value="up lostmine4"/>
@@ -186,72 +220,72 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn">
-  <object height="128" name="ash1" type="spawn" width="32" x="96" y="768">
+  <object id="3" name="ash1" type="spawn" x="96" y="768" width="32" height="128">
    <properties>
     <property name="spawngroup" value="ash1"/>
    </properties>
   </object>
-  <object height="64" name="ash3" type="spawn" width="96" x="128" y="704">
+  <object id="4" name="ash3" type="spawn" x="128" y="704" width="96" height="64">
    <properties>
     <property name="spawngroup" value="ash3"/>
    </properties>
   </object>
-  <object height="288" name="ash1_1" type="spawn" width="288" x="256" y="608">
+  <object id="5" name="ash1_1" type="spawn" x="256" y="608" width="288" height="288">
    <properties>
     <property name="quantity" value="4"/>
     <property name="spawngroup" value="ash1"/>
    </properties>
   </object>
-  <object height="192" name="ash1_2" type="spawn" width="32" x="160" y="512">
+  <object id="6" name="ash1_2" type="spawn" x="160" y="512" width="32" height="192">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="ash1"/>
    </properties>
   </object>
-  <object height="64" name="ashs2" type="spawn" width="160" x="32" y="448">
+  <object id="7" name="ashs2" type="spawn" x="32" y="448" width="160" height="64">
    <properties>
     <property name="spawngroup" value="ashs2"/>
    </properties>
   </object>
-  <object height="32" name="ash1_3" type="spawn" width="32" x="64" y="416">
+  <object id="8" name="ash1_3" type="spawn" x="64" y="416" width="32" height="32">
    <properties>
     <property name="spawngroup" value="ash1"/>
    </properties>
   </object>
-  <object height="160" name="ash1_4" type="spawn" width="64" x="32" y="256">
+  <object id="9" name="ash1_4" type="spawn" x="32" y="256" width="64" height="160">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="ash1"/>
    </properties>
   </object>
-  <object height="32" name="ash3_1" type="spawn" width="32" x="96" y="288">
+  <object id="10" name="ash3_1" type="spawn" x="96" y="288" width="32" height="32">
    <properties>
     <property name="spawngroup" value="ash3"/>
    </properties>
   </object>
-  <object height="96" name="ash1_5" type="spawn" width="128" x="128" y="224">
+  <object id="11" name="ash1_5" type="spawn" x="128" y="224" width="128" height="96">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="ash1"/>
    </properties>
   </object>
-  <object height="64" name="ash1_6" type="spawn" width="64" x="224" y="96">
+  <object id="12" name="ash1_6" type="spawn" x="224" y="96" width="64" height="64">
    <properties>
     <property name="spawngroup" value="ash1"/>
    </properties>
   </object>
-  <object height="32" name="ash1_7" type="spawn" width="128" x="288" y="96">
+  <object id="13" name="ash1_7" type="spawn" x="288" y="96" width="128" height="32">
    <properties>
     <property name="spawngroup" value="ash1"/>
    </properties>
   </object>
-  <object height="288" name="ash1_8" type="spawn" width="160" x="416" y="96">
+  <object id="14" name="ash1_8" type="spawn" x="416" y="96" width="160" height="288">
    <properties>
     <property name="quantity" value="3"/>
     <property name="spawngroup" value="ash1"/>
    </properties>
   </object>
-  <object height="32" name="ash2" type="spawn" width="64" x="384" y="384">
+  <object id="15" name="ash2" type="spawn" x="384" y="384" width="64" height="32">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="ash2"/>
@@ -259,4 +293,4 @@
   </object>
  </objectgroup>
  <objectgroup name="Keys"/>
-</map>
\ No newline at end of file
+</map>
diff --git a/AndorsTrail/res/xml/pwcave2.tmx b/AndorsTrail/res/xml/pwcave2.tmx
index 0771b72d1..3e153d2e4 100644
--- a/AndorsTrail/res/xml/pwcave2.tmx
+++ b/AndorsTrail/res/xml/pwcave2.tmx
@@ -1,190 +1,219 @@
-<?xml version="1.0" ?><!DOCTYPE map  SYSTEM 'http://mapeditor.org/dtd/1.0/map.dtd'><map height="30" orientation="orthogonal" tileheight="32" tilewidth="32" version="1.0" width="30">
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- <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">eJy1lksOwjAMRFF23JszcIVQtqxCuUEoZ4JKtRgZ/+KKhaUIkj4n8XhyKYfDRYl7IrxvaCyaO3/imYjGOPT7eQuNSbwlye1CHtXZ5wy82zEfPI9mMKeNuYenhcWe/sT02BbXupuRvCW2ti7CpNqoMLbY1eFa9YDapHpsMLb27XGtekB9E6cHa7NC3trZaHeC+h6tMeJSL9lzJ1o0Nl/rWRofuVbdaDlbPTJSY5n+4vVJaz89ccZRXWCP1nIeOWNem5oPWtojbraHk09xvqd3zC/DXQN9MlIrkfsf5Vu1ci6/fSPSByOhcSvkROxRpnUvUa7W0yTtX4usWb5Oui/UDdef9kajPv8QuIswXzq7BowurJG8kLzpVX7flZQ/7sPzwLl8+yz/DnohehN/Vy7l65O4D03r67dP21zuuV3gcb1wr+TeZrHx/LKeK9WOx97LyXKjgbUkvb8sLurEC67bzv6jMdfLyn0DcDiHpw==</data>
+<?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="18">
+ <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 name="Ground" width="30" height="30">
+  <data encoding="base64" compression="zlib">
+   eJy1lksOwjAMRFF23JszcIVQtqxCuUEoZ4JKtRgZ/+KKhaWqTfOcxOPJpRwOFyXuifDm0Fg0dv7EMxGNcej9eQuNSbzFmf92lN93IY/qrHMG3jpvNngezWBOG3MPTwuLPf2J6bEtrnU2I3lLbO2/CJNqo8Kzxa4O16oH1CbVY4Nna90e16oH1DdxerA2K+St7Y12Jqjv0RojLvWSPWeiRWPjtZ6l8ZFr1Y2Ws9UjIzWW6S9en7TW0xN7HNUF9mgt55E95rWp+aClPeJmezj5FOd7esf8Mtw10CcjtRI5/1G+VSvn8ts3In0wEhq3Qk7EHmVa5xLlaj1N0v61yJrl/0nnhbrh+tPuaNTnHwJ3EcZLe9eA0YV/JC8kb3qV33sl5Y/r8DxwLt8+y+dBL0Rv4vfKpXx9EtehaX2d+7SN5Z7bBR7XC/dK7m0WG/cv67lS7XjsvZwsNxpYS9L9y+KiTrzguu3sGz1zvazcN4fSh5U=
+  </data>
  </layer>
- <layer height="30" name="Objects" width="30">
-  <data compression="zlib" encoding="base64">eJy9V0tOAkEQxSFjYEOUBQmJG4+giZ8boGfxGERvMMGtC7yAbozuhjWJC8ENQTeuPYJdGV4oHtU9jRN4yWSgu6pfdfWr7p5aLQ6fh5GGO0Q9Kd4frWXbd7t4D1xflvh9Ycf+giPDb7ofF9NbgNPC3NmPVW6nEXmeOJuh80sU15h4fes1X9h1lX1T/X5yeXlu16LxFTHfucdG1ueu5BmQr87P0DNuSKshTQDQRmbEgD4fN9tZnFVqSTRfxr0NQBcW9yZ6AaTmflqr2pgbmszd2KN2wc8YUVtMXi7TJc8sWddmRuudG7x5p3iHtIj1x/hXjvfaPe/O9yENx+jTqN7bNKx57y2ebeA3oF/pOo4YY2jUFGDVh9aYaCHz6ObmwOZjjlhojbEWLhbrCfTSom1S8azEfKyYZe1PiFc4pa1H7QByzeecxanBOtS6kzmepus58HHHcvb/ubehFqFNnG/Mb9W7gGuK0Qz0855RFRIj5sNnpPDc092Gzyhdn+cNt0bu6bu6OGv4zyWdF90eOquk7zVZjdGCb7+ocg5aXGVrIP0vZNM1fDoV1rK+oe8t2T8myzsV6lXH2Kc851R7MxpPxsed1Jor3wfhj7ulxMNjAsg3NDWjuAEZG+NonYX2ZOyhPm6G2IGn7E6q9YrvBPyXfFlxQauc71DszGNhF99VvvvEwLj//AEi7pGq</data>
+ <layer name="Objects" width="30" height="30">
+  <data encoding="base64" compression="zlib">
+   eJy9V0tOAkEQxSGTwIYoCxISNx5BEz83QM/iMYjeYIJbF3gB3BjdDWsSF6IbMrpx7RHsyvBC+ajuaZzASyYD3VX9qqtfdfc0GnH4OIg03CGaSfl+66zavrrle+T6ssTvCzv2FxwafpN2XEwvAU4LhbOfqdy+R+R57mzGzi9RXDPi9a1XsbTrK/u2+j1xeXnsNqLxGTHfwmMj63Nb8YzIV+dn7Bk3pNWQJgBoIzNiQJ+Pm+0szjq1JJqv4t4GoAuLexO9AFJz352/2igMTeZu7Gm35GdMqS0mLxfpimeRrGszo/XODd68V75DWsT6Y/xLx3vlnlfne5+GY/RpVO9tGta895bPNvAT0K90HUWMMTZqCrDqQ2tMtJB5dHO9b/MxRyy0xlgL58v1BAZp2TaveVZiPlbMsvbHxCuc0jagdgC55nPO4tRgHWrdyRxP0vUc+LhjOYf/3NtQi9Amzjfmt+pdwDXFaAf6ec+oC4kR8+EzUnju6G7DZ5Suz7OWWyP3DF1dnLb855LOi24PnVXS95z8jdGCb7+ocw5aXFVrIP1PZNM3fHo11rK5oe8N2T8kqzsV6lXHOKQ851R7CxpPxsed1Jor3wfhj7ulxMNjAsg3NLWguAEZG+NonYX2ZOyhPm6G2IGn6k6q9YrvBPyXfFlxQauc71DszGNhF99VvvvEyLj//AJ45ZGJ
+  </data>
  </layer>
- <layer height="30" name="Above" width="30">
-  <data compression="zlib" encoding="base64">eJzNlk0KAjEMhYvggFsXrryIBxFP4M+NPIjeYJau1As5AQux03T62mTqg8JQmHxN+0ji3P+p34z3Lp1z++86dDa8GJd0GnjHYZ0VucTyvJfA1ZZnzsXj3LmZnttCmtw3EKuGy//l3gx1W9dzQxb/lnzSV3J5TrvlLwf15nWBcZH490ieJbLyfsqPKd/UKhXXqr5M5WORa06NlrjPwvO06AsoE6mDU9xcpqafc+Nov0Uul2qa5vu36r0aOZScvcaffP7cAr2FlNuLYjlpz5/SbLAKzojwHkI/5Pcdmw2sahnS+xHRPWnVOJTL7+oDdHZO6g==</data>
+ <layer name="Above" width="30" height="30">
+  <data encoding="base64" compression="zlib">
+   eJzNlk0KAjEMhYvggFsXrryIBxFP4M+NPIjeYJau1As5AQux03T62mTqg8JQmHxN+0ji3P+p34z3Lp1z++86dDa8GJd0GnjHYZ0VucTyvJfA1ZZnzsXj3LmZnttCmtw3EKuGy//l3gx1W9dzQxb/lnzSV3J5TrvlLwf15nWBcZH490ieJbLyfsqPKd/UKhXXqr5M5WORa06NlrjPwvO06AsoE6mDU9xcpqafc+Nov0Uul2qa5vu36r0aOZScvcaffP7cAr2FlNuLYjlpz5/SbLAKzojwHkI/5Pcdmw2sahnS+xHRPWnVOJTL7+oDdHZO6g==
+  </data>
  </layer>
- <layer height="30" name="Walkable" width="30">
-  <data compression="zlib" encoding="base64">eJztk1EOgDAIQ3cK73+F3dD4uxjbQjs/lIQvgVfKnMcY80+YV6TnK5FiqXo6zK7eJBPNctU6d0hy39pXqVc5TzOcXq9zHZ6hXjbc90lx0U2USHGRlpTPyAcXU92XYbP11aj8OyqX8Z7Rxb45RuvdtwSze1d3fo2L7p7ur/QqUeVWZq69Xf1VL3e+nZV7AgQW5SA=</data>
+ <layer name="Walkable" width="30" height="30" visible="0">
+  <data encoding="base64" compression="zlib">
+   eJztk1EOgDAIQ3cK73+F3dD4uxjbQjs/lIQvgVfKnMcY80+YV6TnK5FiqXo6zK7eJBPNctU6d0hy39pXqVc5TzOcXq9zHZ6hXjbc90lx0U2USHGRlpTPyAcXU92XYbP11aj8OyqX8Z7Rxb45RuvdtwSze1d3fo2L7p7ur/QqUeVWZq69Xf1VL3e+nZV7AgQW5SA=
+  </data>
  </layer>
  <objectgroup name="Mapevents" visible="0">
-  <object height="32" name="south" type="mapchange" width="64" x="864" y="928">
+  <object id="1" name="south" type="mapchange" x="864" y="928" width="64" height="32">
    <properties>
     <property name="map" value="pwcave1"/>
     <property name="place" value="north"/>
    </properties>
   </object>
-  <object height="32" name="north" type="mapchange" width="32" x="448" y="64">
+  <object id="2" name="north" type="mapchange" x="448" y="64" width="32" height="32">
    <properties>
     <property name="map" value="pwcave2a"/>
     <property name="place" value="south"/>
    </properties>
   </object>
-  <object height="64" name="east" type="mapchange" width="32" x="928" y="608">
+  <object id="3" name="east" type="mapchange" x="928" y="608" width="32" height="64">
    <properties>
     <property name="map" value="pwcave3"/>
     <property name="place" value="west"/>
@@ -192,79 +221,79 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn" visible="0">
-  <object height="32" name="iqhan_2" type="spawn" width="64" x="768" y="832">
+  <object id="4" name="iqhan_2" type="spawn" x="768" y="832" width="64" height="32">
    <properties>
     <property name="spawngroup" value="iqhan_2"/>
    </properties>
   </object>
-  <object height="32" name="iqhan_3" type="spawn" width="64" x="704" y="832">
+  <object id="5" name="iqhan_3" type="spawn" x="704" y="832" width="64" height="32">
    <properties>
     <property name="spawngroup" value="iqhan_3"/>
    </properties>
   </object>
-  <object height="32" name="iqhan_3_1" type="spawn" width="64" x="480" y="864">
+  <object id="6" name="iqhan_3_1" type="spawn" x="480" y="864" width="64" height="32">
    <properties>
     <property name="spawngroup" value="iqhan_3"/>
    </properties>
   </object>
-  <object height="32" name="iqhan_2_1" type="spawn" width="128" x="256" y="896">
+  <object id="7" name="iqhan_2_1" type="spawn" x="256" y="896" width="128" height="32">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="iqhan_2"/>
    </properties>
   </object>
-  <object height="64" name="iqhan_3_2" type="spawn" width="32" x="192" y="864">
+  <object id="8" name="iqhan_3_2" type="spawn" x="192" y="864" width="32" height="64">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="iqhan_3"/>
    </properties>
   </object>
-  <object height="160" name="iqhan_3_3" type="spawn" width="128" x="64" y="704">
+  <object id="9" name="iqhan_3_3" type="spawn" x="64" y="704" width="128" height="160">
    <properties>
     <property name="spawngroup" value="iqhan_3"/>
    </properties>
   </object>
-  <object height="32" name="iqhan_3_4" type="spawn" width="96" x="96" y="640">
+  <object id="10" name="iqhan_3_4" type="spawn" x="96" y="640" width="96" height="32">
    <properties>
     <property name="quantity" value="3"/>
     <property name="spawngroup" value="iqhan_3"/>
    </properties>
   </object>
-  <object height="128" name="iqhan_2_2" type="spawn" width="224" x="96" y="512">
+  <object id="11" name="iqhan_2_2" type="spawn" x="96" y="512" width="224" height="128">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="iqhan_2"/>
    </properties>
   </object>
-  <object height="288" name="iqhan_3_5" type="spawn" width="224" x="96" y="192">
+  <object id="12" name="iqhan_3_5" type="spawn" x="96" y="192" width="224" height="288">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="iqhan_3"/>
    </properties>
   </object>
-  <object height="32" name="iqhan_4" type="spawn" width="32" x="384" y="96">
+  <object id="13" name="iqhan_4" type="spawn" x="384" y="96" width="32" height="32">
    <properties>
     <property name="spawngroup" value="iqhan_4"/>
    </properties>
   </object>
-  <object height="64" name="iqhan_4_1" type="spawn" width="32" x="512" y="96">
+  <object id="14" name="iqhan_4_1" type="spawn" x="512" y="96" width="32" height="64">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="iqhan_4"/>
    </properties>
   </object>
-  <object height="224" name="iqhan_3_6" type="spawn" width="288" x="608" y="128">
+  <object id="15" name="iqhan_3_6" type="spawn" x="608" y="128" width="288" height="224">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="iqhan_3"/>
    </properties>
   </object>
-  <object height="352" name="iqhan_ch_1" type="spawn" width="480" x="416" y="352">
+  <object id="16" name="iqhan_ch_1" type="spawn" x="416" y="352" width="480" height="352">
    <properties>
     <property name="spawngroup" value="iqhan_ch_1"/>
    </properties>
   </object>
-  <object height="320" name="iqhan_4_2" type="spawn" width="416" x="448" y="320">
+  <object id="17" name="iqhan_4_2" type="spawn" x="448" y="320" width="416" height="320">
    <properties>
     <property name="quantity" value="4"/>
     <property name="spawngroup" value="iqhan_4"/>
@@ -272,4 +301,4 @@
   </object>
  </objectgroup>
  <objectgroup name="Keys"/>
-</map>
\ No newline at end of file
+</map>
diff --git a/AndorsTrail/res/xml/road1.tmx b/AndorsTrail/res/xml/road1.tmx
index 35204d677..fb29ccd18 100644
--- a/AndorsTrail/res/xml/road1.tmx
+++ b/AndorsTrail/res/xml/road1.tmx
@@ -191,10 +191,10 @@
  </layer>
  <layer name="Objects" width="25" height="25">
   <data encoding="base64" compression="zlib">
-   eJyNVb1Ow0AMtioVdUIk0EiV4BEYgQkeBmZ2FjaQeAB4FdIdFCidClX6k4mlIqVdQEJMiHMb93yur40li7vj/H3+bF8K4FovAHiK7H5s1rnxScOeTRtQ2nx3fwxmxnieizXy8Ji/7XI8Mr8kmK81Le+hG7u5U44jDVyeYcHh00I5POwCPO6ux8d7EOr/SyJdy011vn8zsd0SHHhP9oT2rcjVgvpIy5XhuTZ+a/y8AvBSB/jesNq4xtOqWyeuAS33zBjZnYm/rNg98qE2TaPse8xwfH3pmtw77Bzz2t9b1kk2Cty5jCO779RdLciRGr8X3o7sPJCdbQFcVJfvojfZeuDpPb7V4xrASQmf6QxszbR3KetFPG2RN8UPxfmXZ3Z5DPZe4/koHPlGgR8nNxifDXc/ZvuUxUoeyUczR7lNBC7nGXtyShQ9q7iIj3LOBI+miev5LXydLswLnbAkZo/p4fXGt4AzzflWcSEmxb+GtiarLGZ1l9p8daQ6ZUptSBuf05bAma7hyj34vl7QnCXit7EvvhWcC2vO+03Y/QLLN2NxEctx+TdmEFku3m85V9y4Luwf9QTfZ8owZxrFrCzqHOp6eh4dTZGvZlQD3g/eF222+FmsYGcCi3Nlnnpp80a5LWol7mg5c9y+8h7p74H5Rh8WflSbc9CZnEEZ+w939yQl
+   eJyNVb1Ow0AMtioVdUIk0EiV4BEYgQkeBmZ2FjaQeAB4FdIdFCidClX6k4mlIqVdQEJMiHMb93yur40li9xx/j5/tu8K4FovAHiK7HpsvnPjk4bdmzagtPnO/hjMjPE8F9/Iw2P+tsvxyPySYP6taXkP3djNnXIcaeDyDAsOnxbK4WEX4HF3PT6eg1D/XxLpWm6q8/Wbie2W4MBzsie0bkWuFtRHWq4Mz7XxW+PnFYCXOsD3htXGNZ5W3TpxDWi5Z8bI7kz8ZcWukQ+1aRpl32OG4+tL1+TeYfuY1/7esk6yUeDOZRzZdafuakGO1Pi98HZk54HsbAvgorp8Fr3Jvgee3vcEHtpxDeBE8ZnOwNZMu5eyXsTTFjwUPxT7X57Z5THYe43no3DkGym6yHKD8dlw12O2Tlms5JF8NHOU20Tgcp6xJ6dE0bOKi/go50zwaJq4nt/C1+nCvNAJS2Ly2eH1xruAM835VnEhJsW/hrYmqyxmdZfafHWkOmVKbUgbn9OWwJmu4co9+L5e0Jwl4rexL94KzoU15/0m7H6B5ZuxuIjluPyNGUSWi/dbzhU3rgv7Rz3B+5kyzJlGMSuLOoe6Hu1dQmuKfDWjGvB+8L5os8X3YgU7E1icK/PUS5s3ym1RK3FGy5nj9pX7SH8PzBt9WPhRbc5Be3IGZew/6e4jDQ==
   </data>
  </layer>
- <layer name="Above" width="25" height="25" visible="0">
+ <layer 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=
   </data>
@@ -206,7 +206,7 @@
  </layer>
  <layer name="Walkable" width="25" height="25">
   <data encoding="base64" compression="zlib">
-   eJzdlNENACEIQ53C/VdgQx1AoJRqLteED3OhT6qnzTFsVyabmvoKp8tC9Ze8XpzHiRWxT99YZX7ZmmWqPCr5M3c46kfy78wazXM7wxtSnw/LUUjxn1cZXl6eF8Lp3C+0x3u7UHXmYLxQBjtPlaHab8TIepA9KqrivwCLg9Kq
+   eJzdlN0NACEIg53C/Vdgw3MAfgqtl8s14cEY+gmitteyE5Vsa+IrHJaF6i/9euM+PFbG9vamqvyq9ZTJekSeWV8mM5zlI/1nas3qUd4DO7cMz9u/zVFI8c67jKhfkRfCYeYLzYn+LlRMHRMvlDGtp8tQnTdjVDnIGRXR8X8A6PbPjg==
   </data>
  </layer>
  <layer name="Walkable_replace" width="25" height="25" visible="0">
diff --git a/AndorsTrail/res/xml/snakecave3.tmx b/AndorsTrail/res/xml/snakecave3.tmx
index c9e7d0969..0299433bc 100644
--- a/AndorsTrail/res/xml/snakecave3.tmx
+++ b/AndorsTrail/res/xml/snakecave3.tmx
@@ -1,225 +1,266 @@
-<?xml version="1.0" ?><!DOCTYPE map  SYSTEM 'http://mapeditor.org/dtd/1.0/map.dtd'><map height="30" orientation="orthogonal" tileheight="32" tilewidth="32" version="1.0" width="15">
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- <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="15">
-  <data compression="zlib" encoding="base64">eJyVlTESwyAMBD10/n/LF4Qb946f4OQLzj8CMzCjuZyEXGwRibOPQ8ElLctZeSuOyovUdb9Utsqnciuuvgbrui9du6//3EZ94GlnSPcdWZsT18700rNr5E5RnI5+IxkPRtZeJphx5J2sj+eLuWT1XOxb5ysP94IeI3tBbTQ/1GqvhfjB3LQWzw39CnjRWn1uzC/uj/22/Ap4eaJFL7hOJntlc2XlYc0lm6sjkK/137+MNWy+vGysjKJa7z6b3Tnec7359eYaZ78kfo+hJ91n3wxG02GNfTMYTYu17xpjJ7UfWYJQBA==</data>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
+<map version="1.0" orientation="orthogonal" width="15" height="30" tilewidth="32" tileheight="32">
+ <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="15" height="30">
+  <data encoding="base64" compression="zlib">
+   eJyVlTESwyAMBD10/n/LF4Qb946f4OQLzj8CMzCjuZyEXGwRibOPQ8ElLctZeSuOyovUdb9Utsqnciuuvgbrui9du6//3EZ94GlnSPcdWZsT18700rNr5E5RnI5+IxkPRtZeJphx5J2sj+eLuWT1XOxb5ysP94IeI3tBbTQ/1GqvhfjB3LQWzw39CnjRWn1uzC/uj/22/Ap4eaJFL7hOJntlc2XlYc0lm6sjkK/137+MNWy+vGysjKJa7z6b3Tnec7359eYaZ78kfo+hJ91n3wxG02GNfTMYTYu17xpjJ7UfWYJQBA==
+  </data>
  </layer>
- <layer height="30" name="Objects" width="15">
-  <data compression="zlib" encoding="base64">eJxjYKAciDNBaC4m7HJCTKjqYGANkL+IFcFfzQQRA+EPghCxR0IQWkUQIk8O2CmGas9hMfzqZ0PtmYvDPmTxHKC5FwmYhwucFsS0kxIACn/0MIaBNVjEsdmJHsbI+gi5ETmMcdmJTx5b/GKzk5C5uPTBACxtgdSgx/EHQUz16HaSGlfo4UIpwOZ/fPGGDHD5DxdA9ysy/5MQcWYQE18ggBwvpABC5iOHDXrexxY3xJhHSXrABgjZie5ufHaSKkdqmkB3EzX8P9AAAE/vLbY=</data>
+ <layer name="Objects" width="15" height="30">
+  <data encoding="base64" compression="zlib">
+   eJxjYKAciDNBaC4m7HJCTKjqYGANkL+IFcFfzQQRA+EPghCxR0IQWkUQIk8O2CmGas9hMfzqZ0PtmYvDPmTxHKC5FwmYhwucFsS0kxIACn/0MIaBNVjEsdmJHsbI+gi5ETmMcdmJTx5b/GKzk5C5uPTBACxtgdSgx/EHQUz16HaSGlfo4UIpwOZ/fPGGDHD5DxdA9ysy/5MQcWYQE18ggBwvpABC5iOHDXrexxY3xJhHSXrABgjZie5ufHaSKkdqmkB3EzX8P9AAAE/vLbY=
+  </data>
  </layer>
- <layer height="30" name="Above" width="15">
-  <data compression="zlib" encoding="base64">eJxjYICAy2IMWAEucWT5SzjU4BKHgcME5Gmldy4T+XqpAfCFKSE5fGGKL0wIhRcueUJ24pPHZ+dg9As+vfjMJEcvuluIUYNLLTa9xLqFWL3Y3EKsXmLEiPUrNjFSwg497xNrJ7K5+ORolabxlVkjtRylJgAA/G46rw==</data>
+ <layer name="Above" width="15" height="30">
+  <data encoding="base64" compression="zlib">
+   eJxjYICAy2IMWAEucWT5SzjU4BKHgcME5Gmldy4T+XqpAfCFKSE5fGGKL0wIhRcueUJ24pPHZ+dg9As+vfjMJEcvuluIUYNLLTa9xLqFWL3Y3EKsXmLEiPUrNjFSwg497xNrJ7K5+ORolabxlVkjtRylJgAA/G46rw==
+  </data>
  </layer>
- <layer height="30" name="Walkable" visible="0" width="15">
-  <data compression="zlib" encoding="base64">eJzNk8sJACAMQ53C/VdwQ09epM2nKFrowZRH0oKjtzYe96pIi2bRnJXDs2y7jnzYvg6X5a6yyp5KxhOsk4fdwfVz2V27yaL7VFj2Vj0zTWWR703NzYL2YBybOazyVzKO3YKxqCvMj+wEb1zp/A==</data>
+ <layer name="Walkable" width="15" height="30" visible="0">
+  <data encoding="base64" compression="zlib">
+   eJzNk8sJACAMQ53C/VdwQ09epM2nKFrowZRH0oKjtzYe96pIi2bRnJXDs2y7jnzYvg6X5a6yyp5KxhOsk4fdwfVz2V27yaL7VFj2Vj0zTWWR703NzYL2YBybOazyVzKO3YKxqCvMj+wEb1zp/A==
+  </data>
  </layer>
  <objectgroup name="Mapevents">
-  <object height="32" name="south" type="mapchange" width="32" x="320" y="928">
+  <object name="south" type="mapchange" x="320" y="928" width="32" height="32">
    <properties>
     <property name="map" value="snakecave2"/>
     <property name="place" value="north"/>
    </properties>
   </object>
-  <object height="32" name="sign_snakecave3_grave" type="sign" width="32" x="384" y="96"/>
+  <object name="sign_snakecave3_grave" type="sign" x="384" y="96" width="32" height="32"/>
+  <object name="ewmondold_snake_master_defeted_script_10" type="script" x="96" y="64" width="192" height="192">
+   <properties>
+    <property name="when" value="step"/>
+   </properties>
+  </object>
  </objectgroup>
- <objectgroup name="Spawn" visible="0">
-  <object height="224" name="cavesnake2" type="spawn" width="160" x="288" y="640">
+ <objectgroup name="Spawn">
+  <object name="cavesnake2" type="spawn" x="288" y="640" width="160" height="224">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="cavesnake2"/>
    </properties>
   </object>
-  <object height="224" name="cavesnake2_boss" type="spawn" width="96" x="352" y="416">
+  <object name="cavesnake2_boss" type="spawn" x="352" y="416" width="96" height="224">
    <properties>
     <property name="spawngroup" value="cavesnake2_boss"/>
    </properties>
   </object>
-  <object height="128" name="cavesnake3" type="spawn" width="160" x="288" y="256">
+  <object name="cavesnake3" type="spawn" x="288" y="256" width="160" height="128">
    <properties>
     <property name="spawngroup" value="cavesnake3"/>
    </properties>
   </object>
-  <object height="320" name="cavesnake3_1" type="spawn" width="160" x="160" y="416">
+  <object name="cavesnake3_1" type="spawn" x="160" y="416" width="160" height="320">
    <properties>
     <property name="quantity" value="3"/>
     <property name="spawngroup" value="cavesnake3"/>
    </properties>
   </object>
-  <object height="448" name="cavesnake3_2" type="spawn" width="128" x="32" y="384">
+  <object name="cavesnake3_2" type="spawn" x="32" y="384" width="128" height="448">
    <properties>
     <property name="quantity" value="3"/>
     <property name="spawngroup" value="cavesnake3"/>
    </properties>
   </object>
-  <object height="128" name="cavesnake3_boss" type="spawn" width="416" x="32" y="64">
+  <object name="cavesnake3_boss" type="spawn" x="32" y="64" width="416" height="128">
    <properties>
     <property name="spawngroup" value="cavesnake3_boss"/>
    </properties>
   </object>
-  <object height="192" name="cavesnake3_3" type="spawn" width="192" x="96" y="96">
+  <object name="cavesnake3_3" type="spawn" x="96" y="96" width="192" height="192">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="cavesnake3"/>
    </properties>
   </object>
+  <object name="cavesnake_master_ewmondold" type="spawn" x="128" y="96" width="128" height="96">
+   <properties>
+    <property name="active" value="false"/>
+    <property name="spawngroup" value="ewmondold_snake_master"/>
+   </properties>
+  </object>
  </objectgroup>
  <objectgroup name="Keys"/>
-</map>
\ No newline at end of file
+</map>
diff --git a/AndorsTrail/res/xml/waterway12.tmx b/AndorsTrail/res/xml/waterway12.tmx
index d089c8e8f..b5ad4fd49 100644
--- a/AndorsTrail/res/xml/waterway12.tmx
+++ b/AndorsTrail/res/xml/waterway12.tmx
@@ -1,263 +1,269 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.2" tiledversion="1.2.2" orientation="orthogonal" renderorder="right-down" width="30" height="30" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="10">
+<!DOCTYPE map SYSTEM "http://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 id="1" name="Ground" width="30" height="30">
+ <layer name="Ground" width="30" height="30">
   <data encoding="base64" compression="zlib">
    eJztlTEOgzAMRVE27r9yhYIiDkDHrnCGHgQqFGFZteOf4nTJ8AakyM/fIUnsuy4KvByo6dL8tXyNRuNkNnK3R7pzOCW9WD1DsPcRBT+S6eMbCUPAeiiZ34M5KROYH0HzjmBuhOWo+yTUyr0eNTeClN8j8ztcSF7Pvdb2+19er1kntH/bK3PuTHmdq5zTI7eWld+jd3l5XclHv39xWX08K5I5eTSX5kO8uVpW1zcvnXUuk2WOKJZaaY329pT4dpdXntI=
   </data>
  </layer>
- <layer id="2" name="Objects" width="30" height="30">
+ <layer name="Objects" width="30" height="30">
   <data encoding="base64" compression="zlib">
    eJztVctOwzAQtDggccwlUr4d5SP4hl5ipOaEKKGSL6AK2nsFh0h4qRdG2/VLhFtHWuVhZ2d2bG/GzpihMd/Ytca8hTj4ePbx2ZpFcPR5tj72IT9x7gTXR4ilOJGbc0u+pbli+K/aLrigBnjGc/H+h70qeQ4VufaVWmTfksDeEottJD9rKeGSPHTWne9zt1fGTP7a+6vtTnPvbk7XY0ZLCRfxzD7/GHITXwx9GLOh57MeqSXFxXBNnOcxMYaYxTzpnwTrpv+HzXBsYJzqjumlXKzjSZmDHjHulXcp8D92zHyXG0ctD9fn4xPoXyn+SQ+YD+t2ita1v38Je+cVeDeJNZBrWwvymDSsgw7b6muR2mtDo98jsE66J17X6N5oIM/Za00fwSnnTea13fn6p87yz3eQhz2PeY/vUQvVzM+oAb3V1roHfbHzmPLddr/elNSKOrTzrPlvYT9Lz/l5qtyr6FGuD7GuMURpnRKrSO+dlfM6VHpKyPXs2DryP24JyHXg2pCbuXA/lvxvUr1KzmOva/dFCTStWq9OzUfIukq80OqiPF+mVNSs
   </data>
  </layer>
- <layer id="3" name="Above" width="30" height="30">
+ <layer name="Above" width="30" height="30">
   <data encoding="base64" compression="zlib">
    eJztlD0KgDAMRsVDCJ5dPIhLFydnLyRCA6E0//Vn6Fu1fcmX6DC8zzF/IO10Op3M9uA/KDnufrKev3BOsfO1jLy5STPyzJBC0zfnw88sda2j/l0OyBi7pdw9s/b2idmzV6pPem71R7LeilxreXNEv6uWuw5w+bby3X1b77rrSrPu3JJnWs52F/L29rcQO7QSdUShfBjYreiOaVwYyFjKuoWr5rVkHfEBb/so/wUrJS2z
   </data>
  </layer>
- <layer id="4" name="Walkable" width="30" height="30" visible="0">
+ <layer name="Walkable" width="30" height="30">
   <data encoding="base64" compression="zlib">
    eJztk8ENwCAMA5mi+6/Ahv2iKoAdjNVHkPwK5AwO/Wmtl0ql0mWhy8VReMn0yPKRvaxn5Xs5c2G4p/zobHYedz6QuvIvrPaMtW9PR9ZRvxvcVf+Znxn7JN8MUzXXTLZKPpMtwkXnOfLBcNl7s4zMW0d1B1fJQTN2yMn6i149Atfp
   </data>
  </layer>
- <objectgroup id="5" name="Mapevents" visible="0">
-  <object id="1" name="west" type="mapchange" x="0" y="416" width="32" height="480">
+ <objectgroup name="Mapevents">
+  <object name="west" type="mapchange" x="0" y="416" width="32" height="480">
    <properties>
     <property name="map" value="waterway7"/>
     <property name="place" value="east"/>
    </properties>
   </object>
-  <object id="2" name="east" type="mapchange" x="928" y="352" width="32" height="544">
+  <object name="east" type="mapchange" x="928" y="352" width="32" height="544">
    <properties>
     <property name="map" value="waterway13"/>
     <property name="place" value="west"/>
    </properties>
   </object>
-  <object id="9" name="entrance" type="mapchange" x="480" y="544" width="32" height="32">
+  <object name="entrance" type="mapchange" x="480" y="544" width="32" height="32">
    <properties>
     <property name="map" value="brimhaven6"/>
     <property name="place" value="north"/>
    </properties>
   </object>
+  <object name="release_mouse0" type="script" x="384" y="576" width="160" height="192">
+   <properties>
+    <property name="when" value="step"/>
+   </properties>
+  </object>
  </objectgroup>
- <objectgroup id="6" name="Spawn" visible="0">
-  <object id="3" name="izthiel_2" type="spawn" x="64" y="320" width="256" height="160">
+ <objectgroup name="Spawn">
+  <object name="izthiel_2" type="spawn" x="64" y="320" width="256" height="160">
    <properties>
     <property name="spawngroup" value="izthiel_2"/>
    </properties>
   </object>
-  <object id="4" name="izthiel_3" type="spawn" x="512" y="288" width="32" height="64">
+  <object name="izthiel_3" type="spawn" x="512" y="288" width="32" height="64">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="izthiel_3"/>
    </properties>
   </object>
-  <object id="5" name="izthiel_2_1" type="spawn" x="576" y="256" width="320" height="160">
+  <object name="izthiel_2_1" type="spawn" x="576" y="256" width="320" height="160">
    <properties>
     <property name="spawngroup" value="izthiel_2"/>
    </properties>
   </object>
-  <object id="6" name="erumen_2" type="spawn" x="64" y="448" width="352" height="160">
+  <object name="erumen_2" type="spawn" x="64" y="448" width="352" height="160">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="erumen_2"/>
    </properties>
   </object>
-  <object id="7" name="erumen_1" type="spawn" x="64" y="608" width="288" height="288">
+  <object name="erumen_1" type="spawn" x="64" y="608" width="288" height="288">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="erumen_1"/>
    </properties>
   </object>
-  <object id="8" name="erumen_1_1" type="spawn" x="672" y="416" width="224" height="256">
+  <object name="erumen_1_1" type="spawn" x="672" y="416" width="224" height="256">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="erumen_1"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup id="7" name="Keys"/>
+ <objectgroup name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/waytobrimhaven1.tmx b/AndorsTrail/res/xml/waytobrimhaven1.tmx
index 613808920..96360d135 100644
--- a/AndorsTrail/res/xml/waytobrimhaven1.tmx
+++ b/AndorsTrail/res/xml/waytobrimhaven1.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="27" tilewidth="32" tileheight="32" infinite="0" nextobjectid="9">
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
+<map version="1.0" orientation="orthogonal" width="30" height="27" 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="27">
@@ -204,46 +205,54 @@
   </data>
  </layer>
  <objectgroup name="Mapevents">
-  <object id="1" name="west" type="mapchange" x="0" y="288" width="32" height="288">
+  <object name="west" type="mapchange" x="0" y="288" width="32" height="288">
    <properties>
     <property name="map" value="waytobrimhaven0"/>
     <property name="place" value="east"/>
    </properties>
   </object>
-  <object id="2" name="east" type="mapchange" x="928" y="96" width="32" height="160">
+  <object name="east" type="mapchange" x="928" y="96" width="32" height="160">
    <properties>
     <property name="map" value="waytobrimhaven2"/>
     <property name="place" value="west"/>
    </properties>
   </object>
-  <object id="6" name="north" type="mapchange" x="608" y="0" width="32" height="32">
+  <object name="north" type="mapchange" x="608" y="0" width="32" height="32">
    <properties>
     <property name="map" value="waterwayb1"/>
     <property name="place" value="south"/>
    </properties>
   </object>
-  <object id="7" name="east2" type="mapchange" x="928" y="704" width="32" height="64">
+  <object name="east2" type="mapchange" x="928" y="704" width="32" height="64">
    <properties>
     <property name="map" value="waytobrimhaven4"/>
     <property name="place" value="west"/>
    </properties>
   </object>
-  <object id="8" name="brv_ctrl_flood" type="script" x="896" y="96" width="32" height="192"/>
+  <object name="brv_ctrl_flood" type="script" x="896" y="96" width="32" height="192"/>
+  <object name="brv_crime_scene" type="script" x="288" y="96" width="32" height="32">
+   <properties>
+    <property name="when" value="enter"/>
+   </properties>
+  </object>
  </objectgroup>
  <objectgroup name="Spawn">
-  <object id="3" name="erumen_1" type="spawn" x="736" y="96" width="160" height="480">
+  <object name="erumen_1" type="spawn" x="736" y="96" width="160" height="480">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="erumen_1"/>
    </properties>
   </object>
-  <object id="4" name="fieldcritter_1" type="spawn" x="64" y="64" width="128" height="544">
+  <object name="fieldcritter_1" type="spawn" x="64" y="64" width="128" height="544">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="fieldcritter_1"/>
    </properties>
   </object>
-  <object id="5" name="forestwolf2" type="spawn" x="224" y="96" width="512" height="512">
+  <object name="forestwolf2" type="spawn" x="224" y="96" width="512" height="512">
    <properties>
     <property name="quantity" value="5"/>
+    <property name="spawngroup" value="forestwolf2"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/waytobrimhaven2.tmx b/AndorsTrail/res/xml/waytobrimhaven2.tmx
index 89a57da50..8f78532bc 100644
--- a/AndorsTrail/res/xml/waytobrimhaven2.tmx
+++ b/AndorsTrail/res/xml/waytobrimhaven2.tmx
@@ -1,189 +1,190 @@
 <?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="16">
+<!DOCTYPE map SYSTEM "http://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 name="Ground" width="30" height="30" visible="0">
@@ -231,72 +232,72 @@
    eJzFlTEOgDAIRb2Ci4n3P4K7i7OLrnoDHbyBdWjSmBYpH+TNhQ8tnzaNnLEHgpmsne35Uo6FmSfqcc9r5Kipj2KqzFF7Poek9suhVy5b8MBO+ADRpWb5CJqnka40FplLbuyW6RnpFfGR1Uw9zK2PLsXXrFujsdsl/HHfubv90s15gcujlcand1vrCepdLPdjKTZqlrTR/5NTs+Q9NXQ14yLcvfzuV+PfThkcd483HrsP9Ym0ZnRepXPn9a9q+wThBhLXRko=
   </data>
  </layer>
- <layer name="Walkable" width="30" height="30" visible="0">
+ <layer name="Walkable" width="30" height="30">
   <data encoding="base64" compression="zlib">
    eJztVEEKwDAI6yv2/y/0h2OHQZGqMbqujAVkxWFi1dqP1vpv29iFNzRvRPJjc53hiRiEA+HKaCP4sq7mi+RcpatxWWBqjNzZQ7a3LKx6rtCP5LRK2/sfzY+dIY2DmWPpR3Lz5lHGRN4t8/5nsSv34y66XmwE6G5Fe12ti8RV7kuLo7LnM255Hr8Rq9BlTOO3Znr0s7povHbvrHamVqt1pZ3BNZEs
   </data>
  </layer>
  <objectgroup name="Mapevents" visible="0">
-  <object id="1" name="west" type="mapchange" x="0" y="416" width="32" height="160">
+  <object name="west" type="mapchange" x="0" y="416" width="32" height="160">
    <properties>
     <property name="map" value="waytobrimhaven1"/>
     <property name="place" value="east"/>
    </properties>
   </object>
-  <object id="2" name="east" type="mapchange" x="928" y="416" width="32" height="64">
+  <object name="east" type="mapchange" x="928" y="416" width="32" height="64">
    <properties>
     <property name="map" value="waytobrimhaven3"/>
     <property name="place" value="west"/>
    </properties>
   </object>
-  <object id="3" name="down" type="mapchange" x="832" y="864" width="32" height="32">
+  <object name="down" type="mapchange" x="832" y="864" width="32" height="32">
    <properties>
     <property name="map" value="waytobrimhavencave0"/>
     <property name="place" value="up"/>
    </properties>
   </object>
-  <object id="10" name="brv_flood_key_set1" type="script" x="128" y="608" width="96" height="32"/>
-  <object id="11" name="brv_flood_key_set1a" type="script" x="128" y="544" width="64" height="32"/>
-  <object id="12" name="brv_flood_key_set2" type="script" x="704" y="864" width="64" height="32"/>
-  <object id="13" name="brv_flood_key_set2a" type="script" x="736" y="800" width="64" height="32"/>
+  <object name="brv_flood_key_set1" type="script" x="128" y="608" width="96" height="32"/>
+  <object name="brv_flood_key_set1a" type="script" x="128" y="544" width="64" height="32"/>
+  <object name="brv_flood_key_set2" type="script" x="704" y="864" width="64" height="32"/>
+  <object name="brv_flood_key_set2a" type="script" x="736" y="800" width="64" height="32"/>
  </objectgroup>
- <objectgroup name="Spawn" visible="0">
-  <object id="4" name="erumen_1" type="spawn" x="192" y="448" width="320" height="416">
+ <objectgroup name="Spawn">
+  <object name="erumen_1" type="spawn" x="192" y="448" width="320" height="416">
    <properties>
     <property name="quantity" value="3"/>
     <property name="spawngroup" value="erumen_1"/>
    </properties>
   </object>
-  <object id="5" name="erumen_2" type="spawn" x="160" y="96" width="352" height="352">
+  <object name="erumen_2" type="spawn" x="160" y="96" width="352" height="352">
    <properties>
     <property name="quantity" value="3"/>
     <property name="spawngroup" value="erumen_2"/>
    </properties>
   </object>
-  <object id="6" name="erumen_2_1" type="spawn" x="512" y="96" width="352" height="352">
+  <object name="erumen_2_1" type="spawn" x="512" y="96" width="352" height="352">
    <properties>
     <property name="quantity" value="3"/>
     <property name="spawngroup" value="erumen_2"/>
    </properties>
   </object>
-  <object id="7" name="erumen_3" type="spawn" x="512" y="448" width="320" height="416">
+  <object name="erumen_3" type="spawn" x="512" y="448" width="320" height="416">
    <properties>
     <property name="quantity" value="3"/>
     <property name="spawngroup" value="erumen_3"/>
    </properties>
   </object>
-  <object id="8" name="skeleton3" type="spawn" x="832" y="800" width="32" height="64">
+  <object name="skeleton3" type="spawn" x="832" y="800" width="32" height="64">
    <properties>
     <property name="spawngroup" value="skeleton3"/>
    </properties>
   </object>
-  <object id="14" name="churrie" type="spawn" x="864" y="640" width="64" height="160">
+  <object name="churrie" type="spawn" x="864" y="640" width="64" height="160">
    <properties>
     <property name="active" value="false"/>
     <property name="spawngroup" value="churrie"/>
    </properties>
   </object>
-  <object id="15" name="tamarukh" type="spawn" x="32" y="512" width="64" height="64">
+  <object name="tamarukh" type="spawn" x="32" y="480" width="64" height="64">
    <properties>
     <property name="active" value="false"/>
     <property name="spawngroup" value="tamarukh"/>
@@ -304,7 +305,7 @@
   </object>
  </objectgroup>
  <objectgroup name="Keys" visible="0">
-  <object id="9" name="brv_flood_key" type="key" x="128" y="576" width="64" height="32">
+  <object name="brv_flood_key" type="key" x="128" y="576" width="64" height="32">
    <properties>
     <property name="phrase" value="brv_flood_key"/>
     <property name="requireId" value="brv_nondisplay"/>
@@ -315,7 +316,7 @@
   </object>
  </objectgroup>
  <objectgroup name="Replace" visible="0">
-  <object id="10" name="brv_nondisplay:83" type="replace" x="96" y="64" width="864" height="864">
+  <object name="brv_nondisplay:83" type="replace" x="96" y="64" width="864" height="864">
    <properties>
     <property name="Above" value="Above_3"/>
     <property name="Ground" value="Ground_3"/>
@@ -325,7 +326,7 @@
     <property name="requireValue" value="83"/>
    </properties>
   </object>
-  <object id="11" name="brv_nondisplay:89" type="replace" x="96" y="64" width="864" height="864">
+  <object name="brv_nondisplay:89" type="replace" x="96" y="64" width="864" height="864">
    <properties>
     <property name="Above" value="Above_9"/>
     <property name="Ground" value="Ground_9"/>
diff --git a/AndorsTrail/res/xml/waytobrimhaven3.tmx b/AndorsTrail/res/xml/waytobrimhaven3.tmx
index 9699cac75..6cf5e23b0 100644
--- a/AndorsTrail/res/xml/waytobrimhaven3.tmx
+++ b/AndorsTrail/res/xml/waytobrimhaven3.tmx
@@ -1,192 +1,193 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" tiledversion="1.1.5" orientation="orthogonal" renderorder="right-down" width="30" height="29" tilewidth="32" tileheight="32" infinite="0" nextobjectid="14">
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
+<map version="1.0" orientation="orthogonal" width="30" height="29" 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_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7577" name="map_crate_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7705" name="map_guynmart" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7705" name="map_guynmart" tilewidth="32" tileheight="32">
   <image source="../drawable/map_guynmart.png" width="512" height="256"/>
  </tileset>
  <layer name="Ground" width="30" height="29">
@@ -234,71 +235,76 @@
    eJztlUEOAiEMRbmCGxPufw83rt3odsYT4CTeQE1sQkh/W1pwNr4NM8PA55dSUsIsOaU14/77u2/L/a005yL0IU0CvVP7yLonznthtDSsftHY9btW0uTWjbyQ9qlTl4tpLx7NCHUM6ty5HWXNrRnHPSOd9nvNFeh6ckiidMxTFG+E5WzU/1wO9jVE0GqCRJ2Pvbk5Gmvt+SVtTCKx9vqLaHqZpTlij6Xa5cXi9zxBl6D7rOXjFdVMC554RzW9zIwvAnkdkadSPeW8Wu/nCFqMZ+3BcyddjT3y/I+Odv5eKZJ2vw==
   </data>
  </layer>
- <layer name="Walkable" width="30" height="29" visible="0">
+ <layer name="Walkable" width="30" height="29">
   <data encoding="base64" compression="zlib">
    eJztVLkRwCAMY4rsv0I2TJUOW9ZDqviOIkcsCQt0X2vd/5LWW9X3CS5Uac4df6Xpy3MmuJ1KzxbNFPFP9CULYTL8E30KXtJjp0fRoehn7xDCYfoUrR1nlTudVracfFB53Vyq/lXfkOIz05PMYWdOiTycYiQ5d5iuxlOep3krTDbjUp6z+67/3R3qcNP3bfqO1FxydEx6nFLOPvEF6X8ArfY9OA==
   </data>
  </layer>
- <objectgroup name="Mapevents" visible="0">
-  <object id="1" name="west" type="mapchange" x="0" y="352" width="32" height="64">
+ <objectgroup name="Mapevents">
+  <object name="west" type="mapchange" x="0" y="352" width="32" height="64">
    <properties>
     <property name="map" value="waytobrimhaven2"/>
     <property name="place" value="east"/>
    </properties>
   </object>
-  <object id="2" name="east" type="mapchange" x="928" y="256" width="32" height="32">
+  <object name="east" type="mapchange" x="928" y="256" width="32" height="32">
    <properties>
     <property name="map" value="waterway6"/>
     <property name="place" value="west"/>
    </properties>
   </object>
-  <object id="3" name="sign_waytobrim3_grave1" type="sign" x="832" y="608" width="32" height="32"/>
-  <object id="4" name="sign_waytobrim3_grave2" type="sign" x="864" y="640" width="32" height="32"/>
-  <object id="5" name="sign_waytobrim3_grave3" type="sign" x="896" y="672" width="32" height="32"/>
-  <object id="12" name="east2" type="mapchange" x="928" y="704" width="32" height="96">
+  <object name="sign_waytobrim3_grave1" type="sign" x="832" y="608" width="32" height="32"/>
+  <object name="sign_waytobrim3_grave2" type="sign" x="864" y="640" width="32" height="32"/>
+  <object name="sign_waytobrim3_grave3_0" type="sign" x="896" y="672" width="32" height="32"/>
+  <object name="east2" type="mapchange" x="928" y="704" width="32" height="96">
    <properties>
     <property name="map" value="brimhaven4"/>
     <property name="place" value="west1"/>
    </properties>
   </object>
-  <object id="13" name="east3" type="mapchange" x="928" y="864" width="32" height="32">
+  <object name="east3" type="mapchange" x="928" y="864" width="32" height="32">
    <properties>
     <property name="map" value="brimhaven4"/>
     <property name="place" value="west2"/>
    </properties>
   </object>
+  <object name="release_mouse0" type="script" x="736" y="704" width="192" height="64">
+   <properties>
+    <property name="when" value="step"/>
+   </properties>
+  </object>
  </objectgroup>
- <objectgroup name="Spawn" visible="0">
-  <object id="6" name="erumen_2" type="spawn" x="64" y="256" width="288" height="352">
+ <objectgroup name="Spawn">
+  <object name="erumen_2" type="spawn" x="64" y="256" width="288" height="352">
    <properties>
     <property name="quantity" value="3"/>
     <property name="spawngroup" value="erumen_2"/>
    </properties>
   </object>
-  <object id="7" name="erumen_1" type="spawn" x="512" y="768" width="384" height="160">
+  <object name="erumen_1" type="spawn" x="512" y="768" width="384" height="160">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="erumen_1"/>
    </properties>
   </object>
-  <object id="8" name="erumen_2_1" type="spawn" x="64" y="576" width="544" height="320">
+  <object name="erumen_2_1" type="spawn" x="64" y="576" width="544" height="320">
    <properties>
     <property name="quantity" value="3"/>
     <property name="spawngroup" value="erumen_2"/>
    </properties>
   </object>
-  <object id="9" name="erumen_1_1" type="spawn" x="800" y="224" width="96" height="96">
+  <object name="erumen_1_1" type="spawn" x="800" y="224" width="96" height="96">
    <properties>
     <property name="spawngroup" value="erumen_1"/>
    </properties>
   </object>
-  <object id="10" name="forestwolf2" type="spawn" x="448" y="96" width="384" height="480">
+  <object name="forestwolf2" type="spawn" x="448" y="96" width="384" height="480">
    <properties>
     <property name="quantity" value="3"/>
     <property name="spawngroup" value="forestwolf2"/>
    </properties>
   </object>
-  <object id="11" name="forestdog" type="spawn" x="576" y="320" width="320" height="288">
+  <object name="forestdog" type="spawn" x="576" y="320" width="320" height="288">
    <properties>
     <property name="quantity" value="4"/>
     <property name="spawngroup" value="forestdog"/>
@@ -307,7 +313,7 @@
  </objectgroup>
  <objectgroup name="Keys" visible="0"/>
  <objectgroup name="Replace" visible="0">
-  <object id="10" name="brv_nondisplay:83" type="replace" x="0" y="224" width="960" height="704">
+  <object name="brv_nondisplay:83" type="replace" x="0" y="224" width="960" height="704">
    <properties>
     <property name="Above" value="Above_3"/>
     <property name="Ground" value="Ground_3"/>
@@ -317,7 +323,7 @@
     <property name="requireValue" value="83"/>
    </properties>
   </object>
-  <object id="11" name="brv_nondisplay:89" type="replace" x="0" y="224" width="960" height="704">
+  <object name="brv_nondisplay:89" type="replace" x="0" y="224" width="960" height="704">
    <properties>
     <property name="Above" value="Above_9"/>
     <property name="Ground" value="Ground_9"/>
diff --git a/AndorsTrail/res/xml/waytobrimhaven6.tmx b/AndorsTrail/res/xml/waytobrimhaven6.tmx
index 68e3ab3ce..7d1faf30d 100644
--- a/AndorsTrail/res/xml/waytobrimhaven6.tmx
+++ b/AndorsTrail/res/xml/waytobrimhaven6.tmx
@@ -1,195 +1,196 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" tiledversion="1.1.5" orientation="orthogonal" renderorder="right-down" width="30" height="7" tilewidth="32" tileheight="32" infinite="0" nextobjectid="4">
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
+<map version="1.0" orientation="orthogonal" width="30" height="7" 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_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7577" name="map_plant_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7705" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7705" name="map_ground_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7833" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7833" name="map_tree_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
  <layer name="Ground" width="30" height="7">
@@ -213,22 +214,28 @@
   </data>
  </layer>
  <objectgroup name="Mapevents">
-  <object id="1" name="west" type="mapchange" x="0" y="64" width="32" height="96">
+  <object name="west" type="mapchange" x="0" y="64" width="32" height="96">
    <properties>
     <property name="map" value="waytobrimhaven5"/>
     <property name="place" value="east"/>
    </properties>
   </object>
-  <object id="2" name="east" type="mapchange" x="928" y="96" width="32" height="32">
+  <object name="east" type="mapchange" x="928" y="96" width="32" height="32">
    <properties>
     <property name="map" value="brimhaven4"/>
     <property name="place" value="west3"/>
    </properties>
   </object>
+  <object name="release_mouse0" type="script" x="768" y="64" width="160" height="96">
+   <properties>
+    <property name="when" value="step"/>
+   </properties>
+  </object>
  </objectgroup>
  <objectgroup name="Spawn">
-  <object id="3" name="forestwolf2" type="spawn" x="96" y="64" width="800" height="96">
+  <object name="forestwolf2" type="spawn" x="96" y="64" width="800" height="96">
    <properties>
+    <property name="ignoreAreas" value="true"/>
     <property name="quantity" value="5"/>
     <property name="spawngroup" value="forestwolf2"/>
    </properties>
diff --git a/AndorsTrail/res/xml/wild2.tmx b/AndorsTrail/res/xml/wild2.tmx
index 4f2c0c058..a75f8d0d6 100644
--- a/AndorsTrail/res/xml/wild2.tmx
+++ b/AndorsTrail/res/xml/wild2.tmx
@@ -1,233 +1,268 @@
-<?xml version="1.0" ?><!DOCTYPE map  SYSTEM 'http://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 "http://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">eJytlDEOwyAMRVG2HiF3zxVClRO0OUKbvVPnniFYspVfh2JDGZ4YYj0+2CEOIUTmmlguB58xhNf4veJ3XUtrLPhqndoXM76cu8aXy+iF9tM+K6NFzkdMQA9fa2apvzO/fKV7xb5T7Zp4MnNDRpwl2ndLvJnbcM4srI5z63M82ImZha3BJ07MLHj68c/84v1hf616axZ1f/X8Ip65wf5657nkw/enhw/fnV75av9fK19PH/Z3BxKsKAs=</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">
+   eJytlDEOwyAMRVG2HiF3zxVClRO0OUKbvVPnniFYspVfh2JDGZ4YYj0+2CEOIUTmmlguB58xhNf4veJ3XUtrLPhqndoXM76cu8aXy+iF9tM+K6NFzkdMQA9fa2apvzO/fKV7xb5T7Zp4MnNDRpwl2ndLvJnbcM4srI5z63M82ImZha3BJ07MLHj68c/84v1hf616axZ1f/X8Ip65wf5657nkw/enhw/fnV75av9fK19PH/Z3BxKsKAs=
+  </data>
  </layer>
- <layer height="20" name="Objects" width="20">
-  <data compression="zlib" encoding="base64">eJylVMFKAzEQDT14EBTSw0rAf/DL/AS/RPwCPTd48VIoaKEn2dal3sSTxf6A4Dw2w86+TdpFHyw72WzevHmZxLk+YuXcKjj3FVwWS9/O7UL/DWx991+d4hfhe6vauMQJ/Pj+WLkZ88T1KO+1H2oAcutYXw61cM6S3qvpUIMd23xr4oXGRSaX8s9MHoX6+l8gr82zPFLz5sj8GNQFDvRR48t7afF6kv9uvZ0bv9Tfkmcfwnc5OZwTeMqs5556EJ5FNfwPuKYcqwN1Wq0x8d2b9acS38hzMenyjgH8fxa+ve84sXZP+6JjnDXoRE1WU5Pm4XOpL25J050ZR/KIe+9zZK+p/7HK7y9r0/7jfLZ3ELO+vwA1aO+xPmhWDXwnAFY3n5mG9O1Ctx9jYGs/k7vrfNrX9x7ymixK89vQ9kuk++Rb4l/K6HJ/</data>
+ <layer name="Objects" width="20" height="20">
+  <data encoding="base64" compression="zlib">
+   eJylVMFKAzEQDT14EBTSw0rAf/DL/AS/RPwCPTd48VIoaKEn2dal3sSTxf6A4Dw2w86+TdpFHyw72WzevHmZxLk+YuXcKjj3FVwWS9/O7UL/DWx991+d4hfhe6vauMQJ/Pj+WLkZ88T1KO+1H2oAcutYXw61cM6S3qvpUIMd23xr4oXGRSaX8s9MHoX6+l8gr82zPFLz5sj8GNQFDvRR48t7afF6kv9uvZ0bv9Tfkmcfwnc5OZwTeMqs5556EJ5FNfwPuKYcqwN1Wq0x8d2b9acS38hzMenyjgH8fxa+ve84sXZP+6JjnDXoRE1WU5Pm4XOpL25J050ZR/KIe+9zZK+p/7HK7y9r0/7jfLZ3ELO+vwA1aO+xPmhWDXwnAFY3n5mG9O1Ctx9jYGs/k7vrfNrX9x7ymixK89vQ9kuk++Rb4l/K6HJ/
+  </data>
  </layer>
- <layer height="20" name="Above" width="20">
-  <data compression="zlib" encoding="base64">eJzNk8ENgDAIRYlDmHR4V+nFDfSKu5gejNgA/RhMfCdj9fUXKNGTdSaXo8TWRr6Rs2eZ8G+53G753LMDGSNEMv7F35zVqJVXOw+triw80onMCXru5trAnnq9v7Ja2bT3yL6Wz/vX6o3niyCd0fnq75nmjJB9H2V9+GUmy5fBF/lqgkf6rP6e+UwwkQ==</data>
+ <layer name="Above" width="20" height="20">
+  <data encoding="base64" compression="zlib">
+   eJzNk8ENgDAIRYlDmHR4V+nFDfSKu5gejNgA/RhMfCdj9fUXKNGTdSaXo8TWRr6Rs2eZ8G+53G753LMDGSNEMv7F35zVqJVXOw+triw80onMCXru5trAnnq9v7Ja2bT3yL6Wz/vX6o3niyCd0fnq75nmjJB9H2V9+GUmy5fBF/lqgkf6rP6e+UwwkQ==
+  </data>
  </layer>
- <layer height="20" name="Walkable" visible="0" width="20">
-  <data compression="zlib" encoding="base64">eJzbKMbAsBEJg8BGMephZECMGkJqaWEmLoAuT0oYkQooCVdqmUsrd1ISjoTcSIy91DCTFP8TCjtSwpOY+CDGHlz68MUNPj+QEyeUpB1KzaGm+6jt18EefvjMAwDYjNQ4</data>
+ <layer name="Walkable" width="20" height="20" visible="0">
+  <data encoding="base64" compression="zlib">
+   eJzbKMbAsBEJg8BGMephZECMGkJqaWEmLoAuT0oYkQooCVdqmUsrd1ISjoTcSIy91DCTFP8TCjtSwpOY+CDGHlz68MUNPj+QEyeUpB1KzaGm+6jt18EefvjMAwDYjNQ4
+  </data>
  </layer>
  <objectgroup name="Mapevents" visible="0">
-  <object height="96" name="east" type="mapchange" width="32" x="608" y="160">
+  <object name="east" type="mapchange" x="608" y="160" width="32" height="96">
    <properties>
     <property name="map" value="wild3"/>
     <property name="place" value="west"/>
    </properties>
   </object>
-  <object height="32" name="north" type="mapchange" width="32" x="128" y="0">
+  <object name="north" type="mapchange" x="128" y="0" width="32" height="32">
    <properties>
     <property name="map" value="crossglen"/>
     <property name="place" value="south"/>
    </properties>
   </object>
-  <object height="32" name="cave" type="mapchange" width="32" x="64" y="288">
+  <object name="cave" type="mapchange" x="64" y="288" width="32" height="32">
    <properties>
     <property name="map" value="snakecave1"/>
     <property name="place" value="south"/>
    </properties>
   </object>
-  <object height="32" name="south" type="mapchange" width="32" x="480" y="608">
+  <object name="south" type="mapchange" x="480" y="608" width="32" height="32">
    <properties>
     <property name="map" value="wild5"/>
     <property name="place" value="north"/>
    </properties>
   </object>
-  <object height="64" name="east2" type="mapchange" width="32" x="608" y="352">
+  <object name="east2" type="mapchange" x="608" y="352" width="32" height="64">
    <properties>
     <property name="map" value="wild3"/>
     <property name="place" value="west2"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" visible="0">
-  <object height="96" name="forestant" type="spawn" width="320" x="32" y="352">
+ <objectgroup name="Spawn">
+  <object name="forestant" type="spawn" x="32" y="352" width="320" height="96">
    <properties>
     <property name="quantity" value="3"/>
     <property name="spawngroup" value="forestant"/>
    </properties>
   </object>
-  <object height="128" name="forestant_1" type="spawn" width="64" x="512" y="288">
+  <object name="forestant_1" type="spawn" x="512" y="288" width="64" height="128">
    <properties>
     <property name="spawngroup" value="forestant"/>
    </properties>
   </object>
-  <object height="64" name="forestsnake" type="spawn" width="192" x="416" y="64">
+  <object name="forestsnake" type="spawn" x="416" y="64" width="192" height="64">
    <properties>
     <property name="spawngroup" value="forestsnake"/>
    </properties>
   </object>
-  <object height="160" name="forestsnake_1" type="spawn" width="160" x="384" y="224">
+  <object name="forestsnake_1" type="spawn" x="384" y="192" width="128" height="160">
    <properties>
     <property name="spawngroup" value="forestsnake"/>
    </properties>
   </object>
+  <object name="inspiring_snake_master" type="spawn" x="384" y="352" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="inspiring_snake_master"/>
+   </properties>
+  </object>
  </objectgroup>
  <objectgroup name="Keys" visible="0"/>
-</map>
\ No newline at end of file
+</map>
diff --git a/AndorsTrail/res/xml/worldmap.xml b/AndorsTrail/res/xml/worldmap.xml
index f71e573d5..19cbb6705 100644
--- a/AndorsTrail/res/xml/worldmap.xml
+++ b/AndorsTrail/res/xml/worldmap.xml
@@ -153,6 +153,8 @@
     <map id="blackwater_mountain40" x="71" y="389"/>
     <map id="blackwater_mountain53" x="86" y="327"/>
     <map id="blackwater_mountain54" x="117" y="321"/>
+    <map id="blackwater_mountain55" x="83" y="389"/>
+    <map id="blackwater_mountain56" x="85" y="368"/>
     <map area="crossglen" id="crossglen" x="148" y="355"/>
     <map area="crossroads" id="crossroads" x="179" y="300"/>
     <map area="fallhaven" id="fallhaven_ne" x="241" y="382"/>
@@ -369,6 +371,7 @@
     <map id="brimhaven3" x="457" y="265"/>
     <map id="brimhaven7" x="457" y="259"/>
     <map id="brimhaven8" x="426" y="290"/>
+    <map id="brimhaven_exit" x="457" y="296"/>
     <namedarea id="crossglen" name="Crossglen" type="settlement"/>
     <namedarea id="crossroads" name="Crossroads Guardhouse" type="other"/>
     <namedarea id="charwoodh" name="Charwood" type="settlement"/>
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
index d231c0f57..219f523e8 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
@@ -24,14 +24,14 @@ public final class AndorsTrailApplication extends Application {
 	public static final boolean DEVELOPMENT_DEBUGRESOURCES = false;
 	public static final boolean DEVELOPMENT_FORCE_STARTNEWGAME = false;
 	public static final boolean DEVELOPMENT_FORCE_CONTINUEGAME = false;
-	public static final boolean DEVELOPMENT_DEBUGBUTTONS = true;
+	public static final boolean DEVELOPMENT_DEBUGBUTTONS = false;
 	public static final boolean DEVELOPMENT_FASTSPEED = false;
-	public static final boolean DEVELOPMENT_VALIDATEDATA = true;
-	public static final boolean DEVELOPMENT_DEBUGMESSAGES = true;
+	public static final boolean DEVELOPMENT_VALIDATEDATA = false;
+	public static final boolean DEVELOPMENT_DEBUGMESSAGES = false;
 	public static final boolean DEVELOPMENT_INCOMPATIBLE_SAVEGAMES = DEVELOPMENT_DEBUGRESOURCES || DEVELOPMENT_DEBUGBUTTONS || DEVELOPMENT_FASTSPEED;
 	public static final int DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION = 999;
 	public static final int CURRENT_VERSION = DEVELOPMENT_INCOMPATIBLE_SAVEGAMES ? DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION : 55;
-	public static final String CURRENT_VERSION_DISPLAY = "0.7.12beta";
+	public static final String CURRENT_VERSION_DISPLAY = "0.7.12";
 	public static final boolean IS_RELEASE_VERSION = !CURRENT_VERSION_DISPLAY.matches(".*[a-d].*");
 
 	private final AndorsTrailPreferences preferences = new AndorsTrailPreferences();