275 new lines of dialogue for the new Loneford quest. The Loneford quest is now completable.

Populated most of the quest droplists (shop droplists still left to do). Fixed issues with the Prim and Blackwater quests, that were never marked as completed under some circumstances in v0.6.9. Moved tiles on a lot of maps to their correct layer (from "Objects" to "Above" for example) Added deterministic sort order to quest list. git-svn-id: https://andors-trail.googlecode.com/svn/trunk@164 08aca716-68be-ccc6-4d58-36f5abd142ac
2026-01-09 05:01:13 +01:00 · 2011-10-02 19:27:46 +00:00
parent a31a359c3e
commit ba2cd2a8b4
55 changed files with 648 additions and 1374 deletions
--- a/AndorsTrail/gen/com/gpl/rpg/AndorsTrail/R.java
+++ b/AndorsTrail/gen/com/gpl/rpg/AndorsTrail/R.java
--- a/AndorsTrail/res/values-fr/content_questlist.xml
+++ b/AndorsTrail/res/values-fr/content_questlist.xml
@@ -11,7 +11,9 @@
 	{40|J\'ai discuté avec Gaela à Fallhaven. Il me conseille d\'aller voir Bucus et de lui demander des informations à propos de la guilde des voleurs.||0|}
 	{50|Bucus m\'a autorisé à passer par la trappe dans la maison en ruines de Fallhaven. Il faut que je parle à Umar.||0|}
 	{51|Umar de la guilde des voleurs de Fallhaven a cru me reconnaître, mais il a dû me confondre avec Andor. Apparemment, Andor l\'a déjà rencontré.||0|}
-	{55|Umar dit qu\'Andor est allé voir un concocteur de potions dénommé Lodar. Je dois rechercher sa retraite.||0|}}|};
+	{55|Umar dit qu\'Andor est allé voir un concocteur de potions dénommé Lodar. Je dois rechercher sa retraite.||0|}
+	{61|I heard a story in Loneford, where it seemed like Andor had been in Loneford, and that he might have had something to do with the illness that the people are suffering from there. I am not sure if it actually was Andor. If it was Andor, why would he have made the people of Loneford ill?||0|}
+	}|};
 {mikhail_bread|Pain du petit déjeuner|1|{
 	{100|J\'ai rapporté du pain à Mikhail.||1|}
 	{10|Mikhail veut que j\'aille lui acheter du pain chez Mara à la halle du village.||0|}}|};
@@ -138,6 +140,7 @@
 	{120|Afin de faire cesser les attaques contre la colonie du Mont Blackwater, Harlenn veut que j\'assassine Guthbered à Prim.|||}
 	{130|J\'ai commencé à me battre avec Guthbered.|||}
 	{131|J\'ai dit à Guthbered que j\'avais été envoyé pour le tuer, mais l\'ai laissé vivre. Il m\'a remercié avec profusion et a quitté Prim.|210||}
+	{149|I have told Harlenn that Guthbered is gone.|||}
 	{150|Harlenn m\'a remercié pour l\'aide que je lui ai fournie. Désormais, les attaques contre la colonie du Mont Blackwater devraient cesser.|500||}
 	{240|J\'ai maintenant gagné la confiance de la colonie du Mont Blackwater, et devrais avoir accès à tous les services.||1|}
 	{250|J\'ai décidé de ne pas aider les gens de la colonie du Mont Blackwater.||1|}
@@ -164,6 +167,7 @@
 	{80|Afin de faire cesser les attaques contre Prim, Guthbered veut que j\'aille tuer Harlenn en haut dans la colonie du Mont Blackwater.|||}
 	{90|J\'ai commencé à me battre avec Harlenn.|||}
 	{91|J\'ai dit à Harlenn que j\'avais été envoyé pour le tuer, mais l\'ai laissé vivre. Il m\'a remercié avec profusion et a quitté la colonie.|210||}
+	{99|I have told Guthbered that Harlenn is gone.|||}
 	{100|Guthbered m\'a remercié pour l\'aide que je lui ai fournie. Désormais, les attaques contre Prim devraient cesser. En remerciement, Guthbered m\'a donné quelques objets et un laisser-passer falsifié afin que je puisse entrer dans les quartiers confidentiels de la colonie du Mont Blackwater.|500||}
 	{140|J\'ai montré le laisser-passer falsifié au garde et ai pu entrer dans les quartiers confidentiels.|||}
 	{240|J\'ai maintenant gagné la confiance de Prim, et devrais avoir accès à tous les services.||1|}
--- a/AndorsTrail/res/values-it/content_questlist.xml
+++ b/AndorsTrail/res/values-it/content_questlist.xml
@@ -12,6 +12,7 @@
 	{50|Bucus mi ha permesso di entrare nella botola nella casa abbandonata in Fallhaven. Dovrei andare a parlare con Umar.||0|}
 	{51|Umar in the Fallhaven thieves guild recognized me, but must have me mixed up with Andor. Apparently, Andor has been to see him.||0|}
 	{55|Umar told me that Andor went to see a potioner called Lodar. I should search for his hideaway.||0|}
+	{61|I heard a story in Loneford, where it seemed like Andor had been in Loneford, and that he might have had something to do with the illness that the people are suffering from there. I am not sure if it actually was Andor. If it was Andor, why would he have made the people of Loneford ill?||0|}
 	}|};
 {mikhail_bread|Pane per la colazione|1|{{100|Ho portato il pane a Mikhail.||1|}{10|Mikhail vuole che vada a comprargli del pane da Mara al municipio.||0|}}|};
 {mikhail_rats|Topi!|1|{{100|Ho ucciso i due ratti nel nostro giardino.|20|1|}{10|Mikhail vuole che vada a controllare il nostro giardino per alcuni ratti. Devo uccidere i ratti e tornare a Mikhail. Se mi faccio male, posso tornare a letto e riposare per ripristinare la salute.||0|}}|};
--- a/AndorsTrail/res/values-ru/content_questlist.xml
+++ b/AndorsTrail/res/values-ru/content_questlist.xml
@@ -12,6 +12,7 @@
 	{50|Бикус позволил мне пройти в подвал заброшенного дома в Фоллхейвене. Я должен поговорить с Умаром.||0|}
 	{51|Umar in the Fallhaven thieves guild recognized me, but must have me mixed up with Andor. Apparently, Andor has been to see him.||0|}
 	{55|Umar told me that Andor went to see a potioner called Lodar. I should search for his hideaway.||0|}
+	{61|I heard a story in Loneford, where it seemed like Andor had been in Loneford, and that he might have had something to do with the illness that the people are suffering from there. I am not sure if it actually was Andor. If it was Andor, why would he have made the people of Loneford ill?||0|}
 	}|};
 {mikhail_bread|Хлеб к завтраку|1|{{100|Я должен принести хлеб Михаилу.||1|}{10|Михаил просил купить буханку хлеба у Мары в таверне.||0|}}|};
 {mikhail_rats|Крысы!|1|{{100|Нужно убить двух крыс в огороде.|20|1|}{10|Михаил хочет что бы я осмотрел наш огород на наличие крыс. Я должен убить крыс в нашем саду и вернуться к Михаилу. Если я буду ранен, я могу вернуться в постель и отдохнуть, чтобы восстановить свое здоровье.||0|}}|};
--- a/AndorsTrail/res/values/content_conversationlist.xml
+++ b/AndorsTrail/res/values/content_conversationlist.xml
@@ -516,9 +516,9 @@
 {note_lodars|On the ground, you find a piece of paper with a lot of strange symbols. You can barely make out the words \'meet me at Lodars hideaway\', but you are not sure what it means.||||};
 {keyarea_crossglen_smith|Audir shouts: Hey you, get away! You are not allowed back there.||||};
 {sign_crossglen_cave|The sign on the wall is cracked in several places. You cannot make out anything comprehensible from the writing.||||};
-{sign_wild1|West: Crossglen\nSouth: Fallhaven||||};
+{sign_wild1|West: Crossglen\nSouth: Fallhaven\nNorth:Feygard||||};
 {sign_notdone|This map is not yet done. Please come back in a later version of the game.||||};
-{sign_wild3|West: Crossglen\nEast: Fallhaven||||};
+{sign_wild3|West: Crossglen\nEast: Fallhaven\nNorth:Feygard||||};
 {sign_pitcave2|Gandir lies here, slain by the hand of his former friend Irogotu.||||};
 {sign_fallhaven1|Welcome to Fallhaven. Watch out for pickpockets!||||};
 {key_fallhavenchurch|You are not allowed to enter the catacombs of Fallhaven Church without permission.||||};
@@ -1238,6 +1238,7 @@
 	{|guthbered_reject|prim_hunt:251|||}
 	{|guthbered_reject|prim_hunt:250|||}
 	{|guthbered_completed|prim_hunt:100|||}
+	{|guthbered_killharl_2|prim_hunt:99|||}
 	{|guthbered_workingforbwm_2|bwm_agent:95|||}
 	{|guthbered_killharl_1|prim_hunt:80|||}
 	{|guthbered_lookforsigns_1|prim_hunt:50|||}
@@ -1368,7 +1369,7 @@
 {guthbered_workingforbwm_3|It is, of course, your choice. But if you are working for them, you are not welcome here in Prim. You should leave quickly, while you still can.|prim_hunt:251|||};
 {guthbered_completed|Hello again my friend. Thank you for your help in dealing with the bandits up in Blackwater Mountain.|||{{N|guthbered_completed_1||||}}|};
 {guthbered_completed_1|I am sure everyone here in Prim will want to talk to you now.|prim_hunt:240||{{N|guthbered_completed_2||||}}|};
-{guthbered_completed_2|Thank you again for your help.||||};
+{guthbered_completed_2|Thank you again for your help.|bwm_agent:250|||};
 {guthbered_sentbybwm_1|The glow in your eyes frightens me.|||{
 	{I am sent by the Blackwater Mountain settlement to stop you.|guthbered_sentbybwm_fight||||}
 	{I am sent by the Blackwater Mountain settlement to stop you. However, I have decided not to kill you.|guthbered_sentbybwm_3||||}
@@ -1392,7 +1393,7 @@
 	{Yes, he is dead.|guthbered_killharl_2||harlenn_id|1|}
 	{Yes, he is gone.|guthbered_killharl_3|prim_hunt:91|||}
 	}|};
-{guthbered_killharl_2|While I am grateful for this news in knowing that he is dead, I am also saddened that it had to come to this.|||{{N|guthbered_killharl_4||||}}|};
+{guthbered_killharl_2|While I am grateful for this news in knowing that he is dead, I am also saddened that it had to come to this.|prim_hunt:99||{{N|guthbered_killharl_4||||}}|};
 {guthbered_killharl_3|Really? This is great news indeed.|||{{N|guthbered_killharl_4||||}}|};
 {guthbered_killharl_4|This will hopefully mean that their attacks on our village will cease.|||{{N|guthbered_killharl_5||||}}|};
 {guthbered_killharl_5|I do not know how to thank you enough my friend.|||{{N|guthbered_killharl_6||||}}|};
@@ -1472,6 +1473,7 @@
 	{|harlenn_return_1|bwm_agent:251|||}
 	{|harlenn_return_1|bwm_agent:250|||}
 	{|harlenn_completed|bwm_agent:150|||}
+	{|harlenn_killguth_3|bwm_agent:149|||}
 	{|harlenn_workingforprim_1|prim_hunt:50|||}
 	{|harlenn_killguth_1|bwm_agent:120|||}
 	{|harlenn_lookforsigns_1|bwm_agent:95|||}
@@ -1555,7 +1557,7 @@
 {harlenn_workingforprim_2|Of course we can\'t have that here. We can\'t have a spy in our midsts. You should leave our settlement while you still can, traitor.|bwm_agent:251|||};

 {harlenn_completed|Thank you, friend. Your help is greatly appreciated. Everyone in the Blackwater Mountain settlement will want to talk to you now.|bwm_agent:240||{{N|harlenn_completed_1||||}}|};
-{harlenn_completed_1|I\'m sure the monster attacks will stop now when we kill the last few monsters that are outside the settlement.||||};
+{harlenn_completed_1|I\'m sure the monster attacks will stop now when we kill the last few monsters that are outside the settlement.|prim_hunt:250|||};
 {harlenn_talkedto_guth_1|He denies it?! Bah, that treacherous fool. I should have known that he wouldn\'t dare tell the truth.|||{{N|harlenn_talkedto_guth_2||||}}|};
 {harlenn_talkedto_guth_2|I am still sure that they somehow are behind all these attacks on us. Who else could there be? There are no other settlements around here for quite a walk.|||{{N|harlenn_talkedto_guth_3||||}}|};
 {harlenn_talkedto_guth_3|Besides, they have always been treacherous. No, of course they are behind the attacks.|bwm_agent:90||{{N|harlenn_talkedto_guth_4||||}}|};
@@ -1621,7 +1623,7 @@
 	{Yes, he is dead.|harlenn_killguth_2||guthbered_id|1|}
 	{Yes, he is gone.|harlenn_killguth_2|bwm_agent:131|||}
 	}|};
-{harlenn_killguth_2|Ha ha! He is finally gone! Now we can rest comfortably in our settlement.|||{{N|harlenn_killguth_3||||}}|};
+{harlenn_killguth_2|Ha ha! He is finally gone! Now we can rest comfortably in our settlement.|bwm_agent:149||{{N|harlenn_killguth_3||||}}|};
 {harlenn_killguth_3|They will no longer attack us now that their lying leader is gone!|||{{N|harlenn_killguth_4||||}}|};
 {harlenn_killguth_4|Thank you friend. Here, have these items as a token of our appreciation for your help.|bwm_agent:150|harlenn_reward|{{N|harlenn_completed||||}}|};
 	</string>
@@ -2757,19 +2759,23 @@
 {crossroads_backguard_5|No.|||{{Ok, nevermind then.|X||||}{200 gold then?|crossroads_backguard_6||||}}|};
 {crossroads_backguard_6|No.|||{{Ok, nevermind then.|X||||}{400 gold then?|crossroads_backguard_7||||}}|};
 {crossroads_backguard_7|Look, you are not getting back there. And there is nothing to see back there.|||{{Ok, nevermind then.|X||||}{Ok, final offer, 800 gold? That\'s a fortune.|crossroads_backguard_8||||}}|};
-{crossroads_backguard_8|Hm, 800 gold you say? Well, why didn\'t you say so from the start? Sure, that could work.|||{{Nevermind, I was just kidding.|X||||}{Here is the gold, now get out of the way.|R||gold|800|}}|};
+{crossroads_backguard_8|Hm, 800 gold you say? Well, why didn\'t you say so from the start? Sure, that could work.|||{{N|crossroads_backguard_9||||}}|};
+{crossroads_backguard_9|I should tell you however, that there is something in there that we won\'t dare go near. I just guard here to make sure it doesn\'t get out, and that no one goes in.|||{{N|crossroads_backguard_10||||}}|};
+{crossroads_backguard_10|Some other guards went in there earlier, and came back screaming. Enter at your own risk, but don\'t say I didn\'t warn you.|||{{Nevermind, I was just kidding.|X||||}{Here is the gold, now get out of the way.|R||gold|800|}}|};
+
+{keknazar|*hssss*\n(You hear squishing sounds as the creature starts moving towards you)|||{{For the Shadow!|F||||}{You will not survive this, you pathetic creature.|F||||}{A fight! I have been looking forward to this!|F||||}}|};
 	</string>

 	<string name="conversationlist_fields_1">
 [id|message|progressQuest|rewardDropListID|replies[text|nextPhraseID|requires_Progress|requires_itemID|requires_Quantity|]|];
 {feygard_bridgeguard|Sorry, the road to Feygard is closed until further notice.||||};
 {sign_crossroadshouse|Crossroads guardhouse, housing for allies of Feygard.||||};
-{sign_crossroads_s|Southeast: To Nor City\nNorthwest: To Feygard\nEast: Loneford||||};
-{sign_crossroads_n|Northwest: To Feygard\nEast: Loneford.||||};
-{sign_fields1|Northwest: To Feygard\nEast: Loneford.||||};
-{sign_fields6|Northwest: To Feygard\nSouth: To Nor City.||||};
+{sign_crossroads_s|Southeast: Nor City\nNorthwest: Feygard\nEast: Loneford\nSouth: Fallhaven||||};
+{sign_crossroads_n|Northwest: Feygard\nEast: Loneford.||||};
+{sign_fields1|Northwest: Feygard\nEast: Loneford.||||};
+{sign_fields6|Northwest: Feygard\nSouth: Nor City.||||};
 {crossroads_sleep|The guard shouts at you: Hey! You cannot sleep here!||||};
-{sign_loneford2|Welcome to quiet Loneford.\n(The sign also contains a drawing of bale of hay with what looks like a farmer sitting on top.)||||};
+{sign_loneford2|Welcome to peaceful Loneford.\n(The sign also contains a drawing of bale of hay with what looks like a farmer sitting on top.)||||};
 	</string>

 	<string name="conversationlist_loneford_1">
@@ -2780,11 +2786,13 @@
 {loneford_farmer_il_1|It all started a few days ago. Selgan found Hesor passed out on his old cropfield, completely white face and shivering.|||{{N|loneford_farmer_il_2||||}}|};
 {loneford_farmer_il_2|A few days later, Selgan started showing the same symptoms as Hesor, with stomach aches. I also started feeling the pains and got the shivers.|||{{N|loneford_farmer_il_3||||}}|};
 {loneford_farmer_il_3|Then, all people showed the symptoms in one way or another.|||{{N|loneford_farmer_il_4||||}}|};
-{loneford_farmer_il_4|Poor old Selgan and Hesor apparently got the worst of it, and died the day before yesterday.|||{{N|loneford_farmer_il_5||||}}|};
+{loneford_farmer_il_4|Poor old Selgan and Hesor apparently got the worst of it, and both died the day before yesterday.|||{{N|loneford_farmer_il_5||||}}|};
 {loneford_farmer_il_5|Cursed illness, why did it have to be Selgan and Hesor? I wonder who is next.|||{{N|loneford_farmer_il_6||||}}|};
 {loneford_farmer_il_6|We all started to investigate what could be the cause. We still aren\'t certain what the cause is, but we have our suspicions.|loneford:10||{{N|loneford_farmer_il_7||||}}|};
 {loneford_farmer_il_7|Luckily, now Feygard has sent patrols up here to help guard the village at least. We are still suffering though, and we fear who will be taken by the illness next.|loneford:11|||};

+{loneford_wellguard|Please report any suspicious behaviour you might see.||||};
+
 {rolwynn|What have we done to deserve this? Please, will you help us?|||{
 	{What do you think is the cause of the illness?|rolwynn_1|loneford:11|||}
 	{What\'s wrong?|loneford_farmer0_1||||}
@@ -2809,12 +2817,278 @@
 	<string name="conversationlist_loneford_2">
 [id|message|progressQuest|rewardDropListID|replies[text|nextPhraseID|requires_Progress|requires_itemID|requires_Quantity|]|];
 {loneford_guard0|We keep the order around here. I wonder what the people of Loneford would do without us guards from Feygard. Poor things.||||};
-{loneford_wellguard|Please report any suspicious behaviour you might see.||||};
 {loneford_villager0|*cough* Please help us, soon there won\'t be many left of us!|||{{What\'s wrong?|loneford_farmer0_1||||}}|};
 {loneford_villager1|I can\'t feel my face anymore, please help us!|||{{What\'s wrong?|loneford_farmer0_1||||}}|};
 {loneford_villager2|Don\'t disturb me, I need to finish chopping this wood. Go bother someone else.||||};
-{loneford_villager3|I fear for our survival. It seems we are getting worse every day that passes.|||{{What\'s wrong?|loneford_farmer0_1||||}}|};
+{loneford_villager3|I fear for our survival. It seems we are getting worse every day that passes. It\'s a good thing Feyard helps us at least.|||{{What\'s wrong?|loneford_farmer0_1||||}}|};
 {loneford_villager4|Don\'t I know you from somewhere? You look familiar somehow.||||};
+
+{landa||||{
+	{|landa_already_1|loneford:35|||}
+	{|landa_1||||}
+	}|};
+{landa_1|Wha? You!? No, get away from me!|||{{I heard that you saw something that you won\'t talk about.|landa_2|loneford:25|||}}|};
+{landa_2|(Landa gives you a terrified look)|||{{N|landa_3||||}}|};
+{landa_3|You were there! I ssssaw you!|||{{N|landa_4||||}}|};
+{landa_4|Or was it you? No, it looked like you, and I have a good memory! *bites lip*|||{{Calm down.|landa_5||||}}|};
+{landa_5|Get away from me, whatever you did over there, it\'s your business and I don\'t want any trouble!|||{{You must have me confused with someone else.|landa_6||||}}|};
+{landa_6|Please don\'t hurt me!|||{{Landa, you must have me confused with someone else! What was it you saw?|landa_7||||}}|};
+{landa_7|No, you are smaller than him.|||{{Are you going to tell me what it was you saw?|landa_8||||}}|};
+{landa_8|The boy. He was doing something. I tried to sneak close by to see what it was he was doing, I did. But he ran away before I could see.|||{{N|landa_9||||}}|};
+{landa_9|He did something by the well here in Loneford.|||{{When was this?|landa_10||||}}|};
+{landa_10|It was in the middle of the night, on the day before everything started. The day after, I was sleeping it off during the day, so I didn\'t notice all the turmoil about when they brought Hesor back.|||{{N|landa_11||||}}|};
+{landa_11|Almost the whole village wanted to see what had happened to Hesor. I kept to myself and didn\'t dare talk to anyone.|loneford:30||{{N|landa_12||||}}|};
+{landa_12|The same day, others started to get pale as well. I could see it in their faces.|||{{N|landa_13||||}}|};
+{landa_13|The following night, I was getting ready to go to the well myself to look for any traces of what the boy had did.|||{{N|landa_14||||}}|};
+{landa_14|I peeked out the window to see if there were anyone that might see me. Instead, I saw someone skulking around the well, filling up several vials with both dirt around the well, and water from the well itself.|||{{N|landa_15||||}}|};
+{landa_15|I am sure it was Buceth, from the chapel. I have a good eye for people, and a good memory. Yes, I am sure it was Buceth.|||{{N|landa_16||||}}|};
+{landa_16|Also, isn\'t it strange how Buceth has not gotten ill, while all others in the village has not gotten ill?|loneford:31||{{N|landa_17||||}}|};
+{landa_17|He must be up to something. He and that boy that looked like you. Are you sure it wasn\'t you?|loneford:35||{{N|landa_18||||}}|};
+{landa_18|Never mind. Please don\'t tell anyone that I told you all this.|||{{N|landa_19||||}}|};
+{landa_19|Now, get out of here kid, before anyone sees you talking to me. *Looks around anxiously*|||{
+	{Thank you Landa. You secret is safe with me.|X||||}
+	{Thank you Landa. I\'ll consider it.|X||||}
+	{Are you done? Phew, I though you were never going to stop takling.|X||||}
+	}|};
+{landa_already_1|You again? I already told you. Get out of here before anyone sees you talking to me.||||};
+	</string>
+
+	<string name="conversationlist_buceth">
+[id|message|progressQuest|rewardDropListID|replies[text|nextPhraseID|requires_Progress|requires_itemID|requires_Quantity|]|];
+{buceth||||{
+	{|buceth_complete_1|loneford:60|||}
+	{|buceth_fight_1|loneford:50|||}
+	{|buceth_story_3|loneford:45|||}
+	{|buceth_follow_1|loneford:42|||}
+	{|buceth_bribed_1|loneford:41|||}
+	{|buceth_1||||}
+	}|};
+{buceth_bribed_1|You again. Thank you for the gold earlier.|||{{N|buceth_story_1||||}}|};
+{buceth_follow_1|Welcome back my friend. Walk with the Shadow.|||{{N|buceth_story_1||||}}|};
+{buceth_1|Shadow be with you.|||{
+	{I know of your business at the well the night after the illness broke out.|buceth_2|loneford:35|||}
+	{Can you tell me more about the Shadow?|priest_shadow_1||||}
+	}|};
+{buceth_2|Oh, I am sure you do. But what proof do you have, eh? Anything the guards would believe?|||{{N|buceth_3||||}}|};
+{buceth_3|Let me ask you something first, and we might talk after that.|||{
+	{Ok, what?|buceth_4||||}
+	{How about some gold, would that make you talk?|buceth_gold_1||||}
+	}|};
+{buceth_4|Let me start by telling you a story.|||{
+	{Go ahead|buceth_5||||}
+	{Let me guess, this story is going to take forever to listen to. How about I give you some gold, and instead we can discuss what you were doing at the well.|buceth_gold_1||||}
+	}|};
+{buceth_gold_1|Hm, that might be an interesting proposal. How much gold are you suggesting?|||{
+	{Here\'s 10 gold, take it.|buceth_gold_no||gold|10|}
+	{Here\'s 100 gold, take it.|buceth_gold_no||gold|100|}
+	{Here\'s 250 gold, take it.|buceth_gold_no||gold|250|}
+	{Here\'s 500 gold, take it.|buceth_gold_no||gold|500|}
+	{Here\'s 1000 gold, take it.|buceth_gold_yes||gold|1000|}
+	{Here\'s 2000 gold, take it.|buceth_gold_yes||gold|2000|}
+	}|};
+{buceth_gold_no|Hrmpf. Thanks for the gold, but I am not interested in talking to you. Now, please leave.||||};
+{buceth_gold_yes|You seem to realize the true value of the Shadow. Yes, this will do fine, thank you.|loneford:41||{{N|buceth_bribed_1||||}}|};
+{buceth_5|Let\'s assume you live in a village that, for the most part, keeps to itself. Your village is self-sustainable and the crops have been good for some years.|||{{N|buceth_6||||}}|};
+{buceth_6|With the few exceptions of a some fights here and there between villagers because of misunderstandings, on the whole, your village is a friendly peaceful village.|||{{N|buceth_7||||}}|};
+{buceth_7|You work in the same profession as your parents, which in turn worked in the same professions as their parents.|||{{N|buceth_8||||}}|};
+{buceth_8|Let\'s also assume that the way you conduct your business is the same way that the people in the village have been conducting their business for generations past.|||{{N|buceth_9||||}}|};
+{buceth_9|Everyone respects one another in the village, and your appointed leader does a good job at keeping everyone\'s interests satisfied, while at the same time being reasonably fair.|||{{N|buceth_10||||}}|};
+{buceth_10|Then, one day, a group of men come walking into the village. Shining armours, white teeth, combed hair, trimmed beards.|||{{N|buceth_11||||}}|};
+{buceth_11|The men claim that their lord owns this land, including your village.|||{{N|buceth_12||||}}|};
+{buceth_12|They claim that they keep the land safe of wrongdoers and evil creatures.|||{{N|buceth_13||||}}|};
+{buceth_13|For their help in protecting your village, they ask that the village compensate them with a share of the harvest.|||{{N|buceth_14||||}}|};
+{buceth_14|Now, tell me. Would you support those men by agreeing to their terms?|||{
+	{Yes|buceth_15||||}
+	{No|buceth_15||||}
+	{I don\'t know|buceth_dontknow||||}
+	}|};
+{buceth_dontknow|I am sorry to hear that. You should make up your mind and return to me once you have done so. Then we might be able to talk more.|||{
+	{Ok, goodbye.|X||||}
+	{How about I give you some gold instead?|buceth_gold_1||||}
+	}|};
+{buceth_15|How interesting.|||{{N|buceth_16||||}}|};
+{buceth_16|Let me continue the story of our hypothetical case.|||{{N|buceth_17||||}}|};
+{buceth_17|A while later, the men return. They explain that some of the methods that are used in the village have now been prohibited across the whole land.|||{{N|buceth_18||||}}|};
+{buceth_18|Without going into specifics, let\'s say that these are methods that have been used for past generations in your village.|||{{N|buceth_19||||}}|};
+{buceth_19|Changing the way things are done without these methods will require quite an effort. A lot of people in the village are upset because of these news from the men.|||{{N|buceth_20||||}}|};
+{buceth_20|Now, tell me. Would you in secret continue using the old methods your past generations have used, or would you instead convert to the way that the men are advocating?|||{
+	{I would continue using the old ways in secret|buceth_21_1||||}
+	{I would continue using the old ways, and fight the ruling that prohibited them in the first place|buceth_21_2||||}
+	{I would only use the methods that are allowed|buceth_22||||}
+	{I would follow the law|buceth_22||||}
+	{I can\'t decide without knowing the specifics|buceth_dontknow||||}
+	}|};
+{buceth_21_1|How interesting.|||{{N|buceth_25||||}}|};
+{buceth_21_2|I am glad to hear that there are people still around that are willing to stand up for what is right.|||{{N|buceth_25||||}}|};
+{buceth_22|How interesting. You have a different view of the world than what I and the priests of Nor City have.|||{{N|buceth_23||||}}|};
+{buceth_23|You are of course entitled to your opinion, but you should know that your opinion might conflict with the Shadow.|||{{N|buceth_24||||}}|};
+{buceth_24|You wanted to know about some business that you accuse me of. Since you have no proof, I will claim innocence. I know that my conscience is clean.|||{
+	{Ok, goodbye.|X||||}
+	{Fine. How about I give you some gold instead, would that make you talk?|buceth_gold_1||||}
+	}|};
+{buceth_25|Your views match those that I and the other priests from Nor City believe in. Tell me, would you be interested in following the glow of the Shadow?|||{
+	{I am ready to follow the Shadow.|buceth_27||||}
+	{How can I agree to something without knowing what it entails?|buceth_26||||}
+	{No, I will go my own way.|buceth_decline||||}
+	{No, I will go my own way. Your stupid Shadow is nothing but talk and fancy words.|buceth_decline||||}
+	}|};
+{buceth_26|If the answers you gave previously were indeed your views, then I can assure you that the path that is guided by the Shadow is the right one.|||{
+	{I am ready to follow the Shadow.|buceth_27||||}
+	{No, I will go my own way.|buceth_decline||||}
+	{No, I will go my own way. Your stupid Shadow is nothing but talk and fancy words.|buceth_decline||||}
+	}|};
+{buceth_decline|I am sorry to hear that. I guess we do not share views after all.|||{{N|buceth_24||||}}|};
+{buceth_27|I am glad to hear that. But then, I had a feeling all along that you would say that.|loneford:42||{{N|buceth_story_1||||}}|};
+
+{buceth_story_1|You wanted to ask me something?|||{{What were you doing at the well during the night?|buceth_story_2||||}}|};
+{buceth_story_2|Let me first tell you my background.|||{
+	{Great. Another endless story.|buceth_story_3||||}
+	{Please go ahead.|buceth_story_3||||}
+	}|};
+{buceth_story_3|I am appointed by the priests of Nor City to help guide the people of Loneford towards the Shadow. Our mission is to see that the Shadow casts its glow over Loneford as well as other settlements around here.|||{{N|buceth_story_4||||}}|};
+{buceth_story_4|Most folk in these northern parts seem too occupied with obeying the will of Feygard and Lord Geomyr. We want to help people see the light of the wrongdoings that Feygard advocates, and to point out the errors in their ways.|||{{N|buceth_story_5||||}}|};
+{buceth_story_5|That\'s my mission here. To see that the Shadow casts its glow over Loneford.|||{{How does this relate to what you were doing at the well?|buceth_story_6||||}}|};
+{buceth_story_6|Nor City sent word to me that something was about to happen here in Loneford. Something that would help our cause.|||{{N|buceth_story_7||||}}|};
+{buceth_story_7|They were sending a boy to do some business here, and I was assigned to make sure that the mission was successful.|andor:61||{{N|buceth_story_8||||}}|};
+{buceth_story_8|I was tasked with gathering samples from the water in the well and from the ground around the well. Also, I was given some vials whose contents should be poured into the well.|||{{N|buceth_story_9||||}}|};
+{buceth_story_9|Apparently, the boy they sent was successful in his mission. The task that I did was also successful, if I may say so myself.|loneford:45||{{N|buceth_story_10||||}}|};
+{buceth_story_10|And that\'s where we stand now. The deed is done, and the Shadow will look favourably upon us.|||{
+	{So the well was poisoned, that\'s horrible. How could you?|buceth_story_11||||}
+	{Thank you for telling me.|buceth_story_12||||}
+	}|};
+{buceth_story_11|Horrible!? What is horrible? What those people from Feygard are doing - that\'s what\'s horrible!|||{{N|buceth_story_12||||}}|};
+{buceth_story_12|Now, I ask you to keep this story just between us two. You understand that, right?|||{
+	{Absolutely. Walk with the Shadow.|buceth_story_14||||}
+	{I promise not to tell anyone.|buceth_story_14||||}
+	{No, I will report you to the guard.|buceth_story_13||||}
+	}|};
+{buceth_story_13|I urge you to rethink your reasoning. The way of the Shadow is the righteous way.|||{
+	{Very well. I promise not to tell anyone.|buceth_story_14||||}
+	{No. Your crimes will be punished!|buceth_fight_1||||}
+	}|};
+{buceth_fight_1|Infidel, you will not defeat me! For the Shadow!|loneford:50||{{Fight!|F||||}}|};
+{buceth_story_14|Thank you, my friend.|loneford:60||{{N|buceth_story_15||||}}|};
+{buceth_story_15|If you want to learn more about the Shadow, please visit the chapel custodian in Nor City. Tell them I sent you, and they will surely extend their gratitude towards you.|loneford:60|||};
+{buceth_complete_1|Welcome back my friend. May you bask in the glow of the Shadow.|||{{N|buceth_story_15||||}}|};
+
+	</string>
+
+	<string name="conversationlist_talion">
+[id|message|progressQuest|rewardDropListID|replies[text|nextPhraseID|requires_Progress|requires_itemID|requires_Quantity|]|];
+{talion|Shadow be with you.|||{
+	{Do you know anything about the illness?|talion_1|loneford:11|||}
+	{Do you have anything to trade?|S||||}
+	}|};
+{talion_1|The people of Loneford are very keen on following the will of Feygard, whatever it may be.|||{{N|talion_2||||}}|};
+{talion_2|Normally, this would not be a problem. But Lord Geomyr seems to have something against the Shadow. He will do almost anything to oppose all actions that in some way are extend the reach of the Shadow.|||{{N|talion_3||||}}|};
+{talion_3|Because of this, the people of Loneford are now actively abolising the thought of the Shadow guiding them through their lives.|||{{N|talion_4||||}}|};
+{talion_4|People around here would rather follow the law of Feygard than follow the old ways.|||{{N|talion_5||||}}|};
+{talion_5|My feeling is that this illness is caused by the Shadow, as punishment to all of us here in Loneford.|loneford:23||{{N|loneford_ill_c_1||||}}|};
+
+	</string>
+
+	<string name="conversationlist_taevinn">
+[id|message|progressQuest|rewardDropListID|replies[text|nextPhraseID|requires_Progress|requires_itemID|requires_Quantity|]|];
+{taevinn|Please, you must help us!|||{
+	{Do you know anything about the illness?|taevinn_1|loneford:11|||}
+	{What\'s wrong?|loneford_farmer0_1||||}
+	}|};
+{taevinn_1|I\'ll tell you what I know. We try to follow the law around here. Without rules and laws, how would we be any different from the savages that roam the southern lands?|||{{N|taevinn_2||||}}|};
+{taevinn_2|But even if we here in Loneford keep as peaceful as possible, there\'s always someone that has a desire to cause mischief.|||{{N|taevinn_3||||}}|};
+{taevinn_3|Have you seen him? That fool Sienn. Him and his \'pet\' are always trying to cause some trouble. We can\'t have that around here in our friendly village. Especially not in times like these when we are trying to show our good side to those magnificent guards from Feygard that are here.|||{{N|taevinn_4||||}}|};
+{taevinn_4|Did you know I tried to talk to him on several occasions about his so called \'pet\'? I couldn\'t really make out what he was trying to tell me, but that thing of his nearly tried to kill me, it did!|||{{N|taevinn_5||||}}|};
+{taevinn_5|I tell you, there\'s mischief all around him and that thing ke keeps around. I am sure they are up to something. They probably caused this illness somehow. Maybe we caught something contagious from that thing of his that he keeps around?|loneford:24||{{N|loneford_ill_c_1||||}}|};
+	</string>
+
+	<string name="conversationlist_loneford_kuldan">
+[id|message|progressQuest|rewardDropListID|replies[text|nextPhraseID|requires_Progress|requires_itemID|requires_Quantity|]|];
+{kuldan||||{
+	{|kuldan_c_1|loneford:55|||}
+	{|kuldan_bc_1|loneford:54|||}
+	{|kuldan_1||||}
+	}|};
+{kuldan_1|Please report any suspicious behaviour you might see.|||{
+	{I know what the cause of the illness is. Have a look at this vial that Buceth had on him.|kuldan_bc_1|loneford:50|buceth_vial|1|}
+	{Who are you?|kuldan_2||||}
+	}|};
+{kuldan_2|I am Kuldan, captain of this here detachment of guards in Loneford. Now, if you will excuse me, I have work to do.||||};
+{kuldan_c_1|Feygard is grateful for your assistance in solving the mystery of the illness here in Loneford.|||{{N|kuldan_c_2||||}}|};
+{kuldan_c_2|We are trying to help the last few people that are still ill here now. Loneford might require our assistance from Feygard for quite some time.||||};
+{kuldan_bc_1|What is this? This smells like Narwood poison. You say you retrieved this from Buceth?|loneford:54||{{Buceth was part of a mission by the Nor City priests to poison the water well here in Loneford.|kuldan_bc_2||||}}|};
+{kuldan_bc_2|But this means.. It is the water that the people are getting ill from? This explains a lot of things.|||{{N|kuldan_bc_3||||}}|};
+{kuldan_bc_3|You my friend have done Loneford a great service by finding this, and by extension, Feygard as well. We should go catch Buceth for what he has done.|||{{He is already dead|kuldan_bc_4||||}}|};
+{kuldan_bc_4|Dead you say? Hm, not quite the way we do things in Feygard, but I guess this is an exceptional case.|||{{He is already dead|kuldan_bc_5||||}}|};
+{kuldan_bc_5|I always suspected that those savages from Nor City were behind this all along.|||{{N|kuldan_bc_6||||}}|};
+{kuldan_bc_6|It\'s good to know that we now at least have some evidence to back up our claims.|||{{N|kuldan_bc_7||||}}|};
+{kuldan_bc_7|As for Loneford, I guess we will have to start bringing in water from Feygard to help the people here. Good thing they have us around, what would they do otherwise?|||{{N|kuldan_bc_8||||}}|};
+{kuldan_bc_8|And you, my friend - you should of course be sufficiently rewarded for your assistance in this matter. You should travel to the glorious city of Feygard to the northwest and report to the castle steward there for further instructions.|||{{N|kuldan_bc_9||||}}|};
+{kuldan_bc_9|I happen to know the castle steward personally, and I will send word to him about your help here.|||{{N|kuldan_bc_10||||}}|};
+{kuldan_bc_10|For the glory of Feygard, the people of Loneford may live on thanks to your help.|loneford:55|||};
+
+{kuldan_guard|What? Talk to the boss.||||};
+	</string>
+
+	<string name="conversationlist_loneford_3">
+[id|message|progressQuest|rewardDropListID|replies[text|nextPhraseID|requires_Progress|requires_itemID|requires_Quantity|]|];
+{sienn|Ha! You look funny. You small.|||{
+	{Who are you?|sienn_who_1||||}
+	{What is that thing you are keeping around?|sienn_pet_1||||}
+	}|};
+{sienn_who_1|Me, Sienn. I strong!|||{
+	{What is that thing you are keeping around?|sienn_pet_1||||}
+	}|};
+{sienn_pet_1|Pet, cute!\n(Sienn makes cuddly sounds while scratching the pet under its chin.)|||{
+	{Who are you?|sienn_who_1||||}
+	{Did you know that Taevinn thinks you caused the illness here in Loneford?|sienn_pet_2|loneford:24|||}
+	}|};
+{sienn_pet_2|Sienn not ill! Sienn stong!||||};
+{sienn_pet|*Shriek!*\n(The creature looks up at you, showing all its teeth, while making a high-pitched piercing sound.)|||{
+	{There, there. Easy now.|X||||}
+	{*slowly back away*|X||||}
+	}|};
+
+{siola|Hello there. Have you come to browse my selection of items?|||{
+	{Yes, let\'s trade.|S||||}
+	{What\'s the deal with Sienn over there with his pet?|siola_sienn_1||||}
+	}|};
+{siola_sienn_1|I don\'t know where he got it from. Anyway, they don\'t harm anyone, so I\'m fine with them being in here. I figured someone should help them have some place to stay, and no one else wanted to help them, so I let them stay here.|||{{N|siola_sienn_2||||}}|};
+{siola_sienn_2|Sienn may be a bit thick, but he sure can be funny when you get to know him and he trusts you. He can do a lot of those hilarious facial expressions.||||};
+	</string>
+
+	<string name="conversationlist_loneford_4">
+[id|message|progressQuest|rewardDropListID|replies[text|nextPhraseID|requires_Progress|requires_itemID|requires_Quantity|]|];
+{grimion|Hello and welcome to Loneford. Please have a seat, I\'ll be right there.|||{
+	{Do you have anything to eat around here?|grimion_trade_1||||}
+	{Is there a place where I can get some rest around here?|grimion_rest_1||||}
+	}|};
+{grimion_trade_1|Sure, have a look.|||{{N|S||||}}|};
+{grimion_rest_1|Sure, the guards have set up some beds downstairs. Go talk to Arngyr down there, he might be able to help you.||||};
+
+{loneford_tavern_room|Arngyr grabs you by the shoulder and pulls you back.\nIf you want to rest over there, you need to check with me first.||||};
+{arngyr||||{
+	{|arngyr_back_1|nondisplay:19|||}
+	{|arngyr_1||||}
+	}|};
+{arngyr_1|Yes, can I help you?|||{{Mind if I use one of the beds back there?|arngyr_2||||}}|};
+{arngyr_2||||{
+	{|arngyr_3|loneford:55|||}
+	{|arngyr_4||||}
+	}|};
+{arngyr_3|Oh no, not at all. Go ahead. After all you have done for us here in Loneford, it would be a privilege to be able to give something back to you.|nondisplay:19||{{N|arngyr_6||||}}|};
+{arngyr_4|These beds are mostly used by us guards. But I guess I could make an exception since you\'re just a kid. Shall we say, 600 gold and you may use it?|||{{Sure, here is the gold.|arngyr_5||gold|600|}{What?! That\'s a bit much, don\'t you think?|arngyr_7||||}}|};
+{arngyr_5|Thank you.|nondisplay:19||{{N|arngyr_6||||}}|};
+{arngyr_6|Use the bed in the back over there as much as you like.|||{{Thanks|X||||}}|};
+{arngyr_7|Look, kid. I make the rules around here. If that\'s my price then that\'s my price. Take it or leave it.|||{{Fine, here is the gold|arngyr_5||gold|600|}{Nevermind then|X||||}}|};
+{arngyr_back_1|Hello again. I hope the bed is comfortable enough.||||};
+
+{loneford_chapelguard|Walk with the Shadow, child.||||};
+
+{wallach|Oh, poor old Selgan. Why did it have to be him? I wonder who is next, and I fear for the worst.||||};
+{mienn|I can\'t see how we could make it without the help of those nice guards from Feygard around here. We are truly lucky to have their assistance.||||};
+{conren|We are lucky to have Feygard here helping us.||||};
+{telund|Who are you? Have you seen my father Selgan? They all tell me he will be back shortly, but they are all lying! I know it, I know it! He wasn\'t home yesterday, and he isn\'t home today.||||};
+
+{loneford_tavern_patron|This is no place for a kid like you. I think you better leave now.||||};
 	</string>

 </resources>
--- a/AndorsTrail/res/values/content_droplist.xml
+++ b/AndorsTrail/res/values/content_droplist.xml
@@ -365,12 +365,60 @@
 <string name="droplists_v0610_npcs">
 [id|items[itemID|quantity_Min|quantity_Max|chance|]|];
 {tinlyn_bells|{{tinlyn_bells|4|4|100|}}|};
-{fieldwasp_unique|{{gold|0|10|70|}{hadracor_waspwing|1|1|100|}}|};
-{tinlyn_sheep|{{meat|0|3|70|}{tinlyn_sheep_meat|1|1|100|}}|};
+{fieldwasp_unique|{
+	{gold|0|10|70|}
+	{hadracor_waspwing|1|1|100|}
+	}|};
+{tinlyn_sheep|{
+	{meat|0|3|70|}
+	{tinlyn_sheep_meat|1|1|100|}
+	}|};
+{feygard_shipment|{{fg_ironsword|10|10|100|}}|};
+{vg_smith_fg_items|{{fg_ironsword_d|10|10|100|}}|};
+{hadracor_reward|{{gloves_woodcutter|1|1|100|}}|};
+{larva_boss|{
+	{gold|0|9|100|}
+	{gem2|1|1|100|}
+	{health_minor|1|1|100|}
+	{erinith_book|1|1|100|}
+	}|};
+{keknazar|{
+	{gold|0|45|70|}
+	{bone|1|3|100|}
+	{health_minor|1|2|100|}
+	{necklace_shield_0|1|1|100|}
+	}|};
+{rogorn|{
+	{gold|0|50|70|}
+	{rogorn_qitem|1|1|100|}
+	{longsword_hard_iron|1|1|100|}
+	{health_minor|1|2|100|}
+	}|};
+{rogorn_henchman|{
+	{gold|0|20|70|}
+	{rogorn_qitem|1|1|100|}
+	{health_minor|1|2|100|}
+	}|};
+{buceth|{
+	{gold|0|20|70|}
+	{buceth_vial|1|1|100|}
+	{health_minor|1|4|100|}
+	{vial_empty2|1|3|100|}
+	{ring_life|1|1|100|}
+	}|};
 </string>

 <string name="droplists_v0610_monsters">
 [id|items[itemID|quantity_Min|quantity_Max|chance|]|];
+{fieldwasp|{{gold|0|10|70|}{insectwing|1|1|30|}}|};
+{larva_1|{{gold|0|5|70|}{gem1|1|1|30|}}|};
+{larva_2|{{gold|0|9|70|}{gem1|1|1|30|}}|};
+{fieldcritter_0|{{gold|0|4|70|}{shell|1|1|30|}}|};
+{fieldcritter_1|{{gold|0|9|70|}{shell|1|1|30|}}|};
+{fieldcritter_2|{{gold|3|15|70|}{gland|1|1|30|}{ring1|1|1|5|}}|};
+{fieldcritter_3|{{gold|3|17|70|}{gland|1|1|30|}{ring1|1|1|5|}{ring2|1|1|5|}}|};
+{carrioncrawler|{{gold|0|4|70|}{bone|1|3|20|}{boots_sewn|1|1|5|}}|};
+{rivertroll|{{gold|0|70|70|}{bone|3|5|50|}{meat|3|5|30|}{club_fine_wooden|1|1|100|}}|};
 </string>

 </resources>
--- a/AndorsTrail/res/values/content_itemlist.xml
+++ b/AndorsTrail/res/values/content_itemlist.xml
@@ -269,6 +269,7 @@
 {gloves_troublemaker|items_armours:36|Troublemaker\'s gloves|4||0|501|1|1||||7|4||||4||||||||||||||||||||||};
 {gloves_guards|items_armours:37|Guard\'s gloves|4||0|636|1|3||||3|||||5||||||||||||||||||||||};
 {gloves_leather_attack|items_armours:35|Leather gloves of attack|4||0|510|1|3||||13|||||-2||||||||||||||||||||||};
+{gloves_woodcutter|items_armours:35|Woodcutter\'s gloves|4||0|426|1|3||||8|||||1||||||||||||||||||||||};
 {boots_crude_leather|items_armours:28|Crude leather boots|5||0|31|1||||||||||1||||||||||||||||||||||};
 {boots_sewn|items_armours:28|Sewn footwear|5||0|73|1||||||||||2||||||||||||||||||||||};
 {boots_coward|items_armours:28|Coward\'s boots|5||0|933|1|||-1|||||||2||||||||||||||||||||||};
@@ -310,6 +311,7 @@
 {rogorn_qitem|items_books:7|Piece of painting|31|1|1|0|||||||||||||||||||||||||||||||||};
 {fg_ironsword|items_weapons:0|Feygard iron sword|0|1|1|0|1||||5|10|||1|5|||||||||||||||||||||||};
 {fg_ironsword_d|items_weapons:0|Degraded Feygard iron sword|0|1|1|0|1||||5|-50|||0|0|||||||||||||||||||||||};
+{buceth_vial|items_consumables:47|Buceth\'s vial of green liquid|31|1|1|0|||||||||||||||||||||||||||||||||};
 	</string>

 </resources>
--- a/AndorsTrail/res/values/content_monsterlist.xml
+++ b/AndorsTrail/res/values/content_monsterlist.xml
@@ -288,7 +288,7 @@
 	<string name="monsterlist_v0610_monsters1">
 [id|iconID|name|tags|size|maxHP|maxAP|moveCost|attackCost|attackChance|criticalChance|criticalMultiplier|attackDamage_Min|attackDamage_Max|blockChance|damageResistance|droplistID|phraseID|hasHitEffect|onHit_boostHP_Min|onHit_boostHP_Max|onHit_boostAP_Min|onHit_boostAP_Max|onHit_conditionsSource[condition|magnitude|duration|chance|]|onHit_conditionsTarget[condition|magnitude|duration|chance|]|];
 {young_larval_burrower|monsters_rltiles2:164|Young larval burrower|larva_1|1x1|30|10|5|5|120|35|3|1|6|25||larva_1|||||||||};
-{larval_burrower|monsters_rltiles2:164|Larval burrower|larva_2|1x1|35|10|5|5|120|35|3|1|6|25||larva_1|||||||||};
+{larval_burrower|monsters_rltiles2:164|Larval burrower|larva_2|1x1|35|10|5|5|120|35|3|1|6|25||larva_2|||||||||};
 {larval_boss|monsters_rltiles2:164|Strong larval burrower|larva_boss|1x1|35|10|5|5|120|35|3|1|6|25||larva_boss|||||||||};
 {lostsheep1|monsters_karvis2:8|Sheep|tinlyn_lostsheep1|1x1|5|10|5|5|10|||0|1|5||tinlyn_sheep|tinlyn_lostsheep1||||||||};
 {lostsheep2|monsters_karvis2:8|Sheep|tinlyn_lostsheep2|1x1|5|10|5|5|10|||0|1|5||tinlyn_sheep|tinlyn_lostsheep2||||||||};
@@ -349,7 +349,7 @@
 {loneford_villager4|monsters_men:2|Villager|loneford_villager4|1x1||10|5|5|||||||||loneford_villager4||||||||};
 {loneford_wellguard|monsters_rltiles1:72|Guard|loneford_wellguard|1x1||10|5|5|||||||||loneford_wellguard||||||||};
 {mienn|monsters_rltiles1:87|Mienn|mienn|1x1||10|5|5|||||||||mienn||||||||};
-{minarra|monsters_rltiles1:86|Minarra|minarra|1x1||10|5|5|||||||||minarra||||||||};
+{minarra|monsters_rltiles1:86|Minarra|minarra|1x1||10|5|5||||||||shop_minarra|minarra||||||||};
 {puny_warehouserat|monsters_rats:1|Warehouse rat|puny_warehouserat|1x1|5|10|5|5|50|||1|1|30||rat|||||||||};
 {rolwynn|monsters_rltiles1:77|Rolwynn|rolwynn|1x1||10|5|5|||||||||rolwynn||||||||};
 {sienn|monsters_rltiles1:66|Sienn|sienn|1x1||10|5|5|||||||||sienn||||||||};
@@ -367,6 +367,7 @@
 {woodcutter_5|monsters_men2:2|Woodcutter|woodcutter_5|1x1||10|5|5|||||||||woodcutter_5||||||||};
 {rogorn|monsters_rltiles1:63|Rogorn|rogorn|1x1|145|10|5|3|90|||5|9|120|5|rogorn|rogorn||||||||};
 {rogorn_henchman|monsters_rogue1:0|Rogorn\'s henchman|rogorn_henchman|1x1|130|10|5|3|80|||5|8|120|4|rogorn_henchman|rogorn_henchman||||||||};
+{buceth|monsters_men2:7|Buceth|buceth|1x1|75|10|5|3|80|100|2|3|9|120|4|buceth|buceth||||||||};
 	</string>

 </resources>
--- a/AndorsTrail/res/values/content_questlist.xml
+++ b/AndorsTrail/res/values/content_questlist.xml
@@ -27,6 +27,7 @@
 	{50|Bucus has allowed me to enter the hatch in the derelict house in Fallhaven. I should go talk to Umar.||0|}
 	{51|Umar in the Fallhaven thieves guild recognized me, but must have me mixed up with Andor. Apparently, Andor has been to see him.||0|}
 	{55|Umar told me that Andor went to see a potion maker called Lodar. I should search for his hideaway.||0|}
+	{61|I heard a story in Loneford, where it seemed like Andor had been in Loneford, and that he might have had something to do with the illness that the people are suffering from there. I am not sure if it actually was Andor. If it was Andor, why would he have made the people of Loneford ill?||0|}
 	}|};
 {mikhail_bread|Breakfast bread|1|{
 	{100|I have brought the bread to Mikhail.||1|}
@@ -53,7 +54,7 @@
 	{100|I have brought the bones to Thoronir. He is now able to supply me with bonemeal potions.\nI should be careful when using them though, since Lord Geomyr has banned their use.|90|1|}
 	}|};
 {jan|Fallen friends|1|{
-	{10|Jan tells me his story where, he and his two friends Gandir and Irogotu, went down the hole to dig for a hidden treasure, but they started fighting and Irogotu killed Gandir in his rage.\nI should bring back Gandir\'s ring from Irogotu, and see Jan when I have it.||0|}
+	{10|Jan tells me his story, where he and his two friends Gandir and Irogotu, went down the hole to dig for a hidden treasure, but they started fighting and Irogotu killed Gandir in his rage.\nI should bring back Gandir\'s ring from Irogotu, and see Jan when I have it.||0|}
 	{100|Irogotu is dead. I have brought Jan the ring of Gandir, and avenged his friend.|150|1|}
 	}|};
 {bucus|Key of Luthor|1|{
@@ -172,6 +173,7 @@
 	{120|To make the attacks on the Blackwater Mountain settlement stop, Harlenn wants me to assassinate Guthbered in Prim.|||}
 	{130|I have started a fight with Guthbered.|||}
 	{131|I told Guthbered that I was sent to kill him, but I let him live. He thanked me deeply, and left Prim.|210||}
+	{149|I have told Harlenn that Guthbered is gone.|||}
 	{150|Harlenn thanked me for the help I have provided. Hopefully, the attacks on the Blackwater Mountain settlement should stop now.|500||}
 	{240|I am now trusted in the Blackwater Mountain settlement, and all services should be available for me to use.||1|}
 	{250|I have decided to not help the people of the Blackwater Mountain settlement.||1|}
@@ -198,6 +200,7 @@
 	{80|In order to make the attacks on Prim stop, Guthbered wants me to kill Harlenn up in the Blackwater Mountain settlement.|||}
 	{90|I have started a fight with Harlenn.|||}
 	{91|I told Harlenn that I was sent to kill him, but I let him live. He thanked me deeply, and left the settlement.|210||}
+	{99|I have told Guthbered that Harlenn is gone.|||}
 	{100|Guthbered thanked me for the help I have provided to Prim. Hopefully, the attacks on Prim should stop now. As thanks, Guthbered gave me some items and a forged permit so that I can enter the inner chamber up in the Blackwater Mountain settlement.|500||}
 	{140|I have shown the forged permit to the guard and was let through to the inner chamber.|||}
 	{240|I am now trusted in Prim, and all services should be available for me to use.||1|}
@@ -313,7 +316,16 @@
 	{23|Talion, the chapel priest in Loneford, thinks that the illness is the work of the Shadow, as punishment for Loneford\'s lack of devotion to the Shadow.|||}
 	{24|Taevinn in Loneford is certain that Sienn in the southeast barn has something to do with the illness. Apparently, Sienn keeps a pet around that has approached Taevinn in a threatening manner several times.|||}
 	{25|I should go see Landa in the Loneford tavern. Rumor has it that he saw something that he doesn\'t dare tell anyone.|||}
-	{30|I should go see Landa in the Loneford tavern. Rumor has it that he saw something that he doesn\'t dare tell anyone.|||}
+	{30|Landa confused me with someone else at first. He apparently saw a small boy doing something around the town well during the night before the illness started. He was scared to talk to me at first since he though I looked like the boy he had seen. Could it have been Andor that he saw?|||}
+	{31|Also, the night after he saw the boy at the well, he saw Buceth taking samples of the water in the well. Strangely enough, Buceth has not gotten ill like the others in the village.|||}
+	{35|I should go question Buceth at the Loneford chapel about what he was doing at the well, and about whether he knows anything about Andor.|||}
+	{41|I have bribed Buceth into talking to me.|||}
+	{42|I have told Buceth that I am ready to follow the Shadow.|||}
+	{45|Buceth tells me that he is assigned by the priests in Nor City to make sure the Shadow casts its glow over Loneford. Apparently, the priests had sent a boy to do some business in Loneford, and Buceth was tasked with gathering some samples from the water well.|||}
+	{50|I have attacked Buceth. I should bring any evidence that Buceth has on him to Kuldan, the guard captain in the longhouse in Loneford.|||}
+	{54|I have given the vial that Buceth had on him to Kuldan, the guard captain in Loneford.|||}
+	{55|Kuldan thanked me for solving the mystery of the illness in Loneford. They will start bringing in water with help from Feygard instead of drinking from the well from now on. Kuldan also told me to visit the castle steward in Feygard if I want to help further.|1500|1|}
+	{60|I have promised to keep Buceth\'s story a secret. If Andor was indeed here, he must have had a good reason for doing what he did. Buceth also told me to visit the chapel custodian in Nor City if I want to learn more about the Shadow.|1500|1|}
 	}|};
 </string>

--- a/AndorsTrail/res/values/loadresources.xml
+++ b/AndorsTrail/res/values/loadresources.xml
@@ -129,6 +129,12 @@
 		<item>@string/conversationlist_fields_1</item>
 		<item>@string/conversationlist_loneford_1</item>
 		<item>@string/conversationlist_loneford_2</item>
+		<item>@string/conversationlist_buceth</item>
+		<item>@string/conversationlist_talion</item>
+		<item>@string/conversationlist_taevinn</item>
+		<item>@string/conversationlist_loneford_kuldan</item>
+		<item>@string/conversationlist_loneford_3</item>
+		<item>@string/conversationlist_loneford_4</item>
    </array>

    <array name="loadresource_monsters">
--- a/AndorsTrail/res/xml/blackwater_mountain1.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain1.tmx
@@ -55,12 +55,12 @@
 </layer>
 <layer name="Objects" width="20" height="20">
  <data encoding="base64" compression="zlib">
-   eJyNU91NwzAQdpCdKVAllxEIfWCAPiC2aBcIoQM4Ud/YomzACN0ARmAR7qvvyOXiUD7p5Et8P9/9uA3OvZAk79yR5GSkobszybZyblVn/bbOdwB8Iv1rOc6OpCe5qd0vcH8f3ASIl9gWsZBfbJATdx0L4jbGHzj4UX+s8rmnc0PyWmUOA9n0PvPbKX6CZL5PpL+TfBixsPykD8Caa0fut5DlbOS5muZe4nfJxXXqHn6S/hXGs8SvV/we2MYXbHWOgU/M+Il7euT+lfqlMSie8NWzAGRGun8A+G0WZiK8tuy7UnslaMK8f72f7ozMRnqIeLFQU8O+wg//v/8hiHfNJql3IiegZyI7rXu1DmN/sVtiLzV3hb0Rn6j+Deq9II+10bE6xU+g3/RezbWUI5lYJZ4xTH007O5IzD5MzxLPA7/FUlzB5f350fcuLPdT1/dXPYgJHbFimPfA1ppMDP0mkp/vyhI/0VuTS99dm4n0MRX0kp1w+gFTVH7q
+   eJyNU91Nw0AMvqC7ToEqpYxA6AMD9AGxRbtACB3gEvWNLcoGjNANYAQWwV/PJo7rUD7JOifnn88/16YQXkhyDOFAcjTS0N2JZFOFsFwU/XZR7gD41PSv5Thbkp7kZhF+gfv7FCZAvMy2iIX8YoOcuOtYELcx/sA+jvpjVc4dnWuS16pwGMimj4XfVvETZPN9JP2d5MOIheUnfQBWXDtyv6UiJyPP1TT3HL9zLq5T9/CT9K80nh6/XvF7YJvo2OocA5+Y8RP39MD98/qlMSie8NWzAGRGun8A+K1nZiK8Nuy7VHslaNJl//o43RmZjfQQ8WqnpoZ9hR/+f/9DEO+aTVbvRE5Az0R2Wvdqlcb+YrfEXmrunL0Rn1r9G9R7QR5ro2N1ip9Av+mdmquXI5tYHs86TX007O5IzD5NT4/nnt+iF1dwfn9x9L1L8/3U9f1VD2JCR6w6XfbA1ppNDP0mZO/1rszxE701ufTdtZlIH7Oje3bC6QcHwX50
  </data>
 </layer>
 <layer name="Above" width="20" height="20">
  <data encoding="base64" compression="zlib">
-   eJxjYCAeFLIyMBSxkqABC2gG6m+hwAx0N0wGsqdQ6CZy7R5pAJffKQmXQjL0jfR4oAXAFQ9DJaxxuRMmjk6TawclAGYvITeQ4j5cboL5ldYAAF/EEJw=
+   eJxjYCAeFLIyMBSxkqABC2gG6m+hwAx0N0wGsqdQ6CZy7R5pAJffKQmXQjL0jfR4oAXAFQ9DJaxxuRMmjk6TawclAGYvITcgqyPXTTC/0hoAAKtXERI=
  </data>
 </layer>
 <layer name="Walkable" width="20" height="20">
--- a/AndorsTrail/res/xml/blackwater_mountain10.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain10.tmx
@@ -55,12 +55,12 @@
 </layer>
 <layer name="Objects" width="20" height="20">
  <data encoding="base64" compression="zlib">
-   eJyFUztOw0AQjc3anANugIQo6PgoEiICUUaUcYmQQnCTzk7ooICeAhq4AS44gGvkC0RwA+hhnryjHY/XeKSnXXt23r757CQaDGaECSEnsK1MvQ6Del0a51vQfmpjZv+sV5Zvw65h7Pi0ZR0cmdXF68I048AHrexn3V36SvIXhB+Ke19v6/Dpy0y3vlLpWQot2DPfKGjXQueWRYNeY77UNHllf+DLlK7t0P1bCR/4uKY6JiHfjsW1py6pOo/cwLel8hip2G/7jdolij9Rd+n6Sfsydd6VafYBeWzG7fOyH6H1c+25L744GOblM2pj2PFfgq2wGitVt7m9M7f67inmgXArdMFeaF5fxcxWxnHC7uIac5ED+J6I41n1BLxvxFV43gBzPsY1mC81zfdxI+bplM4cET4sn+yHfiMcA9sNXI6YQ3BwnmPB57Nc8ELLAc34PuGQcGI1g4Pz1HyFcb3A+rtWzwjPxh7xnNP+WOBS7C9iN8t9hvkBHzSchf441lKoeslvuZd8sLIj3md6BjlmHPefkXf9AfXac6Q=
+   eJyFUztOw0AQtc3anANugIQo6PgoEiICUUaUcYmQQnCTzk7o4AgU0MANcMEBXCNfIIIbQA/z5B3teLzGIz3N2rPz/ObjaRwEc8KUUBDY1qbxo7DxK+NiSzrPbM78H39j+basjxLHpy3v4citLvZL084DH7RynHX36asoXhJ+KO99s6vDpy83/foqpWcltODMfOOw2wtdWx4Hg8Z8mWnzyvkglitdu5F7txYx8HFPdU5KsT2LW09fMnUftYFvR9UxVrnf9hm9SxV/qr6l+yftyzR116Y9B9SxnXTvy3lENs6957n48mDYl8+4i1HPewm20mqsVd8W9puFae/fvdAFe6F9fRU7WxvHCXtIGixEDeB7Io5nNRPwvhFX6fkHmPMxacB8mdJ3J/bpnO6cED4sn5yH/kc4B7Yfuhqxh+DgOieCz2eF4IWWI9rxQ8Ix4cxqBgfXqflK42YB/7vR7AjvxgHxXNL5VOBanK8St8tDhv0BHzRcRP481lKqfslneZZ8sKon32d6Bzlnkgzfkd/6A9PXcnc=
  </data>
 </layer>
 <layer name="Above" width="20" height="20">
  <data encoding="base64" compression="zlib">
-   eJxjYBgYUMjKwFDEOkCWowFqueUDM+VmIIP3VDZvOIDBlG4oBbD0ksxCHfP+Uzm9jDTzvjBS1zxaA5h7Pw+guwFtDgzt
+   eJxjYBgYUMjKwFDEOkCWowFqueUDM+VmIIP3VDZvOIDBlG4oBbD0ksyCKj4R6L9JZPjxP5XTy0gz7wsjdc2jNYC59/MAuhsAjxEOGg==
  </data>
 </layer>
 <layer name="Walkable" width="20" height="20" visible="0">
--- a/AndorsTrail/res/xml/blackwater_mountain14.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain14.tmx
@@ -55,12 +55,12 @@
 </layer>
 <layer name="Objects" width="30" height="20">
  <data encoding="base64" compression="zlib">
-   eJy1VdFtgzAQxdTNIF2hVT8YAFVRt0gXaEkGgLBbBmGE5L/lBb/6OM4mkdonWRhzvvN7d2eax6LYjaMZx9c42jDHWqfeafMp3mkn8VwWxUs5zWs3vQNcA3aG33YlhnWWFBDXQmP59ZNvKwbQ+6Uu98bVHIDBT8+Tt/li/SjORm3vAfY9bZZ+rt8SvHiuzkf+ZfBx8rfFhaa98MP5UeyXGgM4JzEo+34lrtwL7EMeti7uHRJ8U9pc8+7n9Svr2cJl/H7wsQ7aEPvs5jaSU2tw1LVQuWiXAr5XLq8Vdf0Y7V7FeHN27f/6Xql7YOvSdjIPB1EP1EnzpU2XqblB+Sg3Sxt+gy1zAP1rt6yFk1/XmDiGHHeJPXUiD5qvRE4/ADXei9o6ZPxrVEZ+ybtW9ajx/RB9pGzqzNn1/Unedahp5sXqq07Ek70IoB+rBN/Wx7sjxTcH1ILuEY690Ksz9NgqrQnEHVbqC1r3fn5nEYOP/4Sz4sDel3zlutUbfwH6lf9PPHv+u27spxxk3xLQidq/i7uWc63Pf+ByQ6wf0QuITg==
+   eJy1Ve1RwzAMjYPoIKwAx48MkON63aIsAGkGyMdQbBAGYIOM0P6HvMbCiiI7/QHvzhcnliW/J8mp7rPsOI1qGu/TaPwc31r1zjZv4p3tJB7zLHvK53np5neAvwFHw2+zEcM6SwyIa6Gy/NLs24oB9LTWZSvuJ83PLwp8pX9g9GsD2XzxvRNnY20lPih+FgD7HnZrP9e1CC8+V0uBf+59DIl48izQtBd+eN4JG6kxgHMyRmXfb/CUe1+nHJx8HvYu7B0jfGPaXPNOy/qV9WzhMq3XFOqg8bHPbmkjOTUGR10LhQt2MWC9cGmtWFdo9CzGi7Nr/9f3Rt0Dexe3k3moRT2wTpov27SJmhuVj3y3tuE12HIOoH/p1rUw0LbGjM7nuI3sKSN50HwlUvoBqPFe1Fad8K9RGPll3qWqR43vu+AjZlMmzq7vT+Zd+prmvFh91Yp4shcB9GMR4dtQuDtifFNALege4XESerWGHnulNQNxx436gtY9Le8sxkjhn3BWHLj3JV/53eqNvwD7lf9PPHv+d93YTynIvmVAJ9b+IO5anmt9/gOXG2L9AFpbi88=
  </data>
 </layer>
 <layer name="Above" width="30" height="20">
  <data encoding="base64" compression="zlib">
-   eJzVVFsKwjAQjFpP4gnrETxVvvvVA+QeFup/daEDcdlXQxAc6EfTZHdmdtKU+qEMKc2f53b+Xufv/4T7te0c+UAoQ9+6HHmvv1z61DuKreqbFa0Sxkp/7QWtR7x5/kgv+Hi8tDkDyMMU8Gg0+kg8pAxofI/kJJrRTakJraRd20Ow9EqAl1JNnkG+J5pR7l89X00L7ZkcbuQ/z34085aH9R6pXuQsOALw+XXyz/H7aM2IENELv1qAvl62wNPLjYds6H0wDtq/grhEvJYg6fU8XvdeVs+i+INvLbmqwec7B+9n1CetHnivwTpeDjV9bxaOSQg=
+   eJzVVMENwjAMDBQmYUI6AlPl3VcG6B4glX+LpVgyVmwfUYXUk/poktp3l3NT2g/zJaXyeW7n73X9fiSM12PUfQ371kOxdva9C/3SC1pHvHn+SS/ziXhR9j2Uuj8F57hnxEci15oyAxbfX3KCZtTKAGsl7V5OPL0tsJetmln5q8/ofY+T1C/v19JCZ6aAG/mvs49mHpm1dWjXQ+dU+sM+v0/xd3oevTsiIHrZrx5w3yhbzDPKTYTs6H0oDta/grggXrfQ0ht5vNReXs/Z8If3enIloe+3gPOJ+mTVY94LWCfKoaVvAyKmRew=
  </data>
 </layer>
 <layer name="Walkable" width="30" height="20">
--- a/AndorsTrail/res/xml/blackwater_mountain15.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain15.tmx
@@ -50,12 +50,12 @@
 </tileset>
 <layer name="Ground" width="15" height="30">
  <data encoding="base64" compression="zlib">
-   eJzNlNENgzAMREPoBu0WXZsNYIN0g46QRapKPWFOZ8v+68cJEvxsnxKzLa1tpIPWQ8R4uvXreu067i30oNh713Gs6fQyhSwzi97Agvl6ey2nIpbrsbeoD+QeIh9yPtsp7nkE+SMWueGzwuI7fHL9DGt7wP7+e3rs7uSxOaK6/8Ty/VLy2MzseKw3O1ZcuzpHNj7yqebIspFP1RPvef4yrCf1X2DWuwfsJ7pDircewB6CzfiwLJQ5I2bxXjkjZitnxGw0Y9AHhk0lng==
+   eJzNldENgzAMREPoBu0WXZsNYIN0g46QRapKPWFOZ8v+68cJAn62T4lhW1rbSAeth4jxdOvX9dp13FvoQbH3ruNY0+llCllmFr2BBfP19lpORSzXY29RH8g9RD7kfLZT3PMI8kcscsNnhcV7+OT6Gdb2gOf77+qxu5PH5ojq/hPL50vJYzOz47He7Fhx7eoc2fjIp5ojy0Y+VU/8zPOXYT2p7wKz3jlgP9UzZD2APZKs8sv/gsweMYv7yh4xW9kjZqMZgz4kkyYY
  </data>
 </layer>
 <layer name="Objects" width="15" height="30">
  <data encoding="base64" compression="zlib">
-   eJydVcFtwzAMlAXDg7T95edH0VfQOonRV9GkaWbySB5BA2iTZICKiA5hznRk9ADBssUTeRQpO+dcrJ0b0mD01W0uNr5xLmQ7sQ/E0e+aC4yGDwsWt4QXf8999su5okv0vSfuax6fabTN/bq2B0bKg6xJDF3OFedoDpsUb5fGyl2fWyN+7MXaPuh9769x4UyR92jEYnEfQe9pcdus+6mZcnUuLG5HHNZ5rub9hvp2LrrORsrBEr2iMRJvmPELXdwPup/CA67kqdQXP8m2z7WxS8+jn3Ii+WOsjW/gBNLKef9aWMOSf0960I/wpXtH50jH/5178E3dA6wpzvTW2jh7Pdd1WdKJ+47PUoB+Ra9CZ2vUvWBQvJPy+6u4XP+A1P2lmtaQQHIETaxH1/Ep1xCwy3O+v7hvZU3ikxo85HE0/GAPvmP+c5djj74q98ZYl/9dsLH2Qtx/GdFOgw==
+   eJydVcFtwzAMlAXDg7T95edH0EcRNE5i9FUkbZCZPJJH0ADapB2gIqJDmDMdGT2AsB3xRB5FKs45F2vnhmSMvrq9i49vnAvZT/wDcfS35gKjEcOCxS3hxd9zn/1yrugSfe+Ju872kaxt7te1PzBSHWRNcuhyrbhGc9ilfLtkK3d97o38sRdr29L3yV/zwpmi7tHIxeI+gt7T4rZZ91Mz5epaWNyOOKzzp5qPG+rbueg+G6kGS/SKxki8YSYudPE86HkKD7hSp9JcfCffPvfGIT3PfsqJFI+xMX4DJ5BWrvvnwh6W+nvSg3lELD07ukY6/2OewVd1D7CmODNbG+Ps9bvuy5JO3Hd8lgLMK2YVOluj7wWD4l1U3JPicv8D0ve/1bSH3nKNoIn16D6+5B7ScQV8f/HcyprkJz34le1sxMEefMf85y7HHn1Vno2xLv93wcfaC3n/AW+MTsg=
  </data>
 </layer>
 <layer name="Above" width="15" height="30">
--- a/AndorsTrail/res/xml/blackwater_mountain29.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain29.tmx
@@ -55,12 +55,12 @@
 </layer>
 <layer name="Objects" width="22" height="16">
  <data encoding="base64" compression="zlib">
-   eJxjYKAdMGdnYCgEYk4WCC0LZcviEbcA4pXMEP5mILuWHUKD+DDgDuQ3ArEkC4QGAUmoPC5xD6i5IP4sqNxsdoQ8COQxk+fPlVB9q4DmtQHxaiBOZsGvhxRzcYE6Ngh9AUr/h6pfQsBuQubCwgFG/yegHmYfyNzzQPYFKB+ZjQ0gm3uPDZUGgWQkc1XZIRgEkNkgAAsHGP0eydx3bKg0srk7gep2ofltG5FpAJ97TwLNuArER5HwMSLNBbkTFJ4w92YD9QmzY1dLKJ7xuRdkLicOc0kB6OG7kZWBQQSHuSBxkDwx4B40HGDuPYhmLrLfQeIHiTQX5E57doR7LxJw70UizSUXAAAZZD4G
+   eJxjYKAdMGdnYCgEYk4WCC0LZcviEbcA4pXMEP5mILuWHUKD+DDgDuQ3ArEkC4QGAUmoPC5xD6i5IP4sqNxsdoQ8COQxk+fPlVB9q4DmtQHxaiBOZsGvhxRzcYE6Ngh9gQ1VfAkBuwmZCwsHYsMDZh/I3PNA9gUoH5lNCNxjQ6VBIBnJXFV2CAYBZDYIwMKhDi0cQOAdGyqNbO5OoLm70Py4jUg/43PvSaAZV4H4KBI+RqS5IHeCwhPm3mygPmF27GoJxTM+94LM5cRhLikAPXw3sjIwiOAwFyQOkicG3IOGA8y9B9HMRfY7SPwgkeaC3GnPjnDvRQLuvUikueQCAGntOg4=
  </data>
 </layer>
 <layer name="Above" width="22" height="16">
  <data encoding="base64" compression="zlib">
-   eJxjYKAd+M9Mf3OtmFFpXKCMnTRzvZhRaVLAQIQDIRAJ9H8UNAwUgfRCpPAYjO7FB97jMRfdTmq5YdRc8szlxJLvqGGuMJHmoqcVfGmHHgAAP5sZSQ==
+   eJxjYKAd+M9Mf3OtmFFpXKCMnTRzvZhRaVIAvcKBFHsigf6PgoaBIpBeiBQelJiLD9DK3PfMuPlDzS/D3VxOLPmOGuYKE2kuvrQyEAAA7wMdQQ==
  </data>
 </layer>
 <layer name="Walkable" width="22" height="16">
--- a/AndorsTrail/res/xml/blackwater_mountain30.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain30.tmx
@@ -55,12 +55,12 @@
 </layer>
 <layer name="Objects" width="30" height="20">
  <data encoding="base64" compression="zlib">
-   eJzVVcuNwkAMNWDNNpASkLgjDtyQVlSAtgJEGXwayC5cEQG2pm1kW2AMscZY9hAOkeBJVuZnP48/EwCAE8IVZfxiAPip522iqjmYi+anlnmZc/WAqzL2VuifKWLMRsG2VdTrpdInexbPs5g6vMwhYfGNOrbu0Flvgn7GJ8bUsf9Zr/8JXzeY5nSHQTftjcU4F095btsD2EX5Cmm8VrpWfaC4l3VH5udz2p9z5PmNsghpvBe1+O34ILkwE9uZs3fAmzCWYsycHN9HPVgoDqr7uVqTsX4WA0OX7Ol45+rewhFv0hRtv0WvCpk7irms4VL0oAYGv/84d7p2tD7vc43z+5XT85Dz9d3AOfHuZPWM1uMc/PeSHf1PojjLPPZVHgi676QNL09kr2m/Tj7ubVeqBpr8014JF6uFMtk=
+   eJzVVcsNwjAMjagVFugIlViAAzcuTICYADEGnwXK54oohZlYhBEghloxlhNaoUrlSVaTJvZz/EmMMaYE80LuvmCN2VXzNlFUHMSF87JlXuJcfeEqlLUVhPekLmZDq9tKq/+50Ed7Gk9TTAK8xMGh8T2S332QyCI+1eW9MV834Od4hkHPr43YOBZPvm/vuA9OZtaP10JXqw9g59LOSPy0T/pzcTxXJwvrx0dWi9uAD5wLIrGdBtZO8BbCko2Jk+L7rQdTwYF1Pxf/eKybYqDooj0Z71jdazjDW+qi7buoq+C5w5jzGs5ZD0qADfcf5U7WjtSndapxur9ieiHEfP03UE5CZ9J6RupRDu6JtyPfJIwzz2Mm8oCQfcdthPKE9ur267j/absQNVDnTesSnnFbM+0=
  </data>
 </layer>
 <layer name="Above" width="30" height="20">
  <data encoding="base64" compression="zlib">
-   eJxjYMAN/jPjkSQDgMwjxsyRaC+ldn9A0k+JvZUspNmLrP89kfYSqw4E+nC45z2afmLNw6UOJI7LLlziMH2UpC10f+Cy8wMW/xIb1pQAdDtIiTtKAMzdyOFAD3uxAVqUC8QASuOOXHupDajtDxAg1y/o+kg1h1y/kFte4QImbPTVNxTAYCwfAGcoNmQ=
+   eJxjYMAN/jPjkSQDgMwjxsyRaC+ldn9A0k+KvSaMqGKVLBDaiBFTPS4zYOA9kfaC1LngMN8JTbyPBbcZuNyBD+BSBxLHZRcucZg+StIWuj9w2fkBi3+JDWtKALodxMYxpQDmbuRwoIe92AAtygViAKVxR6691AbU9gcIkOsXdH2kmkOuX8gtr3ABEzb66hsKYDCWDwChUjVQ
  </data>
 </layer>
 <layer name="Walkable" width="30" height="20" visible="0">
--- a/AndorsTrail/res/xml/blackwater_mountain37.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain37.tmx
@@ -50,12 +50,12 @@
 </tileset>
 <layer name="Ground" width="15" height="15">
  <data encoding="base64" compression="zlib">
-   eJylktENgzAMRE2ar/6SnVkkG6QbwAaMwCJNFE5cT3Wh4uNkZPwu4UwezPJNLVK17ykGs7XWyXp9hM6gPzvcqyrVmW1nWx13Bn14wW8m9mldkx3PG/XhBb9v7C81L/i1e+DePFMueI3hM4MiOZzxzC4k9ivOt4GNlAXviH2U1R1BnCvvWs/0claf9AerPl5OOnu2J/03OVPtFef9G5/QYjE=
+   eJylktENhDAMQ3OFL35hvxuHRdigbAAbMAKLXKtinbEIReLDCgp5bnGYPmbTS61Ste+pDWZbqqOV2oTCoL843Jw0pJn9YHPtDwZ9eMFvIbazotH+zzv14QW/K/ZO2Qt++R64N8/EB159OGcQJYcaz+xKYr/ofBvYlrLgHbGPsrojiHPlXeuZXs7qMzjst6nvx8tJZ2t70n+TM9VedN7/ANxNYok=
  </data>
 </layer>
 <layer name="Objects" width="15" height="15">
  <data encoding="base64" compression="zlib">
-   eJxjYBi6gJWVPH0mTAwMImwQNog2ZoKYhSxOCkDWAzMLZg8y+M8MUfuZEcL/wkjYPHwAph9mJrJ5xkzY9RADKAmDz2h+oiSOkM1FDldcdsNAPDNuNbBwQY8bGIDFEQhgiydku9D9Si4AAOLeDrQ=
+   eJxjYBi6gJWVPH0mTAwMImwQNog2ZoKYhSxOCkDWAzMLZg8y+M8MUfuZEcL/wkjYPHwAph9mJrJ5xkzY9RADKAmDz2h+oiSOkM1FDldcdhPjPli4oMcNDMDiCASwxROyXeh+JRcAAJ+BDlI=
  </data>
 </layer>
 <layer name="Above" width="15" height="15">
--- a/AndorsTrail/res/xml/blackwater_mountain38.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain38.tmx
@@ -50,17 +50,17 @@
 </tileset>
 <layer name="Ground" width="30" height="18">
  <data encoding="base64" compression="zlib">
-   eJytVdENAiEMBXQDHMOtYQPd4NjAEVxESGxonm0pOT9eLueV99rSV2sMoX7ROq4phFecuKT5fQdNAcaR3q0/33Ei9/djg1fKXavjyfTu4Reoa/FKuWt1DB5JT9IdsRavljvyUa1WHL/7VawHpGvFjPvgd39W06ubk333lNvoyQNwRteDkRtpo188uocR69Eu4Jem8FVFV+qZp38F/ML9Sme5dyVdbTdY/SvwO+o3RZe+WTuHn8fatVmR6uexOa13Dp4nfeSy9KV59uwcOs/7Qz36l39XM4x72avr8Y01yzt7mbik2dJiOHb7gh7iQI+u/tctf3t4PquM5Sw=
+   eJytVdsNwjAMTFI2KGOwE8MlG8AGzQaMwCIkElasw3YclY9TVerc+ZEzJYZQvqgNlxTCKw5saXxfQVWAcaR3bc93HNjb+7HAK+Wu1fFkerfwC9S1eKXctTo6j6Qn6fZYi1fLHfmoViuOz34W6wHpWjF9Hnz2ZzW9unuyZ0+59Z48AGd0Pei5kTb6xaN7GLEe7Qx+qQpfUXSlnnn6l8Ev3K90lntX0tV2g9W/DL+jflV06Zu1c/h5rF27K1L9PHZP852D50mfuO6bPge+rzBHz86h87w/1KN/+Xd2h3Eve3U9vrHu8speJi7pbmkxHKt9QQ9xoEdn/+uWvz08HzKY5WI=
  </data>
 </layer>
 <layer name="Objects" width="30" height="18">
  <data encoding="base64" compression="zlib">
-   eJzFVDsOgkAQXVmU0Nh5Euk5gq1WtvaWXIdDcAR6jyC9Eu2VF5xkHGaXxWh8iVHZnTePNx9jdKzmjoMfou1ynhbf48M7HBL3+aI7zyJjdtaYc5f3GBuzjvx8HFvB3QZ4hnxNl6uK+//l67uO9fvw42p7rRpX4fBLvgfnTxnXbabzwo+LfX8uNfPfeTLMk0XD++DIlZpkTC9xQNtd0cfh8i0EmafWGjQtGzt8pulGPSgfaa4maCe+kBi6G+qNr+c5HyD7ZYr/nId6Qss9tnvKD2rOc3PNmPll0uugWfPtjDG4tCM/ZlX6h3pi1sZqQJA7h6DtBw170a/wonHkr5QaoYfhF3YmPogvJuhH7VJFa0g8YuUu0eJdHkku2bsP6+5nWTfeT1I7PPLNqbZzAezFMvbfkbkJcibqAJ5/4Alz3kZc
+   eJzFVEsOgjAQrVAlbNx5ErvnCG71Bu5dch0OwRHYewQ4gET3ygtOMhmmpRiNLzGi7bx5vPkYo2O39hz8EP2Q87r5Hh/e4Zz5zzfDuUuMOaXGtEPeizVmn4T5OI6Cu4/wDPm6IVdtx9/V+7ux+n34cUtHrRpX6fFLvgfnzxnXfaXztgqv1Myfi2yaxyXT++AolJo4ppc4oO2h6OPw+RYDF6i1Bk3LIZ3+p+lGPSgfaa4XaCe+mBi6G+tNqOc5HyD7ZYn/nId6Qss9t3uqD2rOc3PNmPltNuqgWQvtjDn4tCM/ZlX6h3pi1uZqQJA7h6DthxjAi86Tv1ZqhB6GX9iZ+CC+XKAftcsVrTHxiJW7RIv3eSS5ZO8+U38/y7rxfpLa4VFoTrWdC2AvVjZ8R+YmyJloInj+gReDE0UI
  </data>
 </layer>
 <layer name="Above" width="30" height="18">
  <data encoding="base64" compression="zlib">
-   eJxjYMAE/5mxCNIQwOx7D6U/UGA/sW4HqXuPphadT4q5+PRiMyeZhTi1xJpLLXOoZSfMLGLVUMtOYu2lpn2k2EsLQE17STFr1F7SzcClh5yyh5w0jMssbOURMf4iphwj1ixy1BICpITRF0bq2UsqoKTOG0oAAELzKp8=
+   eJxjYMAE/5mxCNIQwOx7D6U/UGA/sW4HqXuPphadT4q5+PRiMyeZhTi1xJpLLXOQ1VJqNzFxgR731ADE2EtN+0ixlxaAmvaSYtaovaSbgUsPOWUPOWkYl1nYyiNi/EVMOUasWeSoJQRICaMvjNSzl1RASZ03lAAAPrIrkQ==
  </data>
 </layer>
 <layer name="Walkable" width="30" height="18" visible="0">
--- a/AndorsTrail/res/xml/blackwater_mountain4.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain4.tmx
@@ -47,12 +47,12 @@
 </tileset>
 <layer name="Ground" width="15" height="15">
  <data encoding="base64" compression="zlib">
-   eJzNkbENgDAMBM0u6WjZIGzACIwCDVCSgQEpr7ysRwEqilNQ/JfEJjRmQTAQqs70xJydMa+Tq8OZKAtS9sDu6nB2kcW5rZVvf1aq9MHuW7643clqhVjJov/o3M3KHmd4zujfuxcqE8TMlKsy6v24YyH3LuP3+Y67Of/x/z51D2mSO7w=
+   eJxTYWRgUMGCg5EwNnlk7IKEW6B6kqF0M5o8TE8zkloYngLV94QVQk9Gk4fpmYykFoZh5mozINjI8jA9+PyBrJdUTI5eEyDuYkBgZwJqYf53RtPbzYAQQ1aDHM4w/6PrBWFsalSwhBk2vdjUYHM/zI5OJL241KCLI9uBK5wHY/wSqxcA8E08QQ==
  </data>
 </layer>
- <layer name="Objects" width="15" height="15" visible="0">
+ <layer name="Objects" width="15" height="15">
  <data encoding="base64" compression="zlib">
-   eJzbzMjAsAWIYcCChYFhMxIfBGDyTlC5LWjyIODBgsq/woqpBmY+PiDFzsDwBKhXmh2/OnQAcpMWUM9jZgYGbXZMP8AAsvuR3XIQKnYRTR8+P+PTix4eMLucCPifEoAetoTCmlgA8z8+89DDiFCYoashJlxwxRExduDS68GC6b8QNLeg60WXxwZg8Y/LXmQzAOmSIuM=
+   eJzbzMjAsAWIYcCChYFhMxIfBGDyTlC5LWjyIODBgsq/woqpBmY+PiDFDqGl2fGrQwcgN2kB9TxmZmDQZsf0Awwgux/ZLQehYhfR9OHzMz696OEBs8uJgP8pAehhSyisiQUw/+MzDz2MCIUZuhpiwgVXHBFjBy69HiyY/gtBcwu6XnR5bAAW/7jsRTYDAD0JIfo=
  </data>
 </layer>
 <layer name="Above" width="15" height="15">
--- a/AndorsTrail/res/xml/blackwater_mountain43.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain43.tmx
@@ -55,12 +55,12 @@
 </layer>
 <layer name="Objects" width="30" height="30">
  <data encoding="base64" compression="zlib">
-   eJxjYBg4sJmdvvrQwSw2/OyPrKSbqYmmRwuJLwQ09wEQr2IjzBZiQzVHhB2C0dkwYMmKwNZQGtneT6wQ82H8VUh2rILKY7OTEHsJC/7wgJmPzt7BgiqObu9voPwfFkw2MnBnhoQvDCMDdPNxsXeguZ9QOINAONBeK1YExuZfmLm47EW3ExsbHVQC7a1iRtDIYC7Q7F1shNnEAGLilF7AihlTbCMrIpwocetHLGbDgBcWuYOsuOOHWmGGzd6LeOwlBiST6baNaPaeArrtKhAfheJjzBAxagP0cL4PTLcbkfhNQPYmPOFBblwgh3M/leqYkQxYcdSfi9ghdXgQEAcDcQiUDRKLBOIoPPILscQLcnybMKHy/ZHSpy9UbxKQTgbiFHYIGx0QkscHQOX+Z0bS9NAKMLND8j4umpAafOAsOyqNDJDrT3QaFjf41OADd9lRaXr5FwQGU704kAC5/Y2L/YmZOHXI4DI7fj61wWCMz4F2EwCj0l4D
+   eJxjYBg4sJmdvvrQwSw2/OyPrKSbqYmmRwuJLwQ09wEQr2IjzBZiQzVHhB2C0dkwYMmKwNZQGtneT6wQ82H8VUh2rILKY7OTEHsJC/7wgJmPzt7BgiqObu9voPwfFkw2MnBnhoQvDCMDdPNxsXeguZ9QOINAONBeK1YExuZfmLm47EW3ExsbHVQC7a1iRtDIYC7Q7F1shNnEAGLilF7AihlTbCMrIpwocetHLGbDgBdQLhnN7IOsuOOHWmGGzd6LeOwlBqCbRyzYiGbvKaDbrgLxUSg+xgwRozZAD+f7wHS7EYnfBGRvwhMe5MYFcjj3U6mOGcmAFUf9uYgdUocHAXEwEIdA2SCxSCCOwiO/EEu8IMe3CRMq3x8pffpC9SYB6WQgTmGHsNEBIXl8AFTuf2YkTQ+tADM7JO/jogmpwQfOsqPSyAC5/kSnYXGDTw0+cJcdlaaXf0FgMNWLAwmQ29+42J+YiVOHDC6z4+dTGwzG+BxoNwEAqENe0Q==
  </data>
 </layer>
 <layer name="Above" width="30" height="30">
  <data encoding="base64" compression="zlib">
-   eJxjYBg48J+ZgYGVFcLezI7KZkNiY9MXDRSPYYfII7OR1cD46GaA5ESh5oPsgbElgLQYlM2KJI+sjxg/eQL1eAGxNxAH4NBPDJtUe4mRI9VeQWDYfWeD8H8AaU4sYYkMwki0i1L/+gLD1weI/ekYzplAnIVEU8NeIXbMsCXWbchy74lgkwKItZdSgG4WNe19BFWPXA7A2P+R5J4xI8LJCkgns1BmLz6ALz4I2dsJ5HchiYHY3VRwWzrQjAw8aXUlFjtWUzFMRqq9tAbUTLfEmv8fKS9JsBJWT017SVEPA+HsEIxPnhb2kgLItdcezV++SHx0ORhQxONfUFkJEzvLjr19RQ2Abs4VdkSaussO4eNTr4gnPnH5G5s5l9nx86kFaFmfkqIWPVwJhTO17KVEPSntG1LbQrQuPwcTAACbuHkL
+   eJxjYBg48J+ZgYGVFcLezI7KZkNiY9MXDRSPYYfII7OR1cD46GaA5ESh5oPsgbElgLQYlM2KJI+sjxg/eQL1eAGxNxAH4NBPDJtUe4mRI9VeQWDYfWeD8H8AaU4sYYkMwki0i1L/+gLD1weI/ekYzplAnIVEU8NeIXbMsCXWbchy74lgkwKItZdSgG4WNe19BFWPXA7A2P+R5J4xI8LJisz0QSwgJT7Q7e0E8ruQxEDsbiq4LR1oRgaetLoSix2rqRgmI9VeWgNqpltizf+PlJckWAmrp6a9pKiHgXB2CMYnTwt7SQHk2muP5i9fJD66HAwo4vEvqKyEiZ1lx96+ogZAN+cKOyJN3WWH8PGpV8QTn7j8jc2cy+z4+dQCtKxPSVGLHq6Ewpla9lKinpT6lNS2EK3Lz8EEAJdHeD0=
  </data>
 </layer>
 <layer name="Walkable" width="30" height="30">
--- a/AndorsTrail/res/xml/blackwater_mountain5.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain5.tmx
@@ -55,10 +55,10 @@
 </layer>
 <layer name="Objects" width="15" height="15">
  <data encoding="base64" compression="zlib">
-   eJxjYMAOlNgYGIzYIDSpAKTPCaqfVADT50Qle4OIMMeECaLPjRFCKzNBxJPw6O0Fyp1ggdAgANILAv3sEFoIKO6HQ/9cNlQaphcE/JH0wNyBDnawINjIepH1FyOpMcFhDkzvCRZU8R04+JysuO2FgTIW7OL27Kh60e0Agc9IZv5nxu4WZHtBcp9xuAMdfGGE6CVWPTrA5V9q6AUAkSwYBA==
+   eJxjYMAOlNgYGIzYIDSpAKTPCaqfVADT50Qle4OIMMeECaLPixFCKzNBxJPw6O0Fyp1ggdAg4MYIofvZIbQQUNwPh/65bKg0TC8I+CPpgbkDHexgQbCR9SLrL0ZSY4LDHJjeEyyo4jtw8DlZcdsLA2Us2MXt2VH1otsBAp+RzPzPjN0tyPaC5D7jcAc6+MII0UusenSAy7/U0AsAmwwYCA==
  </data>
 </layer>
- <layer name="Above" width="15" height="15" visible="0">
+ <layer name="Above" width="15" height="15">
  <data encoding="base64" compression="zlib">
   eJxjYMAOlrMzMKwA4kvsOBTgAduBenaQqRekB2Y3IfCfGVMvzG4QSMdjBja9l4h0M7peUgC5ekH63lOgl1wwUHq/MJKvd6gBALC/Fgk=
  </data>
--- a/AndorsTrail/res/xml/blackwater_mountain9.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain9.tmx
@@ -55,12 +55,12 @@
 </layer>
 <layer name="Objects" width="17" height="23">
  <data encoding="base64" compression="zlib">
-   eJxjYKANCGaj3IxkMs3YwcLAcArKjoSakcyCoE9B1Sgz4TbDD8lukBlCSPwdLNj1nMAjDjKjD80/nxkh9BdG3GbCxEH2R6Lpx2YfzEwY+M/MwOCP5hdks9HV4wNfGFHNwKUXVzjAAMwvQhSmEfTwQAYmTITjGJ8ZyH7AFTcggC1eYAA5fgkBYsLjAzP+sM0kIjzfM+OWu8QOcYM/gXAlBoDMQgfo4YjLLyC9+NyAbB6uNGjEhsD4AL7078SGwOgA5HYdPGFJjDv+MxN2AyF3EAuIDQ9kAABdES1w
+   eJxjYKANCGaj3IxkMs3YwcLAcArKjoSakcyCoE9B1Sgz4TbDD8lukBlCSPwdLNj1nMAjDjKjD80/nxkh9BdG3GbCxEH2R6Lpx2YfzEwY+M/MwOCP5hdks9HV4wNfGFHNwKUXVzjAAMwvQhSmEfTwQAYmTITjGJ8ZyH7AFTcggC1eYAA5fgkBYsMDX9hmUhiel9ghbvAnEK7EmoUO0MMRl19AevG5Adk8XGnQiA2B8QF86d+JDYHRAcjtOsyE3YjPHf+ZCbuBkDuIBcSGBzIAAP7kK4s=
  </data>
 </layer>
 <layer name="Above" width="17" height="23">
  <data encoding="base64" compression="zlib">
-   eJxjYKAO+M+MyU5nx6+OGDOQASsraWa8x6MOWQ5mLjFuJBYMhBkfsKj/wkhbO8kxA5s70fXhizt8dpDi/sFuBimA2DxBiRkSrLjl6ekOYsByYNmzAogvkVgGIYPtQL07KDQDpBfmFnRAbN4EmQFzC7kAX3jgAgBMvjDQ
+   eJxjYKAO+M+MyU5nx6+OGDOQASsraWa8x6MOWQ5mLjFuJBYMhBkfsKj/wkhbO8kxA5s70fXhizt8dpDi/sFuBjrAFW6EzCA2XAmZIcGKW55Ud9DajOXAsmcFEF8isQxCBtuBendQaAZIL8wt6IDYvAkyA+YWcgG+8MAFAKrcMrU=
  </data>
 </layer>
 <layer name="Walkable" width="17" height="23">
--- a/AndorsTrail/res/xml/crossglen.tmx
+++ b/AndorsTrail/res/xml/crossglen.tmx
@@ -1,71 +1,71 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map version="1.0" orientation="orthogonal" width="30" height="30" tilewidth="32" tileheight="32">
 <tileset firstgid="1" name="tiles_1_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_1.png"/>
+  <image source="../drawable/map_tiles_1_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="tiles_1_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_2.png"/>
+  <image source="../drawable/map_tiles_1_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="tiles_2_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_1.png"/>
+  <image source="../drawable/map_tiles_2_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="tiles_2_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_2.png"/>
+  <image source="../drawable/map_tiles_2_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="tiles_2_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_3.png"/>
+  <image source="../drawable/map_tiles_2_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="641" name="tiles_2_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_4.png"/>
+  <image source="../drawable/map_tiles_2_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="769" name="tiles_2_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_5.png"/>
+  <image source="../drawable/map_tiles_2_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="897" name="tiles_1_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_3.png"/>
+  <image source="../drawable/map_tiles_1_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1025" name="tiles_1_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_4.png"/>
+  <image source="../drawable/map_tiles_1_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1153" name="tiles_1_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_5.png"/>
+  <image source="../drawable/map_tiles_1_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1281" name="tiles_1_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_6.png"/>
+  <image source="../drawable/map_tiles_1_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1409" name="tiles_1_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_7.png"/>
+  <image source="../drawable/map_tiles_1_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1537" name="tiles_1_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_8.png"/>
+  <image source="../drawable/map_tiles_1_8.png" width="512" height="224"/>
 </tileset>
 <tileset firstgid="1649" name="tiles_2_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_6.png"/>
+  <image source="../drawable/map_tiles_2_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1777" name="tiles_2_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_7.png"/>
+  <image source="../drawable/map_tiles_2_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1905" name="tiles_2_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_8.png"/>
+  <image source="../drawable/map_tiles_2_8.png" width="512" height="224"/>
 </tileset>
- <layer name="Ground" width="30" height="30">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+2X0Q3CMAwFU9MRWIJZOgJDMALLdAPYgC5AmQAmoRVYWC82sSBGQurHCUjSnLFiB/ompX6ipZQujc2KHus0js81J2Oe12zSC23MQu47CDjmObahyfF4O8rhOd4XcyP3s3LV0nvvlnJwX09uSqB3Rzk1PCXvnnKivJj7X+A9y4s3xnsuEOUdJ27wKt9HedGFn2t5MYfXArW8Wg61Xt1BrVvjpXnpxRxqvRr7tRzXYrSe4141CnhO69XYry2HFot8bk35OeI5rVdjv5YOLUbr+zKfnhnp0GKMutdK91b0vfZPeOo0Ak+dRuCp0wg8dbrwHfPvyYNBtNf7X6omdxbSpIgQDgAA
+ <layer name="Ground" width="30" height="30" visible="0">
+  <data encoding="base64" compression="zlib">
+   eJztl8ENwjAMABNTMQFLMEtH4MufEbpMN4AN6AKUCWASUhULy7GJBTESUh+nQpzmXCtxoY8h9IkGQrhGnRXM8yROzzlnJY5ztuGFNKZB1x0ImPOU2xBzLN4WcjCG6/La0PW0WjXw3ruDHL6upTYluPcAOTU8JW+XPPv1fEW8vLz2v8C6lxevj/dSwMs7Ju7sSj97ebmLf6/l5TW8FajllWoo9eqWnXVtvBSnXl5DqVfzfk3HpRy1+7BXjQSMSb2a92vNIeVC79tAvo8wRns07dna80o5as+LfLpnqKMT8Hqv0Vpocc/32j9hOaceWM6pB5Zz6oHlnC58x/R78qjg7bX+l6rJA7Gv/JY=
  </data>
 </layer>
 <layer name="Objects" width="30" height="30">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA61WPW8UMRDdnNf8gIg/kEBHmUs4pBRp4CB0gELSouuooaE6ckrSQFKgVCCQgpQrwpeO4hqUSFCcRBUJKqrUtBTQMaOd0b6deO1F4UmW17v2PL+Z8Xiz7P/g1rn0nI08y3bz6rt2q+gH8r5vvs+14jbvNeBVzk2wzXtZz8PzcU0IvOflqWJv532aH3nZ7kaN7YEr9Ktm5snB/ho9XyPeLVl/mcZ3qXWl53W85qI/zYu+v0M+a9Gc3/LtmavuYw/G47zkbfvCxgXg1J6he901etnP7Kce8U5TvyX2V4BnRM8fqR3T3Oc054Uvedd8WC9y14Hj9CAS68/E+YXad/p+QLbeBHhZN3J3ZNwx3JrLHENe/9SXY87vHV++Y+C7J7545nUWypVHtKrPl2j9QsN2KSufO8L7sEE+d2UOarHadNw3ulUjj1m/fkfMwLhprNVWCJjDGlPNsW+yZhZiGsozxZ47bX+fbAzFziQvbTKQdww5FgLHEPdg88tiKLz7wM15jHoxBzUO6l+Mywi+23hMAn4d1viaeRf/IQdtsxhH6rDltWdnAGvrciOFmUQMQrxNoDmmQB9j/lyHmv2Ocu+9Oxsvo2s0cc7YGK/KmGv2IXEeUZt3YV7d11df3SNC9bbhPn8tHOjjXGrhsnDMSe1U3j+u8AVD9/XDl8+Mt7KXDz6sF2FrVujMqN6e8D4i+/dBo9blT7KXY1+N74nxbQ/yfdH0C4FvXJtj+duHGlanlzVtS7M6VTuPT0Tz48R5mTUcTe5ihvpS7/sYbvv4PxrW59Q5VV697y2sHgbWYHsPWb14TrfJ/g61n67kxfNla1qd7Viv/4Cr8G/1kvheUbvh0rWh7n8mdgdyf1U0XyGOm66ay5qzFra2KEeotk8CdyD3v8AungWt8ai36Z1xVvCelNee8RhiZ2Uk+lNg3hWTm4i6+KXy+C/kHC+ZEA4AAA==
+  <data encoding="base64" compression="zlib">
+   eJytVr9PFEEUXm92/AOI/wBoZ8kJZ0Jho6fYqUFoDZ01NFanF6RRKAyVRhNMuMKfOYprCCZaXGJFIhUVNS2Fdr6XfS/77WN2Zg1+yWR2dmfeN997b95slv0f3LuYnrOWZ9lWXn3XbhV9X973zPfpVtzmowa8yvkcbPNenuXh+bgmBN7z/IVib5d8mh952e5aje2+K/SrZubJwf4SPd8i3nVZP0vjh9S60vM6XnPFn+VF3z8gn7Vozm/59spV97EN41Fe8rZ9YeMycGrP0L1uGb3sZ/XTBPXrYn8BeIb0vEvtgOa+pjlvfMm75MN6kbsOHKeVSKy/E+cPaof0/QPZ+hjgZd3I3ZFxx3BrLnMMef1LX445vzd9+Y6B71744pnXWShXHtGqPr9B62catqtZ+dwR3tUG+dyVOajFatNxz+hWjTxm/fodMQnjprFWWyFgDmtMNcd+yZopiGkozxTb7qz9HbIxEDvjvLTJQN4R5FgIHEPcg80vi4Hw7gA35zHqxRzUOKh/MS5D+G7jMQ74dVDja+ad+4cctM1iFKnDlteenT6srcuNFCYTMQjxNoHmmAJ9jPlzG2r2Z8q9L+58vIyu0cQ5Y2O8CON94vxG7ZoL8+q+fvrqHhGqtw33+XvhQB/nUgvnhWNaaqfy/nGFL3BfR758ZnySvXz1Yb0IW7NCZ8bqfUL2H4NGrct7spcDX43vsfHtMuT7nOlnAt+4Nsfytwc1rE4va9qQZnWqdh4fi+anifMyZTia3MUM9aXe9zHc9/F/NKzPqXOqvHrfW1g9DKzB9h6yevGcbpD9TWonruTF82VrWp3tWK//gIvwb/WW+N5Ru+PStaHufyZ2B3J/U7iuE8ddV81lzVkLW1uUI1Tbx4E7kPtTsItnQWs86m16Z5wXvCfltWc8hthZGYr+FJh3weQmoi5+qTz+C5untK8=
  </data>
 </layer>
 <layer name="Above" width="30" height="30">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA8VW2w3CMAwMajtL+UZMAIhF2IUvJBZhBHaCDUCWsGq559hNm3ISKsRuDr8uSWnAq0lV8fntf23Haxak71xevbbfYP8dWM/lpu9S2nbDM/cO8Z4M3oOxjoDyIrkRb4kNoQc8Fndu76X6DXHX7mUEilXX5d4NH29tKrgOU+tXAtnjDOK1YpO/0Xfkm+OSqB2vpTlr5LkGb6RGqA4e761SPhCv1OqHsrNeaz3XOo7sUrMRr9Tqp7KzXms91zru2afWl/1L42VM1Ujyv7Tz410KXt7IbmmIBOp/ayYIXt7+cfYwdLzejEbOoaOTQ8nJPadnlIDuVRHIGbXOBu45PaOEaP/pe5x3DnmIzLW3dwk3z+kaWIunBvR9HdkjOKveRBzRZxTvZvwfS/bR734Bo+VJchAOAAA=
+  <data encoding="base64" compression="zlib">
+   eJzFVtsNwjAMDGo7S/lGTACIRdiFLyQWYQR2gg1AlrBquefYTZtyEirEbg6/LklpwKtJVfH57X9tx2sWpO9cXr2232D/HVjP5abvUtp2wzP3DvGeDN6DsY6A8iK5EW+JDaEHPBZ3bu+l+g1x1+5lBIpV1+XeDR9vbSq4DlPrVwLZ4wzitWKTv9F35Jvjkqgdr6U5a+S5Bm+kRqgOHu+tUj4Qr9Tqh7KzXms91zqO7FKzEa/U6qeys15rPdc67tmn1pf9S+NlTNVI8r+08+NdCl7eyG5piATqf2smCF7e/nH2MHS83oxGzqGjk0PJyT2nZ5SA7lURyBm1zgbuOT2jhGj/6Xucdw55iMy1t3cJN8/pGliLpwb0fR3ZIzir3kQc0WcU72b8H0v20e9+AahUSdg=
  </data>
 </layer>
 <layer name="Walkable" width="30" height="30" visible="0">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA8WUSw7AIAhEvYL3v2y3TVOG+WCcxE0tPEHGvdbalxcSE8sy2NgpLlsD+v/bi5PcSikX5ah4TCxiO6q4iF3FdudV7qLaU+9xSk5dnXcUlnvmjpv6xOV2/EluOoss15U6C+iN6HKc4qrzr3KRj5j7VLh/jFP1vvnVt+lZZmqr+ChP4qFUTK+YfZXZ5XVyMswprjtXaR/dmU49NsFypHrylpeSd4XJm3In5ua7Hq3vp4wQDgAA
+  <data encoding="base64" compression="zlib">
+   eJzFlEsOwCAIRL2C979st01ThvlgnMRNLTxBxr3W2pcXEhPLMtjYKS5bA/r/24uT3EopF+WoeEwsYjuquIhdxXbnVe6i2lPvcUpOXZ13FJZ75o6b+sTldvxJbjqLLNeVOgvojehynOKq869ykY+Y+1S4f4xT9b751bfpWWZqq/goT+KhVEyvmH2V2eV1cjLMKa47V2kf3ZlOPTbBcqR68paXkneFyZtyJ+bmux4ZKSBY
  </data>
 </layer>
 <objectgroup name="Mapevents" width="30" height="30">
--- a/AndorsTrail/res/xml/crossglen_hall.tmx
+++ b/AndorsTrail/res/xml/crossglen_hall.tmx
@@ -55,12 +55,12 @@
 </layer>
 <layer name="Objects" width="20" height="15">
  <data encoding="base64" compression="zlib">
-   eJxjYIAAaXYGBk4WCE0syIHqycSiRxsoJskCoUkBID3oQIoVQouSYNZdNgaGA2wQ+gKUJgQ2Q/2DzN4MtfMtG3YaBG4z4zYT2T/Y/IYNJCKZdwrIPg3Ev4lwPzM7xJ8s7Kj+LUQybwpaGOqxYmfDADb/4gK7gf7bw4IwC8bHZi4y+IZk9hIk/aeB7DNIYYbOh4GrQLEcPHEAA9jcgcttNUhucgaa7YLF/KtExic6CAaaFUKEe0kByG7pIRDeIODAjp9PDpAB2isLxHJE2E8uAADffiPp
+   eJxjYIAAaXYGBk4WCE0syIHqycSiRxsoJskCoUkBID3oQIoVQouSYNZdNgaGA2wQ+gKUJgQ2Q/2DzN4MtfMtG3YaBG4z4zYT2T/Y/IYNJCKZdwrIPg3Ev4lwPzM7xJ8s7Kj+LUQybwpaGOqxYmfDADb/4gK7gf7bw4IwC8bHZi4y+IZk9hIk/aeB7DNIYYbOh4GrQLEcPHEAA9jcgcttNUhucgaa7YLF/KtExic6CAaaFQLEyWTqxwaQ3dJDILxBwIEdP58cIAO0VxaI5Yiwn1wAAFt1JFA=
  </data>
 </layer>
 <layer name="Above" width="20" height="15">
  <data encoding="base64" compression="zlib">
-   eJxjYGBg+M/MQDLApwddbjUR5g8X87YB2buJMO89kea1sBNWTwggm0eJOdjMQwZCQLf+YEPwBYF8TnbyzSMXDBXzklmI12PAjptPrvt4WBkYeIGYjxVVHD2NCBMRh/QCAKxIG1s=
+   eJxjYGBg+M/MQDLApwddbjUR5g8X87YB2buJMO89kea1sBNWTwggm0eJOdjMQwZCQLf+YEPwBYF8TnbyzSMXDEfzDNhx88l1Hw8rAwMvEPOxooqjpxFhIuKQXgAAMGAa9A==
  </data>
 </layer>
 <layer name="Walkable" width="20" height="15" visible="0">
--- a/AndorsTrail/res/xml/crossglen_smith.tmx
+++ b/AndorsTrail/res/xml/crossglen_smith.tmx
@@ -1,71 +1,71 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map version="1.0" orientation="orthogonal" width="10" height="8" tilewidth="32" tileheight="32">
 <tileset firstgid="1" name="tiles_1_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_1.png"/>
+  <image source="../drawable/map_tiles_1_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="tiles_1_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_2.png"/>
+  <image source="../drawable/map_tiles_1_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="tiles_2_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_1.png"/>
+  <image source="../drawable/map_tiles_2_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="tiles_2_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_2.png"/>
+  <image source="../drawable/map_tiles_2_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="tiles_2_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_3.png"/>
+  <image source="../drawable/map_tiles_2_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="641" name="tiles_2_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_4.png"/>
+  <image source="../drawable/map_tiles_2_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="769" name="tiles_2_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_5.png"/>
+  <image source="../drawable/map_tiles_2_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="897" name="tiles_1_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_3.png"/>
+  <image source="../drawable/map_tiles_1_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1025" name="tiles_1_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_4.png"/>
+  <image source="../drawable/map_tiles_1_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1153" name="tiles_1_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_5.png"/>
+  <image source="../drawable/map_tiles_1_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1281" name="tiles_1_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_6.png"/>
+  <image source="../drawable/map_tiles_1_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1409" name="tiles_1_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_7.png"/>
+  <image source="../drawable/map_tiles_1_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1537" name="tiles_1_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_8.png"/>
+  <image source="../drawable/map_tiles_1_8.png" width="512" height="224"/>
 </tileset>
 <tileset firstgid="1649" name="tiles_2_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_6.png"/>
+  <image source="../drawable/map_tiles_2_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1777" name="tiles_2_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_7.png"/>
+  <image source="../drawable/map_tiles_2_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1905" name="tiles_2_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_8.png"/>
+  <image source="../drawable/map_tiles_2_8.png" width="512" height="224"/>
 </tileset>
 <layer name="Ground" width="10" height="8">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAAwtiZGAIIhI3EsAwdRMJYJg6RwYGBlck7IiG8al7ycLA8IoFoa6REVM/COcB1eRC1TVC7cem7idQzS+oOpCaQAbs2BGNDwDUWgFBQAEAAA==
+  <data encoding="base64" compression="zlib">
+   eJwLYmRgCCISNxLAMHUTCWCYOkcGBgZXJOyIhvGpe8nCwPCKBaGukRFTPwjnAdXkQtU1Qu3Hpu4nUM0vqDqQmkAG7NgRjQ8ACCYfJA==
  </data>
 </layer>
 <layer name="Objects" width="10" height="8">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgQAAldgaCwIuFgcEIqM4OiG2B+Ag7REwOTW8UUMwJi9hFNgS/h5WBoR2IhdgYMMBDNLE+JLMScLizH00clzpvZgYGT2YEvwBJ3RQiwgAZAAC5atRmQAEAAA==
-  </data>
- </layer>
- <layer name="Walkable" width="10" height="8" visible="0">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAAxNkYGAQHECMC+BTgy6GSy0+dYI41BHjXmQ+AAPtet1AAQAA
+  <data encoding="base64" compression="zlib">
+   eJxjYEAAJXYGgsCLhYHBCKjODohtgfgIO0RMDk1vFFDMCYvYRTYEv4eVgaEdiIXYGDDAQzSxPqBZySwQdgIOd/ajieNS583MwODJjDCvAEndFCLCABkAAFYoCuM=
  </data>
 </layer>
 <layer name="Above" width="10" height="8">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIB78Z6atugB2/OqSWci3twXJ7PdEmkcMAADLV5WbQAEAAA==
+  <data encoding="base64" compression="zlib">
+   eJxjYCAe/GemrboAdtrZ24Jk9nsizSMGAACR0Abf
+  </data>
+ </layer>
+ <layer name="Walkable" width="10" height="8" visible="0">
+  <data encoding="base64" compression="zlib">
+   eJwTZGBgEBxAjAvgU4MuhkstPnWCONQR415kPgCafgO5
  </data>
 </layer>
 <objectgroup name="mapevents" width="10" height="8">
--- a/AndorsTrail/res/xml/fallhaven_derelict2.tmx
+++ b/AndorsTrail/res/xml/fallhaven_derelict2.tmx
@@ -1,71 +1,71 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map version="1.0" orientation="orthogonal" width="25" height="19" tilewidth="32" tileheight="32">
 <tileset firstgid="1" name="tiles_1_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_1.png"/>
+  <image source="../drawable/map_tiles_1_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="tiles_1_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_2.png"/>
+  <image source="../drawable/map_tiles_1_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="tiles_2_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_1.png"/>
+  <image source="../drawable/map_tiles_2_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="tiles_2_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_2.png"/>
+  <image source="../drawable/map_tiles_2_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="tiles_2_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_3.png"/>
+  <image source="../drawable/map_tiles_2_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="641" name="tiles_2_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_4.png"/>
+  <image source="../drawable/map_tiles_2_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="769" name="tiles_2_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_5.png"/>
+  <image source="../drawable/map_tiles_2_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="897" name="tiles_1_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_3.png"/>
+  <image source="../drawable/map_tiles_1_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1025" name="tiles_1_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_4.png"/>
+  <image source="../drawable/map_tiles_1_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1153" name="tiles_1_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_5.png"/>
+  <image source="../drawable/map_tiles_1_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1281" name="tiles_1_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_6.png"/>
+  <image source="../drawable/map_tiles_1_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1409" name="tiles_1_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_7.png"/>
+  <image source="../drawable/map_tiles_1_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1537" name="tiles_1_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_8.png"/>
+  <image source="../drawable/map_tiles_1_8.png" width="512" height="224"/>
 </tileset>
 <tileset firstgid="1649" name="tiles_2_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_6.png"/>
+  <image source="../drawable/map_tiles_2_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1777" name="tiles_2_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_7.png"/>
+  <image source="../drawable/map_tiles_2_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1905" name="tiles_2_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_8.png"/>
+  <image source="../drawable/map_tiles_2_8.png" width="512" height="224"/>
 </tileset>
 <layer name="Ground" width="25" height="19">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA71UORLCMAwUsYd/UJCegg9QAR2paDl6nkDHp+BDHB+ACmuCB0VItghHsUXWklbSOq46ANUfsCnawZIbNbZFE2NXg/McmKvFRT5qTKGJuavBeQ7M1eIir2lYYcm1ePUtjZSXZZi5r+xD60fqlXtM74FWH8F7k3iqQb2zesTvksRHDaw/eWig3if3ILVPztG4vQc4+Pfn5J7zXY4SPuTuoHQm7TLXm/RupDxvs+NVmHMdsHT1zNjXMezz5J999pysMTR4rp1fQ/0b8W1ANEqXriF5vjC8Z3SvlNt1Xznp36Pf56B/8Xqs5G/O89w5j53B73EHAgUlRGwHAAA=
+  <data encoding="base64" compression="zlib">
+   eJy9VDkSwjAMFLGHf1CQnoIPUAEdqWg5ep5Ax6fgQxwfgAprggdFSLYIR7FF1pJW0jquOgDVH7Ap2sGSGzW2RRNjV4PzHJirxUU+akyhibmrwXkOzNXiIq9pWGHJtXj1LY2Ul2WYua/sQ+tH6pV7TO+BVh/Be5N4qkG9s3rE75LERw2sP3looN4n9yC1T87RuL0HOPj35+Se812OEj7k7qB0Ju0y15v0bqQ8b7PjVZhzHbB09czY1zHs8+SfffacrDE0eK6dX0P9G/FtQDRKl64heb4wvGd0r5TbdV856d+j3+egf/F6rORvzvPcOY+dwe9xB3Vdo3c=
  </data>
 </layer>
 <layer name="Objects" width="25" height="19">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoB/wZYbQm9lRxXHxrdDEQWAlGwNDOBZxGIiF2sHKihDLBIplQcVLkfSC2F44zELWjw58GDHFKoHmV0HtaAWamczCwCDJCmH/ZkOoEwSy/wJxL1QMnSYXuEPtDmNGiM1lw06TC8KZCasRJNKO/1CzQOGEDMKIsAMXmIBm93ugWabMmHbAAHq6IwQigWYtgNqRDWRXA/FJID4FxFeB+CgUH4OKwUAqDj9hE0d260Y8aRAZlALdVIrmzzIou5RAeF5EsuMH1G96RNqLC2Qj2YkcxiBzTwPddQZHfBALkONZAurWIDT/w/xAbBiilymgeMaVbtDBQSLtuERG/oP5AxZPxUB/lgBxETOmn0HgERY7cPkDZjYnifkAHWixQrAnUjjAwh09zmFlYSHU7WpAu+2x2H8BqO4ukl+sWBG4BylMBLGk2Wwsaf430K4/UDdYI4XbWwrLRFIAAL4S2axsBwAA
+  <data encoding="base64" compression="zlib">
+   eJxjYKAf8GWG0JvZUcVx8a3QxEFgJRsDQzgWcRiIhdrByooQywSKZUHFS5H0gtheOMxC1o8OfBgxxSqB5ldB7WgFmpnMwsAgyQph/2ZDqBMEsv8CcS9UDJ0mF7hD7Q5jhtgNAnPZsNPkgnBmwmoEibTjP9QsmFthIIwIO3CBCWh2vweaZcqMaQcMoKc7QiASaNYCqB3ZQHY1EJ8E4lNAfBWIj0LxMagYDKTi8BM2cWS3bsSTBpFBKdBNpWj+LIOySwmE50UkO35A/aZHpL24QDaSnchhDDL3NNBdZ3DEB7EAOZ4loG4NQvM/zA/EhiF6mQKKZ1zpBh0cJNKOS2TkP5g/YPFUDPRnCRAXMWP6GQQeYbEDlz9gZnOSmA/QgRYrBHsihQMs3NHjHFYWFkLdrga02x6L/ReA6u4i+cWKFYF7kMJEEEuazcaS5n8D7foDdYM1Uri9pbBMJAUAAA/8Pak=
  </data>
 </layer>
 <layer name="Above" width="25" height="19">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoA/4z0x7vQNpRzILbj0wOZBeXOqQxSn1Bz63UANQElYwsakU+JFYO3YC6V1AfBtJzTaoGDHmoMtRGkfvCdiBHm+UpANiAbXtAJmHbiYt7EAPS3xhi8sNxMQ5qe5CB4TinBp2kKqekBmD0Q7kcITlE0JxTkie3gAAFM19FmwHAAA=
+  <data encoding="base64" compression="zlib">
+   eJxjYKAP+M9Me70DaUcyC249MDmQXlzqkMXp4Q9KACVhBRObSiV34rNjJ5DeBcS3kdRsg4oRYw66HKVx9J6AHehpYzDFJSnmoZtJCzvQwxJf2OJyAzFxTqq70AGhOKeGHaSqJ2TGYLQDORxh+YRQnBOSpzcAALqSMRs=
  </data>
 </layer>
 <layer name="Walkable" width="25" height="19">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA91TSQ4AIQjjC/z/s3M1hNbSIXMYEg4KdlHMiMgfZXyAfwbiRzrOeoB+J5hGplfxWM9OtLy9z7zUXD/bHAqGwlHrSnS9aAY7DQhnMouqj627Yj6YLofjFi5HhzHlUPpqnfE6c6d6r2e6tYqtvDnaU//idj5kd/4TbAcAAA==
+  <data encoding="base64" compression="zlib">
+   eJzdU0kOACEI4wv8/7NzNYTW0iFzGBIOCnZRzIjIH2V8gH8G4kc6znqAfieYRqZX8VjPTrS8vc+81Fw/2xwKhsJR60p0vWgGOw0IZzKLqo+tu2I+mC6H4xYuR4cx5VD6ap3xOnOneq9nurWKrbw52lP/4nY+cjUUUw==
  </data>
 </layer>
 <objectgroup name="Mapevents" width="25" height="19">
--- a/AndorsTrail/res/xml/fallhaven_ne.tmx
+++ b/AndorsTrail/res/xml/fallhaven_ne.tmx
@@ -1,71 +1,71 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map version="1.0" orientation="orthogonal" width="30" height="30" tilewidth="32" tileheight="32">
 <tileset firstgid="1" name="tiles_1_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_1.png"/>
+  <image source="../drawable/map_tiles_1_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="tiles_1_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_2.png"/>
+  <image source="../drawable/map_tiles_1_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="tiles_2_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_1.png"/>
+  <image source="../drawable/map_tiles_2_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="tiles_2_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_2.png"/>
+  <image source="../drawable/map_tiles_2_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="tiles_2_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_3.png"/>
+  <image source="../drawable/map_tiles_2_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="641" name="tiles_2_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_4.png"/>
+  <image source="../drawable/map_tiles_2_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="769" name="tiles_2_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_5.png"/>
+  <image source="../drawable/map_tiles_2_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="897" name="tiles_1_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_3.png"/>
+  <image source="../drawable/map_tiles_1_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1025" name="tiles_1_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_4.png"/>
+  <image source="../drawable/map_tiles_1_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1153" name="tiles_1_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_5.png"/>
+  <image source="../drawable/map_tiles_1_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1281" name="tiles_1_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_6.png"/>
+  <image source="../drawable/map_tiles_1_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1409" name="tiles_1_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_7.png"/>
+  <image source="../drawable/map_tiles_1_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1537" name="tiles_1_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_8.png"/>
+  <image source="../drawable/map_tiles_1_8.png" width="512" height="224"/>
 </tileset>
 <tileset firstgid="1649" name="tiles_2_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_6.png"/>
+  <image source="../drawable/map_tiles_2_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1777" name="tiles_2_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_7.png"/>
+  <image source="../drawable/map_tiles_2_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1905" name="tiles_2_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_8.png"/>
+  <image source="../drawable/map_tiles_2_8.png" width="512" height="224"/>
 </tileset>
 <layer name="Ground" width="30" height="30">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+2XsQ6CMBCGm4M+jCNPUY0zEeOojsZBV+PiyENLUy+U2uvRFkw0Dl+uQOnP/9N4shBCLCLYyOFYyeE5zRpocM4K4gg9j3rp74AG528hjjGZnIAm1a/rW8l33RvQpPp1fbvvdiy5flPJ9ZsK52vfcfDUuf1eOq5aqzQVj3N1KT9YK2FoRT+uMjU1+PxUxXntBFo2FcOUWn++C67Xpdw7Zj2u14UI9UpuvTP4mdvvHfxw6+b6Tc0xlFVMfjGZoV8qK43uBcdymF/uHkG/dceyMBXHyEMY8BqlG5OZnVtT9GPUbCxd7l2GMqP2nY3tNWYP1Ratc+zDvb8pelJ/w7h+qaT/P+ic4LfFp3Wp75pf9Gtr6voE80F1EhAOAAA=
+  <data encoding="base64" compression="zlib">
+   eJztl7EOgjAQhptCfRdGnqIaZyLGUR2Ng67GxZGHlqZeuNa2R1sw0Th8uSKFn/9vw0nFGKsi2AhzLIX5m2LN/cCcFY8j9Dzypb/jfmD+lscxJpMT95Pq1/YtxbvurT9/WOhqk+rX9m2v7Vhy/aaS6zcVytderZWjzu330nNVWqWucJyr6/MDtWaajg3jOlNTAc/vqzCvm0ALUxNMqfXnu6B6Xcq1Y+5H9boQoV5J3e/M3czt9851v1MVQ903129qjqGsYvKLyQz82hlhVC84lmZ+uXsE/DY9y0JXGAMPpoFzPt2YzHBubTGMQbNFutRaGhk59plr32Gw15g91CA669iFfX1bDKS+w6h+KYX7P+icwLfFp3V93zW/6BdrqvoE6mLb9w==
  </data>
 </layer>
 <layer name="Objects" width="30" height="30">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA7VXO0oEQRCdZXv0AnsBE91URJ3ATBERsxExU1DETAMXzHSzDcT/CcxM/GSbiHoE8QQmZrKRsXYxVcybsno/oz4ouvr7uqqrp3qiKMN0HEVJHBWg26ZZr8e5LqC2sTgr/wO4F9FxD3rvGr/ZG84VXftmeSgrZ12xtPw6CBL2q+gtV+zf9Lw1355yu5SdanlOgT7jfsb/xtbQWouVYl+D21eAS/ulDHb8eussC17mPe8qtIVkdwCbt3mfc7DfNZ6/z23zlbwufpC+psv1tRK+XjZ4XxUv4hXGXyjeOcMW1GtqfxTHFJc0vwnjZjzvVBfZqxR5xQa0RfSG4RPxYTc/Cyxd5ml7dJ2gYxXnXwAv2X8JXFegnwHviZdTL8fAJfW2y+u05jH4ldoOAvEs8doM3Bni7XYeKDMBHSVR5yd+vR7OdCo3XNYvtqEdlu1Yx7iVeW0jzpd43LnL9HPws/X9cMDTNvqt+4LodT/L3N9+ePHcLTkckLdlfB8o3737u3zr5U7lGn0HXUk7BcQra2xynn30nE/M+xe5LsQraLAPJnw56vkmq3ZMWBh3P/UPP3/LZTIB/Wmc36O9Huf8VyB76P6hvW8l8mkvf3ypc2pCXKV8vvdc3vixn9X8XSVxhvGG+obLSx1vHYiTOp9dqr4bzzzngcfqOMN4E93KNYIjfDf7sQnYjrwvRm4hP8k7M5RDk2pucwhOvVPRzwS51+IvWle/4UbUG9v6TnY7d+3nMqgPkI9CuSn0phCE/il0nrVyEeZRzMWhcVb+xje+BYq1kUAfQfycxvZ5WHMtzm89NfzLEA4AAA==
+  <data encoding="base64" compression="zlib">
+   eJy1V71KA0EQvpA9fQFfII2mFVGvSGcQEbsLYhdBEDstErDTdCkk/sQnsLPxp0sj6iOIT2BjJ1b27nA73HeT2SR3xg+Gnf39dmZnb/aCIMFqGARRGGQg21adXg1TnUFtC2FS/gdwL6zjHuTeJf6yN5zLuvRNYyYp10y21PyaB5HzK+tdMzxmzrbHrp3L73JxToY840nG/8VW31qbpWxf27VvA5fml7w4tOvtOtmwsm55d6DNJ0c5bD5w+6zDfptu/rFrWy+ldfYD93VMqjcL+Lqh8L4LXsQ7jO8L3rpiC+pzYn8UxxSXNL8D42qWd2WEtEpZXrYBbWG9rfiEfTjKzwxN53nSHlknyFjF+X3gJfuvgesG9EvgPbdyYaUHXFwfmLROa/bAr9R24olnjteO584Q76jzQKl5dJRInB/79XY20ancM0k/24Z2aLZjHeOW5w2UON9y465Mol+Bn7XvhwGegdKv3RfEuPtZ5P5OwovnrslpTt6u8n2gfPdp7/K9lQeRa+QdNAXtZBCvXOPZcr443mnkOh8vo+18sGTLecu3XNZjQsOiGda/7Px9k8gS9Mdheo9aY855WiB76P6hvR8F8umk/mB0IK5id76Prryze/opp+8qjjOMN9T3TFr64o3ipOrOLhbfjVc350nEEscZxhvrWq5hnOG72Y6NYF3kffPkFn5n+nJoVE5t9sGIdyr6mcD3Gv0l33AV8cbWvpOjzl36uQiqOfKRLzf53hTSbvlPIfOsloswj2Iu9o3T8je+8TVQrFU8fQT2cxzq56HN1Th/AXGYhlA=
  </data>
 </layer>
 <layer name="Above" width="30" height="30">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA9VWUQrCMAytaPEo3ffwBE68iAfat6f0CJMihTiavjZJiz4Y6xaat/cWkjpni8uhHJ9BXLrvBuJXIa90X8J21O2X+BW8c5PX8VLdKNddyUUhrQ8t0H/Wesrp0tYHAqerNy/NT9faumzhfXXWSDGCa/Wfi3vm3iE8z9/3XwDSKtHZA6V5Z93LaL7SvNPOLGk+655S65/1mSPqXSpqy/rMkfMPacuhVS/lTbqRthxa6yT2zBqfa/OhWCDrx8mGd2K499+0Pz9odJdmKDeHNHxhYJ9NPo3kRKidRfFKPi/+f2YYxRvJS7o3EA4AAA==
+  <data encoding="base64" compression="zlib">
+   eJzVVm0KwjAMrWjxKN1v8QROvIgH2m9P6RGUIoE4mrwuaYs+KPvIkreXZUlDaIvzTrefgN3qdwX2i5HX6kd47X3+lnylGMIUfbxcN4p1c3JxWOvDC/SdvTmVdHnrA0HS1ZuXx+fn3rrcwvvsrJFjBNcSP0u6lu4hPI7fx18A0mrR2QPavGvdy3g8bd55Z5Y1XuueUpu/1nuOrHeuqK3We45S/pC2Erbq5bykG2krAeklHjrmnlmTZwSt7rKNenNiz90PbXgngXv9Tuv9g6Yb/UfaDJXmUE2eJd80sM9SnkZyItTOorwoz3P8nxnG8Qa64TFH
  </data>
 </layer>
 <layer name="Walkable" width="30" height="30" visible="0">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+2TUQ7AIAhDewXvf9n9GlJRKMN9jMTMbIxHsQ4A41/phUtMoI9/Gl3sYZ5vsrt95M2T6Ve1ZOLrXO8/kBw223mf9SmrGcmp9ipQ128m7Pyr7top1/uuaFZ8oejMzkud8Q0mpnfdXNbHW9yOc2Z1O3TaupalMOcaK23eOa/qRbwS0atyT8+R5bL9rtedV1YRza9gqqwKn1ffnS7uA22xU3oQDgAA
+  <data encoding="base64" compression="zlib">
+   eJztk1EOwCAIQ3sF73/Z/RpSUSjDfYzEzGyMR7EOAONf6YVLTKCPfxpd7GGeb7K7feTNk+lXtWTi61zvP5AcNtt5n/UpqxnJqfYqUNdvJuz8q+7aKdf7rmhWfKHozM5LnfENJqZ33VzWx1vcjnNmdTt02rqWpTDnGitt3jmv6kW8EtGrck/PkeWy/a7XnVdWEc2vYKqsCp9X350u7gMQFCjH
  </data>
 </layer>
 <objectgroup name="Mapevents" width="30" height="30">
--- a/AndorsTrail/res/xml/fallhaven_nw.tmx
+++ b/AndorsTrail/res/xml/fallhaven_nw.tmx
@@ -50,17 +50,17 @@
 </tileset>
 <layer name="Ground" width="30" height="30">
  <data encoding="base64" compression="zlib">
-   eJztlk0KwjAQhcNAD5Oli55BxLWIuNS9C917gV5Eb6CnM0ILQzq/TQIuXHyMSdOGNzMvMYYQ4si+C2Hd8TGGdtTccwM80t54bgs83L4H4KHWTzrx3BF4PDq9ei/A49Ep6aW4A08tvaXU1OvhlL57hnlsrfeavnuDeWytd4UY0G+sn3pP8qrHv3Hcl8pD7tMvklct/rXkgToDJa969XqQvFqitwRNb6t8aHpb5UM7n7XnS3Ognc/a8zwHS7xZ0h+Tf0u96e0PqS7U3VqrP6S64NrUuk+5O5vDep9q5/huxNpTjzR+Ah/z+ll6xbLulcZv4KPWJ1SvWNb1iCEb90T9LP/DrOsmBmb+z+/xASc034I=
+   eJztlTsOwjAMhiOLcpeMDD0DQswIIUa6M8DOBXoRuAE9Ha3aCivYjk0SiYHhk+s0bfT7Fe+c8xP7yrl1xVvvypHzzA3wSGfjtS3wcOcegIfaP+vEa0fgsei06j0Dj0WnpJfi1u9tlqMNyaU3lZx6LZyG2MCnLa330v/3CqNtFm+/tN4VokXPWD/1ndSrlv7107lUHMI+HZB6VdO/mjhQM1DqVateC7g3w55N0ZtCTG+peMT0lopHbD7H3n8bg9h8pmqCioeUl5y1Gp4z929qb1rrQ8oLdbfmqg8qbzg/8/tc9yl3Z3No79PYHN9NaGvq3vsP4G2YP02taPY9e7+D0Q55wH6nqBOqVjT7akQb+DWRP6pepFlA1VRIy6z/+T1ezUPemA==
  </data>
 </layer>
 <layer name="Objects" width="30" height="30">
  <data encoding="base64" compression="zlib">
-   eJylVr1KA0EQNtyuT+ALpPMJzBUWguEIaQ3B1KYQS+UOTJdGA4Fo5VNE6xTa21j6ACkFwVKw0Rtvhp2bm93ckQ+Wu9udm2/nd3dkd/7RwWcIMZMB+Vj5h8/7ZAAjoUtDXV1NMLFVvYTYhnmW0XZ7ud/wT+pZf46qc3XiBThoudFrVe3lGOwWz8eo/PTtK4S1cfYmLbdn4Hw1Zdkx8r7kfHu2eAIM4zU198DzinhHnn/7uN7G9bkit1+Td4Jyl8bxLnAO/ADvU/QJrC+YXlqnd55fXfTVufCZhsNWOd5yhNYhN7ifBsg3DvC2RXwBMyEvYy2RIO8a5fbYHvh7V9HDeetgyeooEfb69jnw8E5rxINA9TszVV5CP2BLrPiZahNq9idy3xoyU805AM9Fyk2SAU6j8FJt8pq98HBDPflyzjfPQbwZ+hpyhPx0nXNOAjaHcmNoq/Wn/ctrkuvLArEHuaRGz1iZIh9gUL0fefwEaDOdsj+vMb5DlKE+/o3ysiYJWn+6s87eobBD9meyl0A5cRuIiw9Um6RPq0dec5w3NVV57bzQejnV5qbeSSNu2HN4L+c1+8Hs9Z2v5P+1J35ZIM/ejfOXrFnibYJVg34HgJy7wn9ST9xCkP11qeRULyoGIHQfmmJ9kA1PLA6f+P7G9PN60e5ewHlaM8dDvdMHWd9Uz8B5JvxybMoygLnoV/wc/Y30eb4/uU/wWyefi3H+Jv8+MU6G69HuNoAvdgbKviNlU2EjxeMhfw5pbw3uNtsMgrbn0F0uU+RX4oyVZ25m3besN/49suV7hHYX0fqfr49wHX8R+Y/p
+   eJylVrFOw0AMpcqFL+gPdOMLaAYGJKqo6koVkRkGxAhqJLp1gUqVChNfUZg70J2FkQ/oiMSOxERMbcV17OtFPOmU5M7nZ/ts5/J47w9dfPqQMBmQT5Q9fN6SAeRCl4ZQXU0wjut6CUns51lE/7PlcceekbH+GtXnQs4LcNiqRr9V95djuL95PkfbT8suH9au8jdtVTYD55vT96xKvna8eQIc43WBNvC8It7c2DvA9Q6uzxS5g0DeMcpdu4p3jnMQB3ifYExgfc700jq98/zqYawujZhxHLW2z1sO3zrkBo/TMICvI84XMBX7rLMmpMi7Rrk2s4G/9xQ9nDcEC1ZHqfDXslOLA+ydBMSHQPU7dXVewsDjS6LEmWoTavYnqr41FK6ecwCei5SbJAOcTuFdCR74vjK4oZ6snLPmOYi3wFhDjlCcbkvOscdnX25kcb3+tL28Jrm+wnP2IJcG9Iyl2+QDDKr3YyNOgA7TKfvzGs83Qxnq498oL2uSoPWnh7jyNxN+yP5M/krce87FAtUm6dPqkdcc5x25urz2v9B6OdXmrt5JI2nYc3gv5zX7yfy1/q8U/7VxfoUnzz5cFS9Zs8TbBMsG/Q4AOXeDe0bGufkg++tC8aEfbQbAdx+aYH2QDy/sHL7w/Z3p5/Wi3b2A8ywwx32904Ksb6pn4DwXcTlx2zKAmehXbSM2cp7sk3ZC3LrlXILzd+X3KbOD69HuNhwQW9l3pOzI1fcAnspnhjZcNLjb/GcQNJt9d7lCkV+Kf6z85xZx9S3rjX/n8fY9QruLaP3P6iNcxy+NDIqn
  </data>
 </layer>
 <layer name="Above" width="30" height="30">
  <data encoding="base64" compression="zlib">
-   eJzFls0NwjAMhYPSbsAO6bliggqxCCcW4VSJUTtCwYcIy3LynJ/CJ1Vq5CS1n2M3zpURRuemsXBR571Wn15/ObX7hfaYmT36cAVrXsLPwMYxBrTHwuw94rSy++878jEi461hY9/9ZbyRYMgrgusgNaFxzq7xDx2IVh04q8dziF2Z16PeZ7BmS/jHv12jx3Jw7lJa8HjjmdPOovaOePi0FijeW2OPQPEiu9RB+59oWqB4a/VIgXTS6sRql3m31iaRqpOcnfTN1SyqzRZyNZvLTes5zYFydxSUG0vvlPmI5yOlieVOZ+mdlI+Se1ivM7Vn+hn3jbgP9WdK+65lTvg8U0O9S7QaPY94DtpL+8dwZN/pcV88mtK7XMuY8xzqfZag/v4GxYs3hw==
+   eJzFlssNwjAMhoPSbsAO6bliggqxCCcW4VSJUTtCwYcIy3LyO4/CJyE1ch7279jEuTLC6Nw0Fi7qvNfq0+svp3a/0B4zs0cfrmDNS/gZ2DjGgPZYmL1HnFZ2//1GPkZkvDVs7NxfxhsJhrwiuA5SExrn7Br/0IFo1YGzejyH2JV5Pep9Bmu2hH/87Bo9loNzl9KCxxvvnHYXtW/Ew6e1QPHeGnsEihfZpQ7a/4mmBYq3Vo8USCetTqx2mXdrbRKpOsnZSd9czaLabCFXs7nctN7THCh3R0G5sfROmY94P1KaWN50lt5J+Sh5h/W6U3umn3HfiPtQf6e0cy1zwuc3NdS7tGk1eh7xHA0+T/ZWuYfsOz3ei0dT+pZrGXOeQ73PEtTf33rROXs=
  </data>
 </layer>
 <layer name="Walkable" width="30" height="30" visible="0">
--- a/AndorsTrail/res/xml/fallhaven_prison.tmx
+++ b/AndorsTrail/res/xml/fallhaven_prison.tmx
@@ -1,71 +1,71 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map version="1.0" orientation="orthogonal" width="15" height="10" tilewidth="32" tileheight="32">
 <tileset firstgid="1" name="tiles_1_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_1.png"/>
+  <image source="../drawable/map_tiles_1_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="tiles_1_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_2.png"/>
+  <image source="../drawable/map_tiles_1_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="tiles_2_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_1.png"/>
+  <image source="../drawable/map_tiles_2_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="tiles_2_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_2.png"/>
+  <image source="../drawable/map_tiles_2_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="tiles_2_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_3.png"/>
+  <image source="../drawable/map_tiles_2_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="641" name="tiles_2_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_4.png"/>
+  <image source="../drawable/map_tiles_2_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="769" name="tiles_2_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_5.png"/>
+  <image source="../drawable/map_tiles_2_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="897" name="tiles_1_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_3.png"/>
+  <image source="../drawable/map_tiles_1_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1025" name="tiles_1_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_4.png"/>
+  <image source="../drawable/map_tiles_1_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1153" name="tiles_1_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_5.png"/>
+  <image source="../drawable/map_tiles_1_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1281" name="tiles_1_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_6.png"/>
+  <image source="../drawable/map_tiles_1_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1409" name="tiles_1_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_7.png"/>
+  <image source="../drawable/map_tiles_1_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1537" name="tiles_1_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_8.png"/>
+  <image source="../drawable/map_tiles_1_8.png" width="512" height="224"/>
 </tileset>
 <tileset firstgid="1649" name="tiles_2_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_6.png"/>
+  <image source="../drawable/map_tiles_2_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1777" name="tiles_2_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_7.png"/>
+  <image source="../drawable/map_tiles_2_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1905" name="tiles_2_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_8.png"/>
+  <image source="../drawable/map_tiles_2_8.png" width="512" height="224"/>
 </tileset>
 <layer name="Ground" width="15" height="10">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA1NjYGBQowCnM+HGuORhesuZcGNc8jC9AUjYkhmCYXx0eWRxXHLU0AvyG7l6y/HoxWUuIZzOhNtcfNiTGaLPlAETB2ARw4YB0qlcUFgCAAA=
+  <data encoding="base64" compression="zlib">
+   eJxTY2BgUKMApzPhxrjkYXrLmXBjXPIwvQFI2JIZgmF8dHlkcVxy1NAL8hu5esvx6MVlLiGczoTbXHzYkxmiz5QBEwdgEcOGAby8LAM=
  </data>
 </layer>
 <layer name="Objects" width="15" height="10">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoA5Yx8zAcIQdwV7JhpDzZkGl0cFeZuxsEIgG6mFlhdDIQAcoJsWK4K8G6hME2r+fDVXdVaC+HqC6XjRxVXYEuwyo5j9Q/3kkNUJI7LlI7F1o7gOZ/R9J7D+aPDI4BZS7CsRHofg0EL9HUg9i32dH4AfsuM0iBcwDmrMeiBcAcTKOOAABVSrZBwIAe8d6l1gCAAA=
+  <data encoding="base64" compression="zlib">
+   eJxjYKAOWMfMwHCEHcFeyYaQ82ZBpdHBXmbsbBCIBuphZYXQyEAHKCbFiuCvBuoTBNq/nw1V3VWgvh6gul40cVV2BLsMavZ5JDVCSOy5SOxdaO7rYUXl/0eTRwangHJXgfgoFJ9GU/seyL/PjsAP2LGbQyqYBzRnPRAvAOJkHHEAAqpUsg8EAFTFGUQ=
  </data>
 </layer>
 <layer name="Above" width="15" height="10">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoAz8ZyZfHl1uNTN+eUJyyGK0tPc2kvxuNLXn2BkYziPhC+zEmQsC99hxyxHSiw+8p0AvuQAACG4FRVgCAAA=
+  <data encoding="base64" compression="zlib">
+   eJxjYKAM/GcmXx5dbjUzfnlCcshipNpLit7bSPK70fSeY2dgOI+EL7DjN/c9ktg9dkx5YtxECLynQC+5AABbCBgM
  </data>
 </layer>
 <layer name="Walkable" width="15" height="10">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAAxNkYGAQHMKYAY84A5I8NnW45LEBQnrx6SdFLz5/kgpINQdfeBIKb3QMANMM0CxYAgAA
+  <data encoding="base64" compression="zlib">
+   eJwTZGBgEBzCmAGPOAOSPDZ1uOSxAUJ68eknRS8+f5IKSDUHX3gSCm90DAAY8wbY
  </data>
 </layer>
 <objectgroup name="Mapevents" width="15" height="10">
--- a/AndorsTrail/res/xml/fallhaven_sw.tmx
+++ b/AndorsTrail/res/xml/fallhaven_sw.tmx
@@ -1,71 +1,71 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map version="1.0" orientation="orthogonal" width="30" height="20" tilewidth="32" tileheight="32">
 <tileset firstgid="1" name="tiles_1_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_1.png"/>
+  <image source="../drawable/map_tiles_1_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="tiles_1_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_2.png"/>
+  <image source="../drawable/map_tiles_1_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="tiles_2_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_1.png"/>
+  <image source="../drawable/map_tiles_2_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="tiles_2_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_2.png"/>
+  <image source="../drawable/map_tiles_2_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="tiles_2_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_3.png"/>
+  <image source="../drawable/map_tiles_2_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="641" name="tiles_2_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_4.png"/>
+  <image source="../drawable/map_tiles_2_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="769" name="tiles_2_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_5.png"/>
+  <image source="../drawable/map_tiles_2_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="897" name="tiles_1_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_3.png"/>
+  <image source="../drawable/map_tiles_1_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1025" name="tiles_1_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_4.png"/>
+  <image source="../drawable/map_tiles_1_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1153" name="tiles_1_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_5.png"/>
+  <image source="../drawable/map_tiles_1_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1281" name="tiles_1_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_6.png"/>
+  <image source="../drawable/map_tiles_1_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1409" name="tiles_1_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_7.png"/>
+  <image source="../drawable/map_tiles_1_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1537" name="tiles_1_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_8.png"/>
+  <image source="../drawable/map_tiles_1_8.png" width="512" height="224"/>
 </tileset>
 <tileset firstgid="1649" name="tiles_2_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_6.png"/>
+  <image source="../drawable/map_tiles_2_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1777" name="tiles_2_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_7.png"/>
+  <image source="../drawable/map_tiles_2_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1905" name="tiles_2_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_8.png"/>
+  <image source="../drawable/map_tiles_2_8.png" width="512" height="224"/>
 </tileset>
 <layer name="Ground" width="30" height="20">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAC9NkYGDQHMUUYW8mTIyuJpyVgcGdlTyzsJkHwtFMmBhdDTF24jILm3kgnM+EibH5lxh7sZmFzTwQrmfCxOT6F5tZ2MwbxaMYGyY2nY3iUTyYMCjdEls2UxPD6j9i7Yepw6UelzwuPq76F9kMbDSp6tFpAJXe8kZgCQAA
+  <data encoding="base64" compression="zlib">
+   eJzTZGBg0BzFFGFvJkyMriaclYHBnZU8s7CZB8LRTJgYXQ0xduIyC5t5IJzPhImx+ZcYe7GZhc08EK5nQuAUNghNrn+RzcJn3igexdgwselsFI/iwYRB6ZbYspmaGFb/EWs/TB0u9bjkcfFx1b/IZmCjSVWPTgMA+3hyPQ==
  </data>
 </layer>
 <layer name="Objects" width="30" height="20">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAC61UMU4DMRC8iHP4QFqqfCGQKyiQkCiokKBJDV8gPTSkiCBVeqgJDQ0FqfgBSPT8BK/Oo5vsrY1zYqSTz+fxzo69t0VR497V48Jtvp/0mjmvTw3+W7k5v1Fz2YO5cBk8nwTdCcXRKF3724/BA6wYS//t08f5crbujPbofDWed9LrQEV5i/7MtXVzcBy47xm6lYqLc8rVZe/ngbsKuhf9ekQ9LP84J0t3RR4Q7zUSbx24V4E3N3KH37Fre2fdNeki3kdYQ11ckr7c1WnP9qR1BKg5OT/oip87V8ca7BbFtZ/v9Zs9Z553YDyVoTtWmkM1xzkz9gNH+xDeo1978s+3a+65C0T3KOLjUI3i68XZ98jAXVp3yrroNQ9Gr+F+Jutl4FjguptGOFYe2Mf9ieud496Gd6kT9hXrYzHvo8R5bNtXoIO8BOwfOescObdc3ZGz+3gKVh8HWJd5qZrhNc1LedQ1gf8sll8qhy5Abvr/3vY8dV5D464taF2dl9b4L8R0c8Fec/ICX3S7+PgFJ/uca2AJAAA=
+  <data encoding="base64" compression="zlib">
+   eJytVDFOAzEQvIhz+ABtqnwhkCsokJBSpEKCJjVvID00pIiAKj3UJA0NBVT8ACR6foJX59FN9tbGOTHSyefzemfG3tuiqHHn6vHBbb9Pes2c1+dG/Gu5Pb9Wc9mDucQyeD4LvDPKo1G69rcfIw6wcqz8t0+f58vZvAvao/VqPO+l14GKdAv/wrV5c3AaYt8yeCuVF+eUy8vez0PsOvBe9OsR9bD645ws3jV5QL6XSL535XdpaIffsWt7Z16dS/AR1lAXl8QvdzXt2Z40jwA1J+cHXvFz6+pcB/tFceXng36z58zHHRlPZfCOFedQzXHOjMMQo31I3KNfe/LPt2vuuQuE9yTi41iN4mvj7Htk4C6tO2Ve9Jp7o9dwP5P1MsRY4LqbR2IsHdjH/YnrnfPehHepE/YV62Mx76PEeezaV8ADXQL2D81aI2vL5R05u4+nYPVxgHk5LlUzvKbjUh51TeA/i+lLaegCaNP/967nqXUNjbu2oHm1Ls3xX4jx5oK95uhCvPB28fELc+ZVqA==
  </data>
 </layer>
 <layer name="Above" width="30" height="20">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAC81UWwqEMAxUVs9Sv8UTqGfzS5Ddi3oEH2gxlIlp01J2fmozcfLSFMWDpcbP9u7yMXeKqcJ2DebPO98cOZj6OlPE70psbxm7RgvpjYxvf9tDauK0QvQ20HfbY7ffPkB6CKunnwuuHo2eCaxNwvfQ+92aQ2LtWNhZamaqgfTdoTzOPUPfQ7vn5NE+8qkr9bxTxsk1Fw3ecqOcVENMjf/SHzePHHkZRTzpf+d4SR/50lPyRzy1czq5sQPpdoKrYAkAAA==
+  <data encoding="base64" compression="zlib">
+   eJzNVFsKhDAMVFbPUr/FE6hn80uQ3Yt6BB9oMZSJadNSdn5qM3Hy0hTFg6XGz/bu8jF3iqnCdg3mzzvfHDmY+jpTxO9KbG8Zu0YL6Y2Mb3/bQ2ritEL0NtB322O33z5Aegirp58Lrh6NngmsTcL30PvdmkNi7VjYWWpmqoH03aE8zj1D30O75+TRPvKpK/W8U8bJNRcN3nKjnFRDTI3/0h83jxx5GUU86X/neEkf+dJT8kc8tXM6ubEDOWgfcQ==
  </data>
 </layer>
 <layer name="Walkable" width="30" height="20">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAC7WV0Q0AIQhDWcH9l/XXGAoPRBJyCQKtnNZlZitwS9Z/uR3fSavgUnzVR+WoWMaL7EPlKd7TuGR29FzdfdS8PH5qXeGSWrKnyKbPecZP7T3qF/37Li+Sn9UQbhVdIb06nKMY4d7BjPIVJ1JXrenq55QpXDr3bL4v9+L1Tk2Zp9eefv/ArGhL9R264wSb6EUn//QNnP5NBGAJAAA=
+  <data encoding="base64" compression="zlib">
+   eJy1ldENACEIQ1nB/Zf11xgKD0QScgkCrZzWZWYrcEvWf7kd30mr4FJ81UflqFjGi+xD5Sne07hkdvRc3X3UvDx+al3hklqyp8imz3nGT+096hf9+y4vkp/VEG4VXSG9OpyjGOHewYzyFSdSV63p6ueUKVw692y+L/fi9U5NmafXnn7/wKxoS/UduuMEm+hFJ//0DQE+D2k=
  </data>
 </layer>
 <objectgroup name="Mapevents" width="30" height="20">
--- a/AndorsTrail/res/xml/fields5.tmx
+++ b/AndorsTrail/res/xml/fields5.tmx
@@ -55,15 +55,15 @@
 </layer>
 <layer name="Objects" width="30" height="30">
  <data encoding="base64" compression="zlib">
-   eJy1Vstug0AMRAi+Jf2D5trS5t6m9FO4h0TKnQP53cYKo0yM92FCR0KJFrNjj2cNRZGHl/r2+1rP78nadlpvyqJ4n67f6/V5vX7K9P7yvLV3KI55mOt7umKc2GNb2+tWXBPgSXFpnKrb76F6zGFT3zkFFp+HR9cl6Oo7P4AcZL1ZiY9xrNIxbw6fxNBkPo9+Sq1fT3Byj1L+Zc6ltVqeiEE4xWdL9Q15sDPOiPWsV9+Y54fq0UsyjzYGr7fWZz2/xEsxH4w0HwQhT3m8pHVFvOg5kKbc11M1n4VezpCuB1UjILlgnn9QvKenHMv1XIw51Btr7cTt6SliW8pdz9n/BHRplW4CPjPn6b/UvVthtjOgk2jeq/6eKYc9vTd3C73EubPmAvYzzlJH79bcvmqvyx77cq6b5tfwnhvtdfTP4tb88Bw0yD03KU3QsxR/zl4Mzg85j9S/gWpP8a9Vqwb6HuJfUiugv414Hh6NM8P8nnmI/PS8FfCcsmYk8+e+Hy2Nu8i3EQNx1mxOITT7BaPaj+9b36ie+Q2NL+r8aVj6Y421z6k95ePeOEd6XdcocX/2JXBp
+   eJy1Vstug0AMRAi+pf2D5prS5t6k9FO4h0TKnQP53cYKo06M92FCR0KJlmXHHo8NRZGH1/r++1bP78naZlpvyqJ4n66f2/V5u77L9PnyvHV2aB/zMNd+umKcOGNT2+vWvibAk+LSOFf332MVjkFg8Xl4rDO7+o8fQAyy3qzExzhV6T1bh09iaDKfRz0l168nOLlGKf8y59JcLU/EIJzis6X6hjzYGT1iPevVN+b5oXr0ksyjF4PXm+uznl/ipZgPRpoPgpCnPF7SumK/6DmQplzXczWfhV7OkK5HlSMgsWCef9B+T015L+dzNeZQb6y1E7enptjbUux6zv4noEurdBNwz1ym/5L3boXZzoBOonmv6nuhGA703twt9BLHzpoL2M/oJfjA06va63LGoZzrpvk1vH2jvY76WdyaH56DBrl9k9IENUvx55zF4PgQ80j1Gyj3FP9auWqg7iH+JbkC+tuI5+HJ6Bnm98xDxKfnrYDnlDUjmT/3/Whp3EW+jRjYZ83mFEKzXzCq8/i+9Y3qmd/Q+Kr6T8PSH2usfU7uKR/3Rh/pdZ2j7PsFzqxwPQ==
  </data>
 </layer>
 <layer name="Above" width="30" height="30">
  <data encoding="base64" compression="zlib">
-   eJxjYKAMaLAi2OZAtgUrbrWU2KGOZi417UE3m1ZAg072EAIg/9LDLch2IIcxLD5p6QZsaWY4Alx5w3wA/E6PeMUHqFkmtLFQzyxqA1qUsYMN0KouIRZEAO1OIBJ7kOjOwZi2aOlfZIBcPmxiZmAQZ4FgCSAWw0PD1G1kpo5/hzugtAwmN42OhLJpFJAPBmPZNwoQAACZARRC
+   eJxjYKAMaLAi2OZAtgUrbrWU2KGOZi417UE3m1ZAA4899HIDzC58bqEWQLYD2X+w+KSlG7ClmeEIcOUN8wHwOz3iFR+gZpnQxkI9s6gNaFHGDjZAq7qEWBABtDuBSOxBojsHY9qipX+RAXL5sImZgUGcBYIlgFgMDw1Tt5GZOv4d7oDSMpjcNDoSyqZRQD4YjGXfKEAAAMB6FG4=
  </data>
 </layer>
- <layer name="Walkable" width="30" height="30" visible="0">
+ <layer name="Walkable" width="30" height="30">
  <data encoding="base64" compression="zlib">
   eJzl00sOwCAIBFCu4P0v25UbI3EYBjHpJN006gM/w8zGj78ZdBwyFlnDNv9P4xR9nmpQeUi/FSZ6rkoXXUdtImupzDXVrhfVWaAe4rK9eg7iKk0vCpON2mRqqdzbjmTeVfYeKcyovbs/UTubDvMFlzWzdXS81ZdN9r3cdNHaMiZbT8TN9LzOvb2/Mx8ACSDP
  </data>
--- a/AndorsTrail/res/xml/flagstone_upper.tmx
+++ b/AndorsTrail/res/xml/flagstone_upper.tmx
@@ -1,71 +1,71 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map version="1.0" orientation="orthogonal" width="20" height="12" tilewidth="32" tileheight="32">
 <tileset firstgid="1" name="tiles_1_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_1.png"/>
+  <image source="../drawable/map_tiles_1_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="129" name="tiles_1_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_2.png"/>
+  <image source="../drawable/map_tiles_1_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="257" name="tiles_2_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_1.png"/>
+  <image source="../drawable/map_tiles_2_1.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="385" name="tiles_2_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_2.png"/>
+  <image source="../drawable/map_tiles_2_2.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="513" name="tiles_2_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_3.png"/>
+  <image source="../drawable/map_tiles_2_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="641" name="tiles_2_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_4.png"/>
+  <image source="../drawable/map_tiles_2_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="769" name="tiles_2_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_5.png"/>
+  <image source="../drawable/map_tiles_2_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="897" name="tiles_1_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_3.png"/>
+  <image source="../drawable/map_tiles_1_3.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1025" name="tiles_1_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_4.png"/>
+  <image source="../drawable/map_tiles_1_4.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1153" name="tiles_1_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_5.png"/>
+  <image source="../drawable/map_tiles_1_5.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1281" name="tiles_1_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_6.png"/>
+  <image source="../drawable/map_tiles_1_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1409" name="tiles_1_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_7.png"/>
+  <image source="../drawable/map_tiles_1_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1537" name="tiles_1_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_8.png"/>
+  <image source="../drawable/map_tiles_1_8.png" width="512" height="224"/>
 </tileset>
 <tileset firstgid="1649" name="tiles_2_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_6.png"/>
+  <image source="../drawable/map_tiles_2_6.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1777" name="tiles_2_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_7.png"/>
+  <image source="../drawable/map_tiles_2_7.png" width="512" height="256"/>
 </tileset>
 <tileset firstgid="1905" name="tiles_2_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_8.png"/>
+  <image source="../drawable/map_tiles_2_8.png" width="512" height="224"/>
 </tileset>
 <layer name="Ground" width="20" height="12">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NiZGBgojJOZ6IOhplXzkQdDDPPgIE6mF7mEWMHLn1D3bwEZtLMA6UbdHFsYsSoSYemG3RxbGLEqAGJmTFQFwMAr41CQcADAAA=
+  <data encoding="base64" compression="zlib">
+   eJxjYmRgYKIyTmeiDoaZV85EHQwzz4CBOphe5hFjBy59Q928BGbSzAOlG3RxbGLEqEmHpht0cWxixKgBiZkxUBcDALk8MRw=
  </data>
 </layer>
 <layer name="Objects" width="20" height="12">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoC3wZkFlZ7AzMKxkwxS3AopbsqOKw8BFoPrLbBB2NFC+jB3BhgEYG6QOxPYCqvFkRxWHgYdA9mMkfhs7drc/gaqrZsNUh6wfHyjG4h9C4BzQnvNQfAHNbVKsDAwiONyLS989IPs+FD+Aim9khdC4zMKlDwR6kfzOBxW/yIqqF2SuFFRsP5awQjZjLhb5fizugrn1PBb12MxABpHMuOVgfqgmMk5BwBNoXjJS3AojufcJCeZQCgAySKVPwAMAAA==
+  <data encoding="base64" compression="zlib">
+   eJxjYKAt8GZBZWewMzCsZMMUtwKKW7KjisPARaD6y2wQdjRQvowdwYYBGBukDsT2AqrxZEcVh4GHQPZjIE6GyrWxI9jI4AlUXTUbprrHbJjqsYFiLOYSAueA9pyH4gvsqHJSrAwMIuyk6bsHZN+H4gdQ8Y2sEBqXWbj0gUAvkt/5oOIXWVH1gsyVgortxxJWyGbMxSLfj8VdMLeex6IemxnIIJIZexyDAMwP1UTGKQh4opknjOTeJySYQykAAE9xKTA=
  </data>
 </layer>
 <layer name="Above" width="20" height="12">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoD74zzw4zCtjx29eMgtCDJmNDgipGyz+JcU8YuzApWaomocvjvGZ9x6LODYxctRQCgDbpycmwAMAAA==
+  <data encoding="base64" compression="zlib">
+   eJxjYKA++M88OMwrY6eOecks+OUHi39JMY8YO3CpGWnmvccijk2MHDWUAgClCBTd
  </data>
 </layer>
 <layer name="Walkable" width="20" height="12">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAAxNkYGAQHKEYBpDZDGjiyGrR9aCbg8sMYgG13Eqq/8l1C7o6bGYwEJAnRZxcfcSah8tvxJiHLW3gs4daGAAXJkzjwAMAAA==
+  <data encoding="base64" compression="zlib">
+   eJwTZGBgEByhGAaQ2Qxo4shq0fWgm4PLDGIBtdxKqv/JdQu6OmxmMBCQJ0WcXH3EmofLb8SYhy1t4LOHWhgAnMgJxA==
  </data>
 </layer>
 <objectgroup name="Mapevents" width="20" height="12">
--- a/AndorsTrail/res/xml/gargoylecave2.tmx
+++ b/AndorsTrail/res/xml/gargoylecave2.tmx
@@ -55,12 +55,12 @@
 </layer>
 <layer name="Objects" width="20" height="20">
  <data encoding="base64" compression="zlib">
-   eJxjYKA9EGIjrOYZK4S2YifOTBkc6i6j2eVFpHk6ONQ9Bpr3BIiTWXDrnYqm155IO0FgJxa1S9nx2wcCoqzE2wEDv1gR5iKzkYElM0ScC+pn9PCEgX6ou0sJuJMPzX+PiUgLyKAaTf1UpLABpZl+EsIam3tIAchhBgofbOn6PzNhc9D9hA8QYx61wRdGCA3LY8/ISGvYAHoemwnli2AxPwNLPCGrA4VLB1Laew/kr0RKG7B0aczEwPARqE8CqtcEyN9BIM0SAtji/TMjItyQ3Yhs12ckeZDaEyyofkBXMxQAAJWiJ3w=
+   eJxjYKA9EGIjrOYZK4S2YifOTBkc6i6j2eVFpHk6ONQ9Bpr3BIiTWXDrnYqm155IO0FgJxa1S9nx2wcCoqzE2wEDv1gR5iKzkYElM0ScC+pn9PCEgX6ou0sJuJMPzX+PiUgLyKAaTf1UpLABpZl+EsIam3tIAchhBgofbOn6PzNhc9D9hA8QYx61wRdGCA3LY8/ISGvYAHoemwnli2AxPwNLPCGrA4VLB1raW4mUNmDp0piJgeEjUJ8EVK8JkL+DQJolBLDF+2dGRLghuxHZrs9I8iC1J1gw/fAZzYzBDgAyJiaK
  </data>
 </layer>
 <layer name="Above" width="20" height="20">
  <data encoding="base64" compression="zlib">
-   eJxjYEAF/5kZiALUUgeTx6cOWY5Y894TaR4+dcTIE+MmUgHMvFesCDFkNrnmUUvtUDGPkjAjxs5kFuqahw18ZiTPDmoBctI2Nj0fiMiXuAA2PV9oEC4fqJyPaeHGwQYA88Yi3w==
+   eJxjYEAF/5kZiALUUgeTx6cOWY5Y894TaR4+dcTIE+MmUgHMvFesCDFkNrnmUUvtUDGPkjAjxs5kFuqahw18ZiTPDmoBctI2Nj0fiMiXuAA2PV8YCashFXygcj5Gd+NwBABXUSPR
  </data>
 </layer>
 <layer name="Walkable" width="20" height="20">
--- a/AndorsTrail/res/xml/home.tmx
+++ b/AndorsTrail/res/xml/home.tmx
@@ -55,7 +55,12 @@
 </layer>
 <layer name="Objects" width="10" height="10">
  <data encoding="base64" compression="zlib">
-   eJxjYCAe5LIzMHixIPgw9k82TLVRQLlioHgLO4StxcrAoAnEnqwINXeB8sxA+WYgPQVI9wDlrJAwDLzFYj42cJFIdQ/ZIBgEdID27Aa6bw8LhI0MNqLxcam7iMQHyZ0GqjkDDZtfRLoJBgCErxNf
+   eJxjYCAe5LIzMHixIPgw9k82TLVRQLlioHgLO4StxcrAoAnEnqwINXeB8sxA+WYgPQVI9wDlrJAwDLzFYj42cJFIdQ/ZIDgZ6C4doD27gfQeKBsZbETj41J3EYkPkjsNVHMGGja/iHQTDAAAwDcTxg==
+  </data>
+ </layer>
+ <layer name="Above" width="10" height="10">
+  <data encoding="base64" compression="zlib">
+   eJxjYCAefGAmTt1/JHX49CCre0+kOkL2XmQjTh0y4GYl3l5OduLULcNhJiEAAKoOC4k=
  </data>
 </layer>
 <layer name="Walkable" width="10" height="10">
@@ -63,11 +68,6 @@
   eJwTZGBgEBzkmBAgVi0uc3Hx0c2jhjpBHGIwDAAZbASn
  </data>
 </layer>
- <layer name="Above" width="10" height="10">
-  <data encoding="base64" compression="zlib">
-   eJxjYCAefGAmTt1/JHX49CCre0+kOkL2XmQjTh0IJLNAaG5W4u3lZCdO3TIcZhICAOWWC/A=
-  </data>
- </layer>
 <objectgroup name="mapevents" width="10" height="10">
  <object name="entrance" type="mapchange" x="96" y="288" width="32" height="32">
   <properties>
--- a/AndorsTrail/res/xml/loneford4.tmx
+++ b/AndorsTrail/res/xml/loneford4.tmx
@@ -92,6 +92,11 @@
    <property name="respawn" value="false"/>
   </properties>
  </object>
+  <object name="Buceth" type="spawn" x="96" y="96" width="32" height="32">
+   <properties>
+    <property name="respawn" value="false"/>
+   </properties>
+  </object>
 </objectgroup>
 <objectgroup name="Keys" width="13" height="10"/>
 </map>
--- a/AndorsTrail/res/xml/pwcave1.tmx
+++ b/AndorsTrail/res/xml/pwcave1.tmx
@@ -50,12 +50,12 @@
 </tileset>
 <layer name="Ground" width="30" height="30">
  <data encoding="base64" compression="zlib">
-   eJy9V9sNwjAQayIWoCPwyxcDwAawDvuwAWzQbtCOwCSkEqdEV98jQeXD4qEk7jk+J32ErntsjFfCscsY/sC5IEY/76igttae8WrPNwUZIfr5ucbW82m8+5j5a3mlOXycBOLXuEew3jIH7S/3gAWN+wn2FtUseeAXbjTfsxejUwONu5yPNEZ7MTENnl/9JG6+LtdQ6l3kHzRH8h+vuSYzJC3LNSXeUm/kF40XrUn6ep6TuJEvrGxG61BOktcGgxv1kMUreYzQs31EHEgzK9+QRjwryz4bhLqlntUy2tOzqPYWztqslM4H6vEyq6ORLZ5arbwg3eh/0gWNbeHUfBpjrn1OOKTfp7jOn1ZO5FO6OyBdPbnX0hdzyHcH66ySeCmnSmj9T/6RsnN0eJhnlIW5qBV5bw5rjaSx2j2LY1njreyX5+xFGWWhxfNlr2+FmrOI477L0MYhz3jeT36pnXxPnjmn75dQ916E+kgD8sw1fd4Y7wc6X4de
+   eJy9V9sNwjAQayIWgBH45YsBYANYh33YADZoN2g3gElIJU49Hb5HguDD4qEkzjk+p72mrrv+GPeCXbeg/wPnjJzjvIOB2lo3gtfa35h0pBznlxp7+3skHeu88NfyanPkOA3Eb3EPYL15Djpf6QEPFvcNnC2qWfPAN9xofuQshqAGFjefjzRGZzEKDW5v/TRuua7UUOtdudaY8BzNf7LmmszQtORrarxcb+QXixetSfpG9kncyBdeNqN1KCfJa73DjXrI49U8RtiIc0QcSDMv35BGMit5n/VK3VrPWhkd6VlUewtnbVZq9wP1OM/q7GRLpFYvL0g3+p90QWNbOC2f5rzUPhVsy+99/syfVk7kU3p2QLpGcq+lL6Z3DWPy7yqNl3KKw+p/8o+WnUPAwzKjPEysVuS9KX1qpI21nu8k5jWexnlF7l7en1G0eJ73+q9QcxdJXFYLrHHIM5H3k29qJ9+TZw7l+zHVvRehPrKAPHMqn2fB+wKAiIgO
  </data>
 </layer>
 <layer name="Objects" width="30" height="30">
  <data encoding="base64" compression="zlib">
-   eJy9VjtOAzEQ3azWmwbERwrQUCQtIDgCDUjQkAYuQkFBSc0BKBANDTUNR0igoqBIuqSgTw6QMKN4pNlhxvYikSet9mf7zRu/sZ1ly8FuuSQigY0l8z4X1fdJI95ny2XZpqt++xbvKTo6uf7d6jvyvGPP1W9m2XszzvNX8Pgwpk/PNYD7EK42/N9xel+JnI31VtjtiCvlX1vJn5zPKcxnj33T+kiQB6aKFyh2axwe35y1sXxleSCEFA118cp8xGOVOUBu6fUU0LzwnOBYzqXXgaU7NYeoJeQ94sMYue6u4Udq369Zg4PIf84tNZNW5MY6lH6XmNf0ypA9E3cdj2q1S+OcQ7xncL2U1RygBvQc6cZ6xT6dhPqJAcdpJfhVq/W/ckrgXko5eCh/j8u563JijmTOb5je6yK+TmraNcS8RniCeO59TLcJ+2Ce6C/pQ6zlPdHm0fNdlGnrJGrn3otxSnzVOD9Y66bktjjHrD/taRof+WGWL3KEezTntvZXPEvwtc7SwuO1PEEacA7uIr4ZGutnqt9mbE+S54PC6TpIg8ZxLL7x9QPz2XLVueDz1YucDzRgWzzbdQVvafgl5MlRJGehWl+BvqtwbQPvGtzXA2OFakYC5wTzzNvLugmBz1HDa//wuaH9PMUrcv/fh+cDuJow1iHcj4rFeYRjwnyC/ZH3BGI4/YczWChu5L0EzivB+wNuI2X9
+   eJy9VjtOAzEQ3azWmwbERwrQUCQ1CI5AAxI0pIGLUFBQUnMACkRDQ03DERKoKCiSLinokwMkzCgeaXaYsb2RyJNW+7P95o3f2M6y1WC/XBGRwNaKeV+K6vukEe+z47Js21W//Yj3FB2dXP9u9R153rHn6jez7KMZ51kWPD6M6ctzDeA+hKsN//ec3lciZ2O9F3Y74kr511byJ+dzCvPZY9+0PhLkganiBYrdGofHN2dtLF9ZHgghRUNdvDEf8VhlDpBbej0FNC88JziWc+l1YOlOzSFqCXmP+DBGrrtr+JHa92vW4CDyn3NLzaQVubEOpd8l5jW9MmTPy/hMq10a5wLiPYfrtazmADWg50g31iv26STUTww4TivBr1qtL8spgXsp5eCx/Dsu567LiTmSOb9lem+K+DqpadcQ8xrhGeJ58DHdJeyDeaLPZJ1rtfzk+S7LNP+idu69GKfEd43zg7VuSm6Lc8z6056m8ZEfZvkiR7hHc25rf8WzBF/rLC08XssTpAHn4D7im6Gxfqb6bcb2JHk+KJyugzRoHCfiG18/MJ8tV50LPl+9yPlAA7bFs11X8JaGX0KeHEVyFqr1Nei7Dtcu8G7AfTMwVqhmJHBOMM+8vaybEPgcNbz2T58bWgNSvCL3/wN4PoSrCWMdwf24WJxHOCbMJ9gfeU8hhrN/OIOF4kbeK+C8Fry/hRdlrg==
  </data>
 </layer>
 <layer name="Above" width="30" height="30">
@@ -63,7 +63,7 @@
   eJzNlzcOgDAMRUNb2dhoJ+D+Z+ESlBkJkgEhUcQ3/Fix5Ing55pijI6ssRIoAK5jolymf87WANhD/CsyGRddh/jng8sUxJ6kB1CZI4x7l+PR8xw8xfonB+7fN7+fcvInB+w+ncC6SXLFqqc0VqQHUa5UGDF/qWvoZwiby+x9lKkd687UjJXN1D533eyPgd9tGNzeHHuNxBYjxztPYuttX1zO35PrGp9zkKf+bN9JaXmV1dpqY7UF+Mz7USeIN7R30QYAwUpv
  </data>
 </layer>
- <layer name="Walkable" width="30" height="30">
+ <layer name="Walkable" width="30" height="30" visible="0">
  <data encoding="base64" compression="zlib">
   eJzlklEKwDAIQ3uF3v+y+xqMUqcx0TIW2J/Jqy5zjDGbvltdvCfzFLeT+YUbr7PMW6PcqKq4kbco/y/CjbK9WStv50HYzL5eD1iudddsb6JM9IZeNpKjml9Vwd15mAzGh3qtbkVzskzr3Uwes2s1H9EfmJX3VWR1c5Ec5S2RLAX3TVlvZhbdgxXbF89n8dQ9VfX6AkUdK9U=
  </data>
--- a/AndorsTrail/res/xml/pwcave2.tmx
+++ b/AndorsTrail/res/xml/pwcave2.tmx
@@ -48,19 +48,19 @@
 <tileset firstgid="1905" name="tiles_2_8" tilewidth="32" tileheight="32">
  <image source="../drawable/map_tiles_2_8.png" width="512" height="224"/>
 </tileset>
- <layer name="Ground" width="30" height="30">
+ <layer name="Ground" width="30" height="30" visible="0">
  <data encoding="base64" compression="zlib">
   eJyllsuNwzAMRCV2YLexXee2R+WWo93BuqKsAA/C0OJPPgziILEeJXJIPWopD0X7hLS1IurvE5Vy/H/+JVXpO47jlMfsvP7+Snlm10LXOCJM8H7KvGQcFvt57vEOT5PFft7c4yzb4kbrcYatcaNMou9ni705XK8W4RXUY/8/nq19e1yrHoj5BZwlwOTc3TgbLSfc39kaA7c5dRHJiSbEjO9tcHaIwcuJVTdazBrPq23EPdNftgBT289C+TOO+oL3aC3mzBnL2tyTTM6d7eGYU5Lv+T3TDzXxORmplUj+s3yrVlq99o1IH4xI424sJrCzTCsvUa62xsj7Wx17Vr43yhf3jfRfU/oP+vxvuXLXgYdHZ8dZi+N78DCbXuV6rySWK977NK9jz2DLdXDXlfdBea9c6TMnrbxx9n7uWc5crKPNQs7la8ocWH3mqPdm7qh2PPZdziw3Kq33S99rc7EFJX3bc8J/w7P0S+e+AbfoUhQ=
  </data>
 </layer>
 <layer name="Objects" width="30" height="30">
  <data encoding="base64" compression="zlib">
-   eJy1V7FOwzAQTROSzkWqxIRUJNjL5zAj+gNQkPgGxNoObCwMDIgFVqaWP2g2OrBW7cZUfHIfuVzOjqvQJ1lpnLPf+e6d7UZRGB73Ag0d+GjZ9p+Yp/b52i76Opl9rgzX0rSXTZOAnRxPOEir9oPA9T+Fmf3hKI6iEZv7LYBnYmz6ZtwX8/Nd2LjyRXyELhubst9TE4tPEQ8fpgE24JSg/Iwjf1uJ3PH49B3z+rS6DNAgtAH/uA/45uKWdhpnk1oizddx7wLQhca9jV4AqrlxVtYG/w1Nzoxd3rb8ErnoC4nLICl4enFVm5Qrnu+ZwrtO7NOnReQf81+bMTebcbdZ5IVLo3xv49DWfZfZtgtcefT7YDifA3i5zx1hr9UH1xhpgceI5/DewS05QsE1JrVwkZTfh4ntmzQ8K7EezWfK/bHgJU7qGyZVewJiLc85jZND6pDrjtZ4klRj4OIO5Zz5p3MCtQht4nyT/Fq9E2RNSaTKnYDPUTd+G5CPWI88I4nnJyrnRp5RvD7PjN/nph0aLV2m7nOJx4X3+84q+hbHZR81uPaLJuegxlWXA/reEvnvKnn99uS6DvMtx+bi/TQu7lSoV+4j1Qdf+1rUX0+sj+bHnVRbK+V9kRTfMB53S/JHzgkg3tBUj+0z+3FxJ6W5MQ/4+DgN2ENd3BJkBx6K38KzL3G94n8C3nOHX9CqjLfPd8mjoen/qhC47hPkk9wPfwEwG33b
+   eJy1V7FOwzAQTROSzkWqxITUSrCXz2EF0R+AgsQ3IFY6sLEwMCAWWJla/qDZ6MDebkzgU/rI9cV2XIU+yUrqnP3Od+9sN4rC8LATaOjAe6to/4l5Wjxf2mVfJyueS8O1MO151Riw4/GCvbRqPwxc/2OY2R/6cRTdqblfA3gmxmZgxn0qP9/IxpUv4RN01dhUvU9NLD4oHj5MA2zAyZD8jCN/W1LudHwGjnl9Wl0EaBDagH/aB3xzcbOdjbNJLYnm67i3AejCxr2JXgCpuXG2rg39Dk3OjF3eLvgZOfWFxGWYlDy9uKpNyZXO98zC+5MUT58WkX/Mf2nGXJl2YsZcZ5EXLo3qvU3Dtu6brGjbwIVHv/eG8ymAV/vcIXtbfWiNiRZ0jHQObx3czBEKrTHWwtkqn8AoKfomDc9KrMfms+T+gHiFU/pG1A8g1nzO2Tg1WIdad7LGw6QaAxd3KOfMbe4FahHaxPnG/LZ6F3BNMVLLnUDPUTd+E4iPWA+fkcLzHa3nhs8oXZ/Hxu9T0/aNls5T97mk46L7fWeVfIvjdR9tcO0XTc5BG1ddDuR7i/LfteT1y5PrOsw3HJvT76O4vFOhXrWPUh967TiLgB6tT+bHndS2Vr4PYjzuluIPzwkg3tBUT+0zu3F5J5W5MU/fs+9rYA91cTPEDjx1d1KtV/xPwO/c4Re0yvH2+c48NjT9XxUC131CfOL98BcxI30I
  </data>
 </layer>
 <layer name="Above" width="30" height="30">
  <data encoding="base64" compression="zlib">
-   eJzNlk0OAiEMhTE6mSt4FeMJ/LmFG6+qO5eeQuMFdJpI0iAFSh+MLyGZMDN8FB4tzv2f3svfvuPo3ObbtmMbXoxL2k+83dQOQC6xPO8hcNHyzF48zu3N9Nw5hOQ+FWNZuPxf7s1Ql8gZ0HJDFn+WfHI3cnlM54Cj9eZroePy8U+r9PdXUI5p5f2UH1O+sSo1bqv8kouH3uX2s5aZikfiUl/NfKx1oQdTkwdz3FIm0s+l46BrdCmXchryDM1VexEx1Mzd4k9+/1wPun9La1EsJvQeSXeDQRkT102oh3y9Y3eDVtLUfo1onVA5TsvlZ+YDf2FYFg==
+   eJzNll0KwjAQhCO29ApeRXoCf27hi1etbz56CsULaAMGlpikO2a2dSBQCtmvm0x317n/02v9/e7YObf9rL6z4aW4XvuRtxvXgcj1rMC7Z7hsBeZcPMmdmxm4S4jJfQCxarhyr/RmrCHxD6DcmCWfcz65VXJlTueIg3rzucK4SPwLqcZYeb/kx5JvalWKa1VfpvKxyFVTo3PcU2PHZAtlInVwiqtlMv2sjcO+Cy3X1zTm/S/Vexk5/PLtNf6U8+emxfZqe1EqJ/b8mZsN2ignhHfN9EN53qnZwKqWIb0fkT8nVo1DufKs3n5ZWOk=
  </data>
 </layer>
 <layer name="Walkable" width="30" height="30" visible="0">
--- a/AndorsTrail/res/xml/pwcave3.tmx
+++ b/AndorsTrail/res/xml/pwcave3.tmx
@@ -48,14 +48,14 @@
 <tileset firstgid="1905" name="tiles_2_8" tilewidth="32" tileheight="32">
  <image source="../drawable/map_tiles_2_8.png" width="512" height="224"/>
 </tileset>
- <layer name="Ground" width="30" height="30">
+ <layer name="Ground" width="30" height="30" visible="0">
  <data encoding="base64" compression="zlib">
   eJytVsFRxDAMtNOB6YA3NUAHUGR+PMOPp+ngUhHxEE2WnZXkG3ho7sZStLK0krzWUlZHvpwzlEyvbDysIctSyu34rct1tp9yA0G9fcOCNgoTv3s4/zc66+ST9QoXbUYMiPlB3z2VS/Csk471Q56P/y+Oj3bGjndlf0reJ2xeD39vIj6TTndl/VZ/BM8+hR+0WQUe+0BctuXaZ7FzzdgPnnUnx1x7FZuysX4wf8ZjhatyzLVXd1Y21g/mr0Ev4t2iHM7cmXlp/cA8bsvvu3n+LNahizif8XKGz0rf4M4cM+bE+36Wi55+EZhYY9X7UQ0Z16tflEMVE3Mj61GOO+vf7sQ08oA9tNZrBimuoo8sF9iHHjdwF0V7L+sj09ncNxuvBriLGB93GH5je1bNHJv7ls9sljI+4io+7WTv9XnWF4yvdinX9hH2v7cr1UzN+DjjZwt6OMJVvDH7jURxKsJU/Wg1Qt7gG4TjNG5vxHOF2SHOJrhvu8ns8Q3i2aIoTMzHTjFne0LNBfUe9GYCvk35vRi91bLdmolh7fXqEbVro1l07/7Efrw3VsT27so8/w/hOcNv0WwG/CWmaM54onZZtOfUzBq43/tiZCw=
  </data>
 </layer>
 <layer name="Objects" width="30" height="30">
  <data encoding="base64" compression="zlib">
-   eJzNVrFSAjEQDeFOapzBscXWr9AZ6S302/wFaxs+4bCzoOCsaKyVGQsblB3yzN6ymwSh8DUcyWbf5mWzG+f+P9Z959778f9brdudh/EzY34fPA3KbV8D34Lx0norTo4L79zwxLmx745JaPM3m9+Jj/zcRuOmdfOqOzatdu1y83cbP/chbo6m6sbAx4GPXvxehW/ExP3Bjmz4tzZPmInz4hpyTs5NfDNmsxJ2I6Gh5mcheKW+GrDPEttjQu5PA/K+MWLjGkBj5Ih29hKWzbKO/shmJHKrl/ANHR9dPMdanB3PD+iv3TPwY24obGTOky3XpA2/z4NdXnBa2vK7pumUOz/y3QY+mZcc2h0E5P44JqJ+0NpcrUpBu88WMI/4qCe8hD2SbhOfjukvyNXG2w3PFeOS9qU6ALm4oRfqPvDNeiP04dxWL8M4zlSrgcC1j3Xfiosjt3dtr7n8tnzydU1hLZK1Fz6sPMz5k7GPjbw4pOan7mbOf0pb2SuphpGOWs1d97v/ZS5yyBqscZI2X2y8DTHI3ivXIRdTdaOtt28j5HnqfpE+qR5TAv7mWtZ5ToI35n/7Tzjzh0rfq/fxDclx6ba58FnHnEBOkh6nfv/6ZKEkp8El9eC9lsOqvWQ7Nd6TBLzr9sU803vhm/NJHquGYLypYo21au2xzqQEGv8PbZx7MQ==
+   eJzNVrFSAjEQDbk7qXEGxxb/RGekt9Bv8xesbfiEw86CgrOisVZmLGxQdswze8tuEpSC13Akm32bl81unDt+bCrn3qr4/7XR7c7D+Jkxvw8eh+W2L4FvyXhpvRUnx4V3bnTi3MT3xyS0+evt79RHfm6jcdO6Rd0fm9W7drn5262fuxA3R1v3Y+DjwPsgfq/DN2Li/mBHNvxbmyfMxXlxDTkn5ya+ObNZC7ux0FDzsxS8Ul8N2GeJ7SEh96cBed8asXENoDFyRDt7Cctm1UR/ZDMWuTVI+IaODy6eYyPOjucH9NfuGfgxNxI2MufJlmvShd+n4S4vOC1t+V3TdMqdH/nuAp/MSw7tDgJyfxxTUT9oba5WpaDdZwuYR3zUE57DHkm3qU/H9BfkauPNlueScUn7Uh2AXNzQC3Uf+GK9EfpwbquXYRxnqtVA4MrHum/FxZHbu7bXXH5bPvm6trAWydoLH1Ye5vzJ2CdGXvyn5qfuZs5/SlvZK6mGkY5azd1U/f8yFzlkDdY4SZtPNt6FGGTvleuQi6m60TU/byPkeep+kT6pHlMC/uZaNXlOgjfmf/tPOPP7Wt+r9/ENKUG58NHEnEBOkh6nfv/6ZKEkp8El9eC9lsOqvWQ7M96TBLzr9sUi03vhm/NJHquGYLytY421au2hzqQEGv83DjR7Bg==
  </data>
 </layer>
 <layer name="Above" width="30" height="30">
--- a/AndorsTrail/res/xml/pwcave4.tmx
+++ b/AndorsTrail/res/xml/pwcave4.tmx
@@ -48,19 +48,19 @@
 <tileset firstgid="1905" name="tiles_2_8" tilewidth="32" tileheight="32">
  <image source="../drawable/map_tiles_2_8.png" width="512" height="224"/>
 </tileset>
- <layer name="Ground" width="30" height="30">
+ <layer name="Ground" width="30" height="30" visible="0">
  <data encoding="base64" compression="zlib">
   eJytVstuwzAMc4z8QPYb++vec8juHdDdN2D9olbAhCos9XC6AxEkMk0rlmifptZOBF8JGIfN0Xtr722PSzD2d4qRrVHneEt0cWxV11ujzoGaAuV+FMZ6XG+NGc/qVvQsn+1dhqXvdW1snR+w76ire3e+xz7n/ZN9Z/8ZdSv/WN+/7+N/5vyJNfWqLuYTAXvI02VxrX/9bvPBcdXetbqRJ2xkf1nNovbU9zHbS6KLcesPUscS13q2+TKe1ZZ6xj3WXhLd5W9u9B9dm8RZvshjXunV1mrmQP9hfY77u/Rn7xrRFWT+49Wz513RHmR9lOVb7SHM2frVOnM/GnlGuTL/YH6EsSM+5aHyb6v56vjqXSHSr/gxcpaea2vPsbvCK0DPsIjuJ/8Bpqs5jt4BPFTOhei/VmsNOaxO0KuY5pE6Zzw7d3TuW6719sqes/MkypdxhXN1vD3THj0TLDc6gzJ4vIo/jtZqBtZDFZ7cbTbgbQZHdHEORNVbq3PcAEW9fOM=
  </data>
 </layer>
 <layer name="Objects" width="30" height="30">
  <data encoding="base64" compression="zlib">
-   eJy9Vr1Ow0AMTkOvnUACCYkBKtE3KBs/C/1BohukIMTMG4DEq7D0JehTMDI2G7xA1W5M5UzOiuPYl6QUPumU053tz76znQuCv8d7s5r8sZU/JTpndn5SwcZyI/nOTLpG55rOpeXYNNkxbOZ17+zaDlmbEN/aobVF9pYK74dJZGeWd9/OD9homVT3tRYEe24OvIbYRBsctTC/1nZrWxCn83kgyEk66wBwXdvRdzaHNq6Rm283gmBeS2LluAgTuYjIcnSYny/1dH5eMgYt1sj5Deit8TwQS+H+JEztncVKHUg25uQsF27+FaS5EXpiQd0FsfHmqcFY4NSwEGQkPZCD3uHjBXRXuBMphxCYg1MPb1FdfBb0myIceuxDLdD9CfPzyO1LPvr0ALRuOLBXoA3sYdBPHutpXVNg7e2afEzon5YzPKe1O7vy8P4GfaHmI9eLumygLO7jF0Drtkx9SH5A7LdCTMBhhFzrOZ+qnINUl7zfjUhckiycxcDxQt1K/yENMZlHRI/y4XlTYIw3Lmas2yrcvt5aBb665YD8vzfyeHB3+qTsa6MMJwDySaobimfBXtX/QjvM1i3XlzjGjewerxnME60/074n1VucX8rwwnfK9ui7RPKZcnJdCS2hl42V/lbmDSb5JOlTDqpTJW8B+KYHe/zthf8FKvtzpq7GeJyUG/S0e6dAGx3lP0f1MdcoL81JGouGojfaqu+eIt7/xje1p3Da
+   eJy9Vr1OAzEMvh4NnUACCYkBKtE3KBs/C/1BohtcQYiZNwCJV2HpS9CnYGTsbfACVbsxlZiLdT7Xzl3KzydFFyW2PzuxfYmiv8dbI0z+yMqfEJ1TOz8OsLFYy75Tk6/RuaZzYTk2THEMGsu6t3Ztm6yNiW+t2NoiewuF991kslPLu2fn+2w0Ta77UouiXTcHXkNsgg0JNWEdZTchTudzX9Evs78KgOvKjp6zObBxDd18az2KZrUsVo7zOJNLiCxHm/n5XM/nZxVj0GJNnN+A7i+eBwLztQwTe2epUgeSjRk5y7mbf0Z5bsSeWFB3Tmy8emowFTg1zAUZSQ/koHf4eAGdFe5EyiEE5uDEw1tWFx8l/aYMBx77UAt0f8z8PHT7ko8+PQCtGw7sFWgDexj0k4d6XtcUWHs7Zjkm9E/LGZ7T2p1denh/gp5Q84nrRR02UBb38QugdVulPiQ/IPYbISbgMEKudZ1PIecg1SXvd0MSlyQLZ9F3vFC30n9IQ0rmCdGjfHjeFBjjtYsZ6zaE29dbQ+CrWw7I/zsjj3t3p4/KvjaqcAIgn6S6oXgS7IX+F1pxsW65vsQxWi/u8ZrBPNH6M+17Ur2ly0sFXvhO2B59l0g+U06uK6Ep9LKR0t+qvMEknyR9ykF1QvIWgG96sMffXvhfoLLfZ+pqjMdJuUFPu3cKtNFW/nNUH3ON8tKcpLFoKHujrfruKeP9b3wBFS1v6A==
  </data>
 </layer>
 <layer name="Above" width="30" height="30">
  <data encoding="base64" compression="zlib">
-   eJzdVm0KwjAM7ZCZPyL4W2+gN9HpnbyFR9LL+HEB7ZCOUpI06RfogzFok/fa9K2LMfXxnqXFDmDMZV5X18Xce2MW9tlbzTN8xw72vezlvBOXN//s8JjpjfCvkD2P8Zo6StYmzdPmYLraHG0eVWetrmSvV+uLG9AcWry6eEwLjpZ4ZHjKwdVaw5Xj5VCX4sI8IF0jF4fxroGfj+13A3Qux7v1dFNquoN4bmlPc99tiBL+TEHOHf8P0JxRKYw1b3nefg9Q4j6Saqb2ADGciB7NabbaY21NzicSzVSfcdyxXhTLl35j2n9COO40j8oenqsjpVvbY7/WX6XiA+LlWcY=
+   eJzdVm0KwjAM7ZCZPyL4W2+gN/HrTt7CI+llpl5AO6SjlCRt0g/QB2OwJu8t6esWY+rjPdPFHsGY67yurosZemMW9tpbzQt8nx3sfdmn805c3vqzw2OmO8K/Qmoe4yndQVKnYC9cnjQH05XmSPOoPkt1U2q9WV/cgeaQ4tXFY1pwtMQjw1MOrtcSrhwvh7oUF+aB1Hfk4jDeNfDrsXo3QOdyvFtPV9PTHcRzS3uaO7chSvhTA833458g2aNSGHvecr/9GaDE9yhVUzsDxHAmZjSn2arG2pqcT1I0tT7juGOzKJafesak/4TwudM8CWd4ro85M3AOfm2+0uIDg25auA==
  </data>
 </layer>
 <layer name="Walkable" width="30" height="30" visible="0">
--- a/AndorsTrail/res/xml/road2.tmx
+++ b/AndorsTrail/res/xml/road2.tmx
@@ -55,7 +55,7 @@
 </layer>
 <layer name="Objects" width="20" height="19">
  <data encoding="base64" compression="zlib">
-   eJyVUssNwjAMjaJkIE5wRqgDUDFBJkBIvRdxYBCG6JUh6L1qByFWY8l9OG2wZLWxn997+Rijx8Ebs/fl9X8xjOOQ+NJ5iWWuJn0fTudgrKZH349b10PONuEHt/RRMt+539rRGnOyS0wNnKiT0+Xaxc68nMTPM2Py8M7su2RfyI9Jer2Y34n/Ku31pehrtS29OuZZZGV1jtIYwAPyY6Jebg/0TjulN8XaU5z5lt5VnGXv9btq4/rul374TaGHEOs35a7xDWKMwDOlNXFJTulFnq12Fq3iJaR57vWZPs43UGNP3KczD9ALoEEY9i+9S7zGIf1iHwPxuZlpxW9Og9Zf07tPuw==
+   eJyVUssNwjAMjaJkIE5wRqgDUDFBRkDqPYgDgzBErwxB71U7CLGIJffhtMGS1cZ+fu/lY4weB2/M3tfX/8UwjkPia+cllrm6/L07nYOxmh59325dDzljxo9u6aNmvne/taM15mSXmBY4Uaeky7WL/fJyEj/PTNnDq7Dvmn0hPybpDWJ+J/6bvNenoq/VtvTalGeRjdU5amMED8iPiXqlPdA77ZXenGoPceZbejIGr99VTOubX/rhN4UeQqpflbvGN4gxAc+c18QlOaUXebbaWUTFS8jz3BsKfZzvoMaeuE9nHqAXQIMw7F96l3iNQ/rFPgbiSzPzit+SBq0/0ZFPRQ==
  </data>
 </layer>
 <layer name="Above" width="20" height="19">
--- a/AndorsTrail/res/xml/roadtocarntower1.tmx
+++ b/AndorsTrail/res/xml/roadtocarntower1.tmx
@@ -55,7 +55,7 @@
 </layer>
 <layer name="Objects" width="30" height="20">
  <data encoding="base64" compression="zlib">
-   eJy9VTtOxTAQTBT7cQFKejhABCmpgJKOA0CDaGmgS14eUNBBT0FqEOIETxTQPi4EWSWrTMaOIUFiJMsb27uzO/4ktZGDhXHHpozznNopcKbEX1Cs0vR9mWtO8Uvjn+NYFcUTXs5lDNRX4+VQq/BqXco7H6gnhNOk/338gy/WL3nkI7gQFzXvZd3OAvyo3cbM1XIuOtTtaaLGt+SXe86Vb/1d3d+39j7k/5W4PoiHWdM/1/217fZNUHnOlWqtvI/i09pHwPVe2x9Jvx8L1PZqQE/V+cY2jbG+FkUvtunRVkiNC+PeR85Be97XkvxUM+FYAu8SeNmHwffZF19QGHePhGMFvCuqV98E1BbPFb9DvrsUyu+3wLiyt5jPYRxF29DO42FfQRE4sydtjIPYXf9qu3plbI94EBy3GngTOD+NiWvebF9DXVN4YvruPNfP/waMifi0fV0zyI3rU5SBs+LDLu2dthByM+7/sAP5ZK3tu794z7KB90PXSExdg/ZfsWX7+f4XJP/NibyZ7TTw5e6b/wY+ylMW
+   eJy9VTFOxDAQTBT7+AAlPTwggpRUQEnHA6BBtDTQJZcDCv5AQWoQ4gUnCmiPD0FWySrjieO7BImRLDu2d2Z37XVSG/WwMP25KfO8puMUNFPSL4irNK4ta82JvzT+NeaqiE902ZcxUFvlyyFW0dW4VHc+EE8Il4n7fb7GFuMXP/IRWoibWve2blcBfczdzmw4ly8Tc/xIdrnnXoX2C47B/5+kv454mjX9a93f2+7cBJXnXmmuVfdZbNrxGWh91uOvxO3HAnN7tybPD7ZpjO2tKHqzTY9jhcS4MP16ZB+053MtyU5zJhpL0F2CLtswuJ59/ILC9M9INFagu6J49U3A3OK94nfIV0sh/zYF8srZoj+ncRTtQ7uOh20FReDOXrQcJ3F//7vt4pW5I9JBMG818Cawf8qJez6sm0PdU3g4fTXP8fO/ATkR39bNawa+cXyKMnBXfDiks9MWQm7G/R8OwJ+sHfvqF+ssG3g/dI9w6h4c/xV71vX3vyD+707UzWyXA5/vvvVfFY1Q1A==
  </data>
 </layer>
 <layer name="Above" width="30" height="20">
--- a/AndorsTrail/res/xml/waterway0.tmx
+++ b/AndorsTrail/res/xml/waterway0.tmx
@@ -55,15 +55,15 @@
 </layer>
 <layer name="Objects" width="30" height="30">
  <data encoding="base64" compression="zlib">
-   eJy9lm9ugzAMxTOUnGDrGZi0A8DX7u9nyrreYPdY2zO2HKexwOLVOIiMgCUrCoL87NfkpcbMi7fMmFefPz4/fH5nMxeM5O1WYq7Jk8y1eCl+R15n6rtzdcW6Y5lzeozhpdIVmawZMijfE50PTVesHxmfPl9MmvOxFd8i88vdM+qE55G5sgdiHtxyZ5C5lR/PtmeWPgu3DFNyf13f57Pr61gi6o677/bqQbCXiqbrifaqxl466kxnrxHMpt96ar/oKegtMXG17T6rJvQ75uMVPGsCe/MCz9krx/oN8djPKPYjPV+VOrbg8dgvaqnx2G/o+wcbl8xljdg7QlpKf/uzvY8+2XadjR8fbTunxHnTzTWN5fllluanUjep9UXRV97drHHphqwTfM9M9FWa45kM7W/t/wL2q90LpGnhht52tPfsneBjhpg8Hm3PklGIPomdC6+rQS+ZIaY8v6gx3hsnO6xBrnFW6pfv8fdl4E6S+47WypV+8b1c8QLJ5LVY41ypJ6Ttf0deB0fJmMLSaoyp5QbY5Hhw
+   eJy9lltugzAQRSmyV9B2Da3UBcBv+so3oWl20H0UssaE5dQWjLi5jCkWj5FGlhH2mbl4xiTJPHtLk+TV+bfzD+df6cwNI3mHjZhb8pi5FW+J7yj7TH13rq4YdyxzTo4xvKV0RaZohgzv7wvVh6Yrxo+MT+cvyTL1saO1yNzbW0a5YD0Kl3PwzJNdrwaFW7jxbHpm7jyz6zCZ+2P7PJ9tH8caVnbcY3dWT8Rey5ouJ39WNfbaVqY6ewsTtv/WU/PFnoK9Jcaupj1nxYR8x/p4Ac+awNm8wHPplWP5hnjSz7wdR3K+KnHsoMdjvqilxpN+49ffmTgXrmgkvSOkJfe3X9P30QfT7vPoxnvTzr3jvOnmmsZcv8LS+inrxlpfFH357haNcztk1bBemNhX/RxrMnS+tf8FzFe7F7ymmR32tsrcsg/ERw8xZaxMz2LLKE/PfqJeV4Je7CEm129NbLk3ajOMgfc4K/Hze7I+D9xJfJZkL853TzqE9hGm7FXRGcJ4MmJrWsWMEhvGyN8vlFdIM037/8Y/kix3OA==
  </data>
 </layer>
 <layer name="Above" width="30" height="30">
  <data encoding="base64" compression="zlib">
-   eJztlmEOgyAMhUnEG3gHvIG7gUfwBDuIm/edN1AII3YNQ8tK94cvIY2Q8PpaEju2Sk12jSext8uA6PZvdi1aZTGBO4ZI/JaLO/+FAfh5vnN/aO/DFNJ0GHTXrD/3Y/XgINU/Tn+Yq2+Km5Qmd20hWKNkbSHYTyl/EFP4/qopx739j8+18W9Vmq3xUVo76EprQ13JPle/Mrwy/YZZAH93J/McPqdqBvAcSeVqjVP55cwfXG+Kos39juEsGNPqif8Ean6xflP6Sc0Pg2fhysEONDItbQ==
+   eJztltsJwzAMRQ1xNugOzgbpBhkhE3SQttm32SC1cQ2q8LuS+pMDRsQGXb0gWkalVnuWgp3sMcC6+6s9m1ZdrMDHHLGpWNz7L8wgn+cn9of2eRgmTYdBvu76+z5WDwpy/aPMD1M7U9TkNKlrC8EanLWF4Hy48oMYZv+nphy38T957oOfVWmOwVtp7aArrQ11Jft85ivDqzPfsAvg70thn8PvrZoBvEe2UlvjXHw9+wfVTLVoU88x3AVjWlPjPyHlK0Ws3y39xPHhOS6Bd+EazZIvajh24xreeuoupQ==
  </data>
 </layer>
- <layer name="Walkable" width="30" height="30" visible="0">
+ <layer name="Walkable" width="30" height="30">
  <data encoding="base64" compression="zlib">
   eJzt0jEKACAMA8B+of//rJPgoFahSUQayKhnqW5mXq1+UBN4PQqT5c7C9hizKkzVTp1slVvuzfkxaHcVlJuZTCtr9ydGphm56L/ONl+cF/2GnYG0ozuR86L/0KwNA2EzIw==
  </data>
--- a/AndorsTrail/res/xml/waterway1.tmx
+++ b/AndorsTrail/res/xml/waterway1.tmx
@@ -55,17 +55,17 @@
 </layer>
 <layer name="Objects" width="30" height="30">
  <data encoding="base64" compression="zlib">
-   eJytVstSwzAMTDPJt5Qrl6YHDoQ+cgVa2u9pyTeWfg7WkJ1sNnIewM5opjHYq5UsWVWeJOdgVbB1MMN+kSRFsx7DNWt/b9IkeSHbpu36Kdhb2t8PTnDYecZrqMgnw2fm89jZu2DvwfbBPmT96PBWI3rZp43DA7Oz78Gvg7PuQTlr0svcG+Hj81j/NsIT08sAr8Uc3KXEjLngD8d4iN/2sl7cFeP9lHuD+/GV9bVDP2K8j9wlPgucNfFAL6Ba+fs1/O8q2FOwRTbdTO9DsGXe5YUfFoOy8f/WrEG7ca6DPeY/ezgO3n3ivxdSK4bnRsNqRMN60eYZ/sQ4NU5LqRXOK36XlC/ey/4bhuqGz6nyfm8wXKQ/nIR3Sl8Y4j07vUH5tF6n9gWvpuHzNu3qHeKbA44/19SBvsH5X3waf74b3AeG+t8cPoOeo+8R38m5d8PjPMl9rrN+Ld+zrvbfamTOXRpf534O7dwb5/JpHtHThzi5Z/xFI2KFfjmF01BM4I3NFvwmeJz6btka+t9lQpzLtPveQeMla98C9ecWifcccF9UM2jM7w6nzlJT8qt9kc3A9eBp9+a0KfkdgzfvaL9XvXXW3+vNwQbkbCjO0H6Wd05nRwP89KB5jf2fzlIaW+VU8Ow9B+DlmcHLK/cpjdHVmb3V2C+tE67NmF77Pjq+emewvwfHV4WnF9DvYiQPDO883V+IXtb2DQOAp6E=
+   eJytVkFywjAMTDLOW3ruhXDooZRArqWh5D1A3kh5Tq1pNFk2suO03RnNNC7WamVLVlNmWeet8bb2JtjnWVYN6yFc3Pj3tsiyN7C6GNdP3g7FdL9yKof4E15BAzEJrs7mEd87bx/e9t4+af1o8DYzejGmrcGjJr7vPq7WWLfAnD3oRe4t8aE/1F8HeEJ6EcorOVfuDeUMuTQezHGMX/aiXr0rwnule6P348tNtat+zfE+cJfQl3L2wKN6FawVv9/9b1feXrzlLt2sWhFejUNysBniv7mR9zBwrr09lz97MA/WfcL/V1QrgtdBw2pGwzofz1kQ4+Q8PVGt4LleSR/vxfgFsbpBP0057Q2CM/WHE/Gm9IUYb2f0Bubjek3tC1ZNa8x18ag3xrcEmH+sqRa+lfO/+Dj/eDewD8T63xI+Afvh9wjv5NK7YXGe6D73blrLd/eo/bcakXNXhNexn6t27I1L+fgctafHOLFn/EWj5kr7ZQqnoErgDc0W+CZYnPxuyZr2v3NCnjfF43unGs9ufAs4nlsg30uAfZFNwDm/G5w8S6WcL/dFNAHWg6XdmtNSzncO1rzD/Z719m6615qDBXpmsTyr9o7eOZ4dBRqnBT7X0O94luLcMicDZ+8lUF6cGaxzxT7FOboYszcbxsV1grUZ0ivfRyNWywfG2xqxMiy9Cv6uZs4BYfnj/RXpRW3fZ6enMw==
  </data>
 </layer>
 <layer name="Above" width="30" height="30">
  <data encoding="base64" compression="zlib">
-   eJztl4ENwiAQRS+pTGCdod2gbqRr6kK6gUIakvPyOcEeNI19CaGhwO8HDiiRzuiIBjfngcnnZ/As0d4hjcgg2uT2Yc24km4tv9/8rOG3ZI1sCYuxvHdE/WFOJ5+OLO9Z4rQaSxmjKb/BA//mW4frPRPlmmZgqd9Xhu4ENJbOb44u0m7hV2Kxpkp0LfeExw9+d3a2Rryf8XtaC80aoLNA82XlV+5R3F8c2xrIPQqdN/+I9k9gSapvVF4SX6huzjqO84/iWcb5xaer+yzn/aXapwjab7daGsY=
+   eJztlwEOwiAMRZtMTuA8w3aDeSO9pl5Ib6CQhaQ2bS1StizuJQ0LA/4+UMgAdMYAMIS5TEyxPDPPFO0dp5EZSB/rGN6MK+m28vvNzxp+S/bIFqC5UsO9A+gPc5xiHFHZo8AsNZc0RyW/yQP+5lvHt3sK9Zpmotbvy6A7MRq162vR5bSX8Evx2FMlup5nwuMHvzs7WyPfOV53j1WzBdxdoPny8kvPKOwvz20L6BnF3Tf/iPZP4Ik0Nldfkl9cW8s+zuvP5TPN80uMa/isx+NJ/SWS9ht1ABsf
  </data>
 </layer>
- <layer name="Walkable" width="30" height="30">
+ <layer name="Walkable" width="30" height="30" visible="0">
  <data encoding="base64" compression="zlib">
-   eJztkkEOwCAIBPkC//9sT00aA5SyKzbGSbwYZFxURUQf60Yb18gK9+55PTrm9NUdgTq9PijZHux3YWZge99qNahjuq19xJvN6p1l5K2cY/VCvJWZIV6L2d7j7PPt4MzSmW+GL3OfbucfvMjMLap/jPFnqhyv7/Xukq0d9yLvBXesKRw=
+   eJztkksKQCEIRd2C+99sowchGuZVe0QHmvTxdC0mIp7GBzcOyQn37XktOvq0616BOq06KN4a2e9SkaPyfeV61Lnj1uYRrzerdTYjb+RcVi3EG+kZ4tWo9j5nn+8Gp5fOfBU+z326nX/wIj3XiP6xjD8T5Xltr3UX7145t/IOJj8pLQ==
  </data>
 </layer>
 <objectgroup name="Mapevents" width="30" height="30">
--- a/AndorsTrail/res/xml/waterwayhouse.tmx
+++ b/AndorsTrail/res/xml/waterwayhouse.tmx
@@ -55,12 +55,12 @@
 </layer>
 <layer name="Objects" width="19" height="15">
  <data encoding="base64" compression="zlib">
-   eJxjYKA+4GSBYBjwYcFPY9MDA5IsEDyTDcKPYcFPr2RD6JnHhjCnCsouY4NgYaC8CBSLQml0MRjoA6pfh2TWYizuJASWIOlBNsuDGcEOgIpz4MHoAN2sJWhuA/GxmeMGVJsMVavDCsHIIIKZAStYx4qJYQBkxm6gmXtYUM3bj+TGWUhsdHciA5D+00CxM2hmnYfqvwCkV7Fh14sNYPPjXTYEvQqLu5yAYeAMxC5A7AjEWkD9mqwQ2htKw8BbNgSNzawgoP5gIA4B4kAgtgLqtWRFpQm5ixh/ogNkd+3CEfauzJB4rATSVUAcxgxJHzBMbQAAudYvLg==
+   eJxjYKA+4GSBYBjwYcFPY9MDA5IsEDyTDcKPYcFPr2RD6JnHhjCnCsouY4NgYaC8CBSLQml0MRjoA6pfh2TWYizuJASWIOlBNsuDGcEOgIpz4MHoAN2sJWhuA/GxmeMGVJsMVavDCsHIIAJJHsU+VkwMAyAzdgP17GFBNW8/khtnIbHR3YkMQPpPA8XOoJl1Hqr/ApBexYZdLzaAzY932RD0KizucgKGgTMQuwCxIxBrAfVrskJobygNA2/ZEDQ2s4KA+oOBOASIA4HYCqjXkhWVJuQuYvyJDpDdtQtH2LsyQ+KxEkhXAXEYMyR9wDC1AQCrSS+V
  </data>
 </layer>
 <layer name="Above" width="19" height="15">
  <data encoding="base64" compression="zlib">
-   eJxjYKAu+M88eM2qYkPwPxBpdjdUzzwkvejuItWd+MyiBIDMSmYZWLM42RkYfrChitEqTVDqV1Ldxc+KyvdF4g9Uus8Eqs3Co/49kWZRK90QAwBLvxVC
+   eJxjYKAu+M88eM2qYkPwPxBpdjdUzzwkvejuItWd+MyiBIDMSmahnlnkAE52BoYfbKhitEoTlPqVVHfxs6LyfZH4A5XuM4Fqs/Cof0+kWdRKN8QAAFpMFNs=
  </data>
 </layer>
 <layer name="Walkable" width="19" height="15">
--- a/AndorsTrail/res/xml/wild0.tmx
+++ b/AndorsTrail/res/xml/wild0.tmx
@@ -55,12 +55,12 @@
 </layer>
 <layer name="Objects" width="21" height="21">
  <data encoding="base64" compression="zlib">
-   eJyVVMGNwkAMNCFJK1ABIH5wCCFewF0BPPjdmwLgeNBAoAt4pB9KoAZsZS0sY2f3Rlol2djj8dpegHTMOwBVDjAsfJtrbu+PCtuPOP8cH0a/JZ4VhzgvSqcXP/af9lfIN8J1iOjUfoSjoYP2SON/eBinFg2SU+fD35pPfmv7Kuj0zoXyIJtaadoHXz4vjluHPS/3rwxgimuW+TkydC08nRPk2qLtOmuvv8QOuQah5ha+kWuD68fQaZ37UvBwP8T60QP5XcIZer3Qxm/pI8i6xHTp/6RH9zmDOHV/aD2yTxi9opn7ntGvKTr5Tqkj9xXhnL/vjMqpj56bGMh+rOpOOCk9N3y/l817Sj/UYq64Txdq7ldlk/+jtHWlxJHztA/P3y7As/z0t+pkxU2981LRL/y5l3gBKuszKA==
+   eJyVVMuNwkAMNSFJK1ABIG7LIoQ48dkCOHDjTAHLcqCBQBdwSD+UQA3YylhYXjszPGmUZGI/P4/tAUjHrANQ5QDDwre55vb+qLD9iPPP8WH0W+JZcYjzonR68WP/aX+JfCNcvxGd2o9wNHTQHmn8hIdxatEgOXU+/K355Le2r4JO71woD7KplaZD8OXz4rh12PNy/84AJrimmZ8jQ9fC0/mFXFu0XWXt9ZfYIdcg1NzCBrnWuH4Mnda5LwQP90OsHz2Q3yWcodcLbfyWPoKsS0yX/k96dJ8ziFP3h9Yj+4TRK5q57xn9mqKT75Q6cl8Rzvn7zqic+ui5iYHsx6ruhJPSc8P3e9m8p/RDLeaK+3Su5n5ZNvk/SltXShw5T4fw3HcBnuV/f6tOVtzUO+8TeHMv8QIj6DL7
  </data>
 </layer>
 <layer name="Above" width="21" height="21">
  <data encoding="base64" compression="zlib">
-   eJy1VMkNwDAI45HOko6QCTt31UekKOKyQ/3GYFtAvyTEnahB6vb6p4l0kDv5DO8E67yK+Qh/zXfXwfRD4fm19FjQ+kQ+5nxkzwaZb1ZHlPe326eIckdyYfSguWv11Xvp+WD/EIIKP5U6M3fp9fX2iMnHgvY///7jL30ADS4=
+   eJytVMkNwDAI45HOko6QCTt31EekKOKyg98YbAvoj4R4EzVI3Vn/NZEOchef4d1gn1cxH+Hv+Z46mH4oPL+WHgtan8jHmo/s2SDzzeqI8v53+xZR7kgujB40d62+ei89H+wfQlDhp1Jn5i69vt4eMflY0P4n+0ezuiaEAw1b
  </data>
 </layer>
 <layer name="Walkable" width="21" height="21">
--- a/AndorsTrail/res/xml/wild1.tmx
+++ b/AndorsTrail/res/xml/wild1.tmx
@@ -63,7 +63,7 @@
   eJxjYBg44MZKfTPVgWZqYDEXmxix5o00gCsMiQHY9CGHIUgen/kwcXQ15LqHECDWPTA3kWM+IQDKB2447IG5jxxzaQ2okTeoWQbAzKIkryOnB0L5gNplgzpa2qckHxICyOaSGgfEpE9izCU1/MgNDwBKCgoO
  </data>
 </layer>
- <layer name="Walkable" width="21" height="21" visible="0">
+ <layer name="Walkable" width="21" height="21">
  <data encoding="base64" compression="zlib">
   eJylk0EOACEIA/mC///sXjcGbKc04aIwgOCpqgOsoP8/rotV5939Sy/ulGvLTHmE6Yj2nmiKV0w6X+KvaiJzcplOLXTvXWYXP/Xh8rb/INlXxaRSc93wUiZ9H/rXFTPJnzLvOToiO+nu8G0fcB8O0A==
  </data>
--- a/AndorsTrail/res/xml/wild16.tmx
+++ b/AndorsTrail/res/xml/wild16.tmx
@@ -55,7 +55,7 @@
 </layer>
 <layer name="Objects" width="20" height="15">
  <data encoding="base64" compression="zlib">
-   eJzdUsENwjAMdKuERXjxBvHqC5igZYOyQVkA8+lIGaET8O8m1GqsHE6LeHOS1fTsi+3YRP+JhyfiyfblJx8cUePn8+hyv8XB+F3UsktcH89PN+ftfOLwfr1rBK3qBK1PetuLcsHlnKIFDv3tSiwv5GGj17itT/UxfLVnOZ+n/k7RLrHXIdb7As0AmmMx271IddwiVwFXfYlDQwR4Z5l5M9VUR7vCXHaUZhDMbAQj9MDGP5h/2Y/GvCuiW7h/aT4IffvO5zPGvHgXxkn9uJsYo7O0e9OvxK/tHPoYtOUm3yvMqTXwD/nE/wZAGkKj
+   eJzdUsENwjAMTKuERRgBxKsvYALCBmWDsgDm05EyQifg302oVVs5nBbx5iSr6dkX27Gd+088gnM02a7+5JN3Lob5PPrSb7E3fi9a8pnr5fz0c94uZA7v17tG0KqO0Yast70ol3zJKVrg0N+uxNJCHjJ6jduGXB/BV3vm82nq7yh2ll4HqfcFmgE0h2q2e5XruAnXANd8iUNDJHhnnnmcarqIXc1cdQbJzIYxQg9k/IP55/2I5l0R3cL9S/NB6Nt3oZwx5sW7MI7rx93EGJ2l3Zt+JX5t59BHoK035V5hTq2BfsjH/jf7f0J6
  </data>
 </layer>
 <layer name="Above" width="20" height="15">
--- a/AndorsTrail/res/xml/wild2.tmx
+++ b/AndorsTrail/res/xml/wild2.tmx
@@ -55,15 +55,15 @@
 </layer>
 <layer name="Objects" width="20" height="20">
  <data encoding="base64" compression="zlib">
-   eJytVDFOAzEQ3Au+9EgUtKmSHhQiqlQuUKoU9wAUeAF5QLo8JE+gyBPygXsAP0BK+rDLeXXDxnucBCOdbJ+949nx2kQ/EQuiqiR6KMnFLM1Luwnt2gnEHELTzpnvrWj6XZwjM6f8Fuerpl0w5z6065A7F2f1IT4T54o5p0nve7jUgGPs78Olxo35h/xd31+B+0q+24wOxO6XeYTn68HhkDqqMz6iPsVymOdAb/XsBZqnd+7PzHfbUW+KmFmjerUm7wdET87ZFCa+6rHn976J727Q/hty7DV/N7BvH4j/j8y3Di2nxK7NuehY8hKdkhP6V6d58dmri6Px4cTjcdmcZUx9Dx89a039j0X+zbDatP5srWPtSD/+w/2SHLT2rL4Z3Df7JghQt70ztdHn3TUPmPsLx74a/7y3D5HTrKjKvH9f+z00Gg==
+   eJytVDFuwkAQXMOZHikFbaqkJwpRKqorEFUKPwARXhAeQJeH8AQKnuAP+AF5A/Swi2/lzXoXW0pGsu7Odzs3N7t3AL8RM4AiB5jl4OItzVO7C83aZxFThrqdI99XVvfvcT6qOebXuAzrdomcx9Csk9xWnNZnYY2cr0nvIbQ1yLHsH0Nb4079k/z3vr9C7/tt6JDYd8xLeL6WDgfVUWX4yJD5+BjZHNJbzj2Bz+nlfYV8k458E6KxhvVyTb4MABZObjIVX/TY87Zv4psOmn8jjB3j9yD27QPy/x35tqHhpNityguP6Vykk84k/avSPPns1cVJ+XDG8VNe5zKmvoefnrXG/sfMfjO0Nq4/Xeuydqgf/+F+0Rm49rQ+0swa9JtAkLr1namUPu+ueZBn/8TYjfKv6+0jWJoZRW77dwU9cjL6
  </data>
 </layer>
 <layer name="Above" width="20" height="20">
  <data encoding="base64" compression="zlib">
-   eJxjYEAF/5kZqAqIMU+DlXjzvjASr1adFWG2Ogl2UApIcSOtzCfVvyAz3ZDCCjlOyA27D1jiHpdZxKQTYsMVZNZ7ItMxNjdiM49YcWLsxWUePr244gafeaQAZDOplX5JydfIgJg4IQUghw81ygFalpHUcp8bFcs7XO4DxS8A4DscXA==
+   eJy1k1EOgCAMQ2cMZ8GTcP+b6If/Gj6MNWFLZ0o/CXts7TD76lpNKoa3FZ53LvzdWl52Dd44xDNnepzFx9lZZgOvsDbyLtLIV4/F7Anra2ftZKZM9l5vo3PmXY8X1XrZRLyMkKna38z+odT/Ef35u8seT6EZ/TUBB3mPsL+e7w2eFR18
  </data>
 </layer>
- <layer name="Walkable" width="20" height="20" visible="0">
+ <layer name="Walkable" width="20" height="20">
  <data encoding="base64" compression="zlib">
   eJzNklEKACAIQ72C979svyLpplk08COyx1hTEVEz4s5o0L4Vs4N2bzAj+ftKRl1Vcp/kIWaFE/XjlLXz2O0lw+x6z8T2l/1n5B+9yzoevWMzR/uV7rzoTIf3o7/p/DLeAjezEiI=
  </data>
--- a/AndorsTrail/res/xml/wild3.tmx
+++ b/AndorsTrail/res/xml/wild3.tmx
@@ -55,12 +55,12 @@
 </layer>
 <layer name="Objects" width="20" height="20">
  <data encoding="base64" compression="zlib">
-   eJydVDsSgjAQJQLeg05KLYRxrOEGOPYewU+tlZWFZ6HgIN7DI2hissNjTcLnzWSSZTcvb7MbyjgIdnKUljmXoxDBD5n5vojbtUIdaTs3touL4okvibv7cI0gHZlD30b877EhAX2EjHGNxR5yuEbdPBppLy2cPJ7zrYUexwF5pWagTfyp4eM4iPYM23Cd+zCap9yT70yErx6u/lBQtX0YH9/r24dw1YP22vxcAwe+E+LjOEXd+D6tU3vVpgd7lfLDt1rFWl/lOa9PM9bzxup9H/h2Ebb85yPrjTEYu5rp+R1Kber9Svvs4LLdCfVAY+7sE7a+rVy/Is3rgu+eFQrpf4quJvU/voDt4sD+VTGKi2aC79+E/V2D/wvkjTYD
+   eJydVDsOwjAMbSDlHt1YYaAVYm5vUMTOEfjMMDF14CwdehDuAzGJVcfEKe2Tosa18/IcO6nSJNmbUQW+hRmlSr7I3f9l2s8BrbZ24WyJC+ORL0v9dXROgTpyQd9W/a4JISP6EDnjGosDyeGm/Tw6Y68CnDye822UHac/85L4kY/jqPo9QkPat3Gap5xTbE+uXaqH1B8AqG3jfHxtbB2FVA9cG/JzDRz0niAfx1n78UNap/ZqSA/tVcyP3tU6tfrqyH5Dmmk976zejwk9Hsp/MbLeNIbGrmdEG9xfY18ErtCZYA907sze8963M/OXtrwSYucMKI3/qXxN8B5fiS1x0P6FGODCLyL2NtH+bon/A+vcNG0=
  </data>
 </layer>
 <layer name="Above" width="20" height="20">
  <data encoding="base64" compression="zlib">
-   eJxjYCAfaLDSVj2tACnuUGelrbtpbT41ze5HMwvmdmx+INZf1PQ/uvtIBaS6hVj15PoP3Xx1LOYgq3FDoylxD63S5H9mCIYBYsIQlxqQOe/RzMMFCIUJSJ4Yc0gxcxIjcfaSYk8YgfRAbwAAE5wQKg==
+   eJxjYCAfaLDSVj2tACnuUGelrbtpbT41ze5HMwvmdmx+INZf1PQ/uvtIBaS6hVj15PoP3Xx1LOYgq3FDoylxD63S5H9mCIYBYsIQlxqQOe/RzMMFCIUJSB5mznsizCPGzEmMxNlLij1hBNIDvQEAL0ARHA==
  </data>
 </layer>
 <layer name="Walkable" width="20" height="20">
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java
@@ -72,8 +72,7 @@ public final class MainActivity extends Activity {
    public void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        L.log("onCreate");
-    	//Debug.startMethodTracing(ICICLE_KEY);
-        
+    	
        AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
        this.world = app.world;
        this.view = new ViewContext(app, this);
@@ -167,8 +166,6 @@ public final class MainActivity extends Activity {
        view.movementController.stopMovement();
        
        save(Savegames.SLOT_QUICKSAVE);
-    	
-        //Debug.stopMethodTracing();
    }
    
    @Override
@@ -192,7 +189,6 @@ public final class MainActivity extends Activity {
 		.setOnMenuItemClickListener(new OnMenuItemClickListener() {
 			@Override
 			public boolean onMenuItemClick(MenuItem arg0) {
-				//Dialogs.showConfirmExit(MainActivity.this, view);
 				MainActivity.this.finish();
 				return true;
 			}
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
@@ -69,6 +69,8 @@ public final class CombatController {
    			lootCurrentMonsterBags();
    		}
    		killedMonsterBags.clear();
+    	} else {
+    		context.gameRoundController.resume();
    	}
    	totalExpThisFight = 0;
    }
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Player.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Player.java
@@ -257,6 +257,11 @@ public final class Player extends Actor {
 		} else {
 			this.availableSkillIncreases = src.readInt();
 		}
+		
+		if (fileversion <= 21) {
+			if (hasExactQuestProgress("prim_hunt", 240)) addQuestProgress(new QuestProgress("bwm_agent", 250));
+			if (hasExactQuestProgress("bwm_agent", 240)) addQuestProgress(new QuestProgress("prim_hunt", 250));
+		}
 	}
 	
 	public void writeToParcel(DataOutputStream dest, int flags) throws IOException {
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/Quest.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/Quest.java
@@ -2,17 +2,19 @@ package com.gpl.rpg.AndorsTrail.model.quest;

 import com.gpl.rpg.AndorsTrail.model.actor.Player;

-public final class Quest {
+public final class Quest implements Comparable<Quest> {
 	public final String questID;
 	public final String name;
 	public final QuestLogEntry[] stages; //Must be sorted in ascending stage order
 	public final boolean showInLog;
+	public final int sortOrder;
 	
-	public Quest(String questID, String name, QuestLogEntry[] stages, boolean showInLog) {
+	public Quest(String questID, String name, QuestLogEntry[] stages, boolean showInLog, int sortOrder) {
 		this.questID = questID;
 		this.name = name;
 		this.stages = stages;
 		this.showInLog = showInLog;
+		this.sortOrder = sortOrder;
 	}
 	
 	public boolean isCompleted(final Player player) {
@@ -24,4 +26,9 @@ public final class Quest {
 		}
 		return false;
 	}
+
+	@Override
+	public int compareTo(Quest q) {
+		return (new Integer(sortOrder)).compareTo(q.sortOrder);
+	}
 }
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/QuestCollection.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/QuestCollection.java
@@ -1,6 +1,8 @@
 package com.gpl.rpg.AndorsTrail.model.quest;

+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;

@@ -13,7 +15,9 @@ public final class QuestCollection  {
 	private final HashMap<String, Quest> quests = new HashMap<String, Quest>();
 	
 	public Collection<Quest> getAllQuests() {
-		return quests.values();
+		ArrayList<Quest> quests = new ArrayList<Quest>(this.quests.values());
+		Collections.sort(quests);
+		return quests;
 	}

 	public QuestLogEntry getQuestLogEntry(final QuestProgress stage) {
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/QuestParser.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/QuestParser.java
@@ -12,7 +12,8 @@ import com.gpl.rpg.AndorsTrail.resource.ResourceFileTokenizer;
 import com.gpl.rpg.AndorsTrail.resource.ResourceFileTokenizer.ResourceParserFor;

 public final class QuestParser extends ResourceParserFor<Quest> {
-
+	private int sortOrder = 0;
+	
 	private final ResourceFileTokenizer questStageResourceTokenizer = new ResourceFileTokenizer(4);
 	private final ResourceObjectParser<QuestLogEntry> questLogEntryParser = new ResourceObjectParser<QuestLogEntry>() {
 		@Override
@@ -45,12 +46,15 @@ public final class QuestParser extends ResourceParserFor<Quest> {
 		Collections.sort(stages, sortByQuestProgress);				
 		final QuestLogEntry[] stages_ = stages.toArray(new QuestLogEntry[stages.size()]);
 		
+		++sortOrder;
+		
 		final String questID = parts[0];
 		return new Pair<String, Quest>(questID, new Quest(
 				questID 	// questID
 				, parts[1] 	// name
 				, stages_
 				, ResourceParserUtils.parseBoolean(parts[2], false) // showInLog
+				, sortOrder
 			));
 	}
 }