diff --git a/AndorsTrail/gen/com/gpl/rpg/AndorsTrail/R.java b/AndorsTrail/gen/com/gpl/rpg/AndorsTrail/R.java
index d9c4ca5f7..7c6e3e527 100644
--- a/AndorsTrail/gen/com/gpl/rpg/AndorsTrail/R.java
+++ b/AndorsTrail/gen/com/gpl/rpg/AndorsTrail/R.java
@@ -406,10 +406,10 @@ public final class R {
         /**  Do not translate this. 
          */
         public static final int about_authors=0x7f050000;
-        public static final int about_button1=0x7f050116;
-        public static final int about_button2=0x7f050117;
-        public static final int about_button3=0x7f050118;
-        public static final int about_contents1=0x7f050119;
+        public static final int about_button1=0x7f050117;
+        public static final int about_button2=0x7f050118;
+        public static final int about_button3=0x7f050119;
+        public static final int about_contents1=0x7f05011a;
         /**  
 		This is the GNU GPL v2 text, originally from 
 			http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
@@ -417,24 +417,24 @@ public final class R {
 			http://www.gnu.org/licenses/old-licenses/gpl-2.0-translations.html
 	
          */
-        public static final int about_contents3=0x7f05011a;
+        public static final int about_contents3=0x7f05011b;
         /**  Translated as: affliction / statuseffect / temporary effect 
  Translated as: affliction / statuseffect / temporary effect 
  Translated as: affliction / statuseffect / temporary effect 
  Translated as: affliction / statuseffect / temporary effect 
          */
-        public static final int actorcondition_info_removes_all=0x7f050133;
-        public static final int actorconditioninfo_category=0x7f0501a1;
-        public static final int actorconditioninfo_constant_effect=0x7f050151;
-        public static final int actorconditioninfo_effect_every_full_round=0x7f050153;
-        public static final int actorconditioninfo_effect_every_round=0x7f050152;
+        public static final int actorcondition_info_removes_all=0x7f050134;
+        public static final int actorconditioninfo_category=0x7f0501a2;
+        public static final int actorconditioninfo_constant_effect=0x7f050152;
+        public static final int actorconditioninfo_effect_every_full_round=0x7f050154;
+        public static final int actorconditioninfo_effect_every_round=0x7f050153;
         public static final int actorconditions_v069=0x7f050001;
         public static final int actorconditions_v069_bwm=0x7f050002;
-        public static final int actorinfo_attack=0x7f0500d4;
-        public static final int actorinfo_attacksperturn=0x7f0500d2;
-        public static final int actorinfo_basetraits=0x7f0500d8;
-        public static final int actorinfo_class=0x7f0500cf;
-        public static final int actorinfo_criticalhit=0x7f0500d5;
+        public static final int actorinfo_attack=0x7f0500d5;
+        public static final int actorinfo_attacksperturn=0x7f0500d3;
+        public static final int actorinfo_basetraits=0x7f0500d9;
+        public static final int actorinfo_class=0x7f0500d0;
+        public static final int actorinfo_criticalhit=0x7f0500d6;
         /**  =========================================== 
  Added in v0.6.9 
  =========================================== 
@@ -444,63 +444,63 @@ public final class R {
  =========================================== 
  Added in v0.6.9 
          */
-        public static final int actorinfo_currentconditions=0x7f050132;
-        public static final int actorinfo_currenttraits=0x7f0500d9;
-        public static final int actorinfo_defense=0x7f0500d6;
-        public static final int actorinfo_difficulty=0x7f0500d0;
-        public static final int actorinfo_health=0x7f0500d1;
-        public static final int actorinfo_movecost=0x7f0500d7;
-        public static final int actorinfo_movesperturn=0x7f0500d3;
-        public static final int app_name=0x7f050079;
-        public static final int bulkselection_select_all=0x7f050156;
-        public static final int bulkselection_sell_confirmation=0x7f050158;
-        public static final int bulkselection_sell_confirmation_title=0x7f050157;
-        public static final int bulkselection_totalcost_buy=0x7f050154;
-        public static final int bulkselection_totalcost_sell=0x7f050155;
-        public static final int combat_attack=0x7f0500a5;
-        public static final int combat_begin_flee=0x7f0500ab;
-        public static final int combat_endturn=0x7f0500a9;
+        public static final int actorinfo_currentconditions=0x7f050133;
+        public static final int actorinfo_currenttraits=0x7f0500da;
+        public static final int actorinfo_defense=0x7f0500d7;
+        public static final int actorinfo_difficulty=0x7f0500d1;
+        public static final int actorinfo_health=0x7f0500d2;
+        public static final int actorinfo_movecost=0x7f0500d8;
+        public static final int actorinfo_movesperturn=0x7f0500d4;
+        public static final int app_name=0x7f05007a;
+        public static final int bulkselection_select_all=0x7f050157;
+        public static final int bulkselection_sell_confirmation=0x7f050159;
+        public static final int bulkselection_sell_confirmation_title=0x7f050158;
+        public static final int bulkselection_totalcost_buy=0x7f050155;
+        public static final int bulkselection_totalcost_sell=0x7f050156;
+        public static final int combat_attack=0x7f0500a6;
+        public static final int combat_begin_flee=0x7f0500ac;
+        public static final int combat_endturn=0x7f0500aa;
         /**  <string name="combat_endcombat">End combat</string>
  <string name="combat_endcombat">Kampf beenden</string>
  <string name="combat_endcombat">End combat</string>
  <string name="combat_endcombat">End combat</string>
  <string name="combat_endcombat">End combat</string>
          */
-        public static final int combat_flee=0x7f0500aa;
-        public static final int combat_flee_failed=0x7f0500ac;
-        public static final int combat_hero_dies=0x7f0500b8;
-        public static final int combat_monsteraction=0x7f0500af;
-        public static final int combat_monsterhealth=0x7f0500ae;
-        public static final int combat_move=0x7f0500a6;
-        public static final int combat_not_enough_ap=0x7f0500b7;
-        public static final int combat_result_herohit=0x7f0500b4;
-        public static final int combat_result_herohitcritical=0x7f0500b5;
-        public static final int combat_result_herokillsmonster=0x7f0500b6;
-        public static final int combat_result_heromiss=0x7f0500b3;
-        public static final int combat_result_monsterhit=0x7f0500b1;
-        public static final int combat_result_monsterhitcritical=0x7f0500b2;
+        public static final int combat_flee=0x7f0500ab;
+        public static final int combat_flee_failed=0x7f0500ad;
+        public static final int combat_hero_dies=0x7f0500b9;
+        public static final int combat_monsteraction=0x7f0500b0;
+        public static final int combat_monsterhealth=0x7f0500af;
+        public static final int combat_move=0x7f0500a7;
+        public static final int combat_not_enough_ap=0x7f0500b8;
+        public static final int combat_result_herohit=0x7f0500b5;
+        public static final int combat_result_herohitcritical=0x7f0500b6;
+        public static final int combat_result_herokillsmonster=0x7f0500b7;
+        public static final int combat_result_heromiss=0x7f0500b4;
+        public static final int combat_result_monsterhit=0x7f0500b2;
+        public static final int combat_result_monsterhitcritical=0x7f0500b3;
         /**  <string name="combat_cannotexitcombat">You cannot exit combat since there are adjacent monsters. You first have to move by long-clicking a place with no adjacent monster, before you may end the combat.</string>  
  <string name="combat_cannotexitcombat">Du kannst den Kampf nicht verlassen, weil noch Gegner in der Nähe sind.Du musst dich zunächst auf ein Feld bewegen, wo dich die Gegner nicht mehr erreichen können.</string>  
  <string name="combat_cannotexitcombat">You cannot exit combat since there are adjacent monsters. You first have to move by longclicking a place with no adjacent monster, before you may end the combat.</string>  
  <string name="combat_cannotexitcombat">You cannot exit combat since there are adjacent monsters. You first have to move by longclicking a place with no adjacent monster, before you may end the combat.</string>  
  <string name="combat_cannotexitcombat">You cannot exit combat since there are adjacent monsters. You first have to move by longclicking a place with no adjacent monster, before you may end the combat.</string>  
          */
-        public static final int combat_result_monstermiss=0x7f0500b0;
-        public static final int combat_spell=0x7f0500a8;
-        public static final int combat_status_ap=0x7f0500ad;
-        public static final int combat_use=0x7f0500a7;
-        public static final int conversation_leave=0x7f0500ff;
-        public static final int conversation_lostgold=0x7f0500fb;
-        public static final int conversation_next=0x7f0500fe;
+        public static final int combat_result_monstermiss=0x7f0500b1;
+        public static final int combat_spell=0x7f0500a9;
+        public static final int combat_status_ap=0x7f0500ae;
+        public static final int combat_use=0x7f0500a8;
+        public static final int conversation_leave=0x7f050100;
+        public static final int conversation_lostgold=0x7f0500fc;
+        public static final int conversation_next=0x7f0500ff;
         /**  <string name="conversation_title">%1$s says</string>  
  <string name="conversation_title">%1$s sagt</string>  
  <string name="conversation_title">%1$s Dit</string>  
          */
-        public static final int conversation_rewardexp=0x7f0500f9;
-        public static final int conversation_rewardgold=0x7f0500fa;
-        public static final int conversation_rewarditem=0x7f0500fc;
-        public static final int conversation_rewarditems=0x7f0500fd;
-        public static final int conversation_title=0x7f0501a5;
+        public static final int conversation_rewardexp=0x7f0500fa;
+        public static final int conversation_rewardgold=0x7f0500fb;
+        public static final int conversation_rewarditem=0x7f0500fd;
+        public static final int conversation_rewarditems=0x7f0500fe;
+        public static final int conversation_title=0x7f0501a6;
         public static final int conversationlist_alynndir=0x7f050026;
         public static final int conversationlist_ambelie=0x7f05002a;
         public static final int conversationlist_benbyr=0x7f05004a;
@@ -523,7 +523,8 @@ public final class R {
         public static final int conversationlist_crossglen_leta=0x7f050004;
         public static final int conversationlist_crossglen_odair=0x7f050009;
         public static final int conversationlist_crossglen_tharal=0x7f050006;
-        public static final int conversationlist_debug=0x7f050077;
+        public static final int conversationlist_crossroads_1=0x7f05004b;
+        public static final int conversationlist_debug=0x7f050078;
         public static final int conversationlist_erinith=0x7f050046;
         public static final int conversationlist_fallhaven=0x7f05000b;
         public static final int conversationlist_fallhaven_arcir=0x7f050011;
@@ -574,305 +575,305 @@ public final class R {
         public static final int conversationlist_vilegard_villagers=0x7f050022;
         public static final int conversationlist_wilderness=0x7f050019;
         public static final int conversationlist_wrye=0x7f05002d;
-        public static final int dialog_close=0x7f05008b;
-        public static final int dialog_confirmexit_message=0x7f05008d;
-        public static final int dialog_confirmexit_title=0x7f05008c;
-        public static final int dialog_groundloot_message=0x7f0500c5;
-        public static final int dialog_groundloot_title=0x7f0500c4;
-        public static final int dialog_loading_failed_incorrectversion=0x7f05008a;
-        public static final int dialog_loading_failed_message=0x7f050089;
-        public static final int dialog_loading_failed_title=0x7f050088;
-        public static final int dialog_loading_message=0x7f050087;
-        public static final int dialog_loot_foundgold=0x7f0500c2;
-        public static final int dialog_loot_pickall=0x7f0500c1;
-        public static final int dialog_loot_pickedupitems=0x7f0500c3;
-        public static final int dialog_monsterencounter_info=0x7f050093;
-        public static final int dialog_monsterencounter_message=0x7f050092;
-        public static final int dialog_monsterencounter_title=0x7f050091;
-        public static final int dialog_monsterloot_gainedexp=0x7f0500c8;
-        public static final int dialog_monsterloot_message=0x7f0500c7;
-        public static final int dialog_monsterloot_title=0x7f0500c6;
-        public static final int dialog_newversion_message=0x7f05011c;
-        public static final int dialog_newversion_title=0x7f05011b;
-        public static final int dialog_paused_message=0x7f05008f;
-        public static final int dialog_paused_resume=0x7f050090;
-        public static final int dialog_paused_title=0x7f05008e;
-        public static final int dialog_rest_confirm_message=0x7f050114;
-        public static final int dialog_rest_message=0x7f050115;
-        public static final int dialog_rest_title=0x7f050113;
-        public static final int droplists_crossglen=0x7f05004b;
-        public static final int droplists_crossglen_outside=0x7f05004c;
-        public static final int droplists_debug=0x7f050075;
-        public static final int droplists_fallhaven=0x7f05004d;
-        public static final int droplists_v0610_monsters=0x7f050054;
-        public static final int droplists_v0610_npcs=0x7f050053;
-        public static final int droplists_v0610_shops=0x7f050052;
-        public static final int droplists_v068=0x7f05004f;
-        public static final int droplists_v069_monsters=0x7f050051;
-        public static final int droplists_v069_npcs=0x7f050050;
-        public static final int droplists_wilderness=0x7f05004e;
-        public static final int exit=0x7f05007a;
-        public static final int exit_to_menu=0x7f05007b;
-        public static final int heroinfo_actionpoints=0x7f0500a3;
-        public static final int heroinfo_char=0x7f050098;
-        public static final int heroinfo_gold=0x7f0500a2;
-        public static final int heroinfo_inv=0x7f050099;
-        public static final int heroinfo_inventory=0x7f0500a1;
-        public static final int heroinfo_level=0x7f05009e;
-        public static final int heroinfo_levelup=0x7f05009d;
-        public static final int heroinfo_quests=0x7f0500a4;
-        public static final int heroinfo_skill=0x7f05009b;
-        public static final int heroinfo_spell=0x7f05009c;
-        public static final int heroinfo_totalexperience=0x7f05009f;
-        public static final int heroinfo_wear=0x7f05009a;
-        public static final int heroinfo_wornequipment=0x7f0500a0;
-        public static final int inventory_assign=0x7f050148;
-        public static final int inventory_assign_slot1=0x7f050149;
-        public static final int inventory_assign_slot2=0x7f05014a;
-        public static final int inventory_assign_slot3=0x7f05014b;
-        public static final int inventory_drop=0x7f0500bd;
-        public static final int inventory_equip=0x7f0500ba;
-        public static final int inventory_info=0x7f0500b9;
-        public static final int inventory_item_dropped=0x7f0500bf;
-        public static final int inventory_item_equipped=0x7f0500c0;
-        public static final int inventory_item_used=0x7f0500be;
-        public static final int inventory_unassign=0x7f05014c;
-        public static final int inventory_unequip=0x7f0500bb;
-        public static final int inventory_use=0x7f0500bc;
-        public static final int itemcategory_money=0x7f0500e8;
-        public static final int itemcategory_other=0x7f0500f2;
-        public static final int itemcategory_potion=0x7f0500f1;
-        public static final int itemcategory_shield=0x7f0500ea;
-        public static final int itemcategory_weapon=0x7f0500e9;
-        public static final int itemcategory_wearable_body=0x7f0500ec;
-        public static final int itemcategory_wearable_feet=0x7f0500ee;
-        public static final int itemcategory_wearable_hand=0x7f0500ed;
-        public static final int itemcategory_wearable_head=0x7f0500eb;
-        public static final int itemcategory_wearable_neck=0x7f0500ef;
-        public static final int itemcategory_wearable_ring=0x7f0500f0;
-        public static final int iteminfo_action_equip=0x7f0500e3;
-        public static final int iteminfo_action_equip_ap=0x7f0500e6;
-        public static final int iteminfo_action_unequip=0x7f0500e4;
-        public static final int iteminfo_action_unequip_ap=0x7f0500e7;
-        public static final int iteminfo_action_use=0x7f0500e2;
-        public static final int iteminfo_action_use_ap=0x7f0500e5;
+        public static final int dialog_close=0x7f05008c;
+        public static final int dialog_confirmexit_message=0x7f05008e;
+        public static final int dialog_confirmexit_title=0x7f05008d;
+        public static final int dialog_groundloot_message=0x7f0500c6;
+        public static final int dialog_groundloot_title=0x7f0500c5;
+        public static final int dialog_loading_failed_incorrectversion=0x7f05008b;
+        public static final int dialog_loading_failed_message=0x7f05008a;
+        public static final int dialog_loading_failed_title=0x7f050089;
+        public static final int dialog_loading_message=0x7f050088;
+        public static final int dialog_loot_foundgold=0x7f0500c3;
+        public static final int dialog_loot_pickall=0x7f0500c2;
+        public static final int dialog_loot_pickedupitems=0x7f0500c4;
+        public static final int dialog_monsterencounter_info=0x7f050094;
+        public static final int dialog_monsterencounter_message=0x7f050093;
+        public static final int dialog_monsterencounter_title=0x7f050092;
+        public static final int dialog_monsterloot_gainedexp=0x7f0500c9;
+        public static final int dialog_monsterloot_message=0x7f0500c8;
+        public static final int dialog_monsterloot_title=0x7f0500c7;
+        public static final int dialog_newversion_message=0x7f05011d;
+        public static final int dialog_newversion_title=0x7f05011c;
+        public static final int dialog_paused_message=0x7f050090;
+        public static final int dialog_paused_resume=0x7f050091;
+        public static final int dialog_paused_title=0x7f05008f;
+        public static final int dialog_rest_confirm_message=0x7f050115;
+        public static final int dialog_rest_message=0x7f050116;
+        public static final int dialog_rest_title=0x7f050114;
+        public static final int droplists_crossglen=0x7f05004c;
+        public static final int droplists_crossglen_outside=0x7f05004d;
+        public static final int droplists_debug=0x7f050076;
+        public static final int droplists_fallhaven=0x7f05004e;
+        public static final int droplists_v0610_monsters=0x7f050055;
+        public static final int droplists_v0610_npcs=0x7f050054;
+        public static final int droplists_v0610_shops=0x7f050053;
+        public static final int droplists_v068=0x7f050050;
+        public static final int droplists_v069_monsters=0x7f050052;
+        public static final int droplists_v069_npcs=0x7f050051;
+        public static final int droplists_wilderness=0x7f05004f;
+        public static final int exit=0x7f05007b;
+        public static final int exit_to_menu=0x7f05007c;
+        public static final int heroinfo_actionpoints=0x7f0500a4;
+        public static final int heroinfo_char=0x7f050099;
+        public static final int heroinfo_gold=0x7f0500a3;
+        public static final int heroinfo_inv=0x7f05009a;
+        public static final int heroinfo_inventory=0x7f0500a2;
+        public static final int heroinfo_level=0x7f05009f;
+        public static final int heroinfo_levelup=0x7f05009e;
+        public static final int heroinfo_quests=0x7f0500a5;
+        public static final int heroinfo_skill=0x7f05009c;
+        public static final int heroinfo_spell=0x7f05009d;
+        public static final int heroinfo_totalexperience=0x7f0500a0;
+        public static final int heroinfo_wear=0x7f05009b;
+        public static final int heroinfo_wornequipment=0x7f0500a1;
+        public static final int inventory_assign=0x7f050149;
+        public static final int inventory_assign_slot1=0x7f05014a;
+        public static final int inventory_assign_slot2=0x7f05014b;
+        public static final int inventory_assign_slot3=0x7f05014c;
+        public static final int inventory_drop=0x7f0500be;
+        public static final int inventory_equip=0x7f0500bb;
+        public static final int inventory_info=0x7f0500ba;
+        public static final int inventory_item_dropped=0x7f0500c0;
+        public static final int inventory_item_equipped=0x7f0500c1;
+        public static final int inventory_item_used=0x7f0500bf;
+        public static final int inventory_unassign=0x7f05014d;
+        public static final int inventory_unequip=0x7f0500bc;
+        public static final int inventory_use=0x7f0500bd;
+        public static final int itemcategory_money=0x7f0500e9;
+        public static final int itemcategory_other=0x7f0500f3;
+        public static final int itemcategory_potion=0x7f0500f2;
+        public static final int itemcategory_shield=0x7f0500eb;
+        public static final int itemcategory_weapon=0x7f0500ea;
+        public static final int itemcategory_wearable_body=0x7f0500ed;
+        public static final int itemcategory_wearable_feet=0x7f0500ef;
+        public static final int itemcategory_wearable_hand=0x7f0500ee;
+        public static final int itemcategory_wearable_head=0x7f0500ec;
+        public static final int itemcategory_wearable_neck=0x7f0500f0;
+        public static final int itemcategory_wearable_ring=0x7f0500f1;
+        public static final int iteminfo_action_equip=0x7f0500e4;
+        public static final int iteminfo_action_equip_ap=0x7f0500e7;
+        public static final int iteminfo_action_unequip=0x7f0500e5;
+        public static final int iteminfo_action_unequip_ap=0x7f0500e8;
+        public static final int iteminfo_action_use=0x7f0500e3;
+        public static final int iteminfo_action_use_ap=0x7f0500e6;
         /**  <string name="key_required">A specific key is required to pass.</string>  
  <string name="key_required">Hier kommt man nur mit einem bestimmten Schlüssel weiter.</string>  
  <string name="key_required">Une clé spécifique est requise pour passer.</string>  
          */
-        public static final int iteminfo_category=0x7f0500e1;
-        public static final int iteminfo_effect_chance_of=0x7f050134;
-        public static final int iteminfo_effect_decrease_current_ap=0x7f05013e;
-        public static final int iteminfo_effect_decrease_current_hp=0x7f05013c;
-        public static final int iteminfo_effect_decrease_max_ap=0x7f050143;
-        public static final int iteminfo_effect_decrease_max_hp=0x7f050141;
-        public static final int iteminfo_effect_decrease_movecost=0x7f050145;
-        public static final int iteminfo_effect_duration=0x7f050135;
-        public static final int iteminfo_effect_increase_current_ap=0x7f05013f;
-        public static final int iteminfo_effect_increase_current_hp=0x7f05013d;
-        public static final int iteminfo_effect_increase_max_ap=0x7f050142;
-        public static final int iteminfo_effect_increase_max_hp=0x7f050140;
-        public static final int iteminfo_effect_increase_movecost=0x7f050144;
-        public static final int iteminfo_effect_works_on_source=0x7f050136;
-        public static final int iteminfo_effect_works_on_target=0x7f050137;
-        public static final int iteminfo_effect_works_when_equipped=0x7f05013b;
-        public static final int iteminfo_effect_works_when_hitting_target=0x7f050138;
-        public static final int iteminfo_effect_works_when_killing_target=0x7f050139;
-        public static final int iteminfo_effect_works_when_used=0x7f05013a;
-        public static final int itemlist_animal=0x7f05005c;
-        public static final int itemlist_armour=0x7f050059;
-        public static final int itemlist_debug=0x7f050074;
-        public static final int itemlist_food=0x7f05005a;
-        public static final int itemlist_junk=0x7f05005d;
-        public static final int itemlist_money=0x7f050055;
-        public static final int itemlist_necklaces=0x7f050058;
-        public static final int itemlist_potions=0x7f05005b;
-        public static final int itemlist_quest=0x7f05005e;
-        public static final int itemlist_rings=0x7f050057;
-        public static final int itemlist_v0610_1=0x7f050063;
-        public static final int itemlist_v0610_2=0x7f050064;
-        public static final int itemlist_v068=0x7f05005f;
-        public static final int itemlist_v069=0x7f050060;
-        public static final int itemlist_v069_2=0x7f050061;
-        public static final int itemlist_v069_questitems=0x7f050062;
-        public static final int itemlist_weapons=0x7f050056;
-        public static final int key_required=0x7f0501a4;
-        public static final int levelup_add_attackchance=0x7f05010d;
-        public static final int levelup_add_attackchance_description=0x7f05010e;
-        public static final int levelup_add_attackdamage=0x7f05010f;
-        public static final int levelup_add_attackdamage_description=0x7f050110;
-        public static final int levelup_add_blockchance=0x7f050111;
-        public static final int levelup_add_blockchance_description=0x7f050112;
-        public static final int levelup_add_health=0x7f05010b;
-        public static final int levelup_add_health_description=0x7f05010c;
-        public static final int levelup_adds_new_skillpoint=0x7f05019d;
-        public static final int levelup_buttontext=0x7f05010a;
-        public static final int levelup_description=0x7f050109;
-        public static final int levelup_title=0x7f050108;
-        public static final int loadsave_save_overwrite_confirmation=0x7f0501a0;
-        public static final int loadsave_save_overwrite_confirmation_title=0x7f05019f;
-        public static final int loadsave_save_to_new_slot=0x7f05019e;
-        public static final int loadsave_selectslot=0x7f050084;
-        public static final int loadsave_slot_empty=0x7f050085;
-        public static final int loadsave_title_load=0x7f050083;
-        public static final int loadsave_title_save=0x7f050082;
-        public static final int menu_load=0x7f05007f;
-        public static final int menu_pause=0x7f05007c;
-        public static final int menu_save=0x7f05007e;
-        public static final int menu_save_failed=0x7f050081;
-        public static final int menu_save_gamesaved=0x7f050080;
-        public static final int menu_settings=0x7f05007d;
-        public static final int monster_difficulty_easy=0x7f0500ca;
-        public static final int monster_difficulty_hard=0x7f0500cc;
-        public static final int monster_difficulty_impossible=0x7f0500ce;
-        public static final int monster_difficulty_normal=0x7f0500cb;
-        public static final int monster_difficulty_veryeasy=0x7f0500c9;
-        public static final int monster_difficulty_veryhard=0x7f0500cd;
-        public static final int monsterlist_crossglen_animals=0x7f050065;
-        public static final int monsterlist_crossglen_npcs=0x7f050067;
-        public static final int monsterlist_debug=0x7f050078;
-        public static final int monsterlist_fallhaven_animals=0x7f050066;
-        public static final int monsterlist_fallhaven_npcs=0x7f050068;
-        public static final int monsterlist_v0610_monsters1=0x7f05006d;
-        public static final int monsterlist_v0610_npcs1=0x7f05006e;
-        public static final int monsterlist_v068_npcs=0x7f05006a;
-        public static final int monsterlist_v069_monsters=0x7f05006b;
-        public static final int monsterlist_v069_npcs=0x7f05006c;
-        public static final int monsterlist_wilderness=0x7f050069;
-        public static final int preferences_combat_category=0x7f05012c;
-        public static final int preferences_combat_speed=0x7f05012e;
-        public static final int preferences_combat_speed_title=0x7f05012d;
-        public static final int preferences_dialog_category=0x7f050125;
-        public static final int preferences_dialog_confirmattack=0x7f050129;
-        public static final int preferences_dialog_confirmattack_title=0x7f050128;
-        public static final int preferences_dialog_confirmrest=0x7f050127;
-        public static final int preferences_dialog_confirmrest_title=0x7f050126;
-        public static final int preferences_dialog_monsterloot=0x7f05012b;
-        public static final int preferences_dialog_monsterloot_title=0x7f05012a;
-        public static final int preferences_display_category=0x7f050122;
-        public static final int preferences_display_fullscreen=0x7f050124;
-        public static final int preferences_display_fullscreen_title=0x7f050123;
-        public static final int preferences_display_scaling_factor=0x7f050147;
-        public static final int preferences_display_scaling_factor_title=0x7f050146;
-        public static final int preferences_movement_category=0x7f05012f;
-        public static final int preferences_movement_dpad_minimizeable=0x7f050150;
-        public static final int preferences_movement_dpad_minimizeable_title=0x7f05014f;
-        public static final int preferences_movement_dpad_position=0x7f05014e;
+        public static final int iteminfo_category=0x7f0500e2;
+        public static final int iteminfo_effect_chance_of=0x7f050135;
+        public static final int iteminfo_effect_decrease_current_ap=0x7f05013f;
+        public static final int iteminfo_effect_decrease_current_hp=0x7f05013d;
+        public static final int iteminfo_effect_decrease_max_ap=0x7f050144;
+        public static final int iteminfo_effect_decrease_max_hp=0x7f050142;
+        public static final int iteminfo_effect_decrease_movecost=0x7f050146;
+        public static final int iteminfo_effect_duration=0x7f050136;
+        public static final int iteminfo_effect_increase_current_ap=0x7f050140;
+        public static final int iteminfo_effect_increase_current_hp=0x7f05013e;
+        public static final int iteminfo_effect_increase_max_ap=0x7f050143;
+        public static final int iteminfo_effect_increase_max_hp=0x7f050141;
+        public static final int iteminfo_effect_increase_movecost=0x7f050145;
+        public static final int iteminfo_effect_works_on_source=0x7f050137;
+        public static final int iteminfo_effect_works_on_target=0x7f050138;
+        public static final int iteminfo_effect_works_when_equipped=0x7f05013c;
+        public static final int iteminfo_effect_works_when_hitting_target=0x7f050139;
+        public static final int iteminfo_effect_works_when_killing_target=0x7f05013a;
+        public static final int iteminfo_effect_works_when_used=0x7f05013b;
+        public static final int itemlist_animal=0x7f05005d;
+        public static final int itemlist_armour=0x7f05005a;
+        public static final int itemlist_debug=0x7f050075;
+        public static final int itemlist_food=0x7f05005b;
+        public static final int itemlist_junk=0x7f05005e;
+        public static final int itemlist_money=0x7f050056;
+        public static final int itemlist_necklaces=0x7f050059;
+        public static final int itemlist_potions=0x7f05005c;
+        public static final int itemlist_quest=0x7f05005f;
+        public static final int itemlist_rings=0x7f050058;
+        public static final int itemlist_v0610_1=0x7f050064;
+        public static final int itemlist_v0610_2=0x7f050065;
+        public static final int itemlist_v068=0x7f050060;
+        public static final int itemlist_v069=0x7f050061;
+        public static final int itemlist_v069_2=0x7f050062;
+        public static final int itemlist_v069_questitems=0x7f050063;
+        public static final int itemlist_weapons=0x7f050057;
+        public static final int key_required=0x7f0501a5;
+        public static final int levelup_add_attackchance=0x7f05010e;
+        public static final int levelup_add_attackchance_description=0x7f05010f;
+        public static final int levelup_add_attackdamage=0x7f050110;
+        public static final int levelup_add_attackdamage_description=0x7f050111;
+        public static final int levelup_add_blockchance=0x7f050112;
+        public static final int levelup_add_blockchance_description=0x7f050113;
+        public static final int levelup_add_health=0x7f05010c;
+        public static final int levelup_add_health_description=0x7f05010d;
+        public static final int levelup_adds_new_skillpoint=0x7f05019e;
+        public static final int levelup_buttontext=0x7f05010b;
+        public static final int levelup_description=0x7f05010a;
+        public static final int levelup_title=0x7f050109;
+        public static final int loadsave_save_overwrite_confirmation=0x7f0501a1;
+        public static final int loadsave_save_overwrite_confirmation_title=0x7f0501a0;
+        public static final int loadsave_save_to_new_slot=0x7f05019f;
+        public static final int loadsave_selectslot=0x7f050085;
+        public static final int loadsave_slot_empty=0x7f050086;
+        public static final int loadsave_title_load=0x7f050084;
+        public static final int loadsave_title_save=0x7f050083;
+        public static final int menu_load=0x7f050080;
+        public static final int menu_pause=0x7f05007d;
+        public static final int menu_save=0x7f05007f;
+        public static final int menu_save_failed=0x7f050082;
+        public static final int menu_save_gamesaved=0x7f050081;
+        public static final int menu_settings=0x7f05007e;
+        public static final int monster_difficulty_easy=0x7f0500cb;
+        public static final int monster_difficulty_hard=0x7f0500cd;
+        public static final int monster_difficulty_impossible=0x7f0500cf;
+        public static final int monster_difficulty_normal=0x7f0500cc;
+        public static final int monster_difficulty_veryeasy=0x7f0500ca;
+        public static final int monster_difficulty_veryhard=0x7f0500ce;
+        public static final int monsterlist_crossglen_animals=0x7f050066;
+        public static final int monsterlist_crossglen_npcs=0x7f050068;
+        public static final int monsterlist_debug=0x7f050079;
+        public static final int monsterlist_fallhaven_animals=0x7f050067;
+        public static final int monsterlist_fallhaven_npcs=0x7f050069;
+        public static final int monsterlist_v0610_monsters1=0x7f05006e;
+        public static final int monsterlist_v0610_npcs1=0x7f05006f;
+        public static final int monsterlist_v068_npcs=0x7f05006b;
+        public static final int monsterlist_v069_monsters=0x7f05006c;
+        public static final int monsterlist_v069_npcs=0x7f05006d;
+        public static final int monsterlist_wilderness=0x7f05006a;
+        public static final int preferences_combat_category=0x7f05012d;
+        public static final int preferences_combat_speed=0x7f05012f;
+        public static final int preferences_combat_speed_title=0x7f05012e;
+        public static final int preferences_dialog_category=0x7f050126;
+        public static final int preferences_dialog_confirmattack=0x7f05012a;
+        public static final int preferences_dialog_confirmattack_title=0x7f050129;
+        public static final int preferences_dialog_confirmrest=0x7f050128;
+        public static final int preferences_dialog_confirmrest_title=0x7f050127;
+        public static final int preferences_dialog_monsterloot=0x7f05012c;
+        public static final int preferences_dialog_monsterloot_title=0x7f05012b;
+        public static final int preferences_display_category=0x7f050123;
+        public static final int preferences_display_fullscreen=0x7f050125;
+        public static final int preferences_display_fullscreen_title=0x7f050124;
+        public static final int preferences_display_scaling_factor=0x7f050148;
+        public static final int preferences_display_scaling_factor_title=0x7f050147;
+        public static final int preferences_movement_category=0x7f050130;
+        public static final int preferences_movement_dpad_minimizeable=0x7f050151;
+        public static final int preferences_movement_dpad_minimizeable_title=0x7f050150;
+        public static final int preferences_movement_dpad_position=0x7f05014f;
         /**  =========================================== 
  Added in v0.6.10 
          */
-        public static final int preferences_movement_dpad_position_title=0x7f05014d;
-        public static final int preferences_movementmethod=0x7f050131;
-        public static final int preferences_movementmethod_title=0x7f050130;
-        public static final int questlist=0x7f050070;
-        public static final int questlist_debug=0x7f050076;
+        public static final int preferences_movement_dpad_position_title=0x7f05014e;
+        public static final int preferences_movementmethod=0x7f050132;
+        public static final int preferences_movementmethod_title=0x7f050131;
+        public static final int questlist=0x7f050071;
+        public static final int questlist_debug=0x7f050077;
         /**   These quests do not need translation: 
          */
-        public static final int questlist_nondisplayed=0x7f05006f;
-        public static final int questlist_v0610=0x7f050073;
-        public static final int questlist_v068=0x7f050071;
-        public static final int questlist_v069=0x7f050072;
-        public static final int questlog_includecompleted_prompt=0x7f05011e;
-        public static final int questlog_queststatus=0x7f05011f;
-        public static final int questlog_queststatus_completed=0x7f050121;
-        public static final int questlog_queststatus_inprogress=0x7f050120;
-        public static final int questlog_title=0x7f05011d;
-        public static final int savegame_currenthero_displayinfo=0x7f050086;
-        public static final int shop_buy=0x7f050100;
-        public static final int shop_buyitem=0x7f050103;
-        public static final int shop_infoitem=0x7f050102;
-        public static final int shop_item_bought=0x7f050106;
-        public static final int shop_item_sold=0x7f050107;
-        public static final int shop_sell=0x7f050101;
-        public static final int shop_sellitem=0x7f050104;
-        public static final int shop_yourgold=0x7f050105;
-        public static final int skill_current_level=0x7f050196;
-        public static final int skill_current_level_with_maximum=0x7f050197;
-        public static final int skill_longdescription_barkskin=0x7f050185;
-        public static final int skill_longdescription_barter=0x7f050183;
-        public static final int skill_longdescription_better_criticals=0x7f050187;
-        public static final int skill_longdescription_cleave=0x7f05018b;
-        public static final int skill_longdescription_coinfinder=0x7f050189;
-        public static final int skill_longdescription_dodge=0x7f050184;
-        public static final int skill_longdescription_eater=0x7f05018c;
-        public static final int skill_longdescription_evasion=0x7f05018e;
-        public static final int skill_longdescription_fortitude=0x7f05018d;
-        public static final int skill_longdescription_lower_exploss=0x7f050190;
-        public static final int skill_longdescription_magicfinder=0x7f050191;
-        public static final int skill_longdescription_more_criticals=0x7f050186;
-        public static final int skill_longdescription_more_exp=0x7f05018a;
-        public static final int skill_longdescription_regeneration=0x7f05018f;
-        public static final int skill_longdescription_resistance_blood_disorder=0x7f050194;
-        public static final int skill_longdescription_resistance_mental=0x7f050192;
-        public static final int skill_longdescription_resistance_physical_capacity=0x7f050193;
-        public static final int skill_longdescription_speed=0x7f050188;
-        public static final int skill_longdescription_weapon_chance=0x7f050181;
-        public static final int skill_longdescription_weapon_dmg=0x7f050182;
-        public static final int skill_number_of_increases_one=0x7f05019b;
-        public static final int skill_number_of_increases_several=0x7f05019c;
-        public static final int skill_prerequisite_level=0x7f050199;
-        public static final int skill_prerequisite_other_skill=0x7f050198;
-        public static final int skill_prerequisite_stat=0x7f05019a;
-        public static final int skill_shortdescription_barkskin=0x7f050171;
-        public static final int skill_shortdescription_barter=0x7f05016f;
-        public static final int skill_shortdescription_better_criticals=0x7f050173;
-        public static final int skill_shortdescription_cleave=0x7f050177;
-        public static final int skill_shortdescription_coinfinder=0x7f050175;
-        public static final int skill_shortdescription_dodge=0x7f050170;
-        public static final int skill_shortdescription_eater=0x7f050178;
-        public static final int skill_shortdescription_evasion=0x7f05017a;
-        public static final int skill_shortdescription_fortitude=0x7f050179;
-        public static final int skill_shortdescription_lower_exploss=0x7f05017c;
-        public static final int skill_shortdescription_magicfinder=0x7f05017d;
-        public static final int skill_shortdescription_more_criticals=0x7f050172;
-        public static final int skill_shortdescription_more_exp=0x7f050176;
-        public static final int skill_shortdescription_regeneration=0x7f05017b;
-        public static final int skill_shortdescription_resistance_blood_disorder=0x7f050180;
-        public static final int skill_shortdescription_resistance_mental=0x7f05017e;
-        public static final int skill_shortdescription_resistance_physical_capacity=0x7f05017f;
-        public static final int skill_shortdescription_speed=0x7f050174;
-        public static final int skill_shortdescription_weapon_chance=0x7f05016d;
-        public static final int skill_shortdescription_weapon_dmg=0x7f05016e;
-        public static final int skill_title_barkskin=0x7f05015d;
-        public static final int skill_title_barter=0x7f05015b;
-        public static final int skill_title_better_criticals=0x7f05015f;
-        public static final int skill_title_cleave=0x7f050163;
-        public static final int skill_title_coinfinder=0x7f050161;
-        public static final int skill_title_dodge=0x7f05015c;
-        public static final int skill_title_eater=0x7f050164;
-        public static final int skill_title_evasion=0x7f050166;
-        public static final int skill_title_fortitude=0x7f050165;
-        public static final int skill_title_lower_exploss=0x7f050168;
-        public static final int skill_title_magicfinder=0x7f050169;
-        public static final int skill_title_more_criticals=0x7f05015e;
-        public static final int skill_title_more_exp=0x7f050162;
-        public static final int skill_title_regeneration=0x7f050167;
-        public static final int skill_title_resistance_blood_disorder=0x7f05016c;
-        public static final int skill_title_resistance_mental=0x7f05016a;
-        public static final int skill_title_resistance_physical_capacity=0x7f05016b;
-        public static final int skill_title_speed=0x7f050160;
-        public static final int skill_title_weapon_chance=0x7f050159;
-        public static final int skill_title_weapon_dmg=0x7f05015a;
-        public static final int skillinfo_action_levelup=0x7f050195;
-        public static final int startscreen_about=0x7f0500f6;
-        public static final int startscreen_continue=0x7f0500f3;
-        public static final int startscreen_enterheroname=0x7f0500f7;
-        public static final int startscreen_load=0x7f0500f8;
-        public static final int startscreen_newgame=0x7f0500f4;
-        public static final int startscreen_newgame_confirm=0x7f0500f5;
-        public static final int status_ap=0x7f050096;
-        public static final int status_exp=0x7f050097;
-        public static final int status_hp=0x7f050094;
-        public static final int status_mp=0x7f050095;
-        public static final int traitsinfo_attack_chance=0x7f0500db;
-        public static final int traitsinfo_attack_cost=0x7f0500da;
-        public static final int traitsinfo_attack_damage=0x7f0500dc;
-        public static final int traitsinfo_base_max_ap=0x7f0501a3;
-        public static final int traitsinfo_base_max_hp=0x7f0501a2;
-        public static final int traitsinfo_criticalhit_chance=0x7f0500dd;
-        public static final int traitsinfo_criticalhit_multiplier=0x7f0500de;
-        public static final int traitsinfo_defense_chance=0x7f0500df;
-        public static final int traitsinfo_defense_damageresist=0x7f0500e0;
+        public static final int questlist_nondisplayed=0x7f050070;
+        public static final int questlist_v0610=0x7f050074;
+        public static final int questlist_v068=0x7f050072;
+        public static final int questlist_v069=0x7f050073;
+        public static final int questlog_includecompleted_prompt=0x7f05011f;
+        public static final int questlog_queststatus=0x7f050120;
+        public static final int questlog_queststatus_completed=0x7f050122;
+        public static final int questlog_queststatus_inprogress=0x7f050121;
+        public static final int questlog_title=0x7f05011e;
+        public static final int savegame_currenthero_displayinfo=0x7f050087;
+        public static final int shop_buy=0x7f050101;
+        public static final int shop_buyitem=0x7f050104;
+        public static final int shop_infoitem=0x7f050103;
+        public static final int shop_item_bought=0x7f050107;
+        public static final int shop_item_sold=0x7f050108;
+        public static final int shop_sell=0x7f050102;
+        public static final int shop_sellitem=0x7f050105;
+        public static final int shop_yourgold=0x7f050106;
+        public static final int skill_current_level=0x7f050197;
+        public static final int skill_current_level_with_maximum=0x7f050198;
+        public static final int skill_longdescription_barkskin=0x7f050186;
+        public static final int skill_longdescription_barter=0x7f050184;
+        public static final int skill_longdescription_better_criticals=0x7f050188;
+        public static final int skill_longdescription_cleave=0x7f05018c;
+        public static final int skill_longdescription_coinfinder=0x7f05018a;
+        public static final int skill_longdescription_dodge=0x7f050185;
+        public static final int skill_longdescription_eater=0x7f05018d;
+        public static final int skill_longdescription_evasion=0x7f05018f;
+        public static final int skill_longdescription_fortitude=0x7f05018e;
+        public static final int skill_longdescription_lower_exploss=0x7f050191;
+        public static final int skill_longdescription_magicfinder=0x7f050192;
+        public static final int skill_longdescription_more_criticals=0x7f050187;
+        public static final int skill_longdescription_more_exp=0x7f05018b;
+        public static final int skill_longdescription_regeneration=0x7f050190;
+        public static final int skill_longdescription_resistance_blood_disorder=0x7f050195;
+        public static final int skill_longdescription_resistance_mental=0x7f050193;
+        public static final int skill_longdescription_resistance_physical_capacity=0x7f050194;
+        public static final int skill_longdescription_speed=0x7f050189;
+        public static final int skill_longdescription_weapon_chance=0x7f050182;
+        public static final int skill_longdescription_weapon_dmg=0x7f050183;
+        public static final int skill_number_of_increases_one=0x7f05019c;
+        public static final int skill_number_of_increases_several=0x7f05019d;
+        public static final int skill_prerequisite_level=0x7f05019a;
+        public static final int skill_prerequisite_other_skill=0x7f050199;
+        public static final int skill_prerequisite_stat=0x7f05019b;
+        public static final int skill_shortdescription_barkskin=0x7f050172;
+        public static final int skill_shortdescription_barter=0x7f050170;
+        public static final int skill_shortdescription_better_criticals=0x7f050174;
+        public static final int skill_shortdescription_cleave=0x7f050178;
+        public static final int skill_shortdescription_coinfinder=0x7f050176;
+        public static final int skill_shortdescription_dodge=0x7f050171;
+        public static final int skill_shortdescription_eater=0x7f050179;
+        public static final int skill_shortdescription_evasion=0x7f05017b;
+        public static final int skill_shortdescription_fortitude=0x7f05017a;
+        public static final int skill_shortdescription_lower_exploss=0x7f05017d;
+        public static final int skill_shortdescription_magicfinder=0x7f05017e;
+        public static final int skill_shortdescription_more_criticals=0x7f050173;
+        public static final int skill_shortdescription_more_exp=0x7f050177;
+        public static final int skill_shortdescription_regeneration=0x7f05017c;
+        public static final int skill_shortdescription_resistance_blood_disorder=0x7f050181;
+        public static final int skill_shortdescription_resistance_mental=0x7f05017f;
+        public static final int skill_shortdescription_resistance_physical_capacity=0x7f050180;
+        public static final int skill_shortdescription_speed=0x7f050175;
+        public static final int skill_shortdescription_weapon_chance=0x7f05016e;
+        public static final int skill_shortdescription_weapon_dmg=0x7f05016f;
+        public static final int skill_title_barkskin=0x7f05015e;
+        public static final int skill_title_barter=0x7f05015c;
+        public static final int skill_title_better_criticals=0x7f050160;
+        public static final int skill_title_cleave=0x7f050164;
+        public static final int skill_title_coinfinder=0x7f050162;
+        public static final int skill_title_dodge=0x7f05015d;
+        public static final int skill_title_eater=0x7f050165;
+        public static final int skill_title_evasion=0x7f050167;
+        public static final int skill_title_fortitude=0x7f050166;
+        public static final int skill_title_lower_exploss=0x7f050169;
+        public static final int skill_title_magicfinder=0x7f05016a;
+        public static final int skill_title_more_criticals=0x7f05015f;
+        public static final int skill_title_more_exp=0x7f050163;
+        public static final int skill_title_regeneration=0x7f050168;
+        public static final int skill_title_resistance_blood_disorder=0x7f05016d;
+        public static final int skill_title_resistance_mental=0x7f05016b;
+        public static final int skill_title_resistance_physical_capacity=0x7f05016c;
+        public static final int skill_title_speed=0x7f050161;
+        public static final int skill_title_weapon_chance=0x7f05015a;
+        public static final int skill_title_weapon_dmg=0x7f05015b;
+        public static final int skillinfo_action_levelup=0x7f050196;
+        public static final int startscreen_about=0x7f0500f7;
+        public static final int startscreen_continue=0x7f0500f4;
+        public static final int startscreen_enterheroname=0x7f0500f8;
+        public static final int startscreen_load=0x7f0500f9;
+        public static final int startscreen_newgame=0x7f0500f5;
+        public static final int startscreen_newgame_confirm=0x7f0500f6;
+        public static final int status_ap=0x7f050097;
+        public static final int status_exp=0x7f050098;
+        public static final int status_hp=0x7f050095;
+        public static final int status_mp=0x7f050096;
+        public static final int traitsinfo_attack_chance=0x7f0500dc;
+        public static final int traitsinfo_attack_cost=0x7f0500db;
+        public static final int traitsinfo_attack_damage=0x7f0500dd;
+        public static final int traitsinfo_base_max_ap=0x7f0501a4;
+        public static final int traitsinfo_base_max_hp=0x7f0501a3;
+        public static final int traitsinfo_criticalhit_chance=0x7f0500de;
+        public static final int traitsinfo_criticalhit_multiplier=0x7f0500df;
+        public static final int traitsinfo_defense_chance=0x7f0500e0;
+        public static final int traitsinfo_defense_damageresist=0x7f0500e1;
     }
     public static final class style {
         public static final int Theme_NoBackground=0x7f0a0000;
diff --git a/AndorsTrail/res/values/content_conversationlist.xml b/AndorsTrail/res/values/content_conversationlist.xml
index 45c0ab87d..a7837c185 100644
--- a/AndorsTrail/res/values/content_conversationlist.xml
+++ b/AndorsTrail/res/values/content_conversationlist.xml
@@ -2232,7 +2232,7 @@
 {tinlyn_lostsheep_check_4||||{{|tinlyn_lostsheep_placed_1|tinlyn:23|||}{|tinlyn_lostsheep_placed_2||||}}|};
 {tinlyn_lostsheep_placed_1||tinlyn:25||{{|tinlyn_lostsheep_placed_2||||}}|};
 {tinlyn_lostsheep_placed_2|(You place the bells around the neck of the sheep.)||||};
-{tinlyn_lostsheep_atk||||{{|tinlyn_lostsheep_atk1|tinlyn:15|||}{|F||||}}|};
+{tinlyn_lostsheep_atk||||{{|tinlyn_lostsheep_atk1|tinlyn:15|||}{|tinlyn_sheep_atk||||}}|};
 {tinlyn_lostsheep_atk1||tinlyn:60||{{|tinlyn_sheep_atk||||}}|};
 {tinlyn_sheep|Baah!|||{{Attack|tinlyn_lostsheep_atk|benbyr:20|||}}|};
 {tinlyn_sheep_atk||benbyr:21||{{|F||||}}|};
@@ -2297,6 +2297,30 @@
 	}|};
 {benbyr_mission_2|Ha ha! That fool Tinlyn must be in tears. The Shadow surely walks with you my friend.|benbyr:30||{{N|benbyr_complete_2||||}}|};
 {benbyr_complete_2|This is a glorious day indeed! Tinlyn should have known not to mess with me!|||{{N|benbyr_complete_3||||}}|};
-{benbyr_complete_3|As for you my friend, seek out my friends in Brightport. I am sure they would extend their hospitaly to you.||||};
+{benbyr_complete_3|As for you my friend, seek out my friends in Brightport. I am sure they would extend their hospitality to you.||||};
+	</string>
+
+	<string name="conversationlist_crossroads_1">
+[id|message|progressQuest|rewardDropListID|replies[text|nextPhraseID|requires_Progress|requires_itemID|requires_Quantity|]|];
+{fanamor|Yikes! You scared me there.|||{{N|fanamor_1||||}}|};
+{fanamor_1|I was just strolling through these woods .. eh .. killing Anklebiters.|||{{N|fanamor_2||||}}|};
+{fanamor_2|Yes. Killing them was what I was doing. Not running away from them. No, killing them.|||{{N|fanamor_3||||}}|};
+{fanamor_3|.. sigh ..|||{{N|fanamor_4||||}}|};
+{fanamor_4|Oh, who am I kidding. Ok, I was trying to get through the forest here and got ambushed by these anklebiters.|||{{N|fanamor_5||||}}|};
+{fanamor_5|I won\'t leave until nightfall, when they can\'t see me anymore and I might be able to sneak back.|||{{N|fanamor_6||||}}|};
+{fanamor_6|This is my hiding spot! Now leave me.||||};
+
+{crossroads_guard||||{
+	{|crossroads_guard_r_1|farrik:90|||}
+	{|crossroads_guard_1||||}
+	}|};
+{crossroads_guard_r_1|Did you hear? Some thieves down in Fallhaven were planning an escape for one of the imprisoned thieves in the prison there.|||{{N|crossroads_guard_r_2||||}}|};
+{crossroads_guard_r_2|Luckily, someone got wind of it and told the guard captain.|||{{N|crossroads_guard_r_3||||}}|};
+{crossroads_guard_r_3|It\'s good to know that there are at least a few decent people still around.||||};
+{crossroads_guard_1|Aren\'t you a bit young to be travelling around here all by yourself?|||{{N|crossroads_guard_2||||}}|};
+{crossroads_guard_2|I sure hope you are not another one of those types trying to sell me your cheap junk.|||{{N|crossroads_guard_3||||}}|};
+{crossroads_guard_3|Go away, kid.||||};
+
+{crossroads_guard_3|Go away, kid.||||};
 	</string>
 </resources>
diff --git a/AndorsTrail/res/values/content_monsterlist.xml b/AndorsTrail/res/values/content_monsterlist.xml
index 9e0f0a931..4517ce8a8 100644
--- a/AndorsTrail/res/values/content_monsterlist.xml
+++ b/AndorsTrail/res/values/content_monsterlist.xml
@@ -306,7 +306,7 @@
 
 	<string name="monsterlist_v0610_npcs1">
 [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|]|];
-{ailshara|monsters_men:8|Ailshara|ailshara|1x1||10|5|5|||||||||ailshara||||||||};
+{ailshara|monsters_men:8|Ailshara|ailshara|1x1||10|5|5||||||||shop_ailshara|ailshara||||||||};
 {arngyr|monsters_rltiles1:65|Arngyr|arngyr|1x1||10|5|5|||||||||arngyr||||||||};
 {benbyr|monsters_rltiles1:74|Benbyr|benbyr|1x1||10|5|5|||||||||benbyr||||||||};
 {celdar|monsters_rltiles1:94|Celdar|celdar|1x1||10|5|5|||||||||celdar||||||||};
@@ -318,14 +318,14 @@
 {erinith|monsters_rltiles1:82|Erinith|erinith|1x1||10|5|5|||||||||erinith||||||||};
 {fanamor|monsters_men:7|Fanamor|fanamor|1x1||10|5|5|||||||||fanamor||||||||};
 {feygard_bridgeguard|monsters_men2:4|Feygard bridge guard|feygard_bridgeguard|1x1||10|5|5|||||||||feygard_bridgeguard||||||||};
-{fieldwasp_0|monsters_insects:1|Frantic forest wasp|fieldwasp_0|1x1|29|10|5|3|70|60|3|2|6|95|||||||||||};
-{fieldwasp_1|monsters_insects:1|Frantic forest wasp|fieldwasp_1|1x1|32|10|5|3|70|70|3|2|6|125|||||||||||};
-{fieldwasp_2|monsters_insects:1|Frantic forest wasp|fieldwasp_2|1x1|35|10|5|3|70|75|3|2|6|130|||||||||||};
-{fieldwasp_unique|monsters_insects:1|Frantic forest wasp|fieldwasp_unique|1x1|70|10|5|3|70|100|3|2|6|150|||||||||||};
+{fieldwasp_0|monsters_insects:1|Frantic forest wasp|fieldwasp_0|1x1|29|10|5|3|70|60|3|2|6|95||fieldwasp|||||||||};
+{fieldwasp_1|monsters_insects:1|Frantic forest wasp|fieldwasp_1|1x1|32|10|5|3|70|70|3|2|6|125||fieldwasp|||||||||};
+{fieldwasp_2|monsters_insects:1|Frantic forest wasp|fieldwasp_2|1x1|35|10|5|3|70|75|3|2|6|130||fieldwasp|||||||||};
+{fieldwasp_unique|monsters_insects:1|Frantic forest wasp|fieldwasp_unique|1x1|70|10|5|3|70|100|3|2|6|150||fieldwasp_unique|||||||||};
 {gallain|monsters_rltiles1:69|Gallain|gallain|1x1||10|5|5|||||||||gallain||||||||};
 {gandoren|monsters_men2:6|Gandoren|gandoren|1x1||10|5|5|||||||||gandoren||||||||};
 {grimion|monsters_men2:2|Grimion|grimion|1x1||10|5|5|||||||||grimion||||||||};
-{hadracor|monsters_men2:2|Hadracor|hadracor|1x1||10|5|5|||||||||hadracor||||||||};
+{hadracor|monsters_men2:2|Hadracor|hadracor|1x1||10|5|5||||||||shop_hadracor|hadracor||||||||};
 {kuldan|monsters_rltiles1:85|Kuldan|kuldan|1x1||10|5|5|||||||||kuldan||||||||};
 {kuldan_guard|monsters_warrior1:0|Kuldan\'s Guard|kuldan_guard|1x1||10|5|5|||||||||kuldan_guard||||||||};
 {landa|monsters_men:0|Landa|landa|1x1||10|5|5|||||||||landa||||||||};
@@ -345,7 +345,7 @@
 {rolwynn|monsters_rltiles1:77|Rolwynn|rolwynn|1x1||10|5|5|||||||||rolwynn||||||||};
 {sienn|monsters_rltiles1:66|Sienn|sienn|1x1||10|5|5|||||||||sienn||||||||};
 {sienn_pet|monsters_misc:0|Sienn\'s pet|sienn_pet|1x1||10|5|5|||||||||sienn_pet||||||||};
-{siola|monsters_rltiles1:90|Siola|siola|1x1||10|5|5|||||||||siola||||||||};
+{siola|monsters_rltiles1:90|Siola|siola|1x1||10|5|5||||||||shop_siola|siola||||||||};
 {taevinn|monsters_karvis2:5|Taevinn|taevinn|1x1||10|5|5|||||||||taevinn||||||||};
 {talion|monsters_men2:8|Talion|talion|1x1||10|5|5|||||||||talion||||||||};
 {telund|monsters_rltiles1:74|Telund|telund|1x1||10|5|5|||||||||telund||||||||};
diff --git a/AndorsTrail/res/values/content_questlist.xml b/AndorsTrail/res/values/content_questlist.xml
index 664d697cf..4fb205fc5 100644
--- a/AndorsTrail/res/values/content_questlist.xml
+++ b/AndorsTrail/res/values/content_questlist.xml
@@ -271,7 +271,26 @@
 	{20|I have agreed to help Benbyr find Tinlyn\'s sheep and kill all eight of them. I should go look for them in the fields northwest of the crossroads guardhouse.|||}
 	{21|I have started attacking the sheep. I should return to Benbyr once I have killed all eight of them.|||}
 	{30|Benbyr was thrilled to hear that all of Tinlyn\'s sheep are dead.|520|1|}
-	{60|I declined to helping Benbyr kill the sheep.||1|}
+	{60|I declined to help Benbyr kill the sheep.||1|}
+	}|};
+{rogorn|Troll under the bridge|1|{
+	{10|Minarra up in the tower at the Crossroads guardhouse has seen a band of rogues heading west from the guardhouse, towards Carn tower. Minarra was sure they matched the decription of some men that the Feygard patrol are searching for.|||}
+	{20|I am helping Minarra find the band of rogues. I should travel the road west from the Crossroads guardhouse towards Carn tower and look for them.|||}
+	}|};
+{gandoren|Feygard errands|1|{
+	{10|I met Gandoren, the guard captain at the Crossroads guardhouse. He told me about some trouble up in Loneford, that have forced the guards to be even more alert than usual. Because of this, they can\'t do their regular errands themselves but need help with some basic things.|||}
+	{20|Gandoren wants me to help him transport a shipment of 10 iron swords and 10 wooden bucklers to another guard post to the south.|||}
+	{21|I have agreed to help Gandoren transport the shipment, as a service for Feygard.|||}
+	{22|I have agreed to help Gandoren transport the shipment, in return for 300 gold as compensation.|||}
+	{23|With some grudge, I have agreed to help Gandoren transport the shipment.|||}
+	}|};
+{loneford|Flows through the veins|1|{
+	{10|I heard a story about Loneford. Apparently, a lot of people have become ill there recently, and some have even died. The cause is still unknown.|||}
+	{11|I should investigate what could have caused the people of Loneford to become ill. I should ask around people in Loneford and outside the village about clues and what people believe is the cause.|||}
+	{15|The guards in the Crossroads guardhouse are certain that the illness in Loneford is caused by some sabotage done by the priests or people from Nor City.|||}
+	{16|Some villagers in Loneford believe that the illness is caused by the guards from Feygard, in some scheme to make the people suffer even more than they already have.|||}
+	{17|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.|||}
+	{18|I should go see Landa in the Loneford tavern. Rumor has it that he saw something that he doesn\'t dare tell anyone.|||}
 	}|};
 </string>
 
diff --git a/AndorsTrail/res/values/loadresources.xml b/AndorsTrail/res/values/loadresources.xml
index f976a5f68..66cc85df4 100644
--- a/AndorsTrail/res/values/loadresources.xml
+++ b/AndorsTrail/res/values/loadresources.xml
@@ -118,6 +118,7 @@
         <item>@string/conversationlist_tinlyn</item>
         <item>@string/conversationlist_tinlyn_sheep</item>
         <item>@string/conversationlist_benbyr</item>
+        <item>@string/conversationlist_crossroads_1</item>
     </array>
     
     <array name="loadresource_monsters">
diff --git a/AndorsTrail/res/xml/fields5.tmx b/AndorsTrail/res/xml/fields5.tmx
index 84f4fcd3f..b34aaf3dd 100644
--- a/AndorsTrail/res/xml/fields5.tmx
+++ b/AndorsTrail/res/xml/fields5.tmx
@@ -55,7 +55,7 @@
  </layer>
  <layer name="Objects" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJy1Vstug0AMRAi+Jf2D5trS5t6m9FO4h0TKnQP53cYKo0yM92FCR0JEG7Njj2cNRZGHl/p2f63n/8nadlpvyqJ4n67f6/V5vX7K9P7yvLV3KI55mOt7umKc2GNb2+tWXBPgSXFpnKrb/VA95rCp75wCi8/Do+sSdPWdH0AOst6sxMc4VumYN4dPYmgyn0c/pdavJzi5Ryn/MufSWi1PxCCc4rOl+oY82BlnxHrWq2/M80P16CWZRxuD11vrs55f4qWYD0aaD4KQpzxe0roiXvQcSFPu66maz0IvZ0jXg6oRkFwwzz8o3tNTjuV6LsYc6o21duL29BSxLeWu5+x/Arq0SjcBn5nz9Fvq3q0w2xnQSTTvVX/PlMOe3pu7hV7i3FlzAfsZZ6mjd2tuX7XXZY99OddN82t4z432OvpncWt+eA4a5J6blCboWYo/Zy8G54ecR+rfQLWn+NeqVQN9D/EvqRXQ30Y8D4/GmWF+zzxEfnreCnhOWTOS+XPfj9CYY7vItxEDcdZsTgEaW1yj2o9jrG9Uz/yGxhd1/jQs/bHG2ufUnvJxb5wjva5rlLg/kwdwFg==
+   eJy1Vstug0AMRAi+Jf2D5trS5t6m9FO4h0TKnQP53cYKo0yM92FCR0KJFrNjj2cNRZGHl/r2+1rP78nadlpvyqJ4n67f6/V5vX7K9P7yvLV3KI55mOt7umKc2GNb2+tWXBPgSXFpnKrb76F6zGFT3zkFFp+HR9cl6Oo7P4AcZL1ZiY9xrNIxbw6fxNBkPo9+Sq1fT3Byj1L+Zc6ltVqeiEE4xWdL9Q15sDPOiPWsV9+Y54fq0UsyjzYGr7fWZz2/xEsxH4w0HwQhT3m8pHVFvOg5kKbc11M1n4VezpCuB1UjILlgnn9QvKenHMv1XIw51Btr7cTt6SliW8pdz9n/BHRplW4CPjPn6b/UvVthtjOgk2jeq/6eKYc9vTd3C73EubPmAvYzzlJH79bcvmqvyx77cq6b5tfwnhvtdfTP4tb88Bw0yD03KU3QsxR/zl4Mzg85j9S/gWpP8a9Vqwb6HuJfUiugv414Hh6NM8P8nnmI/PS8FfCcsmYk8+e+Hy2Nu8i3EQNx1mxOITT7BaPaj+9b36ie+Q2NL+r8aVj6Y421z6k95ePeOEd6XdcocX/2JXBp
   </data>
  </layer>
  <layer name="Above" width="30" height="30">
@@ -63,7 +63,7 @@
    eJxjYKAMaLAi2OZAtgUrbrWU2KGOZi417UE3m1ZAg072EAIg/9LDLch2IIcxLD5p6QZsaWY4Alx5w3wA/E6PeMUHqFkmtLFQzyxqA1qUsYMN0KouIRZEAO1OIBJ7kOjOwZi2aOlfZIBcPmxiZmAQZ4FgCSAWw0PD1G1kpo5/hzugtAwmN42OhLJpFJAPBmPZNwoQAACZARRC
   </data>
  </layer>
- <layer name="Walkable" width="30" height="30">
+ <layer name="Walkable" width="30" height="30" visible="0">
   <data encoding="base64" compression="zlib">
    eJzl00sOwCAIBFCu4P0v25UbI3EYBjHpJN006gM/w8zGj78ZdBwyFlnDNv9P4xR9nmpQeUi/FSZ6rkoXXUdtImupzDXVrhfVWaAe4rK9eg7iKk0vCpON2mRqqdzbjmTeVfYeKcyovbs/UTubDvMFlzWzdXS81ZdN9r3cdNHaMiZbT8TN9LzOvb2/Mx8ACSDP
   </data>
diff --git a/AndorsTrail/res/xml/fields6.tmx b/AndorsTrail/res/xml/fields6.tmx
index aece5f0cb..db953956f 100644
--- a/AndorsTrail/res/xml/fields6.tmx
+++ b/AndorsTrail/res/xml/fields6.tmx
@@ -55,7 +55,7 @@
  </layer>
  <layer name="Objects" width="30" height="28">
   <data encoding="base64" compression="zlib">
-   eJy1VkluwzAQMwz1QX1Ck7b3LO1TencsIHcd4u9WQj0IwXIsO3YICAEkechZlaZ5Dk5t0xzz+szrK69dXu/tk8hm8u+Ifw/7aq3Ra/y20O53Xh90fhR6t4gX85zBZgx/vyn8j9da7jN9P4xcPy/6/mlj31PQ+zfYN/+38r0Xtufo29p3QxfqWh71/RLuucSYqrjfaK+f8H2N//2En6rusEdZg9JR7GMs2abF+xL0Pp4lqj1Ph2dnWFBfrDNSvvbjTFoClefO0YRaLUfIiTPK7icnljVM1QBz8oxS8HI6OL1VdNvdEvcpzgj3auAeYn0IjzNS7Snb3qxAjQlyyO8aczJ6J27M481vr1YVZ4mN6pNi23R4NYtnXq3ye2p2MVZqjnC+sd4Nj9RqAdcpzzRvvvIcME7Uyr11XdibSkutbjB/5hvzFu02O5fCOJPgYVydfuUZPkfLIZ+/Vvre6o97vxvfITUna1rwjUe7/F9B9TtDfW/3h3B/2w2Htm4XY9+L/jUenLMdfVPwRryIOKGb8QsQF3Y9
+   eJy1VkluwzAQMwz1QX1Ck7b3bH1K744M5K5D/N1KqAchWI5l1w4BIYAkDzmr0jTPwaltmmNen3ld8trl9d4+iWwm/47497Cv1hq9xm8L7X7l9UHnR6F3i3gxzxls9uH3N4W/8VrLfabvh5Hr+0XfP23sewp6/w775v9Wvkdhe46+rX03dKGu5b++X8MjlxhTFfc77cUJ39f4Hyf8VHWHPcoalI5iH2PJNi3e16D38SxR7Xk6PDvDgvpinT3laz/OpCVQee4cTajVcoScOKPsfnJiWcNUDTAnzygFL6eD01tFt90tcZ/i7OFeDdxDrA/hcfZUe8q2NytQY4Ic8rvGnIzoxI15vPnt1ariLLFRfVJsmw6vZvHMq1V+T80uxkrNEs431rvyc26tFnCd8kzz5ivPAeNErdxbt4W9qbTU6gbzZ74xb9Fus3MpjDMJHsbN6Vee4XO0HPL5a6Xvrf6497vxHVJzsqYF33i0y/8VVL8z1Pd2fwiPt91waOt2MfZR9K/x4Jzt6JuCN+JF9BO6GT8M/HaB
   </data>
  </layer>
  <layer name="Above" width="30" height="28">
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/Dialogs.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/Dialogs.java
index 01a565c36..dc78ada75 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/Dialogs.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/Dialogs.java
@@ -160,6 +160,7 @@ public final class Dialogs {
 				}
 				ItemController.pickupAll(lootBags, context.model);
 	        	ItemController.updateLootVisibility(context, lootBags);
+	        	context.gameRoundController.resume();
 				return;
 			}
 		}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/GameRoundController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/GameRoundController.java
index 1b4053981..f88974b50 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/GameRoundController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/GameRoundController.java
@@ -46,13 +46,13 @@ public final class GameRoundController implements TimedMessageTask.Callback {
     }
     
     public void resume() {
-    	//L.log(id + " : Controller::resume()");
-		view.mainActivity.updateStatus();
+    	//L.log("GameRoundController::resume() from " + from);
+    	view.mainActivity.updateStatus();
 		model.uiSelections.isMainActivityVisible = true;
 		roundTimer.start();
     }
     public void pause() {
-    	//L.log(id + " : Controller::pause()");
+    	//L.log("GameRoundController::pause() from " + from);
     	roundTimer.stop();
     	model.uiSelections.isMainActivityVisible = false;
     }