diff --git a/AndorsTrail/AndroidManifest.xml b/AndorsTrail/AndroidManifest.xml
index c86d4c5f6..c6f557e23 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="49"
-	android:versionName="0.7.8dev"
+	android:versionName="0.7.8"
 	android:installLocation="auto"
 	>
 	<uses-sdk 
diff --git a/AndorsTrail/res/raw/actorconditions_arulir_mountain.json b/AndorsTrail/res/raw/actorconditions_arulir_mountain.json
new file mode 100644
index 000000000..9d9cb3277
--- /dev/null
+++ b/AndorsTrail/res/raw/actorconditions_arulir_mountain.json
@@ -0,0 +1,67 @@
+[
+    {
+        "id":"crushed",
+        "iconID":"actorconditions_1:13",
+        "name":"Crushed",
+        "category":"physical",
+        "isStacking":1,
+        "roundEffect":{
+            "visualEffectID":"redSplash",
+            "increaseCurrentHP":{
+                "min":-1,
+                "max":-1
+            }
+        },
+        "abilityEffect":{
+            "increaseMaxHP":-5,
+            "increaseDamageResistance":-2
+        }
+    },
+    {
+        "id":"head_wound",
+        "iconID":"actorconditions_1:48",
+        "name":"Head wound",
+        "category":"physical",
+        "roundEffect":{
+            "increaseCurrentHP":{
+                "min":-2,
+                "max":-2
+            }
+        },
+        "abilityEffect":{
+            "increaseAttackChance":-20,
+            "increaseBlockChance":-20
+        }
+    },
+    {
+        "id":"mermaid_scale",
+        "iconID":"actorconditions_1:22",
+        "name":"Mermaid curse",
+        "category":"spiritual",
+        "roundEffect":{
+            "increaseCurrentHP":{
+                "min":-1,
+                "max":0
+            }
+        },
+        "abilityEffect":{
+            "increaseAttackChance":-20,
+            "increaseMaxHP":-15,
+            "increaseMaxAP":-3,
+            "increaseBlockChance":-10,
+            "increaseDamageResistance":-1
+        }
+    },
+    {
+        "id":"increased_defense",
+        "iconID":"actorconditions_1:107",
+        "name":"Increased defense",
+        "category":"physical",
+        "isPositive":1,
+        "abilityEffect":{
+            "increaseMaxHP":0,
+            "increaseBlockChance":15,
+            "increaseDamageResistance":2
+        }
+    }
+]
\ No newline at end of file
diff --git a/AndorsTrail/res/raw/conversationlist_arulir_mountain.json b/AndorsTrail/res/raw/conversationlist_arulir_mountain.json
new file mode 100644
index 000000000..bc5b010b7
--- /dev/null
+++ b/AndorsTrail/res/raw/conversationlist_arulir_mountain.json
@@ -0,0 +1,2046 @@
+[
+    {
+        "id":"arulirmountain_entrance",
+        "message":"You have a gut feeling that it would be better to not go any further unprepared.",
+        "replies":[
+            {
+                "text":"Careful, rockfall",
+                "nextPhraseID":"arulirmountain_entrance_1"
+            }
+        ]
+    },
+    {
+        "id":"arulirmountain_entrance_1",
+        "message":"You need some item that would help you go through there undiscovered.",
+        "replies":[
+            {
+                "text":"Leave",
+                "nextPhraseID":"X"
+            }
+        ]
+    },
+    {
+        "id":"arulirmountain_brokenbridge",
+        "message":"The Bridge is broken. It would not hold your weight.",
+        "replies":[
+            {
+                "text":"Leave.",
+                "nextPhraseID":"X"
+            }
+        ]
+    },
+    {
+        "id":"arulirmountain_trap01",
+        "replies":[
+            {
+                "nextPhraseID":"arulirmountain_trap_hole"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"arulirmountain_trap",
+                "value":1
+            }
+        ]
+    },
+    {
+        "id":"arulirmountain_trap02",
+        "replies":[
+            {
+                "nextPhraseID":"arulirmountain_trap_hole"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"arulirmountain_trap",
+                "value":2
+            }
+        ]
+    },
+    {
+        "id":"arulirmountain_trap03",
+        "replies":[
+            {
+                "nextPhraseID":"arulirmountain_trap_hole"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"arulirmountain_trap",
+                "value":3
+            }
+        ]
+    },
+    {
+        "id":"arulirmountain_trap04",
+        "replies":[
+            {
+                "nextPhraseID":"arulirmountain_trap_rocks"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"arulirmountain_trap",
+                "value":4
+            }
+        ]
+    },
+    {
+        "id":"arulirmountain_trap05",
+        "replies":[
+            {
+                "nextPhraseID":"arulirmountain_trap_rocks"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"arulirmountain_trap",
+                "value":5
+            }
+        ]
+    },
+    {
+        "id":"arulircave_trap01",
+        "replies":[
+            {
+                "nextPhraseID":"arulirmountain_trap_hole"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"arulircave_trap",
+                "value":1
+            }
+        ]
+    },
+    {
+        "id":"arulircave_trap02",
+        "replies":[
+            {
+                "nextPhraseID":"arulirmountain_trap_rocks"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"arulircave_trap",
+                "value":2
+            }
+        ]
+    },
+    {
+        "id":"arulircave_trap03",
+        "replies":[
+            {
+                "nextPhraseID":"arulirmountain_trap_rocks"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"arulircave_trap",
+                "value":3
+            }
+        ]
+    },
+    {
+        "id":"arulircave_trap04",
+        "replies":[
+            {
+                "nextPhraseID":"arulirmountain_trap_hole"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"arulircave_trap",
+                "value":4
+            }
+        ]
+    },
+    {
+        "id":"arulircave_trap05",
+        "replies":[
+            {
+                "nextPhraseID":"arulirmountain_trap_rocks"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"arulircave_trap",
+                "value":5
+            }
+        ]
+    },
+    {
+        "id":"arulircave_trap06",
+        "replies":[
+            {
+                "nextPhraseID":"arulirmountain_trap_rocks"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"arulircave_trap",
+                "value":6
+            }
+        ]
+    },
+    {
+        "id":"arulircave_trap07",
+        "replies":[
+            {
+                "nextPhraseID":"arulirmountain_trap_hole"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"arulircave_trap",
+                "value":7
+            }
+        ]
+    },
+    {
+        "id":"arulircave_trap08",
+        "replies":[
+            {
+                "nextPhraseID":"arulirmountain_trap_hole"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"arulircave_trap",
+                "value":8
+            }
+        ]
+    },
+    {
+        "id":"arulircave_trap09",
+        "replies":[
+            {
+                "nextPhraseID":"arulirmountain_trap_rocks"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"arulircave_trap",
+                "value":9
+            }
+        ]
+    },
+    {
+        "id":"arulirmountain_trap_hole",
+        "replies":[
+            {
+                "nextPhraseID":"arulirmountain_trap_hole_7",
+                "requires":[
+                    {
+                        "requireType":"factionScore",
+                        "requireID":"arulirmountain_trap_hole",
+                        "value":7
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"arulirmountain_trap_hole_6",
+                "requires":[
+                    {
+                        "requireType":"factionScore",
+                        "requireID":"arulirmountain_trap_hole",
+                        "value":6
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"arulirmountain_trap_hole_5",
+                "requires":[
+                    {
+                        "requireType":"factionScore",
+                        "requireID":"arulirmountain_trap_hole",
+                        "value":5
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"arulirmountain_trap_hole_4",
+                "requires":[
+                    {
+                        "requireType":"factionScore",
+                        "requireID":"arulirmountain_trap_hole",
+                        "value":4
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"arulirmountain_trap_hole_3",
+                "requires":[
+                    {
+                        "requireType":"factionScore",
+                        "requireID":"arulirmountain_trap_hole",
+                        "value":3
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"arulirmountain_trap_hole_2",
+                "requires":[
+                    {
+                        "requireType":"factionScore",
+                        "requireID":"arulirmountain_trap_hole",
+                        "value":2
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"arulirmountain_trap_hole_1",
+                "requires":[
+                    {
+                        "requireType":"factionScore",
+                        "requireID":"arulirmountain_trap_hole",
+                        "value":1
+                    }
+                ]
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"alignmentChange",
+                "rewardID":"arulirmountain_trap_hole",
+                "value":1
+            }
+        ]
+    },
+    {
+        "id":"arulirmountain_trap_rocks",
+        "replies":[
+            {
+                "nextPhraseID":"arulirmountain_trap_rocks_7",
+                "requires":[
+                    {
+                        "requireType":"factionScore",
+                        "requireID":"arulirmountain_trap_rocks",
+                        "value":7
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"arulirmountain_trap_rocks_6",
+                "requires":[
+                    {
+                        "requireType":"factionScore",
+                        "requireID":"arulirmountain_trap_rocks",
+                        "value":6
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"arulirmountain_trap_rocks_5",
+                "requires":[
+                    {
+                        "requireType":"factionScore",
+                        "requireID":"arulirmountain_trap_rocks",
+                        "value":5
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"arulirmountain_trap_rocks_4",
+                "requires":[
+                    {
+                        "requireType":"factionScore",
+                        "requireID":"arulirmountain_trap_rocks",
+                        "value":4
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"arulirmountain_trap_rocks_3",
+                "requires":[
+                    {
+                        "requireType":"factionScore",
+                        "requireID":"arulirmountain_trap_rocks",
+                        "value":3
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"arulirmountain_trap_rocks_2",
+                "requires":[
+                    {
+                        "requireType":"factionScore",
+                        "requireID":"arulirmountain_trap_rocks",
+                        "value":2
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"arulirmountain_trap_rocks_1",
+                "requires":[
+                    {
+                        "requireType":"factionScore",
+                        "requireID":"arulirmountain_trap_rocks",
+                        "value":1
+                    }
+                ]
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"alignmentChange",
+                "rewardID":"arulirmountain_trap_rocks",
+                "value":1
+            }
+        ]
+    },
+    {
+        "id":"arulirmountain_trap_hole_1",
+        "message":"The ground under your feet suddenly gives way, a fissure opens, and you fall into it.",
+        "replies":[
+            {
+                "text":"Good thing I put on these protective boots. Who knows what could have happened otherwise!",
+                "nextPhraseID":"X",
+                "requires":[
+                    {
+                        "requireType":"wear",
+                        "requireID":"arulir_boots",
+                        "value":1
+                    }
+                ]
+            },
+            {
+                "text":"Ouch!",
+                "nextPhraseID":"X",
+                "requires":[
+                    {
+                        "requireType":"wear",
+                        "requireID":"arulir_boots",
+                        "value":1,
+                        "negate":true
+                    }
+                ]
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"bleeding_wound",
+                "value":7
+            },
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"bleeding_wound",
+                "value":7
+            },
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"bleeding_wound",
+                "value":3
+            },
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"bleeding_wound",
+                "value":3
+            }
+        ]
+    },
+    {
+        "id":"arulirmountain_trap_hole_2",
+        "message":"Again, a crack has opened and you fall into it.",
+        "replies":[
+            {
+                "text":"My protective boots saved my life another time!",
+                "nextPhraseID":"X",
+                "requires":[
+                    {
+                        "requireType":"wear",
+                        "requireID":"arulir_boots",
+                        "value":1
+                    }
+                ]
+            },
+            {
+                "text":"I almost broke my legs. I wish I had better shoes...",
+                "nextPhraseID":"X",
+                "requires":[
+                    {
+                        "requireType":"wear",
+                        "requireID":"arulir_boots",
+                        "value":1,
+                        "negate":true
+                    }
+                ]
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"bleeding_wound",
+                "value":7
+            },
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"bleeding_wound",
+                "value":7
+            },
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"bleeding_wound",
+                "value":3
+            },
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"bleeding_wound",
+                "value":3
+            }
+        ]
+    },
+    {
+        "id":"arulirmountain_trap_hole_3",
+        "message":"Another hole in the ground! This time you can't even see the bottom, but somehow you managed to stop your fall after a few meters.",
+        "replies":[
+            {
+                "text":"I have to remember to thank Bernhar for the boots!",
+                "nextPhraseID":"X",
+                "requires":[
+                    {
+                        "requireType":"wear",
+                        "requireID":"arulir_boots",
+                        "value":1
+                    }
+                ]
+            },
+            {
+                "text":"It is really dangerous to walk here!",
+                "nextPhraseID":"X",
+                "requires":[
+                    {
+                        "requireType":"wear",
+                        "requireID":"arulir_boots",
+                        "value":1,
+                        "negate":true
+                    }
+                ]
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"bleeding_wound",
+                "value":7
+            },
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"bleeding_wound",
+                "value":7
+            },
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"bleeding_wound",
+                "value":3
+            },
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"bleeding_wound",
+                "value":3
+            }
+        ]
+    },
+    {
+        "id":"arulirmountain_trap_rocks_1",
+        "message":"Some rocks above your head begin to crack.\nA moment later a pile of rocks rains down on you.",
+        "replies":[
+            {
+                "text":"Thanks to my protective cap I am not seriously hurt.",
+                "nextPhraseID":"X",
+                "requires":[
+                    {
+                        "requireType":"wear",
+                        "requireID":"arulir_cap",
+                        "value":1
+                    }
+                ]
+            },
+            {
+                "text":"Ouch, my head!",
+                "nextPhraseID":"X",
+                "requires":[
+                    {
+                        "requireType":"wear",
+                        "requireID":"arulir_cap",
+                        "value":1,
+                        "negate":true
+                    }
+                ]
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"bleeding_wound",
+                "value":5
+            },
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"bleeding_wound",
+                "value":5
+            },
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"crit2",
+                "value":3
+            },
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"crit2",
+                "value":3
+            }
+        ]
+    },
+    {
+        "id":"arulirmountain_trap_rocks_2",
+        "message":"You hear rocks cracking above your head again.\nThere is no chance to jump away before they hit!",
+        "replies":[
+            {
+                "text":"Good thing I am wearing this protective cap!",
+                "nextPhraseID":"X",
+                "requires":[
+                    {
+                        "requireType":"wear",
+                        "requireID":"arulir_cap",
+                        "value":1
+                    }
+                ]
+            },
+            {
+                "text":"I should take more care where I am going!",
+                "nextPhraseID":"X",
+                "requires":[
+                    {
+                        "requireType":"wear",
+                        "requireID":"arulir_cap",
+                        "value":1,
+                        "negate":true
+                    }
+                ]
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"bleeding_wound",
+                "value":5
+            },
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"bleeding_wound",
+                "value":5
+            },
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"crit2",
+                "value":3
+            },
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"crit2",
+                "value":3
+            }
+        ]
+    },
+    {
+        "id":"arulirmountain_trap_hole_4",
+        "message":"You fell into another hole hidden in the ground and hurt yourself.",
+        "replies":[
+            {
+                "text":"I hope my boots are OK.",
+                "nextPhraseID":"X",
+                "requires":[
+                    {
+                        "requireType":"wear",
+                        "requireID":"arulir_boots",
+                        "value":1
+                    }
+                ]
+            },
+            {
+                "text":"That one really hurt!",
+                "nextPhraseID":"X",
+                "requires":[
+                    {
+                        "requireType":"wear",
+                        "requireID":"arulir_boots",
+                        "negate":true
+                    }
+                ]
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"bleeding_wound",
+                "value":7
+            },
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"bleeding_wound",
+                "value":7
+            },
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"bleeding_wound",
+                "value":4
+            },
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"bleeding_wound",
+                "value":4
+            }
+        ]
+    },
+    {
+        "id":"arulirmountain_trap_rocks_3",
+        "message":"Rocks falling! You jump aside - luckily a very big boulder only grazed your side.",
+        "replies":[
+            {
+                "text":"That was neat. I fear that not even my protective cap would have helped much against that huge boulder.",
+                "nextPhraseID":"X",
+                "requires":[
+                    {
+                        "requireType":"wear",
+                        "requireID":"arulir_cap",
+                        "value":1
+                    }
+                ]
+            },
+            {
+                "text":"That was neat!",
+                "nextPhraseID":"X",
+                "requires":[
+                    {
+                        "requireType":"wear",
+                        "requireID":"arulir_cap",
+                        "value":1,
+                        "negate":true
+                    }
+                ]
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"bleeding_wound",
+                "value":6
+            },
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"bleeding_wound",
+                "value":6
+            },
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"crit2",
+                "value":4
+            },
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"crit2",
+                "value":4
+            }
+        ]
+    },
+    {
+        "id":"arulirmountain_trap_rocks_4",
+        "message":"A huge boulder suddenly breaks, and its pieces fall down from above onto you.",
+        "replies":[
+            {
+                "text":"Thanks to my protective cap I am not seriously hurt.",
+                "nextPhraseID":"X",
+                "requires":[
+                    {
+                        "requireType":"wear",
+                        "requireID":"arulir_cap",
+                        "value":1
+                    }
+                ]
+            },
+            {
+                "text":"Ouch!",
+                "nextPhraseID":"X",
+                "requires":[
+                    {
+                        "requireType":"wear",
+                        "requireID":"arulir_cap",
+                        "value":1,
+                        "negate":true
+                    }
+                ]
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"bleeding_wound",
+                "value":7
+            },
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"bleeding_wound",
+                "value":7
+            },
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"crit2",
+                "value":5
+            },
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"crit2",
+                "value":5
+            }
+        ]
+    },
+    {
+        "id":"arulirmountain_trap_hole_5",
+        "message":"You fell into a hole and hurt yourself.",
+        "replies":[
+            {
+                "text":"Will these holes in the ground never end?",
+                "nextPhraseID":"X"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"bleeding_wound",
+                "value":8
+            },
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"bleeding_wound",
+                "value":8
+            },
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"bleeding_wound",
+                "value":3
+            },
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"bleeding_wound",
+                "value":3
+            }
+        ]
+    },
+    {
+        "id":"arulirmountain_trap_rocks_5",
+        "message":"Several small but sharp edged pieces of rock are coming down. One hits you right on the top of your head.",
+        "replies":[
+            {
+                "text":"That could have been very bad without my cap!",
+                "nextPhraseID":"X",
+                "requires":[
+                    {
+                        "requireType":"wear",
+                        "requireID":"arulir_cap",
+                        "value":1
+                    }
+                ]
+            },
+            {
+                "text":"Ouch! It's like the mountain is out to get me!",
+                "nextPhraseID":"X",
+                "requires":[
+                    {
+                        "requireType":"wear",
+                        "requireID":"arulir_cap",
+                        "value":1,
+                        "negate":true
+                    }
+                ]
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"bleeding_wound",
+                "value":7
+            },
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"bleeding_wound",
+                "value":7
+            },
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"crit2",
+                "value":6
+            },
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"crit2",
+                "value":6
+            }
+        ]
+    },
+    {
+        "id":"arulirmountain_trap_rocks_6",
+        "message":"A big part of the mountain side above you cracks.\nA moment later a pile of rocks rains down on you.",
+        "replies":[
+            {
+                "text":"Ouch! It could have been worse though, without the cap!",
+                "nextPhraseID":"X",
+                "requires":[
+                    {
+                        "requireType":"wear",
+                        "requireID":"arulir_cap"
+                    }
+                ]
+            },
+            {
+                "text":"Ouch!",
+                "nextPhraseID":"X",
+                "requires":[
+                    {
+                        "requireType":"wear",
+                        "requireID":"arulir_cap",
+                        "negate":true
+                    }
+                ]
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"bleeding_wound",
+                "value":7
+            },
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"bleeding_wound",
+                "value":7
+            },
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"crit2",
+                "value":6
+            },
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"crit2",
+                "value":6
+            }
+        ]
+    },
+    {
+        "id":"arulirmountain_trap_hole_6",
+        "message":"You fell into yet another hole and hurt yourself.",
+        "replies":[
+            {
+                "text":"Good footwear is a prerequisite for successful exploration!",
+                "nextPhraseID":"X",
+                "requires":[
+                    {
+                        "requireType":"wear",
+                        "requireID":"arulir_boots",
+                        "value":1
+                    }
+                ]
+            },
+            {
+                "text":"I'm really starting to hate this place!",
+                "nextPhraseID":"X",
+                "requires":[
+                    {
+                        "requireType":"wear",
+                        "requireID":"arulir_boots",
+                        "value":1,
+                        "negate":true
+                    }
+                ]
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"bleeding_wound",
+                "value":9
+            },
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"bleeding_wound",
+                "value":9
+            },
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"bleeding_wound",
+                "value":3
+            },
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"bleeding_wound",
+                "value":3
+            }
+        ]
+    },
+    {
+        "id":"arulirmountain_trap_hole_7",
+        "message":"Guess what - you have found another crack in the ground.",
+        "replies":[
+            {
+                "text":"[singing] How many holes must a man fall down...?",
+                "nextPhraseID":"X"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"bleeding_wound",
+                "value":10
+            },
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"bleeding_wound",
+                "value":10
+            },
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"bleeding_wound",
+                "value":5
+            },
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"bleeding_wound",
+                "value":5
+            }
+        ]
+    },
+    {
+        "id":"arulirmountain_trap_rocks_7",
+        "message":"Seven rocks above your head begin to crack.\nA moment later a pile of rocks rains down on you.",
+        "replies":[
+            {
+                "text":"*Sigh* These rocks are really annoying!",
+                "nextPhraseID":"X",
+                "requires":[
+                    {
+                        "requireType":"wear",
+                        "requireID":"arulir_cap",
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"*Sigh* Even with the protective cap, these rocks are really annoying!",
+                "nextPhraseID":"X",
+                "requires":[
+                    {
+                        "requireType":"wear",
+                        "requireID":"arulir_cap"
+                    }
+                ]
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"bleeding_wound",
+                "value":9
+            },
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"bleeding_wound",
+                "value":9
+            },
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"crit2",
+                "value":8
+            },
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"crit2",
+                "value":8
+            }
+        ]
+    },
+    {
+        "id":"arulircave_secret_open",
+        "message":"You stumble over some rocks. As you fall against the wall, it buckles and the whole wall begins to crumble.",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"arulircave_secret_1"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"arulircave_secret",
+                "value":20
+            }
+        ]
+    },
+    {
+        "id":"arulircave_secret_1",
+        "message":"When the dust clears a bit you can see a small corridor.",
+        "replies":[
+            {
+                "text":"Nice, a secret room!",
+                "nextPhraseID":"X"
+            }
+        ]
+    },
+    {
+        "id":"arulircave_secret",
+        "replies":[
+            {
+                "nextPhraseID":"arulircave_secret_open",
+                "requires":[
+                    {
+                        "requireType":"questLatestProgress",
+                        "requireID":"arulircave_secret",
+                        "value":10
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"X"
+            }
+        ]
+    },
+    {
+        "id":"arulircave_secret_initiate",
+        "replies":[
+            {
+                "nextPhraseID":"X"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"arulircave_secret",
+                "value":10
+            }
+        ]
+    },
+    {
+        "id":"arulircave_trap10",
+        "message":"The ground is very slippery. You can't get back onto the solid rock!",
+        "replies":[
+            {
+                "text":"Oh no...",
+                "nextPhraseID":"X"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"arulircave_trap",
+                "value":10
+            }
+        ]
+    },
+    {
+        "id":"arulircave_trap10_msg",
+        "message":"You slide slowly into the cold water ... you think of Mikhail, and of Andor ... your senses disappear ...",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"arulircave_trap10_msg_2"
+            }
+        ]
+    },
+    {
+        "id":"arulircave_trap10_msg_2",
+        "message":"Shivering you come back to consciousness. The current has taken you a long way, but fortunately you have been washed ashore."
+    },
+    {
+        "id":"arulirmountain_bosstrap_r",
+        "replies":[
+            {
+                "nextPhraseID":"arulirmountain_bosstrap_ry",
+                "requires":[
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"lava_rock_hot",
+                        "value":1
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"arulirmountain_bosstrap_rn"
+            }
+        ]
+    },
+    {
+        "id":"arulirmountain_bosstrap_ry",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"arulirmountain_bosstrap_rs"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"giveItem",
+                "rewardID":"lava_rock_cold",
+                "value":1
+            }
+        ]
+    },
+    {
+        "id":"arulirmountain_bosstrap_rn",
+        "message":"The lava is bubbling and glowing flakes are scorching through your clothes.",
+        "replies":[
+            {
+                "text":"That's hot!",
+                "nextPhraseID":"X"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"giveItem",
+                "rewardID":"lava_rock_hot",
+                "value":1
+            },
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"fire",
+                "value":1
+            }
+        ]
+    },
+    {
+        "id":"arulirmountain_bosstrap_rs",
+        "replies":[
+            {
+                "nextPhraseID":"arulirmountain_bosstrap_ry",
+                "requires":[
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"lava_rock_hot",
+                        "value":1
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"X"
+            }
+        ]
+    },
+    {
+        "id":"arulirmountain_bosstrap",
+        "replies":[
+            {
+                "nextPhraseID":"arulirmountain_bosstrap_b",
+                "requires":[
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"lava_rock_hot",
+                        "value":1
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"arulirmountain_bosstrap_nr"
+            }
+        ]
+    },
+    {
+        "id":"arulirmountain_bosstrap_b",
+        "replies":[
+            {
+                "nextPhraseID":"X"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"fire",
+                "value":2
+            },
+            {
+                "rewardType":"giveItem",
+                "rewardID":"lava_rock_cold",
+                "value":1
+            }
+        ]
+    },
+    {
+        "id":"arulirmountain_bosstrap_nr",
+        "replies":[
+            {
+                "nextPhraseID":"X"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"giveItem",
+                "rewardID":"lava_rock_hot",
+                "value":1
+            }
+        ]
+    },
+    {
+        "id":"do_nothing_but_leave",
+        "replies":[
+            {
+                "nextPhraseID":"X"
+            }
+        ]
+    },
+    {
+        "id":"sign_arulir1",
+        "message":"Danger! Unstable cliffs. Proceed with caution!"
+    },
+    {
+        "id":"sign_arulir2",
+        "message":"Danger! Cave subject to rockfall. Do not enter!"
+    },
+    {
+        "id":"bernhar",
+        "replies":[
+            {
+                "nextPhraseID":"bernhar_16",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"arulircave_non_display",
+                        "value":10
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"bernhar_10"
+            }
+        ]
+    },
+    {
+        "id":"bernhar_10",
+        "message":"Oh - a wandering kid! How surprising!",
+        "replies":[
+            {
+                "text":"Who are you?",
+                "nextPhraseID":"bernhar_12"
+            },
+            {
+                "text":"What are you doing here?",
+                "nextPhraseID":"bernhar_12"
+            }
+        ]
+    },
+    {
+        "id":"bernhar_12",
+        "message":"My name is Bernhar. I am an explorer, and I'm trying to find out something about the cave system here.",
+        "replies":[
+            {
+                "text":"Have you already found something?",
+                "nextPhraseID":"bernhar_20"
+            },
+            {
+                "text":"Ah. Interesting. Keep having fun with it. Bye.",
+                "nextPhraseID":"X"
+            }
+        ]
+    },
+    {
+        "id":"bernhar_16",
+        "message":"Oh - the wandering kid! You are still alive? How surprising!",
+        "replies":[
+            {
+                "text":"Hi Bernhar. I want to talk with you again.",
+                "nextPhraseID":"bernhar_20"
+            }
+        ]
+    },
+    {
+        "id":"bernhar_20",
+        "message":"Sure! I could tell you things...",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"bernhar_30"
+            }
+        ]
+    },
+    {
+        "id":"bernhar_30",
+        "message":"Steep mountain flanks and wide, branching, cave passages! But beware - it is dangerous ground! You must not go unprotected!",
+        "replies":[
+            {
+                "text":"What do you mean by \"unprotected\"?",
+                "nextPhraseID":"bernhar_40"
+            },
+            {
+                "text":"I have heard this before.",
+                "nextPhraseID":"bernhar_32",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"arulircave_non_display",
+                        "value":10
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        "id":"bernhar_32",
+        "message":"You are not taking me seriously. Let me tell you...",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"bernhar_40"
+            }
+        ]
+    },
+    {
+        "id":"bernhar_40",
+        "message":"You are risking your life here. It is not only those Arulir brutes. They are just annoying.",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"bernhar_50"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"arulircave_non_display",
+                "value":10
+            }
+        ]
+    },
+    {
+        "id":"bernhar_50",
+        "message":"The ground is really dangerous. It's deceptive and life-threatening. And there is always the danger of falling rocks from above.",
+        "replies":[
+            {
+                "text":"How did you manage?",
+                "nextPhraseID":"bernhar_60"
+            }
+        ]
+    },
+    {
+        "id":"bernhar_60",
+        "message":"I was only able to survive this far because I was wearing the proper protective gear.",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"bernhar_70"
+            }
+        ]
+    },
+    {
+        "id":"bernhar_70",
+        "message":"I have completed my work here though, so I don't need it any more. I could sell it to you for a good price.",
+        "replies":[
+            {
+                "text":"Great, show me please.",
+                "nextPhraseID":"S"
+            },
+            {
+                "text":"Maybe another time.",
+                "nextPhraseID":"bernhar_80"
+            }
+        ]
+    },
+    {
+        "id":"bernhar_80",
+        "message":"If you go in there unprotected, I fear there will be no other time.",
+        "replies":[
+            {
+                "text":"OK. Let's have a look.",
+                "nextPhraseID":"S"
+            },
+            {
+                "text":"I can handle myself.",
+                "nextPhraseID":"X"
+            }
+        ]
+    },
+    {
+        "id":"bernhar_reminder",
+        "replies":[
+            {
+                "nextPhraseID":"bernhar_reminder_10",
+                "requires":[
+                    {
+                        "requireType":"inventoryKeep",
+                        "requireID":"arulir_cap",
+                        "value":1
+                    },
+                    {
+                        "requireType":"wear",
+                        "requireID":"arulir_cap",
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"arulircave_non_display",
+                        "value":20,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"bernhar_reminder_10",
+                "requires":[
+                    {
+                        "requireType":"inventoryKeep",
+                        "requireID":"arulir_boots",
+                        "value":1
+                    },
+                    {
+                        "requireType":"wear",
+                        "requireID":"arulir_boots",
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"arulircave_non_display",
+                        "value":20,
+                        "negate":true
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        "id":"bernhar_reminder_10",
+        "message":"Hey kid! The protective gear is of no use if you don't wear it!",
+        "switchToNPC":"bernhar",
+        "replies":[
+            {
+                "text":"Oh, yes. Thank you for reminding me!",
+                "nextPhraseID":"X"
+            }
+        ]
+    },
+    {
+        "id":"bernhar_remove",
+        "rewards":[
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"bernhar",
+                "mapName":"arulirmountain1"
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"arulircave_non_display",
+                "value":20
+            }
+        ]
+    },
+    {
+        "id":"tjure",
+        "replies":[
+            {
+                "nextPhraseID":"tjure_200",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"mermaid_scale",
+                        "value":200
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"tjure_100",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"mermaid_scale",
+                        "value":100
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"tjure_90",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"mermaid_scale",
+                        "value":90
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"tjure_30",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"mermaid_scale",
+                        "value":30
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"tjure_20",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"mermaid_scale",
+                        "value":20
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"tjure_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"mermaid_scale",
+                        "value":10
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"tjure_0"
+            }
+        ]
+    },
+    {
+        "id":"tjure_0",
+        "message":"Oh, what a rare surprise!",
+        "replies":[
+            {
+                "text":"Who are you?",
+                "nextPhraseID":"tjure_0_10"
+            },
+            {
+                "text":"What are you doing in such a lonely place?",
+                "nextPhraseID":"tjure_0_10"
+            },
+            {
+                "text":"Eh, sorry to disturb you.",
+                "nextPhraseID":"X"
+            }
+        ]
+    },
+    {
+        "id":"tjure_0_10",
+        "message":"I am Tjure of Brimhaven. I am ... was ... a successful merchant. But my luck has run out.",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"tjure_0_12"
+            }
+        ]
+    },
+    {
+        "id":"tjure_0_12",
+        "message":"All I can do now is hide in this lonely place, far away from any water.",
+        "replies":[
+            {
+                "text":"Aha. I won't bother you then.",
+                "nextPhraseID":"tjure_0_20"
+            },
+            {
+                "text":"Why is that?",
+                "nextPhraseID":"tjure_0_20"
+            }
+        ]
+    },
+    {
+        "id":"tjure_0_20",
+        "message":"I once found a mermaid asleep on the beach of a river. What a beautiful sight! I could not avert my eyes!",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"tjure_0_22"
+            }
+        ]
+    },
+    {
+        "id":"tjure_0_22",
+        "message":"Especially, the colorful tail attracted me so much, that I did something that I have deeply regretted since then.",
+        "replies":[
+            {
+                "text":"What did you do?",
+                "nextPhraseID":"tjure_10"
+            }
+        ]
+    },
+    {
+        "id":"tjure_10",
+        "message":"I pulled out one of her shimmering, dazzling scales, and ran away.",
+        "replies":[
+            {
+                "text":"No! You really did that?",
+                "nextPhraseID":"tjure_10_10"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"mermaid_scale",
+                "value":10
+            }
+        ]
+    },
+    {
+        "id":"tjure_10_10",
+        "message":"The mermaid immediately awoke and was very angry. But on land she had no chance to catch me.",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"tjure_20"
+            }
+        ]
+    },
+    {
+        "id":"tjure_20",
+        "message":"Crying and sobbing, the mermaid called after me. Finally, she screamed at me that I would never find peace, and that I would never want to approach water again!",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"tjure_30"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"mermaid_scale",
+                "value":20
+            }
+        ]
+    },
+    {
+        "id":"tjure_30",
+        "message":"At first I was happy with my shimmering scale. But I soon realized that everything in my life was going wrong.",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"tjure_30_10"
+            }
+        ]
+    },
+    {
+        "id":"tjure_30_10",
+        "message":"I couldn't think of anything else but the wrath of the people of the river.",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"tjure_30_20"
+            }
+        ]
+    },
+    {
+        "id":"tjure_30_20",
+        "message":"What could I do? I tried to throw it away or give it to other people - all in vain.",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"tjure_30_30"
+            }
+        ]
+    },
+    {
+        "id":"tjure_30_30",
+        "message":"I traveled all over Dhayavar to find someone to help me. Finally, a wise woman, far in the northeast, listened to my story. She advised me to return the scale to the mermaid. This would break the curse.",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"tjure_30_32"
+            }
+        ]
+    },
+    {
+        "id":"tjure_30_32",
+        "message":"But I did not dare to do this.",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"tjure_30_34"
+            }
+        ]
+    },
+    {
+        "id":"tjure_30_34",
+        "message":"She told me that my only other option was to find some kind-hearted person to buy it from me, but then they take on the curse.",
+        "replies":[
+            {
+                "text":"Who would be that stupid?",
+                "nextPhraseID":"tjure_30_40"
+            },
+            {
+                "text":"Let me be the one to rescue you. Sell me the scale.",
+                "nextPhraseID":"tjure_30_90"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"mermaid_scale",
+                "value":30
+            }
+        ]
+    },
+    {
+        "id":"tjure_30_40",
+        "message":"I know, I know. When they heard my story, everybody ran away.",
+        "replies":[
+            {
+                "text":"That's too bad. I hope that you will find someone to buy it. Bye.",
+                "nextPhraseID":"tjure_30_50"
+            },
+            {
+                "text":"Not me. I will buy the scale.",
+                "nextPhraseID":"tjure_30_90"
+            }
+        ]
+    },
+    {
+        "id":"tjure_30_50",
+        "message":"So you really won't help me? You will leave me to my misery?",
+        "replies":[
+            {
+                "text":"Sorry, I can't do it. Bye.",
+                "nextPhraseID":"tjure_90"
+            },
+            {
+                "text":"I have to think about it.",
+                "nextPhraseID":"X"
+            },
+            {
+                "text":"OK. maybe I am stupid, but sell me the scale.",
+                "nextPhraseID":"tjure_30_90"
+            }
+        ]
+    },
+    {
+        "id":"tjure_30_90",
+        "message":"Here, take it! I have to request gold for it, otherwise it won't work. But one piece of gold should be enough.",
+        "replies":[
+            {
+                "text":"No problem, here, take the gold.",
+                "nextPhraseID":"tjure_30_92",
+                "requires":[
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"gold",
+                        "value":1
+                    }
+                ]
+            },
+            {
+                "text":"Forget it.",
+                "nextPhraseID":"X"
+            }
+        ]
+    },
+    {
+        "id":"tjure_30_92",
+        "message":"(As soon as you take the scale in your hands, a great sluggishness and a feeling of despair come over you.)",
+        "switchToNPC":"none",
+        "replies":[
+            {
+                "text":"I feel ... strange!",
+                "nextPhraseID":"tjure_30_94"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"mermaid_scale",
+                "value":100
+            },
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"mermaid_scale",
+                "value":999
+            }
+        ]
+    },
+    {
+        "id":"tjure_30_94",
+        "message":"(For a second you feel very dizzy. At least you manage not to faint. As from afar you hear a voice.)",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"tjure_100"
+            }
+        ]
+    },
+    {
+        "id":"tjure_90",
+        "message":"*Sigh* You were my last hope. Leave me now.",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"mermaid_scale",
+                "value":90
+            }
+        ]
+    },
+    {
+        "id":"tjure_100",
+        "message":"Thank you for your help.",
+        "switchToNPC":"tjure"
+    },
+    {
+        "id":"tjure_200",
+        "message":"Oh, you look better than the last time we met. Thank you for your help."
+    },
+    {
+        "id":"watermark_script",
+        "replies":[
+            {
+                "nextPhraseID":"watermark_script_210",
+                "requires":[
+                    {
+                        "requireType":"questLatestProgress",
+                        "requireID":"mermaid_scale",
+                        "value":210
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"watermark_script_100",
+                "requires":[
+                    {
+                        "requireType":"questLatestProgress",
+                        "requireID":"mermaid_scale",
+                        "value":100
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        "id":"watermark_script_100",
+        "message":"This seems to be a very strange place. Maybe even dangerous.",
+        "replies":[
+            {
+                "text":"* Put the scale on the ground *",
+                "nextPhraseID":"watermark_script_100_10"
+            },
+            {
+                "text":"* Run for your life *",
+                "nextPhraseID":"X"
+            }
+        ]
+    },
+    {
+        "id":"watermark_script_100_10",
+        "message":"What a relief! You suddenly feel lighthearted again.",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"mermaid_scale",
+                "value":200
+            },
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"mermaid_scale",
+                "value":-99
+            }
+        ]
+    },
+    {
+        "id":"watermark_script2",
+        "replies":[
+            {
+                "nextPhraseID":"watermark_script_200",
+                "requires":[
+                    {
+                        "requireType":"questLatestProgress",
+                        "requireID":"mermaid_scale",
+                        "value":200
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        "id":"watermark_script_200",
+        "message":"Suddenly, you hear someone singing.",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"watermark_script_200_10"
+            }
+        ]
+    },
+    {
+        "id":"watermark_script_200_10",
+        "message":"You never heard such a beautiful sound before.",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"mermaid_scale",
+                "value":210
+            }
+        ]
+    },
+    {
+        "id":"watermark_script_210",
+        "message":"You found a heavy bag of gold. 1000 shining pieces of gold!",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"mermaid_scale",
+                "value":220
+            },
+            {
+                "rewardType":"giveItem",
+                "rewardID":"gold",
+                "value":1000
+            }
+        ]
+    },
+    {
+        "id":"blackwater_mountain5a_00",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"blackwater_mountain5a_01",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"misc_nondisplay ",
+                        "value":10,
+                        "negate":true
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        "id":"blackwater_mountain5a_01",
+        "message":"You have found a small, shiny, metal bar. ",
+        "rewards":[
+            {
+                "rewardType":"giveItem",
+                "rewardID":"silver_bar",
+                "value":1
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"misc_nondisplay ",
+                "value":10
+            }
+        ]
+    },
+    {
+        "id":"lonely_wolf",
+        "switchToNPC":"lonely_wolf",
+        "replies":[
+            {
+                "nextPhraseID":"F"
+            }
+        ]
+    }
+]
\ No newline at end of file
diff --git a/AndorsTrail/res/raw/conversationlist_burhczyd.json b/AndorsTrail/res/raw/conversationlist_burhczyd.json
new file mode 100644
index 000000000..f615e7e77
--- /dev/null
+++ b/AndorsTrail/res/raw/conversationlist_burhczyd.json
@@ -0,0 +1,2770 @@
+[
+    {
+        "id":"burhczyd1",
+        "replies":[
+            {
+                "nextPhraseID":"burhczydx_90",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"quest_burhczyd_nd",
+                        "value":61
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"burhczydx_10"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":71
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":72
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":73
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":74
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":75
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":76
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":77
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":78
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":79
+            }
+        ]
+    },
+    {
+        "id":"burhczyd2",
+        "replies":[
+            {
+                "nextPhraseID":"burhczydx_90",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"quest_burhczyd_nd",
+                        "value":62
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"burhczydx_10"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":71
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":72
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":73
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":74
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":75
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":76
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":77
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":78
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":79
+            }
+        ]
+    },
+    {
+        "id":"burhczyd3",
+        "replies":[
+            {
+                "nextPhraseID":"burhczydx_90",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"quest_burhczyd_nd",
+                        "value":63
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"burhczydx_10"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":71
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":72
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":73
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":74
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":75
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":76
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":77
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":78
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":79
+            }
+        ]
+    },
+    {
+        "id":"burhczyd4",
+        "replies":[
+            {
+                "nextPhraseID":"burhczydx_90",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"quest_burhczyd_nd",
+                        "value":64
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"burhczydx_10"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":71
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":72
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":73
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":74
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":75
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":76
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":77
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":78
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":79
+            }
+        ]
+    },
+    {
+        "id":"burhczyd5",
+        "replies":[
+            {
+                "nextPhraseID":"burhczydx_90",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"quest_burhczyd_nd",
+                        "value":65
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"burhczydx_10"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":71
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":72
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":73
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":74
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":75
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":76
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":77
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":78
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":79
+            }
+        ]
+    },
+    {
+        "id":"burhczyd6",
+        "replies":[
+            {
+                "nextPhraseID":"burhczydx_90",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"quest_burhczyd_nd",
+                        "value":66
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"burhczydx_10"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":71
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":72
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":73
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":74
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":75
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":76
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":77
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":78
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":79
+            }
+        ]
+    },
+    {
+        "id":"burhczyd7",
+        "replies":[
+            {
+                "nextPhraseID":"burhczydx_90",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"quest_burhczyd_nd",
+                        "value":67
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"burhczydx_10"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":71
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":72
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":73
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":74
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":75
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":76
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":77
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":78
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":79
+            }
+        ]
+    },
+    {
+        "id":"burhczyd8",
+        "replies":[
+            {
+                "nextPhraseID":"burhczydx_90",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"quest_burhczyd_nd",
+                        "value":68
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"burhczydx_10"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":71
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":72
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":73
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":74
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":75
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":76
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":77
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":78
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":79
+            }
+        ]
+    },
+    {
+        "id":"burhczyd9",
+        "replies":[
+            {
+                "nextPhraseID":"burhczydx_90",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"quest_burhczyd_nd",
+                        "value":69
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"burhczydx_10"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":71
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":72
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":73
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":74
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":75
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":76
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":77
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":78
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":79
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_10",
+        "replies":[
+            {
+                "nextPhraseID":"burhczydx_10_1",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"quest_burhczyd_nd",
+                        "value":61
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"quest_burhczyd_nd",
+                        "value":71,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"burhczydx_10_2",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"quest_burhczyd_nd",
+                        "value":62
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"quest_burhczyd_nd",
+                        "value":72,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"burhczydx_10_3",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"quest_burhczyd_nd",
+                        "value":63
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"quest_burhczyd_nd",
+                        "value":73,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"burhczydx_10_4",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"quest_burhczyd_nd",
+                        "value":64
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"quest_burhczyd_nd",
+                        "value":74,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"burhczydx_10_5",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"quest_burhczyd_nd",
+                        "value":65
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"quest_burhczyd_nd",
+                        "value":75,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"burhczydx_10_6",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"quest_burhczyd_nd",
+                        "value":66
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"quest_burhczyd_nd",
+                        "value":76,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"burhczydx_10_7",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"quest_burhczyd_nd",
+                        "value":67
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"quest_burhczyd_nd",
+                        "value":77,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"burhczydx_10_8",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"quest_burhczyd_nd",
+                        "value":68
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"quest_burhczyd_nd",
+                        "value":78,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"burhczydx_10_9",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"quest_burhczyd_nd",
+                        "value":69
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"quest_burhczyd_nd",
+                        "value":79,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"burhczydx_50"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_10_1",
+        "replies":[
+            {
+                "nextPhraseID":"burhczydx_50"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"burhczyd1",
+                "mapName":"crossglen_hall"
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":61
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_10_2",
+        "replies":[
+            {
+                "nextPhraseID":"burhczydx_50"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"burhczyd2",
+                "mapName":"fallhaven_tavern"
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":62
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_10_3",
+        "replies":[
+            {
+                "nextPhraseID":"burhczydx_50"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"burhczyd3",
+                "mapName":"loneford6"
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":63
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_10_4",
+        "replies":[
+            {
+                "nextPhraseID":"burhczydx_50"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"burhczyd4",
+                "mapName":"vilegard_tavern"
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":64
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_10_5",
+        "replies":[
+            {
+                "nextPhraseID":"burhczydx_50"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"burhczyd5",
+                "mapName":"stoutford_tavern"
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":65
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_10_6",
+        "replies":[
+            {
+                "nextPhraseID":"burhczydx_50"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"burhczyd6",
+                "mapName":"blackwater_mountain43"
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":66
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_10_7",
+        "replies":[
+            {
+                "nextPhraseID":"burhczydx_50"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"burhczyd7",
+                "mapName":"remgard_tavern0"
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":67
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_10_8",
+        "replies":[
+            {
+                "nextPhraseID":"burhczydx_50"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"burhczyd8",
+                "mapName":"crossglen_hall"
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":68
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_10_9",
+        "replies":[
+            {
+                "nextPhraseID":"burhczydx_50"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"removeSpawnArea",
+                "rewardID":"burhczyd9",
+                "mapName":"blackwater_mountain22"
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":69
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_50",
+        "replies":[
+            {
+                "nextPhraseID":"burhczydx_9a",
+                "requires":[
+                    {
+                        "requireType":"questLatestProgress",
+                        "requireID":"quest_burhczyd",
+                        "value":80
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"burhczydx_8a",
+                "requires":[
+                    {
+                        "requireType":"questLatestProgress",
+                        "requireID":"quest_burhczyd",
+                        "value":70
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"burhczydx_7a",
+                "requires":[
+                    {
+                        "requireType":"questLatestProgress",
+                        "requireID":"quest_burhczyd",
+                        "value":60
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"burhczydx_6a",
+                "requires":[
+                    {
+                        "requireType":"questLatestProgress",
+                        "requireID":"quest_burhczyd",
+                        "value":50
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"burhczydx_5a",
+                "requires":[
+                    {
+                        "requireType":"questLatestProgress",
+                        "requireID":"quest_burhczyd",
+                        "value":40
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"burhczydx_4a",
+                "requires":[
+                    {
+                        "requireType":"questLatestProgress",
+                        "requireID":"quest_burhczyd",
+                        "value":30
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"burhczydx_3a",
+                "requires":[
+                    {
+                        "requireType":"questLatestProgress",
+                        "requireID":"quest_burhczyd",
+                        "value":20
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"burhczydx_2a",
+                "requires":[
+                    {
+                        "requireType":"questLatestProgress",
+                        "requireID":"quest_burhczyd",
+                        "value":10
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"burhczydx_1a"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_90",
+        "replies":[
+            {
+                "nextPhraseID":"burhczydx_9e",
+                "requires":[
+                    {
+                        "requireType":"questLatestProgress",
+                        "requireID":"quest_burhczyd",
+                        "value":90
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"burhczydx_8e",
+                "requires":[
+                    {
+                        "requireType":"questLatestProgress",
+                        "requireID":"quest_burhczyd",
+                        "value":80
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"burhczydx_7e",
+                "requires":[
+                    {
+                        "requireType":"questLatestProgress",
+                        "requireID":"quest_burhczyd",
+                        "value":70
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"burhczydx_6e",
+                "requires":[
+                    {
+                        "requireType":"questLatestProgress",
+                        "requireID":"quest_burhczyd",
+                        "value":60
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"burhczydx_5e",
+                "requires":[
+                    {
+                        "requireType":"questLatestProgress",
+                        "requireID":"quest_burhczyd",
+                        "value":50
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"burhczydx_4e",
+                "requires":[
+                    {
+                        "requireType":"questLatestProgress",
+                        "requireID":"quest_burhczyd",
+                        "value":40
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"burhczydx_3e",
+                "requires":[
+                    {
+                        "requireType":"questLatestProgress",
+                        "requireID":"quest_burhczyd",
+                        "value":30
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"burhczydx_2e",
+                "requires":[
+                    {
+                        "requireType":"questLatestProgress",
+                        "requireID":"quest_burhczyd",
+                        "value":20
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"burhczydx_1e",
+                "requires":[
+                    {
+                        "requireType":"questLatestProgress",
+                        "requireID":"quest_burhczyd",
+                        "value":10
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_xa",
+        "replies":[
+            {
+                "nextPhraseID":"burhczyd1_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"quest_burhczyd_nd",
+                        "value":71
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"burhczyd2_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"quest_burhczyd_nd",
+                        "value":72
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"burhczyd3_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"quest_burhczyd_nd",
+                        "value":73
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"burhczyd4_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"quest_burhczyd_nd",
+                        "value":74
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"burhczyd5_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"quest_burhczyd_nd",
+                        "value":75
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"burhczyd6_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"quest_burhczyd_nd",
+                        "value":76
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"burhczyd7_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"quest_burhczyd_nd",
+                        "value":77
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"burhczyd8_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"quest_burhczyd_nd",
+                        "value":78
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"burhczyd9_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"quest_burhczyd_nd",
+                        "value":79
+                    }
+                ]
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"alignmentChange",
+                "rewardID":"fct_burhczyd",
+                "value":1
+            }
+        ]
+    },
+    {
+        "id":"burhczyd1_10",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":61
+            }
+        ]
+    },
+    {
+        "id":"burhczyd2_10",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":62
+            }
+        ]
+    },
+    {
+        "id":"burhczyd3_10",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":63
+            }
+        ]
+    },
+    {
+        "id":"burhczyd4_10",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":64
+            }
+        ]
+    },
+    {
+        "id":"burhczyd5_10",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":65
+            }
+        ]
+    },
+    {
+        "id":"burhczyd6_10",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":66
+            }
+        ]
+    },
+    {
+        "id":"burhczyd7_10",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":67
+            }
+        ]
+    },
+    {
+        "id":"burhczyd8_10",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":68
+            }
+        ]
+    },
+    {
+        "id":"burhczyd9_10",
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":69
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_1a",
+        "message":"Hi, who are you? I have never seen you here.",
+        "replies":[
+            {
+                "text":"My name is $playername. I am from Crossglen.",
+                "nextPhraseID":"burhczydx_1a_2"
+            },
+            {
+                "text":"My father always told me not to talk to strangers.",
+                "nextPhraseID":"X"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_1a_2",
+        "message":"Cool. I am Burhczyd afgz Dtaloumiye. Nice to meet you.",
+        "replies":[
+            {
+                "text":"Burh... - eh, OK. Do you live here in this town?",
+                "nextPhraseID":"burhczydx_1a_3"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_1a_3",
+        "message":"Yes. At least until now. My parents gave me some money so that I could tour the world. This morning I set off, and I'm staying here in the inn. However, I will have to earn some more money, otherwise it will be a short trip.",
+        "replies":[
+            {
+                "text":"Yes, some gold always helps. Hmm, maybe you can kill two birds with one stone.",
+                "nextPhraseID":"burhczydx_1a_4"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_1a_4",
+        "message":"What are you talking about?",
+        "replies":[
+            {
+                "text":"Take a cart and start a transport company. You can deliver goods to different cities and get some money.",
+                "nextPhraseID":"burhczydx_1a_5"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_1a_5",
+        "message":"Wow, splendid idea! I will take my fathers cart. Then all I need is a name for my company. Thanks for this tip.",
+        "replies":[
+            {
+                "text":"My pleasure.",
+                "nextPhraseID":"burhczydx_1a_9"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_1a_9",
+        "replies":[
+            {
+                "nextPhraseID":"burhczydx_xa"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"quest_burhczyd",
+                "value":10
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_1e",
+        "message":"I am still thinking about what to call my company. As soon as I have a name, I'll start."
+    },
+    {
+        "id":"burhczydx_2a",
+        "message":"Hi, we know each other! Unfortunately I forgot your name. Come, have a drink with me. How are you?",
+        "replies":[
+            {
+                "text":"My name is $playername. And you are called something with Brr, as far as I can remember.",
+                "nextPhraseID":"burhczydx_2a_2"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_2a_2",
+        "message":"Yes, almost: My name is Burhczyd afgz Dtaloumiye. I opened a transport company, as you suggested.",
+        "replies":[
+            {
+                "text":"Great to hear! Is it going well? Do you already have many customers?",
+                "nextPhraseID":"burhczydx_2a_3"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_2a_3",
+        "message":"Well, there are not too many yet.",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"burhczydx_2a_4"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_2a_4",
+        "message":"More precisely, none at all.",
+        "replies":[
+            {
+                "text":"Really? Why is this?",
+                "nextPhraseID":"burhczydx_2a_5"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_2a_5",
+        "message":"I have no idea. My beautiful cart with BURHCZYD AFGZ DTALOUMIYE - TRANSPORTS written in big white letters always runs empty.",
+        "replies":[
+            {
+                "text":"Good grief! What did you name your company?!",
+                "nextPhraseID":"burhczydx_2a_6"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_2a_6",
+        "message":"'Burhczyd afgz Dtaloumiye - Transports'. Is there a problem with that?",
+        "replies":[
+            {
+                "text":"Nobody can pronounce that name, let alone remember it. No wonder you do not get any orders!",
+                "nextPhraseID":"burhczydx_2a_7"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_2a_7",
+        "message":"Do you really think so?",
+        "replies":[
+            {
+                "text":"Sure. You have to use a short and catchy name.",
+                "nextPhraseID":"burhczydx_2a_8"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_2a_8",
+        "message":"OK, I'll think about a better company name.",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"burhczydx_2a_9"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_2a_9",
+        "replies":[
+            {
+                "nextPhraseID":"burhczydx_xa"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"quest_burhczyd",
+                "value":20
+            },
+            {
+                "rewardType":"spawnAll",
+                "rewardID":"burhczyd1",
+                "mapName":"crossglen_hall"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_2e",
+        "message":"I am still thinking about a better name for my company. As soon as I have it, I'll leave."
+    },
+    {
+        "id":"burhczydx_3a",
+        "message":"Hello ... eh, sorry, I forgot your name. How are you?",
+        "replies":[
+            {
+                "text":"I am $playername. How's business?",
+                "nextPhraseID":"burhczydx_3a_2"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_3a_2",
+        "message":"Don't ask. Still no orders. And I have now idea why.",
+        "replies":[
+            {
+                "text":"That's horrible! What did you call your company? It should be short and memorable.",
+                "nextPhraseID":"burhczydx_3a_3"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_3a_3",
+        "message":"Yes, that's what I've done. You said 'Burhczyd afgz Dtaloumiye' was be too long and hard to remember, so I simply chose the initials of my name. Clever, right?",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"burhczydx_3a_4"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_3a_4",
+        "message":"It is now: 'B.A.D. TRANSPORTS' - it looks great!",
+        "replies":[
+            {
+                "text":"You can't be serious!  BAD TRANSPORTS? Tell me that's just a joke!",
+                "nextPhraseID":"burhczydx_3a_5"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_3a_5",
+        "message":"Oh no! Did I get it wrong again? Nothing I do ever works. (sob)",
+        "replies":[
+            {
+                "text":"Look, just call your company 'Easy Transports'. That will do.",
+                "nextPhraseID":"burhczydx_3a_6"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_3a_6",
+        "message":"OK, thank you. I'll try. Later. Tomorrow. Maybe. (sob)",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"burhczydx_3a_9"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_3a_9",
+        "replies":[
+            {
+                "nextPhraseID":"burhczydx_xa"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"quest_burhczyd",
+                "value":30
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_3e",
+        "message":"Only one more beer, then I'll leave."
+    },
+    {
+        "id":"burhczydx_4a",
+        "message":"Hello, what's-your-name? How are you?",
+        "replies":[
+            {
+                "text":"I am fine. And my name is $playername, as you should know by now.",
+                "nextPhraseID":"burhczydx_4a_2"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_4a_2",
+        "message":"I am Burhczyd afgz Dtaloumiye, proud owner of Easy Transports.",
+        "replies":[
+            {
+                "text":"The last time we saw each other, you did not have any transport orders yet.",
+                "nextPhraseID":"burhczydx_4a_3"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_4a_3",
+        "message":"Oh, that has completely changed. I am into big business now. ",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"burhczydx_4a_4"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_4a_4",
+        "message":"I just got a cartload of fresh fish in Remgard. I think I will sell it here with a high profit.",
+        "replies":[
+            {
+                "text":"Fish?",
+                "nextPhraseID":"burhczydx_4a_5"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_4a_5",
+        "message":"In the last two cities, they could not afford to buy this quality fish. But it will work here. Certainly.",
+        "replies":[
+            {
+                "text":"Fresh fish - from Remgard?",
+                "nextPhraseID":"burhczydx_4a_6"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_4a_6",
+        "message":"Of course from Remgard, their fish is the best - a rare delicacy in this area!",
+        "replies":[
+            {
+                "text":"Rare yes, but still delicious?",
+                "nextPhraseID":"burhczydx_4a_7"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_4a_7",
+        "message":"What?",
+        "replies":[
+            {
+                "text":"Nothing. Because we have known each other for so long, I will suggest something.",
+                "nextPhraseID":"burhczydx_4a_8"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_4a_8",
+        "message":"Fire away. Your ideas are always good.",
+        "replies":[
+            {
+                "text":"I will buy your fish for, say, 1000 gold pieces.",
+                "nextPhraseID":"burhczydx_4a_9",
+                "requires":[
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"gold",
+                        "value":1000
+                    }
+                ]
+            },
+            {
+                "text":"I will buy your fish for, say, 100 gold pieces.",
+                "nextPhraseID":"burhczydx_4a_9",
+                "requires":[
+                    {
+                        "requireType":"inventoryKeep",
+                        "requireID":"gold",
+                        "value":1000,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"gold",
+                        "value":100
+                    }
+                ]
+            },
+            {
+                "text":"I will buy your fish for, say, 10 gold pieces.",
+                "nextPhraseID":"burhczydx_4a_9",
+                "requires":[
+                    {
+                        "requireType":"inventoryKeep",
+                        "requireID":"gold",
+                        "value":100,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"gold",
+                        "value":10
+                    }
+                ]
+            },
+            {
+                "text":"I will take your fish, but I can't give you any money.",
+                "nextPhraseID":"burhczydx_4a_9",
+                "requires":[
+                    {
+                        "requireType":"inventoryKeep",
+                        "requireID":"gold",
+                        "value":10,
+                        "negate":true
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_4a_9",
+        "message":"Oh.",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"burhczydx_4a_10"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_4a_10",
+        "message":"Well. Take it.",
+        "replies":[
+            {
+                "text":"No, no! It is not for me. Unload the fish in the nearest forest and make a burnt offering.",
+                "nextPhraseID":"burhczydx_4a_11"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_4a_11",
+        "message":"That is a great idea! The better the offering, the greater the help will be.",
+        "replies":[
+            {
+                "text":"Sure.",
+                "nextPhraseID":"burhczydx_4a_12"
+            },
+            {
+                "text":"I hope it doesn't work the other way around",
+                "nextPhraseID":"burhczydx_4a_12"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_4a_12",
+        "message":"Let's have a drink on this splendid idea!",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"burhczydx_4a_90"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_4a_90",
+        "replies":[
+            {
+                "nextPhraseID":"burhczydx_xa"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"quest_burhczyd",
+                "value":40
+            },
+            {
+                "rewardType":"spawnAll",
+                "rewardID":"burhczyd7",
+                "mapName":"remgard_tavern0"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_4e",
+        "message":"Let's have another drink on this splendid idea, before I leave to do the offering."
+    },
+    {
+        "id":"burhczydx_5a",
+        "message":"Hi Jakora.",
+        "replies":[
+            {
+                "text":"Jakora? No, my name is $playername.",
+                "nextPhraseID":"burhczydx_5a_2"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_5a_2",
+        "message":"Is it? Anyway. Nice to meet you here. I want to thank you for your good advice.",
+        "replies":[
+            {
+                "text":"Oh, it is nothing.",
+                "nextPhraseID":"burhczydx_5a_3"
+            },
+            {
+                "text":"You really needed it.",
+                "nextPhraseID":"burhczydx_5a_3"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_5a_3",
+        "message":"Yes. Immediately after the burnt offering, I was able to complete a very profitable trade.",
+        "replies":[
+            {
+                "text":"Indeed? Great!",
+                "nextPhraseID":"burhczydx_5a_4"
+            },
+            {
+                "text":"It's about time!",
+                "nextPhraseID":"burhczydx_5a_4"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_5a_4",
+        "message":"Just look at this heavy bag of gold!",
+        "replies":[
+            {
+                "text":"I am very impressed. What was the trade?",
+                "nextPhraseID":"burhczydx_5a_5"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_5a_5",
+        "message":"It was a very simple thing. Fast and easy gold.",
+        "replies":[
+            {
+                "text":"Tell me, what was the trade for?",
+                "nextPhraseID":"burhczydx_5a_6"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_5a_6",
+        "message":"I sold my cart! Together with the horse - now I even save the money for its food.",
+        "replies":[
+            {
+                "text":"Ah. OK, but what do you intend to use to transport the next load?",
+                "nextPhraseID":"burhczydx_5a_7"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_5a_7",
+        "message":"Oh, right. I hadn't thought of that. My father doesn't have another cart, so I will look for something else to do.",
+        "replies":[
+            {
+                "text":"So we have to think about what else you might do. Do you have any musical talent?",
+                "nextPhraseID":"burhczydx_5a_8"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_5a_8",
+        "message":"Oh yeah! I always liked to play the lute and sing! With the money I have I can buy the best lute in the country!",
+        "replies":[
+            {
+                "text":"I wish you the best of luck!",
+                "nextPhraseID":"burhczydx_5a_9"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_5a_9",
+        "replies":[
+            {
+                "nextPhraseID":"burhczydx_xa"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"quest_burhczyd",
+                "value":50
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_5e",
+        "message":"Before I leave, we should drink to a good start."
+    },
+    {
+        "id":"burhczydx_6a",
+        "message":"... THERE WAAAS A GIIIRL AT THE GAAAATE ...",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"burhczydx_6a_2"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_6a_2",
+        "message":"... WITH TEAAAAARS IN HER EYEEES ...",
+        "replies":[
+            {
+                "text":"Oh dear - it is Burhczyd.",
+                "nextPhraseID":"burhczydx_6a_3"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_6a_3",
+        "message":"... AAAAAAND IT WAS NIIIIGHT!",
+        "replies":[
+            {
+                "text":"Finally. Bravo! More! But not now, please.",
+                "nextPhraseID":"burhczydx_6a_4"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_6a_4",
+        "message":"Hey, my biggest fan. How did you find me?",
+        "replies":[
+            {
+                "text":"You were incredible.",
+                "nextPhraseID":"burhczydx_6a_5"
+            },
+            {
+                "text":"Easy, just follow the noise.",
+                "nextPhraseID":"burhczydx_6a_5"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_6a_5",
+        "message":"Thank you, I know. What is your name again?",
+        "replies":[
+            {
+                "text":"$playername. Is my name that difficult?",
+                "nextPhraseID":"burhczydx_6a_5b"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_6a_5b",
+        "message":"Eh, wait. Do you have any idea why the landlord is coming for me with a thick wooden club?",
+        "replies":[
+            {
+                "text":"It's probably best that you promise him that you will not sing anymore.",
+                "nextPhraseID":"burhczydx_6a_6"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_6a_6",
+        "message":"Was it that bad?",
+        "replies":[
+            {
+                "text":"Honestly? Yes.",
+                "nextPhraseID":"burhczydx_6a_7"
+            },
+            {
+                "text":"You could sing in a troll band.",
+                "nextPhraseID":"burhczydx_6a_7"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_6a_7",
+        "message":"Sigh. My mother always loved my music.",
+        "replies":[
+            {
+                "text":"Your lute skills are actually quite good. Maybe just try it without singing.",
+                "nextPhraseID":"burhczydx_6a_8"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_6a_8",
+        "message":"OK, I will try that. But I think it would be better if it were not here. The landlord is still looking at me suspiciously.",
+        "replies":[
+            {
+                "text":"That would be good!",
+                "nextPhraseID":"burhczydx_6a_9"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_6a_9",
+        "replies":[
+            {
+                "nextPhraseID":"burhczydx_xa"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"quest_burhczyd",
+                "value":60
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_6e",
+        "message":"The landlord is still watching me - I had better not move."
+    },
+    {
+        "id":"burhczydx_7a",
+        "message":"Hey, nice to meet you again!",
+        "replies":[
+            {
+                "text":"You forgot my name again, didn't you? I am $playername.",
+                "nextPhraseID":"burhczydx_7a_2"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_7a_2",
+        "message":"Yes. Sigh.",
+        "replies":[
+            {
+                "text":"What's up with you?",
+                "nextPhraseID":"burhczydx_7a_3"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_7a_3",
+        "message":"Look here, my lute. The best instrument in the country. And I'm not allowed to play here.",
+        "replies":[
+            {
+                "text":"Why not?",
+                "nextPhraseID":"burhczydx_7a_4"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_7a_4",
+        "message":"I played so well and charmingly, that the guests forgot everything around them.",
+        "replies":[
+            {
+                "text":"But that is great!",
+                "nextPhraseID":"burhczydx_7a_5"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_7a_5",
+        "message":"They even forgot to order something to drink.",
+        "replies":[
+            {
+                "text":"And the landlord was not amused?",
+                "nextPhraseID":"burhczydx_7a_6"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_7a_6",
+        "message":"Yes. Sigh. He forbade me to continue making music.",
+        "replies":[
+            {
+                "text":"You are really unlucky.",
+                "nextPhraseID":"burhczydx_7a_7"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_7a_7",
+        "message":"Now I have to think again about what to do next.",
+        "replies":[
+            {
+                "text":"I am sure you will come up with something.",
+                "nextPhraseID":"burhczydx_7a_9"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_7a_9",
+        "replies":[
+            {
+                "nextPhraseID":"burhczydx_xa"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"quest_burhczyd",
+                "value":70
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_7e",
+        "message":"As soon as I know what I'm going to do next, I'll leave."
+    },
+    {
+        "id":"burhczydx_8a",
+        "message":"Hi $playername.",
+        "replies":[
+            {
+                "text":"Hi Burhczyd. You remembered my name!",
+                "nextPhraseID":"burhczydx_8a_2"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_8a_2",
+        "message":"Sure I did. And I also have learned a new profession. I am already rather good.",
+        "replies":[
+            {
+                "text":"Great to hear! Tell me more.",
+                "nextPhraseID":"burhczydx_8a_3"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_8a_3",
+        "message":"I talk to people in places like this. Taverns and such.",
+        "replies":[
+            {
+                "text":"Yes. And...?",
+                "nextPhraseID":"burhczydx_8a_4"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_8a_4",
+        "message":"We talk about everything; the world, magic rings, dragons, everything. We become more and more familiar.",
+        "replies":[
+            {
+                "text":"And by doing that you get a beer or two?",
+                "nextPhraseID":"burhczydx_8a_5"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_8a_5",
+        "message":"Ha ha ha. Much better. People start to trust me. A great feeling.",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"burhczydx_8a_5_81"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_8a_5_81",
+        "replies":[
+            {
+                "nextPhraseID":"burhczydx_8a_5_81a",
+                "requires":[
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"gold",
+                        "value":100
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"burhczydx_8a_5_82"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_8a_5_81a",
+        "replies":[
+            {
+                "nextPhraseID":"burhczydx_8a_5_82"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":81
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_8a_5_82",
+        "replies":[
+            {
+                "nextPhraseID":"burhczydx_8a_5_82a",
+                "requires":[
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"necklace_undead",
+                        "value":1
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"burhczydx_8a_5_83"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_8a_5_82a",
+        "replies":[
+            {
+                "nextPhraseID":"burhczydx_8a_5_83"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":82
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_8a_5_83",
+        "replies":[
+            {
+                "nextPhraseID":"burhczydx_8a_5_83a",
+                "requires":[
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"ring_mikhail",
+                        "value":1
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"burhczydx_8a_5_84"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_8a_5_83a",
+        "replies":[
+            {
+                "nextPhraseID":"burhczydx_8a_5_84"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":83
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_8a_5_84",
+        "replies":[
+            {
+                "nextPhraseID":"burhczydx_8a_5_84a",
+                "requires":[
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"gem2",
+                        "value":1
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"burhczydx_8a_5_85"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_8a_5_84a",
+        "replies":[
+            {
+                "nextPhraseID":"burhczydx_8a_5_85"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":84
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_8a_5_85",
+        "replies":[
+            {
+                "nextPhraseID":"burhczydx_8a_5_85a",
+                "requires":[
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"dagger_shadow_priests",
+                        "value":1
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"burhczydx_8a_6"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_8a_5_85a",
+        "replies":[
+            {
+                "nextPhraseID":"burhczydx_8a_6"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":85
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_8a_6",
+        "message":"And when they leave, they don't even miss their purse or jewels.",
+        "replies":[
+            {
+                "text":"You are a pick pocket?!",
+                "nextPhraseID":"burhczydx_8a_7"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_8a_7",
+        "message":"Hush, not so loud. No, I'm not an ordinary pickpocket. I became a master thief.",
+        "replies":[
+            {
+                "text":"Oh dear. I didn't expect that from you.",
+                "nextPhraseID":"burhczydx_8a_8"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_8a_8",
+        "message":"I am finished here for now. As soon as the moment is right, I will disappear.",
+        "replies":[
+            {
+                "text":"I am still surprised.",
+                "nextPhraseID":"burhczydx_8a_9"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_8a_9",
+        "replies":[
+            {
+                "nextPhraseID":"burhczydx_xa"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"quest_burhczyd",
+                "value":80
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_8e",
+        "message":"As soon as the moment is right, I will go."
+    },
+    {
+        "id":"burhczydx_9a",
+        "message":"Hi $playername.",
+        "replies":[
+            {
+                "text":"Hi Burhczyd",
+                "nextPhraseID":"burhczydx_9a_2"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_9a_2",
+        "message":"I have a bad conscience.",
+        "replies":[
+            {
+                "text":"Why? Did you do something wrong?",
+                "nextPhraseID":"burhczydx_9a_3"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_9a_3",
+        "message":"Yes, I did something very wrong.",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"burhczydx_9a_4"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_9a_4",
+        "message":"I never should have done that to a friend.",
+        "replies":[
+            {
+                "text":"What do you mean?",
+                "nextPhraseID":"burhczydx_9a_5"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_9a_5",
+        "message":"I 'borrowed' some things from you the last time we met.",
+        "replies":[
+            {
+                "text":"Did you? I can't recall.",
+                "nextPhraseID":"burhczydx_9a_6"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_9a_6",
+        "replies":[
+            {
+                "nextPhraseID":"burhczydx_9a_6a",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"quest_burhczyd_nd",
+                        "value":81,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"quest_burhczyd_nd",
+                        "value":82,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"quest_burhczyd_nd",
+                        "value":83,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"quest_burhczyd_nd",
+                        "value":84,
+                        "negate":true
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"quest_burhczyd_nd",
+                        "value":85,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"burhczydx_9a_6_81"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_9a_6a",
+        "message":"Oh, it was just a few trifles, nothing important. Here you go, have them all back again.",
+        "replies":[
+            {
+                "text":"Hmmm ...",
+                "nextPhraseID":"burhczydx_9a_7"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_9a_6_81",
+        "replies":[
+            {
+                "nextPhraseID":"burhczydx_9a_6_81a",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"quest_burhczyd_nd",
+                        "value":81
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"burhczydx_9a_6_82"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_9a_6_81a",
+        "message":"First of all, you can have back your 100 pieces of gold.",
+        "replies":[
+            {
+                "text":"How did you ...?",
+                "nextPhraseID":"burhczydx_9a_6_82"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"giveItem",
+                "rewardID":"gold",
+                "value":100
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":81
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_9a_6_82",
+        "replies":[
+            {
+                "nextPhraseID":"burhczydx_9a_6_82a",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"quest_burhczyd_nd",
+                        "value":82
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"burhczydx_9a_6_83"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_9a_6_82a",
+        "message":"Here is your necklace of the Undead. I didn't even wear it once.",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"burhczydx_9a_6_83"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"giveItem",
+                "rewardID":"necklace_undead",
+                "value":1
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":82
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_9a_6_83",
+        "replies":[
+            {
+                "nextPhraseID":"burhczydx_9a_6_83a",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"quest_burhczyd_nd",
+                        "value":83
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"burhczydx_9a_6_84"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_9a_6_83a",
+        "message":"This is your father's ring, I think.",
+        "replies":[
+            {
+                "text":"Mikhails ring!",
+                "nextPhraseID":"burhczydx_9a_6_84"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"giveItem",
+                "rewardID":"ring_mikhail",
+                "value":1
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":84
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_9a_6_84",
+        "replies":[
+            {
+                "nextPhraseID":"burhczydx_9a_6_84a",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"quest_burhczyd_nd",
+                        "value":84
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"burhczydx_9a_6_85"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_9a_6_84a",
+        "message":"Then we have a ruby gem - not of much worth really.",
+        "replies":[
+            {
+                "text":"How dare you do that?",
+                "nextPhraseID":"burhczydx_9a_6_85"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"giveItem",
+                "rewardID":"gem2",
+                "value":1
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":84
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_9a_6_85",
+        "replies":[
+            {
+                "nextPhraseID":"burhczydx_9a_6_85a",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"quest_burhczyd_nd",
+                        "value":85
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"burhczydx_9a_7"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_9a_6_85a",
+        "message":"Last but not least I proudly present: The dagger of the Shadow priests!",
+        "replies":[
+            {
+                "text":"I'm speechless!",
+                "nextPhraseID":"burhczydx_9a_7"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"giveItem",
+                "rewardID":"dagger_shadow_priests",
+                "value":1
+            },
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"quest_burhczyd_nd",
+                "value":85
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_9a_7",
+        "message":"I am really sorry.",
+        "replies":[
+            {
+                "text":"I did not expect that from you. But OK, you did a good job as master thief.",
+                "nextPhraseID":"burhczydx_9a_8"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_9a_8",
+        "message":"That's what I wanted to hear.",
+        "replies":[
+            {
+                "text":"And you are naughty in addition to that.",
+                "nextPhraseID":"burhczydx_9a_9"
+            },
+            {
+                "text":"I don't suppose you are a member of the Thieves guild? I never heard of you.",
+                "nextPhraseID":"burhczydx_9a_8a",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Thieves02",
+                        "value":2
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_9a_8a",
+        "message":"You talk of Unmar and his little gang? Are you also no one and nobody has seen you?",
+        "replies":[
+            {
+                "text":"Yes.",
+                "nextPhraseID":"burhczydx_9a_8b"
+            },
+            {
+                "text":"No - what do you mean?",
+                "nextPhraseID":"burhczydx_9a_8b"
+            },
+            {
+                "text":"How do you ...",
+                "nextPhraseID":"burhczydx_9a_8b"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_9a_8b",
+        "message":"Don't look so irritated. Of course I know such internals. But no, I am no member of the guild. I prefer to be independent.",
+        "replies":[
+            {
+                "text":"You ... you would fit perfectly.",
+                "nextPhraseID":"burhczydx_9a_8c"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_9a_8c",
+        "message":"Honestly, I don't even know if this job is the right thing for me.",
+        "replies":[
+            {
+                "text":"We'll see.",
+                "nextPhraseID":"burhczydx_9a_9"
+            },
+            {
+                "text":"By the way - did you meet my brother Andor on your journeys?",
+                "nextPhraseID":"burhczydx_9a_8d"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_9a_8d",
+        "message":"Sure. I even trailed him for some time, because he had exhibited some interesting behaviour.",
+        "replies":[
+            {
+                "text":"Interesting? Or perhaps strange? What did he do?",
+                "nextPhraseID":"burhczydx_9a_8e"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_9a_8e",
+        "message":"No no no, I won't tell you of course.",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"burhczydx_9a_8f"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_9a_8f",
+        "message":"But here, take this little thing that I 'borrowed' from him.",
+        "replies":[
+            {
+                "text":"A stuffed rat? Urgh. I will give it back to him as soon as possible.",
+                "nextPhraseID":"burhczydx_9a_8g"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"giveItem",
+                "rewardID":"stuffed_rat",
+                "value":1
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_9a_8g",
+        "message":"Well, it's time to say goodbye. Farewell now.",
+        "replies":[
+            {
+                "text":"Farewell.",
+                "nextPhraseID":"burhczydx_9a_9"
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_9a_9",
+        "replies":[
+            {
+                "nextPhraseID":"burhczydx_xa"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"quest_burhczyd",
+                "value":90
+            }
+        ]
+    },
+    {
+        "id":"burhczydx_9e",
+        "message":"Before I leave, I have some business to do here."
+    }
+]
\ No newline at end of file
diff --git a/AndorsTrail/res/raw/conversationlist_fallhaven_potions.json b/AndorsTrail/res/raw/conversationlist_fallhaven_potions.json
index 260400b82..f300d1be6 100644
--- a/AndorsTrail/res/raw/conversationlist_fallhaven_potions.json
+++ b/AndorsTrail/res/raw/conversationlist_fallhaven_potions.json
@@ -191,6 +191,38 @@
                         "requireType":"inventoryRemove",
                         "requireID":"gold",
                         "value":50
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"antifoodp",
+                        "value":35,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"I have those ingredients for you.",
+                "nextPhraseID":"fallhaven_pot_antifp_q3",
+                "requires":[
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"gland",
+                        "value":1
+                    },
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"hair",
+                        "value":2
+                    },
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"gold",
+                        "value":50
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"antifoodp",
+                        "value":35
                     }
                 ]
             },
diff --git a/AndorsTrail/res/raw/conversationlist_foamingflask_guards.json b/AndorsTrail/res/raw/conversationlist_foamingflask_guards.json
index d1c685adc..dbd538812 100644
--- a/AndorsTrail/res/raw/conversationlist_foamingflask_guards.json
+++ b/AndorsTrail/res/raw/conversationlist_foamingflask_guards.json
@@ -135,7 +135,7 @@
                 ]
             },
             {
-                "text":"Hi! I have been sent by Herg ... Hertzsen Laumwill, patriarch of the Laumwill family, to bring back her daughter!",
+                "text":"Hi! I have been sent by Herg ... Hertzsen Laumwill, patriarch of the Laumwill family, to bring back his daughter!",
                 "nextPhraseID":"ff_captain_guild02_1",
                 "requires":[
                     {
diff --git a/AndorsTrail/res/raw/conversationlist_stoutford_combined.json b/AndorsTrail/res/raw/conversationlist_stoutford_combined.json
index 036c31d1f..cf6e7b8d7 100644
--- a/AndorsTrail/res/raw/conversationlist_stoutford_combined.json
+++ b/AndorsTrail/res/raw/conversationlist_stoutford_combined.json
@@ -11742,5 +11742,9 @@
                 "value":48
             }
         ]
+    },
+    {
+        "id":"erwyn_skel_band",
+        "message":"Please don't disturb. We have to practice."
     }
 ]
\ No newline at end of file
diff --git a/AndorsTrail/res/raw/droplists_arulir_mountain.json b/AndorsTrail/res/raw/droplists_arulir_mountain.json
new file mode 100644
index 000000000..0bac3ed3f
--- /dev/null
+++ b/AndorsTrail/res/raw/droplists_arulir_mountain.json
@@ -0,0 +1,392 @@
+[
+    {
+        "id":"arulirskin",
+        "items":[
+            {
+                "itemID":"gold",
+                "chance":"70",
+                "quantity":{
+                    "min":1,
+                    "max":12
+                }
+            },
+            {
+                "itemID":"meat",
+                "chance":"5",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            },
+            {
+                "itemID":"hair",
+                "chance":"10",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            },
+            {
+                "itemID":"arulir_skin",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            }
+        ]
+    },
+    {
+        "id":"arulircave_secretloot",
+        "items":[
+            {
+                "itemID":"gem4",
+                "chance":"80",
+                "quantity":{
+                    "min":5,
+                    "max":10
+                }
+            },
+            {
+                "itemID":"gem5",
+                "chance":"70",
+                "quantity":{
+                    "min":5,
+                    "max":10
+                }
+            },
+            {
+                "itemID":"gold",
+                "chance":"100",
+                "quantity":{
+                    "min":100,
+                    "max":1000
+                }
+            },
+            {
+                "itemID":"gem3",
+                "chance":"90",
+                "quantity":{
+                    "min":5,
+                    "max":10
+                }
+            }
+        ]
+    },
+    {
+        "id":"arulircave1_loot1",
+        "items":[
+            {
+                "itemID":"gold",
+                "chance":"100",
+                "quantity":{
+                    "min":100,
+                    "max":300
+                }
+            },
+            {
+                "itemID":"shirt1",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            },
+            {
+                "itemID":"ring1",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            }
+        ]
+    },
+    {
+        "id":"arulircave1_loot2",
+        "items":[
+            {
+                "itemID":"rusted_iron_sword",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":3
+                }
+            },
+            {
+                "itemID":"shield_cracked_wooden",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":2
+                }
+            }
+        ]
+    },
+    {
+        "id":"arulir_gem1",
+        "items":[
+            {
+                "itemID":"gem3",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":2
+                }
+            }
+        ]
+    },
+    {
+        "id":"arulir_gem2",
+        "items":[
+            {
+                "itemID":"gem3",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":2
+                }
+            }
+        ]
+    },
+    {
+        "id":"arulir_gem3",
+        "items":[
+            {
+                "itemID":"gem4",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":2
+                }
+            }
+        ]
+    },
+    {
+        "id":"arulir_gem4",
+        "items":[
+            {
+                "itemID":"gem3",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":2
+                }
+            }
+        ]
+    },
+    {
+        "id":"arulir_gem5",
+        "items":[
+            {
+                "itemID":"gem5",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":2
+                }
+            }
+        ]
+    },
+    {
+        "id":"arulir_gornaud",
+        "items":[
+            {
+                "itemID":"gold",
+                "chance":"70",
+                "quantity":{
+                    "min":5,
+                    "max":80
+                }
+            },
+            {
+                "itemID":"hair",
+                "chance":"10",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            },
+            {
+                "itemID":"crystal_blue",
+                "chance":"5",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            },
+            {
+                "itemID":"crystal_red",
+                "chance":"5",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            },
+            {
+                "itemID":"meat",
+                "chance":"5",
+                "quantity":{
+                    "min":1,
+                    "max":2
+                }
+            },
+            {
+                "itemID":"hunters_sword",
+                "chance":"1/10000",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            }
+        ]
+    },
+    {
+        "id":"arulir_demonic",
+        "items":[
+            {
+                "itemID":"arulir_skin",
+                "chance":"10",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            },
+            {
+                "itemID":"gold",
+                "chance":"70",
+                "quantity":{
+                    "min":10,
+                    "max":60
+                }
+            },
+            {
+                "itemID":"hunters_sword",
+                "chance":"1/1000",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            },
+            {
+                "itemID":"crystal_blue",
+                "chance":"3",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            },
+            {
+                "itemID":"crystal_red",
+                "chance":"3",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            }
+        ]
+    },
+    {
+        "id":"arulir_leader",
+        "items":[
+            {
+                "itemID":"arulir_skin",
+                "chance":"90",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            },
+            {
+                "itemID":"gold",
+                "chance":"70",
+                "quantity":{
+                    "min":20,
+                    "max":80
+                }
+            },
+            {
+                "itemID":"crystal_blue",
+                "chance":"5",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            },
+            {
+                "itemID":"crystal_red",
+                "chance":"5",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            },
+            {
+                "itemID":"flail_giant",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            },
+            {
+                "itemID":"haub_giant",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            }
+        ]
+    },
+    {
+        "id":"bernhar_shop",
+        "items":[
+            {
+                "itemID":"arulir_cap",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            },
+            {
+                "itemID":"arulir_boots",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            }
+        ]
+    },
+    {
+        "id":"lonely_wolf",
+        "items":[
+            {
+                "itemID":"gold",
+                "chance":"20",
+                "quantity":{
+                    "min":1,
+                    "max":5
+                }
+            },
+            {
+                "itemID":"meat2",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            },
+            {
+                "itemID":"hair",
+                "chance":"20",
+                "quantity":{
+                    "min":1,
+                    "max":1
+                }
+            }
+        ]
+    }
+]
\ No newline at end of file
diff --git a/AndorsTrail/res/raw/itemlist_arulir_mountain.json b/AndorsTrail/res/raw/itemlist_arulir_mountain.json
new file mode 100644
index 000000000..f4cbacbe3
--- /dev/null
+++ b/AndorsTrail/res/raw/itemlist_arulir_mountain.json
@@ -0,0 +1,143 @@
+[
+    {
+        "id":"crystal_blue",
+        "iconID":"items_misc:31",
+        "name":"Blue Crystals",
+        "hasManualPrice":1,
+        "baseMarketCost":5,
+        "category":"gem",
+        "description":"Some blue shimmering crystals."
+    },
+    {
+        "id":"crystal_red",
+        "iconID":"items_misc:34",
+        "name":"Red Crystals",
+        "hasManualPrice":1,
+        "baseMarketCost":4,
+        "category":"gem",
+        "description":"Some red shimmering crystals."
+    },
+    {
+        "id":"hunters_sword",
+        "iconID":"items_misc_5:42",
+        "name":"Hunters Sword",
+        "displaytype":"extraordinary",
+        "category":"lsword",
+        "description":"When venery is your game, you need a superior sword.",
+        "equipEffect":{
+            "increaseAttackDamage":{
+                "min":2,
+                "max":8
+            },
+            "increaseAttackCost":4,
+            "increaseAttackChance":25
+        },
+        "hitEffect":{
+            "increaseCurrentAP":{
+                "min":1,
+                "max":1
+            }
+        },
+        "killEffect":{
+            "conditionsSource":[
+                {
+                    "condition":"rage_minor",
+                    "magnitude":1,
+                    "duration":3,
+                    "chance":"10"
+                }
+            ]
+        }
+    },
+    {
+        "id":"lava_rock_hot",
+        "iconID":"items_misc_3:102",
+        "name":"Fierce Lava Rock",
+        "category":"other",
+        "description":"It's burning through your clothes"
+    },
+    {
+        "id":"lava_rock_cold",
+        "iconID":"items_misc:13",
+        "name":"Cold Lava Rock",
+        "category":"other",
+        "description":"A cold piece of magma"
+    },
+    {
+        "id":"arulir_cap",
+        "iconID":"items_misc_4:4",
+        "name":"Rockfall deflecting cap",
+        "hasManualPrice":1,
+        "baseMarketCost":80,
+        "category":"hd_cloth"
+    },
+    {
+        "id":"arulir_boots",
+        "iconID":"items_armours:28",
+        "name":"Sure step boots",
+        "hasManualPrice":1,
+        "baseMarketCost":120,
+        "category":"feet_lthr"
+    },
+    {
+        "id":"silver_bar",
+        "iconID":"items_misc:8",
+        "name":"Silver bar",
+        "displaytype":"ordinary",
+        "hasManualPrice":1,
+        "baseMarketCost":319,
+        "category":"gem",
+        "description":"A small bar made of silver."
+    },
+    {
+        "id":"flail_giant",
+        "iconID":"items_misc_6:16",
+        "name":"Giant's flail",
+        "displaytype":"extraordinary",
+        "category":"mace",
+        "description":"This is a very heavy weapon!",
+        "equipEffect":{
+            "increaseAttackDamage":{
+                "min":11,
+                "max":40
+            },
+            "increaseAttackCost":14,
+            "increaseAttackChance":20,
+            "increaseCriticalSkill":5,
+            "setCriticalMultiplier":3.0
+        },
+        "hitEffect":{
+            "conditionsTarget":[
+                {
+                    "condition":"dazed",
+                    "magnitude":1,
+                    "duration":3,
+                    "chance":"20"
+                }
+            ]
+        }
+    },
+    {
+        "id":"haub_giant",
+        "iconID":"items_tometik2:44",
+        "name":"Giant's hauberk",
+        "displaytype":"extraordinary",
+        "category":"bdy_hv",
+        "equipEffect":{
+            "increaseMaxHP":3,
+            "increaseAttackCost":1,
+            "increaseBlockChance":23,
+            "increaseDamageResistance":1
+        },
+        "hitReceivedEffect":{
+            "conditionsSource":[
+                {
+                    "condition":"increased_defense",
+                    "magnitude":1,
+                    "duration":3,
+                    "chance":"15"
+                }
+            ]
+        }
+    }
+]
\ No newline at end of file
diff --git a/AndorsTrail/res/raw/itemlist_burhczyd.json b/AndorsTrail/res/raw/itemlist_burhczyd.json
new file mode 100644
index 000000000..8a9cd76bb
--- /dev/null
+++ b/AndorsTrail/res/raw/itemlist_burhczyd.json
@@ -0,0 +1,8 @@
+[
+    {
+        "id":"stuffed_rat",
+        "iconID":"items_misc:13",
+        "name":"Stuffed rat from Andor",
+        "category":"other"
+    }
+]
\ No newline at end of file
diff --git a/AndorsTrail/res/raw/monsterlist_arulir_mountain.json b/AndorsTrail/res/raw/monsterlist_arulir_mountain.json
new file mode 100644
index 000000000..dfe2dd798
--- /dev/null
+++ b/AndorsTrail/res/raw/monsterlist_arulir_mountain.json
@@ -0,0 +1,324 @@
+[
+    {
+        "id":"arulir_3",
+        "name":"Cave Arulir",
+        "iconID":"monsters_arulirs:0",
+        "maxHP":365,
+        "maxAP":5,
+        "moveCost":5,
+        "monsterClass":"giant",
+        "attackDamage":{
+            "min":3,
+            "max":22
+        },
+        "spawnGroup":"arulir_2",
+        "droplistID":"arulir",
+        "attackCost":5,
+        "attackChance":80,
+        "criticalSkill":44,
+        "criticalMultiplier":3.0,
+        "blockChance":28,
+        "damageResistance":8,
+        "hitEffect":{
+            "conditionsTarget":[
+                {
+                    "condition":"stunned",
+                    "magnitude":1,
+                    "duration":4,
+                    "chance":"23"
+                }
+            ]
+        }
+    },
+    {
+        "id":"arulir_4",
+        "name":"Giant Cave Arulir",
+        "iconID":"monsters_arulirs:1",
+        "maxHP":380,
+        "maxAP":5,
+        "moveCost":5,
+        "monsterClass":"giant",
+        "attackDamage":{
+            "min":3,
+            "max":22
+        },
+        "spawnGroup":"arulir_2",
+        "droplistID":"arulir",
+        "attackCost":5,
+        "attackChance":80,
+        "criticalSkill":44,
+        "criticalMultiplier":3.0,
+        "blockChance":28,
+        "damageResistance":10,
+        "hitEffect":{
+            "conditionsTarget":[
+                {
+                    "condition":"stunned",
+                    "magnitude":1,
+                    "duration":4,
+                    "chance":"26"
+                }
+            ]
+        }
+    },
+    {
+        "id":"arulir_5",
+        "name":"Golden Arulir",
+        "iconID":"monsters_arulirs:12",
+        "maxHP":403,
+        "maxAP":5,
+        "moveCost":5,
+        "monsterClass":"giant",
+        "attackDamage":{
+            "min":4,
+            "max":25
+        },
+        "spawnGroup":"arulir_3",
+        "droplistID":"arulir",
+        "attackCost":5,
+        "attackChance":110,
+        "criticalSkill":50,
+        "criticalMultiplier":3.0,
+        "blockChance":28,
+        "damageResistance":12,
+        "hitEffect":{
+            "conditionsTarget":[
+                {
+                    "condition":"stunned",
+                    "magnitude":1,
+                    "duration":4,
+                    "chance":"30"
+                }
+            ]
+        }
+    },
+    {
+        "id":"arulir_6",
+        "name":"Giant Golden Arulir",
+        "iconID":"monsters_arulirs:13",
+        "maxHP":501,
+        "maxAP":5,
+        "moveCost":5,
+        "monsterClass":"giant",
+        "attackDamage":{
+            "min":4,
+            "max":27
+        },
+        "spawnGroup":"arulir_3",
+        "droplistID":"arulir",
+        "attackCost":5,
+        "attackChance":110,
+        "criticalSkill":50,
+        "criticalMultiplier":3.0,
+        "blockChance":29,
+        "damageResistance":13,
+        "hitEffect":{
+            "conditionsTarget":[
+                {
+                    "condition":"stunned",
+                    "magnitude":1,
+                    "duration":4,
+                    "chance":"30"
+                }
+            ]
+        }
+    },
+    {
+        "id":"arulir_8",
+        "name":"Demonic Arulir",
+        "iconID":"monsters_arulirs:14",
+        "maxHP":750,
+        "maxAP":10,
+        "moveCost":10,
+        "monsterClass":"giant",
+        "attackDamage":{
+            "min":4,
+            "max":20
+        },
+        "spawnGroup":"arulir_4",
+        "droplistID":"arulir_demonic",
+        "attackCost":5,
+        "attackChance":110,
+        "criticalSkill":50,
+        "criticalMultiplier":3.0,
+        "blockChance":32,
+        "damageResistance":14,
+        "hitEffect":{
+            "conditionsTarget":[
+                {
+                    "condition":"stunned",
+                    "magnitude":1,
+                    "duration":4,
+                    "chance":"30"
+                }
+            ]
+        }
+    },
+    {
+        "id":"gornaud_4",
+        "name":"Azurite Gornaud",
+        "iconID":"monsters_rltiles2:28",
+        "maxHP":390,
+        "maxAP":5,
+        "moveCost":5,
+        "monsterClass":"giant",
+        "attackDamage":{
+            "min":7,
+            "max":23
+        },
+        "spawnGroup":"gornaud_4",
+        "droplistID":"arulir_gornaud",
+        "attackCost":5,
+        "attackChance":120,
+        "blockChance":45,
+        "damageResistance":9,
+        "hitEffect":{
+            "conditionsTarget":[
+                {
+                    "condition":"dazed",
+                    "magnitude":1,
+                    "duration":3,
+                    "chance":"25"
+                }
+            ]
+        }
+    },
+    {
+        "id":"gornaud_5",
+        "name":"Garnet Gornaud",
+        "iconID":"monsters_rltiles2:30",
+        "maxHP":385,
+        "maxAP":5,
+        "moveCost":5,
+        "monsterClass":"giant",
+        "attackDamage":{
+            "min":7,
+            "max":23
+        },
+        "spawnGroup":"gornaud_4",
+        "droplistID":"arulir_gornaud",
+        "attackCost":5,
+        "attackChance":120,
+        "blockChance":45,
+        "damageResistance":9,
+        "hitEffect":{
+            "conditionsTarget":[
+                {
+                    "condition":"dazed",
+                    "magnitude":1,
+                    "duration":3,
+                    "chance":"25"
+                }
+            ]
+        }
+    },
+    {
+        "id":"gornaud_6",
+        "name":"Nephrite Gornaud",
+        "iconID":"monsters_rltiles2:31",
+        "maxHP":395,
+        "maxAP":5,
+        "moveCost":5,
+        "monsterClass":"giant",
+        "attackDamage":{
+            "min":7,
+            "max":23
+        },
+        "spawnGroup":"gornaud_4",
+        "droplistID":"arulir_gornaud",
+        "attackCost":5,
+        "attackChance":120,
+        "blockChance":45,
+        "damageResistance":9,
+        "hitEffect":{
+            "conditionsTarget":[
+                {
+                    "condition":"dazed",
+                    "magnitude":1,
+                    "duration":3,
+                    "chance":"25"
+                }
+            ]
+        }
+    },
+    {
+        "id":"arulir_leader",
+        "name":"Arulir Pack Leader",
+        "iconID":"monsters_arulirs:8",
+        "maxHP":1000,
+        "unique":1,
+        "monsterClass":"giant",
+        "attackDamage":{
+            "min":10,
+            "max":20
+        },
+        "spawnGroup":"arulir_leader",
+        "droplistID":"arulir_leader",
+        "attackCost":5,
+        "attackChance":125,
+        "criticalSkill":55,
+        "criticalMultiplier":3.0,
+        "blockChance":35,
+        "damageResistance":15,
+        "hitEffect":{
+            "conditionsSource":[
+                {
+                    "condition":"rage_minor",
+                    "magnitude":1,
+                    "duration":1,
+                    "chance":"50"
+                }
+            ],
+            "conditionsTarget":[
+                {
+                    "condition":"stunned",
+                    "magnitude":1,
+                    "duration":4,
+                    "chance":"35"
+                }
+            ]
+        }
+    },
+    {
+        "id":"bernhar",
+        "name":"Bernhar",
+        "iconID":"monsters_ld1:18",
+        "unique":1,
+        "monsterClass":"humanoid",
+        "phraseID":"bernhar",
+        "droplistID":"bernhar_shop"
+    },
+    {
+        "id":"tjure",
+        "name":"Tjure",
+        "iconID":"monsters_ld1:19",
+        "unique":1,
+        "monsterClass":"humanoid",
+        "phraseID":"tjure"
+    },
+    {
+        "id":"river_mermaid",
+        "name":"Mermaid",
+        "iconID":"monsters_rltiles2:5",
+        "monsterClass":"humanoid"
+    },
+    {
+        "id":"lonely_wolf",
+        "name":"Ancient wolf",
+        "iconID":"monsters_dogs:4",
+        "maxHP":35,
+        "maxAP":10,
+        "moveCost":3,
+        "unique":1,
+        "monsterClass":"animal",
+        "attackDamage":{
+            "min":3,
+            "max":6
+        },
+        "spawnGroup":"lonely_wolf",
+        "droplistID":"lonely_wolf",
+        "attackCost":5,
+        "attackChance":110,
+        "blockChance":30
+    }
+]
\ No newline at end of file
diff --git a/AndorsTrail/res/raw/monsterlist_burhczyd.json b/AndorsTrail/res/raw/monsterlist_burhczyd.json
new file mode 100644
index 000000000..70efb7481
--- /dev/null
+++ b/AndorsTrail/res/raw/monsterlist_burhczyd.json
@@ -0,0 +1,74 @@
+[
+    {
+        "id":"burhczyd1",
+        "name":"Burhczyd",
+        "iconID":"monsters_ld2:8",
+        "unique":1,
+        "monsterClass":"humanoid",
+        "phraseID":"burhczyd1"
+    },
+    {
+        "id":"burhczyd2",
+        "name":"Burhczyd",
+        "iconID":"monsters_ld2:8",
+        "unique":1,
+        "monsterClass":"humanoid",
+        "phraseID":"burhczyd2"
+    },
+    {
+        "id":"burhczyd3",
+        "name":"Burhczyd",
+        "iconID":"monsters_ld2:8",
+        "unique":1,
+        "monsterClass":"humanoid",
+        "phraseID":"burhczyd3"
+    },
+    {
+        "id":"burhczyd4",
+        "name":"Burhczyd",
+        "iconID":"monsters_ld2:8",
+        "unique":1,
+        "monsterClass":"humanoid",
+        "phraseID":"burhczyd4"
+    },
+    {
+        "id":"burhczyd5",
+        "name":"Burhczyd",
+        "iconID":"monsters_ld2:8",
+        "unique":1,
+        "monsterClass":"humanoid",
+        "phraseID":"burhczyd5"
+    },
+    {
+        "id":"burhczyd6",
+        "name":"Burhczyd",
+        "iconID":"monsters_ld2:8",
+        "unique":1,
+        "monsterClass":"humanoid",
+        "phraseID":"burhczyd6"
+    },
+    {
+        "id":"burhczyd7",
+        "name":"Burhczyd",
+        "iconID":"monsters_ld2:8",
+        "unique":1,
+        "monsterClass":"humanoid",
+        "phraseID":"burhczyd7"
+    },
+    {
+        "id":"burhczyd8",
+        "name":"Burhczyd",
+        "iconID":"monsters_ld2:8",
+        "unique":1,
+        "monsterClass":"humanoid",
+        "phraseID":"burhczyd8"
+    },
+    {
+        "id":"burhczyd9",
+        "name":"Burhczyd",
+        "iconID":"monsters_ld2:8",
+        "unique":1,
+        "monsterClass":"humanoid",
+        "phraseID":"burhczyd9"
+    }
+]
\ No newline at end of file
diff --git a/AndorsTrail/res/raw/monsterlist_stoutford_combined.json b/AndorsTrail/res/raw/monsterlist_stoutford_combined.json
index 6f3a9d0e3..7ff1d5e49 100644
--- a/AndorsTrail/res/raw/monsterlist_stoutford_combined.json
+++ b/AndorsTrail/res/raw/monsterlist_stoutford_combined.json
@@ -1220,5 +1220,37 @@
         "id":"none",
         "name":"none",
         "iconID":"monsters_eye1:0"
+    },
+    {
+        "id":"erwyn_skel_lute",
+        "name":"Lutenist",
+        "iconID":"monsters_fatboy73:41",
+        "monsterClass":"undead",
+        "spawnGroup":"erwyn_skel_lute",
+        "phraseID":"erwyn_skel_band"
+    },
+    {
+        "id":"erwyn_skel_hornet",
+        "name":"Horn player",
+        "iconID":"monsters_fatboy73:43",
+        "monsterClass":"undead",
+        "spawnGroup":"erwyn_skel_hornet",
+        "phraseID":"erwyn_skel_band"
+    },
+    {
+        "id":"erwyn_skel_drum",
+        "name":"Drummer",
+        "iconID":"monsters_fatboy73:45",
+        "monsterClass":"undead",
+        "spawnGroup":"erwyn_skel_drum",
+        "phraseID":"erwyn_skel_band"
+    },
+    {
+        "id":"erwyn_skel_cymbal",
+        "name":"Cymbalist",
+        "iconID":"monsters_fatboy73:47",
+        "monsterClass":"undead",
+        "spawnGroup":"erwyn_skel_cymbal",
+        "phraseID":"erwyn_skel_band"
     }
 ]
\ No newline at end of file
diff --git a/AndorsTrail/res/raw/questlist_arulir_mountain.json b/AndorsTrail/res/raw/questlist_arulir_mountain.json
new file mode 100644
index 000000000..7a5ecf10f
--- /dev/null
+++ b/AndorsTrail/res/raw/questlist_arulir_mountain.json
@@ -0,0 +1,154 @@
+[
+    {
+        "id":"arulirmountain_trap",
+        "name":"Arulir Mountain Trap",
+        "stages":[
+            {
+                "progress":1,
+                "logText":"01=Hole"
+            },
+            {
+                "progress":2,
+                "logText":"02=Hole"
+            },
+            {
+                "progress":3,
+                "logText":"03=Hole"
+            },
+            {
+                "progress":4,
+                "logText":"04=Hole"
+            },
+            {
+                "progress":5,
+                "logText":"05=Rocks"
+            }
+        ]
+    },
+    {
+        "id":"arulircave_trap",
+        "name":"Arulir Cave Traps",
+        "stages":[
+            {
+                "progress":1,
+                "logText":"01=Hole"
+            },
+            {
+                "progress":2,
+                "logText":"02=Rocks"
+            },
+            {
+                "progress":3,
+                "logText":"03=Rocks"
+            },
+            {
+                "progress":4,
+                "logText":"04=Hole"
+            },
+            {
+                "progress":5,
+                "logText":"05=Rocks"
+            },
+            {
+                "progress":6,
+                "logText":"06=Rocks"
+            },
+            {
+                "progress":7,
+                "logText":"07=Hole"
+            },
+            {
+                "progress":8,
+                "logText":"08=Hole"
+            },
+            {
+                "progress":9,
+                "logText":"09=Rocks"
+            },
+            {
+                "progress":10,
+                "logText":"10=Slippery ground"
+            }
+        ]
+    },
+    {
+        "id":"arulircave_secret",
+        "name":"Arulircave secret room",
+        "stages":[
+            {
+                "progress":10
+            },
+            {
+                "progress":20,
+                "finishesQuest":1
+            }
+        ]
+    },
+    {
+        "id":"arulircave_non_display",
+        "name":"arulircave_non_display",
+        "stages":[
+            {
+                "progress":10,
+                "logText":"Talked to Bernhar"
+            },
+            {
+                "progress":20,
+                "logText":"Bernhar left"
+            }
+        ]
+    },
+    {
+        "id":"mermaid_scale",
+        "name":"The silver scale",
+        "showInLog":1,
+        "stages":[
+            {
+                "progress":10,
+                "logText":"In a clearing, you met Tjure, who desperately asked for your help. He had once found a mermaid asleep on the beach at the river. The colorful tail attracted him so much that he pulled out a dazzling scale and ran away."
+            },
+            {
+                "progress":20,
+                "logText":"Crying and mourning, the mermaid called after him. Finally she cursed him. Since then, Tjure has never been happy. He just wanted to get rid of the scale. Nevertheless, he never ventured back to the vicinity of the river."
+            },
+            {
+                "progress":30,
+                "logText":"A wise woman told Tjure that he could neither throw away nor destroy the scale. His only salvation would be to give it back or to have someone buy it from him. But who would ever want to incur the wrath of a mermaid?"
+            },
+            {
+                "progress":90,
+                "logText":"You decided not to help Tjure.",
+                "rewardExperience":500,
+                "finishesQuest":1
+            },
+            {
+                "progress":100,
+                "logText":"As soon as you held the scale in your hands, a great sluggishness and dispair came over you."
+            },
+            {
+                "progress":200,
+                "logText":"You put the scale on the mark on the ground."
+            },
+            {
+                "progress":210,
+                "logText":"There rang out a beautiful song of gratitude.",
+                "rewardExperience":3500,
+                "finishesQuest":1
+            },
+            {
+                "progress":220,
+                "logText":"You found a heavy bag of gold."
+            }
+        ]
+    },
+    {
+        "id":"misc_nondisplay ",
+        "name":"misc_nondisplay ",
+        "stages":[
+            {
+                "progress":10,
+                "logText":"Found silver bar at bwm"
+            }
+        ]
+    }
+]
\ No newline at end of file
diff --git a/AndorsTrail/res/raw/questlist_burhczyd.json b/AndorsTrail/res/raw/questlist_burhczyd.json
new file mode 100644
index 000000000..d944537ca
--- /dev/null
+++ b/AndorsTrail/res/raw/questlist_burhczyd.json
@@ -0,0 +1,157 @@
+[
+    {
+        "id":"quest_burhczyd",
+        "name":"Young merchant",
+        "showInLog":1,
+        "stages":[
+            {
+                "progress":10,
+                "logText":"You met Burhczyd afgz Dtaloumiye, a likable young man, in a tavern. He wanted to see the world and followed your advice to travel as a trader from city to city.",
+                "rewardExperience":20
+            },
+            {
+                "progress":20,
+                "logText":"In another tavern you met Burhczyd again. He never got any customers, because he had named his company 'Burhczyd afgz Dtaloumiye - Transports'. You told him to find an easier name.",
+                "rewardExperience":50
+            },
+            {
+                "progress":30,
+                "logText":"You saw Burhczyd in a tavern, but he still did not have any customers. You told him that 'B.A.D. Transports' was not a good idea either.",
+                "rewardExperience":100
+            },
+            {
+                "progress":40,
+                "logText":"Another place, another tavern, Burhczyd again sitting there. He did get a shipment from Remgard of almost fresh fish, but nobody wanted to buy it. You bought the entire cargo and got it disposed of.",
+                "rewardExperience":200
+            },
+            {
+                "progress":50,
+                "logText":"What a surprise - you met Burhczyd again in a tavern. He told you that he finally sold something successfully - his cart. The fool, how will he earn money now?",
+                "rewardExperience":500
+            },
+            {
+                "progress":60,
+                "logText":"In a tavern a bard sang in a high, shrill voice. It's an old acquaintance - Burhczyd. His singing was incredibly bad. Maybe he should just play his instrument without singing?",
+                "rewardExperience":1000
+            },
+            {
+                "progress":70,
+                "logText":"You found Burhczyd collapsed at a table in the tavern, his lute lying in front of him. The landlord forbade him to play his lovely music, because then all the guests forgot to drink.",
+                "rewardExperience":2000
+            },
+            {
+                "progress":80,
+                "logText":"Again you met  Burhczyd in a tavern. He told you that he had become a master thief.",
+                "rewardExperience":5000
+            },
+            {
+                "progress":90,
+                "logText":"When you met Burhczyd again, he gave you some of your things back.",
+                "rewardExperience":10000
+            }
+        ]
+    },
+    {
+        "id":"quest_burhczyd_nd",
+        "name":"Young merchant Non-displayed",
+        "showInLog":0,
+        "stages":[
+            {
+                "progress":60,
+                "logText":"60=listened to merchant completely"
+            },
+            {
+                "progress":61,
+                "logText":"61=talked to merchant Crossglen"
+            },
+            {
+                "progress":62,
+                "logText":"62=talked to merchant Fallhaven"
+            },
+            {
+                "progress":63,
+                "logText":"63=talked to merchant Loneford"
+            },
+            {
+                "progress":64,
+                "logText":"64=talked to merchant Vilegard"
+            },
+            {
+                "progress":65,
+                "logText":"65=talked to merchant Stoutford"
+            },
+            {
+                "progress":66,
+                "logText":"66=talked to merchant BWM"
+            },
+            {
+                "progress":67,
+                "logText":"67=talked to merchant Remgard"
+            },
+            {
+                "progress":68,
+                "logText":"68=talked to merchant Brimhaven?"
+            },
+            {
+                "progress":69,
+                "logText":"69=talked to merchant Prim"
+            },
+            {
+                "progress":71,
+                "logText":"71=temp merchant Crossglen"
+            },
+            {
+                "progress":72,
+                "logText":"72=temp merchant Fallhaven"
+            },
+            {
+                "progress":73,
+                "logText":"73=temp merchant Loneford"
+            },
+            {
+                "progress":74,
+                "logText":"74=temp merchant Vilegard"
+            },
+            {
+                "progress":75,
+                "logText":"75=temp merchant Stoutford"
+            },
+            {
+                "progress":76,
+                "logText":"76=temp merchant BWM"
+            },
+            {
+                "progress":77,
+                "logText":"77=temp merchant Remgard"
+            },
+            {
+                "progress":78,
+                "logText":"78=temp merchant Brimhaven?"
+            },
+            {
+                "progress":79,
+                "logText":"79=temp merchant Prim?"
+            },
+            {
+                "progress":81,
+                "logText":"81=100 gold"
+            },
+            {
+                "progress":82,
+                "logText":"82=necklace_undead"
+            },
+            {
+                "progress":83,
+                "logText":"83=ring_mikhail"
+            },
+            {
+                "progress":84,
+                "logText":"84=gem2 ruby gem"
+            },
+            {
+                "progress":85,
+                "logText":"85=dagger_shadow_priests"
+            }
+        ]
+    }
+]
\ No newline at end of file
diff --git a/AndorsTrail/res/values/arrays.xml b/AndorsTrail/res/values/arrays.xml
index b747e3053..76c3b1c7f 100644
--- a/AndorsTrail/res/values/arrays.xml
+++ b/AndorsTrail/res/values/arrays.xml
@@ -134,15 +134,15 @@
 	<string-array name="preferences_language">
 		<item>@string/preferences_language_default</item>
 		<item>English</item>
-		<item>Deutsch (93%)</item>
+		<item>Deutsch (96%)</item>
 		<item>Español (93%)</item>
 		<item>Française (59%)</item>
 		<item>Italiano (93%)</item>
 		<item>Magyar (45%)</item>
-		<item>Polski (93%)</item>
+		<item>Polski (94%)</item>
 		<item>Português (81%)</item>
 		<item>Português Brasil (85%)</item>
-		<item>Русский язык (93%)</item>
+		<item>Русский язык (99%)</item>
 	</string-array>
 	<string-array name="preferences_language_values">
 		<item>default</item>
diff --git a/AndorsTrail/res/values/loadresources.xml b/AndorsTrail/res/values/loadresources.xml
index 0256a90db..f26e2fc24 100644
--- a/AndorsTrail/res/values/loadresources.xml
+++ b/AndorsTrail/res/values/loadresources.xml
@@ -25,6 +25,8 @@
         <item>@raw/actorconditions_stoutford_combined</item>
         <!--Added by ATCS v0.6.15 for project v076-->
         <item>@raw/actorconditions_omicronrg9</item>
+        <!--Added by ATCS v0.6.15 for project v078-->
+        <item>@raw/actorconditions_arulir_mountain</item>
     </array>
         
     <array name="loadresource_items">
@@ -63,6 +65,9 @@
         <item>@raw/itemlist_bugfix_0_7_4</item>
         <!--Added by ATCS v0.6.15 for project v076-->
         <item>@raw/itemlist_omicronrg9</item>
+        <!--Added by ATCS v0.6.15 for project v078-->
+        <item>@raw/itemlist_arulir_mountain</item>
+        <item>@raw/itemlist_burhczyd</item>
     </array>
         
     <array name="loadresource_droplists">
@@ -96,6 +101,8 @@
         <item>@raw/droplists_bugfix_0_7_4</item>
         <!--Added by ATCS v0.6.15 for project v076-->
         <item>@raw/droplists_omicronrg9</item>
+        <!--Added by ATCS v0.6.15 for project v078-->
+        <item>@raw/droplists_arulir_mountain</item>
     </array>
         
     <array name="loadresource_quests">
@@ -114,7 +121,8 @@
         <item>@raw/questlist_shortcut_lodar</item>
         <item>@raw/questlist_pathway_fallhaven</item>
         <item>@raw/questlist_halvor_surprise</item>
-                -		
+                        -		
+        
         
         <item>@raw/questlist_stoutford</item>
         <!--Added by ATCS v0.6.11 for project graveyard1-->
@@ -124,6 +132,9 @@
         <item>@raw/questlist_stoutford_combined</item>
         <!--Added by ATCS v0.6.15 for project v076-->
         <item>@raw/questlist_omicronrg9</item>
+        <!--Added by ATCS v0.6.15 for project v078-->
+        <item>@raw/questlist_arulir_mountain</item>
+        <item>@raw/questlist_burhczyd</item>
     </array>
         
     <array name="loadresource_conversationlists">
@@ -298,6 +309,9 @@
         <item>@raw/conversationlist_bugfix_0_7_4</item>
         <!--Added by ATCS v0.6.15 for project v076-->
         <item>@raw/conversationlist_omicronrg9</item>
+        <!--Added by ATCS v0.6.15 for project v078-->
+        <item>@raw/conversationlist_arulir_mountain</item>
+        <item>@raw/conversationlist_burhczyd</item>
     </array>
         
     <array name="loadresource_monsters">
@@ -337,6 +351,9 @@
         <item>@raw/monsterlist_stoutford_combined</item>
         <!--Added by ATCS v0.6.15 for project v076-->
         <item>@raw/monsterlist_omicronrg9</item>
+        <!--Added by ATCS v0.6.15 for project v078-->
+        <item>@raw/monsterlist_arulir_mountain</item>
+        <item>@raw/monsterlist_burhczyd</item>
     </array>
         
     <array name="loadresource_maps">
@@ -857,6 +874,18 @@
         <item>@xml/crackshot_hideout3</item>
         <item>@xml/guildbrig1</item>
         <item>@xml/guildbrig2</item>
+        <!--Added by ATCS v0.6.15 for project v078-->
+        <item>@xml/arulircave1</item>
+        <item>@xml/arulircave2</item>
+        <item>@xml/arulircave3</item>
+        <item>@xml/arulircave4</item>
+        <item>@xml/arulircave5</item>
+        <item>@xml/arulircave6</item>
+        <item>@xml/arulirmountain1</item>
+        <item>@xml/arulirmountain2</item>
+        <item>@xml/blackwater_mountain53</item>
+        <item>@xml/blackwater_mountain54</item>
+        <item>@xml/stoutford_castle_shed</item>
     </array>
         
 </resources>
diff --git a/AndorsTrail/res/xml/arulircave1.tmx b/AndorsTrail/res/xml/arulircave1.tmx
new file mode 100644
index 000000000..e6fd28e32
--- /dev/null
+++ b/AndorsTrail/res/xml/arulircave1.tmx
@@ -0,0 +1,411 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.2" tiledversion="1.3.0" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="25" height="30" tilewidth="32" tileheight="32" infinite="0" nextlayerid="12" nextobjectid="33">
+ <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_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" 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" 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" 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" 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" 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" 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" 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" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_5.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="7577" name="map_transition_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_5.png" width="512" height="256"/>
+ </tileset>
+ <layer id="1" name="Ground" width="25" height="30">
+  <data encoding="base64" compression="zlib">
+   eAG9ld1NBDEMhE/AC09AC7RDaeyVAJQAiAp4owR64CiBH3+6HTEaJbs5kDjJsuPYM7aTzU3Hm800KLcVd1fyMMtj6ZfTvdyHf1fr93l/FF/Y4JLvGPC8mV/7XwdwbCvWsYWxiZ/84r842fc4VX4KM0Hc/1xrcl00C/r4aOzBQbzjYGsmzPwm9h0f2znOCs952FM8uJKcCecIj/qCX3no5BDPZ+1xFooVPjoxiGndF+Wida/QcCC+jz3NAn7rXDM+19SbPD4zceSMEqe3Bl/n2uJhZshUAkcPp+fnLISvGPG8znM7r7khcCCKW9KKpSY4WrHica08dCtHPo9rcTxV7Yp1fGzPla1YtHxov8PZBxziYU88zM0xlmzunb+FziF8cfhdu446exzg572Gw7Fl46d29bHGwWxa+LvyU6twpfH7nHpnoV7AZjZZv3C4t1dHPzz4tTfSQ692x5FND7LR9LfGse3U7jh8u76WnXPqnQUcymlpcPT95neeHFPFtmSEg7+/y8b7OjInOEc46IOf95k99Oakvjw3bWpNH+tDOaZ5jokFTp6BYpJDGGt6GzWDI8zUzrE2J+f9T46lulTHX/sY4Ri9tz4nbNW4xuH4vCNL8b/l0PsknRzfFQwkJg==
+  </data>
+ </layer>
+ <layer id="2" name="Objects" width="25" height="30">
+  <data encoding="base64" compression="zlib">
+   eAGtlc2LjlEYxg9jtvMaMpoiX/+D7DX+AFbKZqxFCfnayEcWlijZShm7SYlZeUcYs2KhjJWNMDYKMQnXb55zNXd3z/NKuet+z3nPOfd13R/n3E9/rJT+AL2xuZR5aZZ9q5uVWWyH8m4ps3VteX8APtx3W/DBRMG5urGUa9JHdc3rZs0c+Pw8aYzB9l9HGoQjq0qJalyPO9bIjxBDV0583rH/WldKb32zul8cYBxXHHs1H6v5213HBcWGuhY5J4vCygKexXifdO6EOKK4VksbmlU4cgzOd7TrmsM7UTnGq/8++7n6mfGdk2Gdp46Wg9Xeduwjjm2bcm/Zrjm1eCEO4s058rnluirv+b68ld1oxffZN/LlumKB52jYsx+RwzFg63wbp2uN9ZfKFzzUJsZjW3MYHz+RubXNGH9PCee09Iz0Sa0/OTmsePEJnls1nlejK5bmwG4oxMkJ8zEHP8qcOMDfKfx3mr+XfpBGHuqC3tGbm6lv2T6C5VzZ9yuJgzjuKeY94niq+aHhUj4GHjDcA7i78DxMXPChYFuxs9yX3WNxEMOiFNEzLM80P9dr+stF5Q0f/QYjF3zmbMMHD44DNQb+n1f9KAEcyDHh8/6RyOG5+9a8uGKO/Da5H9TjbOXAfwsc1OmC8IkDMa7H/CabU02PZe4+wXxJuZoQD/5/UZ9cEP4PKTHclvqeGJuxDZ++hd/cgU3CaxN4wT+p/SnV/lL1n7MPlIvI4XtsHPdy/48j+eA+Ifb/cvWBGCw3B3D4TXKWfo4Qy676tuhT36TfpeTHAneULg7j/xS2v0fR7nft2XHNvYm+hbgWXRzTLdj0IktPfsOTfWafPPH2EGox1ZGrfsUbCTX2t41cbRHH1pAffxfN6W9WjoHau+b+JuAL75g+hLi/uA81qyu/+E+u6ItIG0fsXZyhT1JXahrfBXvIZOrNYMd30cZBLLl3gfU6YJEP3t3fpK0W8Z3EvIHl3kuPJI/ul4zE2iZdMUQe18Y1wC/3So8zWov9LHL9C4ft2myyHz7L2HY+xpBz1WVjDvZ9b5kj/5sj42eOP0+kP9Q=
+  </data>
+ </layer>
+ <layer id="3" name="Objects_replace" width="25" height="30">
+  <data encoding="base64" compression="zlib">
+   eAFjYBgFwzkEBJiGs+9Gnt8qmWnrZ1qbT1vXj5o+GgKjITCSQkBktH4bSdE96ldoCAAAl+YBIQ==
+  </data>
+ </layer>
+ <layer id="4" name="Above" width="25" height="30">
+  <data encoding="base64" compression="zlib">
+   eAGlVT0vREEUHUQjClYiIRF/wS/Q6DVqGg2JTiGIWtSqjVK10UuWbiWC7Ui28Q/EL6BxT/bd7NmbM+89b2/yzNe555yZuTt6yym111J6C1/fxrl4shyP3oz3xtt3woC/jI8zP4q81vRolvUw+9saraF3uJTSXYnfcXRKkS+ux/Gm8Z/aV3cP53YmSmNnKiV8KraN/8o+FX4mcQ06MZRuxKgx8rbozBmT02eM9/nefQ7tfbgzXkM/5n2KvQG3Unhsh7OCx2ehgToaiHlwIXxvg8XhmP92SAM49thdYGS+j7w94skjx/nLcLwWffEa+vuZO4243Bj8VTV1PKEG+Ks0cv7qziuNPtUF9tkkOA/1AZ1dum/W4Pp5sPfqscabBX7UMP82oXFhGl/kH97dy3cx3zNc1buIHPiaJ8/g8vv4KbgOinWfBwZRpuF+eN/DrKFXnj8x/ut/arh354wtez2aTenS+G8LDdZGntpHFT/yXuydehVvle8dGA+lwR4dp1r1O1a5k2go3XhOwDTRWLcaU6HOCTilof7fMeec3e2G0FHnlNNgvtiH19WifuJaU424/xwP9HJrOKtOyXsS885Evfp+ItbnoVGmk8vzfLS+V4Xtmn/XyOmoPOZH3zGqbm+CBnTi++j5zgtf8Z0GRvEjp4kGcqp8uB/X+ANH85E1
+  </data>
+ </layer>
+ <layer id="5" name="Above_replace" width="25" height="30">
+  <data encoding="base64" compression="zlib">
+   eAFjYBgFoyFA2xBIYmJg2CZEWzsuizEwHKOxHZeAdvQL09Yf+EwH2Z0MDEtaAVqbTyt3j5o7GgKjITAaAqMhMBoCIyUEAOsSBoY=
+  </data>
+ </layer>
+ <layer id="6" name="Top" width="25" height="30">
+  <data encoding="base64" compression="zlib">
+   eAFjYBgFoyEwGgKjITAaAqMhMBoCgzkEHosNZtfhd9tlOrj9MB3suEQHO/CH5KjsaAgwMAAAxM0DpA==
+  </data>
+ </layer>
+ <layer id="7" name="Walkable" width="25" height="30" visible="0">
+  <data encoding="base64" compression="zlib">
+   eAHNj4sJw0AMQzNF918hGxZBHwjhi88hgRqCf9Lz5fwcx/nCd/ziDTZMnaC+k3ljl59iOydv+m5Sd5zcq5/wpc2o/NIw95qZc3zmtd/x+aS+YvAuNBMuWrw7Gc8kO1e+DGdpd9X7Luvk0lc6zTJSt+rdd6Wpbsi78kznsPI99FNepeeGdgR1pZ/OnImXmTKzO7niwKx20xvJwp9sdOx3s3Oo5SV2OZUORpXR5475TpZXuircn3vfdXXl7WYdM/fJ817aKpLR9RVDM/elxneTesXJufoJ17V4YWq3CvdNavE6PTc73Wr/TzdWb9yZ7/zHDudK88SNL96apvA=
+  </data>
+ </layer>
+ <objectgroup id="8" name="Mapevents" visible="0">
+  <object id="1" name="exit" type="mapchange" x="256" y="928" width="32" height="32">
+   <properties>
+    <property name="map" value="arulirmountain1"/>
+    <property name="place" value="cave"/>
+   </properties>
+  </object>
+  <object id="2" name="east" type="mapchange" x="768" y="128" width="32" height="64">
+   <properties>
+    <property name="map" value="arulircave3"/>
+    <property name="place" value="west"/>
+   </properties>
+  </object>
+  <object id="3" name="north" type="mapchange" x="736" y="0" width="32" height="32">
+   <properties>
+    <property name="map" value="arulircave2"/>
+    <property name="place" value="south"/>
+   </properties>
+  </object>
+  <object id="4" name="arulircave_trap01" type="script" x="320" y="704" width="32" height="32">
+   <properties>
+    <property name="when" value="enter"/>
+   </properties>
+  </object>
+  <object id="5" name="arulircave_trap02" type="script" x="320" y="288" width="32" height="32">
+   <properties>
+    <property name="when" value="enter"/>
+   </properties>
+  </object>
+  <object id="6" name="arulircave_trap03" type="script" x="288" y="320" width="32" height="32">
+   <properties>
+    <property name="when" value="enter"/>
+   </properties>
+  </object>
+  <object id="7" name="arulircave_trap04" type="script" x="640" y="128" width="32" height="32">
+   <properties>
+    <property name="when" value="enter"/>
+   </properties>
+  </object>
+  <object id="8" name="arulircave_trap05" type="script" x="128" y="256" width="32" height="32">
+   <properties>
+    <property name="when" value="enter"/>
+   </properties>
+  </object>
+  <object id="9" name="arulircave1_loot1" type="container" x="640" y="512" width="32" height="32"/>
+  <object id="10" name="arulircave1_loot2" type="container" x="576" y="352" width="32" height="32"/>
+ </objectgroup>
+ <objectgroup id="9" name="Spawn">
+  <object id="11" name="arulir_2" type="spawn" x="192" y="576" width="224" height="192">
+   <properties>
+    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="arulir_2"/>
+   </properties>
+  </object>
+  <object id="12" name="arulir_2" type="spawn" x="256" y="832" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="arulir_2"/>
+   </properties>
+  </object>
+  <object id="13" name="arulir_2" type="spawn" x="480" y="320" width="192" height="576">
+   <properties>
+    <property name="quantity" value="5"/>
+    <property name="spawngroup" value="arulir_2"/>
+   </properties>
+  </object>
+  <object id="14" name="gornaud_4" type="spawn" x="160" y="256" width="96" height="96">
+   <properties>
+    <property name="spawngroup" value="gornaud_4"/>
+   </properties>
+  </object>
+  <object id="15" name="arulir_2" type="spawn" x="96" y="192" width="288" height="192">
+   <properties>
+    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="arulir_2"/>
+   </properties>
+  </object>
+  <object id="16" name="gornaud_4" type="spawn" x="576" y="64" width="96" height="32">
+   <properties>
+    <property name="spawngroup" value="gornaud_4"/>
+   </properties>
+  </object>
+  <object id="17" name="arulir_2" type="spawn" x="512" y="64" width="64" height="32">
+   <properties>
+    <property name="spawngroup" value="arulir_2"/>
+   </properties>
+  </object>
+  <object id="18" name="arulir_2" type="spawn" x="288" y="480" width="128" height="192">
+   <properties>
+    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="arulir_2"/>
+   </properties>
+  </object>
+  <object id="19" name="arulir_2" type="spawn" x="448" y="416" width="32" height="96">
+   <properties>
+    <property name="spawngroup" value="arulir_2"/>
+   </properties>
+  </object>
+  <object id="20" name="arulir_2" type="spawn" x="448" y="352" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="arulir_2"/>
+   </properties>
+  </object>
+  <object id="21" name="arulir_2" type="spawn" x="416" y="96" width="96" height="224">
+   <properties>
+    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="arulir_2"/>
+   </properties>
+  </object>
+  <object id="22" name="arulir_2" type="spawn" x="640" y="64" width="96" height="128">
+   <properties>
+    <property name="spawngroup" value="arulir_2"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup id="10" name="Keys" visible="0">
+  <object id="23" name="arulircave_trap:01" type="key" x="320" y="704" width="32" height="32">
+   <properties>
+    <property name="phrase" value="do_nothing_but_leave"/>
+    <property name="requireId" value="arulircave_trap"/>
+    <property name="requireNegation" value="true"/>
+    <property name="requireType" value="questProgress"/>
+    <property name="requireValue" value="1"/>
+   </properties>
+  </object>
+  <object id="24" name="arulircave_trap:02" type="key" x="320" y="288" width="32" height="32">
+   <properties>
+    <property name="phrase" value="do_nothing_but_leave"/>
+    <property name="requireId" value="arulircave_trap"/>
+    <property name="requireNegation" value="true"/>
+    <property name="requireType" value="questProgress"/>
+    <property name="requireValue" value="2"/>
+   </properties>
+  </object>
+  <object id="25" name="arulircave_trap:03" type="key" x="288" y="320" width="32" height="32">
+   <properties>
+    <property name="phrase" value="do_nothing_but_leave"/>
+    <property name="requireId" value="arulircave_trap"/>
+    <property name="requireNegation" value="true"/>
+    <property name="requireType" value="questProgress"/>
+    <property name="requireValue" value="3"/>
+   </properties>
+  </object>
+  <object id="26" name="arulircave_trap:04" type="key" x="640" y="128" width="32" height="32">
+   <properties>
+    <property name="phrase" value="do_nothing_but_leave"/>
+    <property name="requireId" value="arulircave_trap"/>
+    <property name="requireNegation" value="true"/>
+    <property name="requireType" value="questProgress"/>
+    <property name="requireValue" value="4"/>
+   </properties>
+  </object>
+  <object id="27" name="arulircave_trap:05" type="key" x="128" y="256" width="32" height="32">
+   <properties>
+    <property name="phrase" value="do_nothing_but_leave"/>
+    <property name="requireId" value="arulircave_trap"/>
+    <property name="requireNegation" value="true"/>
+    <property name="requireType" value="questProgress"/>
+    <property name="requireValue" value="5"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup id="11" name="Replace" visible="0">
+  <object id="28" name="arulircave_trap:1" type="replace" x="320" y="704" width="32" height="32">
+   <properties>
+    <property name="Objects" value="Objects_replace"/>
+   </properties>
+  </object>
+  <object id="29" name="arulircave_trap:2" type="replace" x="320" y="288" width="64" height="32">
+   <properties>
+    <property name="Above" value="Above_replace"/>
+    <property name="Objects" value="Objects_replace"/>
+   </properties>
+  </object>
+  <object id="30" name="arulircave_trap:3" type="replace" x="288" y="320" width="64" height="32">
+   <properties>
+    <property name="Above" value="Above_replace"/>
+    <property name="Objects" value="Objects_replace"/>
+   </properties>
+  </object>
+  <object id="31" name="arulircave_trap:4" type="replace" x="640" y="128" width="32" height="32">
+   <properties>
+    <property name="Objects" value="Objects_replace"/>
+   </properties>
+  </object>
+  <object id="32" name="arulircave_trap:5" type="replace" x="96" y="192" width="64" height="96">
+   <properties>
+    <property name="Above" value="Above_replace"/>
+   </properties>
+  </object>
+ </objectgroup>
+</map>
diff --git a/AndorsTrail/res/xml/arulircave2.tmx b/AndorsTrail/res/xml/arulircave2.tmx
new file mode 100644
index 000000000..080fad309
--- /dev/null
+++ b/AndorsTrail/res/xml/arulircave2.tmx
@@ -0,0 +1,250 @@
+<?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="10">
+ <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_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" 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" 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" 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" 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" 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" 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" 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" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_5.png" width="512" height="256"/>
+ </tileset>
+ <layer name="Ground" width="15" height="15">
+  <data encoding="base64" compression="zlib">
+   eJyVk9sNgCAMRUn4cgCnFkcQ3EBxCkcwjmBwByGWeGnq6+NEa3toSarRSplIGxmBLuIol5jg3VENxgYYIh5iSzj6PkJPz1wEZ/KCa+m51ko1zM0z9uDOVXluym31eVdpxgk8dAPlUt9BmDHXI+gG6hsg3l9co8t67koeuu0Hd/npJpbqQnKf5s7+3czc57F077td4ud9cfNO8L2SXKvLHcL/CPdKcg/SnqNZ
+  </data>
+ </layer>
+ <layer name="Objects" width="15" height="15">
+  <data encoding="base64" compression="zlib">
+   eJyVkzEOwjAMRa0GBlgQKWpVAQdAvQGMjIxchQWY4QRwBe4AWwsLrIxMHdg4AgO2ElM3SpGw9NXE9osdV0mGADNUnR01wEmbda4AzqqMpYKjGIvtitwNdRE+H/u25ycBQObUkMZ+Zn1506Dak8yjffrjru3A73fr5k7dp67m8hx8syrEPLKaXNe+940AWtijigG6qEZs/IPQ8Dvc71Ev0c8I2Ynlab4a4/3QfDuh8RO3sWdt45LNo2rfoa3bQ0WBmTX1REY161jKuWO8iflL7HONmttZP3C9QO7gsLLvlTJiI76wd5Qcs8yPHfF5xEeef82sq+THG+FZ/8tJ+wCapEOx
+  </data>
+ </layer>
+ <layer name="Above" width="15" height="15">
+  <data encoding="base64" compression="zlib">
+   eJxjYECAw2IQ+rUQphgIXBLDLg7jczOhil1CUwMCl8VQ9YL42NRhs+ewGCYfZgYyuCaEXS8296P7A5sb0d0Hk0MWl2JCdeMRZsL+QQY8wphuRAfVSGZyCxNnLjJADydS9OJScxvqJuQ0gw6qcYQFNQC6n6xlideL7idtIvWipw8Q0ATqtZJF2I8rXV3CohcA1q0sEQ==
+  </data>
+ </layer>
+ <layer name="Above_replace" width="15" height="15" visible="0">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgF1ADSTOTrlaRAb78w+XpHweAAAJhQANs=
+  </data>
+ </layer>
+ <layer name="Walkable" width="15" height="15" visible="0">
+  <data encoding="base64" compression="zlib">
+   eJzbKMbAsHEQYBjAxSdGLyl6kPWSah+6XnL9S0k4keNfZPWk6scFyPUzuWaQkz4GS9zh0gsAoFmRXg==
+  </data>
+ </layer>
+ <objectgroup name="Mapevents">
+  <object id="1" name="south" type="mapchange" x="320" y="448" width="32" height="32">
+   <properties>
+    <property name="map" value="arulircave1"/>
+    <property name="place" value="north"/>
+   </properties>
+  </object>
+  <object id="2" name="arulircave_trap06" 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="3" name="gornaud_4" type="spawn" x="160" y="64" width="160" height="96"/>
+  <object id="4" name="arulir_2" type="spawn" x="128" y="96" width="32" height="64"/>
+  <object id="5" name="arulir_2" type="spawn" x="128" y="160" width="32" height="64"/>
+  <object id="6" name="arulir_2" type="spawn" x="96" y="224" width="192" height="160">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object id="7" name="arulir_2" type="spawn" x="256" y="288" width="96" height="96"/>
+ </objectgroup>
+ <objectgroup name="Keys">
+  <object id="9" name="arulircave_trap:06" type="key" x="224" y="224" width="32" height="32">
+   <properties>
+    <property name="phrase" value="do_nothing_but_leave"/>
+    <property name="requireId" value="arulircave_trap"/>
+    <property name="requireNegation" value="true"/>
+    <property name="requireType" value="questProgress"/>
+    <property name="requireValue" value="06"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Replace">
+  <object id="8" name="arulircave_trap:06" type="replace" x="224" y="160" width="32" height="96">
+   <properties>
+    <property name="Above" value="Above_replace"/>
+   </properties>
+  </object>
+ </objectgroup>
+</map>
diff --git a/AndorsTrail/res/xml/arulircave3.tmx b/AndorsTrail/res/xml/arulircave3.tmx
new file mode 100644
index 000000000..a97e5d6a5
--- /dev/null
+++ b/AndorsTrail/res/xml/arulircave3.tmx
@@ -0,0 +1,284 @@
+<?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">
+ <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_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" 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" 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" 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" 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" 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" 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" 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" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_5.png" width="512" height="256"/>
+ </tileset>
+ <layer name="Ground" width="15" height="15">
+  <data encoding="base64" compression="zlib">
+   eJw7wcnAcIJIPJeZgaEHCROrD4TXM0P0zyNDL0z/BqgZMLE3zKgYn36Q3vXMmHrQ8X885hDS95YMvW+JcD8xemF230Iz6x8zdvyfgDkgLMCCHb9G8zc2vbjwXyT7kd1HanrAhrspMAc5XaNjcvURiwHqmLNr
+  </data>
+ </layer>
+ <layer name="Objects" width="15" height="15">
+  <data encoding="base64" compression="zlib">
+   eJxjYCAOHGSG0J6yDAxeQCwlC+G/EcKufoo4A8M0cexynrII9k2gubeg+DbUjiVAfcvEEebD7IYBmHpkEMyEaQ6625EBK1A9JxOCD2KzMGGqg+k/BDXjIdS/rkC1blD1klBamQVTLywcJgkzMEwGYjGg2lAgDgPiRCaIeSB9H4VQ3Q3yNywcFgH1LRZG2A+zD+TmX6IIcZDfU4HqTcURdoMAur+cofwcVkg4gADInE9AbAbVU4Yl7q4LIvz5ECnerwHFQ4DqXaF6QO5WYsGOxZkQGGROKJI+EKhkhugvBeISIF6KlBYUoWbAwhlbGqtixsTVWOIfFragcK6EylvJomJrWdxmwjAIWALVHRJDxZqymOZhw1pADACKk0ZB
+  </data>
+ </layer>
+ <layer name="Objects_replace" width="15" height="15">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgFQxFwM5GvV5oCvaOA+gAASCwAKw==
+  </data>
+ </layer>
+ <layer name="Above" width="15" height="15">
+  <data encoding="base64" compression="zlib">
+   eJxjYCAfZAmTr7cKTW8SE/F6u3DYKwg046EQ+W6iBIDcf0kMt/wsPGGFTx8IrCIynFPEGRiuCxKnNhmHe3Hpd4bGjyQJ8XQNalYwCXrwAXYmBAYBV3HKzXw9QOkFGQAA8aoNWA==
+  </data>
+ </layer>
+ <layer name="Walkable" width="15" height="15" visible="0">
+  <data encoding="base64" compression="zlib">
+   eJzbKMbAsHEAMQzA2KTqQwbk6iNWPza1pNiNzY/oZpHrdlL1EhInJd7IiW966x3MGACNIIpf
+  </data>
+ </layer>
+ <layer name="Walkable_replace" width="15" height="15" visible="0">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgFQxFsFBsYvaOA+gAAn/oBjw==
+  </data>
+ </layer>
+ <objectgroup name="Mapevents">
+  <object id="1" name="west" type="mapchange" x="0" y="128" width="32" height="64">
+   <properties>
+    <property name="map" value="arulircave1"/>
+    <property name="place" value="east"/>
+   </properties>
+  </object>
+  <object id="2" name="downstairs" type="mapchange" x="352" y="256" width="32" height="32">
+   <properties>
+    <property name="map" value="arulircave4"/>
+    <property name="place" value="upstairs"/>
+   </properties>
+  </object>
+  <object id="3" name="arulircave_trap07" type="script" x="160" y="224" width="32" height="64">
+   <properties>
+    <property name="when" value="enter"/>
+   </properties>
+  </object>
+  <object id="4" name="arulircave_trap10" type="script" x="192" y="320" width="96" height="32">
+   <properties>
+    <property name="when" value="enter"/>
+   </properties>
+  </object>
+  <object id="5" name="slipperytrap" type="mapchange" x="192" y="352" width="96" height="32">
+   <properties>
+    <property name="map" value="mountainlake5"/>
+    <property name="place" value="trapexit"/>
+   </properties>
+  </object>
+  <object id="13" name="arulircave_trap10_msg" type="script" x="192" y="352" width="96" 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">
+   <properties>
+    <property name="quantity" value="3"/>
+   </properties>
+  </object>
+  <object id="7" name="arulir_2" type="spawn" x="224" y="224" width="64" height="128"/>
+ </objectgroup>
+ <objectgroup name="Keys">
+  <object id="10" name="arulircave_trap:07" type="key" x="160" y="224" width="32" height="64">
+   <properties>
+    <property name="phrase" value="do_nothing_but_leave"/>
+    <property name="requireId" value="arulircave_trap"/>
+    <property name="requireNegation" value="true"/>
+    <property name="requireType" value="questProgress"/>
+    <property name="requireValue" value="07"/>
+   </properties>
+  </object>
+  <object id="12" name="arulircave_trap:10" type="key" x="224" y="288" width="64" height="32">
+   <properties>
+    <property name="phrase" value="arulircave_trap10"/>
+    <property name="requireId" value="arulircave_trap"/>
+    <property name="requireNegation" value="true"/>
+    <property name="requireType" value="questProgress"/>
+    <property name="requireValue" value="10"/>
+   </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">
+   <properties>
+    <property name="Objects" value="Objects_replace"/>
+    <property name="Walkable" value="Walkable_replace"/>
+   </properties>
+  </object>
+ </objectgroup>
+</map>
diff --git a/AndorsTrail/res/xml/arulircave4.tmx b/AndorsTrail/res/xml/arulircave4.tmx
new file mode 100644
index 000000000..d6137030f
--- /dev/null
+++ b/AndorsTrail/res/xml/arulircave4.tmx
@@ -0,0 +1,234 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" tiledversion="1.1.5" orientation="orthogonal" renderorder="right-down" width="10" height="10" tilewidth="32" tileheight="32" infinite="0" nextobjectid="6">
+ <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_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" 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" 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" 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" 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" 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" 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" tilecount="128" columns="16">
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
+ </tileset>
+ <layer name="Ground" width="10" height="10">
+  <data encoding="base64" compression="zlib">
+   eJx7w8zA8AaI/yHhNzjwWyAWYEHg13jUfULCxKrDZe9/NDXI7niNJCbIAlHzF+oPmD5eNHUws/ihZsD0IbsV3W3oGNlP+NSh+4WQGgAJg1YT
+  </data>
+ </layer>
+ <layer name="Objects" width="10" height="10">
+  <data encoding="base64" compression="zlib">
+   eJxjYCAPyDHhl1diQWB84JMoA4OQMAPDTWYI/wQzBGMDIDXBUHt5gTSTGKq8JFBMDCrvDKX/APUIoalTxuKmS0JAt6KpewMUewTEilB/gPT9B/IfCqGqOwzUxwm1TwwpXG5i8cctZkyMDAAPtxL8
+  </data>
+ </layer>
+ <layer name="Above" width="10" height="10">
+  <data encoding="base64" compression="zlib">
+   eJxjYCANHBYjXh2TMHXNI6TvMlDsEhHqkMWcmSA0uj5kdbxANcFMuN12mxm3HKkAAJheCx4=
+  </data>
+ </layer>
+ <layer name="Walkable" width="10" height="10" visible="0">
+  <data encoding="base64" compression="zlib">
+   eJzbKMbAsHEAMQiQq24gxGAAmzp0QE54AABNk0IU
+  </data>
+ </layer>
+ <objectgroup name="Mapevents" visible="0">
+  <object id="1" name="upstairs" type="mapchange" x="224" y="128" width="32" height="32">
+   <properties>
+    <property name="map" value="arulircave3"/>
+    <property name="place" value="downstairs"/>
+   </properties>
+  </object>
+  <object id="2" name="downstairs" type="mapchange" x="64" y="96" width="32" height="32">
+   <properties>
+    <property name="map" value="arulircave5"/>
+    <property name="place" value="upstairs"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Spawn" visible="0">
+  <object id="3" name="arulir_3" type="spawn" x="192" y="224" width="64" height="64">
+   <properties>
+    <property name="spawngroup" value="arulir_3"/>
+   </properties>
+  </object>
+  <object id="4" name="arulir_3" type="spawn" x="128" y="256" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="arulir_3"/>
+   </properties>
+  </object>
+  <object id="5" name="arulir_3" type="spawn" x="64" y="160" width="64" height="128">
+   <properties>
+    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="arulir_3"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Keys"/>
+ <objectgroup name="Replace"/>
+</map>
diff --git a/AndorsTrail/res/xml/arulircave5.tmx b/AndorsTrail/res/xml/arulircave5.tmx
new file mode 100644
index 000000000..66d53da40
--- /dev/null
+++ b/AndorsTrail/res/xml/arulircave5.tmx
@@ -0,0 +1,261 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.2" tiledversion="1.3.0" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="10" height="10" tilewidth="32" tileheight="32" infinite="0" nextlayerid="13" nextobjectid="10">
+ <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_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" 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" 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" 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" 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" 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" 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" tilecount="128" columns="16">
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
+ </tileset>
+ <layer id="1" name="Ground" width="10" height="10">
+  <data encoding="base64" compression="zlib">
+   eAH7xMzA8AmKWVgYGNAxTA6ZZgWqE0PDzEA+sprPQDPFgWI9QFoYSoPYokD2R6h9IPUgdSBxbJgcdSAzsZkFEkM2D9mtMDZMHyF1MDcTUgdzC8x8YmgAkpxJQg==
+  </data>
+ </layer>
+ <layer id="2" name="Ground_replace" width="10" height="10" visible="0">
+  <data encoding="base64" compression="zlib">
+   eAFjYBge4BMzAwMLCwT3ANnIGNmHn4FyYkB1MCwOZIPUfgRiZABSh2wGjE2uOpD7YGYg0yBxZAAAyzoUQw==
+  </data>
+ </layer>
+ <layer id="3" name="Objects" width="10" height="10">
+  <data encoding="base64" compression="zlib">
+   eAFjYCAfMIkR1svEwsAgBFTHCKQ1gBgb0ASKPxJiYFACqgtmgqhQx6KWFSrHCaSFhLGZBBE7DDTnATMEPwTSYkD1ID2EAEgtseCTKLEqSVMHAAZiCBk=
+  </data>
+ </layer>
+ <layer id="4" name="Objects_replace" width="10" height="10" visible="0">
+  <data encoding="base64" compression="zlib">
+   eAFjYBh+4LAYA8MlIQYGSSYGhj5h3P77DVQDAmE41GiwMDDAsCaQ/QiqHqILQf4Hiv/kg/DFgHaCMDbwgJmBARkfx2IeAGg2DEI=
+  </data>
+ </layer>
+ <layer id="5" name="Above" width="10" height="10">
+  <data encoding="base64" compression="zlib">
+   eAFjYCAPHBaD6HNmwq3/MlDNJai6YDzqYGbhNgkiA1LHJAxh9wHpi1Cz0fU9YEYXGTg+qW4BANzBCFo=
+  </data>
+ </layer>
+ <layer id="6" name="Above_replace" width="10" height="10">
+  <data encoding="base64" compression="zlib">
+   eAFjYBh+4AEzA8N5IAaBR1AawiONvCZEmnqY6u1E6AO5EYTRAQCbzwYS
+  </data>
+ </layer>
+ <layer id="7" name="Walkable" width="10" height="10">
+  <data encoding="base64" compression="zlib">
+   eAHbKMbAsJHGmAEICNkBUoMMsKkHyYPEkWkYG5t6mBhEB243IJuBzIbph9HIcuhsEB8GYOrJoQFhWz74
+  </data>
+ </layer>
+ <layer id="8" name="Walkable_replace" width="10" height="10" visible="0">
+  <data encoding="base64" compression="zlib">
+   eAFjYBgeYKMYAwM6BvkMJIYM0NXA5GE0TC26OmRxGBtEo+uDiaGLo5uHzEc2DwAJJRT+
+  </data>
+ </layer>
+ <objectgroup id="9" name="Mapevents">
+  <object id="1" name="upstairs" type="mapchange" x="160" y="64" width="32" height="32">
+   <properties>
+    <property name="map" value="arulircave4"/>
+    <property name="place" value="downstairs"/>
+   </properties>
+  </object>
+  <object id="2" name="downstairs" type="mapchange" x="256" y="224" width="32" height="32">
+   <properties>
+    <property name="map" value="arulircave6"/>
+    <property name="place" value="upstairs"/>
+   </properties>
+  </object>
+  <object id="3" name="arulircave_secret" type="script" x="160" y="128" width="32" height="32">
+   <properties>
+    <property name="when" value="enter"/>
+   </properties>
+  </object>
+  <object id="4" name="arulircave_secretloot" type="container" x="64" y="256" width="32" height="32"/>
+  <object id="5" name="arulircave_secret_initiate" type="script" x="128" y="96" width="96" height="32">
+   <properties>
+    <property name="when" value="enter"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup id="10" name="Spawn" visible="0">
+  <object id="6" name="arulir_3" type="spawn" x="160" y="128" width="64" height="32"/>
+  <object id="7" name="arulir_3" type="spawn" x="224" y="96" width="32" height="32"/>
+  <object id="8" name="arulir_3" type="spawn" x="224" y="128" width="64" height="64"/>
+ </objectgroup>
+ <objectgroup id="11" name="Keys"/>
+ <objectgroup id="12" name="Replace" visible="0">
+  <object id="9" name="arulircave_secret:20" type="replace" x="0" y="160" width="224" height="160">
+   <properties>
+    <property name="Above" value="Above_replace"/>
+    <property name="Ground" value="Ground_replace"/>
+    <property name="Objects" value="Objects_replace"/>
+    <property name="Walkable" value="Walkable_replace"/>
+   </properties>
+  </object>
+ </objectgroup>
+</map>
diff --git a/AndorsTrail/res/xml/arulircave6.tmx b/AndorsTrail/res/xml/arulircave6.tmx
new file mode 100644
index 000000000..9823c4acd
--- /dev/null
+++ b/AndorsTrail/res/xml/arulircave6.tmx
@@ -0,0 +1,326 @@
+<?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="19">
+ <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_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" 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" 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" 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" 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" 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" 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" 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" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_5.png" width="512" height="256"/>
+ </tileset>
+ <layer name="Ground" width="15" height="15">
+  <data encoding="base64" compression="zlib">
+   eJyVklsSgyAMRVE2170JS6CsoFpnXGDJNHfmmgaqH2ciIYdHJMUQUuNJpAGoqTqW+CZKx+O6vZE1rnMIL41bi4vj7fqdyZV6C7uZPIyP+RuRG7n2DOLaO8Hl3lTHE+xc0l4hj75YT+A5sMXffDaed+Yeds+rrrfnVfcxncFad/flce+9Mrhrib7LNSOKeRv8H/+5zAfVuYqF
+  </data>
+ </layer>
+ <layer name="Ground_replace" width="15" height="15" visible="0">
+  <data encoding="base64" compression="zlib">
+   eJxjYBj6QJGJgUGZiTy9hkB9xmTqXccE0T8KRgElAADS6QGU
+  </data>
+ </layer>
+ <layer name="Objects" width="15" height="15">
+  <data encoding="base64" compression="zlib">
+   eJx9UzsOwjAMNYkYWDO0AtSFDXEExk4VIxJn4XMBOAEg2CkjM1PbkwBCYuAIDNiKraah5UlPcR2/+JN0EkEtEvT3kHkA0MV10hAnUEH1ux81616mtI8awKD2oKvakafLtaWgQLutAAacN9P12kL/2mkIMEfenToIiVMvxW4xZh9WYwrMd2L93NsTBMrGnMNqfgHtpQ3auroFfj1Prp/mIvGyvr09qSdWdlbipxn+w43P6WDcFPkxv3VIzgWuK7aXuF5Y21VWs0OukRtH+zCWhIBrGfMd5Mbml3ml3AMhadm7oJyzVnnGMCr1V/bFTo8dr1/STdnnv1d5cy6l18y7n6b/423q/Zlz1hfymkLs
+  </data>
+ </layer>
+ <layer name="Objects_replace" width="15" height="15" visible="0">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgF5AIRJlQ+NxN2dcQAaQr0HmImX+8oGHgAAOTeAQY=
+  </data>
+ </layer>
+ <layer name="Above_replace" width="15" height="15" visible="0">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgFIxn0Cw+0C0YBAPj5AKM=
+  </data>
+ </layer>
+ <layer name="Above" width="15" height="15">
+  <data encoding="base64" compression="zlib">
+   eJxjYKAcHBYjTt1lMUz+JaiYEBN2Pc5MCHVPhXDb+VyIAQMgm49sPzHuham5CjT3sRDCnGpmVHWVaHx087H5GZ99MHvQ1V0TQvULMsDmx8fQ8NiEJVyQzbyIpBfd/EN49CIDXH4ChRU++9mE8ZuFHtYgcAPqZjGg3nBGCP4GtQM9XrHphwF0v2JLEzAxbiR3wsL1MZK/sMULTK+0MGoYI5sDMwMAGfoxAQ==
+  </data>
+ </layer>
+ <layer name="Walkable" width="15" height="15">
+  <data encoding="base64" compression="zlib">
+   eJzbKMbAsHGAMQiQqw8GiFGHTR8+/fjECemjRC85/iUUDrj0kqIPpo6YsMMX1vgAsfaTE1fY7CDGD7TGAAeHfSg=
+  </data>
+ </layer>
+ <objectgroup name="Mapevents">
+  <object id="1" name="upstairs" type="mapchange" x="96" y="64" width="32" height="32">
+   <properties>
+    <property name="map" value="arulircave5"/>
+    <property name="place" value="downstairs"/>
+   </properties>
+  </object>
+  <object id="2" name="arulircave_trap08" type="script" x="128" y="96" width="64" height="96">
+   <properties>
+    <property name="when" value="enter"/>
+   </properties>
+  </object>
+  <object id="3" name="arulircave_trap09" type="script" x="256" y="256" width="32" height="32">
+   <properties>
+    <property name="when" value="enter"/>
+   </properties>
+  </object>
+  <object id="4" name="arulirmountain_bosstrap" type="script" x="352" y="320" width="96" height="128">
+   <properties>
+    <property name="when" value="round"/>
+   </properties>
+  </object>
+  <object id="5" name="arulirmountain_bosstrap_r" type="script" x="320" y="320" width="32" height="32">
+   <properties>
+    <property name="when" value="enter"/>
+   </properties>
+  </object>
+  <object id="6" name="arulir_gem5" type="container" x="32" y="288" width="32" height="32"/>
+ </objectgroup>
+ <objectgroup name="Spawn">
+  <object id="7" name="gornaud_4" type="spawn" x="352" y="96" width="96" height="96">
+   <properties>
+    <property name="spawngroup" value="gornaud_4"/>
+   </properties>
+  </object>
+  <object id="8" name="gornaud_4" type="spawn" x="96" y="160" width="128" height="224">
+   <properties>
+    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="gornaud_4"/>
+   </properties>
+  </object>
+  <object id="9" name="arulir_3" type="spawn" x="32" y="128" width="96" height="224">
+   <properties>
+    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="arulir_3"/>
+   </properties>
+  </object>
+  <object id="10" name="arulir_leader" type="spawn" x="384" y="320" width="64" height="128">
+   <properties>
+    <property name="spawngroup" value="arulir_leader"/>
+   </properties>
+  </object>
+  <object id="11" name="arulir_3" type="spawn" x="160" y="384" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="arulir_3"/>
+   </properties>
+  </object>
+  <object id="12" name="arulir_3" type="spawn" x="192" y="256" width="96" height="160">
+   <properties>
+    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="arulir_3"/>
+   </properties>
+  </object>
+  <object id="13" name="arulir_3" type="spawn" x="288" y="192" width="64" height="96">
+   <properties>
+    <property name="spawngroup" value="arulir_3"/>
+   </properties>
+  </object>
+  <object id="14" name="arulir_4" type="spawn" x="288" y="288" width="32" height="64">
+   <properties>
+    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="arulir_4"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Keys">
+  <object id="15" name="arulircave_trap:08" type="key" x="128" y="96" width="64" height="96">
+   <properties>
+    <property name="phrase" value="do_nothing_but_leave"/>
+    <property name="requireId" value="arulircave_trap"/>
+    <property name="requireNegation" value="true"/>
+    <property name="requireType" value="questProgress"/>
+    <property name="requireValue" value="8"/>
+   </properties>
+  </object>
+  <object id="16" name="arulircave_trap:09" type="key" x="256" y="256" width="32" height="32">
+   <properties>
+    <property name="phrase" value="do_nothing_but_leave"/>
+    <property name="requireId" value="arulircave_trap"/>
+    <property name="requireNegation" value="true"/>
+    <property name="requireType" value="questProgress"/>
+    <property name="requireValue" value="9"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Replace" visible="0">
+  <object id="17" name="arulircave_trap:8" type="replace" x="128" y="96" width="64" height="96">
+   <properties>
+    <property name="Ground" value="Ground_replace"/>
+    <property name="Objects" value="Objects_replace"/>
+   </properties>
+  </object>
+  <object id="18" name="arulircave_trap:9" type="replace" x="256" y="160" width="32" height="128">
+   <properties>
+    <property name="Objects" value="Objects_replace"/>
+   </properties>
+  </object>
+ </objectgroup>
+</map>
diff --git a/AndorsTrail/res/xml/arulirmountain1.tmx b/AndorsTrail/res/xml/arulirmountain1.tmx
new file mode 100644
index 000000000..e51c5f3cf
--- /dev/null
+++ b/AndorsTrail/res/xml/arulirmountain1.tmx
@@ -0,0 +1,416 @@
+<?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="39">
+ <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_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" 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" 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" 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" 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" 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" 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" 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">
+   eJyVVktSwlAQhMcKFy7ZudAb6B3kam48QsobQLA4QAgrtwGOkIP4pmTKTtPzEqzqKpPMm+758ro0m20DHADq++fiD3XG7orvjCbwE/GgXZtxAjSkw/18LYYwHR3Yo58N8aA+tztn9ICOdJzIt8frvjrhB7W7jWmpwU7loU9ayxlsMFb2g9r9nfOO1UBp4Xfon3Pb05mmwDulJ5Sex9Utr9JoNhW9Ny0fQvcYnlY6XgW0qYL/EW3BV0XnmhF77zezORd8qe/IwfPWBfY8a5FNpCnqK5+3LfFXSc8s519pwpje58NnnjfeYWMza9gJTTXFZLy8VzBW5p4yszsRX0s6jNef7U/FijtljNPrwPFZ/D/LfxgvPiN8RrH2B/Cv5sp7qKaa7ZfTeQ2Y4z4N93tUV5+bkl/j9TmrhC3m2PuuS8Me8LNee++9iFPVpw64+XcBewB7J/JhiPZYKT9qTnnmSzku9aL3xL1aeU7Zx5T9an3HvbcR9hFa6t1jfl4/DH3wLlOcrFftmNKcXq683oO47/oCZ/T7H4HPm0/jxbtRxMW8rtXyuJ7fD+fxvVLiwxyb1uM1j5WAz7A6vwccRR3U7sC9dAnmiFHivdB3vqe6fp/Ne+5KamdE9VT3yOeMl6Tvz2oO8fuU+vE+co7XjLd0u5N45rmfeWdHdY9i53uG++CZ5x6L7ijIEdXCd76q6y+HGpWd
+  </data>
+ </layer>
+ <layer name="Objects" width="30" height="30">
+  <data encoding="base64" compression="zlib">
+   eJydV01rFEEQ7XRgFxP82Bkzw4omh8Rf4k8Q4i2XnA1ozp79C4aoF9GzN8nFj+SQBQUhYOJuTu6yC0oOksNiQCRdTBf9pqY6M+ZBszPTVfWqqqtqZo1phn4nXH+aNWbXra28+L0MRjZcH3aq+49s9RniaR74aT3Lw94R2FuqsSMRk5fPP7SM+dgqrkf/yYEYC12ytZYaMx+x+bUVck55I3nyje2kih76R3JfEmOGSXGfwd5GGq77naCHPqKtfwtVnvWGuaAzmnV8v5WzR3wDDrJ/NWtmH7HjdCzEtqvYIJkd/zyLxLCY6fIIzg/3C52RJsc2CFyvf5PqPttZS82FiHHgvtZnEgfChw3BuwdxS862qBfcvy1qsClGtl5+nmWUHK0rNUzIRE3fcWsu0jtSV973lbxuCr37QidtG3PTrQW3btnAxaCz4h5lOzcgPvb/elr16VDMv/ewt+z4Vty62y77o82wPTxfx3Pi/cFzHUK93PM2Bm7/j18E+j1z67Wb0W/y4v4YbMTmZ11NMzi3vQbyU+DGGVey1w3c2A9jJT6OjbBtq7PjBdwTN+8fiZp5HMkBnuuZEt+2oofnv+z9P47MKnyvoU+novYkH501z+ZX3bLMT+CaQh1gf1HdcO6XxHNpgzlpT/YRg/L6KyvrIa65/c8QH3PPiT7twVlqHIQryiyTtcf1sxjxF2cG2SD9idfhGOW87sIs+94p6lDWxFtb7smHtqyL4Nrdv6BvcpiLPxKdk/Hcy9E8fmLLedpU+Il3YoNvxEP9NvYxDJQeYwyTqr3Y857PI+eVzpFjpjrg+TuIcDXBicL7YKa8iHN1pth7B/LMx+cfe9drsyo2NxDEy3L7oq8nEKt81zMop5ManlMlfpy1hAFcc/7R/9h312UwjdQO+9Rr8C2EkPO6KVZcXl7ask/aLK77DiZoOY5Bm1+U87r/KufB/dCH
+  </data>
+ </layer>
+ <layer name="Objects_replace" width="30" height="30">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgFIxmIMA20C0bBYAKXhAYmTZwRop5ZQ939o2AUjIJRMApGwSgYBfQEAIj5AuM=
+  </data>
+ </layer>
+ <layer name="Above" width="30" height="30">
+  <data encoding="base64" compression="zlib">
+   eJy1VjFOxDAQDI4EEh2JdOj4Bk/gEXQ0PIFXIJ4QwQ94ACVcw4kG3UmIGsRV1FQgEUuxvLeZXa8dmCq5jGfiye76qqocD/X2/b6bIEawmKU5301V3Q/+R73voh5zqM75PO1n8b1wkbsn7Neis55F3srAp9rPu/iZRcevz/HL0U75ctTtNE0rrtl3aoFv58Y8DTn8K4HXkd/XIJ9O0ed8xPWcwJOeW2qV4tLF/VBNqhNqTPPMqSc0V1DPck30TqXw88PSszzTFcg4N3PLuyMO8n08sPtK9c2/O/J5a7bvfwbfr/76tb9+N/SO5B8ypr4fLr3/gBJvWrd8f/+J4Gnp1WPljLPsmftS/xzw2ZTjnXMWc0+/5pPUtzY/OawZI0+Uz03mnrnGWTvmaPzUWSL5aqB5hP56AfNDy/mQPUN9it7LUnO3gq8j2Wk9gXw9NsKM5Pvk+TXE92Q+niGnO/H6bpgfNGOv/0S8pflnqVG01msvm6iRyphrTP0PuDF8e8n7L9ek5pGmU5p9CXjPW8B73zoLAn4BkHuMUA==
+  </data>
+ </layer>
+ <layer name="Walkable" width="30" height="30" visible="0">
+  <data encoding="base64" compression="zlib">
+   eJztkzsSACEIQz3F3v8K3nBbC5QkgDRmhsZRXvg4vzHmi9ZYhdz18rDM9d0uh3VuvWd4rJA8iIeTd5TP9tzzavk6zZ7lor7YnVP2FOlHxR/aKYOH5sngKf5v1xnlMnOt4Kq1Zu1X9V5k7uF6XjFPT4r/yt6iPfNmo7Aic+7mRnmKotyIz9vc27V21vtCix91sCTt
+  </data>
+ </layer>
+ <objectgroup name="Mapevents" visible="0">
+  <object id="28" 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 id="1" 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 id="2" 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 id="3" 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 id="4" name="arulirmountain_trap03" type="script" x="256" y="128" width="32" height="32">
+   <properties>
+    <property name="when" value="enter"/>
+   </properties>
+  </object>
+  <object id="5" name="arulirmountain_trap04" type="script" x="640" y="288" width="32" height="32">
+   <properties>
+    <property name="when" value="enter"/>
+   </properties>
+  </object>
+  <object id="6" name="arulirmountain_trap05" type="script" x="256" y="352" width="32" height="32">
+   <properties>
+    <property name="when" value="enter"/>
+   </properties>
+  </object>
+  <object id="35" name="bernhar_reminder" type="script" x="576" y="448" width="32" height="32">
+   <properties>
+    <property name="when" value="enter"/>
+   </properties>
+  </object>
+  <object id="36" name="bernhar_remove" type="script" x="576" y="352" width="32" height="32">
+   <properties>
+    <property name="when" value="enter"/>
+   </properties>
+  </object>
+  <object id="37" name="arulir_gem2" type="container" x="128" y="160" width="32" height="32"/>
+  <object id="38" name="arulir_gem1" type="container" x="160" y="480" width="32" height="32"/>
+ </objectgroup>
+ <objectgroup name="Spawn" visible="0">
+  <object id="9" 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 id="10" name="arulir_1b" type="spawn" x="320" y="736" width="96" height="32">
+   <properties>
+    <property name="spawngroup" value="arulir_1"/>
+   </properties>
+  </object>
+  <object id="11" 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 id="12" 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 id="13" name="arulir_1e" type="spawn" x="576" y="448" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="arulir_1"/>
+   </properties>
+  </object>
+  <object id="14" name="arulir_1f" type="spawn" x="576" y="288" width="32" height="96">
+   <properties>
+    <property name="spawngroup" value="arulir_1"/>
+   </properties>
+  </object>
+  <object id="15" 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 id="16" 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 id="17" name="arulir_1i" type="spawn" x="256" y="288" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="arulir_1"/>
+   </properties>
+  </object>
+  <object id="18" name="gornaud_4" type="spawn" x="64" y="384" width="224" height="128">
+   <properties>
+    <property name="spawngroup" value="gornaud_4"/>
+   </properties>
+  </object>
+  <object id="19" 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 id="20" 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 id="30" 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 id="21" name="arulir_2" type="spawn" x="544" y="160" width="96" height="64">
+   <properties>
+    <property name="spawngroup" value="arulir_2"/>
+   </properties>
+  </object>
+  <object id="34" 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 id="22" 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"/>
+    <property name="requireNegation" value="true"/>
+    <property name="requireType" value="questProgress"/>
+    <property name="requireValue" value="3"/>
+   </properties>
+  </object>
+  <object id="23" 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"/>
+    <property name="requireNegation" value="true"/>
+    <property name="requireType" value="questProgress"/>
+    <property name="requireValue" value="4"/>
+   </properties>
+  </object>
+  <object id="24" 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"/>
+    <property name="requireNegation" value="true"/>
+    <property name="requireType" value="questProgress"/>
+    <property name="requireValue" value="5"/>
+   </properties>
+  </object>
+  <object id="33" 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"/>
+    <property name="requireType" value="questProgress"/>
+    <property name="requireValue" value="1"/>
+   </properties>
+  </object>
+  <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"/>
+    <property name="requireType" value="questProgress"/>
+    <property name="requireValue" value="2"/>
+   </properties>
+  </object>
+  <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"/>
+    <property name="requireType" value="questProgress"/>
+    <property name="requireValue" value="2"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Replace" visible="0">
+  <object id="25" name="arulirmountain_trap:3" type="replace" x="256" y="128" width="32" height="32">
+   <properties>
+    <property name="Objects" value="Objects_replace"/>
+   </properties>
+  </object>
+  <object id="26" name="arulirmountain_trap:4" type="replace" x="640" y="256" width="64" height="64">
+   <properties>
+    <property name="Objects" value="Objects_replace"/>
+   </properties>
+  </object>
+  <object id="27" name="arulirmountain_trap:5" type="replace" x="256" y="320" width="64" height="64">
+   <properties>
+    <property name="Objects" value="Objects_replace"/>
+   </properties>
+  </object>
+ </objectgroup>
+</map>
diff --git a/AndorsTrail/res/xml/arulirmountain2.tmx b/AndorsTrail/res/xml/arulirmountain2.tmx
new file mode 100644
index 000000000..1158871c2
--- /dev/null
+++ b/AndorsTrail/res/xml/arulirmountain2.tmx
@@ -0,0 +1,290 @@
+<?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="12">
+ <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_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" 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" 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" 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" 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" 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" 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" tilecount="128" columns="16">
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="7449" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_rock_2.png" width="512" height="256"/>
+ </tileset>
+ <layer name="Ground" width="15" height="15">
+  <data encoding="base64" compression="zlib">
+   eJyVkkEOgzAMBKE3Hs2TaJ4A5tRrmh54AA9pLNbS1nJRchghxUzWcbI9hmEDT5Aqb0epnKhL5Zh+6wu53ud9S+CutG+i/xmtvabL5fVc2dG/BJ5lRq7ycT32uHck8nrdebxQT7+Z5huxB7lGxnwFZ7nLFXIXzDQ3eMnlmtuCkGvn9G/vHwXugdy1w7Vsu5+WnsVls9vS6wn4XWjPX5Nuqok=
+  </data>
+ </layer>
+ <layer name="Objects" width="15" height="15">
+  <data encoding="base64" compression="zlib">
+   eJxjYEAFf4QYGK4LMmAFXEwMDE+ZIGwTcexqsAGQHikgvgY11w2PXpDdj4Rwm5MG1fsYqEZGGMIGmQtzFwh8wuKHKeIQv4EAyHyQ/sdAPcFQfTvFMO2LZWRgWAOULwPqNRNHuA8EtgHpZ0y43ZrLCHHTITEIG2Q+CIsxYVcPsx9Z/hCSm2D2YnMnsl8jgXYdBqppA7o3mBG7Xc5IdjxDc08JUN8ycYg9j5HkYOGLy/0w+U4mhHseQ9PLTSgfFtYiUPqTEELvVCxpohAoXoTDPhiAmT2NhPSI7N4UoD5TqH9B6Qg5LK9B06IkmhuSkfgpJNqLDFzFIfYBAE9ZO6c=
+  </data>
+ </layer>
+ <layer name="Objects_replace" width="15" height="15">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgF9AQiTAPtAsrAUHf/YAQATnAALQ==
+  </data>
+ </layer>
+ <layer name="Above" width="15" height="15">
+  <data encoding="base64" compression="zlib">
+   eJxjYMAODotBMLoYCFzCIkdI7yUo/zKaHI8wYb3IcpdwyF0Ww+4uCw5Ut+My9ykTqtmhQH1hQBzLCBEH0dgALveAQBxUTzDQ7E4gnsuEW+08JoS9bkDszATRX4impxuHGZeh7ogA6g1mhODZTJhqLmNxL7IfYOEE0+vMhBDH51f0eAWBYCZM87EBfHGODtag+QmmdzWesAUBTizysPRySYiwfmT7sLFJ0Yue1gDODDLz
+  </data>
+ </layer>
+ <layer name="Top" width="15" height="15">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgFhEAsI/l64yjQOwpGBgAAri0Avg==
+  </data>
+ </layer>
+ <layer name="Walkable" width="15" height="15" visible="0">
+  <data encoding="base64" compression="zlib">
+   eJzbKMbAsJFOGASIVYcOsMnjswOXGlxmEpLD5i5cbiXFDHSzyAkfQmFCK72E/IovbIn160jAAKragdI=
+  </data>
+ </layer>
+ <objectgroup name="Mapevents" visible="0">
+  <object id="1" name="west" type="mapchange" x="0" y="96" width="32" height="96">
+   <properties>
+    <property name="map" value="arulirmountain1"/>
+    <property name="place" value="east"/>
+   </properties>
+  </object>
+  <object id="2" name="arulirmountain_brokenbridge" type="script" x="352" y="160" width="32" height="32">
+   <properties>
+    <property name="when" value="enter"/>
+   </properties>
+  </object>
+  <object id="3" name="arulirmountain_trap01" type="script" x="160" y="288" width="32" height="32">
+   <properties>
+    <property name="when" value="enter"/>
+   </properties>
+  </object>
+  <object id="4" name="arulirmountain_trap02" type="script" x="64" y="192" width="32" height="32">
+   <properties>
+    <property name="when" value="enter"/>
+   </properties>
+  </object>
+  <object id="11" name="arulir_gem3" type="container" x="320" y="256" width="32" height="32"/>
+ </objectgroup>
+ <objectgroup name="Spawn" visible="0">
+  <object id="5" name="gornaud_4" type="spawn" x="224" y="32" width="192" height="128">
+   <properties>
+    <property name="spawngroup" value="gornaud_4"/>
+   </properties>
+  </object>
+  <object id="6" name="arulir_1" type="spawn" x="96" y="192" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="arulir_1"/>
+   </properties>
+  </object>
+  <object id="7" name="arulir_1" type="spawn" x="160" y="128" width="192" height="256">
+   <properties>
+    <property name="quantity" value="4"/>
+    <property name="spawngroup" value="arulir_1"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Keys" visible="0">
+  <object id="8" name="arulirmountain_trap:01" type="key" x="160" y="288" width="32" height="32">
+   <properties>
+    <property name="phrase" value="do_nothing_but_leave"/>
+    <property name="requireId" value="arulirmountain_trap"/>
+    <property name="requireNegation" value="true"/>
+    <property name="requireType" value="questProgress"/>
+    <property name="requireValue" value="01"/>
+   </properties>
+  </object>
+  <object id="21" name="arulirmountain_trap:02" type="key" x="64" y="192" width="32" height="32">
+   <properties>
+    <property name="phrase" value="do_nothing_but_leave"/>
+    <property name="requireId" value="arulirmountain_trap"/>
+    <property name="requireNegation" value="true"/>
+    <property name="requireType" value="questProgress"/>
+    <property name="requireValue" value="02"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Replace" visible="0">
+  <object id="9" name="arulirmountain_trap:01" type="replace" x="160" y="288" width="32" height="32">
+   <properties>
+    <property name="Objects" value="Objects_replace"/>
+   </properties>
+  </object>
+  <object id="10" name="arulirmountain_trap:02" type="replace" x="64" y="192" width="32" height="32">
+   <properties>
+    <property name="Objects" value="Objects_replace"/>
+   </properties>
+  </object>
+ </objectgroup>
+</map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain16.tmx b/AndorsTrail/res/xml/blackwater_mountain16.tmx
index a673a60cb..e5fadc04e 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.0.2" orientation="orthogonal" renderorder="right-down" width="15" height="30" tilewidth="32" tileheight="32" nextobjectid="14">
+<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">
  <properties>
   <property name="outdoors" value="1"/>
  </properties>
@@ -190,7 +190,7 @@
  </layer>
  <layer name="Objects" width="15" height="30">
   <data encoding="base64" compression="zlib">
-   eJx9VbFOwzAQtbwxobjCUlbm/jHiC+hYEaWMZaB0K1IhgikVCKROHRAsCD/Fp5xfnDzJqmPfuzuf77nGpKi9Mc9FunZ03e+e1sfW4OPNpd+Hsv/W/rEH/Cl7oIk2J7W+9ikPo1G+XuJ8WQw5O/KvYy/pDK0b2uSwCnu3cdzRmZHXlvze2H5eKb92JIbUSfznuI64ElPOjfyrEW5FXNzlnOoEG8m7UrVkLtDQeTc+Pxcu22t8BJtPNb58zz1RjtyDa8rtIfYJ5yw9wffEXIl7XwxjXZz3+gBefcq1s3ytAOSEfcF3sPuJ4zcMR9yDTfluZiZR+byOFrY7+5Xt7vvapnvo6y1pg98E4KlMeYDcs9RJ62fn8760jfiUtWNGt9Dngmoheeqekvl7aSbBd3pGvuEHGkBMttXahU1JXEYdcl/FM4l29XsjWsNbMqc724Tvx7h2mekpfqskZyD35uJXx2hVzHbivQSktqIduTf0Fez2ah+27I/rmOtT9KWOWUc91dRj2lfu/0gAveg6aN3/AwQ4isI=
+   eJx9VcFKAzEQDbl5km5pYK+e+8fiF9hjcdl6rAdrbxWqi562Kgo9eRAFEfPYDDt5O+2D0Gwyb2YymZc6l6MOzj2M3AD7wrmtsW6twcdzkX/vyv5b+8ce8KfsgSbZvMT130k3X4ach9EoX49pPldrwtmQfx17Tmdoi6GNhUXcu0rjms6MvNbk99L380r59QdiSJ3Ev8UtiCsx5dzIvzrArYiLu5xSnWAjeVeqlswFGjrvKthz4bK9xlu0eVfjI/TcT8qRe3BJud2mPuGcpSf4npgrcW9Gw1iT004bgqeQc/3YrhWAnLAv+Ip232n8xFEQd+dzfjF2R1EpfeiazXx39nPf3feFz/fQ12vShvUm3Jc5D5B7ljpp/WyC7UvbiE9Z2xu6hT5nVAvJU/eUzF9LdxR8pyfkG36gAcRkW61d2JTEZdQx90U6k2hXvzeiNbwlU7qzVfy+S2tnRk/xWyU5A9abi18do1Ux2yPvJSC1Fe3IvaGvYLdV+7Blf1xHq0/RlzpmnfRUU49pX9b/kQB60XXQuv8Hd3mLxQ==
   </data>
  </layer>
  <layer name="Above" width="15" height="30">
@@ -198,9 +198,9 @@
    eJytlMsNhDAMRCNuHAMSBdD2imq2AzggGqAOFkXRGuPPGDEXQJlnD7GSlIq+Q3l+muSqejXxGhP55izSbxmudZq+cBPAck/X62sIL+WypHnqPlh7qa1JbCvs+Zrv+Sk7Gr1rbpofyaz5IuyW/779l38O9pVmhrKn+MwiLPdG2DnAnhm5H1nz6lqcxlrngJ5vPhcrp3QvtMY9EpH3j56e9vbmYgnhkLuU+lB/tP6boj3rO3JvR3UAkPk+vw==
   </data>
  </layer>
- <layer name="Walkable" width="15" height="30">
+ <layer name="Walkable" width="15" height="30" visible="0">
   <data encoding="base64" compression="zlib">
-   eJy9k9EJACEMQ53i9l/BDe+rcJSmTVo9QVDxJbHY/ay1L00b7L3vsHPFB+l0Wc9He9Y300K62R6xrFeUN8qfrT2L7iBfpFWxlZ7qk/0JpVaKb/UXu2xVv0k/dftYYaY5J+9j+ai3pmwnP8ueqpHyLp9Rrc3f8wXDhd/h
+   eJy9k9EJACEMQ53i9l/BDe/rfiRpkvZQEFR8SVp0P2ttc36je5+xaKBz5cN0nIwOj/aub6XFdJ0+dr1QXpS/Wp8su8N8mZZilV7qU72JpFeJr3qLXVb1L/m3qO6US5lpzkl9Lo/+1pTt5HfZv3qU1HVmTHtze74Q49s3
   </data>
  </layer>
  <objectgroup name="Mapevents">
@@ -217,8 +217,14 @@
     <property name="place" value="east2"/>
    </properties>
   </object>
+  <object id="14" name="north" type="mapchange" x="352" y="0" width="64" height="32">
+   <properties>
+    <property name="map" value="blackwater_mountain53"/>
+    <property name="place" value="south"/>
+   </properties>
+  </object>
  </objectgroup>
- <objectgroup name="Spawn">
+ <objectgroup name="Spawn" visible="0">
   <object id="4" name="gornaud_1" type="spawn" x="192" y="672" width="96" height="32">
    <properties>
     <property name="quantity" value="2"/>
@@ -275,5 +281,5 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys"/>
+ <objectgroup name="Keys" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain22.tmx b/AndorsTrail/res/xml/blackwater_mountain22.tmx
index 0228554cf..2d11eb376 100644
--- a/AndorsTrail/res/xml/blackwater_mountain22.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain22.tmx
@@ -1,44 +1,4 @@
 <?xml version="1.0" ?><!DOCTYPE map  SYSTEM 'http://mapeditor.org/dtd/1.0/map.dtd'><map height="11" orientation="orthogonal" tileheight="32" tilewidth="32" version="1.0" width="13">
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
  <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">
@@ -200,6 +160,11 @@
    <properties>
    </properties>
   </object>
+  <object name="burhczyd9" type="spawn" x="32" y="196" width="32" height="64">
+   <properties>
+    <property name="ignoreAreas" value="true"/>
+   </properties>
+  </object>
  </objectgroup>
  <objectgroup name="Keys"/>
 </map>
\ No newline at end of file
diff --git a/AndorsTrail/res/xml/blackwater_mountain43.tmx b/AndorsTrail/res/xml/blackwater_mountain43.tmx
index cd52a126e..0fa9c3966 100644
--- a/AndorsTrail/res/xml/blackwater_mountain43.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain43.tmx
@@ -1,49 +1,4 @@
 <?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">
@@ -267,6 +222,11 @@
     <property name="spawngroup" value="blackwater_entranceguard"/>
    </properties>
   </object>
+  <object name="burhczyd6" type="spawn" x="480" y="128" width="32" height="64">
+   <properties>
+    <property name="ignoreAreas" value="true"/>
+   </properties>
+  </object>
  </objectgroup>
  <objectgroup name="Keys"/>
 </map>
\ No newline at end of file
diff --git a/AndorsTrail/res/xml/blackwater_mountain5.tmx b/AndorsTrail/res/xml/blackwater_mountain5.tmx
index 302cb5e9b..da0f0a113 100644
--- a/AndorsTrail/res/xml/blackwater_mountain5.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain5.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="2017.05.26" orientation="orthogonal" renderorder="right-down" width="30" height="29" tilewidth="32" tileheight="32" nextobjectid="19">
+<map version="1.2" tiledversion="1.3.0" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="30" height="29" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="20">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
@@ -126,32 +126,32 @@
  <tileset firstgid="5173" name="map_entrance_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
- <layer name="Ground" width="30" height="29">
+ <layer id="1" name="Ground" width="30" height="29">
   <data encoding="base64" compression="zlib">
-   eJzllrFOwzAQhq24AqlLGRjzCknzBoHOLKGdmfqAvAQSjBTxDh14gEos5JScfFz9u3FkS0gMnxL54nzO+XxKXRhTJ2Td83plzMPNcK0Sv/8OcJ/RS9/0CGLbzN49iJErp5ffj/gP3lR5RjVLLBV6TXO9XLNTacc5fI6Ydob3yw4cR6iGEV3PdeHOEUPjMd9M3qNwnnreV8YcRj5W5/vLXr2eWO/JOi7Vb0rvFNdf8dL1+XZw0jW2pslbLRzf1hHyPi3PifXWC8cl75uN9/r6Ao3r3sBIX1n87h0+b6neG+oPDRjnGPeEtRrfKnen5lbC6+sDDRjfC2+nnkNeObcVXt9+bQL1LGN0/2IHkNfXv5B3F/DKGN1/Rnj5XM05p4gG1FVu7wZ49Z6l9u6AV+9ZyNsE1iNj+rkpeeYzXHpA4zoWm69U/1ux3hROlC/p0XnKCecglNMfWJhkbA==
+   eAHNlDtOBDEMhiNAIG0DBSVX2IEb8KhpeNRUHJBLIEHJIu5AwQGQaPCv2U+yTDLaDImgsJw4ib/YiT1spTQ0lGPz9bSb0uXBqJcNfeueZwU578hVTNcmuTzddObeF7jKca8884YwcrrH+/43rt6b2H8Tb+nPyr4Iwh8jF3O5/Fn9203k1PbpDHVE3LJzp020fHxsj/JuWqI/XJIrW9szoY7gyl7TO8SFJ/1p8rKf0motr6bxjYbr7zaHKxaC7yndijvFyK39JVf3eTgc/4G05rXvu9yxM2v5spwjuVhlU7x3i59Syx2MicCUznGfzV7LzfUH1VrsDcw998jt05lcvNoDgxou9YcT21vqF1oTm17BPtlVv56tOmJdmpyL6+uNsXwwjhqufPp9Ja4/T/+KfY0cXphPxlH7NY0f7W0lJa4/Tx+JfY09txNcv6bxWwVX/pVrOC204vVvyzj6bs1VzmF57d+lR7zKuecx9u8CV/855kFz5Sxnj2txHyyvox9qWHUdRWvRxtyvle4dWcypX9hzdS13Lid3jjygiU0am3TubEsbOZjK6TdOrWZ5
   </data>
  </layer>
- <layer name="Objects" width="30" height="29">
+ <layer id="2" name="Objects" width="30" height="29">
   <data encoding="base64" compression="zlib">
-   eJzFVj1LJEEQ7d2ZwNtxcQ82uEMU/AOiwSkGIppcsIuIiAqrIuguJsJqsJzinijK4qmJqJlg6g8Q0VREIxMvvkgQ9JLTwMDkquhqpqanR4+5GSx49EdN16uqru4eIaKXQkaIPGAsE4PxN3gn0/HxDib9ULxxxjud9KOYjJe3w3b7X2yvDnlzkOd8OnreTjtYh7wF3N8YeIXG20h720R5RnmPev4f3lPI037CHX9wvECpgf4uJUQPxNkK6I2grn5bQpxoe8T9WLMlDhLebxRvIeT+HrN1G2C7zpFQ8e7aEkXgmEqG4wiSdYoFbf9pEOKR8NTg/yYqua83+2CSSZabw6y3DSOVtLdV9sehnQA8kG9lmi9q+Y4y/5jz2YCawTuqTHWMbS1EbV1CPV9ZZl6V809QV5/ZHTKm8fZHeGc1Ue4aDTkcznh5J17hvQbfX1ISKH2Oq3sEXQ+MjxypPyM7vObwjJ+zmuO8KG3gXzesH9Xq7Bdbs8P6JcjfV8rhTULa/mnIu9K/xosyo/EmNLTTfAU4RwDfwNcFQBVwy3iDatXEi/dNRcv5R0ILtb00r59flAHHP/cvvCZfr5h9dR5LTK/81HU4X9JixvOLfGWqa+RBXvWO6O/2Rb3fBxRTzNwHXeaAa5XiXIF2XnuTgtapPW5W/2iwn3nL7T9Zrk4Ib3+IYuV3Jo6H2DddLN5m6J9YErjHLTSPfHuW5CtQ31Lr6B3iMZSIdzHr3qM45nthOvNh5c6SPiwClgDL9P5+p3E1pv+dZ+C9B/wA+1uETdbfJt4oYzUJ3qO5TPw8Jsm9kdu/eMF2Ww==
+   eAHFlb1rVUEQxVdj4ScqWETEgP+AaKFiISE2AfMQEVHhqQiaYBOIFkGDiShK8KsRtRNs/QMkaCtiKhutrYRAtDEpLGw8P+4MGZd9keTdqwfO29ndu3Nmdmf3pVQ/2ttSaonnxH8JdC9uaU735NqUcpJf0/lelm7OYY01qXtw3dLJHQi25zukfW6JdeNQphX9k2+b821AN2W6u7S/YLftM/b/qOdudN9on56vwUOFDZtSimR0WvNzG1PqV557xQHLt5v7+70npZnsjGIcd7XX8EWIjVi8njnj1eB1WHdfvtcrX+g5P5UmHFYdXVKedeKe5YLvH1tTWjAuqnX4N97vtp3f/KeH5fzzLjpe7qgsb318Je24+fPW/Z/X+AXxm8U2Zt/xXkXUuf/s+ajpRA1s3qgxzQPa6Q7fVV+Ufz+onmfFHOj6nveqrnaKDt6oqHt8FbruK295k4C/UVWv+j2tmKIuZ9EJH1Wzv3T3ITiqu+JY0Fy/+q9E5t+an1hz3PF3Vvesi7r09ynOI1p/1uqNMfAlrHkS7BHt36Dt4SeN4/tzYd/xwbyjpMvclUyXJZH7zcG4NM+I1xXrDXFS/Bp0O9VqSZf3xu+EuU/bZcA91g7YRNxLG0ontP5vKOn6Go+V+zYb3ge/jyPhHnqc+Rzj8Tt84w9d7jMtOpwvbyvw/+1jmhsV35t2jIHvSjkz7jFgR1yVrzsiuK32mtnVyNI6vxM+7ufcZ/m2dZ4tO1PsRdHnWBPtU5arv2nMkzPjjsNWp/T7ZM/IH+SMIUDvmYgexO7xdWp5P4Dnzp6jM6G69XeUfjyL0p2vvKz8d07xEMOEeFO8JfK/P2X9SbVN4Kd058UH8v/I+DDYj023zlxLeVAzQ9JqWqekje5y+A0R3He4
   </data>
  </layer>
- <layer name="Above" width="30" height="29">
+ <layer id="3" name="Above" width="30" height="29">
   <data encoding="base64" compression="zlib">
-   eJzdlTtOxDAQhu3VFiAUKQUtJ+JRkoKHtsm6paYHaSnooYBbwAE4AieAPQHLBfAvZxQz2BPHSbbgl6JEScaf52mlxldVuvuimGDxBO7VBFxam3Sn2+cl+7bWKklvHf9t9F/uo333bK9D6+NRMSzGDwKfc0lnlncuMFN978uFn8f2OpmopmJc6MIyLxvuZ+Pfx0A/JVEMTelqOTfH3KfXxHVg96VdvMfghnTD4gdfr/fbi+s9Id6cW5e/WWDwGMAG/XSvXW/l1G+Xv3w++DZPDe9by/3YlxvrlZBN31pOyW/IhmbWbY+68vNesXzyGoJ25krtzltb2NDMohmSs/ccG+pbMDFDUmp4qPZm7TOYp8LeuV8vRfi9L+N98/8zXn4lhrS+xK0iXD+/0EYP42I+oA9pdnAWam7lncu8z7bhL0Rn0jrD39A8Cn1bRvbQxcjpl5j4WguhRqfg8vxKsxyqvWcj7MdE/vPPwNhZmKMVmz0HM7fveoSYbWOu/TdJtQH9ABhjT5g=
+   eAHVVcsuBUEQHWJBRGJh64s8liw8YoOttT0JC3sW/AUf4BN8Ab4AP6BOZk7uyUn1mL53SHTSt/vW45yu6q6aphl/7K62mEcr42P3IZL37Bd4iU3+6znumuaki5eSd9FRlq3PP9h9ht5570L2EHMjYtyMOUuOb3v4nZfn3wvO/Z78Do2deL6WeBHnVsztHm7Hqvlf4gXGQXAedrxvXc5ee3JXw5vZMoen8a7wlqe9Y4/paWDu4PcR8SHf0wznzTAuLH+I9XxtMt3nxexdj//Oe9zVJbnA4TmAD+rpJiZqi7nP8Esy53U77w/Q0+e+i+sr1r56dEzFyHSlWiGv+tS+5QxD8bI9fNizLiveld47eXmfXJVvcaFplmJiwBc+7FnsIa12+C95h3u0vKxb3AV6iMZSg1Vjuzw/sQbnTsRfGh7XY3cvLld/1BCH2kHO+6Ueq9pQnslKtpmP+mPP+4UtvpkYatNKcpnboj+gDtk7FAd7vLmr7l3B1+tM7Wt4actVcbI9v0nsV2pDjKzvQFeSu07tMnzYl+TQjTEcnzXl8jG4FIP4fr+aE9prTfDdQKdy2nJVne71G8g9fWZZ8WZ1rEefQIx6XtXX7P+ir9Wc5z/Y6p1n5/0GBTlO6Q==
   </data>
  </layer>
- <layer name="Top" width="30" height="29">
+ <layer id="4" name="Top" width="30" height="29">
   <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AUjIJRMFJAmAACD3d7ke2kp90DZS+63ZxMA2MvPcGovcPX3pGYf0fBKAAASrcRlA==
+   eAHt0rEJACAMRNFgZ+d07j+KpDg4F/gWXkBi9/BjVSYFUiAFUuCXAntV6ZBvltmbGjd1J2xZvgm3DTfnoNTb5dS4VGv/Vy9M+YQtyzfhxkiBLnAASrcRlA==
   </data>
  </layer>
- <layer name="Walkable" width="30" height="29" visible="0">
+ <layer id="5" name="Walkable" width="30" height="29">
   <data encoding="base64" compression="zlib">
-   eJztk1EKACEIRDvCXqr7X2nZv5Axx1AJ1gGhQueh1XzGmB0dHR0/iU+V3lKRLFbRPSL/lZPF3s08s2drDlZOxTvLZrLc6n61HLT3vhFvv8hX42qy7hCdZ3Cl53ru5Z4IeTGztzxQDVojjqzf3YNVw3qyOaf/ilE0l2FnMJm/dAP3BZeH6Ww=
+   eAHtVEEKwzAMyxP2qf7/S6sOAmHkaSNNd2gMwbJsS20JPV5jHPvsb7DvwL4DD7kD44xV/zynDU7jKm/VTPgqT+i4IE8fnSG3KsOL/nf70q97t9Tv9hIP3W5mlSf8EMn300y3m/hvNOuMq8FpzPg6HXKqS04z+l1oT3WIsUfMTC3WyC46HrPaq5i1ZmLuau28f+WcHrjKO45edVZ57TmsHPa0BnZH9dNO6qu+6io/i6mb8qyP2/+HZ30OPEPl7qiT7xuAoOkX
   </data>
  </layer>
- <objectgroup name="Mapevents" visible="0">
+ <objectgroup id="6" name="Mapevents">
   <object id="1" name="exit2" type="mapchange" x="640" y="736" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain4a"/>
@@ -183,43 +183,49 @@
   <object id="9" name="rest7" type="rest" x="160" y="768" width="32" height="32"/>
   <object id="10" name="rest6" type="rest" x="128" y="768" width="32" height="32"/>
   <object id="11" name="rest5" type="rest" x="160" y="640" width="32" height="32"/>
+  <object id="12" name="west" type="mapchange" x="0" y="704" width="32" height="32">
+   <properties>
+    <property name="map" value="blackwater_mountain5a"/>
+    <property name="place" value="east"/>
+   </properties>
+  </object>
  </objectgroup>
- <objectgroup name="Spawn" visible="0">
-  <object id="12" name="bwm_agent_1" type="spawn" x="544" y="768" width="352" height="96">
+ <objectgroup id="7" name="Spawn" visible="0">
+  <object id="13" name="bwm_agent_1" type="spawn" x="544" y="768" width="352" height="96">
    <properties>
     <property name="spawngroup" value="bwm_agent_1"/>
    </properties>
   </object>
-  <object id="13" name="gornaud_1" type="spawn" x="224" y="352" width="256" height="160">
+  <object id="14" name="gornaud_1" type="spawn" x="224" y="352" width="256" height="160">
    <properties>
     <property name="spawngroup" value="gornaud_1"/>
    </properties>
   </object>
-  <object id="14" name="gornaud_2" type="spawn" x="416" y="320" width="256" height="192">
+  <object id="15" name="gornaud_2" type="spawn" x="416" y="320" width="256" height="192">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="gornaud_2"/>
    </properties>
   </object>
-  <object id="15" name="gornaud_2" type="spawn" x="224" y="640" width="192" height="160">
+  <object id="16" name="gornaud_2" type="spawn" x="224" y="640" width="192" height="160">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="gornaud_2"/>
    </properties>
   </object>
-  <object id="16" name="gornaud_1" type="spawn" x="416" y="512" width="96" height="288">
+  <object id="17" name="gornaud_1" type="spawn" x="416" y="512" width="96" height="288">
    <properties>
     <property name="spawngroup" value="gornaud_1"/>
    </properties>
   </object>
-  <object id="17" name="gornaud_1" type="spawn" x="672" y="480" width="96" height="192">
+  <object id="18" name="gornaud_1" type="spawn" x="672" y="480" width="96" height="192">
    <properties>
     <property name="spawngroup" value="gornaud_1"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys" visible="0">
-  <object id="18" name="bwm_agent:10" type="key" x="864" y="576" width="32" height="32">
+ <objectgroup id="8" name="Keys" visible="0">
+  <object id="19" name="bwm_agent:10" type="key" x="864" y="576" width="32" height="32">
    <properties>
     <property name="phrase" value="keyarea_bwm_agent_1"/>
     <property name="requireId" value="bwm_agent"/>
diff --git a/AndorsTrail/res/xml/blackwater_mountain53.tmx b/AndorsTrail/res/xml/blackwater_mountain53.tmx
new file mode 100644
index 000000000..8ebd1c812
--- /dev/null
+++ b/AndorsTrail/res/xml/blackwater_mountain53.tmx
@@ -0,0 +1,254 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" tiledversion="1.1.5" orientation="orthogonal" renderorder="right-down" width="30" height="9" tilewidth="32" tileheight="32" infinite="0" nextobjectid="16">
+ <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>
+ <tileset firstgid="7577" name="map_cavewall_1" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+  <image source="../../../../../ratdom/ATCS/ratdom/created/drawable/map_cavewall_1.png" width="576" height="192"/>
+ </tileset>
+ <layer name="Ground" width="30" height="9">
+  <data encoding="base64" compression="zlib">
+   eJydk8ENgCAMRUlv7H9lBW3cQG+cdQUHEQNNmqaFwuFFJOE/P2COIeQBCSr7ImfjKhyxQpmWc3NmJ9C/Dwt34xFevpbmCSvb8kh+79uwcmW+HM+A7Cm7jPp4ulprkI01L0K/s+w9cqLi1Tqv3lHtDBD0Hj2v956snrfHO5sr95S/y/+F+ACC/rnA
+  </data>
+ </layer>
+ <layer name="Objects" width="30" height="9">
+  <data encoding="base64" compression="zlib">
+   eJxjYMAPZjPhl38ohCm2Vhi3+juSqPy5UPOfiTEwvEDCHkhm7BFEsLmQxNHdBjLLFc1uJjEI/QZo71tJhLonUHf/EEPFEXjcjg08FkL1BwwIAc1aAxR7JogqDlMXDbQnBohjhSH+2AVUv41EvFsM1exjQLuUxCA0un24zD8thj2Oz0hiisHM245m72Eg/y/UTlg4r4eaCVL7GMg/DAynI0B8GMncg0hp5ymWdITuB5BZiQII8SKg+A1BhJ0gNsh8kHtOAfFNIP4tCklbL8UQbkAHsLjABWBm/RGF8JNx5AnkNHAVaM83oJ6fUDfAAChvdKLpf4LkJpgdID8cFkOwQeCSEIR9TBA1PcPAHCYERnbLZUlUO0H5SR5olgKSvZ+A7OtIfGR5mFnIeR0AXbpkwA==
+  </data>
+ </layer>
+ <layer name="Above" width="30" height="9">
+  <data encoding="base64" compression="zlib">
+   eJydUEsKwjAQHXoDKwRyI+9YcgiNS3e5QauLgm4F8RI2tMM8hmQ0vk1fk5m8D1Eb3n3jgkJyRA9fv5936/f6o87TmJuc8HHjNzUfOuHDxg974fMfeZP7PoOYjD4uxl1G9JITde++3HNc8pz7dY9xXP5PkDMW9l6qh+RFjztETfTF4E7Zw9BRE0o5tUb2Eox3a5p4jvv5fdYbQYvPaj1bKPWLeuyBfYSKt1YkQ1d3qnvV+AAb5TPF
+  </data>
+ </layer>
+ <layer name="Walkable" width="30" height="9" visible="0">
+  <data encoding="base64" compression="zlib">
+   eJzbKMbAsJEGGBtAFqeFXej2wviUmIvLL+j2YHMHNr2khBcxAJ//cYkR6yZiwwVXvBJjPqn+xBXO2Ni4/Ems/9HtQ7eXkBn43EDI/7jcQmmaxpd3SMEAhvh60w==
+  </data>
+ </layer>
+ <objectgroup name="Mapevents" visible="0">
+  <object id="1" name="south" type="mapchange" x="512" y="256" width="64" height="32">
+   <properties>
+    <property name="map" value="blackwater_mountain16"/>
+    <property name="place" value="north"/>
+   </properties>
+  </object>
+  <object id="15" name="east" type="mapchange" x="928" y="64" width="32" height="160">
+   <properties>
+    <property name="map" value="blackwater_mountain54"/>
+    <property name="place" value="west"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Spawn" visible="0">
+  <object id="4" name="gornaud_1" type="spawn" x="32" y="96" width="96" height="128">
+   <properties>
+    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="gornaud_1"/>
+   </properties>
+  </object>
+  <object id="6" name="gornaud_2_1" type="spawn" x="256" y="224" width="32" height="32">
+   <properties>
+    <property name="spawngroup" value="gornaud_2"/>
+   </properties>
+  </object>
+  <object id="8" name="gornaud_1_1" type="spawn" x="352" y="160" width="288" height="64">
+   <properties>
+    <property name="spawngroup" value="gornaud_1"/>
+   </properties>
+  </object>
+  <object id="10" name="gornaud_2_4" type="spawn" x="224" y="96" width="96" height="64">
+   <properties>
+    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="gornaud_2"/>
+   </properties>
+  </object>
+  <object id="13" name="gornaud_2_5" type="spawn" x="480" y="64" width="224" height="96">
+   <properties>
+    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="gornaud_2"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Keys" visible="0"/>
+</map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain54.tmx b/AndorsTrail/res/xml/blackwater_mountain54.tmx
new file mode 100644
index 000000000..eb174eecd
--- /dev/null
+++ b/AndorsTrail/res/xml/blackwater_mountain54.tmx
@@ -0,0 +1,235 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" tiledversion="1.1.5" orientation="orthogonal" renderorder="right-down" width="30" height="15" tilewidth="32" tileheight="32" infinite="0" nextobjectid="20">
+ <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="30" height="15">
+  <data encoding="base64" compression="zlib">
+   eJzbyMnAsHEUj2Iy8H4mBoaDTPS3cy0QrwPiA3Syey3Uzv1QOw9C7aeXf0F2XqKjf2H4CRMC09PeoYLnMCEwvexcx4SJaW3nWix2Ems3qWGErB6XnTA8BwdGV7eeCLsBtF9FHQ==
+  </data>
+ </layer>
+ <layer name="Objects" width="30" height="15">
+  <data encoding="base64" compression="zlib">
+   eJylVUsKAjEMrQX3pq48gzfVIwwuXSmIG8GlCMpcYAS3gn+PINhiI5m0aWcwUJo2aV9emrbPgVIv20rbnl5v26OUXpfskt+0+x3fQMboG6UqZ4c4BvbG+oGR7cgVZdQL40PBNXuoc0nx2hHfM4R7dax+9PNoXzNOUhx8jH2hlZro+BpcByot0plJ84VO+3D/lQ+An31b3eGebJvbtvC8K0YOfa8CabQfInmX9JMO9xnrfK07eSeSfya1QOuNYs587zhvPPcV2dPdDSfLDJ+hqY9/Z8Hic7FwvnMyPkT4xDBjOcG5e6bmUcCk6+pBYlkL97RJTcfqshY3u6sFyw/ev1uLmpLi2UHotx2EmBS7CV4V2bfpmyMJxS6h/o/weHPvxCX3SP0hUm7xvD4Ed+ln
+  </data>
+ </layer>
+ <layer name="Above" width="30" height="15">
+  <data encoding="base64" compression="zlib">
+   eJy9VEkOgCAMbHiEiW83vsIT35CrnvyIemiC2GVKjJMQq5QZWxiIiLaRaL9GDf7WPlt4edr8PbLAJ6Hm1OIa2ZjX1iA5Xm0Wl6fpcUa0ensUjRnHYP+PV6v0LsVTenOU4ZmD7K8HhGNVatZ4rFpRHzC0fmuaiA+ivojsbeRMW97tQeQcI/5ZOnvk9Ru9c1DtbHghck98iTn9r8kojl9PPKudZg==
+  </data>
+ </layer>
+ <layer name="Walkable" width="30" height="15" visible="0">
+  <data encoding="base64" compression="zlib">
+   eJzNk1EKwDAIQ3uK3f8KveG+BmM05iVfEwRB25io+1pr/8Afc3lal+Ape9eq+Fuv8uoNqWk0mrSbsB2W66HRKIlPOClvxcVhUu6tEe3TPXJc3R+UG9HN9dPwafqY9ojOkd4f6Z/Mmdw5waP6kz2ZsIk7nul+Eo0U5xsRkcAC
+  </data>
+ </layer>
+ <objectgroup name="Mapevents" visible="0">
+  <object id="5" name="west" type="mapchange" x="0" y="256" width="32" height="160">
+   <properties>
+    <property name="map" value="blackwater_mountain53"/>
+    <property name="place" value="east"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Spawn" visible="0">
+  <object id="17" name="tjure" type="spawn" x="128" y="64" width="96" height="128">
+   <properties>
+    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="tjure"/>
+   </properties>
+  </object>
+  <object id="18" name="forestboar" type="spawn" x="352" y="64" width="544" height="288">
+   <properties>
+    <property name="quantity" value="2"/>
+    <property name="spawngroup" value="forestboar"/>
+   </properties>
+  </object>
+  <object id="19" name="forestwasp" type="spawn" x="64" y="224" width="832" height="224">
+   <properties>
+    <property name="quantity" value="5"/>
+    <property name="spawngroup" value="forestwasp"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Keys" visible="0"/>
+</map>
diff --git a/AndorsTrail/res/xml/blackwater_mountain5a.tmx b/AndorsTrail/res/xml/blackwater_mountain5a.tmx
index 47969973b..6177c8ef0 100644
--- a/AndorsTrail/res/xml/blackwater_mountain5a.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain5a.tmx
@@ -1,234 +1,243 @@
-<?xml version="1.0" ?><!DOCTYPE map  SYSTEM 'http://mapeditor.org/dtd/1.0/map.dtd'><map height="18" orientation="orthogonal" tileheight="32" tilewidth="32" version="1.0" width="20">
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- <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="18" name="Ground" width="20">
-  <data compression="zlib" encoding="base64">eJyllEEOhCAMRc3s5v5broC4mL3iDRg9whxkaqY/aRoolVm8ROH7C5/K/JimeYBtQA8ysRKJ2Jk3j3m8MuvBQRRiIU7mw2OrqNvyOlgPXs8fi3gGRdSNDS/9DYiNOdSV+08dL/glQ1OUn+V1Aa1Hk526Xu1abjp3mcvWqV3LbVfv6Av0kZVzbe1noy/QR1YunnPwEh3nNeInPcMf/vr/uNOLvZ7SSJ215msuOO4YrFHuISju3H81Pw9ftgoGXw==</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="20" height="18" 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="20" height="18">
+  <data encoding="base64" compression="zlib">
+   eJytlDEOgzAMRRFb779yBQhD9wA3SOEIPUiN8JcsN06I2+FJKDbP2BimvusmB4sjH6xEJAKxMS8+u+NaOR/sRCJm4mDefBZFXcu1cz54Pi5mcQ2SqDsaLn0PGI0Y6kpfqLjgC4WcqHwl1wlyrXhSvd5x1Wrn5qbnLvtYKrVzc9v67z6i2KPSnHPPfhh7gT3yvq9WsC//9knn8INffx8tu1jbKc2gsByIe/55uobH0coH/7AFzA==
+  </data>
  </layer>
- <layer height="18" name="Objects" width="20">
-  <data compression="zlib" encoding="base64">eJzVk79LQzEQx6+xQUTwvaYQUHSooB38B5zcXB0EXQVxkoJoB8FN7D/gXCq0jrq46B8g9A9waFWcC11FBRfxzlzIvUdKQXDwC0derrlP7kcK8D+1kgBU0SYVwGI5+P33vPo9+xpjrzh+oJyRvK+KdyyX47E+voDratGt3kj3FmBHBx8xj9BmR+RLLOJUeF8R5nWAvJLwNVKAzTTOOi2G/RTu+xjYxvimuJ9y9LLK8XbTUL/XgwEw2IcL9L/PhBqakVrqGN8rxWv8qQs5b8io6+D7Mtl8pai+AeY5ROuh3bLJWkmHzOvweqmzvV7iOVJ9Hxj/yYxHkSuxnnh/rl2uJ9rVTKK+zCXue0GFu0nd1PV5TfT4FevaF/Px74tmsYfnatoxiXPD965znkPj1g3RJ5qXz+WFf7fMnE7CuS1kbIt3S3NtM6cmeKSWCvm2cvOkXJ4jsyReZwQvLx8/weyGyf5XCsw7Rs6Zjr8pKepB12ZzpiukjWPkdWfHn/lr3jd9CEeb</data>
+ <layer name="Objects" width="20" height="18">
+  <data encoding="base64" compression="zlib">
+   eJzVk79KA0EQxidrFhHBXC5wIGhxgqbwBazsbC0EbQWxkoBoCsFOzAtYhwiJZUSw8QUEH8Ai/sE6kFZUsBG/YWfZueOCYKUDw2YnO7/9ZmaP6H/acoWoDp80RAu1EPe/58zv2ZfI7Uv+0Dhn87E67liqFef6/BLWlbJbvbPdJkTbNsSYeQifHaOXWcxJZZ8q97YPXlXFWhHRRlTMOimH/RT2D0jsIr+t7meN3hLjeDsFvPuYKEYfznHmfSbU0C6opYn8QTUb66tzKThvYDRtiH3FWb3auL4hdI7gA/iNuK6V7UB4PVkvbLbXizJHru8D+Z/CeKyGOpj1JNrPrNN6bF3N+TrmTbib7S5yfV5VPX5FXXuqn/598Sx2ca5hHZM513LvmugcxW5dV33ieXktL/J/IszpSji3CcaWerc8165wGorH1jFBbyc3T9bynJul5/XG8LRdmcCckLUVZ7+VkvCOwDm1xW8qz8zrZ4naf2L8RfsG/OdFNw==
+  </data>
  </layer>
- <layer height="18" name="Above" width="20">
-  <data compression="zlib" encoding="base64">eJxjYBgc4LAYddRfhopfIsE8kB5c6kl1F7pZa/ghtJIwhJ7LhJCbw0++u9DV9RAwCwRAfmESJqwO2Y0wII5FjJSwuUxALbpfYeq5cfgLn93Ywg2X+sNo6WWbAHF2wcRCWFHFiYkvbObB9ElCw/kiCWGLLb7oCbYLMTDsECJND670cAloznEgPkGiedjCYCfQjF1A/BCIP5Fo3mABAJYOKWk=</data>
+ <layer name="Above" width="20" height="18">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgc4LAYddRfhopfIsE8kB5c6kl1F7pZa/ghtJIwhJ7LhJCbw0++u9DV9RAwCwRAfmESJqwO2Y0wII5FjJSwuUxALbpfYeq5cfgLn93Ywg2X+sNo6WWbAHF2wcRCWFHFiYkvbObB9ElCw/kiCWGLLb7oCbYLMTDsEKKOWZeA5hwH4hNUMG8n0IxdQPwQiD9RyX30BgAChyfh
+  </data>
  </layer>
- <layer height="18" name="Walkable" width="20">
-  <data compression="zlib" encoding="base64">eJzbKMbAsHEU0wSDADXNIcY8YtUgA0JqiHUjIfXYAC63E2M3KeYREzbUNA9ZPzZ16Hbg8i8uQKw6fICSNENt86iZT6iFB4N5APWD2OI=</data>
+ <layer name="Walkable" width="20" height="18">
+  <data encoding="base64" compression="zlib">
+   eJzbKMbAsHEU0wSDADXNIcY8YtUgA0JqiHUjIfWE7EUWI8ZubABfWJBqHqGwJcavuNSh24PPTkL+xKcOH6AkzVBqHjlpbCRiAHTs3Yw=
+  </data>
  </layer>
  <objectgroup name="Mapevents">
-  <object height="32" name="south" type="mapchange" width="32" x="224" y="544">
-   <properties>
-    <property name="map" value="blackwater_mountain4"/>
-    <property name="place" value="north"/>
-   </properties>
-  </object>
-  <object height="96" name="east" type="mapchange" width="32" x="608" y="224">
+  <object name="east" type="mapchange" x="608" y="256" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain5"/>
     <property name="place" value="west"/>
    </properties>
   </object>
+  <object name="blackwater_mountain5a_00" type="script" x="160" y="160" width="32" height="32">
+   <properties>
+    <property name="when" value="enter"/>
+   </properties>
+  </object>
  </objectgroup>
- <objectgroup name="Spawn">
-  <object height="160" name="gornaud_1" type="spawn" width="96" x="64" y="256">
+ <objectgroup name="Spawn" visible="0">
+  <object name="gornaud_1" type="spawn" x="64" y="256" width="96" height="160">
    <properties>
     <property name="spawngroup" value="gornaud_1"/>
    </properties>
   </object>
-  <object height="32" name="gornaud_1_1" type="spawn" width="32" x="160" y="384">
+  <object name="gornaud_1_1" type="spawn" x="160" y="384" width="32" height="32">
    <properties>
     <property name="spawngroup" value="gornaud_1"/>
    </properties>
   </object>
-  <object height="256" name="gornaud_2" type="spawn" width="128" x="160" y="128">
+  <object name="gornaud_2" type="spawn" x="160" y="128" width="128" height="256">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="gornaud_2"/>
    </properties>
   </object>
-  <object height="320" name="gornaud_1_2" type="spawn" width="224" x="352" y="160">
+  <object name="gornaud_1_2" type="spawn" x="352" y="160" width="224" height="320">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="gornaud_1"/>
    </properties>
   </object>
-  <object height="128" name="gornaud_2_1" type="spawn" width="192" x="192" y="384">
+  <object name="gornaud_2_1" type="spawn" x="192" y="384" width="192" height="128">
    <properties>
     <property name="spawngroup" value="gornaud_2"/>
    </properties>
@@ -236,4 +245,4 @@
  </objectgroup>
  <objectgroup name="Keys"/>
  <objectgroup name="Replace"/>
-</map>
\ No newline at end of file
+</map>
diff --git a/AndorsTrail/res/xml/crossglen_hall.tmx b/AndorsTrail/res/xml/crossglen_hall.tmx
index c93cb8728..64cd73463 100644
--- a/AndorsTrail/res/xml/crossglen_hall.tmx
+++ b/AndorsTrail/res/xml/crossglen_hall.tmx
@@ -1,200 +1,235 @@
-<?xml version="1.0" ?><!DOCTYPE map  SYSTEM 'http://mapeditor.org/dtd/1.0/map.dtd'><map height="15" orientation="orthogonal" tileheight="32" tilewidth="32" version="1.0" width="20">
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- <tileset firstgid="1" name="map_bed_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_bed_1.png" width="512"/>
- </tileset><tileset firstgid="129" name="map_border_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_border_1.png" width="512"/>
- </tileset><tileset firstgid="257" name="map_bridge_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_bridge_1.png" width="512"/>
- </tileset><tileset firstgid="385" name="map_bridge_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_bridge_2.png" width="512"/>
- </tileset><tileset firstgid="513" name="map_broken_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_broken_1.png" width="512"/>
- </tileset><tileset firstgid="641" name="map_cavewall_1" tileheight="32" tilewidth="32">
-  <image height="192" source="../drawable/map_cavewall_1.png" width="576"/>
- </tileset><tileset firstgid="749" name="map_cavewall_2" tileheight="32" tilewidth="32">
-  <image height="192" source="../drawable/map_cavewall_2.png" width="576"/>
- </tileset><tileset firstgid="857" name="map_cavewall_3" tileheight="32" tilewidth="32">
-  <image height="192" source="../drawable/map_cavewall_3.png" width="576"/>
- </tileset><tileset firstgid="965" name="map_cavewall_4" tileheight="32" tilewidth="32">
-  <image height="192" source="../drawable/map_cavewall_4.png" width="576"/>
- </tileset><tileset firstgid="1073" name="map_chair_table_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_chair_table_1.png" width="512"/>
- </tileset><tileset firstgid="1201" name="map_chair_table_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_chair_table_2.png" width="512"/>
- </tileset><tileset firstgid="1329" name="map_crate_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_crate_1.png" width="512"/>
- </tileset><tileset firstgid="1457" name="map_cupboard_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_cupboard_1.png" width="512"/>
- </tileset><tileset firstgid="1585" name="map_curtain_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_curtain_1.png" width="512"/>
- </tileset><tileset firstgid="1713" name="map_entrance_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_entrance_1.png" width="512"/>
- </tileset><tileset firstgid="1841" name="map_entrance_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_entrance_2.png" width="512"/>
- </tileset><tileset firstgid="1969" name="map_fence_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_fence_1.png" width="512"/>
- </tileset><tileset firstgid="2097" name="map_fence_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_fence_2.png" width="512"/>
- </tileset><tileset firstgid="2225" name="map_fence_3" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_fence_3.png" width="512"/>
- </tileset><tileset firstgid="2353" name="map_fence_4" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_fence_4.png" width="512"/>
- </tileset><tileset firstgid="2481" name="map_ground_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_1.png" width="512"/>
- </tileset><tileset firstgid="2609" name="map_ground_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_2.png" width="512"/>
- </tileset><tileset firstgid="2737" name="map_ground_3" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_3.png" width="512"/>
- </tileset><tileset firstgid="2865" name="map_ground_4" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_4.png" width="512"/>
- </tileset><tileset firstgid="2993" name="map_ground_5" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_5.png" width="512"/>
- </tileset><tileset firstgid="3121" name="map_ground_6" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_6.png" width="512"/>
- </tileset><tileset firstgid="3249" name="map_ground_7" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_7.png" width="512"/>
- </tileset><tileset firstgid="3377" name="map_ground_8" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_8.png" width="512"/>
- </tileset><tileset firstgid="3505" name="map_house_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_house_1.png" width="512"/>
- </tileset><tileset firstgid="3633" name="map_house_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_house_2.png" width="512"/>
- </tileset><tileset firstgid="3761" name="map_indoor_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_indoor_1.png" width="512"/>
- </tileset><tileset firstgid="3889" name="map_indoor_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_indoor_2.png" width="512"/>
- </tileset><tileset firstgid="4017" name="map_kitchen_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_kitchen_1.png" width="512"/>
- </tileset><tileset firstgid="4145" name="map_outdoor_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_outdoor_1.png" width="512"/>
- </tileset><tileset firstgid="4273" name="map_pillar_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_pillar_1.png" width="512"/>
- </tileset><tileset firstgid="4401" name="map_pillar_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_pillar_2.png" width="512"/>
- </tileset><tileset firstgid="4529" name="map_plant_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_plant_1.png" width="512"/>
- </tileset><tileset firstgid="4657" name="map_plant_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_plant_2.png" width="512"/>
- </tileset><tileset firstgid="4785" name="map_rock_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_rock_1.png" width="512"/>
- </tileset><tileset firstgid="4913" name="map_rock_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_rock_2.png" width="512"/>
- </tileset><tileset firstgid="5041" name="map_roof_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_roof_1.png" width="512"/>
- </tileset><tileset firstgid="5169" name="map_roof_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_roof_2.png" width="512"/>
- </tileset><tileset firstgid="5297" name="map_roof_3" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_roof_3.png" width="512"/>
- </tileset><tileset firstgid="5425" name="map_shop_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_shop_1.png" width="512"/>
- </tileset><tileset firstgid="5553" name="map_sign_ladder_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_sign_ladder_1.png" width="512"/>
- </tileset><tileset firstgid="5681" name="map_table_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_table_1.png" width="512"/>
- </tileset><tileset firstgid="5809" name="map_trail_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_trail_1.png" width="512"/>
- </tileset><tileset firstgid="5937" name="map_transition_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_transition_1.png" width="512"/>
- </tileset><tileset firstgid="6065" name="map_transition_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_transition_2.png" width="512"/>
- </tileset><tileset firstgid="6193" name="map_transition_3" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_transition_3.png" width="512"/>
- </tileset><tileset firstgid="6321" name="map_transition_4" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_transition_4.png" width="512"/>
- </tileset><tileset firstgid="6449" name="map_transition_5" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_transition_5.png" width="512"/>
- </tileset><tileset firstgid="6577" name="map_tree_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_tree_1.png" width="512"/>
- </tileset><tileset firstgid="6705" name="map_tree_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_tree_2.png" width="512"/>
- </tileset><tileset firstgid="6833" name="map_wall_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_wall_1.png" width="512"/>
- </tileset><tileset firstgid="6961" name="map_wall_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_wall_2.png" width="480"/>
- </tileset><tileset firstgid="7081" name="map_wall_3" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_wall_3.png" width="480"/>
- </tileset><tileset firstgid="7201" name="map_wall_4" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_wall_4.png" width="480"/>
- </tileset><tileset firstgid="7321" name="map_window_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_window_1.png" width="512"/>
- </tileset><tileset firstgid="7449" name="map_window_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_window_2.png" width="512"/>
- </tileset><layer height="15" name="Ground" width="20">
-  <data compression="zlib" encoding="base64">eJzj42Jg2C2FifmA4pvFsGM+PHpA+LQUJiZkHi49IHySExPD5HBhfHqwyWHzDzIm1Txs/kHGpJpHDkY2byEXBFPLPGq7jxx8E4d56OJDwb8vCWBc5uFKm7jyGgyD1NRxMzDUA3EDN4S/G0/aJMa8eUBz5gPxAqh5ILPQ/QBjEzIPVzgAANv53Uc=</data>
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" tiledversion="1.1.5" orientation="orthogonal" renderorder="right-down" width="20" height="15" tilewidth="32" tileheight="32" infinite="0" nextobjectid="23">
+ <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="20" height="15">
+  <data encoding="base64" compression="zlib">
+   eJzj42Jg2C2FifmA4pvFsGM+PHpA+LQUJiZkHi49IHySExPD5HBhfHqwyWHzDzIm1Txs/kHGpJpHDkY2byEXBFPLPGq7jxx8E4d56OJDwb8vCWBc5uFKm7jyGgyD1NRxMzDUA3EDN4S/G0/aJMa8eUBz5gPxAqh5ILPQ/QBjEzIPVzgAANv53Uc=
+  </data>
  </layer>
- <layer height="15" name="Objects" width="20">
-  <data compression="zlib" encoding="base64">eJxjYIAAGzYGhj8yEJpY8J8PokeWH1POB2gOjyyEJgWA9KCDZhYIbchCvDnqQDyZBUIvhtKEwFWof5DZIBoEzBmw0yAgwoHbTGT/YPMbNvCRFcFWB5qtAcTVrLjVw8BCqD8XofmXESkOzqOZY8mCnQ0D2PyLCxSKMTAUiyHMgvGxmYsMDiGlnxuCCP0TgXoniyHk0PkwcAuop5CI8MHmDlxum4hk3hUg+yoW828JErYTG3gCNOspEF/E4hdyAbJbKogICyFB/HxyQBcwLLuBuIeEfEoqAADWwiTF</data>
+ <layer name="Objects" width="20" height="15">
+  <data encoding="base64" compression="zlib">
+   eJxjYIAAGzYGhj8yEJpY8J8PokeWH1POB2gOjyyEJgWA9KCDZhYIbchCvDnqQDyZBUIvhtKEwFWof5DZIBoEzBmw0yAgwoHbTGT/YPMbNvCRFcFWB5qtAcTVrLjVw8BCqD8XofmXESkOzqOZY8mCnQ0D2PyLCxSKMTAUiyHMgvGxmYsMDiGlnxuCCP0TgXoniyHk0PkwcAuop5CI8MHmDlxum4hk3hUg+yoW828JErYTG3gCNOspEF/E4hdyAbJbKogICyFB/HxyQBcwLLuBuIeEfEoqAADWwiTF
+  </data>
  </layer>
- <layer height="15" name="Above" width="20">
-  <data compression="zlib" encoding="base64">eJxjYGBgOCzGQDLApwddjoNj5JgnBjRLggjzLhFp3n5WwuoJAWTzKDEHm3nI4AQ/A8MRfgT/OJB9kh+7WmLMIxcMR/OYBHHzyXVfFQsDQzUQ17CgiqOnEQs0+YEEAC9NGHM=</data>
+ <layer name="Above" width="20" height="15">
+  <data encoding="base64" compression="zlib">
+   eJxjYGBgOCzGQDLApwddjoNj5JgnBjRLggjzLhFp3n5WwuoJAWTzKDEHm3nI4AQ/A8MRfgT/OJB9kh+7WmLMIxcMR/OYBHHzyXVfFQsDQzUQ17CgiqOnEQs0+YEEAC9NGHM=
+  </data>
  </layer>
- <layer height="15" name="Walkable" width="20">
-  <data compression="zlib" encoding="base64">eJzbKMbAsHEIYBCA0TA2JWahA0r10Mo8QnqItRNZDbmAkDtwuZ0Y91JqHjHhSwogNs4oMZOQfaSGD7FmEbKfHPOwmUFIDTkYAN2ehbU=</data>
+ <layer name="Walkable" width="20" height="15">
+  <data encoding="base64" compression="zlib">
+   eJzbKMbAsHEIYBCA0TA2JWahA0r10Mo8QnqItRNZDbmAkDtwuZ0Y91JqHjHhSwogNs4oMZOQfaSGD7FmEbKfHPOwmUFIDTkYAN2ehbU=
+  </data>
  </layer>
  <objectgroup name="Mapevents">
-  <object height="32" name="entrance" type="mapchange" width="32" x="96" y="448">
+  <object id="1" name="entrance" type="mapchange" x="96" y="448" width="32" height="32">
    <properties>
     <property name="map" value="crossglen"/>
     <property name="place" value="hall"/>
    </properties>
   </object>
-  <object height="32" name="rest4" type="rest" width="32" x="512" y="192"/>
-  <object height="32" name="rest5" type="rest" width="32" x="576" y="192"/>
-  <object height="32" name="rest3" type="rest" width="32" x="576" y="96"/>
-  <object height="32" name="rest2" type="rest" width="32" x="512" y="96"/>
-  <object height="32" name="rest1" type="rest" width="32" x="448" y="96"/>
+  <object id="2" name="rest4" type="rest" x="512" y="192" width="32" height="32"/>
+  <object id="3" name="rest5" type="rest" x="576" y="192" width="32" height="32"/>
+  <object id="4" name="rest3" type="rest" x="576" y="96" width="32" height="32"/>
+  <object id="5" name="rest2" type="rest" x="512" y="96" width="32" height="32"/>
+  <object id="6" name="rest1" type="rest" x="448" y="96" width="32" height="32"/>
  </objectgroup>
  <objectgroup name="Spawn">
-  <object height="64" name="Leonid" type="spawn" width="96" x="64" y="64"/>
-  <object height="160" name="Mara" type="spawn" width="192" x="128" y="192"/>
-  <object height="192" name="drunk" type="spawn" width="256" x="192" y="160">
+  <object id="7" name="Leonid" type="spawn" x="64" y="64" width="96" height="64"/>
+  <object id="8" name="Mara" type="spawn" x="128" y="192" width="192" height="160"/>
+  <object id="9" name="drunk" type="spawn" x="192" y="160" width="256" height="192">
    <properties>
     <property name="quantity" value="3"/>
    </properties>
   </object>
-  <object height="32" name="Arambold" type="spawn" width="160" x="448" y="128"/>
-  <object height="32" name="Tharal" type="spawn" width="32" x="512" y="384"/>
-  <object height="32" name="Gruil" type="spawn" width="32" x="32" y="224"/>
+  <object id="10" name="Arambold" type="spawn" x="448" y="128" width="160" height="32"/>
+  <object id="11" name="Tharal" type="spawn" x="512" y="384" width="32" height="32"/>
+  <object id="12" name="Gruil" type="spawn" x="32" y="224" width="32" height="32"/>
+  <object id="14" name="burhczyd1" type="spawn" x="352" y="192" width="96" height="64">
+   <properties>
+    <property name="active" value="false"/>
+    <property name="ignoreAreas" value="true"/>
+   </properties>
+  </object>
  </objectgroup>
  <objectgroup name="Keys"/>
-</map>
\ No newline at end of file
+</map>
diff --git a/AndorsTrail/res/xml/fallhaven_tavern.tmx b/AndorsTrail/res/xml/fallhaven_tavern.tmx
index a3c5d1842..114935bd1 100644
--- a/AndorsTrail/res/xml/fallhaven_tavern.tmx
+++ b/AndorsTrail/res/xml/fallhaven_tavern.tmx
@@ -231,6 +231,11 @@
     <property name="spawngroup" value="Ganos"/>
    </properties>
   </object>
+  <object name="burhczyd2" type="spawn" x="256" y="256" width="32" height="32">
+   <properties>
+    <property name="ignoreAreas" value="true"/>
+   </properties>
+  </object>
  </objectgroup>
  <objectgroup name="Keys">
   <object name="fallhaventavern:20" type="key" x="448" y="288" width="32" height="32">
diff --git a/AndorsTrail/res/xml/guynmart.tmx b/AndorsTrail/res/xml/guynmart.tmx
index bc6ccb524..8029e4fc7 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.0" tiledversion="1.1.5" orientation="orthogonal" renderorder="right-down" width="30" height="30" tilewidth="32" tileheight="32" infinite="0" nextobjectid="105">
+<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">
  <properties>
   <property name="colorfilter" value="none"/>
   <property name="outdoors" value="1"/>
@@ -187,152 +187,152 @@
  <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="30" height="30">
+ <layer id="1" name="Ground" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJztlrEOgjAURRnVxURcOuDX+QV8UJlYS9gc/AA3f0MnVkfT0JeUZ1tuEVEDw1nIaw83TS/U6ySpZ8bu0GUqb5N1mcors5bC8CveW4ozxCs93keKgzrP29e8+plNjJevJfq8lcO72uPEeFXWUhn4vToJHD1v342Ql3Iqk7tkXATOcdPuYXt951uZmcJ4FSMmr+29gl7KnDNi8+agV9M4fERMXloTOlvUexc4Y3qHsHjn4/X11be81Gm8l21ce4fmkX62e5x3MyGZUwVm0e8C72Mf3IvQd76f5h+977xvzP/ewng8ASBrjm0=
+   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==
   </data>
  </layer>
- <layer name="Objects" width="30" height="30">
+ <layer id="2" name="Objects" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJy1l89rE0EUxycpNhGhcYzmB0vEi/oX2AoexbaexWoNUqqQWhoP9VD81b/AKigWtY0evKi1Fw8q2IOKVYgI4k9QEI1nSywePAm+x77XeTuZjd3YfuExv3beZ97szOzshFbqR06pBbB0XqnzUL4g6ji9DnU3wAYcbVWwXRvUkh5qFRC2b0srtT1t/GO/YfHcRZG3/e8VTNnOGrB4tqrC1xA8+6Xgfq5scR45eDa7SvmSDs4H12FcWMb8AnF/x5Qa3eTnh8TYOf8yZ8Zja1g3jsEeS5iQi3riiF/67NPBupIYh/0ucMxlbdjcxmN/7Jm+88R99Y9xhukg+Ox2zAmzZfyvLW5JmzEV09G4PdZ8SNYhajud9VMZ791s0EYicO2+aGeyPp/XxwnYc7PExXjzcRPv/yi+2RjqLDHkPmJ9bW/u6zmM64VnUtQzSOc9k7I08X4VDFfuj615014H7iI951rPH8DvR8+kqHeQvvdMyqpQ/zbg70gq1SmsO2nWP48LuRg3cwfjxpcd0zfK17xgGTUn/M1ArLuBMwn2HWw/sSUXVW9vjHdLoTGmn5Rf9IJl1BT1PxzzDTVOMVYg7QVuJRvkhkmu9ysJpa6CXUu421nHY76hyrSn+4k7sUyu3N+3gHcb7E7C3c66B4wp8P9Gm3d6OSK3FT3VZg+xbjq4g1A+AnY0uTJc/N4gdxRYXXT+TTaJ9+SaaP73xd31zB3Tvl0C2wPMvlWeZ+TK/XtM+0x81ys5z+vWN3Jn6HwuAuuAOLPwfG6jc62WgjsW9N1I/T9B+XOqtTGg/ohzUoq/TSng1ldhrlPiu9Ap7gN8D4tRO8ZdCeHXOoLltx3u52x/zEWNaHOfZPE3cK6FuF3rOSPqkOu6azwoGJttwr2/1th0k+ekP+by+Rx292smyY0i5Np34uns8i0Qb4R+58R6luyieM/jIs/iM70no9ROsN6MX67mGuNAybp+x/+Hy7f9jFwHY8Q9lQmfU/veaNfL1P4Pkv8wS/ds+u/qygTnJaxv2P8dp38BAmwn2Q==
+   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=
   </data>
  </layer>
- <layer name="Above" width="30" height="30">
+ <layer id="3" name="Above" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJy1l71OwzAQx0MGmq0NoJIlvBdi6DPwHjxBhYQKQpUAMTBhYEJd6MpKB8LCQIUK4mPEUXzicvHZl6T9S6fW9t39fE7iOLMkYPWkx2bJ/y/uo/8lUkk1Brf3N+z9tj46riw5FYmnbdAildfAzUfCkXAhp28tuH5lWZ8sLduX4d4RTlsBW1L/c6de7gz549qkaw1amDyHwmv+YZknd39RTRADuMOG3EEcBG/Mc+PSWiTjgcKa/liThs9RrlsSOxXkOjc+qiX3JS23x3Fho9geowi3Hzbjfpr4vA5a/4GFPTc+Zy3rBW6e70KQay7wue6528B9T2X5pFyfhqTeK7OuUY+PWQY3F+beM/fSKrlSrYJ7aql3TPooV3WD4KZbvBteN6uWMe8MzIXnFliUaeM+aOa0W+yV0VbVuD2RrvOAsOj7wbXOl3pspO1Y20latOmewHFB9J0gOdccaZ9vbT/aftOizXEx37c/hzt+9rr26WiLBL6QD+ZW56xB1de5trUlAi6Irknds29T4f15GUzfteXUlp3vw/RsuoueF5x/L5YzpWcxKs4f31ePSfmbxfc95JqfLdY17vpOcvXhOrhcXHwe8wesEcdX
+   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==
   </data>
  </layer>
- <layer name="Above_1" width="30" height="30">
+ <layer id="4" name="Above_1" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJxjYBgFo4D2wI4Nlf+QnTT9j5DU35EgrP6CNIT2Q7P3I9ScObLE2fuJRHfCAMi/R5DsgNk7i0b24vIvIwdp5jAhqV8kSJreI0T6DRvYTYbe1VA9O4H0ckEExgUuAsPokjSChtn7mES7d8qi0uQAkL2fofpXE2nOW6i6VVSy9y2J9uIDOwTw82H2vpeljr2w9E5IfhaN/EsMGGh7iQWDxd6d/AwMu/ghdcMLYUz8CEeZSKm9J4F2nuKHlJUcIpiYCUcZSs1wXgeUWwjEi4B4sSyEj6tMJNbej0Somw9U8w2IvwPxD1kIn1BZTMh+UL3BJAdhI5fL6GX0QaA5h4D4sCxhtSDzSK2PcIGLQPsuAfFlKqX7UTAKhgsAAOPfYXo=
+   eAHtVT1LA0EUXFNoOpVYCKI/JT8hPzAIklgICtZGK00aU5nY2qiNjUgU1NIZbh95t7dfh4qFtzC39/bNm7l93N0a04ymA7/fge5q2eN+rRynogfFv9tOsY252Sk4Pcd3YXX2d9MaZLwq37yKgsX9TpSH+PbVWkyvrm9ovyvtmEs111L84WY1H1vR+43xfLmLzL7o2hNbM8J8hGcVaI6+n+GdmAMyM0ffx5re9OOQuYjqXen7ZnVkHymFZ8s/tnOK78trX9Hz8fRaDu9sQ1cY48bi+4Jnz9GjWown73vZdRlJnt+b9Dmmt6yM+2pe6v6vfVPPJ/ncvgg/NMt+Q3l33fUdrRtzDvBseOpUoc8ArfVd32t4TgH+K9tbVeh/4k/6aq1TvKcDYAgcAoz5zfhG7n4XgXqteQDOO/ABfAKMQ75Sl/LnudHaK9jyT3ZnZi/hdQWMAQ6XIzFz1Kt7HrHON2bwmwO31tfHadaaDvzHDnwB499heg==
   </data>
  </layer>
- <layer name="Walkable" width="30" height="30" visible="0">
+ <layer id="5" name="Walkable" width="30" height="30" visible="0">
   <data encoding="base64" compression="zlib">
-   eJzFl1EKxDAIRHOK/dpL7HF722U/CiIzjpq4DQjF6LyoaaFrrXW9z9i97PMi+p8X14h8/hnx/EJaft/HonzFRr2wMRGX8Sr7Si+alapb+aM5sf537harT+mqfmS40R2a5KLcqt4/LNOPSp9V/KkzV/SmuWre6O51uGpmEW93vpFWl1v1+15nuNXl+agGFLfLV3qs3gku6sF0nxGLxe3ykK46n/V3zpCZr/qeZHKz34/qe3eKm8mbsC63Ui/LfYLLtHYX00P1nuCofkQ+pNk5m6rZ6v7+kbyhPbRQLtOy9gWOtWdH
+   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
   </data>
  </layer>
- <layer name="Walkable_2" width="30" height="30" visible="0">
+ <layer id="6" name="Walkable_2" width="30" height="30" visible="0">
   <data encoding="base64" compression="zlib">
-   eJztlEEOwCAIBH1IP97f9r5FWQoiadiEg4IMEnGMc7qvt2VxV+s/ck/1ecWV/DNrro371TCfheupC89p3Kh7Y77qXCk+iyv5q3C1/QiuVZ53lc1l4ndxvcrus/ffwBqkeizzpHG1GOQyZxg/+y8wsSw3Yn525Wu1qusBg6G3IA==
+   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=
   </data>
  </layer>
- <layer name="Walkable_1" width="30" height="30" visible="0">
+ <layer id="7" name="Walkable_1" width="30" height="30" visible="0">
   <data encoding="base64" compression="zlib">
-   eJztlF0SgCAIhD1IF++2vRIDsvyoTQMzTGXKt23iGOfivt65kyvd/5l7wmuLK73Xsrk+bjR5PQ83o4uvs7hV383rneRqfGte5v/OvEd0Ve3nLBcdp8+aBkQvElZvSFzUL4srXaPzMtzZHqv0GalX5XP23KDjEQ1eLmVZvek5txB9u7kV/bOqXkfH1+MBXde+5w==
+   eAHtkFkKwkAQBXMQL+5tpZGC4tE9iSHRHwfGXt42Ztt+d56PbfP91ksqk+Oe3V3VWe7vysO3svKC3VkzM/9zh0+7T97ZeVjf4dPOur2+87Cmw6eddXv95HFmX1nWrbLNqz5P4qvZ2s6rw1d+R7HyJY/qLPfgR71XvC4Xf2ce4a1yEsPPe+f5DfRU8zofe2af2pydQU/tuJ1/7tB773d3vuCJnZkz1x68zXkrvrV7Pd5ZU5c4c/KOzuhdq2fGh5nK/mzFhzr5gFflTtzV3j7FY5404JmZ86TPvf0S8wyvdmR1NTUdhx1e1mRf3DpopvpmvX8nDnv8rMkebtUrztV+V7zp7/H/And+gRdd177n
   </data>
  </layer>
- <layer name="Walkable_3" width="30" height="30" visible="0">
+ <layer id="8" name="Walkable_3" width="30" height="30" visible="0">
   <data encoding="base64" compression="zlib">
-   eJztz7EJACAMRcE/iIu7rdhpJyqkuYOQKjySACS97VtXt7o7b17mtvtDxb/r3wBwagClVCHx
+   eAHtkNEGACAQBPdD+vH+NskS5zilniay1HVzjcTCAAYwIPW2LDh/OTHPCfeNAft1vqHEruY5Y0V+Mt/c7Nn5hJtPVL854d78dX9bn5JKDGAAAxjAgDQApVQh8Q==
   </data>
  </layer>
- <layer name="Objects_1" width="30" height="30">
+ <layer id="9" name="Objects_1" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJztzSEBACAQBMHr8f2TQAMIBA6DBTVjVm4C8EarpNfpL2O/Zp0CAHC3AO51BzU=
+   eAHt0MEJACAIBVD3aP9JaoMaKDt48tztCR9BROFFKAIECPwRmCNiZar/+dKv7vx5MtX7hgkBAgQIECBAgMATuO51BzU=
   </data>
  </layer>
- <objectgroup name="Mapevents" visible="0">
-  <object id="37" name="guynmart_sign_flowers_1" type="sign" x="864" y="352" width="32" height="32"/>
-  <object id="38" name="guynmart_sign_flowers_2" type="sign" x="896" y="512" width="32" height="32"/>
-  <object id="39" name="guynmart_sign_flowers_3" type="sign" x="896" y="448" width="32" height="32"/>
-  <object id="40" name="guynmart_sign_flowers_4" type="sign" x="832" y="352" width="32" height="32"/>
-  <object id="41" name="guynmart_sign_flowers_5" type="sign" x="832" y="512" width="32" height="32"/>
-  <object id="73" name="north" type="mapchange" x="32" y="0" width="896" height="32">
+ <objectgroup id="10" 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"/>
+  <object id="4" name="guynmart_sign_flowers_4" type="sign" x="832" y="352" width="32" height="32"/>
+  <object id="5" name="guynmart_sign_flowers_5" type="sign" x="832" y="512" width="32" height="32"/>
+  <object id="6" name="north" type="mapchange" x="32" y="0" width="896" height="32">
    <properties>
     <property name="map" value="guynmart_wood_2"/>
     <property name="place" value="south"/>
    </properties>
   </object>
-  <object id="74" name="south" type="mapchange" x="352" y="928" width="160" height="32">
+  <object id="7" name="south" type="mapchange" x="352" y="928" width="160" height="32">
    <properties>
     <property name="map" value="guynmart_wood_1"/>
     <property name="place" value="north"/>
    </properties>
   </object>
-  <object id="2" name="guynmart_main" type="mapchange" x="448" y="448" width="32" height="32">
+  <object id="8" name="guynmart_main" type="mapchange" x="448" y="448" width="32" height="32">
    <properties>
     <property name="map" value="guynmart_main_1"/>
     <property name="place" value="entrance"/>
    </properties>
   </object>
-  <object id="4" name="tower_top" type="mapchange" x="128" y="96" width="32" height="32">
+  <object id="9" name="tower_top" type="mapchange" x="128" y="96" width="32" height="32">
    <properties>
     <property name="map" value="guynmart_tower_4"/>
     <property name="place" value="up"/>
    </properties>
   </object>
-  <object id="5" name="bridge_left" type="mapchange" x="160" y="288" width="32" height="32">
+  <object id="10" name="bridge_left" type="mapchange" x="160" y="288" width="32" height="32">
    <properties>
     <property name="map" value="guynmart_tower_2"/>
     <property name="place" value="bridge"/>
    </properties>
   </object>
-  <object id="6" name="bridge_right" type="mapchange" x="256" y="288" width="32" height="32">
+  <object id="11" name="bridge_right" type="mapchange" x="256" y="288" width="32" height="32">
    <properties>
     <property name="map" value="guynmart_main_2"/>
     <property name="place" value="bridge"/>
    </properties>
   </object>
-  <object id="43" name="wall" type="mapchange" x="64" y="320" width="32" height="32">
+  <object id="12" name="wall" type="mapchange" x="64" y="320" width="32" height="32">
    <properties>
     <property name="map" value="guynmart_tower_2"/>
     <property name="place" value="wall"/>
    </properties>
   </object>
-  <object id="44" name="tower" type="mapchange" x="128" y="384" width="32" height="32">
+  <object id="13" name="tower" type="mapchange" x="128" y="384" width="32" height="32">
    <properties>
     <property name="map" value="guynmart_tower_1"/>
     <property name="place" value="entrance"/>
    </properties>
   </object>
-  <object id="7" name="guynmart_sRpl_main_1a" type="script" x="640" y="320" width="32" height="32"/>
-  <object id="8" name="guynmart_sRpl_main_1b" type="script" x="416" y="480" width="96" height="32"/>
-  <object id="9" name="guynmart_sRpl_main_1c" type="script" x="128" y="416" width="64" height="32"/>
-  <object id="85" name="guynmart_sRpl_main_1d" type="script" x="160" y="640" width="32" height="32"/>
-  <object id="11" name="guynmart_sRpl_main_2a" type="script" x="704" y="320" width="32" height="32"/>
-  <object id="10" name="guynmart_sRpl_main_2b" type="script" x="224" y="288" width="32" height="32"/>
-  <object id="81" name="guynmart_sRpl_main_2c" type="script" x="64" y="352" width="32" height="32"/>
-  <object id="14" name="guynmart_sRpl_main_3a" type="script" x="640" y="416" width="32" height="96"/>
-  <object id="15" name="guynmart_sRpl_main_3b" type="script" x="832" y="352" width="32" height="224"/>
-  <object id="102" name="guynmart_sRpl_main_olav_1" type="script" x="640" y="288" width="32" height="32"/>
-  <object id="67" name="guynmart_sRpl_main_olav_2" type="script" x="640" y="256" width="32" height="32"/>
-  <object id="78" name="guynmart_sRpl_main_olav_3" type="script" x="640" y="224" width="64" height="32"/>
-  <object id="82" name="west3" type="mapchange" x="0" y="832" width="32" height="96">
+  <object id="14" name="guynmart_sRpl_main_1a" type="script" x="640" y="320" width="32" height="32"/>
+  <object id="15" name="guynmart_sRpl_main_1b" type="script" x="416" y="480" width="96" height="32"/>
+  <object id="16" name="guynmart_sRpl_main_1c" type="script" x="128" y="416" width="64" height="32"/>
+  <object id="17" name="guynmart_sRpl_main_1d" type="script" x="160" y="640" width="32" height="32"/>
+  <object id="18" name="guynmart_sRpl_main_2a" type="script" x="704" y="320" width="32" height="32"/>
+  <object id="19" name="guynmart_sRpl_main_2b" type="script" x="224" y="288" width="32" height="32"/>
+  <object id="20" name="guynmart_sRpl_main_2c" type="script" x="64" y="352" width="32" height="32"/>
+  <object id="21" name="guynmart_sRpl_main_3a" type="script" x="640" y="416" width="32" height="96"/>
+  <object id="22" name="guynmart_sRpl_main_3b" type="script" x="832" y="352" width="32" height="224"/>
+  <object id="23" name="guynmart_sRpl_main_olav_1" type="script" x="640" y="288" width="32" height="32"/>
+  <object id="24" name="guynmart_sRpl_main_olav_2" type="script" x="640" y="256" width="32" height="32"/>
+  <object id="25" name="guynmart_sRpl_main_olav_3" type="script" x="640" y="224" width="64" height="32"/>
+  <object id="26" name="west3" type="mapchange" x="0" y="832" width="32" height="96">
    <properties>
     <property name="map" value="guynmart_wood_8"/>
     <property name="place" value="east2"/>
    </properties>
   </object>
-  <object id="83" name="west1" type="mapchange" x="0" y="416" width="32" height="64">
+  <object id="27" name="west1" type="mapchange" x="0" y="416" width="32" height="64">
    <properties>
     <property name="map" value="guynmart_wood_6"/>
     <property name="place" value="east"/>
    </properties>
   </object>
-  <object id="88" name="west2" type="mapchange" x="0" y="608" width="32" height="32">
+  <object id="28" name="west2" type="mapchange" x="0" y="608" width="32" height="32">
    <properties>
     <property name="map" value="guynmart_wood_8"/>
     <property name="place" value="east1"/>
    </properties>
   </object>
-  <object id="90" name="east1" type="mapchange" x="928" y="32" width="32" height="192">
+  <object id="29" name="east1" type="mapchange" x="928" y="32" width="32" height="192">
    <properties>
     <property name="map" value="guynmart_wood_9"/>
     <property name="place" value="west"/>
    </properties>
   </object>
-  <object id="93" name="gate" type="mapchange" x="288" y="672" width="32" height="32">
+  <object id="30" name="gate" type="mapchange" x="288" y="672" width="32" height="32">
    <properties>
     <property name="map" value="guynmart_gate_2"/>
     <property name="place" value="west"/>
    </properties>
   </object>
-  <object id="97" name="guynmart_sign_gatenodoor" type="sign" x="480" y="672" width="32" height="32"/>
-  <object id="101" name="guynmart_s_clearing_10" type="script" x="0" y="480" width="32" height="128"/>
+  <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 name="Spawn">
-  <object id="12" name="guynmart_player" type="spawn" x="576" y="576" width="96" height="96">
+ <objectgroup id="11" 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"/>
     <property name="spawngroup" value="guynmart_player"/>
@@ -340,109 +340,103 @@
   </object>
   <object id="34" name="guynmart_guard_guide" type="spawn" x="384" y="768" width="64" height="32">
    <properties>
-    <property name="quantity" value="1"/>
     <property name="spawngroup" value="guynmart_guard_guide"/>
    </properties>
   </object>
   <object id="35" name="guynmart_gguard" type="spawn" x="768" y="384" width="32" height="32">
    <properties>
-    <property name="quantity" value="1"/>
     <property name="spawngroup" value="guynmart_gguard"/>
    </properties>
   </object>
-  <object id="86" name="guynmart_wguard1" type="spawn" x="64" y="416" width="32" height="320">
+  <object id="36" name="guynmart_wguard1" type="spawn" x="64" y="416" width="32" height="320">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="guynmart_wguard_a"/>
    </properties>
   </object>
-  <object id="87" name="guynmart_wguard2" type="spawn" x="704" y="480" width="32" height="256">
+  <object id="37" name="guynmart_wguard2" type="spawn" x="704" y="480" width="32" height="256">
    <properties>
-    <property name="quantity" value="1"/>
     <property name="spawngroup" value="guynmart_wguard_a"/>
    </properties>
   </object>
-  <object id="48" name="guynmart_wguard3" type="spawn" x="128" y="384" width="160" height="96">
+  <object id="38" name="guynmart_wguard3" type="spawn" x="128" y="384" width="160" height="96">
    <properties>
-    <property name="quantity" value="1"/>
     <property name="spawngroup" value="guynmart_wguard"/>
    </properties>
   </object>
-  <object id="49" name="guynmart_wguard4" type="spawn" x="192" y="512" width="128" height="160">
+  <object id="39" name="guynmart_wguard4" type="spawn" x="192" y="512" width="128" height="160">
    <properties>
-    <property name="quantity" value="1"/>
     <property name="spawngroup" value="guynmart_wguard"/>
    </properties>
   </object>
-  <object id="50" name="guynmart_wguard5" type="spawn" x="288" y="512" width="384" height="128">
+  <object id="40" name="guynmart_wguard5" type="spawn" x="288" y="512" width="384" height="128">
    <properties>
-    <property name="quantity" value="1"/>
     <property name="spawngroup" value="guynmart_wguard"/>
    </properties>
   </object>
-  <object id="98" name="guynmart_wguard9a" type="spawn" x="192" y="512" width="416" height="128">
+  <object id="41" name="guynmart_wguard9a" type="spawn" x="192" y="512" width="416" height="128">
    <properties>
     <property name="active" value="false"/>
     <property name="quantity" value="5"/>
     <property name="spawngroup" value="guynmart_wguard9a"/>
    </properties>
   </object>
-  <object id="99" name="guynmart_pguard" type="spawn" x="288" y="512" width="384" height="128">
+  <object id="42" name="guynmart_pguard" type="spawn" x="288" y="512" width="384" height="128">
    <properties>
     <property name="active" value="false"/>
     <property name="quantity" value="4"/>
     <property name="spawngroup" value="guynmart_pguard"/>
    </properties>
   </object>
-  <object id="36" name="guynmart_nuik" type="spawn" x="800" y="384" width="96" height="128">
+  <object id="43" name="guynmart_nuik" type="spawn" x="800" y="384" width="96" height="128">
    <properties>
-    <property name="quantity" value="1"/>
     <property name="spawngroup" value="guynmart_nuik"/>
    </properties>
   </object>
-  <object id="33" name="guynmart_hannah" type="spawn" x="64" y="64" width="64" height="32">
+  <object id="44" name="guynmart_hannah" type="spawn" x="64" y="64" width="64" height="32">
    <properties>
-    <property name="quantity" value="1"/>
     <property name="spawngroup" value="guynmart_hannah"/>
    </properties>
   </object>
-  <object id="70" name="guynmart_steward3" type="spawn" x="480" y="480" width="32" height="32">
+  <object id="45" name="guynmart_steward3" type="spawn" x="480" y="480" width="32" height="32">
    <properties>
     <property name="active" value="false"/>
-    <property name="quantity" value="1"/>
     <property name="spawngroup" value="guynmart_steward3"/>
    </properties>
   </object>
-  <object id="64" name="guynmart_rob2" type="spawn" x="704" y="352" width="32" height="32">
+  <object id="46" name="guynmart_rob2" type="spawn" x="704" y="352" width="32" height="32">
    <properties>
     <property name="active" value="false"/>
-    <property name="quantity" value="1"/>
     <property name="spawngroup" value="guynmart_rob2"/>
    </properties>
   </object>
-  <object id="69" name="guynmart_olav" type="spawn" x="128" y="480" width="64" height="32">
+  <object id="47" name="guynmart_olav" type="spawn" x="128" y="480" width="64" height="32">
    <properties>
     <property name="active" value="false"/>
+    <property name="spawngroup" value="guynmart_olav"/>
    </properties>
   </object>
-  <object id="6" name="forestboar4" type="spawn" x="160" y="64" width="736" height="192">
+  <object id="48" name="forestboar4" type="spawn" x="160" y="64" width="736" height="192">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="forestboar4"/>
    </properties>
   </object>
-  <object id="7" name="forestwolf2" type="spawn" x="160" y="64" width="736" height="192">
+  <object id="49" name="forestwolf2" type="spawn" x="160" y="64" width="736" height="192">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="forestwolf2"/>
    </properties>
   </object>
-  <object id="84" name="guynmart_horse" type="spawn" x="128" y="544" width="32" height="64">
+  <object id="50" name="guynmart_horse" type="spawn" x="128" y="544" width="32" height="64">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="guynmart_horse"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys" visible="0">
-  <object id="16" name="guynmart_quest_gguard:1" type="key" x="768" y="416" width="32" height="32">
+ <objectgroup id="12" 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"/>
     <property name="requireId" value="guynmart_quest_gguard"/>
@@ -450,7 +444,7 @@
     <property name="requireValue" value="1"/>
    </properties>
   </object>
-  <object id="55" name="guynmart_quest_olav:1" type="key" x="96" y="448" width="544" height="32">
+  <object id="52" name="guynmart_quest_olav:1" type="key" x="96" y="448" width="544" height="32">
    <properties>
     <property name="phrase" value="guynmart_key_olav"/>
     <property name="requireId" value="guynmart_quest_olav"/>
@@ -458,7 +452,7 @@
     <property name="requireValue" value="1"/>
    </properties>
   </object>
-  <object id="61" name="guynmart_quest_olav:7" type="key" x="640" y="256" width="32" height="32">
+  <object id="53" name="guynmart_quest_olav:7" type="key" x="640" y="256" width="32" height="32">
    <properties>
     <property name="phrase" value="guynmart_key_olav7"/>
     <property name="requireId" value="guynmart_quest_olav"/>
@@ -466,7 +460,7 @@
     <property name="requireValue" value="7"/>
    </properties>
   </object>
-  <object id="62" name="guynmart_quest_olav:2" type="key" x="96" y="512" width="576" height="32">
+  <object id="54" name="guynmart_quest_olav:2" type="key" x="96" y="512" width="576" height="32">
    <properties>
     <property name="phrase" value="guynmart_key_olav2"/>
     <property name="requireId" value="guynmart_quest_olav"/>
@@ -474,7 +468,7 @@
     <property name="requireValue" value="1"/>
    </properties>
   </object>
-  <object id="63" name="guynmart_quest_olav:3" type="key" x="672" y="256" width="32" height="288">
+  <object id="55" name="guynmart_quest_olav:3" type="key" x="672" y="256" width="32" height="288">
    <properties>
     <property name="phrase" value="guynmart_key_olav3"/>
     <property name="requireId" value="guynmart_quest_olav"/>
@@ -482,7 +476,7 @@
     <property name="requireValue" value="1"/>
    </properties>
   </object>
-  <object id="79" name="guynmart:170" type="key" x="128" y="384" width="32" height="32">
+  <object id="56" name="guynmart:170" type="key" x="128" y="384" width="32" height="32">
    <properties>
     <property name="phrase" value="guynmart_key_tower_entrance"/>
     <property name="requireId" value="guynmart"/>
@@ -490,7 +484,7 @@
     <property name="requireValue" value="170"/>
    </properties>
   </object>
-  <object id="103" name="guynmart:30" type="key" x="160" y="640" width="32" height="32">
+  <object id="57" name="guynmart:30" type="key" x="160" y="640" width="32" height="32">
    <properties>
     <property name="phrase" value="guynmart_haystack"/>
     <property name="requireId" value="guynmart"/>
@@ -499,98 +493,98 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Replace" visible="0">
-  <object id="17" name="guynmart_qRpl_main:1" type="replace" x="32" y="256" width="736" height="448">
+ <objectgroup id="13" 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"/>
    </properties>
   </object>
-  <object id="18" name="guynmart_qRpl_main:1" type="replace" x="704" y="416" width="32" height="32">
+  <object id="59" name="guynmart_qRpl_main:1" type="replace" x="704" y="416" width="32" height="32">
    <properties>
     <property name="Above" value="Ground"/>
    </properties>
   </object>
-  <object id="19" name="guynmart_qRpl_main:2" type="replace" x="32" y="256" width="736" height="448">
+  <object id="60" name="guynmart_qRpl_main:2" type="replace" x="32" y="256" width="736" height="448">
    <properties>
     <property name="Walkable" value="Walkable_2"/>
    </properties>
   </object>
-  <object id="20" name="guynmart_qRpl_main:2" type="replace" x="704" y="416" width="32" height="32" visible="0">
+  <object id="61" name="guynmart_qRpl_main:2" type="replace" x="704" y="416" width="32" height="32">
    <properties>
     <property name="Above" value="Walkable_2"/>
    </properties>
   </object>
-  <object id="21" name="guynmart_qRpl_main:11" type="replace" x="32" y="256" width="736" height="448" visible="0">
+  <object id="62" name="guynmart_qRpl_main:11" type="replace" x="32" y="256" width="736" height="448">
    <properties>
     <property name="Walkable" value="Walkable_1"/>
    </properties>
   </object>
-  <object id="22" name="guynmart_qRpl_main:11" type="replace" x="704" y="416" width="32" height="32" visible="0">
+  <object id="63" name="guynmart_qRpl_main:11" type="replace" x="704" y="416" width="32" height="32">
    <properties>
     <property name="Above" value="Ground"/>
    </properties>
   </object>
-  <object id="23" name="guynmart_qRpl_main:12" type="replace" x="32" y="256" width="736" height="448" visible="0">
+  <object id="64" name="guynmart_qRpl_main:12" type="replace" x="32" y="256" width="736" height="448">
    <properties>
     <property name="Walkable" value="Walkable_2"/>
    </properties>
   </object>
-  <object id="24" name="guynmart_qRpl_main:12" type="replace" x="704" y="416" width="32" height="32" visible="0">
+  <object id="65" name="guynmart_qRpl_main:12" type="replace" x="704" y="416" width="32" height="32">
    <properties>
     <property name="Above" value="Walkable_2"/>
    </properties>
   </object>
-  <object id="25" name="guynmart_qRpl_main:21" type="replace" x="32" y="256" width="736" height="448" visible="0">
+  <object id="66" name="guynmart_qRpl_main:21" type="replace" x="32" y="256" width="736" height="448">
    <properties>
     <property name="Walkable" value="Walkable_1"/>
    </properties>
   </object>
-  <object id="26" name="guynmart_qRpl_main:21" type="replace" x="704" y="416" width="32" height="32" visible="0">
+  <object id="67" name="guynmart_qRpl_main:21" type="replace" x="704" y="416" width="32" height="32">
    <properties>
     <property name="Above" value="Ground"/>
    </properties>
   </object>
-  <object id="27" name="guynmart_qRpl_main:22" type="replace" x="32" y="256" width="736" height="448" visible="0">
+  <object id="68" name="guynmart_qRpl_main:22" type="replace" x="32" y="256" width="736" height="448">
    <properties>
     <property name="Walkable" value="Walkable_2"/>
    </properties>
   </object>
-  <object id="28" name="guynmart_qRpl_main:22" type="replace" x="704" y="416" width="32" height="32" visible="0">
+  <object id="69" name="guynmart_qRpl_main:22" type="replace" x="704" y="416" width="32" height="32">
    <properties>
     <property name="Above" value="Walkable_2"/>
    </properties>
   </object>
-  <object id="29" name="guynmart_qRpl_main:31" type="replace" x="32" y="256" width="736" height="448" visible="0">
+  <object id="70" name="guynmart_qRpl_main:31" type="replace" x="32" y="256" width="736" height="448">
    <properties>
     <property name="Walkable" value="Walkable_1"/>
    </properties>
   </object>
-  <object id="30" name="guynmart_qRpl_main:31" type="replace" x="704" y="416" width="32" height="32" visible="0">
+  <object id="71" name="guynmart_qRpl_main:31" type="replace" x="704" y="416" width="32" height="32">
    <properties>
     <property name="Above" value="Ground"/>
    </properties>
   </object>
-  <object id="45" name="guynmart_qRpl_shutters:1" type="replace" x="320" y="288" width="128" height="64">
+  <object id="72" name="guynmart_qRpl_shutters:1" type="replace" x="320" y="288" width="128" height="64">
    <properties>
     <property name="Objects" value="Objects_1"/>
    </properties>
   </object>
-  <object id="80" name="guynmart_quest_olav:71" type="replace" x="640" y="288" width="64" height="32" visible="0">
+  <object id="73" name="guynmart_quest_olav:71" type="replace" x="640" y="288" width="64" height="32">
    <properties>
     <property name="Walkable" value="Ground"/>
    </properties>
   </object>
-  <object id="95" name="guynmart:170" type="replace" x="32" y="160" width="672" height="608">
+  <object id="74" name="guynmart:170" type="replace" x="32" y="160" width="672" height="608">
    <properties>
     <property name="Above" value="Above_1"/>
    </properties>
   </object>
-  <object id="104" name="guynmart:170" type="replace" x="736" y="256" width="32" height="480">
+  <object id="75" name="guynmart:170" type="replace" x="736" y="256" width="32" height="480">
    <properties>
     <property name="Above" value="Above_1"/>
    </properties>
   </object>
-  <object id="94" name="guynmart_nondisplay:2" type="replace" x="352" y="672" width="96" height="96">
+  <object id="76" name="guynmart_nondisplay:2" type="replace" x="352" y="672" width="96" height="96">
    <properties>
     <property name="Above" value="Above_1"/>
     <property name="Walkable" value="Walkable_1"/>
@@ -599,7 +593,7 @@
     <property name="requireValue" value="2"/>
    </properties>
   </object>
-  <object id="100" name="guynmart_nondisplay:2n" type="replace" x="352" y="672" width="96" height="96">
+  <object id="77" name="guynmart_nondisplay:2n" type="replace" x="352" y="672" width="96" height="96">
    <properties>
     <property name="Above" value="Above"/>
     <property name="Walkable" value="Walkable"/>
diff --git a/AndorsTrail/res/xml/lakecave2.tmx b/AndorsTrail/res/xml/lakecave2.tmx
index 29aa5b031..0b0cdf351 100644
--- a/AndorsTrail/res/xml/lakecave2.tmx
+++ b/AndorsTrail/res/xml/lakecave2.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="30" height="30" tilewidth="32" tileheight="32" infinite="0" nextobjectid="36">
+<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="13" nextobjectid="36">
  <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>
@@ -183,47 +183,47 @@
  <tileset firstgid="7577" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
- <layer name="Ground" width="30" height="30">
+ <layer id="1" name="Ground" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJy9l0EOgkAMRY07r84ZuMKMLNyDR0Cu4EGExCZN/W3/ILr4K5pfnP6+wXo+narSpFQPUuZ5X/VQGp36iZT1E89qapZVT6UZ1CMvT9ZPPIupuV0+pesHx8sT8ttUiBqtgazLVBp9juzbv/XvvpLRK+F5VN/6w76yJ5060x7sLtOXzcNsdj/jBjuXzgjlQ+8+4oaVPhM0l4hBth7ttHAj45z+rYhp4jWSsxKvjHM6Ux7T5FzZ+Rfw7h7nmCzLefdAe/K5yZ6hZIrNsZ1ZlCOdJ93X3lNMjhfTN9vh4jyz91SWY+TJ9I32u/V+YZhl54U4MapnmRAzUF80L7ur3kxZXnl7jzjBzDTiVevd0LLPUR6ivtGOeVlCzEDc8Ppm74Sy1ML66FnUtyVLiBvfMIXNEuIGyxTmu6CFGyxT0HfBHkU+R/0fi/QCJgebDA==
+   eAG1lMFRBDEMBK/4kToxkAIHD/5ACEAKBILn0VVdQuvz3i0Pl8aWPGNLss93p9NZ431ghtdvwfDFdjwfY/1L423jDOaZ4coX7nBGm32J+R7jR+NzYM5BfMdFTLWVL9zhfBJvYl7v/w7OkfiXMTouYqrt+LIWXWK3YrweXc+vxdHds/dI3cehnbGif6Quff28oH2ULpqxR+vCTT6xrGNXdFf7Ib3vt89bjUXP9lKNo5v4hzK6/vDb97vmH7BuMPnouOLv/g246rl5o7b8G85BxdGAK3ft/rRwkteVWoUvXM5Bxf7D0suecx4s92A+s9F1Dir23pU3RL5dK7C5ouv5DNcc0lveQ75rvTKvNeM8XR/BmX6ybvipSe5IXKx9xMS6Rrmv+9nccBFTfdQkOrUG+Gzhi4UT7cpdY7zXeE+9sg89bKebPLpeqWutCTHUfGbRsu10u3pFx7FdjGtrnL3WDDaX8+g6Ba/WtO5j70p9rW9ce8m+S/iS7uyNbfWS9xj7LDPdmS8cXS+5/yqu/4b91ef619rv6aXu33Cv7f1Tur7ZWqt5dlz1+b7B9t+CZ1xVk7l75Ro848H3n/YXckCa+g==
   </data>
  </layer>
- <layer name="Objects" width="30" height="30">
+ <layer id="2" name="Objects" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJzNVjtPAkEQPk/BBBQihQkqWPs77IkJPRG1VCwsbBSjna2t2mgpDYmthbEjsUUbK0BojQitO2E2DMPs3l4gxi/Z3D7mPbNz63n/AxvJwXfXn4685vzoCMIR6m0nPO8zMXq2mPW8ojqPw8gO9g6UvTl/OKdI4X6a+XKI64r6/igdX2r0FG8D99cE3/Nqb1WNDJ6dKvoCmWt5gMfMkE/LBL4zf0DTQ/oZ/B5HPO9b2dBNDOkrxIYOkfe+NG6bRo/QPTO6Oq6r+K0h7SzacBdx0xEWtwF1dBWxn/eJT9pmHY+3ADuf5sxnTVZbNHY23DN7rwX/XpXelqAb4nph8Zf7I8m24cPir8bLsvms7RgDDshxC+PZZXE9T47Tc16NhuAv3O1E1t0ODVPs4kQW171O1oWQsTchZekpgJoQc8gDjcU+zheU7TGcbxnkVYR9KsuW/yqrvxPCt4LzbX9ch6RT31EppxSm/sBtAehY0dzC3iVZB/UbFz2SjDD1RH3O+TJtEOqG3gZ96sHiI+iGmiuQf1Wa5My1z1FINaN9tNUThSl+O1H11sCxFzXzh81rEPqGOGz6g3tmoi/6QzqNEpnHHO2skfsBfSdv6RO0nvJkXhbu5yTQeqQ74corAeTx/Ev51LXUFu45B/BLvdMVnQl4p42S0COKBt+p3SVG43K3G4b64XWn/1u8t0NPKWOPkfo+BeTTVksu7w1eA/RdG/Z9NAlu/lAX4BeKO3f+
+   eAHNVj1PlEEQXgExAYRAQSJyUvs76AkJPeGrVCksbPyIdra0SgMlNiS0FISOhBZtrDg8WwOerfOEeXJPJvPevRAgTLK3884+87Gzs7NXyv2g52OXcaz23Uw8zUel6Ohl9bX7bY2W8suG0uNnpSzb+jCG8aCXFu+c64BXmnD5E5+5tu7f32z+az7+2Gib7qnLpwMeegsme2qj4WvvDL8oPDCwB9prXM74pU3ofbABDHyBHvj85mEp5xbDhQ3iaQu432LvxzgkObUFdxBwJ/696/ORY/s9hi2LgdTNBzF1503PSRV+Q/xmmH+yJ8bMfHwPe4z6+wNR0vluWq6VNHcqj/x2iPdLsr9j83uW+EZePwV9tR/3k9lWfOR/Jj4j5nAySjrfLcl1R9qbwxmfeT5Rw0ofvb5UprzWB2tf13G3R/2uqzzj1VZV7tg3oK94+J6Rs+TdzvxcRcYelPUU2GFNq02cg+bihcc1YnkYcn5eYlVd7RuUq61u58/eQL234mPK+SWbo4/4DX3eUfVNuzrrGag8xoI15krPFrLPEmeVPbWtfOYns6E+VT+rJ90z3yboKFZtZDz7dVxDn9qR/cZ1+EbNoX4bjsP7xzOq2+fUblYz3GO2prrkq/K3MljKqo81m6soO5MqbB25viuKn7Vc4Z5FIh7/P0DAkV4Jz/vJtaqZtYw8ou/g/wUo6xPMNdaJA/9e/PJ+Qn5dop/sTvSySd0MB3vx/LPzZC3xHYo6ahv6zKHK6/LsT3Xxt4nT+mGPYJ1Fvxq36gFX527rOWn9xLrju8W+wTjQU6CH9bhGDGecZ7da4jkTn82xBvR/bVzL9G9K9tX2e5f0H4o7d/4=
   </data>
  </layer>
- <layer name="Objects2" width="30" height="30" visible="0">
+ <layer id="3" name="Objects2" width="30" height="30" visible="0">
   <data encoding="base64" compression="zlib">
-   eJxjYBgF1AZCTBBakok0fawU2PmDg4FhiywDgwiQ/s5OvL7FLAwMokD6MYluhYEnQLu+yZKnV5U8baNgFIyCUTAKRsEoGAWjYBSMAioBADvjBuQ=
+   eAFjYBgF1A4BISaIiZJQmljzWYlViEXdDw4Ghi2yDAwiQPo7OxYFOIQWszAwiALlHpPoVphxT4B2fQPaSw5QJUfTqJ7REBgNgdEQGA2B0RAYDYHREBgNgdEQGA0BqoUAADvjBuQ=
   </data>
  </layer>
- <layer name="Above" width="30" height="30">
+ <layer id="4" name="Above" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJxjYBgc4LAYdc27DDVPiB+/mktE2HuZBLcRYx6xdhKjjtqA2vEwai9l9s5mYmCYy0ScWlU8aZ1Ue6kNiPUDKWCg/EIsoIf70MsmQuUGKWUZPoBsBzFl1XCKf0rtJTcOKLWX3HSBz15K01MQGwNDMBSHsKHK4UszlKanoZB2qJVXSbWXmmEzFOylZtlEy7xCbh6lZbmBT244tTVGCgAA7+ov/Q==
+   eAHtVFsKwjAQXPzwt+CHN/BC2tuJp/EGeqE20NAlZCezbrBSDIRus4+ZzYQV+Y31PPfl8V7qnQa7bop5Ebi5ll1p9TD1mBiW24rcx+qtA8vqj1u/qftB5DFvZl3AW8/5W90z20PmyXy36oXhlmK+wa+cTa25UcazvZRxeoa1MFPunvSP6vqpBlFcrVmpJ+KEcFFeiVH7vx5Fbsse569e6M0gn65h2agnK6fHuQc3erearwfXE6sxaranlie2hqXPPLWib4nFjeqJ8lG/yKe5WzaaG8gXxbX4tM576tnC2pt/Au/qL/0=
   </data>
  </layer>
- <layer name="Above2" width="30" height="30" visible="0">
+ <layer id="5" name="Above2" width="30" height="30" visible="0">
   <data encoding="base64" compression="zlib">
-   eJxjYBie4LLYwNh7aYDsRQaC/APtglEwCkbBKBgFo2AUjIJRMApGwVAAACzEAfI=
+   eAFjYBie4LLYwPjr0gDZi+xbQX5k3ih7NARGQ2A0BEZDYDQERkNgNARGQ2A0BEZDYDQEsIcAACzEAfI=
   </data>
  </layer>
- <layer name="Top" width="30" height="30" visible="0">
+ <layer id="6" name="Top" width="30" height="30" visible="0">
   <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AUUBNcFhsYew+PMHvnMg2MvaNgFIwC6oCBKjtGwSgYBaNgFKACAFjJBBQ=
+   eAFjYBgFoyEwGgLUDIHLYtQ0jXizDo8we+cyER82oypHQ2A0BAZfCAxUmTX4QmLURaMhMBoCoyEwsCEAAFjJBBQ=
   </data>
  </layer>
- <layer name="Walkable" width="30" height="30" visible="0">
+ <layer id="7" name="Walkable" width="30" height="30" visible="0">
   <data encoding="base64" compression="zlib">
-   eJztk1EKgDAMQz2F97/Cbih+CCKatGl0UwzsR+p729q1eZrah9eaEb1b3D7G3eeqvpoMw+XcsyLMO70Rt8JmTuTOnFedP8br5X3iDWZZLrfqrfbgrJ6xHO5jrYsVCbvzqBvVoXOw/3p5mVv1RveForwpta8ZVvXe3upFPVJSnTn0rcKOel1z+Hvzc4eCOI53MepaAP1Rxgg=
+   eAHlkAEKw1AIQ3uK3f8KveGWwQMJ6rd/g0EnjGgS437Px3GcN/4dr/rF+1Z3pau+9d/Ieoc2ueidP3p2er1pWrx/6u98ZIETb+eZatyL2O3KN60qM/LeZ9l4Ms05vFfQM+JMTuSyHt8VzHLgVjlT3ypHOjXx7vir3N277DlWd5xnL/JwYNTUr8r92UwGGrMjeofsyDMpsvAygxWPDnY+NJAdIRU5emn0Fa720T0LPsvtNPydBw1kB4QH4YWTiv7dnju7+3GPLDBq3k88vlPNZIGVTzzVeaYaWR2S1XkqjV1H/M5rjoWecWiOeJ3XTHWaPJm+4ibZWQZ7/3JX3+DT4jtmOWh3xCf9UcYI
   </data>
  </layer>
- <layer name="Walkable2" width="30" height="30" visible="0">
+ <layer id="8" name="Walkable2" width="30" height="30" visible="0">
   <data encoding="base64" compression="zlib">
-   eJxjYBieYKMYKh7s9lLDreToHYgwGgWjYBSMglEwCkbBKBgFo2AUDA4AAH/fC6o=
+   eAFjYBieYKMYAwMyppcvke0EsYkFyPqI1YOujhT7YHqpYS/MrFF6NARGQ2A0BEZDYDQERkNgNARGQ2A0BEZDYGiFAAB/3wuq
   </data>
  </layer>
- <objectgroup name="Mapevents" visible="0">
+ <objectgroup id="9" name="Mapevents" visible="0">
   <object id="1" name="west1" type="mapchange" x="0" y="896" width="32" height="32">
    <properties>
     <property name="map" value="lakecave0"/>
@@ -260,7 +260,7 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" visible="0">
+ <objectgroup id="10" name="Spawn" visible="0">
   <object id="6" name="lakecave2_1" type="spawn" x="64" y="96" width="288" height="512">
    <properties>
     <property name="quantity" value="2"/>
@@ -343,7 +343,7 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys" visible="0">
+ <objectgroup id="11" name="Keys" visible="0">
   <object id="29" name="lakecave2_key_check1" type="key" x="832" y="64" width="32" height="32">
    <properties>
     <property name="phrase" value="lakecave2_key_check1"/>
@@ -361,7 +361,7 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Replace" visible="0">
+ <objectgroup id="12" name="Replace" visible="0">
   <object id="23" name="board" type="replace" x="768" y="32" width="128" height="128">
    <properties>
     <property name="Above" value="Above2"/>
diff --git a/AndorsTrail/res/xml/loneford6.tmx b/AndorsTrail/res/xml/loneford6.tmx
index 64dc0dde5..9d4765f51 100644
--- a/AndorsTrail/res/xml/loneford6.tmx
+++ b/AndorsTrail/res/xml/loneford6.tmx
@@ -1,44 +1,4 @@
 <?xml version="1.0" ?><!DOCTYPE map  SYSTEM 'http://mapeditor.org/dtd/1.0/map.dtd'><map height="10" orientation="orthogonal" tileheight="32" tilewidth="32" version="1.0" width="13">
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
  <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">
@@ -193,6 +153,11 @@
     <property name="quantity" value="2"/>
    </properties>
   </object>
+  <object name="burhczyd3" type="spawn" x="192" y="224" width="96" height="32">
+   <properties>
+    <property name="ignoreAreas" value="true"/>
+   </properties>
+  </object>
  </objectgroup>
  <objectgroup name="Keys"/>
 </map>
\ No newline at end of file
diff --git a/AndorsTrail/res/xml/mountainlake5.tmx b/AndorsTrail/res/xml/mountainlake5.tmx
index a8a65b231..df597cc6e 100644
--- a/AndorsTrail/res/xml/mountainlake5.tmx
+++ b/AndorsTrail/res/xml/mountainlake5.tmx
@@ -1,245 +1,265 @@
-<?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="29">
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" tiledversion="1.1.5" orientation="orthogonal" renderorder="right-down" width="29" height="20" tilewidth="32" tileheight="32" infinite="0" nextobjectid="22">
  <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="29">
-  <data compression="zlib" encoding="base64">eJy91UEOgjAQBdDSXQ+mp+QKbeIJCrtuixsPwEGE0InjOFOGSlj8GHXoM7V8kjMmKfL4M94aE0o03hlmuMjs7ZZgZRNmJRPWWLPnxWVmKOFMOs+Znrm2t/LvyMv7qSQ2mvQ6yIAyFvfWba+z3ZIbzWy/9wuMCeVZ1lvN2j5J50NyqTGjwBxnxkYzOd6g4UzYp1A5f9p7SGuC6y824X8928Tn9qjZ4mvv86N9pjWlmdoZquXe8dF2WYtJ19TuRVCYtE9xr1JT+i6532eLZHDdyvU7/Xztw5f7hOtpraHJWPoQm7h/zg54nEndNzjrsEo=</data>
+ <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
+ </tileset>
+ <layer name="Ground" width="29" height="20">
+  <data encoding="base64" compression="zlib">
+   eJy9lMENgzAMRUMOTMEKZIWUQ3uHrsCqbMEIHaJE2Kpr2fBpEYcnBJi82MCf6xBmgOlP2hhCIhDfGc50kbOJK+xqDSfXek5eo7Dny0vNjbCcut5yyvfBNNHfR7+cD0Smet4H6syGM4leCh1579V6HONKTz3yPlBnH7/nxY5B8KT1itOb0+g4t7zaMQq4znLKOR1xzrXt0FhOnlPa+P7Qfwh1sre92MkzPtspv1uvVyRPjviQ547mGep8VD6/5CiylrcvJDeRftFZpJ1/RWe6zlXt9O5xbzIvPYeVrV6+y+slD1/1ByunUQdCR3konTJ/zoZ9llN732BHbfY=
+  </data>
  </layer>
- <layer height="20" name="Objects" width="29">
-  <data compression="zlib" encoding="base64">eJylVcFOwzAMjXbjGA5FkfhG+AP4EMRX7BN6GAcQEpWout6rdr1X4wTxGtNXz+4q7UlWmjTx83MSx7nL2GXOvUVrvXNdcK6PVqf2049zajFO+PBj/xBWkBicjC75wZb55Di1L5tx3bef+21IR7Ium/9jTlzTpe88jOP/PGmceSSKMHH10fbRaqFJ00l4jT4bETf61XSVfvJHXMdoP5nufwf9Cvxsw+SH48D+o6GVOegs0PxLnBh/Hs7jaLOpfY6c94K3UjiofxB7KjmXsE9zj9lkdRrD3PL5oP0flD0dYB3jQcnbPu0P4uv2POZe+P818su8d5HrJtrTZjoHbMhHXAzJiXPfw1y7jHcwONC/BsxTAfWhTbnuDJ2ab9nne3fyJ86E3B95j/gcWTVCQwN3nGDdc9Z1mgN1EnNYr+Tne075Zv6lO6fV5ybdV4sfuZGj9XN+Oaf0en3uYZ8RzG9hrcZK6GPdxJ8rbwSvZ5+oieYvaeR6pb1LS++Pxoma+sRHZ5rMel8I2r+tkmOs4ZXxrqyFpker4YWIQ1tnobwyxmvwB1xx/Hw=</data>
+ <layer name="Objects" width="29" height="20">
+  <data encoding="base64" compression="zlib">
+   eJyllbFuwjAQhg1zkCx1rPpInTvQrVLHZI9omYvo3KXvwyOwFnWIBEqzIyD1lbv653ImSPzSybHj3Oe7nG3n+jX2zj0G22XO7UPbBmu4/c6Ocxo1Tlplx/7BR1/3vuv/HFO0Zz/YCk+PU3s7tHll6E/YXtQ7Ya4z4PLzksf/OTwuHK3KR9Y0WB6sUDFZcZLugs9t5kxVPHet3m+y6I9Y82Dv3vY/hn4NfhY++pF1YL8Z2GsSBtUCze9j4vqXvruOiY9tG5ifBlczqP+q/qlmnlPOc+c+WsFjT8NT5l8dBJsZ/3QG34l+jPXn/H9Qz6PumqfK/83Izq9wPwLrLdhhEOtADHnEEmkmzv3yp7Hr9c4SDPRvCfNUgd8d18E+UUeWb92XfUfS+1z/H72PpI5SZ4SlEvY4KbXPJS4SnpOYw+JCvuxzyfe5mkAecre8X1N8ZEuMcg+UPXmxzuc28Y3wU6IYka/1wPurVvFJ3MRf+u4dQcK8YU5pvs6x5IFyI+eVdS/h/aPry2JiTFPmUU2Tpe4XkvVuYeQHz/A6ca9cKise6wyv1Dqs71LaXLnGa/QLVMC2Gw==
+  </data>
  </layer>
- <layer height="20" name="Above" width="29">
-  <data compression="zlib" encoding="base64">eJxjYKAM3JJkYLgpSbw4NcBmGpmLDPZQ2Q5eIQYGPiHscrOZqGvXUAeXxSD0ahLC5aYgeXbAwCUxTHFS7EcGuPRdQjJ7DZKaw2KYarEBQmkS3d41eNxPrJ3UBOh2khu+pIBLWPyJbi+onLpFhzIF2T4YoIe9uMpnWgBCZRnI3s2SiDAnJuzJKe+JrX88GRkYwtFwGCN+PZSW13PR9CObB5K7hKOeGAW0BwBuSylS</data>
+ <layer name="Above" width="29" height="20">
+  <data encoding="base64" compression="zlib">
+   eJxjYKAMvBNgYHgrQLy4NBOFFgLBcSzm4gLk2neBBDuIAYq8DAxKvNjlqBEmwwmkQ8Nem4RwectDmh3haPGbJoBqN6n2IwNc+tKQzNZBUoPuFlyAUJpEt1cHj/uJtZOaAN1OcsOXFJCGxZ/o9oLKqXd0DA/kcpHW9oL8iqt8HggAsve4ACLMiQl75PLekxGYjtAwtvITV/2DDrCZF8aIXw+l5bUsmn5k80ByaTjqCVqC9EFQHgwGOwEPKCJE
+  </data>
  </layer>
- <layer height="20" name="Walkable" width="29">
-  <data compression="zlib" encoding="base64">eJzbKMbAsJEIDAPEqKUWRgYDYSe6/cjuoLW78LmDVL3UcAcx6qgVLqTYSc14INVOavmVVH/S2k5s9tHTTnqFLbXtJMYMdHlK7CdWHzY5fIBSP5IT5sQCStIDOemDmvaN4sGPAZyUbvg=</data>
+ <layer name="Walkable" width="29" height="20" visible="0">
+  <data encoding="base64" compression="zlib">
+   eJxzFWBgcCUCwwAxaqmlHxmQaye57kQH6Oahi1PqVlLcQchOaroHlxnY7KRGOiHVTmqHOSl2Usuv+OIeF5/aduJLO7TyJ6FwpZaduMyhtp3E6EdXQ4n9xOrDJocPkBNPpLiFEkBJeiAnTVLTvlE8+DEAt+iUbA==
+  </data>
+ </layer>
+ <layer name="Walkable_replace" width="29" height="20">
+  <data encoding="base64" compression="zlib">
+   eJztwQEBAAAAgiD/r25IQAEAfBsJEAAB
+  </data>
  </layer>
  <objectgroup name="Mapevents">
-  <object height="160" name="west" type="mapchange" width="32" x="0" y="288">
+  <object id="1" name="west" type="mapchange" x="0" y="288" width="32" height="160">
    <properties>
     <property name="map" value="mountainlake4"/>
     <property name="place" value="east"/>
    </properties>
   </object>
-  <object height="32" name="north" type="mapchange" width="64" x="320" y="0">
+  <object id="19" name="north2" type="mapchange" x="832" y="0" width="64" height="32">
+   <properties>
+    <property name="map" value="mountainlake6"/>
+    <property name="place" value="south2"/>
+   </properties>
+  </object>
+  <object id="2" name="north" type="mapchange" x="320" y="0" width="64" height="32">
    <properties>
     <property name="map" value="mountainlake6"/>
     <property name="place" value="south"/>
    </properties>
   </object>
+  <object id="18" name="east2" type="mapchange" x="896" y="224" width="32" height="64">
+   <properties>
+    <property name="map" value="arulirmountain1"/>
+    <property name="place" value="west2"/>
+   </properties>
+  </object>
+  <object id="3" name="east" type="mapchange" x="896" y="416" width="32" height="32">
+   <properties>
+    <property name="map" value="arulirmountain1"/>
+    <property name="place" value="west"/>
+   </properties>
+  </object>
+  <object id="4" name="trapexit" type="mapchange" x="736" y="320" width="32" height="32"/>
  </objectgroup>
- <objectgroup name="Spawn">
-  <object height="64" name="arulir_1" type="spawn" width="32" x="672" y="192">
+ <objectgroup name="Spawn" visible="0">
+  <object id="5" name="arulir_1" type="spawn" x="672" y="192" width="32" height="64">
    <properties>
-    <property name="spawngroup" value="arulir_1"/>
+    <property name="quantity" value="1"/>
    </properties>
   </object>
-  <object height="64" name="arulir_1_1" type="spawn" width="32" x="672" y="256">
+  <object id="6" name="arulir_1" type="spawn" x="672" y="256" width="32" height="64">
    <properties>
-    <property name="spawngroup" value="arulir_1"/>
+    <property name="quantity" value="1"/>
    </properties>
   </object>
-  <object height="32" name="arulir_1_2" type="spawn" width="64" x="448" y="448">
+  <object id="7" name="arulir_1" type="spawn" x="448" y="448" width="64" height="32">
    <properties>
-    <property name="spawngroup" value="arulir_1"/>
+    <property name="quantity" value="1"/>
    </properties>
   </object>
-  <object height="32" name="arulir_1_3" type="spawn" width="64" x="512" y="448">
+  <object id="8" name="arulir_1" type="spawn" x="512" y="448" width="64" height="32">
    <properties>
-    <property name="spawngroup" value="arulir_1"/>
+    <property name="quantity" value="1"/>
    </properties>
   </object>
-  <object height="160" name="arulir_1_4" type="spawn" width="128" x="608" y="352">
+  <object id="9" name="arulir_1" type="spawn" x="608" y="352" width="128" height="160">
    <properties>
-    <property name="spawngroup" value="arulir_1"/>
+    <property name="quantity" value="1"/>
    </properties>
   </object>
-  <object height="32" name="maonit_3" type="spawn" width="64" x="576" y="96">
+  <object id="10" name="maonit_3" type="spawn" x="576" y="96" width="64" height="32">
    <properties>
-    <property name="spawngroup" value="maonit_3"/>
+    <property name="quantity" value="1"/>
    </properties>
   </object>
-  <object height="32" name="arulir_1_5" type="spawn" width="32" x="512" y="96">
+  <object id="11" name="arulir_1" type="spawn" x="512" y="96" width="32" height="32">
    <properties>
-    <property name="spawngroup" value="arulir_1"/>
+    <property name="quantity" value="1"/>
    </properties>
   </object>
-  <object height="160" name="maonit_3_1" type="spawn" width="160" x="32" y="96">
+  <object id="12" name="maonit_3" type="spawn" x="32" y="96" width="160" height="160">
    <properties>
-    <property name="spawngroup" value="maonit_3"/>
+    <property name="quantity" value="1"/>
    </properties>
   </object>
-  <object height="384" name="maonit_2" type="spawn" width="384" x="64" y="128">
+  <object id="13" name="maonit_2" type="spawn" x="64" y="128" width="384" height="384">
    <properties>
     <property name="quantity" value="2"/>
-    <property name="spawngroup" value="maonit_2"/>
    </properties>
   </object>
-  <object height="32" name="maonit_2_1" type="spawn" width="64" x="416" y="64">
+  <object id="14" name="maonit_2" type="spawn" x="416" y="64" width="64" height="32">
    <properties>
-    <property name="spawngroup" value="maonit_2"/>
+    <property name="quantity" value="1"/>
+   </properties>
+  </object>
+  <object id="15" name="arulir_1" type="spawn" x="800" y="416" width="64" height="32"/>
+  <object id="20" name="arulir_1b" type="spawn" x="832" y="160" width="32" height="32">
+   <properties>
+    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="arulir_1"/>
+   </properties>
+  </object>
+  <object id="21" name="arulir_1c" type="spawn" x="832" y="32" width="32" height="32">
+   <properties>
+    <property name="quantity" value="1"/>
+    <property name="spawngroup" value="arulir_1"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys"/>
-</map>
\ No newline at end of file
+ <objectgroup name="Keys">
+  <object id="16" name="arulirmountain_needskin" type="key" x="768" y="416" width="32" height="32">
+   <properties>
+    <property name="phrase" value="arulirmountain_entrance"/>
+    <property name="requireId" value="arulir_skin"/>
+    <property name="requireType" value="inventoryKeep"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Replace">
+  <object id="17" name="arulircave_trap:10" type="replace" x="704" y="352" width="64" height="32">
+   <properties>
+    <property name="Walkable" value="Walkable_replace"/>
+   </properties>
+  </object>
+ </objectgroup>
+</map>
diff --git a/AndorsTrail/res/xml/mountainlake6.tmx b/AndorsTrail/res/xml/mountainlake6.tmx
index 74b413a20..98312028c 100644
--- a/AndorsTrail/res/xml/mountainlake6.tmx
+++ b/AndorsTrail/res/xml/mountainlake6.tmx
@@ -1,187 +1,222 @@
-<?xml version="1.0" ?><!DOCTYPE map  SYSTEM 'http://mapeditor.org/dtd/1.0/map.dtd'><map height="29" orientation="orthogonal" tileheight="32" tilewidth="32" version="1.0" width="19">
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" tiledversion="1.1.5" orientation="orthogonal" renderorder="right-down" width="21" height="29" tilewidth="32" tileheight="32" infinite="0" nextobjectid="11">
  <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="29" name="Ground" width="19">
-  <data compression="zlib" encoding="base64">eJzl1D0OgCAMBtCmm/dfvYImngBHVjyDBzFEiZUIFFqNicO3vkD/bAdgC5kSGRBgJCk5f7dMpZVyfBxe39bq3P1T4nAsrlOyapy4/lLL198oWbSf0nrRun3RksxEj2ck80V3sLSP3Nl80+LM+XwkZ3HncjmSu1/c/q+4x2F6HyX7o2HRfjxhtTqht1pWfHMkVvinprUBk0mbbA==</data>
+ <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="385" name="map_bridge_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_bridge_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="513" name="map_broken_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="641" name="map_cavewall_1" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="749" name="map_cavewall_2" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="857" name="map_cavewall_3" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="965" name="map_cavewall_4" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+  <image source="../drawable/map_cavewall_4.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="1073" name="map_chair_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1201" name="map_chair_table_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_chair_table_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1329" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1457" name="map_cupboard_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1585" name="map_curtain_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1713" name="map_entrance_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1841" name="map_entrance_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_entrance_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1969" name="map_fence_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2097" name="map_fence_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2225" name="map_fence_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_fence_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2353" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_fence_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2481" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2609" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2737" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2865" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2993" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3121" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3249" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3377" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3505" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_house_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3633" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_house_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3761" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3889" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_indoor_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4017" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4145" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4273" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4401" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_pillar_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4529" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4657" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_plant_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4785" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4913" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_rock_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5041" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5169" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5297" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_roof_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5425" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5553" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5681" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5809" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5937" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6065" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6193" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6321" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6449" name="map_transition_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_5.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6577" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6705" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_tree_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6833" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6961" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="7081" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="7201" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+  <image source="../drawable/map_wall_4.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="7321" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
+ </tileset>
+ <layer name="Ground" width="21" height="29">
+  <data encoding="base64" compression="zlib">
+   eJzt1D0OgCAMBWDC5v1Xr4CJJ8CRFc/gQUwjREJaflpIHBze+gXoK25RylWyEzFaqQ1JzftNPJZpUh7Ea/ysXK90f4nXY7Z6rWaPR81JasKccldqYvOXvif2rl82R3Rp1W9SzzBNbMclJvUXxdgJpmf0E85xhFBu72zgHGdIy//Z2ptLP8H2kmuW9nKEmc8t79IIM+0S14tdwLokMam/TmLm959h3pguw7E=
+  </data>
  </layer>
- <layer height="29" name="Objects" width="19">
-  <data compression="zlib" encoding="base64">eJyllkEKwkAMRQeXgsK4KPSSHsGLeBwXFXQntNouBW3twp3gzgk2NH4nM7YGhlIxz5+fZNCYcGSJMdukf58tjJm7U6aRxAircfm3tH+OZdX2W9s/uvKOV7jnzuo5vrg4Rgt+jQnmlO48k7dHrfAo/1EXcjgq4J0nwzjkTWM/e9j+0EPkHKGOwvb6YjORSX9EntQhOfhbyJI943oqeEqNIdaNNHn89vEoNP8fjlEJbRoH/dJ4XGcDefjOQbVulD5kHl28f8zh/aEdvbuzHqBL6iENWq7G2qffvHIAB2ukGHtnyXuB5/CQvjVSnP7YZ57H68C7KgNODfmy78uIZ+wT15F79pH4NJcrd6YBHnpOgX3kyLu5is37xX7urbaH/B3kafe6toeNmHvsLfrum1PUpYX0qob6cK9D9wWysL6dDXNpr6RnyIrdf/g5/7d4AUNt6us=</data>
+ <layer name="Objects" width="21" height="29">
+  <data encoding="base64" compression="zlib">
+   eJydlr1KxEAQx5d0Cgp7B4Gt9F2sraytfCct7PUBfASLCGcn5DTpTjiTS2En2LlDMmTu7+wHN7Ake5f55b/zdWdM3KrSmJdy3p8sjDn1q3EJx0xm7zk7N1/J1vZwZid8Wau0DexzddZ21rY6QB/Z1rMGiGfM6sR7mNf49VuOMRxEXlL+KR5bC9zPYr5/itQB8ih2vd3P+aD4PweYyHuH83HdtKKWUlbJ+Al/qUvy8J1aPWHP8DlbuErNOTp3pFHJi8Ylk3nS7MezWqE1xMN4Mvd2aczdMnz+Hvxxz0Yx4Jw/eN5jhCl1cn8zj/uSZsC3X/de55n//nwx3ufolPpIk+YXM2a+uv/cZuJdADNVA1o94cy8KvL7Xc4hruc3N2om+4hwjpR4aHODz/SVockV4/OyXivgdcCRM+IyM0ccRz5frfR7N+m49us4g4u5IcO8s9VTXWJfbqA+mbm1+7UR6nN+JtTvod+dUJ/3oo8oVjeB3pH50eoddaKxbq4pGcsOzo3zIzafZCy0/LDfysb51K9aTJGZmsP4Of53+gMnm/v4
+  </data>
  </layer>
- <layer height="29" name="Above" width="19">
-  <data compression="zlib" encoding="base64">eJxjYCAe3JRkYLglCaFHAX4ACytqAmqYhxx3g8F96OFEbtpC9xct0ii5/qOGeaT4ZzMd8yeucCfHDXuGQLkymN1IjXinVrk12MoZGMCWj0g1bw+d6kBYfkKmCQFquYta5Smh8g+fPADR9Syr</data>
+ <layer name="Above" width="21" height="29">
+  <data encoding="base64" compression="zlib">
+   eJxjYCAe3JRkYLglCaFHAWUAFpa0ANQ0FzmuB6N70cOR0rSJ7l9apnVK/U1Nc0nx5+YBzP+44ocSN+0ZguXZUHIzNdMLKeXmRqC6TQTUklq+HQSqOUSif6hRbmLLn+Sau4fOdTgsnyLTxAJqu5OS8h1bOiZUDhMy/zBQHgCpsDGd
+  </data>
  </layer>
- <layer height="29" name="Walkable" width="19">
-  <data compression="zlib" encoding="base64">eJy9kssJwDAMQzNF918hG/ZqQoq+1JCb/JAU72etDd4cpGVZKef0lTJv02Q5vHPPZX35UFkoD8tDM3WNXIwvpltGo9yl2ldDp3DYnC3vyk3/yWIzOCyHi6bBUb3NnVvGxFfyJ0w/bH+OLrkpxzvTSZpPYSWMF71mNwA=</data>
+ <layer name="Walkable" width="21" height="29">
+  <data encoding="base64" compression="zlib">
+   eJytk8ENwDAIAzNF918hG/YbVRD7TJEq9WEudgj7WWuL7yxHp3hEmzBVz4TZ9U2ZVW96R1Nm5ytlJjlvTFWnzmG6eYnPW16loT7/us/0nXVasgdkb6Ya6jOZq8ugM1UznDK//4SpijIdlvLczabSVGyyP04Od6ZdZnUu1ZN3Qfw7WRTTYXdnJbkTJmVV/S9yQyUf
+  </data>
  </layer>
  <objectgroup name="Mapevents">
-  <object height="32" name="south" type="mapchange" width="64" x="64" y="896">
+  <object id="8" name="south2" type="mapchange" x="576" y="896" width="64" height="32">
+   <properties>
+    <property name="map" value="mountainlake5"/>
+    <property name="place" value="north2"/>
+   </properties>
+  </object>
+  <object id="1" name="south" type="mapchange" x="64" y="896" width="64" height="32">
    <properties>
     <property name="map" value="mountainlake5"/>
     <property name="place" value="north"/>
    </properties>
   </object>
-  <object height="32" name="north" type="mapchange" width="96" x="288" y="0">
+  <object id="2" name="north" type="mapchange" x="288" y="0" width="96" height="32">
    <properties>
     <property name="map" value="mountainlake7"/>
     <property name="place" value="south"/>
@@ -189,34 +224,49 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn">
-  <object height="256" name="maonit_2" type="spawn" width="224" x="64" y="608">
+  <object id="3" name="maonit_2" type="spawn" x="64" y="608" width="224" height="256">
    <properties>
     <property name="spawngroup" value="maonit_2"/>
    </properties>
   </object>
-  <object height="64" name="maonit_2_1" type="spawn" width="32" x="160" y="480">
+  <object id="4" name="maonit_2_1" type="spawn" x="160" y="480" width="32" height="64">
    <properties>
     <property name="spawngroup" value="maonit_2"/>
    </properties>
   </object>
-  <object height="32" name="maonit_2_2" type="spawn" width="32" x="160" y="416">
+  <object id="5" name="maonit_2_2" type="spawn" x="160" y="416" width="32" height="32">
    <properties>
     <property name="spawngroup" value="maonit_2"/>
    </properties>
   </object>
-  <object height="256" name="mbrute_1" type="spawn" width="256" x="288" y="576">
+  <object id="6" name="mbrute_1" type="spawn" x="288" y="576" width="352" height="256">
    <properties>
+    <property name="quantity" value="2"/>
     <property name="spawngroup" value="mbrute_1"/>
    </properties>
   </object>
+  <object id="10" name="maonit_2_" type="spawn" x="480" y="480" width="160" height="160">
+   <properties>
+    <property name="spawngroup" value="maonit_2"/>
+   </properties>
+  </object>
  </objectgroup>
  <objectgroup name="Spawn2" visible="0">
-  <object height="800" name="mbrute_2" type="spawn" width="512" x="32" y="64">
+  <object id="7" name="mbrute_2" type="spawn" x="32" y="64" width="512" height="800">
    <properties>
     <property name="quantity" value="3"/>
     <property name="spawngroup" value="mbrute_2"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys"/>
-</map>
\ No newline at end of file
+ <objectgroup name="Keys" visible="0">
+  <object id="9" name="andor:1c" type="key" x="416" y="576" width="128" height="128">
+   <properties>
+    <property name="phrase" value="do_nothing_but_leave"/>
+    <property name="requireId" value="andor"/>
+    <property name="requireType" value="questProgress"/>
+    <property name="requireValue" value="1"/>
+   </properties>
+  </object>
+ </objectgroup>
+</map>
diff --git a/AndorsTrail/res/xml/remgard_tavern0.tmx b/AndorsTrail/res/xml/remgard_tavern0.tmx
index 69bf4d0a6..f94860b8e 100644
--- a/AndorsTrail/res/xml/remgard_tavern0.tmx
+++ b/AndorsTrail/res/xml/remgard_tavern0.tmx
@@ -1,44 +1,4 @@
 <?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="25">
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
  <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">
@@ -223,6 +183,12 @@
     <property name="spawngroup" value="remgard_drunk"/>
    </properties>
   </object>
+  <object name="burhczyd7" type="spawn" x="384" y="256" width="32" height="32">
+   <properties>
+    <property name="active" value="false"/>
+    <property name="ignoreAreas" value="true"/>
+   </properties>
+  </object>
  </objectgroup>
  <objectgroup name="Keys"/>
 </map>
\ No newline at end of file
diff --git a/AndorsTrail/res/xml/roadtocarntower2.tmx b/AndorsTrail/res/xml/roadtocarntower2.tmx
index f6a8d0b7c..bc531329b 100644
--- a/AndorsTrail/res/xml/roadtocarntower2.tmx
+++ b/AndorsTrail/res/xml/roadtocarntower2.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="30" height="26" tilewidth="32" tileheight="32" infinite="0" nextobjectid="12">
+<map version="1.0" tiledversion="1.1.5" orientation="orthogonal" renderorder="right-down" width="30" height="26" tilewidth="32" tileheight="32" infinite="0" nextobjectid="16">
  <properties>
   <property name="outdoors" value="1"/>
  </properties>
@@ -183,27 +183,40 @@
  <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
+ <tileset firstgid="7577" name="map_guynmart" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_guynmart.png" width="512" height="256"/>
+ </tileset>
  <layer name="Ground" width="30" height="26">
   <data encoding="base64" compression="zlib">
-   eJzdlt0NgCAMhNE3R3Afx2QGErZwCkZgBjWGpGkK2gL15+FC5IEvdz3UMBsTdwWw+unUypRnCLOiEjf5xPs9mZRfLS7OVsqWcCm/vbm5+XK40oyx3/SsnXFU4OYyfsKvRpffcoe4nZJya2f7B+4y8PVlvxwudT8C+pe46nILLmaW3oe1GVOMHJPyy+FBLpVp6TsnZd2Zb8vetuxxT6Yd9bgH65ADasGFZ1okVxD2vgH5LVc+
+   eJzdlt0NgCAMhNE3R3Afx3QGE53CKRiBGdQYEnIpmJZafx4uRB74ctdD9b1zYZdP1rk7tTI1M4SsYMSNPnH/Tibl14qL2UrZEi7l925ubr4crjRj9BufrTMOBtxcxk/4tejyW+4Qt1NSbu1s/8AdGr6+7JfDpe6Hh3+Jqy5rcJFZeh/WZkwxckzKL4eXcqlMS985KStqKcxXs7eaPdb0ihpbfW6JdWhKpMHFM8eWZqHQ+wbQLVc7
   </data>
  </layer>
  <layer name="Objects" width="30" height="26">
   <data encoding="base64" compression="zlib">
-   eJylVkFOwzAQDDduJD1EykP4CT/gNzwIcek1TSK1HLiBuIBUtZReOKByI6t4lMlm49rpSFZs1/XM7K6dJImNVZ4kVT7x45n1VdY9G/dcZf26UvqLfnwskuS76Prb9v+HCF69/mZBHMQ/qTnruEX7a9v+AnnN9Yvxusp5Zf/HYrjPV9v2EbziFfutM+JRGhADxPa9fW5c/7fd4y0izpzbmrxAR+mJM/IrT9EZWlc6tzqXPLb8P7dzy6LXFsrLudW+ao8GgPMby6vrmDkwx7UEPcyJfMfyVkZeNaTeRAfqjmtKEHN+B/qct8ZTxzwvfkXjhmoq9PyCV2K3NmJ57s6Y9BC5doqnIR1WfufylkZsJYaVEQNZg/MqwPm9xC+QUq7v075BHzRw3i/hnaplhvh8zMdtDqx9fE0gXqHz9rr3cHfl5wo5b3xnVROxiM0vn7clvb9DAC4ez7kjfdC1i7mHtOtL3HYz7gzNwb7ZE9fuznEdHN8pkDPmLuX6QXxPed9Cv2sE4vXJ8WIv+OSxvpPqbPguiMGW4sNay2zMVSuflpZQwCs4rb34/tCcMXUPsFefjxe191y/qHXBj/pG/TS+WT+MOeb+B8ByAII=
+   eJylVkFOwzAQNLdyIglSmjyBB/ATfsBvOPMWbr2mSaWWAzcQF5BQofTCAdobXtkrT7Z2aqcjWXZc1zOzu3ailB/zUqm2DPx4ZH2bm35h+3nu1jU0LtzztlbquzbjD/3/TQKvXH9RAAfwBzXnhpu0P+u2j+T1ri8O17XWK/rf1v19vnT7TOAlr7zfMgceoYFjwLF91f3Kjn/1Hi8JccbcduCFdTQDceb8Uk86Y+tK5lbmEp99/h/13Kx22mJ5MbfSVzeggYH5TeWVdYwcPIe1xHqQk/Odytt68ipB9UY6uO6wpggp57enz3pbDNQxzpNf0riCmoo9v8xLsVt6Ynnszgh6SFwb4lmADl9+x/I2nthSDFtPDGgNn1cCn99T/DIyyPVt5hrrYw2Y91N4Q7WMIJ8P5WEbA98+Q41AXlnn9cR5uDkb5oo5b3hntYFYpOYXz9sM3t8xYC58HnNHDkHWLs/dZWZMcVuPuDMkB/pGT1i7a8u1sXy7SM5pZd7TMWuxfji+u9K12O8awn5q+vPK7cU+8VneSV3efxekgLxOdPvT3FdV35fk6oRPn5ZYkNf7S+MV90Tg/SE5U+qeIb2GfDyJvcf65Von/Ihv1HfPN+ubZw65/wGHnfn7
   </data>
  </layer>
  <layer name="Above" width="30" height="26">
   <data encoding="base64" compression="zlib">
-   eJxjYMAEbyWxCNIB3KWjvch20du/+wYofO9I0i+M7wyQH2EA2Z/09DeynSBAr7SFnqbo6V+Y3W8kB67soAcYaWlqMABTDgYGcw7a6xkMAJamQG6PZISIBQLpYCAOYcTODmJE+BemH53GZg+6HC3SM7r56GIwQGp6RvYfvQCpdlHLbW+wlOvIZmMLT3q2LwilNVLAJSFUM4m1kxphjcsfs5kg9Fwm/OpIASAz5zAhzES3Cx1gs5tU+ygByO4EAF2EUII=
+   eJxjYMAEbyWxCNIB3KWjvch20du/+wYofO9I0i+M7wyQH2EA2Z/09DeynSBAr7SFnqbo6V+Y3W8kB67soAcYaWlqMABTDgYGcw7a6xkMAJamQG6PZISIBQLpYCAOYcTODmJE+BemH53GZg+6HDL/BCduTApANx9dDAbeEmEvst3I/qMGIMZeUu0iRj0hOyUkGBgkJVD1oPsbW3gSal9QK35BgFBaI8ZeGLgkhGomsXYSCmti/IrLH7OZIPRcJur4F2bmHCaEmeh2oQNsdpMCcJlLLEB2JwBLJHv0
+  </data>
+ </layer>
+ <layer name="Top" width="30" height="26">
+  <data encoding="base64" compression="zlib">
+   eJztzjEBAAAIA6DVsH89Q3gaQQ9IQAIAwCdd1wNYA6kFAQY=
+  </data>
+ </layer>
+ <layer name="Above_1" width="30" height="26" visible="0">
+  <data encoding="base64" compression="zlib">
+   eJzt0bEJACEQRNHBzCKs3CvICq4e2WBwb7l0jOaBiCafVcDMzMwMeMdZq3/P6m7t5bMKG9zznbKb56zzKkWjznzjf9nlCuomG7ffOPy9c5gNeJq+r7AB228wNA==
   </data>
  </layer>
  <layer name="Walkable" width="30" height="26" visible="0">
   <data encoding="base64" compression="zlib">
-   eJzNk8sNACEIRK1i+2/BDj1tsjHg8BtcEg+ayGMGmM8Ys+hYo4q3cy01SH8qtGrs9137m+Giu5Q/yvYG6hODa/GLoXXPHdGJ5vg0X9l5jmhk6kVavzsVYSOOxvZ4Uj1XEZ62Ax3Mk19SXlQLc67/FDf0ZpieerQdZLLRLnTpveFxtXed7D0ny1vE6uhhtg8M3zX2Aqu1eqE=
+   eJzNlMENxTAIQzNF918hG/YUqYowBgfaRsrhV4VnU/PnNcYsutFTxdu5EQ1WTYVXxF7PUe0Jl/22+qvs7GHfqYMbmVeH17234pPl2MvXaZ4Vj51+mdfnTilsxkHszEyqc6Xw0A68wfTmZfVlWjpz/afzhd9MnxM97D8jqzO6494uIJ0KN6u3wqtSx7iqfuX9vQ71VOfj+UVZUTkRbkWGOy6b0bo3KhlS/A==
   </data>
  </layer>
- <objectgroup name="Mapevents">
+ <objectgroup name="Mapevents" visible="0">
   <object id="1" name="north1" type="mapchange" x="928" y="32" width="32" height="128">
    <properties>
     <property name="map" value="roadtocarntower1"/>
@@ -234,8 +247,10 @@
     <property name="place" value="south"/>
    </properties>
   </object>
+  <object id="12" name="watermark_script" type="script" x="480" y="672" width="32" height="32"/>
+  <object id="13" name="watermark_script2" type="script" x="544" y="704" width="64" height="32" visible="0"/>
  </objectgroup>
- <objectgroup name="Spawn uniques">
+ <objectgroup name="Spawn uniques" visible="0">
   <object id="6" name="fieldwasp_unique" type="spawn" x="544" y="64" width="352" height="384">
    <properties>
     <property name="spawngroup" value="fieldwasp_unique"/>
@@ -261,8 +276,13 @@
     <property name="spawngroup" value="rivertroll"/>
    </properties>
   </object>
+  <object id="14" name="river_mermaid" type="spawn" x="256" y="544" width="224" height="256">
+   <properties>
+    <property name="spawngroup" value="river_mermaid"/>
+   </properties>
+  </object>
  </objectgroup>
- <objectgroup name="Spawn monsters">
+ <objectgroup name="Spawn monsters" visible="0">
   <object id="11" name="fieldwasp_2" type="spawn" x="544" y="64" width="352" height="384">
    <properties>
     <property name="quantity" value="3"/>
@@ -271,4 +291,14 @@
   </object>
  </objectgroup>
  <objectgroup name="Keys" visible="0"/>
+ <objectgroup name="Replace" visible="0">
+  <object id="15" name="replace_mermaid_visible" type="replace" x="224" y="544" width="256" height="256">
+   <properties>
+    <property name="Above" value="Above_1"/>
+    <property name="requireId" value="mermaid_scale"/>
+    <property name="requireType" value="questProgress"/>
+    <property name="requireValue" value="210"/>
+   </properties>
+  </object>
+ </objectgroup>
 </map>
diff --git a/AndorsTrail/res/xml/stoutford_castle_shed.tmx b/AndorsTrail/res/xml/stoutford_castle_shed.tmx
new file mode 100644
index 000000000..9f55989e7
--- /dev/null
+++ b/AndorsTrail/res/xml/stoutford_castle_shed.tmx
@@ -0,0 +1,219 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" tiledversion="1.1.5" orientation="orthogonal" renderorder="right-down" width="9" height="8" tilewidth="32" tileheight="32" infinite="0" nextobjectid="11">
+ <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="9" height="8">
+  <data encoding="base64" compression="zlib">
+   eJz7zcnA8JsIHCyNG8PUJEnjxjA1X6H4HBKGiRGrBmTnV05UzM2FYAdD7URXg4xB8k85MfFXND4ANi476w==
+  </data>
+ </layer>
+ <layer name="Objects" width="9" height="8">
+  <data encoding="base64" compression="zlib">
+   eJxjYCAOiDExMExjY2BI4mdgkASyg4E0F5AWZUKoMQaKLQOqEQeKJUPFpYD0B1aEGmegmj38qGaDzGNgQ/BzRIHqmBgwwH8hBLtGFEIHI6kzZ2FgaGRB8HugahYi2Q9TRywAAERiCoA=
+  </data>
+ </layer>
+ <layer name="Above" width="9" height="8">
+  <data encoding="base64" compression="zlib">
+   eJxjYCAOHBZjYDDiJ6wGG3DiJ6yGGHNIVXOJCDWEAAChqwW4
+  </data>
+ </layer>
+ <layer name="Walkable" width="9" height="8" visible="0">
+  <data encoding="base64" compression="zlib">
+   eJzbKMbAsJHOGBugpRpsavG5DZkPADt9J6Y=
+  </data>
+ </layer>
+ <objectgroup name="Mapevents">
+  <object id="5" name="exit" type="mapchange" x="160" y="224" width="32" height="32">
+   <properties>
+    <property name="map" value="waytogalmore1"/>
+    <property name="place" value="entrance4"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Spawn" visible="0">
+  <object id="6" name="erwyn_skel_cymbal" type="spawn" x="96" y="96" width="32" height="32"/>
+  <object id="8" name="erwyn_skel_hornet" type="spawn" x="160" y="96" width="32" height="32"/>
+  <object id="9" name="erwyn_skel_lute" type="spawn" x="128" y="128" width="32" height="32"/>
+  <object id="10" name="erwyn_skel_drum" type="spawn" x="128" y="96" width="32" height="32"/>
+ </objectgroup>
+ <objectgroup name="Keys"/>
+ <objectgroup name="Replace"/>
+</map>
diff --git a/AndorsTrail/res/xml/stoutford_tavern.tmx b/AndorsTrail/res/xml/stoutford_tavern.tmx
index 3c9acbc25..be3cbffda 100644
--- a/AndorsTrail/res/xml/stoutford_tavern.tmx
+++ b/AndorsTrail/res/xml/stoutford_tavern.tmx
@@ -240,6 +240,11 @@
     <property name="spawngroup" value="stoutford_innkeeper"/>
    </properties>
   </object>
+  <object name="burhczyd5" type="spawn" x="384" y="320" width="32" height="32">
+   <properties>
+    <property name="ignoreAreas" value="true"/>
+   </properties>
+  </object>
  </objectgroup>
  <objectgroup name="Keys">
   <object id="7" name="rumblings:30" type="key" x="0" y="96" width="64" height="64">
diff --git a/AndorsTrail/res/xml/vilegard_tavern.tmx b/AndorsTrail/res/xml/vilegard_tavern.tmx
index 55cce31fc..175429376 100644
--- a/AndorsTrail/res/xml/vilegard_tavern.tmx
+++ b/AndorsTrail/res/xml/vilegard_tavern.tmx
@@ -1,44 +1,4 @@
 <?xml version="1.0" ?><!DOCTYPE map  SYSTEM 'http://mapeditor.org/dtd/1.0/map.dtd'><map height="10" orientation="orthogonal" tileheight="32" tilewidth="32" version="1.0" width="17">
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
  <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">
@@ -187,6 +147,11 @@
    </properties>
   </object>
   <object height="96" name="tharwyn" type="spawn" width="192" x="224" y="160"/>
+  <object name="burhczyd4" type="spawn" x="384" y="256" width="32" height="32">
+   <properties>
+    <property name="ignoreAreas" value="true"/>
+   </properties>
+  </object>
  </objectgroup>
  <objectgroup name="Keys"/>
 </map>
\ No newline at end of file
diff --git a/AndorsTrail/res/xml/waytogalmore1.tmx b/AndorsTrail/res/xml/waytogalmore1.tmx
index de56bf947..f69dd74b0 100644
--- a/AndorsTrail/res/xml/waytogalmore1.tmx
+++ b/AndorsTrail/res/xml/waytogalmore1.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="30" height="30" tilewidth="32" tileheight="32" infinite="0" nextobjectid="24">
+<map version="1.0" tiledversion="1.1.5" orientation="orthogonal" renderorder="right-down" width="30" height="30" tilewidth="32" tileheight="32" infinite="0" nextobjectid="25">
  <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>
@@ -192,7 +192,7 @@
  </layer>
  <layer name="Above" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJzFljtLA0EQx8eDvGyiUQIpxa9go6WFoFiIiJVYqL0osbbwAQYbiRJF8AMI1j7aVNoZK1+FdoIW2tg6w2W4yTq7t5cI/mE4srd7v53/7uwGoFV3RVD1ktHbpV6VPsfxw5zf+eyAW84l4wbZZNyvNvMd7AufxSCMuvCcfKY2Xy7nXresG2s3H3LvSwAPpZDREGO6svaxLOmPlrtLzNWk5Utty4o/gcc8bdL2iRT5Q7x1hevy9yDBepE4X366uLxG7dQRe2V6L/0uCG5DyTFpHcn5vzWZzz32/md5vd2Wr6s2zPl/OLgknzPtLzSM8xgRc/GpNU2Pvcn6jyNzwvBgIw2wmY5+++yrmuK5rKX3GJ9JVWTuN7mXBYCrggcYft9HceecS9fIvPHkmnJxaymAw5R7vPTZdV7UgtY9rtUka7QfYAhjrF9/T2e+tr42vu3uZ5UxxzWMaeTNYMxauCTf84qYCzm/8JlrHHegeffK9cx0A3znotA0n24dd2vwffOl8SsiJ8nltlVlDjQu7p5xiffRDkYFYyoTRcUxzvSddGpplzrHOrsQtXbE30MfFzGWMCY7yEeTtld4vSR3LojWS/bX9ptt/5mqGM8TjC2Du630pTDXlc4A27s4kc9Vo20v2SfaEvn831z+P21yNQ+1Nr7n+J1275lceVYT96nQWZ3GKc5n31xt+gGDcIGh
+   eJzFljtLA0EQx8eDvGyiUQIpxa9go6WFoFiIiJVYqL0osbbwAQYbiRJF8AMI1mqdytJY+Sq0E7TQxtYZLkMm6+zjEsE/DEf2du+389+d3QC0664Iql4yervUq9Ln1D/M+Z3PLrjlXDJulE3G/eow3+GB+FmM4qgLz8lnagvlcu51y7qx9vMx974E8FCKGQ0xpidrH8uS/mi5u8RcTVq+1Laq+BMFzNMmbZ9IkT/E21S4Ln+PEqwXifPlp4vLa9RJHbFXpvfS74LgNpQck9aRnP9bk/ncZ+9/kdfbbfm6asOc/4eDSwo50/5CoziPMTGXkFrT9NifrP8kMqcMD7bSANvp1u+QfVVTPJe19O7xmVRF5qHgXhcCwPD7PvKdcz7dBHJNubi1FMBxyj1e+uw6L2pR+x7XapI1PggwgjExqL+nM19bXxvfdvezypjjBsYs8uYw5i1cUuh5RcylXFiEzNXHHWrevXI9M70A37lWaFpMt4+7Nfih+dL4NZGT5HLbujIHGue7Z1zifbSHUcGYybSi4hhn+k46t7RLXWKdXYlaO+HvoY/LGCsY013ko0nbK7xekrsQtdZL9tf2m23/maoYzzOMHYO7q/SlMNeVzgDbO5/I56rRdpDsEx2JfP5vLv+fNrmah1ob33P8Trv3TK48q4n7VOiuTn3y+Ryaq00/T6h/+Q==
   </data>
  </layer>
  <layer name="Top" width="30" height="30">
@@ -202,7 +202,7 @@
  </layer>
  <layer name="Walkable" width="30" height="30" visible="0">
   <data encoding="base64" compression="zlib">
-   eJztk2EKwCAIhTvF7n+FbrhfQdgznxq1QYKMNvXzaatPKXXivc3itJyW56mB8iNsL7fF908vVzt7+97BjTIzXGQn9F7u+E7GRrlaLjLmTmh9WiyLPdOj9bHKmLlF9Kzieu4WOltzXMHdqVdqQRymF5aLampzZngM16ojuey/neUyOWg/mfsc9a9xmflldMg4pi76bpm2c5nvnXPEMnva5af6vdx/c19J1tfp
+   eJztk2EKwCAIhTvF7n+FbrhfQdgznxq1QYKMNvXzaatPKXXivc3itJyW56mB8iNsL7fF908vVzt7+97BjTIzXGQn9F7u+E7GRrlaLjLmTmh9WiyLPdOj9bHKmLlF9Kzieu4WOltzXMH16s1wpRbEYXphuaimNmeGx3CtOpLL/ttZLpOD9pO5z1H/GpeZX0aHjGPqou+WaTuX+d45Ryyzp11+qt/L/Tf3BbyW1yI=
   </data>
  </layer>
  <objectgroup name="Mapevents" visible="0">
@@ -232,8 +232,8 @@
   </object>
   <object id="6" name="entrance4" type="mapchange" x="736" y="416" width="32" height="32">
    <properties>
-    <property name="map" value=""/>
-    <property name="place" value="south"/>
+    <property name="map" value="stoutford_castle_shed"/>
+    <property name="place" value="exit"/>
    </properties>
   </object>
   <object id="7" name="entrance1" type="mapchange" x="32" y="320" width="64" height="32">
diff --git a/AndorsTrail/res/xml/wild14.tmx b/AndorsTrail/res/xml/wild14.tmx
index 0e86666b2..4d173c877 100644
--- a/AndorsTrail/res/xml/wild14.tmx
+++ b/AndorsTrail/res/xml/wild14.tmx
@@ -1,193 +1,222 @@
-<?xml version="1.0" ?><map height="16" orientation="orthogonal" tileheight="32" tilewidth="32" version="1.0" width="20">
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" tiledversion="1.1.5" orientation="orthogonal" renderorder="right-down" width="20" height="16" tilewidth="32" tileheight="32" infinite="0" nextobjectid="10">
  <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="16" name="Ground" width="20">
-  <data compression="zlib" encoding="base64">eJzbyMnAsBGI30kyMNyTJExvxKMeJo6uBpcemDg6RpZHNpsSTA0zkDG13IUrrAjZR8h+fGZhsxdXfJLjV2LjnVQz0d2DzZ3UiANsZtM6fkfxwGAAS4/6Lg==</data>
+ <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="385" name="map_bridge_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_bridge_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="513" name="map_broken_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="641" name="map_cavewall_1" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="749" name="map_cavewall_2" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="857" name="map_cavewall_3" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="965" name="map_cavewall_4" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+  <image source="../drawable/map_cavewall_4.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="1073" name="map_chair_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1201" name="map_chair_table_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_chair_table_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1329" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1457" name="map_cupboard_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1585" name="map_curtain_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1713" name="map_entrance_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1841" name="map_entrance_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_entrance_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1969" name="map_fence_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2097" name="map_fence_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2225" name="map_fence_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_fence_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2353" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_fence_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2481" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2609" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2737" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2865" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2993" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3121" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3249" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3377" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3505" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_house_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3633" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_house_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3761" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3889" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_indoor_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4017" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4145" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4273" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4401" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_pillar_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4529" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4657" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_plant_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4785" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4913" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_rock_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5041" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5169" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5297" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_roof_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5425" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5553" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5681" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5809" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5937" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6065" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6193" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6321" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6449" name="map_transition_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_5.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6577" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6705" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_tree_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6833" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6961" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="7081" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="7201" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+  <image source="../drawable/map_wall_4.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="7321" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
+ </tileset>
+ <layer name="Ground" width="20" height="16">
+  <data encoding="base64" compression="zlib">
+   eJzbyMnAsBGI30kyMNyTJExvxKMeJo6uBpcemDg6RpZHNpsSTA0zkDG13IUrrAjZR8h+fGZhsxdXfJLjV2LjnVQz0d2DzZ3UiANsZtM6fkfxwGAAS4/6Lg==
+  </data>
  </layer>
- <layer height="16" name="Objects" width="20">
-  <data compression="zlib" encoding="base64">eJyVU10LgkAQ3L9wQoL/ol8f+AfypaCnrPQ5MPMl6DHIgVtaxxWvgUXunB1mP05E5FlIMoZind+GKWcpZ4h3t8hn3kA5ygEqysH3HqZ8cI7GC3xZ/ivz/e9Jp47n92bO3eUi13zuT3EhrZbOmsc4G91/YL3Dy2OMg9Evc7/XKUB/EV3UtZr6P3Xueg8d7Yn1fqa+pgK1NmP0zhwwx5JmtdYL1WqoZgt41T2oYg2nhZ3uyd82m/fzE6Yzs/pAbbTVV+fU7MHbUdVHqEYbfprWL78xgN+LBc+icTSZVwf/LQM2l2fDflN4X8Z4kZc=</data>
+ <layer name="Objects" width="20" height="16">
+  <data encoding="base64" compression="zlib">
+   eJyVU9EKgzAMzC9UmOBf7OsH/sB8cbAndbPPA+d8GexxMAMNxmvE7iBI6+V6SVoioldByZiKfb53a85WzhT27oGPvAlyhMOoIIe/D7fmM+eivLAvzX9ntv8z6LRh/TnE3FNOdMtjf4IOtDysJQ/RKN1/oL2zl+cctdIvc7vXKeD+cgxBV2vK/9S5yz7rSE+09wb6mgqutZ9jNObAcyxhVnu9EK0eatZgr3IPqlDDdeNOj+DvmMX9/Lr1zLQ++hZfg1GzBeuOij6HaHi3aGq/+MYY+F5qtcZZ9IYm8lq3nCP1SV91Ls4G/abwfpDJlY4=
+  </data>
  </layer>
- <layer height="16" name="Above" width="20">
-  <data compression="zlib" encoding="base64">eJytku0NgCAMRF2j+6/hIhDYRYlpUi8Xbcm9P8SC18fHtEPGtPeoRJGJGcP2ckfiH8zO9ur3mpN4OiuDfWOvSLMntwrrtZPzxdpr1g99WL2FebWrw3zxzjJk/KpvtBfOs+oV69Ue7vVXj/5sVHMBzpA5yg==</data>
+ <layer name="Above" width="20" height="16">
+  <data encoding="base64" compression="zlib">
+   eJytkt0NwCAIhLsG+6/RRTS6S2sMCZITwfC9EE89zp9OTxqd1ppJhqf2aHTn2xx7tLe3V/3XvCAnMzzQWPeSFJq+UVCvGx+LcVZvPp0H6UXMZ2dlUF79Zoz17p580T9aA/dpeZz0XY+dzrlOusyPajYfMiM9mg==
+  </data>
  </layer>
- <layer height="16" name="Walkable" visible="0" width="20">
-  <data compression="zlib" encoding="base64">eJzbKMbAsHEAMQxQQw82QKxZpAJs+sk1kxj34PI7MWbicielcUOMvaTaNZTNJNUOdHXoeskxm1g3keNmcgAlYUCOeaRiAIJMjwk=</data>
+ <layer name="Walkable" width="20" height="16" visible="0">
+  <data encoding="base64" compression="zlib">
+   eJzbKMbAsHEAMQxQQw82QKxZpAJs+sk1kxj34PI7MWbicielcUOMvaTaNZTNJNUOdHXoeikxk5CbyHEzsYCUfE3IXcSmRXIxAKEnkuw=
+  </data>
  </layer>
  <objectgroup name="Mapevents" visible="0">
-  <object height="64" name="west" type="mapchange" width="32" x="0" y="128">
+  <object id="1" name="west" type="mapchange" x="0" y="128" width="32" height="64">
    <properties>
     <property name="map" value="wild13"/>
     <property name="place" value="east"/>
    </properties>
   </object>
-  <object height="96" name="east" type="mapchange" width="32" x="608" y="384">
+  <object id="2" name="east" type="mapchange" x="608" y="384" width="32" height="96">
    <properties>
     <property name="map" value="wild15"/>
     <property name="place" value="west"/>
    </properties>
   </object>
-  <object height="32" name="down" type="mapchange" width="32" x="480" y="96">
+  <object id="3" name="down" type="mapchange" x="480" y="96" width="32" height="32">
    <properties>
     <property name="map" value="wild14_cave"/>
     <property name="place" value="up_south"/>
@@ -195,17 +224,18 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn" visible="0">
-  <object height="96" name="caveboar1" type="spawn" width="384" x="160" y="96">
+  <object id="4" name="caveboar1" type="spawn" x="160" y="96" width="384" height="96">
    <properties>
     <property name="quantity" value="2"/>
    </properties>
   </object>
-  <object height="224" name="forestserpent2" type="spawn" width="320" x="64" y="256">
+  <object id="5" name="forestserpent2" type="spawn" x="64" y="256" width="320" height="224">
    <properties>
     <property name="quantity" value="2"/>
    </properties>
   </object>
-  <object height="128" name="forestwolf1" type="spawn" width="288" x="288" y="384"/>
+  <object id="6" name="forestwolf1" type="spawn" x="288" y="384" width="288" height="128"/>
+  <object id="7" name="lonely_wolf" type="spawn" x="544" y="384" width="32" height="32"/>
  </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 c219b2d87..2fcdb91cc 100644
--- a/AndorsTrail/res/xml/worldmap.xml
+++ b/AndorsTrail/res/xml/worldmap.xml
@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <worldmap>
+  <segment id="arulircave" x="2" y="29">
+    <map id="arulircave1" x="2" y="45"/>
+    <map id="arulircave2" x="15" y="29"/>
+    <map id="arulircave3" x="28" y="45"/>
+    <map id="arulircave4" x="32" y="61"/>
+    <map id="arulircave5" x="29" y="72"/>
+    <map id="arulircave6" x="34" y="83"/>
+  </segment>
   <segment id="lostmine1" x="47" y="0">
     <map id="lostmine1" x="71" y="62"/>
     <map id="lostmine1a" x="47" y="57"/>
@@ -43,6 +51,7 @@
     <map id="blackwater_mountain6" x="66" y="389"/>
     <map id="blackwater_mountain5" x="35" y="387"/>
     <map id="blackwater_mountain9" x="53" y="361"/>
+    <map id="blackwater_mountain5a" x="14" y="401"/>
   </segment>
   <segment id="bwentry2" x="46" y="368">
     <map id="blackwater_mountain7" x="47" y="368"/>
@@ -137,6 +146,8 @@
     <map id="blackwater_mountain30" x="114" y="407"/>
     <map id="blackwater_mountain32" x="83" y="409"/>
     <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 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"/>
@@ -345,6 +356,8 @@
     <map id="guynmart_wood_13" x="70" y="222"/>
     <map id="guynmart_wood_14" x="54" y="222"/>
     <map id="waytolake12" x="678" y="174"/>
+    <map id="arulirmountain1" x="817" y="94"/>
+    <map id="arulirmountain2" x="848" y="96"/>
     <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 c4493c754..54d4f3633 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
@@ -31,7 +31,7 @@ public final class AndorsTrailApplication extends Application {
 	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 : 49;
-	public static final String CURRENT_VERSION_DISPLAY = "0.7.8dev";
+	public static final String CURRENT_VERSION_DISPLAY = "0.7.8";
 	public static final boolean IS_RELEASE_VERSION = !CURRENT_VERSION_DISPLAY.matches(".*[a-d].*");
 
 	private final AndorsTrailPreferences preferences = new AndorsTrailPreferences();