From c89d0b1d9e265fe9e292cd6d5476498cb6c46827 Mon Sep 17 00:00:00 2001
From: "oskar.wiksten" <oskar.wiksten@08aca716-68be-ccc6-4d58-36f5abd142ac>
Date: Mon, 20 Dec 2010 20:50:01 +0000
Subject: [PATCH] Version 0.6.7 . Merged from local r76 .

git-svn-id: https://andors-trail.googlecode.com/svn/trunk@21 08aca716-68be-ccc6-4d58-36f5abd142ac
---
 AndorsTrail/AndroidManifest.xml               |  16 +-
 AndorsTrail/default.properties                |   2 +-
 AndorsTrail/res/drawable/monsters_demon1.png  | Bin 0 -> 1911 bytes
 AndorsTrail/res/drawable/monsters_demon2.png  | Bin 0 -> 2784 bytes
 AndorsTrail/res/drawable/monsters_mage.png    | Bin 0 -> 2227 bytes
 AndorsTrail/res/drawable/monsters_zombie1.png | Bin 0 -> 962 bytes
 AndorsTrail/res/drawable/monsters_zombie2.png | Bin 0 -> 980 bytes
 AndorsTrail/res/layout/about.xml              |   1 -
 AndorsTrail/res/layout/combatview.xml         |  37 +-
 AndorsTrail/res/layout/heroinfo_stats.xml     |  24 +-
 AndorsTrail/res/layout/loadsave.xml           |  81 ++
 AndorsTrail/res/layout/questlog.xml           |  43 +
 AndorsTrail/res/layout/questlogentry.xml      |   7 +
 AndorsTrail/res/layout/startscreen.xml        |  19 +-
 AndorsTrail/res/values/conversationlist.xml   | 762 +++++++++++-------
 AndorsTrail/res/values/droplist.xml           | 273 +++++++
 AndorsTrail/res/values/itemlist.xml           |  17 +-
 AndorsTrail/res/values/monsterlist.xml        | 217 +++--
 AndorsTrail/res/values/questlist.xml          |  29 +
 AndorsTrail/res/values/questlog.xml           |  83 ++
 AndorsTrail/res/values/strings.xml            | 136 ++--
 AndorsTrail/res/xml/clearing_level1.tmx       | 115 +++
 AndorsTrail/res/xml/clearing_level2.tmx       | 114 +++
 AndorsTrail/res/xml/crossglen.tmx             |  10 +-
 AndorsTrail/res/xml/crossglen_smith.tmx       |  10 +-
 AndorsTrail/res/xml/debugmap.tmx              |  13 +-
 AndorsTrail/res/xml/fallhaven_alaun.tmx       |  83 ++
 .../res/xml/fallhaven_arcir_basement.tmx      |  12 +-
 AndorsTrail/res/xml/fallhaven_barn.tmx        |   4 +-
 AndorsTrail/res/xml/fallhaven_church.tmx      |  10 +-
 AndorsTrail/res/xml/fallhaven_clothes.tmx     |   6 +-
 AndorsTrail/res/xml/fallhaven_derelict.tmx    |   2 +-
 AndorsTrail/res/xml/fallhaven_farmer.tmx      |  83 ++
 AndorsTrail/res/xml/fallhaven_gravedigger.tmx |   8 +-
 AndorsTrail/res/xml/fallhaven_lumberjack.tmx  |  81 ++
 AndorsTrail/res/xml/fallhaven_ne.tmx          |  13 +-
 AndorsTrail/res/xml/fallhaven_nw.tmx          |  13 +-
 AndorsTrail/res/xml/fallhaven_rigmor.tmx      |   8 +-
 AndorsTrail/res/xml/fallhaven_se.tmx          | 108 +++
 AndorsTrail/res/xml/fallhaven_storage.tmx     |  83 ++
 AndorsTrail/res/xml/fallhaven_sw.tmx          | 119 +++
 AndorsTrail/res/xml/fallhaven_tavern.tmx      |  14 +-
 AndorsTrail/res/xml/flagstone0.tmx            | 114 +++
 AndorsTrail/res/xml/flagstone1.tmx            | 103 +++
 AndorsTrail/res/xml/flagstone2.tmx            | 113 +++
 AndorsTrail/res/xml/flagstone3.tmx            | 108 +++
 AndorsTrail/res/xml/flagstone4.tmx            |  88 ++
 AndorsTrail/res/xml/flagstone_inner.tmx       | 110 +++
 AndorsTrail/res/xml/flagstone_upper.tmx       | 100 +++
 AndorsTrail/res/xml/hauntedhouse3.tmx         |   2 +-
 AndorsTrail/res/xml/home.tmx                  |  10 +-
 AndorsTrail/res/xml/preferences.xml           |  14 +-
 AndorsTrail/res/xml/wild1.tmx                 |   8 +-
 AndorsTrail/res/xml/wild10.tmx                | 119 +++
 AndorsTrail/res/xml/wild11.tmx                | 110 +++
 AndorsTrail/res/xml/wild11_clearing.tmx       | 104 +++
 AndorsTrail/res/xml/wild12.tmx                | 113 +++
 AndorsTrail/res/xml/wild2.tmx                 |  13 +-
 AndorsTrail/res/xml/wild3.tmx                 |   2 +-
 AndorsTrail/res/xml/wild4.tmx                 |   2 +-
 AndorsTrail/res/xml/wild5.tmx                 | 108 +++
 AndorsTrail/res/xml/wild6.tmx                 | 135 ++++
 AndorsTrail/res/xml/wild6_house.tmx           |  81 ++
 AndorsTrail/res/xml/wild7.tmx                 | 108 +++
 AndorsTrail/res/xml/wild8.tmx                 |  99 +++
 AndorsTrail/res/xml/wild9.tmx                 | 104 +++
 .../AndorsTrail/AndorsTrailApplication.java   |  13 +-
 .../AndorsTrail/AndorsTrailPreferences.java   |  42 +
 .../src/com/gpl/rpg/AndorsTrail/Dialogs.java  |  87 +-
 .../com/gpl/rpg/AndorsTrail/Savegames.java    | 161 ++++
 .../com/gpl/rpg/AndorsTrail/WorldSetup.java   |  59 +-
 .../AndorsTrail/activity/AboutActivity.java   |   5 +-
 .../activity/ConversationActivity.java        |  40 +-
 .../activity/HeroinfoActivity.java            |  23 +-
 .../activity/ItemInfoActivity.java            |   2 +-
 .../AndorsTrail/activity/LevelUpActivity.java | 108 +--
 .../activity/LoadSaveActivity.java            |  78 ++
 .../AndorsTrail/activity/LoadingActivity.java |  47 +-
 .../AndorsTrail/activity/MainActivity.java    |  94 ++-
 .../activity/MonsterEncounterActivity.java    |   1 -
 .../activity/MonsterInfoActivity.java         |   8 -
 .../rpg/AndorsTrail/activity/Preferences.java |  30 +-
 .../activity/QuestLogActivity.java            | 127 +++
 .../AndorsTrail/activity/ShopActivity.java    |  29 +-
 .../activity/StartScreenActivity.java         |  82 +-
 .../rpg/AndorsTrail/context/ViewContext.java  |   4 +
 .../rpg/AndorsTrail/context/WorldContext.java |  10 +
 .../controller/CombatController.java          | 117 ++-
 .../rpg/AndorsTrail/controller/Constants.java |  44 +
 .../AndorsTrail/controller/Controller.java    |  45 +-
 .../controller/ConversationController.java    |  51 +-
 .../controller/ItemController.java            |   9 +-
 .../controller/MonsterMovementController.java |  47 +-
 .../controller/MovementController.java        |  56 +-
 .../conversation/ConversationCollection.java  |  93 ++-
 .../rpg/AndorsTrail/conversation/Phrase.java  |  23 +-
 .../rpg/AndorsTrail/model/InterfaceData.java  |  17 +-
 .../rpg/AndorsTrail/model/ModelContainer.java |  44 -
 .../rpg/AndorsTrail/model/actor/Monster.java  |   7 +-
 .../model/actor/MonsterTypeCollection.java    |  13 +-
 .../rpg/AndorsTrail/model/actor/Player.java   | 118 ++-
 .../rpg/AndorsTrail/model/item/DropList.java  |  12 +-
 .../model/item/DropListCollection.java        | 343 ++------
 .../AndorsTrail/model/item/ItemContainer.java |   8 +
 .../model/item/ItemTypeCollection.java        |   2 +-
 .../rpg/AndorsTrail/model/map/KeyArea.java    |  15 -
 .../model/map/LayeredWorldMap.java            |  29 +-
 .../AndorsTrail/model/map/MapCollection.java  |  41 +-
 .../rpg/AndorsTrail/model/map/MapObject.java  |  21 +-
 .../model/map/MonsterSpawnArea.java           |  13 +-
 .../AndorsTrail/model/map/TMXMapReader.java   |  22 +-
 .../rpg/AndorsTrail/model/quest/Quest.java    |  27 +
 .../model/quest/QuestCollection.java          |  55 ++
 .../AndorsTrail/model/quest/QuestLoader.java  | 105 +++
 .../model/quest/QuestLogEntry.java            |  15 +
 .../model/quest/QuestProgress.java            |  32 +
 .../resource/DynamicTileLoader.java           |  19 +-
 .../AndorsTrail/resource/ResourceLoader.java  | 125 ++-
 .../gpl/rpg/AndorsTrail/util/CoordRect.java   |   5 +
 .../gpl/rpg/AndorsTrail/view/CombatView.java  |  13 +-
 .../gpl/rpg/AndorsTrail/view/MainView.java    |  93 ++-
 121 files changed, 5633 insertions(+), 1620 deletions(-)
 create mode 100644 AndorsTrail/res/drawable/monsters_demon1.png
 create mode 100644 AndorsTrail/res/drawable/monsters_demon2.png
 create mode 100644 AndorsTrail/res/drawable/monsters_mage.png
 create mode 100644 AndorsTrail/res/drawable/monsters_zombie1.png
 create mode 100644 AndorsTrail/res/drawable/monsters_zombie2.png
 create mode 100644 AndorsTrail/res/layout/loadsave.xml
 create mode 100644 AndorsTrail/res/layout/questlog.xml
 create mode 100644 AndorsTrail/res/layout/questlogentry.xml
 create mode 100644 AndorsTrail/res/values/droplist.xml
 create mode 100644 AndorsTrail/res/values/questlist.xml
 create mode 100644 AndorsTrail/res/values/questlog.xml
 create mode 100644 AndorsTrail/res/xml/clearing_level1.tmx
 create mode 100644 AndorsTrail/res/xml/clearing_level2.tmx
 create mode 100644 AndorsTrail/res/xml/fallhaven_alaun.tmx
 create mode 100644 AndorsTrail/res/xml/fallhaven_farmer.tmx
 create mode 100644 AndorsTrail/res/xml/fallhaven_lumberjack.tmx
 create mode 100644 AndorsTrail/res/xml/fallhaven_se.tmx
 create mode 100644 AndorsTrail/res/xml/fallhaven_storage.tmx
 create mode 100644 AndorsTrail/res/xml/fallhaven_sw.tmx
 create mode 100644 AndorsTrail/res/xml/flagstone0.tmx
 create mode 100644 AndorsTrail/res/xml/flagstone1.tmx
 create mode 100644 AndorsTrail/res/xml/flagstone2.tmx
 create mode 100644 AndorsTrail/res/xml/flagstone3.tmx
 create mode 100644 AndorsTrail/res/xml/flagstone4.tmx
 create mode 100644 AndorsTrail/res/xml/flagstone_inner.tmx
 create mode 100644 AndorsTrail/res/xml/flagstone_upper.tmx
 create mode 100644 AndorsTrail/res/xml/wild10.tmx
 create mode 100644 AndorsTrail/res/xml/wild11.tmx
 create mode 100644 AndorsTrail/res/xml/wild11_clearing.tmx
 create mode 100644 AndorsTrail/res/xml/wild12.tmx
 create mode 100644 AndorsTrail/res/xml/wild5.tmx
 create mode 100644 AndorsTrail/res/xml/wild6.tmx
 create mode 100644 AndorsTrail/res/xml/wild6_house.tmx
 create mode 100644 AndorsTrail/res/xml/wild7.tmx
 create mode 100644 AndorsTrail/res/xml/wild8.tmx
 create mode 100644 AndorsTrail/res/xml/wild9.tmx
 create mode 100644 AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailPreferences.java
 create mode 100644 AndorsTrail/src/com/gpl/rpg/AndorsTrail/Savegames.java
 create mode 100644 AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LoadSaveActivity.java
 create mode 100644 AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/QuestLogActivity.java
 create mode 100644 AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/Constants.java
 delete mode 100644 AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/KeyArea.java
 create mode 100644 AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/Quest.java
 create mode 100644 AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/QuestCollection.java
 create mode 100644 AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/QuestLoader.java
 create mode 100644 AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/QuestLogEntry.java
 create mode 100644 AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/QuestProgress.java

diff --git a/AndorsTrail/AndroidManifest.xml b/AndorsTrail/AndroidManifest.xml
index 99a414cef..3e1942a16 100644
--- a/AndorsTrail/AndroidManifest.xml
+++ b/AndorsTrail/AndroidManifest.xml
@@ -3,15 +3,23 @@
 <manifest 
 	xmlns:android="http://schemas.android.com/apk/res/android" 
 	package="com.gpl.rpg.AndorsTrail"
-	android:versionCode="13"
-	android:versionName="0.6.6"
+	android:versionCode="15"
+	android:versionName="0.6.7"
 	android:installLocation="auto"
 	>
 	<uses-sdk 
 		android:minSdkVersion="4" 
-		android:targetSdkVersion="8"
+		android:targetSdkVersion="9"
 		/>
 	
+	<supports-screens
+		android:smallScreens="true" 
+		android:normalScreens="true"
+		android:largeScreens="true"
+		android:xlargeScreens="true"
+		android:anyDensity="true"
+		/>
+		
 	<application android:label="@string/app_name" android:name=".AndorsTrailApplication" android:icon="@drawable/icon">
 		<activity 
 			android:name=".activity.MainActivity" 
@@ -35,6 +43,8 @@
 		<activity android:name=".activity.AboutActivity" />
 		<activity android:name=".activity.LoadingActivity" />
 		<activity android:name=".activity.Preferences" />
+		<activity android:name=".activity.LoadSaveActivity" android:theme="@android:style/Theme.Dialog" />
+		<activity android:name=".activity.QuestLogActivity" />
 	</application>
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 	
diff --git a/AndorsTrail/default.properties b/AndorsTrail/default.properties
index 0b9250e02..9a2c9f6c8 100644
--- a/AndorsTrail/default.properties
+++ b/AndorsTrail/default.properties
@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-8
+target=android-9
diff --git a/AndorsTrail/res/drawable/monsters_demon1.png b/AndorsTrail/res/drawable/monsters_demon1.png
new file mode 100644
index 0000000000000000000000000000000000000000..8b34d94b54e952a89db1c0bd0d0ed8a2006e550a
GIT binary patch
literal 1911
zcmV--2Z;EIP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igb|
z5fl@;S$UNJ000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}000KkNkl<Z
zc-rk-TaM&53@i`&Ak0nJzd42aB&(Z@F0tRuy+nRP<P-rCK>4sK)3WS#x82=~%o-SA
zp0=t~B#V>>_;r2ltNUtziSQ4AzX1HJia)w91Uv&kbl-~rPG1FhpaHr@cp|!=X_0oR
z?q8P&&IE`8<iOiAPCo-+1{?6<7bNc?fe6`v1IyrFssIn#09U&XfppK>^%nT26W~FU
zGKkOw4jco1Y1fy)KP?0dxPc~OfB;oFeAn%HiQ@z~y~77IfnyH*2=HEAiQ{a?QI)%;
zoN_u6ID^Y>F9F{RzK-*j-0!(ghXP*#y%)Sa%cO3=d&Mn-*JltgGZ!0x?<Khgz9r7%
z24B(b0j?@gMKik}vHL{G3`StyEOXoOw9!!AwHQ(cGZ*01&o`5>rR)(Q6EPz3!!aH=
zkZ`&e{1RZ*#lLNS&B}R+1R`YS4At|)p%XVM;Is)mF$gGG7em4mU01*(d4ULjhm@ho
zS!Du1Z3Qf;BLawoo0j^f3~eVE3??9n%yzs5-m1bq<&X&1kTPomRL>yG@~8~dV5Nz8
zwG?hqLAPoxQ-;JdASm+R6aTkz0ujCg_`OwOY7)w`izs7L6}L#}wsvf_y8{3b*+oK4
zWTl2|4sTq;hAL2nO44|28T3SW`575Ul|<j%B#}b=)@tC1SR>(KN9G+M(=;iq#r)Ea
zuQfR$vBW+R-&GQgh$RwEA-JX@-6q7}L`X7JkhCIWsNHn}Bzn*gIm$={N^zBh$xk#+
z@=3D{etsGUUEV^%8X2l15u$yl%-Ud*+a`T2;jMIiE$f>Q^U^&(0N`@zfB*9{!z<#>
zgx0B|69|$<BoQ#RtH#~;rrVN_ZVgLoYZ4#=guwXm<Gh=MnuwVC<VDoW-acAYX3w?N
z^(`hrBIJ}9DM<;3%ca9T;jqO**Ugha78h=fkT1I}`R@TgsRGX;p#{cDrqVhAzU!<V
zCTZLae%1@5BnW|VxpYG)FaXI%kkCtCHWOBZFHUgyS`P}JlaE~yWLxCr(jf$f$o}2;
zySKLct$Bk1PdBR2?hu$ZK+dcPR%N=hkTM`82FEK>=q97H)F@^Cyuf?^bTH_fPS8(x
z0|}Dy%(z&aJS4WRmHcd{nKLM$kYE#@B5&svtV%G+U6Y+huaC7-rX)}RfdmZBbE2+`
z32*BB&SMA+JIe$F9+RS#NG5q1_(cLd5y>T-HVNE1+?+H;MpTQiz|#{WQAT<Z_?rYw
z7E00}=nRh6LPFgws-no>D?t>9Ny=~~u=5H-a(o5&%`?Hifc5!6(T|z>1xnTgaJ)hj
zpy@oF8MtKHPk984X}nvj%LFJrR^Ij;uXkH+9^5FZc5i-cMmmDGX2@dRz_&ugQ~&@$
z;#~mz=p5(?9iMr?P}I6G9jq&JhDcY2jlF;9dg=2BK1hVO!3k2$5vOwmUkYX8`vLw?
zw137ofWIMxUU7b%yK?{yWwDj`{6h?U{BtCuonU1$?s`P_20n=(NQ6iS$Qhad3P4Et
zX47@|(U?ewUh>_n#}^rVBmwf<bdcH_iVT{XjMnavy_dXgf{<iL*Q+mHXNrAT0a|B&
zp0mqCNlP4y?X?BgFGvj8z9_+rQ87Y|l3QOj_=$&6fy8sEK)XUfogFPVAB^F!8@Wzq
zA_BxQ3EHmP2Ps2otN>h1oDXQeI#rn*uslRSF+-JvdIgNN+sC_T->7Sn>5dN{eW~n8
z@PE^nLUAMb<@nt?Wx92|cG}8jJ;l}3-<U)0^8&cf{DJ$|VbXH1FC??G#wx}SQvtAE
zQ9gELVNkdhB5X%A$tw6FPm<a0&z_-ko9*3ZVBWlWhZ0~jKgfB^>LfP@kS*sXRU))f
z3ji^2A)&U~TfiUU1n(JkxVc}qbv&jjaBcM@1Po+9T%CeWLkGF{Ewj`97%O|3nKOVh
zmg25{m(ThDks&#{Q(x~Ln8%V@stL(xQQxJ2_B1IM!&LVSHTVJqt}ME@P`pZ{J|aJ;
zTRgnw^v#i~l$efzX9fn&URxXNUEah$kUV8R@Nx7FhvsNfEw+H4w%#%W|E%k2Lx=kH
zRg-=gPI`T|H=@ke)-y%R{A&j(Z%KkTr$`dvdvycf+I4cWS49Vs+#>326QM^!!OEnc
z0N07JBtYxA8-M@I>*;ehe?H)Sf|t2Zg0;W!Q>14k!l(bo$hhFCPw?%rk8L||0ESs(
zI1jVJ=Tw20OkTYTh_0@cp1(X{-?KN=?DG`5yM6xK6mTncN9!xiQCaKrt<Slal<w8w
xy;FQ$_`S&o;0@Q?74QxsUUiD}>-s-l{{h@o|1SHB!UF&R002ovPDHLkV1iSnaMl0-

literal 0
HcmV?d00001

diff --git a/AndorsTrail/res/drawable/monsters_demon2.png b/AndorsTrail/res/drawable/monsters_demon2.png
new file mode 100644
index 0000000000000000000000000000000000000000..dea058100810e47d9e40655c60b114cb6e36c73e
GIT binary patch
literal 2784
zcmV<63Lo`}P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L008U&008U(c_?wc00007bV*G`2igb-
z5;Y>?Mgoff000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}000U*Nkl<Z
zSi^OeX>45Ad4`{J@0~k$7S3>HxM@U*n-p1FR6&+dp%R=Z*5bsmT|`M5M{3*}M%ofC
z8n-{1<WJC|KLQI05QIe=q=3=72m)lW<Jgug#|5HTmMlkVWGSRfa!64mM_gv%Y<K2v
zr$6o;Q9_Y37@S$oJ?H(t_x;}Ui6f(<Y<_)=upQec!lAbsYh}}GvFqg;<s+k`w8uZ3
zJ4ct%pra)c9^OkH;-{ee3*dqGbp@XGRKE6dV>NfXWWA>9JRVDS&C8bgr}fqPZ!?>a
zH;=FH*B;6{V`DfKLXlMJ%&z07)A6o8>2JC|-WeMsX;g@roN=XhOiHoSMVu)+_CUe4
zh6=9p9Y@Ne(vf2$PH0%s_(r08<LzB1PW6YPiJuFdv!y&A+j(y6{{hgR8HBKi?ud8y
zZ;y3lQA37@zy<jCZDWKJN#d^<M)gf+XXAqU*_JI%*Ic)!<l0<rR#<Z#5~`Lx98Ho?
z)T0Gy{cBY4Z>pwaB)d_=;r>{<vtOF!|2TY*=g%DbK~5;Db$h1S{OYYyG}Qqkm3eX7
zqhIXRqe;Nkg<$BJL2d{&O*+&3XAnE%58J!kytcKz>hZf~m9l4JHa#juShF2|T`zMe
znpF4bv7<{?dAH-aSzXuJuyqF;2D_<Gy?$u_!OEMSt5l@N+kKh%^MI#0YlKBc427c!
ztY(dHJkh7>oKfqXP*;jLdibAOOW`N<9>zMKH0cnK_B0%+vR3kV^VKHPld$NzTrw-{
zkHi%r$ST4jopBj{VjqLCH&FI8Np{eOB6C8@@5fU$4?x}DV|+Z>yZLl9)txBb9w)o=
zAa<*vw_3HcxofS}&JQ<u%609<W?tQE_F1&TE&zH6`Zg$Jx-}-o9U2W#@JK5f^R|T+
zHTl$`93y=np=%BzWKdpdmd0<izJB%B&V|2S^aZK@$%gcMBab|_d3o|01N)B9_t1Wl
z8-|jN(#rP6TK&E4ww0}0^7*?ZC-v5cRW817bM<|j$y*K`oeH)EmoGas>)<J{>{t|A
zU<=9a9Tu^!A?DoEOw5dM;cPx~;oM5*=5_x2m5W#8(18PJC}PlvCvnU=Mn{@ZG)`*M
zRtEMy@~PaN$+J`Siu}kjhbx{()dM?F@4|xQ#zd2J3StS3V!=VSpbpp`q!TJ{oQv^s
zaR?ii-22zaY<Y~(?AoAOn-61R0%!vNg%EhIMQwSG+R6e`7ha)I%nx7kpeextqy)$F
zXV-yZ0c@f1_+Rwl{Om516Al1dx2YU>vX}EeDzf;)moRjJs)p#yZUIjkj>7OWgWQ}0
zG=v|KXIrdJf5_a`cc`o^P%kdyIp7G800JBrR?1)jI*^RQTEXGfAFt7s+(ccSM@o>9
zjlBBf6^gf;Xf)|bK-hrapZ`zHwNk$VFRFDu{m$4JiVy-Jpiy4p`Y(UT-CNhFF8PNG
z5k%_(5*)`r+`^|qRUs6H8*ZAe&pk)3cO$vJEL|s`<GP*3Q+-F15~Kt5VhPU$RWOW$
z4xk>$7~e`}hghDxMt!w}lzv7W4_psy2g)@+3*|br{A3^j*Y*KSRZVVA++t;Ek!GXH
z^sQTz@8(Ik9#J43@xcn8X@I(`^2@zF6vSWlBBO~;%xW3e_R%&iDAWSp0T<AMg9FBp
z!RJf|n8J_L3k+Nlph$2U&>4YH2s8zR5<KWnuPF*oXr2T0V)@>$P1`@*1j~a(0a-wo
zKql&MrmH?Jg&LHrpejLh!5*px={SfGxDtw0NJJr`-^&03c1Vxi%KZ_UHWaEpzn!U`
zX+w>C4VV%^7D^3RtND?t8YCiqv~dHHF<+F4nEzc>K?{Kv5`;T5lp6xmS{Jksj3^2}
zSK7Cd<N8Q#VB^RR>*!bhYI^hboy|7D_H4Uww+#7$pMjS2fvr|xwdx0O4`fJT<Mus#
z;^}9JclA=N`t;u8PcWhosMNB3b$6tCIrN3EOw+Qze|P+U|60H>fd(=$NOeF+eGpW8
zcGf8dusXW4vwNTVsy(n{4?P*fabd1l#dW=PJt^(zOLhOLu8sY4ZyabT)>1wdb^2oh
z!vIwLHMP3WXLqO1v!Osb2AMb{bm&WB_jEF@tGt$d=;6QV-m)jBg>>RkEf-dK!I4b2
zD-GcXhLnElJ5oIy{`{ZQ+1(w<74yTfFwt<xU)vU4o2qsxIzf3xbV$V^tTQj+1x0dp
z%cEabwUE(J6oDs@1%ZsLYrwA<<a*vTO())&qI_q3WI1>JyFy`0NCRDiNErH3(A()R
zZv}=V0ZoNu91I;4K~{y)hRde6Fa2i7Y^)iTLY~=*IdaqCJ0=W^`$}57zddqn%PTL=
zF3es0Nw&7UFo?IlQs9>#GT^P<QsGyCv0h?f;Ft~PetY3{{%B-m%ZG2h%-gehtqKEe
z{k4UobawkCqXHpOn4130&;D*@^7@ox-B+JMhCB~!`vIZh0+kxHn!Z&_-;DGQjqSU&
z`gV7DCRDn6hjPpRqXD!6YZriW;PL2mB7@wrUFYQUyNMXH!n^<QV3r;<TTrO@>2C&|
zs{|UJUz$tB^)gcdwX)2uxBd&Ww0y5p#({;ZuPFhjpV_VcN_y(CNB-;+nTH<x$JFHY
z`X4K_23)hK$TrgUO}GX%pa@I@p#Vg?M{p%LmftODs;_Rl(V*!{?zH@C-2<``QXvRw
zpq@OMT6t*yz`^LoFB*+{HhtjpUrOyba$Kn{FCc`(sh4maXjxFSU<H^6GOz;VgE`tx
zmITj+sIhL*At0qe-U3TP2Yx@1FhG6o3t8qCl%M|M7k6gI&;QTiXe5yghvPha@)X-X
zd4kH)0*;i-FP12}a5Lcj{^126R)82_NQecZRD=&Cu0m3UnI<d)t^%7Ppyr3a#P`1Y
z2EUt`{kB}3+rRk!yJB_X1B_UjkRD^-$y027<OEA|3p8EHM7hKt8ZJ-*(tz9a^$=16
z!wDLjiG~k&cMLY@<kXofSHQR1zwd&KW15uiEV6R*BJ<a;AoMhf7UR&DPqFL7337`I
zn4YBm2Y_fmU*Md!2WAtj7U*Fpy6{oc2eN8$J|uWLaCKe+4)zDavVc<ABtMsD;=OnI
z=;{Zk@ie*-<8!A^arF2J=JJbJQc_zhJy4fBfaHDmgNxtTR8)Ac2ByFEZ3mv6vzSo>
zu-}Y9_wF!++;x|dK%;3gy_DybOYd^=>IY;y(xi+SCr_W^(c>qWnwfDHZr`3q${3&w
z0udg(Y+M234lMiPIS)Jw+&MBjiV8>t9{XgBk8OxRT!#)F5@G)>Rk-ZHTFYd4Deqjo
za(VLi<2M%`-nwgPxNq~_V<(@yG<AFS8#5CVeZWu}lt>Vj4n#HRO+qpZ^DWNX_Z{A*
zi~|NQ^c(Ed1Vd6hXhK@x`@xth6_%g6lMCOPx^WenO*S3g%cj8rfE;jc61K&G6#m^2
m4m=?OxqWd)FI3kL2lzkb2(u0?p8v=I0000<MNUMnLSTX#^GOK+

literal 0
HcmV?d00001

diff --git a/AndorsTrail/res/drawable/monsters_mage.png b/AndorsTrail/res/drawable/monsters_mage.png
new file mode 100644
index 0000000000000000000000000000000000000000..835a7d7cf6bbd1ab16db336019d8b905dbc0e5b8
GIT binary patch
literal 2227
zcmV;k2u$~hP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igb-
z5i}F1#f_-|000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}000OMNkl<Z
zSi`NBdu&_f8Hb<mJLmY8*m3M8ah)bTZZ4&?3xiRTuD7&|suWE_8oLUKY7=Y-RG~?T
zb<@N&w$bemB&2PCV1S00v`G^h0&NIYa$C_hj7kthOS?i&>!jpj9LIL!%ej2}!%hf=
zLNoD6mXFW*&N)B7@9%xy7p`EL=J4WiPtVTBOmkSRUcJ4CFJQ?ldAVh!0Z1f<e!qEh
z|Bp>GPPJM~T`KPXS=#4q$mgwwkZlholfnI0U)|~1c3uf#+~K-yZ;p>2Ien?%g?qjb
z0o~ohT0CwZXle2G4-9mBsZ_5#dGe&#yZ1gXmz(%rHtU~EB>IM$ni5})L^{c2UYl5s
z2yvOP3(HEYh2Oos!zz_ho~r`#nrk+oJcVJHL|ck#bkq{Zj=e`)TQAjW;r#6E``@0J
zczxtbBcOlUNy|zr(;R*VNGgTqx^QmXlecX#@bWoMj~(N~s-NAr+$J)aEFg$RdsH@i
zrdtRx1dMzUCfx3M&MqOi(RP%&wkyJKes@28>q7kcJN-zzjpv>_#QF1CHf<Wj=PQcd
zUZ_-XmSaNwau;0Jc2lVxjE$wyq$WmA7rAQaSJ;k&=h$o<+)Q^cfKrmVxhVVgeTyfa
zcmSoAR|WcKTq}E?V&~2qIePRcJ9g~Awrv2E5-8<hSuj2QAD({tWiDJeqb}#EWeaGS
zZ~#=vwl_Bk0hNkFrBWi7gJMxqD7-~5*vx?g&vEn3U!kwBOQce54luhM0pfDtNhUWA
z7)I#zL?Y~;nyM0yn<(`@kw`azKr4IpTuW=~Aot$;P1dj9O{tXS!iCX?v)L0rTMDmb
zabV%b&d$NDu~^TsN~LJ*-Mf<`N8V=p_O;x3=RUS<*+wj8a`9plk3RZadU{sjx;Z?r
zM6FiSW3k@DmX*#e3q%Xx$mcEE+i$oD)IYnsHw6lXj4GANV#9_6eSJL~Kb|9<eu+%x
zHC}x2?{s%>WyOki)~x9u6pE`4Kb-HX)e2UjkU6$24_H>3m5J+n9alWl*VotE(a|10
zb7oY5Cq_rddE}8luz&v@m}Un(J^hr+5C{ZN%4K>Qs#QfK;uC>DocZ|+)nzxMJzr+Z
z-?Z}Z*LK~!C6zK0u~@5WZ@)@-9^8KWHj>E=?BD+wgM;f?yS9^Bt&HP12%)oPjUpNq
z1OgC?dDym^Urv*fKe|a?eEHcY+yC*``&K#^{-!je38h@2>mdN5(IzUDG7}RolgrKV
z?6WU1GLpr0b;iaHGCnTx`#}iMb%|m4o;J<lomXl?{gpFYx&N0x;m&W|3c62d8cd7}
zY+E6v<lw=BtY7~FMn;YjiKJMuqL;zJ6rSfbnBd{M0!;%UBti(3Qre}h{IU_S&K+uc
z{*4>B<-s=y_(Iq=AETM;+PwPeg9L*u`2As&@=!`Gen21uc%Dl%x|)`jZamNKYOv(<
zQ(&6ILBH-$rJXm%)^gr*sZ{DARZ0<!MmcffEd~bmuyW;fc;3fRuN0KaH2%4VQl2M-
z_Gh4L8O=x_@X$3EDM3mJ2$WI`4Q*og?t2&>{w}9Zy?~U)Cj?AQfu_~d5e&wqt_M&`
z-F+oy{6sgDQX`+YaNQb02u__k&8}VF=lJozkj)m*b-DQBkJ1GBJb*_yoWwAK9;lzL
zS~c{PWu-CAVR6L*gpia<len&p5Q0o5gX4f@jgZgJQ79Nxs{$cZV?VUDL8$~%3LM8~
z#fo(jgzD(H{)e5NgD)%{ZY~w0FX;y!C|P&1hLrl^>5-8?;rE9z41*6oIL)e6L88$X
zJg+Vw7=)P_2m~M+^(YiVbaoDjR4S-+ee12jyHe^+z#lCuePC&Y=$4h9H_hQM0dGsG
zGd=wd)#@CX%xfs+0g`HUj&fNrJ+08R3KJ6^&CL=`^FHQ<dKv`aq3c0(9ns(4jIQrm
zYZw}Z!uUg=9+pzyW?AVYOH)v8)bElqt3TXvTn-;Tgb;#Aq>FXyZlzevaPZ*27Uu)Q
zQ1tghEJh<L0x4l^40Ih*DUDJoOSM|i`}@DHg2C9~)vLEF(;SXzb=sLRA;i8)B~P_F
zhm_i4e)D-~Zmx3n>?HAc2l03q!|1}c3%vX8+jMrW!Z3V*!nOtFa=m<osAsmh8FXFI
z+8Uuy@Hltwh;ZF1LP!NXun>XDf&qn)i-c23p=lajUDt8(VvIzhpJ>#@=c|xRZX^;(
za^l20<nwuIHJxZw5f0Y_TQ1KwOf1nf@cSM5`;#P-14wB!AXW#F2HbPWJV-d4L<otl
z`?%|_M^S2)mKGP!6L_A$wkxb#cP+`}Moym0@ZNiq)M`GOngoWSGdcMtb93h@mBuL+
zeH02hwhiHML}{9T!7Pt!(Wn^!{#~yE!~#+iiEEgheIKPfa=9Fi<0Bpq;=1*`mdgUe
z@MvmMKpVy42TV?8h{yf3v;?VELrhJLQZDBx6l^s!Gb3hZX2@nOVcW$gq|~0btn@Fm
zXw>upKL-|v$^{nK_B@{FarW#x`27*W;SNF}2!$lYqGWzv(%mib`*j?r6)F8pPfrtz
z`RMFS;JR%TixX6<c~Pqs{yRTEeG7OmNNGH2S?R+7qJhd?z$+h>)FL;O5JJ>VCGq(J
zXqswNN4@k6qyFtULJ1*+ZC5Z14PDo;ZGmmiBZO!NG|Ng)UON7XCA<zbqJU+k%cePe
z7U=mDQJ=LQKX>lX-CbQ<gG#AJU(vCwbop}a`G1*XwmCC>%A^1Q002ovPDHLkV1f&U
BB5wcy

literal 0
HcmV?d00001

diff --git a/AndorsTrail/res/drawable/monsters_zombie1.png b/AndorsTrail/res/drawable/monsters_zombie1.png
new file mode 100644
index 0000000000000000000000000000000000000000..67b6b52d362c94f0d94527200c08d0268f53369e
GIT binary patch
literal 962
zcmV;z13mnSP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igb-
z5jHQioRh2o000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}0009WNkl<Z
zSi_}P(UI#Q3|ulP1S&bXlJF`qRC1&e>nbsw@IF8`*f`;G%w(L{7_C-XNl_^!{B;?l
zPKT^(QX}uGPXHJ*RWC6#0MgZ+2*g1Ux8E8zW=hr)LRb*OvKi;N8z<|aFPQlVfH7(_
zY%PIkZk~%#xgMYY34k#wS?dtOayHB!5d;9+Gol$^?6Ft}fDYk0ultDc+Az@!W)A>}
zg?3FY{{|3($Cn14%w>NDv962yfC1{?Er7HJtR*lrLhx{!VC{^55qK=iw&x=TB<3>!
zUpyAW%)VhIMu3^2Eg`Z8Gs74MqRd_h{JR`5W=g9iXlD4za0q^<-%a=`-?NvD7$qzW
zA_r#veG-c2Pi91-;+-#7x9xinRdJqStpjuZ5V<B%hXEKfC88`d?Ur(YYm7_c{m_gD
z(Z)gsl8tMP0)*Z&aLNHm8fK3W9M(0doW)7ig@xH86fg+Bc|U|KK{@M{5>5cbL%HU<
zzQ4$oymkX~0n7jx0yaib$a0wv_qKs7%9tr>-ItFXZ0#OnQHdnqx&AY(RR|$<S?J0z
zM&MfmksORs>8h#B$OVVo0&7)cT)@gbV^r#a=*m#M|Gr=$$9S)HSDD@eZf#qhZ|5pU
z!_9;>fpwND6}DdPKNPTz3{?{EpBG7!_c$<PD?B1ot*=1{b6@Nm7H+*dFWP>-sAQUE
z=*k<d-FAJ)M9spzN0SYV)zS%oF)EQwouqXQ5CPH4fhRNKt5Pg-dNRYsv#f}xlX2N2
zEWBHFbGr9*ew0wX9z>AW<3;wz$XimLrI}?YIdIvIkH(Er$!Xds)HFBV@1>ev&H+*b
z<a!&?t}#;zAwj!kYf@L<TU!7OwBo^;Ft=w}&iPa9dmvmK8%pm3<pxAcQ}KGnB}8B@
z#(C&}!P}uUgtQGL@8-J)5&p&UKVdKg_gBVO>+rMH2iFvwUa|32FQGS$>;&L=pwm>%
zfn)lvSsDeQv_?87k=rsk5<$A(*rH}wInI(trQMICR_#eFow0YwtE3%`|0ctAO{zvE
kgXqr4+)TQES;uhv2WHkd_-*2Qe*gdg07*qoM6N<$f)2=@%K!iX

literal 0
HcmV?d00001

diff --git a/AndorsTrail/res/drawable/monsters_zombie2.png b/AndorsTrail/res/drawable/monsters_zombie2.png
new file mode 100644
index 0000000000000000000000000000000000000000..f3e7f01f4dfd59e9c80db32b127d243f3ea78c0c
GIT binary patch
literal 980
zcmV;_11tQAP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igb-
z5jPivg&K1J000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}0009oNkl<Z
zSi`MX?UCak41MgR5K+m>m6)w0N+rRSSX+tJ3HL+BA2CUsyJLnSCYUEZeL9p<@UJ7r
zaJXceN;vcG<*xv{4WI#%8TjV)z^@|4P|gSuK4G8&r^Mji0qs{Ee6yMXM1UlH%f#h0
z#pJ*M7VxdcW&pug?%4%9F}}`#Ct>7K4!}AnM06(<_l)lw&?^J<V6IOEsNh>*?io6$
z&soWweU+q;AKx72KZ*FI5U&}a_V%JJyIIT}ScoBaMrVqC9G5eH<pZ$`B_+ny7`I_h
zvktmrMHMhpSYp_qFjK@BK<w=0te=@6cA-oxpbXq-1(P4A9ssOUeBZEYX)cJW|0Z^3
zKF$MG^C2rN%@@M$ZK?~WJu?PX&~^2ZJUb+9c&`GVVjy;*5c!2P&T+0AaA0w~->VBz
zS*XCo3}!!1#Gf-zh1Wrm#S=;FJgaR}t_}*Z`Qc~(eij92y{ksTG#-=E!3U~_x?yhn
zqM0IRXNB3P+-I$A6}tLF&I-BnITK7{31;qSt?;QAr^L(uSK~D&SfdCTkfI=u(#!|V
zFjNIbVkqNfQMsBsB9DwLvIDOst9vnqk|#Nsq8Wx&yRqR!(^NwB_L}XUd3sCml=hkN
zAV7_RGb58vRgZvHU+`Ev9`C-ia(~sXZ#Y7Xp)dp{`%JA6FyyJps!6WK3k%a&!dENL
z*VrEPc@kl|g6X<GLzeX&6I&K8Et--lCYFN$F@_>^yjy4RD!?ly22~in%LC>I#abOr
zcL1+vcq7P5-`NzWOUq7=A+#M{17>i$wVjQ`v){uVOI96y1pt&%c9RI@aj))Y=8~C9
zA}N_mc|1#mLhMsAmuGiv=jBZ7#?F(-y7655l)U~^KG*2J?+NGfyx1=uZQl|?aIPtR
z-xb@w69Tvi?h(R3hJ)L=kCV4eX`aMO@6UUUdS+z8sXpL+PZ&d)lHj)zp^B^kgP(qm
z-N-d(1{8ei>*(_A`%Y->15MA_bJMY%79tSgph>L<lmSa?uXk$9CRjSFO*_|$v`|Vp
zXkYufnzuh;;mp_y@Kraqo3#;L%yH*kr~ALa0pJhiMr5g<s#OI50000<MNUMnLSTY{
C9kikV

literal 0
HcmV?d00001

diff --git a/AndorsTrail/res/layout/about.xml b/AndorsTrail/res/layout/about.xml
index 8f00cc927..7c79d4bb1 100644
--- a/AndorsTrail/res/layout/about.xml
+++ b/AndorsTrail/res/layout/about.xml
@@ -20,7 +20,6 @@
 			android:paddingBottom="@dimen/dialog_iconpadding_bottom"
 			/>
 		<TextView
-			android:id="@+id/about_title"
 			android:layout_width="fill_parent"
 			android:layout_height="wrap_content"
 			android:text="@string/app_name"
diff --git a/AndorsTrail/res/layout/combatview.xml b/AndorsTrail/res/layout/combatview.xml
index a143ad27b..e8c9a73bb 100644
--- a/AndorsTrail/res/layout/combatview.xml
+++ b/AndorsTrail/res/layout/combatview.xml
@@ -22,22 +22,22 @@
 				android:layout_alignParentLeft="true"
 				android:layout_centerVertical="true"
 				android:textSize="@dimen/smalltext"
-				android:text="@string/combat_move"
+				android:text="Action"
 				/>
 		 
-			<Button android:id="@+id/combatview_endcombat"
+			<Button android:id="@+id/combatview_flee"
 				android:layout_width="wrap_content"
 				android:layout_height="@dimen/smalltext_buttonheight"
 				android:layout_alignParentRight="true"
 				android:layout_centerVertical="true"
 				android:textSize="@dimen/smalltext"
-				android:text="@string/combat_endcombat"
+				android:text="@string/combat_flee"
 				/>
 		
 			<Button android:id="@+id/combatview_endturn"
 				android:layout_width="wrap_content"
 				android:layout_height="@dimen/smalltext_buttonheight"
-				android:layout_toLeftOf="@id/combatview_endcombat"
+				android:layout_toLeftOf="@id/combatview_flee"
 				android:layout_centerVertical="true"
 				android:textSize="@dimen/smalltext"
 				android:text="@string/combat_endturn"
@@ -82,35 +82,6 @@
 			android:layout_width="fill_parent"
 			android:layout_height="wrap_content"
 	        />
-		
-		<!-- 
-		<RelativeLayout
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			>
-			<ProgressBar android:id="@+id/combatview_monsterhealth"
-				style="?android:attr/progressBarStyleHorizontal"
-	        	android:progressDrawable="@drawable/healthbar"
-				android:layout_width="fill_parent"
-				android:layout_centerVertical="true"
-				android:layout_height="@dimen/healthbar_height"
-				android:textSize="@dimen/smalltext"
-				/>
-			
-			<TextView android:id="@+id/combatview_monsterhealth_text"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:textSize="@dimen/smalltext"
-				android:layout_centerInParent="true"
-				android:text="HP"
-				android:textColor="#FFF"
-				android:shadowDx="1"
-				android:shadowDy="1"
-				android:shadowRadius="1"
-				android:shadowColor="#555"
-				/>
-		</RelativeLayout>
-		 -->
 		 
 	</LinearLayout>
 	
diff --git a/AndorsTrail/res/layout/heroinfo_stats.xml b/AndorsTrail/res/layout/heroinfo_stats.xml
index 4f812b85e..8126be7db 100644
--- a/AndorsTrail/res/layout/heroinfo_stats.xml
+++ b/AndorsTrail/res/layout/heroinfo_stats.xml
@@ -106,11 +106,25 @@
 		</LinearLayout>
 	</ScrollView>
 
-	<Button
-		android:id="@+id/heroinfo_levelup"
-		android:layout_width="wrap_content"
+	<LinearLayout 
+		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
-		android:text="@string/heroinfo_levelup"
-		/>
+		android:orientation="horizontal"
+		android:gravity="center_vertical">
+		<Button
+			android:id="@+id/heroinfo_levelup"
+			android:layout_width="0dip"
+			android:layout_weight="1"
+			android:layout_height="wrap_content"
+			android:text="@string/heroinfo_levelup"
+			/>
+		<Button
+			android:id="@+id/heroinfo_quests"
+			android:layout_width="0dip"
+			android:layout_weight="1"
+			android:layout_height="wrap_content"
+			android:text="@string/heroinfo_quests"
+			/>
+	</LinearLayout>
 
 </LinearLayout>
diff --git a/AndorsTrail/res/layout/loadsave.xml b/AndorsTrail/res/layout/loadsave.xml
new file mode 100644
index 000000000..13200d0fb
--- /dev/null
+++ b/AndorsTrail/res/layout/loadsave.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="fill_parent"
+	android:layout_height="wrap_content"
+	android:padding="@dimen/dialog_margin"
+	>
+	
+	<LinearLayout
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:layout_alignParentTop="true"
+		android:orientation="horizontal"
+		android:gravity="center_vertical"
+		android:id="@+id/loadsave_titlelayout"
+		>
+		<ImageView 
+			android:id="@+id/loadsave_image"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content" 
+			android:paddingRight="@dimen/dialog_iconpadding_right"
+			android:paddingBottom="@dimen/dialog_iconpadding_bottom"
+			/>
+		<TextView
+			android:id="@+id/loadsave_title"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:text="@string/loadsave_title_save" 
+			android:textSize="@dimen/titletext"
+			/>
+	</LinearLayout>
+
+	<TextView 
+		android:id="@+id/loadsave_description"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:layout_below="@id/loadsave_titlelayout"
+		android:layout_alignParentLeft="true"
+		android:text="@string/loadsave_selectslot"
+		/>
+		
+	<ScrollView
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:layout_alignParentLeft="true"
+		android:layout_below="@id/loadsave_description"
+		>
+		<LinearLayout
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:orientation="vertical"
+			>
+			<Button
+				android:id="@+id/loadsave_slot_1"
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:text="1."
+				/>
+			<Button
+				android:id="@+id/loadsave_slot_2"
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:text="2."
+				/>
+			<Button
+				android:id="@+id/loadsave_slot_3"
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:text="3."
+				/>
+			<Button
+				android:id="@+id/loadsave_slot_4"
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:text="4."
+				/>
+		</LinearLayout>
+		
+	</ScrollView>
+
+</RelativeLayout>
diff --git a/AndorsTrail/res/layout/questlog.xml b/AndorsTrail/res/layout/questlog.xml
new file mode 100644
index 000000000..05af30faf
--- /dev/null
+++ b/AndorsTrail/res/layout/questlog.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="fill_parent"
+	android:layout_height="fill_parent"
+	android:padding="@dimen/dialog_margin"
+	android:orientation="vertical"
+	>
+	<LinearLayout
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:orientation="horizontal"
+		android:gravity="center_vertical"
+		>
+		<ImageView 
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:src="@drawable/icon" 
+			android:paddingRight="@dimen/dialog_iconpadding_right"
+			android:paddingBottom="@dimen/dialog_iconpadding_bottom"
+			/>
+		<TextView
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:text="@string/questlog_title"
+			android:textSize="@dimen/titletext"
+			/>
+	</LinearLayout>
+	
+	<Spinner 
+		android:id="@+id/questlog_includecompleted"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:prompt="@string/questlog_includecompleted_prompt"
+		/>
+	
+	<ExpandableListView
+		android:id="@+id/questlog_contents"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		/>
+
+</LinearLayout>
diff --git a/AndorsTrail/res/layout/questlogentry.xml b/AndorsTrail/res/layout/questlogentry.xml
new file mode 100644
index 000000000..0a998e293
--- /dev/null
+++ b/AndorsTrail/res/layout/questlogentry.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/questlog_entrytext"
+	android:layout_width="fill_parent"
+	android:layout_height="wrap_content"
+	/>
diff --git a/AndorsTrail/res/layout/startscreen.xml b/AndorsTrail/res/layout/startscreen.xml
index 39575b4cf..bbfe0b9f2 100644
--- a/AndorsTrail/res/layout/startscreen.xml
+++ b/AndorsTrail/res/layout/startscreen.xml
@@ -29,14 +29,14 @@
 				android:id="@+id/startscreen_currenthero"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:text="@string/startscreen_currenthero"
+				android:text="Hero name"
 				/>
 			<EditText
 				android:id="@+id/startscreen_enterheroname"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:visibility="gone"
-				android:maxLines="1"
+				android:inputType="textPersonName"
 				/>
 		</LinearLayout>
 		
@@ -70,6 +70,21 @@
 			android:layout_height="wrap_content"
 			android:text="@string/startscreen_newgame"
 			/>
+		<Button
+			android:id="@+id/startscreen_load"
+			android:layout_width="0dip"
+			android:layout_weight="1"
+			android:layout_height="wrap_content"
+			android:text="@string/startscreen_load"
+			/>
+	</LinearLayout>
+		
+	<LinearLayout
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:orientation="horizontal"
+		android:gravity="center_vertical"
+		>
 		<Button
 			android:id="@+id/startscreen_about"
 			android:layout_width="0dip"
diff --git a/AndorsTrail/res/values/conversationlist.xml b/AndorsTrail/res/values/conversationlist.xml
index 7f7e2288b..b5215b019 100644
--- a/AndorsTrail/res/values/conversationlist.xml
+++ b/AndorsTrail/res/values/conversationlist.xml
@@ -2,377 +2,527 @@
 
 <resources>
 	<string name="conversationlist_debug">
-[ID|Text|EnableKey|RwdExp|RwdGold|Rep_text0|Rep_id0|Rep_reqKey0|Rep_itemTag0|Rep_itemQty0|Rep_text1|Rep_id1|Rep_reqKey1|Rep_itemTag1|Rep_itemQty1|Rep_text2|Rep_id2|Rep_reqKey2|Rep_itemTag2|Rep_itemQty2|];
-{debug||||||debug2|dialog2||||debug1|||||||||};
-{debug1|Welcome adventurer!|dialog2|||Trade items long text|S||||Bye|X||||Debug|debug3||||};
-{debug2|Welcome back!||||Trade items very very long text|S||||Bye|X||||Debug|debug3||||};
-{debug3|Debug 3\nTest||5|5|Iron sword*2|debug||sword1|2|Iron sword*1|debug||sword1|1|Fight|F||||};
-
-{test1|Hello, test message||||Bye|X||||Shop|S||||Keytest|testmain||||};
-{testmain|Keytest main||||Back|test1||||Add key|test2||||I have it!|test3|testkey|||};
-{test2|Key added!|testkey|||Ok|testmain||||||||||||||};
-{test3|This is only reachable if you have testkey||||Back|testmain||||||||||||||};
+[ID|Text|EnblQst|DropList|Rep_text0|Rep_id0|Rep_reqQst0|Rep_itemTag0|Rep_itemQty0|Rep_text1|Rep_id1|Rep_reqQst1|Rep_itemTag1|Rep_itemQty1|Rep_text2|Rep_id2|Rep_reqQst2|Rep_itemTag2|Rep_itemQty2|];
+{debugshop|Welcome adventurer!|||Trade items very very long text|S||||Bye|X||||Fight|F||||};
+{debugquest|Debug quest start\nTest.|debugquest:10||Iron sword*2|debugquest2||dagger0|1|Progress+=10|debugquest4||||Progress=100|debugquest1|debugquest:100|||};
+{debugquest1|Yes, you have already completed this quest.||debuglist1|Next|debugquest3||||||||||||||};
+{debugquest2|Thank you for the items.|debugquest:100||Next|debugquest3||||||||||||||};
+{debugquest3|Quest is now completed.|||Bye|X||||||||||||||};
+{debugquest4|More info. Quest progress should now be updated to 20.|debugquest:20||Back|debugquest||||||||||||||};
 	</string>
 	
 	
 	<string name="conversationlist_mikhail">
-[ID|Text|EnableKey|RwdExp|RwdGold|Rep_text0|Rep_id0|Rep_reqKey0|Rep_itemTag0|Rep_itemQty0|Rep_text1|Rep_id1|Rep_reqKey1|Rep_itemTag1|Rep_itemQty1|Rep_text2|Rep_id2|Rep_reqKey2|Rep_itemTag2|Rep_itemQty2|];
-{mikhail_start_select||||||mikhail_visited|mikhail_visited||||mikhail_gamestart|||||||||};
-{mikhail_gamestart|Oh good, you are awake.||||Next|mikhail_visited||||||||||||||};
-{mikhail_visited|I can\'t seem to find your brother anywhere. He hasn\'t been back since he left yesterday.|mikhail_visited|||Next|mikhail3||||||||||||||};
-{mikhail3|Nevermind, he will probably be back soon.||||Next|mikhail_default||||||||||||||};
-{mikhail_default|Anything else I can help you with?||||Tasks|mikhail_tasks||||Brother|mikhail_andor1||||Bye|X||||};
-{mikhail_tasks|Oh yes, there were some things I need help with.||||Bread|mikhail_bread_select||||Rats|mikhail_rats_select||||Back|mikhail_default||||};
-{mikhail_andor1|As I said, Andor went out yesterday and hasn\'t been back since. I\'m starting to worry about him. Please go look for your brother, he said he would only be out a short while.||||Next|mikhail_andor2||||||||||||||};
-{mikhail_andor2|Maybe he went into that supply cave again and got stuck. Or maybe he\'s in Leta\'s basement training with that wooden sword again. Please go look for him in town.||||Back|mikhail_default||||||||||||||};
-
-{mikhail_bread_select||||||mikhail_bread_complete2|qmikhail_bread_complete||||mikhail_bread_continue|qmikhail_bread||||mikhail_bread_start||||};
-{mikhail_bread_start|Oh, I almost forgot. If you have time, please stop by Mara at the town hall and buy me some more bread.|qmikhail_bread|||Ok|mikhail_default||||||||||||||};
-{mikhail_bread_continue|Did you get the bread from Mara at the town hall that I asked for?||||Done|mikhail_bread_complete||bread|1|Not yet|mikhail_default|||||||||};
-{mikhail_bread_complete|Thanks a lot, now I can get my breakfast. Here, take these coins for your help.|qmikhail_bread_complete||20|Back|mikhail_default||||||||||||||};
-{mikhail_bread_complete2|Thanks for the bread earlier.||||You\'re welcome|mikhail_default||||||||||||||};
-
-{mikhail_rats_select||||||mikhail_rats_complete2|qmikhail_rats_complete||||mikhail_rats_continue|qmikhail_rats||||mikhail_rats_start||||};
-{mikhail_rats_start|I saw some rats out back in our garden earlier. Could you please go check our garden if they are still there? Please kill any rats that you see.|qmikhail_rats|||Done|mikhail_rats_complete||tail_trainingrat|2|Sure|mikhail_rats_start2|||||||||};
-{mikhail_rats_start2|If you get hurt by the rats, come back here and rest in your bed. That way you can regain your strength.||||Next|mikhail_rats_start3||||||||||||||};
-{mikhail_rats_start3|Also, don\'t forget to check your inventory. You probably still have that old ring I gave you. Make sure you wear it.||||Ok|mikhail_default||||||||||||||};
-{mikhail_rats_continue|Did you kill those two rats in our garden?||||Yes|mikhail_rats_complete||tail_trainingrat|2|Not yet|mikhail_default|||||||||};
-{mikhail_rats_complete|Oh you did? Wow, thanks a lot for your help!\n\nIf you got hurt, use your bed over there to rest. That way you can regain your strength.|qmikhail_rats_complete|20||Back|mikhail_default||||||||||||||};
-{mikhail_rats_complete2|Thanks for your help with the rats earlier.\n\nIf you got hurt, use your bed over there to rest. That way you can regain your strength.||||You\'re welcome|mikhail_default||||||||||||||};
+[ID|Text|EnblQst|DropList|Rep_text0|Rep_id0|Rep_reqQst0|Rep_itemTag0|Rep_itemQty0|Rep_text1|Rep_id1|Rep_reqQst1|Rep_itemTag1|Rep_itemQty1|Rep_text2|Rep_id2|Rep_reqQst2|Rep_itemTag2|Rep_itemQty2|];
+{mikhail_start_select|||||mikhail_visited|andor:1||||mikhail_gamestart|||||||||};
+{mikhail_gamestart|Oh good, you are awake.|||Next|mikhail_visited||||||||||||||};
+{mikhail_visited|I can\'t seem to find your brother anywhere. He hasn\'t been back since he left yesterday.|andor:1||Next|mikhail3||||||||||||||};
+{mikhail3|Nevermind, he will probably be back soon.|||Next|mikhail_default||||||||||||||};
+{mikhail_default|Anything else I can help you with?|||Tasks|mikhail_tasks||||Brother|mikhail_andor1||||Bye|X||||};
+{mikhail_tasks|Oh yes, there were some things I need help with.|||Bread|mikhail_bread_select||||Rats|mikhail_rats_select||||Back|mikhail_default||||};
+{mikhail_andor1|As I said, Andor went out yesterday and hasn\'t been back since. I\'m starting to worry about him. Please go look for your brother, he said he would only be out a short while.|||Next|mikhail_andor2||||||||||||||};
+{mikhail_andor2|Maybe he went into that supply cave again and got stuck. Or maybe he\'s in Leta\'s basement training with that wooden sword again. Please go look for him in town.|||Back|mikhail_default||||||||||||||};
+{mikhail_bread_select|||||mikhail_bread_complete2|mikhail_bread:100||||mikhail_bread_continue|mikhail_bread:10||||mikhail_bread_start||||};
+{mikhail_bread_start|Oh, I almost forgot. If you have time, please stop by Mara at the town hall and buy me some more bread.|mikhail_bread:10||Ok|mikhail_default||||||||||||||};
+{mikhail_bread_continue|Did you get the bread from Mara at the town hall that I asked for?|||Done|mikhail_bread_complete||bread|1|Not yet|mikhail_default|||||||||};
+{mikhail_bread_complete|Thanks a lot, now I can get my breakfast. Here, take these coins for your help.|mikhail_bread:100|gold20|Back|mikhail_default||||||||||||||};
+{mikhail_bread_complete2|Thanks for the bread earlier.|||You\'re welcome|mikhail_default||||||||||||||};
+{mikhail_rats_select|||||mikhail_rats_complete2|mikhail_rats:100||||mikhail_rats_continue|mikhail_rats:10||||mikhail_rats_start||||};
+{mikhail_rats_start|I saw some rats out back in our garden earlier. Could you please go check our garden if they are still there? Please kill any rats that you see.|mikhail_rats:10||Done|mikhail_rats_complete||tail_trainingrat|2|Sure|mikhail_rats_start2|||||||||};
+{mikhail_rats_start2|If you get hurt by the rats, come back here and rest in your bed. That way you can regain your strength.|||Next|mikhail_rats_start3||||||||||||||};
+{mikhail_rats_start3|Also, don\'t forget to check your inventory. You probably still have that old ring I gave you. Make sure you wear it.|||Ok|mikhail_default||||||||||||||};
+{mikhail_rats_continue|Did you kill those two rats in our garden?|||Yes|mikhail_rats_complete||tail_trainingrat|2|Not yet|mikhail_default|||||||||};
+{mikhail_rats_complete|Oh you did? Wow, thanks a lot for your help!\n\nIf you got hurt, use your bed over there to rest. That way you can regain your strength.|mikhail_rats:100||Back|mikhail_default||||||||||||||};
+{mikhail_rats_complete2|Thanks for your help with the rats earlier.\n\nIf you got hurt, use your bed over there to rest. That way you can regain your strength.|||You\'re welcome|mikhail_default||||||||||||||};
 	</string>
 	
 	<string name="conversationlist_crossglen_leta">
-[ID|Text|EnableKey|RwdExp|RwdGold|Rep_text0|Rep_id0|Rep_reqKey0|Rep_itemTag0|Rep_itemQty0|Rep_text1|Rep_id1|Rep_reqKey1|Rep_itemTag1|Rep_itemQty1|Rep_text2|Rep_id2|Rep_reqKey2|Rep_itemTag2|Rep_itemQty2|];
-{leta1|Hey, this is my house, get out of here!||||But I was just...|leta2||||Oromir|leta_oromir_select||||Bye|X||||};
-{leta2|Beat it kid, get out of my house!||||Oromir|leta_oromir_select||||Bye|X|||||||||};
-{leta_oromir_select||||||leta_oromir_complete2|qleta_complete||||leta_oromir1|||||||||};
-{leta_oromir1|Do you know anything about my husband? He should be helping with the farm today, but is missing as usual.\nSigh.||||No idea|leta_oromir2||||Found him|leta_oromir_complete|oromir||||||||};
-{leta_oromir2|If you see him, tell him to hurry back here and help me with the housework.\nNow get out of here!||||Bye|X||||||||||||||};
-{leta_oromir_complete|Hiding is he? That\'s not really the way forward. I\'ll go let him know who\'s the boss around here.\nThanks for letting me know though.|qleta_complete|30||Bye|X||||||||||||||};
-{leta_oromir_complete2|Thanks for telling me about Oromir earlier. I will go get him in just a minute.||||Bye|X||||||||||||||};
-{oromir1|Oh you startled me.\nHello.||||Hello|oromir2||||||||||||||};
-{oromir2|I\'m hiding here from my wife Leta. She is always getting angry at me for not helping out on the farm. Please don\'t tell her that I\'m here.|oromir|||Sure|X||||||||||||||};
+[ID|Text|EnblQst|DropList|Rep_text0|Rep_id0|Rep_reqQst0|Rep_itemTag0|Rep_itemQty0|Rep_text1|Rep_id1|Rep_reqQst1|Rep_itemTag1|Rep_itemQty1|Rep_text2|Rep_id2|Rep_reqQst2|Rep_itemTag2|Rep_itemQty2|];
+{leta1|Hey, this is my house, get out of here!|||But I was just...|leta2||||Oromir|leta_oromir_select||||Bye|X||||};
+{leta2|Beat it kid, get out of my house!|||Oromir|leta_oromir_select||||Bye|X|||||||||};
+{leta_oromir_select|||||leta_oromir_complete2|leta:100||||leta_oromir1|||||||||};
+{leta_oromir1|Do you know anything about my husband? He should be helping with the farm today, but is missing as usual.\nSigh.|||No idea|leta_oromir2||||Found him|leta_oromir_complete|leta:20||||||||};
+{leta_oromir2|If you see him, tell him to hurry back here and help me with the housework.\nNow get out of here!|leta:10||Bye|X||||||||||||||};
+{leta_oromir_complete|Hiding is he? That\'s not really the way forward. I\'ll go let him know who\'s the boss around here.\nThanks for letting me know though.|leta:100||Bye|X||||||||||||||};
+{leta_oromir_complete2|Thanks for telling me about Oromir earlier. I will go get him in just a minute.|||Bye|X||||||||||||||};
+{oromir1|Oh you startled me.\nHello.|||Hello|oromir2||||||||||||||};
+{oromir2|I\'m hiding here from my wife Leta. She is always getting angry at me for not helping out on the farm. Please don\'t tell her that I\'m here.|leta:20||Sure|X||||||||||||||};
 	</string>
 
 	<string name="conversationlist_crossglen">
-[ID|Text|EnableKey|RwdExp|RwdGold|Rep_text0|Rep_id0|Rep_reqKey0|Rep_itemTag0|Rep_itemQty0|Rep_text1|Rep_id1|Rep_reqKey1|Rep_itemTag1|Rep_itemQty1|Rep_text2|Rep_id2|Rep_reqKey2|Rep_itemTag2|Rep_itemQty2|];
-{audir1|Welcome to my shop!\n\nPlease browse my selection of fine wares.||||Shop|S||||Bye|X|||||||||};
-{arambold1|Oh my, will I ever get any sleep with those drunkards singing like that?\n\nSomeone should do something about them.||||Rest|arambold2||||Trade|S||||Bye|X||||};
-{arambold2|Sure kid, you may rest here.\n\nPick any bed you want.||||Thanks, bye|X||||||||||||||};
-
-{drunk1|Drink drink drink, drink some more.\nDrink drink drink \'til you\'re on the floor.\n\nHey kid, wanna join us in our drinking game?||||No thanks|X||||||||||||||};
-{mara_default|Never mind those drunken fellas, they\'re always causing trouble.\n\nWant something to eat?||||Trade|S||||Bye|X|||||||||};
-{mara1||||||mara_thanks|qodair_complete||||mara_default|||||||||};
-{mara_thanks|I heard you helped Odair clean out that old supply cave. Thanks a lot, we\'ll start using it soon.||||My pleasure|mara_default||||||||||||||};
-
-{farm1|Please do not disturb me, I have work to do.||||Brother|farm_andor||||Bye|X|||||||||};
-{farm2|What?! Can\'t you see I\'m busy? Go bother someone else.||||Brother|farm_andor||||Bye|X|||||||||};
-{farm_andor|Andor? No, I haven\'t seen him around lately.||||Bye|X||||||||||||||};
-
-{snakemaster|Well well, what have we here? A visitor, how nice. I\'m impressed you got this far through all my minions.\n\nNow prepare to die, puny creature.||||Fight!|F||||||||||||||};
-{haunt|Oh mortal, free me from this cursed world!||||Leave|F||||||||||||||};
+[ID|Text|EnblQst|DropList|Rep_text0|Rep_id0|Rep_reqQst0|Rep_itemTag0|Rep_itemQty0|Rep_text1|Rep_id1|Rep_reqQst1|Rep_itemTag1|Rep_itemQty1|Rep_text2|Rep_id2|Rep_reqQst2|Rep_itemTag2|Rep_itemQty2|];
+{audir1|Welcome to my shop!\n\nPlease browse my selection of fine wares.|||Shop|S||||Bye|X|||||||||};
+{arambold1|Oh my, will I ever get any sleep with those drunkards singing like that?\n\nSomeone should do something about them.|||Rest|arambold2||||Trade|S||||Bye|X||||};
+{arambold2|Sure kid, you may rest here.\n\nPick any bed you want.|||Thanks, bye|X||||||||||||||};
+{drunk1|Drink drink drink, drink some more.\nDrink drink drink \'til you\'re on the floor.\n\nHey kid, wanna join us in our drinking game?|||No thanks|X||||||||||||||};
+{mara_default|Never mind those drunken fellas, they\'re always causing trouble.\n\nWant something to eat?|||Trade|S||||Bye|X|||||||||};
+{mara1|||||mara_thanks|odair:100||||mara_default|||||||||};
+{mara_thanks|I heard you helped Odair clean out that old supply cave. Thanks a lot, we\'ll start using it soon.|||My pleasure|mara_default||||||||||||||};
+{farm1|Please do not disturb me, I have work to do.|||Brother|farm_andor||||Bye|X|||||||||};
+{farm2|What?! Can\'t you see I\'m busy? Go bother someone else.|||Brother|farm_andor||||Bye|X|||||||||};
+{farm_andor|Andor? No, I haven\'t seen him around lately.|||Bye|X||||||||||||||};
+{snakemaster|Well well, what have we here? A visitor, how nice. I\'m impressed you got this far through all my minions.\n\nNow prepare to die, puny creature.|||Fight!|F||||||||||||||};
+{haunt|Oh mortal, free me from this cursed world!|||Leave|F||||||||||||||};
 	</string>
 
 	<string name="conversationlist_crossglen_tharal">
-[ID|Text|EnableKey|RwdExp|RwdGold|Rep_text0|Rep_id0|Rep_reqKey0|Rep_itemTag0|Rep_itemQty0|Rep_text1|Rep_id1|Rep_reqKey1|Rep_itemTag1|Rep_itemQty1|Rep_text2|Rep_id2|Rep_reqKey2|Rep_itemTag2|Rep_itemQty2|];
-{tharal1|Walk in the glow of the shadow, my child.||||Trade|S||||Bonemeal|tharal_bonemeal_select|qleonid_bonemeal|||Bye|X||||};
-{tharal_bonemeal_select||||||tharal_bonemeal4|qtharal_complete||||tharal_bonemeal1|||||||||};
-{tharal_bonemeal1|Bonemeal? We shouldn\'t talk about that. It\'s not allowed anymore. Issued by Lord Geomyr.||||Please?|tharal_bonemeal2_1||||Bye|X|||||||||};
-{tharal_bonemeal2_1|No, we really shouldn\'t talk about that.||||Oh come on|tharal_bonemeal2||||Bye|X|||||||||};
-{tharal_bonemeal2|Well if you really are that persistent. Bring me 5 insect wings that I can use for making potions and maybe we can talk more.||||I have it|tharal_bonemeal3||insectwing|5|Ok|X|||||||||};
-{tharal_bonemeal3|Thanks kid. I knew I could count on you.|qtharal_complete|||Next|tharal_bonemeal4||||||||||||||};
-{tharal_bonemeal4|Oh yes, bonemeal. Mixed with the right components it can be one of the most effective healing agents around.||||Next|tharal_bonemeal5||||||||||||||};
-{tharal_bonemeal5|We used to use it extensively before. But now that bastard Lord Geomyr has banned all use of it.||||Next|tharal_bonemeal6||||||||||||||};
-{tharal_bonemeal6|How am I supposed to heal people now? Using regular healing potions? Bah, they\'re so ineffective.||||Next|tharal_bonemeal7||||||||||||||};
-{tharal_bonemeal7|I know someone that still has a supply of Bonemeal if you are interested. Go talk to Thoronir, a fellow priest in Fallhaven. Tell him my password \'Glow of the shadow\'.||||Thanks, bye|X||||||||||||||};
+[ID|Text|EnblQst|DropList|Rep_text0|Rep_id0|Rep_reqQst0|Rep_itemTag0|Rep_itemQty0|Rep_text1|Rep_id1|Rep_reqQst1|Rep_itemTag1|Rep_itemQty1|Rep_text2|Rep_id2|Rep_reqQst2|Rep_itemTag2|Rep_itemQty2|];
+{tharal1|Walk in the glow of the Shadow, my child.|||Trade|S||||Bonemeal|tharal_bonemeal_select|bonemeal:10|||Bye|X||||};
+{tharal_bonemeal_select|||||tharal_bonemeal4|bonemeal:30||||tharal_bonemeal1|||||||||};
+{tharal_bonemeal1|Bonemeal? We shouldn\'t talk about that. It\'s not allowed anymore. Issued by Lord Geomyr.|||Please?|tharal_bonemeal2_1||||Bye|X|||||||||};
+{tharal_bonemeal2_1|No, we really shouldn\'t talk about that.|||Oh come on|tharal_bonemeal2||||Bye|X|||||||||};
+{tharal_bonemeal2|Well if you really are that persistent. Bring me 5 insect wings that I can use for making potions and maybe we can talk more.|bonemeal:20||I have it|tharal_bonemeal3||insectwing|5|Ok|X|||||||||};
+{tharal_bonemeal3|Thanks kid. I knew I could count on you.|bonemeal:30||Next|tharal_bonemeal4||||||||||||||};
+{tharal_bonemeal4|Oh yes, bonemeal. Mixed with the right components it can be one of the most effective healing agents around.|||Next|tharal_bonemeal5||||||||||||||};
+{tharal_bonemeal5|We used to use it extensively before. But now that bastard Lord Geomyr has banned all use of it.|||Next|tharal_bonemeal6||||||||||||||};
+{tharal_bonemeal6|How am I supposed to heal people now? Using regular healing potions? Bah, they\'re so ineffective.|||Next|tharal_bonemeal7||||||||||||||};
+{tharal_bonemeal7|I know someone that still has a supply of Bonemeal if you are interested. Go talk to Thoronir, a fellow priest in Fallhaven. Tell him my password \'Glow of the Shadow\'.|||Thanks, bye|X||||||||||||||};
 	</string>
 
 	<string name="conversationlist_crossglen_gruil">
-[ID|Text|EnableKey|RwdExp|RwdGold|Rep_text0|Rep_id0|Rep_reqKey0|Rep_itemTag0|Rep_itemQty0|Rep_text1|Rep_id1|Rep_reqKey1|Rep_itemTag1|Rep_itemQty1|Rep_text2|Rep_id2|Rep_reqKey2|Rep_itemTag2|Rep_itemQty2|];
-{gruil1|Psst, hey.\n\nWanna trade?||||Trade|S||||Brother|gruil_select|qleonid_andor|||Bye|X||||};
-{gruil_select||||||gruil_return|qgruil_andor_complete||||gruil2|||||||||};
-{gruil2|Your brother? Oh you mean Andor? I might know something, but that information will cost you. Bring me a poison gland from one of those poisonous snakes and maybe I\'ll tell you.|qgruil_andor|||I have it|gruil_complete||gland|1|Ok, bye|X|||||||||};
-{gruil_complete|Thanks a lot kid. This will do just fine. |qgruil_andor_complete|||Next|gruil_andor1||||||||||||||};
-{gruil_return|Look kid, I already told you.||||Next|gruil_andor1||||||||||||||};
-{gruil_andor1|I talked to him yesterday. He asked if I knew someone called Umar or something like that. I have no idea who he was talking about.||||Next|gruil_andor2||||||||||||||};
-{gruil_andor2|He seemed really upset about something and left in a hurry. Something about the Thieves Guild in Fallhaven.||||Next|gruil_andor3||||||||||||||};
-{gruil_andor3|That\'s all I know. Maybe you should ask around in Fallhaven. Look for my friend Gaela, he probably knows more.||||Bye|X||||||||||||||};
+[ID|Text|EnblQst|DropList|Rep_text0|Rep_id0|Rep_reqQst0|Rep_itemTag0|Rep_itemQty0|Rep_text1|Rep_id1|Rep_reqQst1|Rep_itemTag1|Rep_itemQty1|Rep_text2|Rep_id2|Rep_reqQst2|Rep_itemTag2|Rep_itemQty2|];
+{gruil1|Psst, hey.\n\nWanna trade?|||Trade|S||||Brother|gruil_select|andor:10|||Bye|X||||};
+{gruil_select|||||gruil_return|andor:30||||gruil2|||||||||};
+{gruil2|Your brother? Oh you mean Andor? I might know something, but that information will cost you. Bring me a poison gland from one of those poisonous snakes and maybe I\'ll tell you.|andor:20||I have it|gruil_complete||gland|1|Ok, bye|X|||||||||};
+{gruil_complete|Thanks a lot kid. This will do just fine. |andor:30||Next|gruil_andor1||||||||||||||};
+{gruil_return|Look kid, I already told you.|||Next|gruil_andor1||||||||||||||};
+{gruil_andor1|I talked to him yesterday. He asked if I knew someone called Umar or something like that. I have no idea who he was talking about.|||Next|gruil_andor2||||||||||||||};
+{gruil_andor2|He seemed really upset about something and left in a hurry. Something about the Thieves Guild in Fallhaven.|||Next|gruil_andor3||||||||||||||};
+{gruil_andor3|That\'s all I know. Maybe you should ask around in Fallhaven. Look for my friend Gaela, he probably knows more.|||Bye|X||||||||||||||};
 	</string>
 
 	<string name="conversationlist_crossglen_leonid">
-[ID|Text|EnableKey|RwdExp|RwdGold|Rep_text0|Rep_id0|Rep_reqKey0|Rep_itemTag0|Rep_itemQty0|Rep_text1|Rep_id1|Rep_reqKey1|Rep_itemTag1|Rep_itemQty1|Rep_text2|Rep_id2|Rep_reqKey2|Rep_itemTag2|Rep_itemQty2|];
-{leonid1|Hello kid. You\'re Mikhail\'s son aren\'t you? With that brother of yours.\n\nI\'m Leonid, steward of Crossglen village.||||Brother|leonid_andor||||Crossglen|leonid_crossglen||||Bye|leonid_bye||||};
-{leonid_andor|Your brother? No, I haven\'t seen him here today. I think I saw him in here yesterday talking to Gruil. Maybe he knows more?|qleonid_andor|||Thanks|leonid_continue||||Bye|leonid_bye|||||||||};
-{leonid_continue|Anything else I can help you with?||||Brother|leonid_andor||||Crossglen|leonid_crossglen||||Bye|leonid_bye||||};
-{leonid_crossglen|As you know, this is Crossglen village. Mostly a farming community. ||||Next|leonid_crossglen1||||||||||||||};
-{leonid_crossglen1|We have Audir with his smithy to the southwest, Leta and her husband\'s cabin to the west, this town hall here and your father\'s cabin to the northwest.||||Next|leonid_crossglen2||||||||||||||};
-{leonid_crossglen2|That\'s pretty much it. We try to live a peaceful life.||||Recent activity|leonid_crossglen3||||Back|leonid_continue|||||||||};
-{leonid_crossglen3|There were some recent disturbances some weeks ago that you may have noticed. Some villagers got into a fight over the new decree from Lord Geomyr.||||Next|leonid_crossglen4||||||||||||||};
-{leonid_crossglen4|Lord Geomyr issued a statement regarding the unlawful use of Bonemeal as healing substance. Some villagers argued that we should oppose Lord Geomyr\'s word and still use it ourselves.|qleonid_bonemeal|||Next|leonid_crossglen4_1||||||||||||||};
-{leonid_crossglen4_1|Tharal, our priest, was particularly upset and suggested we do something about Lord Geomyr.||||Next|leonid_crossglen5||||||||||||||};
-{leonid_crossglen5|Other villagers argued that we should follow Lord Geomyr\'s wish.\n\nPersonally, I haven\'t decided what my thoughts are.||||Next|leonid_crossglen6||||||||||||||};
-{leonid_crossglen6|On one hand, Lord Geomyr supports Crossglen with a lot of protection. *points to the soldiers in the hall*||||Next|leonid_crossglen7||||||||||||||};
-{leonid_crossglen7|But on the other hand, the tax and the recent changes of what\'s allowed and not are really hitting hard on Crossglen.||||Next|leonid_crossglen8||||||||||||||};
-{leonid_crossglen8|Someone should go to castle Geomyr and talk to the steward about our situation here in Crossglen.|qleonid_crossglen|||Next|leonid_crossglen9||||||||||||||};
-{leonid_crossglen9|In the meantime, we\'ve banned all use of Bonemeal as healing substance.||||Back|leonid_continue||||Bye|leonid_bye|||||||||};
-{leonid_bye|Shadow be with you.||||Exit|X||||||||||||||};
+[ID|Text|EnblQst|DropList|Rep_text0|Rep_id0|Rep_reqQst0|Rep_itemTag0|Rep_itemQty0|Rep_text1|Rep_id1|Rep_reqQst1|Rep_itemTag1|Rep_itemQty1|Rep_text2|Rep_id2|Rep_reqQst2|Rep_itemTag2|Rep_itemQty2|];
+{leonid1|Hello kid. You\'re Mikhail\'s son aren\'t you? With that brother of yours.\n\nI\'m Leonid, steward of Crossglen village.|||Brother|leonid_andor||||Crossglen|leonid_crossglen||||Bye|leonid_bye||||};
+{leonid_andor|Your brother? No, I haven\'t seen him here today. I think I saw him in here yesterday talking to Gruil. Maybe he knows more?|andor:10||Thanks|leonid_continue||||Bye|leonid_bye|||||||||};
+{leonid_continue|Anything else I can help you with?|||Brother|leonid_andor||||Crossglen|leonid_crossglen||||Bye|leonid_bye||||};
+{leonid_crossglen|As you know, this is Crossglen village. Mostly a farming community. |||Next|leonid_crossglen1||||||||||||||};
+{leonid_crossglen1|We have Audir with his smithy to the southwest, Leta and her husband\'s cabin to the west, this town hall here and your father\'s cabin to the northwest.|||Next|leonid_crossglen2||||||||||||||};
+{leonid_crossglen2|That\'s pretty much it. We try to live a peaceful life.|||Recent activity|leonid_crossglen3||||Back|leonid_continue|||||||||};
+{leonid_crossglen3|There were some recent disturbances some weeks ago that you may have noticed. Some villagers got into a fight over the new decree from Lord Geomyr.|||Next|leonid_crossglen4||||||||||||||};
+{leonid_crossglen4|Lord Geomyr issued a statement regarding the unlawful use of Bonemeal as healing substance. Some villagers argued that we should oppose Lord Geomyr\'s word and still use it ourselves.|bonemeal:10||Next|leonid_crossglen4_1||||||||||||||};
+{leonid_crossglen4_1|Tharal, our priest, was particularly upset and suggested we do something about Lord Geomyr.|||Next|leonid_crossglen5||||||||||||||};
+{leonid_crossglen5|Other villagers argued that we should follow Lord Geomyr\'s wish.\n\nPersonally, I haven\'t decided what my thoughts are.|||Next|leonid_crossglen6||||||||||||||};
+{leonid_crossglen6|On one hand, Lord Geomyr supports Crossglen with a lot of protection. *points to the soldiers in the hall*|||Next|leonid_crossglen7||||||||||||||};
+{leonid_crossglen7|But on the other hand, the tax and the recent changes of what\'s allowed and not are really hitting hard on Crossglen.|||Next|leonid_crossglen8||||||||||||||};
+{leonid_crossglen8|Someone should go to castle Geomyr and talk to the steward about our situation here in Crossglen.|crossglen:1||Next|leonid_crossglen9||||||||||||||};
+{leonid_crossglen9|In the meantime, we\'ve banned all use of Bonemeal as healing substance.|||Back|leonid_continue||||Bye|leonid_bye|||||||||};
+{leonid_bye|Shadow be with you.|||Exit|X||||||||||||||};
 	</string>
 	
 	<string name="conversationlist_crossglen_odair">
-[ID|Text|EnableKey|RwdExp|RwdGold|Rep_text0|Rep_id0|Rep_reqKey0|Rep_itemTag0|Rep_itemQty0|Rep_text1|Rep_id1|Rep_reqKey1|Rep_itemTag1|Rep_itemQty1|Rep_text2|Rep_id2|Rep_reqKey2|Rep_itemTag2|Rep_itemQty2|];
-{odair1|Oh, it\'s you. You with that brother of yours. Always causing trouble.||||Next|odair_select||||||||||||||};
-{odair_select||||||odair_complete2|qodair_complete||||odair_continue|qodair||||odair2||||};
-{odair2|Hm, maybe you could be of use to me. Could you help me with a small task do you think?||||Task|odair3||||Bye|X|||||||||};
-{odair3|I recently went in to that cave over there *points west*, to check on our supplies. But apparently, the cave has been infested with rats.||||Next|odair4||||||||||||||};
-{odair4|In particular, I saw one rat that was larger than the other rats. Do you think you have what it takes to help me with my task?||||Sure|odair5||||No thanks|odair_cowards|||||||||};
-{odair5|I need you to get into that cave and kill the large rat, that way maybe we can stop the rat infestation in the cave and start using it as our old supply cave again.|qodair|||Ok|X||||No thanks|odair_cowards|||||||||};
-{odair_cowards|I didn\'t think so either. You and that brother of yours always were cowards.||||Bye|X||||||||||||||};
-{odair_continue|Did you kill that large rat in the cave west of here?||||Yes|odair_complete||tail_caverat|1|What?|odair5||||Not yet|odair_cowards||||};
-{odair_complete|Thanks a lot for you help kid! Maybe you and that brother of yours aren\'t as cowardly as I thought. Here, take these coins for your help.|qodair_complete|30|20|Thanks|X||||||||||||||};
-{odair_complete2|Thanks a lot for your help earlier. Now we might start using that cave as our old supply cave again.||||Bye|X||||||||||||||};
+[ID|Text|EnblQst|DropList|Rep_text0|Rep_id0|Rep_reqQst0|Rep_itemTag0|Rep_itemQty0|Rep_text1|Rep_id1|Rep_reqQst1|Rep_itemTag1|Rep_itemQty1|Rep_text2|Rep_id2|Rep_reqQst2|Rep_itemTag2|Rep_itemQty2|];
+{odair1|Oh, it\'s you. You with that brother of yours. Always causing trouble.|||Next|odair_select||||||||||||||};
+{odair_select|||||odair_complete2|odair:100||||odair_continue|odair:10||||odair2||||};
+{odair2|Hm, maybe you could be of use to me. Could you help me with a small task do you think?|||Task|odair3||||Bye|X|||||||||};
+{odair3|I recently went in to that cave over there *points west*, to check on our supplies. But apparently, the cave has been infested with rats.|||Next|odair4||||||||||||||};
+{odair4|In particular, I saw one rat that was larger than the other rats. Do you think you have what it takes to help me with my task?|||Sure|odair5||||No thanks|odair_cowards|||||||||};
+{odair5|I need you to get into that cave and kill the large rat, that way maybe we can stop the rat infestation in the cave and start using it as our old supply cave again.|odair:10||Ok|X||||No thanks|odair_cowards|||||||||};
+{odair_cowards|I didn\'t think so either. You and that brother of yours always were cowards.|||Bye|X||||||||||||||};
+{odair_continue|Did you kill that large rat in the cave west of here?|||Yes|odair_complete||tail_caverat|1|What?|odair5||||Not yet|odair_cowards||||};
+{odair_complete|Thanks a lot for you help kid! Maybe you and that brother of yours aren\'t as cowardly as I thought. Here, take these coins for your help.|odair:100|gold20|Thanks|X||||||||||||||};
+{odair_complete2|Thanks a lot for your help earlier. Now we might start using that cave as our old supply cave again.|||Bye|X||||||||||||||};
 	</string>
 
 	<string name="conversationlist_jan">
-[ID|Text|EnableKey|RwdExp|RwdGold|Rep_text0|Rep_id0|Rep_reqKey0|Rep_itemTag0|Rep_itemQty0|Rep_text1|Rep_id1|Rep_reqKey1|Rep_itemTag1|Rep_itemQty1|Rep_text2|Rep_id2|Rep_reqKey2|Rep_itemTag2|Rep_itemQty2|];
-{jan_start_select||||||jan_complete2|qjan_complete||||jan_return|qjan||||jan_default||||};
-{jan_default|Hello kid. Please leave me to my mourning.||||Mourning|jan_default2||||Ok, bye|X|||||||||};
-{jan_default2|Oh, it\'s so sad. I really don\'t want to talk about it.||||Please do|jan_default3||||Ok, bye|X|||||||||};
-{jan_default3|Well, I guess it\'s ok to tell you. You seem to be a nice enough kid.||||Next|jan_default4||||||||||||||};
-{jan_default4|Me, my friend Gandir and his friend Irogotu were down here digging this hole. We had heard there was a hidden treasure down here.||||Next|jan_default5||||||||||||||};
-{jan_default5|We started digging and finally broke through to the cave system below. That\'s when we discovered them. The critters and bugs.||||Next|jan_default6||||||||||||||};
-{jan_default6|Oh those critters. Damn bastards. Nearly killed me they did.\n\nMe and Gandir told Irogotu that we should abort the digging and leave while we still could.||||Next|jan_default7||||||||||||||};
-{jan_default7|But Irogotu wanted to continue deeper into the dungeon. He and Gandir got into an argument and started fighting.||||Next|jan_default8||||||||||||||};
-{jan_default8|That\'s when it happened.\n\n*sob*\n\nOh what have we done?||||Next|jan_default9||||||||||||||};
-{jan_default9|Irogotu killed Gandir with his bare hands. You could see the fire in his eyes. He almost seemed to enjoy it.||||Next|jan_default10||||||||||||||};
-{jan_default10|I fled and haven\'t dared go back down there because of the critters and Irogotu himself.||||Next|jan_default11||||||||||||||};
-{jan_default11|Oh that damn Irogotu. If only I could get to him. I\'d show him one thing and another.||||Next|jan_default11_1|!qjan|||Next|jan_default13|qjan||||||||};
-{jan_default11_1|Do you think you could help me?||||I could help|jan_default12||||Bye|X|||||||||};
-{jan_default12|Really? You think you could help? Hm, maybe you could. Beware of those bugs though, they\'re really tough bastards.|qjan|||Next|jan_default13||||||||||||||};
-{jan_default13|If you really want to help, go find Irogotu down in the cave, and get me back Gandir\'s ring.||||Sure|jan_default14||||Background|jan_background||||Bye|X||||};
-{jan_default14|Return to me when you are done. Bring me Gandir\'s ring from Irogotu down in the cave.||||Ok, bye|X||||||||||||||};
-{jan_return|Hello again kid. Did you find Irogotu down in the cave?||||Not yet|jan_default14||||Background|jan_background||||Yes|jan_complete||ring_gandir|1|};
-{jan_background|Didn\'t you listen the first time I told you the story? Do I really have to tell you the story one more time?||||Yes|jan_default3||||No|jan_default14|||||||||};
-{jan_complete2|Thanks for dealing with Irogotu earlier! I am forever in debt to you.||||Bye|X||||||||||||||};
-{jan_complete|Wait, what? You actually went down there and returned alive? How did you manage that? Wow, I almost died going into that cave.\n\nOh thank you so much for bringing me back Gandir\'s ring! Now I can have something to remember him by.|qjan_complete|150||Bye|X||||||||||||||};
+[ID|Text|EnblQst|DropList|Rep_text0|Rep_id0|Rep_reqQst0|Rep_itemTag0|Rep_itemQty0|Rep_text1|Rep_id1|Rep_reqQst1|Rep_itemTag1|Rep_itemQty1|Rep_text2|Rep_id2|Rep_reqQst2|Rep_itemTag2|Rep_itemQty2|];
+{jan_start_select|||||jan_complete2|jan:100||||jan_return|jan:10||||jan_default||||};
+{jan_default|Hello kid. Please leave me to my mourning.|||Mourning|jan_default2||||Ok, bye|X|||||||||};
+{jan_default2|Oh, it\'s so sad. I really don\'t want to talk about it.|||Please do|jan_default3||||Ok, bye|X|||||||||};
+{jan_default3|Well, I guess it\'s ok to tell you. You seem to be a nice enough kid.|||Next|jan_default4||||||||||||||};
+{jan_default4|Me, my friend Gandir and his friend Irogotu were down here digging this hole. We had heard there was a hidden treasure down here.|||Next|jan_default5||||||||||||||};
+{jan_default5|We started digging and finally broke through to the cave system below. That\'s when we discovered them. The critters and bugs.|||Next|jan_default6||||||||||||||};
+{jan_default6|Oh those critters. Damn bastards. Nearly killed me they did.\n\nMe and Gandir told Irogotu that we should abort the digging and leave while we still could.|||Next|jan_default7||||||||||||||};
+{jan_default7|But Irogotu wanted to continue deeper into the dungeon. He and Gandir got into an argument and started fighting.|||Next|jan_default8||||||||||||||};
+{jan_default8|That\'s when it happened.\n\n*sob*\n\nOh what have we done?|||Next|jan_default9||||||||||||||};
+{jan_default9|Irogotu killed Gandir with his bare hands. You could see the fire in his eyes. He almost seemed to enjoy it.|||Next|jan_default10||||||||||||||};
+{jan_default10|I fled and haven\'t dared go back down there because of the critters and Irogotu himself.|||Next|jan_default11||||||||||||||};
+{jan_default11|Oh that damn Irogotu. If only I could get to him. I\'d show him one thing and another.|||Next|jan_default11_1||||||||||||||};
+{jan_default11_1|Do you think you could help me?|||I could help|jan_default12||||Bye|X|||||||||};
+{jan_default12|Really? You think you could help? Hm, maybe you could. Beware of those bugs though, they\'re really tough bastards.|jan:10||Next|jan_default13||||||||||||||};
+{jan_default13|If you really want to help, go find Irogotu down in the cave, and get me back Gandir\'s ring.|||Sure|jan_default14||||Background|jan_background||||Bye|X||||};
+{jan_default14|Return to me when you are done. Bring me Gandir\'s ring from Irogotu down in the cave.|||Ok, bye|X||||||||||||||};
+{jan_return|Hello again kid. Did you find Irogotu down in the cave?|||Not yet|jan_default14||||Background|jan_background||||Yes|jan_complete||ring_gandir|1|};
+{jan_background|Didn\'t you listen the first time I told you the story? Do I really have to tell you the story one more time?|||Yes|jan_default3||||No|jan_default14|||||||||};
+{jan_complete2|Thanks for dealing with Irogotu earlier! I am forever in debt to you.|||Bye|X||||||||||||||};
+{jan_complete|Wait, what? You actually went down there and returned alive? How did you manage that? Wow, I almost died going into that cave.\n\nOh thank you so much for bringing me back Gandir\'s ring! Now I can have something to remember him by.|jan:100||Bye|X||||||||||||||};
 
-{irogotu|Well hello there. Another adventurer. This is MY CAVE. The treasure will be MINE!||||Gandir|irogotu1|qjan|||Bye|X|||||||||};
-{irogotu1|That whelp Gandir? He was in my way. I merely used him as a tool to dig deeper into the cave.||||Next|irogotu2||||||||||||||};
-{irogotu2|Besides, I never really liked him anyway.||||Ring|irogotu3||||||||||||||};
-{irogotu3|NO! You cannot have it. It\'s mine! And what are you anyway kid, coming down here to disturb me?!||||Ring|irogotu4||||||||||||||};
-{irogotu4|No. If you want it you would have to take if from me by force, and I should tell you that my powers are great. Besides, you probably wouldn\'t dare fight me anyway.||||Fight!|F||||Leave|X|||||||||};
+{irogotu|Well hello there. Another adventurer. This is MY CAVE. The treasure will be MINE!|||Gandir|irogotu1|jan:10|||Bye|X|||||||||};
+{irogotu1|That whelp Gandir? He was in my way. I merely used him as a tool to dig deeper into the cave.|||Next|irogotu2||||||||||||||};
+{irogotu2|Besides, I never really liked him anyway.|||Ring|irogotu3||||||||||||||};
+{irogotu3|NO! You cannot have it. It\'s mine! And what are you anyway kid, coming down here to disturb me?!|||Ring|irogotu4||||||||||||||};
+{irogotu4|No. If you want it you would have to take if from me by force, and I should tell you that my powers are great. Besides, you probably wouldn\'t dare fight me anyway.|||Fight!|F||||Leave|X|||||||||};
 	</string>
 	
 	<string name="conversationlist_fallhaven">
-[ID|Text|EnableKey|RwdExp|RwdGold|Rep_text0|Rep_id0|Rep_reqKey0|Rep_itemTag0|Rep_itemQty0|Rep_text1|Rep_id1|Rep_reqKey1|Rep_itemTag1|Rep_itemQty1|Rep_text2|Rep_id2|Rep_reqKey2|Rep_itemTag2|Rep_itemQty2|];
+[ID|Text|EnblQst|DropList|Rep_text0|Rep_id0|Rep_reqQst0|Rep_itemTag0|Rep_itemQty0|Rep_text1|Rep_id1|Rep_reqQst1|Rep_itemTag1|Rep_itemQty1|Rep_text2|Rep_id2|Rep_reqQst2|Rep_itemTag2|Rep_itemQty2|];
+{fallhaven_citizen1|Hello there. Nice weather ain\'t it?|||Brother|fallhaven_andor_1||||Bye|X|||||||||};
+{fallhaven_citizen2|Hello. Anything you want from me?|||Brother|fallhaven_andor_2||||Bye|X|||||||||};
+{fallhaven_citizen3|Hi. Can I help you?|||Brother|fallhaven_andor_3||||Bye|X|||||||||};
+{fallhaven_citizen4|You\'re that kid from Crossglen village right?|||Brother|fallhaven_andor_4||||Bye|X|||||||||};
+{fallhaven_citizen5|Out of the way, peasant.|||Bye|X||||||||||||||};
+{fallhaven_citizen6|Good day to you.|||Brother|fallhaven_andor_6||||Bye|X|||||||||};
+{fallhaven_andor_1|No, sorry. I haven\'t seen anyone by that description.|||Bye|X||||||||||||||};
+{fallhaven_andor_2|Some other kid you say? Hm, let me think.|||Next|fallhaven_andor_1||||||||||||||};
+{fallhaven_andor_3|Hm, I might have seen someone matching that description a few days ago. Can\'t remember where though.|||Bye|X||||||||||||||};
+{fallhaven_andor_4|Oh yes, there was another kid from Crossglen village here a few days ago. Not sure he matched your description though.|||Next|fallhaven_andor_4_1||||Bye|X|||||||||};
+{fallhaven_andor_4_1|There were some shady looking people following him around. Didn\'t see any more than that.|||Bye|X||||||||||||||};
+{fallhaven_andor_6|Nope. Haven\'t seen him.|||Bye|X||||||||||||||};
+{fallhaven_guard|Keep out of trouble.|||Bye|X||||||||||||||};
+{fallhaven_priest|Shadow be with you.|||Shadow|priest_shadow_1||||Bye|X|||||||||};
 
-{fallhaven_citizen1|Hello there. Nice weather ain\'t it?||||Brother|fallhaven_andor_1||||Bye|X|||||||||};
-{fallhaven_citizen2|Hello. Anything you want from me?||||Brother|fallhaven_andor_2||||Bye|X|||||||||};
-{fallhaven_citizen3|Hi. Can I help you?||||Brother|fallhaven_andor_3||||Bye|X|||||||||};
-{fallhaven_citizen4|You\'re that kid from Crossglen village right?||||Brother|fallhaven_andor_4||||Bye|X|||||||||};
-{fallhaven_citizen5|Out of the way, peasant.||||Bye|X||||||||||||||};
-{fallhaven_citizen6|Good day to you.||||Brother|fallhaven_andor_6||||Bye|X|||||||||};
-{fallhaven_andor_1|No, sorry. I haven\'t seen anyone by that description.||||Bye|X||||||||||||||};
-{fallhaven_andor_2|Some other kid you say? Hm, let me think.||||Next|fallhaven_andor_1||||||||||||||};
-{fallhaven_andor_3|Hm, I might have seen someone matching that description a few days ago. Can\'t remember where though.||||Bye|X||||||||||||||};
-{fallhaven_andor_4|Oh yes, there was another kid from Crossglen village here a few days ago. Not sure he matched your description though.||||Next|fallhaven_andor_4_1||||Bye|X|||||||||};
-{fallhaven_andor_4_1|There were some shady looking people following him around. Didn\'t see any more than that.||||Bye|X||||||||||||||};
-{fallhaven_andor_6|Nope. Haven\'t seen him.||||Bye|X||||||||||||||};
+{priest_shadow_1|The Shadow protects us. Shadow keeps us safe and comforts us when we sleep.|||Next|priest_shadow_2||||||||||||||};
+{priest_shadow_2|It follows us wherever we go. Go with the Shadow my child.|||Bye|X||||||||||||||};
+{fallhaven_warden|State your business.|||Prisoner|warden_prisoner_1||||Bye|X|||||||||};
+{warden_prisoner_1|That thief? He was caught in the act. Trespassing he was. Trying to get down into the catacombs of Fallhaven church.|||Next|warden_prisoner_2||||||||||||||};
+{warden_prisoner_2|Luckily, we caught him before he could get down there. Now he\'ll serve as an example to all other thieves.|||Next|warden_prisoner_3||||||||||||||};
+{warden_prisoner_3|Damn thieves. There must be a nest of them around here somewhere. If only I could find where they hide.|||Bye|X||||||||||||||};
 
-{fallhaven_guard|Keep out of trouble.||||Bye|X||||||||||||||};
-{fallhaven_priest|Shadow be with you.||||Shadow|priest_shadow_1||||Bye|X|||||||||};
-{priest_shadow_1|The shadow protects us. It keeps us safe and comforts us when we sleep.||||Next|priest_shadow_2||||||||||||||};
-{priest_shadow_2|It follows us wherever we go. Go with the shadow my child.||||Bye|X||||||||||||||};
-{fallhaven_warden|State your business.||||Prisoner|warden_prisoner_1||||Bye|X|||||||||};
-{warden_prisoner_1|That thief? He was caught in the act. Trespassing he was. Trying to get down into the catacombs of Fallhaven church.||||Next|warden_prisoner_2||||||||||||||};
-{warden_prisoner_2|Luckily, we caught him before he could get down there. Now he\'ll serve as an example to all other thieves.||||Next|warden_prisoner_3||||||||||||||};
-{warden_prisoner_3|Damn thieves. There must be a nest of them around here somewhere. If only I could find where they hide.||||Bye|X||||||||||||||};
+{rigmor|Well hello there! Aren\'t you a cute little fellow.|||Brother|rigmor_1||||Bye|rigmor_leave_select|||||||||};
+{rigmor_1|Your brother you say? His name is Andor? No. I can\'t recall meeting anyone like that.|||Bye|rigmor_leave_select||||||||||||||};
+{rigmor_leave_select|||||rigmor_thanks|calomyran:100||||X|||||||||};
+{rigmor_thanks|I heard you helped my old man find his book, thank you. He had been talking about that book for weeks. Poor thing, he tends to forget things.|||Bye|X||||||||||||||};
 
-{rigmor|Well hello there! Aren\'t you a cute little fellow.||||Brother|rigmor_1||||Bye|rigmor_leave_select|||||||||};
-{rigmor_1|Your brother you say? His name is Andor? No. I can\'t recall meeting anyone like that.||||Bye|rigmor_leave_select||||||||||||||};
-{rigmor_leave_select||||||rigmor_thanks|qfallhaven_oldman_complete||||X|||||||||};
-{rigmor_thanks|I heard you helped my old man find his book, thank you. He had been talking about that book for weeks. Poor thing, he tends to forget things.||||Bye|X||||||||||||||};
-{fallhaven_clothes|Welcome to my shop. Please browse my selection of fine clothing and jewelry.||||Trade|S||||Bye|X|||||||||};
-{fallhaven_potions|Welcome to my shop. Please browse my fine selection of everyday potions.||||Trade|S||||Bye|X|||||||||};
+{fallhaven_clothes|Welcome to my shop. Please browse my selection of fine clothing and jewelry.|||Trade|S||||Bye|X|||||||||};
+{fallhaven_potions|Welcome to my shop. Please browse my fine selection of everyday potions.|||Trade|S||||Bye|X|||||||||};
 	</string>
 
 	<string name="conversationlist_fallhaven_bucus">
-[ID|Text|EnableKey|RwdExp|RwdGold|Rep_text0|Rep_id0|Rep_reqKey0|Rep_itemTag0|Rep_itemQty0|Rep_text1|Rep_id1|Rep_reqKey1|Rep_itemTag1|Rep_itemQty1|Rep_text2|Rep_id2|Rep_reqKey2|Rep_itemTag2|Rep_itemQty2|];
-{bucus_welcome|Hi again, welcome to the .. Oh wait, I thought you were someone else.||||Brother|bucus_andor_select||||Thieves Guild|bucus_thieves_select|!qbucus_complete|||Bye|X||||};
-{bucus_andor_select||||||bucus_umar_1|qbucus_complete||||bucus_andor_no_1|||||||||};
-{bucus_andor_no_1|How interesting that you should ask. What if I had seen him? Why would I tell you?||||Next|bucus_andor_no_2||||||||||||||};
-{bucus_andor_no_2|No, I can\'t tell you. Now please leave.||||Bye|X||||||||||||||};
-{bucus_thieves_select||||||bucus_thieves_continue|qbucus||||bucus_thieves_1|qbucus_thieves||||bucus_thieves_no||||};
-{bucus_thieves_no|Wh, what? No, I don\'t know anything about that.||||Bye|X||||||||||||||};
-{bucus_umar_1|Ok kid. You\'ve proven yourself to me. Yes, I saw some other kid by that description running around here a few days ago.||||Next|bucus_umar_2||||||||||||||};
-{bucus_umar_2|I don\'t know what he was up to though. Kept asking lots of questions. Kind of like you do. *snicker*||||Next|bucus_umar_3||||||||||||||};
-{bucus_umar_3|Anyway, that\'s all I know. You should go talk to Umar, he probably knows more. Down that hatch over there.|qfallhaven_derelict|||Ok, bye|X||||||||||||||};
-{bucus_thieves_1|Who told you that? Argh.\n\nOk so you found us. Now what?||||Join|bucus_thieves_2||||Bye|X|||||||||};
-{bucus_thieves_2|Hah! Join the thieves guild?! You?!\n\nYou\'re one funny kid.||||I\'m serious|bucus_thieves_3||||Bye|X|||||||||};
-{bucus_thieves_3|Ok, tell you what kid. Do a task for me and maybe I\'ll consider giving you more info.||||Task|bucus_thieves_4||||Bye|X|||||||||};
-{bucus_thieves_4|Bring me the key of Luthor and we can talk more. I don\'t know anything about the key itself, but rumor has it that it is located somewhere in the catacombs beneath Fallhaven Church.|qbucus|||Ok|X||||||||||||||};
-{bucus_thieves_continue|How is the search for the key of Luthor going?||||Background|bucus_thieves_4||||I have it|bucus_thieves_complete_1||key_luthor|1|Bye|X||||};
-{bucus_thieves_complete_1|Wow, you actually got the key of Luthor? I didn\'t think you would make it out of there.|qbucus_complete|215||Next|bucus_thieves_complete_2||||||||||||||};
-{bucus_thieves_complete_2|Well done kid.||||Next|bucus_thieves_complete_3||||||||||||||};
-{bucus_thieves_complete_3|So, let\'s talk. What do you want to know?||||Brother|bucus_umar_1||||Bye|X|||||||||};
+[ID|Text|EnblQst|DropList|Rep_text0|Rep_id0|Rep_reqQst0|Rep_itemTag0|Rep_itemQty0|Rep_text1|Rep_id1|Rep_reqQst1|Rep_itemTag1|Rep_itemQty1|Rep_text2|Rep_id2|Rep_reqQst2|Rep_itemTag2|Rep_itemQty2|];
+{bucus_welcome|Hi again, welcome to the .. Oh wait, I thought you were someone else.|||Brother|bucus_andor_select||||Thieves Guild|bucus_thieves_select||||Bye|X||||};
+{bucus_andor_select|||||bucus_umar_1|bucus:100||||bucus_andor_no_1|||||||||};
+{bucus_andor_no_1|How interesting that you should ask. What if I had seen him? Why would I tell you?|||Next|bucus_andor_no_2||||||||||||||};
+{bucus_andor_no_2|No, I can\'t tell you. Now please leave.|||Bye|X||||||||||||||};
+{bucus_thieves_select|||||bucus_thieves_complete_3|bucus:100||||bucus_thieves_continue|bucus:10||||bucus_thieves_select2||||};
+{bucus_thieves_select2|||||bucus_thieves_1|andor:40||||bucus_thieves_no|||||||||};
+{bucus_thieves_no|Wh, what? No, I don\'t know anything about that.|||Bye|X||||||||||||||};
+{bucus_umar_1|Ok kid. You\'ve proven yourself to me. Yes, I saw some other kid by that description running around here a few days ago.|||Next|bucus_umar_2||||||||||||||};
+{bucus_umar_2|I don\'t know what he was up to though. Kept asking lots of questions. Kind of like you do. *snicker*|||Next|bucus_umar_3||||||||||||||};
+{bucus_umar_3|Anyway, that\'s all I know. You should go talk to Umar, he probably knows more. Down that hatch over there.|andor:50||Ok, bye|X||||||||||||||};
+{bucus_thieves_1|Who told you that? Argh.\n\nOk so you found us. Now what?|||Join|bucus_thieves_2||||Bye|X|||||||||};
+{bucus_thieves_2|Hah! Join the thieves guild?! You?!\n\nYou\'re one funny kid.|||I\'m serious|bucus_thieves_3||||Bye|X|||||||||};
+{bucus_thieves_3|Ok, tell you what kid. Do a task for me and maybe I\'ll consider giving you more info.|||Task|bucus_thieves_4||||Bye|X|||||||||};
+{bucus_thieves_4|Bring me the key of Luthor and we can talk more. I don\'t know anything about the key itself, but rumor has it that it is located somewhere in the catacombs beneath Fallhaven Church.|bucus:10||Ok|X||||||||||||||};
+{bucus_thieves_continue|How is the search for the key of Luthor going?|||Background|bucus_thieves_4||||I have it|bucus_thieves_complete_1||key_luthor|1|Bye|X||||};
+{bucus_thieves_complete_1|Wow, you actually got the key of Luthor? I didn\'t think you would make it out of there.|bucus:100||Next|bucus_thieves_complete_2||||||||||||||};
+{bucus_thieves_complete_2|Well done kid.|||Next|bucus_thieves_complete_3||||||||||||||};
+{bucus_thieves_complete_3|So, let\'s talk. What do you want to know?|||Brother|bucus_umar_1||||Bye|X|||||||||};
 	</string>
 
 	<string name="conversationlist_fallhaven_drunk">
-[ID|Text|EnableKey|RwdExp|RwdGold|Rep_text0|Rep_id0|Rep_reqKey0|Rep_itemTag0|Rep_itemQty0|Rep_text1|Rep_id1|Rep_reqKey1|Rep_itemTag1|Rep_itemQty1|Rep_text2|Rep_id2|Rep_reqKey2|Rep_itemTag2|Rep_itemQty2|];
-{fallhaven_drunk|No problem. No sireee! Not causing any more trouble now. I sits here outside now.||||Next|fallhaven_drunk_2||||Bye|X|||||||||};
-{fallhaven_drunk_2|Wait, who are you again? Are you that guard?||||Yes|fallhaven_drunk_3_1||||No|fallhaven_drunk_3_2|||||||||};
-{fallhaven_drunk_3_1|Oh, sir. I\'m not causing any trouble anymore, see? Sits outside now as you says, ok?||||Next|fallhaven_drunk_4||||||||||||||};
-{fallhaven_drunk_3_2|Oh good. That guard threw me out of the tavern. If I see him again I\'ll show him one thing or another.||||Next|fallhaven_drunk_4||||||||||||||};
-{fallhaven_drunk_4|Drink drink drink, drink some more. Drink, drink .. Uh how did it go again?||||Next|fallhaven_drunk_5||||||||||||||};
-{fallhaven_drunk_5|Were you saying something? Where was I? Yes, so we were in this dungeon.||||Next|fallhaven_drunk_6||||||||||||||};
-{fallhaven_drunk_6|Or was it a house? I can\'t remember.||||Next|fallhaven_drunk_7||||||||||||||};
-{fallhaven_drunk_7|No no, it was outside! Now I remember.||||Next|fallhaven_drunk_8|!qfallhaven_drunk|||Next|fallhaven_drunk_11|qfallhaven_drunk||||||||};
-{fallhaven_drunk_8|That\'s where we..\n\nHey, where did my mead go? Did you take it from me? ||||Yes|fallhaven_drunk_9_1||||No|fallhaven_drunk_9_2|||||||||};
-{fallhaven_drunk_9_1|Well then give it back! Or go buy me another mead.||||Here, have it|fallhaven_drunk_10||mead|1|Bye|X|||||||||};
-{fallhaven_drunk_9_2|I must have drunk it then. Could you get me a new mead do you think? ||||Here, have it|fallhaven_drunk_10||mead|1|Bye|X|||||||||};
-{fallhaven_drunk_10|Oh sweet drinks of joy. May the sssshadow be with you kid. *makes big eyes*|qfallhaven_drunk|||Next|fallhaven_drunk_11||||||||||||||};
-{fallhaven_drunk_11|*takes a gulp of the mead*\n\nThat\'s good stuff!||||Next|fallhaven_drunk_12||||||||||||||};
-{fallhaven_drunk_12|Yeah, me and Unnmir had good times. Go ask him yourself, he is usually in the barn to the east of here. I wonder where that treasure went.|qfallhaven_drunk_complete|||Bye|X||||||||||||||};
+[ID|Text|EnblQst|DropList|Rep_text0|Rep_id0|Rep_reqQst0|Rep_itemTag0|Rep_itemQty0|Rep_text1|Rep_id1|Rep_reqQst1|Rep_itemTag1|Rep_itemQty1|Rep_text2|Rep_id2|Rep_reqQst2|Rep_itemTag2|Rep_itemQty2|];
+{fallhaven_drunk|No problem. No sireee! Not causing any more trouble now. I sits here outside now.|||Next|fallhaven_drunk_2||||Bye|X|||||||||};
+{fallhaven_drunk_2|Wait, who are you again? Are you that guard?|||Yes|fallhaven_drunk_3_1||||No|fallhaven_drunk_3_2|||||||||};
+{fallhaven_drunk_3_1|Oh, sir. I\'m not causing any trouble anymore, see? Sits outside now as you says, ok?|||Next|fallhaven_drunk_4||||||||||||||};
+{fallhaven_drunk_3_2|Oh good. That guard threw me out of the tavern. If I see him again I\'ll show him one thing or another.|||Next|fallhaven_drunk_4||||||||||||||};
+{fallhaven_drunk_4|Drink drink drink, drink some more. Drink, drink .. Uh how did it go again?|||Next|fallhaven_drunk_5||||||||||||||};
+{fallhaven_drunk_5|Were you saying something? Where was I? Yes, so we were in this dungeon.|||Next|fallhaven_drunk_6||||||||||||||};
+{fallhaven_drunk_6|Or was it a house? I can\'t remember.|||Next|fallhaven_drunk_7||||||||||||||};
+{fallhaven_drunk_7|No no, it was outside! Now I remember.|||Next|fallhaven_drunk_7_select||||||||||||||};
+{fallhaven_drunk_7_select|||||fallhaven_drunk_11|fallhavendrunk:100||||fallhaven_drunk_8|||||||||};
+{fallhaven_drunk_8|That\'s where we..\n\nHey, where did my mead go? Did you take it from me? |||Yes|fallhaven_drunk_9_1||||No|fallhaven_drunk_9_2|||||||||};
+{fallhaven_drunk_9_1|Well then give it back! Or go buy me another mead.|fallhavendrunk:10||Here, have it|fallhaven_drunk_10||mead|1|Bye|X|||||||||};
+{fallhaven_drunk_9_2|I must have drunk it then. Could you get me a new mead do you think? |fallhavendrunk:10||Here, have it|fallhaven_drunk_10||mead|1|Bye|X|||||||||};
+{fallhaven_drunk_10|Oh sweet drinks of joy. May the sssshadow be with you kid. *makes big eyes*|||Next|fallhaven_drunk_11||||||||||||||};
+{fallhaven_drunk_11|*takes a gulp of the mead*\n\nThat\'s good stuff!|||Next|fallhaven_drunk_12||||||||||||||};
+{fallhaven_drunk_12|Yeah, me and Unnmir had good times. Go ask him yourself, he is usually in the barn to the east of here. I wonder where that treasure went.|fallhavendrunk:100||Bye|X||||||||||||||};
 	</string>
 
 	<string name="conversationlist_fallhaven_oldman">
-[ID|Text|EnableKey|RwdExp|RwdGold|Rep_text0|Rep_id0|Rep_reqKey0|Rep_itemTag0|Rep_itemQty0|Rep_text1|Rep_id1|Rep_reqKey1|Rep_itemTag1|Rep_itemQty1|Rep_text2|Rep_id2|Rep_reqKey2|Rep_itemTag2|Rep_itemQty2|];
-{fallhaven_oldman||||||fallhaven_oldman_complete_2|qfallhaven_oldman_complete||||fallhaven_oldman_continue|qfallhaven_oldman||||fallhaven_oldman_1||||};
-{fallhaven_oldman_1|Would you help an old man please?||||Sure|fallhaven_oldman_2||||Bye|X|||||||||};
-{fallhaven_oldman_2|I recently lost a very valuable book ok mine.||||Next|fallhaven_oldman_3||||||||||||||};
-{fallhaven_oldman_3|I know I had it with me yesterday. Now I can\'t seem to find it.||||Next|fallhaven_oldman_4||||||||||||||};
-{fallhaven_oldman_4|I never lose things! Someone must have stolen it, that\'s my guess.||||Next|fallhaven_oldman_5||||||||||||||};
-{fallhaven_oldman_5|Would you please go look for my book? It\'s called \'Calomyran secrets\'.|qfallhaven_oldman|||Next|fallhaven_oldman_6||||||||||||||};
-{fallhaven_oldman_6|I have no idea where it might be. You could go ask Arcir, he seems very fond of his books. *points at the house to the south*||||Bye|X||||||||||||||};
-{fallhaven_oldman_continue|How is the search for my book going? It\'s called \'Calomyran secrets\'. Have you found my book?||||Yes|fallhaven_oldman_complete||calomyran_secrets|1|No|fallhaven_oldman_6||||Background|fallhaven_oldman_2||||};
-{fallhaven_oldman_complete|My book! Thank you, thank you! Where was it? No, don\'t tell me. Here, have these coins as help for your trouble.|qfallhaven_oldman_complete|60|51|Bye|X||||||||||||||};
-{fallhaven_oldman_complete_2|Thank you so much for finding my book!||||Bye|X||||||||||||||};
+[ID|Text|EnblQst|DropList|Rep_text0|Rep_id0|Rep_reqQst0|Rep_itemTag0|Rep_itemQty0|Rep_text1|Rep_id1|Rep_reqQst1|Rep_itemTag1|Rep_itemQty1|Rep_text2|Rep_id2|Rep_reqQst2|Rep_itemTag2|Rep_itemQty2|];
+{fallhaven_oldman|||||fallhaven_oldman_complete_2|calomyran:100||||fallhaven_oldman_continue|calomyran:10||||fallhaven_oldman_1||||};
+{fallhaven_oldman_1|Would you help an old man please?|||Sure|fallhaven_oldman_2||||Bye|X|||||||||};
+{fallhaven_oldman_2|I recently lost a very valuable book ok mine.|||Next|fallhaven_oldman_3||||||||||||||};
+{fallhaven_oldman_3|I know I had it with me yesterday. Now I can\'t seem to find it.|||Next|fallhaven_oldman_4||||||||||||||};
+{fallhaven_oldman_4|I never lose things! Someone must have stolen it, that\'s my guess.|||Next|fallhaven_oldman_5||||||||||||||};
+{fallhaven_oldman_5|Would you please go look for my book? It\'s called \'Calomyran secrets\'.|||Next|fallhaven_oldman_6||||||||||||||};
+{fallhaven_oldman_6|I have no idea where it might be. You could go ask Arcir, he seems very fond of his books. *points at the house to the south*|calomyran:10||Bye|X||||||||||||||};
+{fallhaven_oldman_continue|How is the search for my book going? It\'s called \'Calomyran secrets\'. Have you found my book?|||Yes|fallhaven_oldman_complete||calomyran_secrets|1|No|fallhaven_oldman_6||||Background|fallhaven_oldman_2||||};
+{fallhaven_oldman_complete|My book! Thank you, thank you! Where was it? No, don\'t tell me. Here, have these coins as help for your trouble.|calomyran:100|gold51|Bye|X||||||||||||||};
+{fallhaven_oldman_complete_2|Thank you so much for finding my book!|||Bye|X||||||||||||||};
 	</string>
 
 	<string name="conversationlist_fallhaven_nocmar">
-[ID|Text|EnableKey|RwdExp|RwdGold|Rep_text0|Rep_id0|Rep_reqKey0|Rep_itemTag0|Rep_itemQty0|Rep_text1|Rep_id1|Rep_reqKey1|Rep_itemTag1|Rep_itemQty1|Rep_text2|Rep_id2|Rep_reqKey2|Rep_itemTag2|Rep_itemQty2|];
-{nocmar|Hello. I\'m Nocmar.||||Trade|nocmar_trade_select||||Unnmir|nocmar_quest_select|qnocmar_unnmir|||Bye|X||||};
-{nocmar_quest_select||||||nocmar_complete_5|qnocmar_complete||||nocmar_continue|qnocmar||||nocmar_quest||||};
-{nocmar_trade_select||||||S|qnocmar_complete||||nocmar_trade_1|||||||||};
-{nocmar_trade_1|I don\'t have any items for sale. I used to have a lot of things for sale, but nowadays I\'m not allowed to sell anything.||||Next|nocmar_trade_2||||||||||||||};
-{nocmar_trade_2|I was once one of the greatest smiths in Fallhaven. Then that bastard Lord Geomyr banned my use of heartsteel.||||Next|nocmar_trade_3||||||||||||||};
-{nocmar_trade_3|By decree of Lord Geomyr, noone in Fallhaven is allowed to even use heartsteel weapons. Much less sell any.||||Next|nocmar_trade_4||||||||||||||};
-{nocmar_trade_4|So now I have to hide the few weapons I have left. And I won\'t dare sell any of them anymore.||||Next|nocmar_trade_4_1||||||||||||||};
-{nocmar_trade_4_1|I haven\'t seen the heartsteel glow in several years now that Lord Geomyr has banned them.||||Next|nocmar_trade_5||||||||||||||};
-{nocmar_trade_5|So, unfortunately I can\'t sell you any of my weapons.||||Bye|X||||||||||||||};
-{nocmar_quest|Unnmir sent you huh? I guess it must be important then.|qnocmar|||Next|nocmar_quest_1||||||||||||||};
-{nocmar_quest_1|Ok, these old weapons have lost their inner glow now that they haven\'t been used in a while.||||Next|nocmar_quest_2||||||||||||||};
-{nocmar_quest_2|To make the heartsteel glow again, we will need a heartstone. ||||Next|nocmar_quest_3||||||||||||||};
-{nocmar_quest_3|Years ago, we used to fight the liches of Undertell. I have no idea if they still haunt that place.||||Undertell|nocmar_quest_4||||||||||||||};
-{nocmar_quest_4|Undertell; the pits of the lost souls. Travel south and enter the caverns of the Dwarves. Follow the horrid smell from there.||||Next|nocmar_quest_5||||||||||||||};
-{nocmar_continue|Have you found a heartstone yet?||||Yes|nocmar_complete||heartstone|1|Background|nocmar_quest_1||||Not yet|nocmar_continue_2||||};
-{nocmar_continue_2|Please keep looking. Unnmir must have something important planned for you.||||Bye|X||||||||||||||};
-{nocmar_quest_5|Beware the liches of Undertell, if they still are around. Those things can kill you by their gaze alone.||||Bye|X||||||||||||||};
-{nocmar_complete|By the shadow. You actually found a heartstone. I thought I wouldn\'t live to see the day.|qnocmar_complete|120||Next|nocmar_complete_2||||||||||||||};
-{nocmar_complete_2|Can you see the glow? It\'s literally pulsating.||||Next|nocmar_complete_3||||||||||||||};
-{nocmar_complete_3|Quick. Let\'s get these old heartsteel weapons glow again.||||Next|nocmar_complete_4||||||||||||||};
-{nocmar_complete_4|*Nocmar places the heartstone among the heartsteel weapons*||||Next|nocmar_complete_5||||||||||||||};
-{nocmar_complete_5|Can you feel it? The heartsteel is glowing again.||||Trade|S||||Bye|X|||||||||};
+[ID|Text|EnblQst|DropList|Rep_text0|Rep_id0|Rep_reqQst0|Rep_itemTag0|Rep_itemQty0|Rep_text1|Rep_id1|Rep_reqQst1|Rep_itemTag1|Rep_itemQty1|Rep_text2|Rep_id2|Rep_reqQst2|Rep_itemTag2|Rep_itemQty2|];
+{nocmar|Hello. I\'m Nocmar.|||Trade|nocmar_trade_select||||Unnmir|nocmar_quest_select|nocmar:10|||Bye|X||||};
+{nocmar_quest_select|||||nocmar_complete_5|nocmar:200||||nocmar_continue|nocmar:20||||nocmar_quest||||};
+{nocmar_trade_select|||||S|nocmar:200||||nocmar_trade_1|||||||||};
+{nocmar_trade_1|I don\'t have any items for sale. I used to have a lot of things for sale, but nowadays I\'m not allowed to sell anything.|||Next|nocmar_trade_2||||||||||||||};
+{nocmar_trade_2|I was once one of the greatest smiths in Fallhaven. Then that bastard Lord Geomyr banned my use of heartsteel.|||Next|nocmar_trade_3||||||||||||||};
+{nocmar_trade_3|By decree of Lord Geomyr, noone in Fallhaven is allowed to even use heartsteel weapons. Much less sell any.|||Next|nocmar_trade_4||||||||||||||};
+{nocmar_trade_4|So now I have to hide the few weapons I have left. And I won\'t dare sell any of them anymore.|||Next|nocmar_trade_4_1||||||||||||||};
+{nocmar_trade_4_1|I haven\'t seen the heartsteel glow in several years now that Lord Geomyr has banned them.|||Next|nocmar_trade_5||||||||||||||};
+{nocmar_trade_5|So, unfortunately I can\'t sell you any of my weapons.|||Bye|X||||||||||||||};
+{nocmar_quest|Unnmir sent you huh? I guess it must be important then.|nocmar:20||Next|nocmar_quest_1||||||||||||||};
+{nocmar_quest_1|Ok, these old weapons have lost their inner glow now that they haven\'t been used in a while.|||Next|nocmar_quest_2||||||||||||||};
+{nocmar_quest_2|To make the heartsteel glow again, we will need a heartstone. |||Next|nocmar_quest_3||||||||||||||};
+{nocmar_quest_3|Years ago, we used to fight the liches of Undertell. I have no idea if they still haunt that place.|||Undertell|nocmar_quest_4||||||||||||||};
+{nocmar_quest_4|Undertell; the pits of the lost souls. Travel south and enter the caverns of the Dwarves. Follow the horrid smell from there.|||Next|nocmar_quest_5||||||||||||||};
+{nocmar_continue|Have you found a heartstone yet?|||Yes|nocmar_complete||heartstone|1|Background|nocmar_quest_1||||Not yet|nocmar_continue_2||||};
+{nocmar_continue_2|Please keep looking. Unnmir must have something important planned for you.|||Bye|X||||||||||||||};
+{nocmar_quest_5|Beware the liches of Undertell, if they still are around. Those things can kill you by their gaze alone.|||Bye|X||||||||||||||};
+{nocmar_complete|By the Shadow. You actually found a heartstone. I thought I wouldn\'t live to see the day.|nocmar:200||Next|nocmar_complete_2||||||||||||||};
+{nocmar_complete_2|Can you see the glow? It\'s literally pulsating.|||Next|nocmar_complete_3||||||||||||||};
+{nocmar_complete_3|Quick. Let\'s get these old heartsteel weapons glow again.|||Next|nocmar_complete_4||||||||||||||};
+{nocmar_complete_4|*Nocmar places the heartstone among the heartsteel weapons*|||Next|nocmar_complete_5||||||||||||||};
+{nocmar_complete_5|Can you feel it? The heartsteel is glowing again.|||Trade|S||||Bye|X|||||||||};
 	</string>
 
 	<string name="conversationlist_fallhaven_tavern">
-[ID|Text|EnableKey|RwdExp|RwdGold|Rep_text0|Rep_id0|Rep_reqKey0|Rep_itemTag0|Rep_itemQty0|Rep_text1|Rep_id1|Rep_reqKey1|Rep_itemTag1|Rep_itemQty1|Rep_text2|Rep_id2|Rep_reqKey2|Rep_itemTag2|Rep_itemQty2|];
-{bela|Welcome to Fallhaven Tavern. Have a seat anywhere.||||Trade|S||||Room|bela_room_select||||Bye|X||||};
-{bela_room_1|A room for the night will cost you 10 gold.||||Buy [10 gold]|bela_room_2||||Back|bela|||||||||};
-{bela_room_2|Thanks. Take the last room down at the end of the hall.|qfallhaven_tavern_room2||-10|Back|bela||||Bye|X|||||||||};
-{bela_room_3|I hope the room suits your needs. It\'s the last room down at the end of the hall.||||Back|bela||||Bye|X|||||||||};
-{bela_room_select||||||bela_room_3|qfallhaven_tavern_room2||||bela_room_1|||||||||};
-{ganos|You seem familiar somehow.||||Trade|S||||Thieves guild|ganos_1|qgruil_andor_complete|||Bye|X||||};
-{ganos_1|Thieves guild? How would I know? Do I look like a thief to you?! Hrmpf.||||Leave|X||||||||||||||};
+[ID|Text|EnblQst|DropList|Rep_text0|Rep_id0|Rep_reqQst0|Rep_itemTag0|Rep_itemQty0|Rep_text1|Rep_id1|Rep_reqQst1|Rep_itemTag1|Rep_itemQty1|Rep_text2|Rep_id2|Rep_reqQst2|Rep_itemTag2|Rep_itemQty2|];
+{bela|Welcome to Fallhaven Tavern. Have a seat anywhere.|||Trade|S||||Room|bela_room_select||||Bye|X||||};
+{bela_room_1|A room for the night will cost you 10 gold.|||Buy [10 gold]|bela_room_2||||Back|bela|||||||||};
+{bela_room_2|Thanks. Take the last room down at the end of the hall.|fallhaventavern:10|gold-10|Back|bela||||Bye|X|||||||||};
+{bela_room_3|I hope the room suits your needs. It\'s the last room down at the end of the hall.|||Back|bela||||Bye|X|||||||||};
+{bela_room_select|||||bela_room_3|fallhaventavern:10||||bela_room_1|||||||||};
+{ganos|You seem familiar somehow.|||Trade|S||||Thieves guild|ganos_1|andor:30|||Bye|X||||};
+{ganos_1|Thieves guild? How would I know? Do I look like a thief to you?! Hrmpf.|||Leave|X||||||||||||||};
 	</string>
 
 	<string name="conversationlist_fallhaven_arcir">
-[ID|Text|EnableKey|RwdExp|RwdGold|Rep_text0|Rep_id0|Rep_reqKey0|Rep_itemTag0|Rep_itemQty0|Rep_text1|Rep_id1|Rep_reqKey1|Rep_itemTag1|Rep_itemQty1|Rep_text2|Rep_id2|Rep_reqKey2|Rep_itemTag2|Rep_itemQty2|];
-{arcir_start|Hello. I\'m Arcir.||||Elythara|arcir_elythara_1|qarcir|||Books|arcir_books_1||||Bye|X||||};
-{arcir_anythingelse|Anything else you wanted to ask?||||Elythara|arcir_elythara_1|qarcir|||Books|arcir_books_1||||Bye|X||||};
-{arcir_elythara_1|You found my statue in the basement I guess?\n\nYes, Elythara is my protector.||||Back|arcir_anythingelse||||||||||||||};
-{arcir_books_1|I find great pleasure in my books. They contain past generations\' accumulated knowledge.||||Calomyran secrets|arcir_calomyran_select|qfallhaven_oldman|||Back|arcir_anythingelse|||||||||};
-{arcir_calomyran_1|\'Calomyran Secrets\'? Hm, yes I think I have one of those in my basement.||||Next|arcir_calomyran_2||||||||||||||};
-{arcir_calomyran_2|Old man Benradas came by last week, wanting to sell me that book. Since it\'s not really my kind of book, I declined.||||Next|arcir_calomyran_3||||||||||||||};
-{arcir_calomyran_3|He seemed upset that I didn\'t like his book, and threw it at me while storming out of the house.||||Next|arcir_calomyran_4||||||||||||||};
-{arcir_calomyran_4|Poor old man Benradas, he probably forgot that he left it here. He tends to forget things.||||Back|arcir_anythingelse||||||||||||||};
-{arcir_calomyran_5|You looked downstairs but didn\'t find it? And a note you say? I guess there must have been someone in my house.||||Next|arcir_calomyran_6||||||||||||||};
-{arcir_calomyran_select||||||arcir_calomyran_complete|qfallhaven_oldman_complete||||arcir_calomyran_5|qcalomyran_tornpage||||arcir_calomyran_1||||};
-{arcir_calomyran_complete|I heard you found it and gave it back to old man Benradas. Thank you. He tends to forget things.||||Back|arcir_anythingelse||||Bye|X|||||||||};
-{arcir_calomyran_6|What did the note say?\n\nLarcal.. I know of him. Always causing trouble. He is usually in the barn to the east of here.||||Thanks, bye|X||||||||||||||};
+[ID|Text|EnblQst|DropList|Rep_text0|Rep_id0|Rep_reqQst0|Rep_itemTag0|Rep_itemQty0|Rep_text1|Rep_id1|Rep_reqQst1|Rep_itemTag1|Rep_itemQty1|Rep_text2|Rep_id2|Rep_reqQst2|Rep_itemTag2|Rep_itemQty2|];
+{arcir_start|Hello. I\'m Arcir.|||Elythara|arcir_elythara_1|arcir:10|||Books|arcir_books_1||||Bye|X||||};
+{arcir_anythingelse|Anything else you wanted to ask?|||Elythara|arcir_elythara_1|arcir:10|||Books|arcir_books_1||||Bye|X||||};
+{arcir_elythara_1|You found my statue in the basement I guess?\n\nYes, Elythara is my protector.|||Back|arcir_anythingelse||||||||||||||};
+{arcir_books_1|I find great pleasure in my books. They contain past generations\' accumulated knowledge.|||Calomyran secrets|arcir_calomyran_select|calomyran:10|||Back|arcir_anythingelse|||||||||};
+{arcir_calomyran_1|\'Calomyran Secrets\'? Hm, yes I think I have one of those in my basement.|||Next|arcir_calomyran_2||||||||||||||};
+{arcir_calomyran_2|Old man Benradas came by last week, wanting to sell me that book. Since it\'s not really my kind of book, I declined.|||Next|arcir_calomyran_3||||||||||||||};
+{arcir_calomyran_3|He seemed upset that I didn\'t like his book, and threw it at me while storming out of the house.|||Next|arcir_calomyran_4||||||||||||||};
+{arcir_calomyran_4|Poor old man Benradas, he probably forgot that he left it here. He tends to forget things.|||Back|arcir_anythingelse||||||||||||||};
+{arcir_calomyran_5|You looked downstairs but didn\'t find it? And a note you say? I guess there must have been someone in my house.|||Next|arcir_calomyran_6||||||||||||||};
+{arcir_calomyran_select|||||arcir_calomyran_complete|calomyran:100||||arcir_calomyran_5|calomyran:20||||arcir_calomyran_1||||};
+{arcir_calomyran_complete|I heard you found it and gave it back to old man Benradas. Thank you. He tends to forget things.|||Back|arcir_anythingelse||||Bye|X|||||||||};
+{arcir_calomyran_6|What did the note say?\n\nLarcal.. I know of him. Always causing trouble. He is usually in the barn to the east of here.|||Thanks, bye|X||||||||||||||};
 	</string>
 
 	<string name="conversationlist_fallhaven_church">
-[ID|Text|EnableKey|RwdExp|RwdGold|Rep_text0|Rep_id0|Rep_reqKey0|Rep_itemTag0|Rep_itemQty0|Rep_text1|Rep_id1|Rep_reqKey1|Rep_itemTag1|Rep_itemQty1|Rep_text2|Rep_id2|Rep_reqKey2|Rep_itemTag2|Rep_itemQty2|];
-{chapelgoer|Shadow, embrace me.||||Bye|X||||||||||||||};
-{thoronir_default|Bask in the shadow, my child.||||Shadow|thoronir_shadow_1||||Church|thoronir_church_1||||Trade|thoronir_trade_bonemeal|qthoronir_complete|||};
-{thoronir_shadow_1|Shadows protect us from the dangers of the night. It keeps us safe and comforts us when we sleep.||||Glow of the shadow|thoronir_tharal_select|qtharal_complete|||Back|thoronir_default||||Bye|X||||};
-{thoronir_church_1|This is our chapel of worship in Fallhaven. Our community turns to us for support.||||Next|thoronir_church_2||||||||||||||};
-{thoronir_church_2|This church has withstood hundreds of years, and has been kept safe from graverobbers.||||Next|thoronir_church_3||||||||||||||};
-{thoronir_tharal_select||||||thoronir_trade_bonemeal|qthoronir_complete||||thoronir_tharal_1|||||||||};
-{thoronir_tharal_1|Glow of the shadow indeed my child. So my old friend Tharal in Crossglen village sent you?||||Next|thoronir_tharal_2||||||||||||||};
-{thoronir_church_3|The catacombs beneath the church houses great leaders of the past. Our great Luthor is rumored to be buried there.||||Enter|thoronir_church_4|qbucus|||Back|thoronir_default||||Bye|X||||};
-{thoronir_church_4|Noone is allowed down in the catacombs, except for Athamyr, my apprentice. He is the only one that has been down there for years.|qthoronir_catacombs|||Back|thoronir_default||||||||||||||};
-{thoronir_tharal_2|Shhh, we shouldn\'t talk so loud about using Bonemeal. As you know, Lord Geomyr issued a ban on all use of Bonemeal.||||Next|thoronir_tharal_3||||||||||||||};
-{thoronir_tharal_3|When the ban came, I did not dare keep any, so I threw away my whole supply. Quite foolish now that I look back at it.||||Next|thoronir_tharal_4||||||||||||||};
-{thoronir_tharal_4|Do you think you could find me 5 skeletal bones that I can use for mixing a bonemeal potion? The bonemeal is very potent in healing old wounds.||||Sure|thoronir_tharal_5||||Done|thoronir_tharal_complete||bone|5|Bye|X||||};
-{thoronir_tharal_5|Thank you, please be back soon. I heard there were some undead near an old abandoned house just north of Fallhaven. Maybe you can check for bones there?||||Back|thoronir_default||||Bye|X|||||||||};
-{thoronir_tharal_complete|Thank you, these bones will do fine. Now I can start creating a bonemeal healing potion for you.|qthoronir_complete|90||Next|thoronir_complete_2||||||||||||||};
-{thoronir_complete_2|Give me some time to mix the bonemeal potion. It is a very potent healing potion.||||Bye|X||||||||||||||};
-{thoronir_trade_bonemeal|The bonemeal potions are ready. Please use them with care, and don\'t let the guards see you. We are not actually allowed to use them anymore.||||Trade|S||||Back|thoronir_default||||Bye|X||||};
-{catacombguard|Turn back while you still can, mortal. This is no place for you. Only death awaits you here.||||Turn back|X||||Proceed|catacombguard1|||||||||};
-{catacombguard1|Nooo, you shall not pass!||||Fight|F||||||||||||||};
-{luthor|*hissss* What mortal distubs my sleep?||||Fight|F||||||||||||||};
+[ID|Text|EnblQst|DropList|Rep_text0|Rep_id0|Rep_reqQst0|Rep_itemTag0|Rep_itemQty0|Rep_text1|Rep_id1|Rep_reqQst1|Rep_itemTag1|Rep_itemQty1|Rep_text2|Rep_id2|Rep_reqQst2|Rep_itemTag2|Rep_itemQty2|];
+{chapelgoer|Shadow, embrace me.|||Bye|X||||||||||||||};
+{thoronir_default|Bask in the Shadow, my child.|||Shadow|thoronir_shadow_1||||Church|thoronir_church_1||||Trade|thoronir_trade_bonemeal|bonemeal:100|||};
+{thoronir_shadow_1|Shadows protect us from the dangers of the night. It keeps us safe and comforts us when we sleep.|||Glow of the Shadow|thoronir_tharal_select|bonemeal:30|||Back|thoronir_default||||Bye|X||||};
+{thoronir_church_1|This is our chapel of worship in Fallhaven. Our community turns to us for support.|||Next|thoronir_church_2||||||||||||||};
+{thoronir_church_2|This church has withstood hundreds of years, and has been kept safe from graverobbers.|||Next|thoronir_church_3||||||||||||||};
+{thoronir_tharal_select|||||thoronir_trade_bonemeal|bonemeal:100||||thoronir_tharal_1|||||||||};
+{thoronir_tharal_1|Glow of the Shadow indeed my child. So my old friend Tharal in Crossglen village sent you?|||Next|thoronir_tharal_2||||||||||||||};
+{thoronir_church_3|The catacombs beneath the church houses great leaders of the past. Our great Luthor is rumored to be buried there.|||Enter|thoronir_church_4|bucus:10|||Back|thoronir_default||||Bye|X||||};
+{thoronir_church_4|Noone is allowed down in the catacombs, except for Athamyr, my apprentice. He is the only one that has been down there for years.|bucus:20||Back|thoronir_default||||||||||||||};
+{thoronir_tharal_2|Shhh, we shouldn\'t talk so loud about using Bonemeal. As you know, Lord Geomyr issued a ban on all use of Bonemeal.|||Next|thoronir_tharal_3||||||||||||||};
+{thoronir_tharal_3|When the ban came, I did not dare keep any, so I threw away my whole supply. Quite foolish now that I look back at it.|||Next|thoronir_tharal_4||||||||||||||};
+{thoronir_tharal_4|Do you think you could find me 5 skeletal bones that I can use for mixing a bonemeal potion? The bonemeal is very potent in healing old wounds.|||Sure|thoronir_tharal_5||||Done|thoronir_tharal_complete||bone|5|Bye|X||||};
+{thoronir_tharal_5|Thank you, please be back soon. I heard there were some undead near an old abandoned house just north of Fallhaven. Maybe you can check for bones there?|bonemeal:40||Back|thoronir_default||||Bye|X|||||||||};
+{thoronir_tharal_complete|Thank you, these bones will do fine. Now I can start creating a bonemeal healing potion for you.|bonemeal:100||Next|thoronir_complete_2||||||||||||||};
+{thoronir_complete_2|Give me some time to mix the bonemeal potion. It is a very potent healing potion.|||Bye|X||||||||||||||};
+{thoronir_trade_bonemeal|The bonemeal potions are ready. Please use them with care, and don\'t let the guards see you. We are not actually allowed to use them anymore.|||Trade|S||||Back|thoronir_default||||Bye|X||||};
+{catacombguard|Turn back while you still can, mortal. This is no place for you. Only death awaits you here.|||Turn back|X||||Proceed|catacombguard1|||||||||};
+{catacombguard1|Nooo, you shall not pass!|||Fight|F||||||||||||||};
+{luthor|*hissss* What mortal distubs my sleep?|||Fight|F||||||||||||||};
 	</string>
 
 	<string name="conversationlist_fallhaven_athamyr">
-[ID|Text|EnableKey|RwdExp|RwdGold|Rep_text0|Rep_id0|Rep_reqKey0|Rep_itemTag0|Rep_itemQty0|Rep_text1|Rep_id1|Rep_reqKey1|Rep_itemTag1|Rep_itemQty1|Rep_text2|Rep_id2|Rep_reqKey2|Rep_itemTag2|Rep_itemQty2|];
-{athamyr|Walk with the shadow.||||Catacombs|athamyr_select|qthoronir_catacombs|||Bye|X|||||||||};
-{athamyr_1|Yes, I have been down in the catacombs beneath Fallhaven Church. ||||Next|athamyr_2||||||||||||||};
-{athamyr_2|But I\'m the only one that both has the permission and the bravery to go down there.||||Permission|athamyr_3||||||||||||||};
-{athamyr_3|You want to go down in the catacombs? Hm, maybe we can make a deal.||||Next|athamyr_4||||||||||||||};
-{athamyr_4|Bring me some of that fine cooked meat from the tavern and you can have my permission to go down in the catacombs beneath Fallhaven Church.||||Done|athamyr_complete||meat_cooked|1|Bye|X|||||||||};
-{athamyr_complete_2|Thanks for helping me. You have my permission to go down in the catacombs beneath Fallhaven Church.|qfallhaven_church|||Bye|X||||||||||||||};
-{athamyr_select||||||athamyr_complete_2|qathamyr_complete||||athamyr_1|||||||||};
-{athamyr_complete|Thanks, this will do nicely.|qathamyr_complete|70||Next|athamyr_complete_2||||||||||||||};
+[ID|Text|EnblQst|DropList|Rep_text0|Rep_id0|Rep_reqQst0|Rep_itemTag0|Rep_itemQty0|Rep_text1|Rep_id1|Rep_reqQst1|Rep_itemTag1|Rep_itemQty1|Rep_text2|Rep_id2|Rep_reqQst2|Rep_itemTag2|Rep_itemQty2|];
+{athamyr|Walk with the Shadow.|||Catacombs|athamyr_select|bucus:20|||Bye|X|||||||||};
+{athamyr_1|Yes, I have been down in the catacombs beneath Fallhaven Church. |||Next|athamyr_2||||||||||||||};
+{athamyr_2|But I\'m the only one that both has the permission and the bravery to go down there.|||Permission|athamyr_3||||||||||||||};
+{athamyr_3|You want to go down in the catacombs? Hm, maybe we can make a deal.|||Next|athamyr_4||||||||||||||};
+{athamyr_4|Bring me some of that fine cooked meat from the tavern and you can have my permission to go down in the catacombs beneath Fallhaven Church.|bucus:30||Done|athamyr_complete||meat_cooked|1|Bye|X|||||||||};
+{athamyr_complete_2|Thanks for helping me. You have my permission to go down in the catacombs beneath Fallhaven Church.|bucus:50||Bye|X||||||||||||||};
+{athamyr_select|||||athamyr_complete_2|bucus:40||||athamyr_1|||||||||};
+{athamyr_complete|Thanks, this will do nicely.|bucus:40||Next|athamyr_complete_2||||||||||||||};
 	</string>
 	
 	<string name="conversationlist_fallhaven_larcal">
-[ID|Text|EnableKey|RwdExp|RwdGold|Rep_text0|Rep_id0|Rep_reqKey0|Rep_itemTag0|Rep_itemQty0|Rep_text1|Rep_id1|Rep_reqKey1|Rep_itemTag1|Rep_itemQty1|Rep_text2|Rep_id2|Rep_reqKey2|Rep_itemTag2|Rep_itemQty2|];
-{larcal|I don\'t have time for you kid. Get lost.||||Calomyran Secrets|larcal_1|qcalomyran_tornpage|||Bye|X|||||||||};
-{larcal_1|Now now, what have we here? Are you implying that I have been down in Arcir\'s basement?||||Next|larcal_2||||||||||||||};
-{larcal_2|So, maybe I was. The book is mine anyway.||||Next|larcal_3||||||||||||||};
-{larcal_3|Look, let\'s solve this peacefully. You walk away and forget about that book, and you might still live.||||Leave|larcal_4||||No|larcal_5|||||||||};
-{larcal_4|Good boy. Now run away.||||Bye|X||||||||||||||};
-{larcal_5|Ok, now you\'re starting to annoy me kid. Get lost while you still can.||||Leave|X||||No|larcal_6|||||||||};
-{larcal_6|Still here? Ok then, if you want the book that bad you will have to take it from me!||||Fight|F||||Leave|X|||||||||};
+[ID|Text|EnblQst|DropList|Rep_text0|Rep_id0|Rep_reqQst0|Rep_itemTag0|Rep_itemQty0|Rep_text1|Rep_id1|Rep_reqQst1|Rep_itemTag1|Rep_itemQty1|Rep_text2|Rep_id2|Rep_reqQst2|Rep_itemTag2|Rep_itemQty2|];
+{larcal|I don\'t have time for you kid. Get lost.|||Calomyran Secrets|larcal_1|calomyran:20|||Bye|X|||||||||};
+{larcal_1|Now now, what have we here? Are you implying that I have been down in Arcir\'s basement?|||Next|larcal_2||||||||||||||};
+{larcal_2|So, maybe I was. The book is mine anyway.|||Next|larcal_3||||||||||||||};
+{larcal_3|Look, let\'s solve this peacefully. You walk away and forget about that book, and you might still live.|||Leave|larcal_4||||No|larcal_5|||||||||};
+{larcal_4|Good boy. Now run away.|||Bye|X||||||||||||||};
+{larcal_5|Ok, now you\'re starting to annoy me kid. Get lost while you still can.|||Leave|X||||No|larcal_6|||||||||};
+{larcal_6|Still here? Ok then, if you want the book that bad you will have to take it from me!|||Fight|F||||Leave|X|||||||||};
 	</string>
 
 	<string name="conversationlist_fallhaven_unnmir">
-[ID|Text|EnableKey|RwdExp|RwdGold|Rep_text0|Rep_id0|Rep_reqKey0|Rep_itemTag0|Rep_itemQty0|Rep_text1|Rep_id1|Rep_reqKey1|Rep_itemTag1|Rep_itemQty1|Rep_text2|Rep_id2|Rep_reqKey2|Rep_itemTag2|Rep_itemQty2|];
-{unnmir|Hi there.||||Drunken story|unnmir_1|qfallhaven_drunk_complete|||Bye|X|||||||||};
-{unnmir_1|That old drunk over at the tavern told you his story did he?||||Next|unnmir_2||||||||||||||};
-{unnmir_2|Same old story. We used to travel together a few years back.||||Next|unnmir_3||||||||||||||};
-{unnmir_3|Real adventuring you know, swords and spells.||||Next|unnmir_4||||||||||||||};
-{unnmir_4|But then we stopped. Can\'t really say why, I guess we got tired of life on the road. We settled down here in Fallhaven.||||Next|unnmir_5||||||||||||||};
-{unnmir_5|Nice little town here. Many thieves around though, but they don\'t bother me.||||Next|unnmir_6||||||||||||||};
-{unnmir_6|So what\'s your story kid? How did you end up here in Fallhaven?||||Brother|unnmir_7||||Bye|X|||||||||};
-{unnmir_7|Yeah yeah, I get it. Your brother has probably run off to some dungeon wanting to do adventuring. *rolls eyes*||||Next|unnmir_8||||||||||||||};
-{unnmir_8|Or maybe he has gone to the one of the bigger cities to the north.||||Next|unnmir_9||||||||||||||};
-{unnmir_9|Can\'t say I blame him for wanting to see the world.||||Next|unnmir_10||||||||||||||};
-{unnmir_10|Hey by the way, are you also looking to be an adventurer?||||Yes|unnmir_11||||Not really|unnmir_12|||||||||};
-{unnmir_11|Nice. I\'ll give you a hint kid. *snickering*. Go see Nocmar over by the west side of town. Tell him I sent you.|qnocmar_unnmir|||Next|unnmir_13||||||||||||||};
-{unnmir_12|Smart move. Adventuring leads to a lot of scars. If you know what I mean.||||Bye|X||||||||||||||};
-{unnmir_13|His house is just southwest of the tavern.||||Thanks|X||||||||||||||};
+[ID|Text|EnblQst|DropList|Rep_text0|Rep_id0|Rep_reqQst0|Rep_itemTag0|Rep_itemQty0|Rep_text1|Rep_id1|Rep_reqQst1|Rep_itemTag1|Rep_itemQty1|Rep_text2|Rep_id2|Rep_reqQst2|Rep_itemTag2|Rep_itemQty2|];
+{unnmir|Hi there.|||Drunken story|unnmir_1|fallhavendrunk:100|||Bye|X|||||||||};
+{unnmir_1|That old drunk over at the tavern told you his story did he?|||Next|unnmir_2||||||||||||||};
+{unnmir_2|Same old story. We used to travel together a few years back.|||Next|unnmir_3||||||||||||||};
+{unnmir_3|Real adventuring you know, swords and spells.|||Next|unnmir_4||||||||||||||};
+{unnmir_4|But then we stopped. Can\'t really say why, I guess we got tired of life on the road. We settled down here in Fallhaven.|||Next|unnmir_5||||||||||||||};
+{unnmir_5|Nice little town here. Many thieves around though, but they don\'t bother me.|||Next|unnmir_6||||||||||||||};
+{unnmir_6|So what\'s your story kid? How did you end up here in Fallhaven?|||Brother|unnmir_7||||Bye|X|||||||||};
+{unnmir_7|Yeah yeah, I get it. Your brother has probably run off to some dungeon wanting to do adventuring. *rolls eyes*|||Next|unnmir_8||||||||||||||};
+{unnmir_8|Or maybe he has gone to the one of the bigger cities to the north.|||Next|unnmir_9||||||||||||||};
+{unnmir_9|Can\'t say I blame him for wanting to see the world.|||Next|unnmir_10||||||||||||||};
+{unnmir_10|Hey by the way, are you also looking to be an adventurer?|||Yes|unnmir_11||||Not really|unnmir_12|||||||||};
+{unnmir_11|Nice. I\'ll give you a hint kid. *snickering*. Go see Nocmar over by the west side of town. Tell him I sent you.|nocmar:10||Next|unnmir_13||||||||||||||};
+{unnmir_12|Smart move. Adventuring leads to a lot of scars. If you know what I mean.|||Bye|X||||||||||||||};
+{unnmir_13|His house is just southwest of the tavern.|||Thanks|X||||||||||||||};
 	</string>
 
 	<string name="conversationlist_fallhaven_gaela">
-[ID|Text|EnableKey|RwdExp|RwdGold|Rep_text0|Rep_id0|Rep_reqKey0|Rep_itemTag0|Rep_itemQty0|Rep_text1|Rep_id1|Rep_reqKey1|Rep_itemTag1|Rep_itemQty1|Rep_text2|Rep_id2|Rep_reqKey2|Rep_itemTag2|Rep_itemQty2|];
-{gaela|Swift is my blade. Poisoned is my tongue. Or was it the other way around?||||Thieves|gaela_1||||Bye|X|||||||||};
-{gaela_1|Yes, we thieves have a strong presence here in Fallhaven.||||Next|gaela_2|qgruil_andor_complete|||Bye|X|||||||||};
-{gaela_2|I heard that you helped Gruil, a fellow thief in Crossglen village.||||Next|gaela_3||||||||||||||};
-{gaela_3|Word has also reached me that you are looking for someone. I might be able to help you.||||Next|gaela_4||||||||||||||};
-{gaela_4|You should go talk to Bucus in the derelict house a bit southwest of here. Tell him you want to know more about the Thieves guild.|qbucus_thieves|||Thanks|gaela_5||||||||||||||};
-{gaela_5|Consider it a favor done in return for you helping Gruil.||||Bye|X||||||||||||||};
+[ID|Text|EnblQst|DropList|Rep_text0|Rep_id0|Rep_reqQst0|Rep_itemTag0|Rep_itemQty0|Rep_text1|Rep_id1|Rep_reqQst1|Rep_itemTag1|Rep_itemQty1|Rep_text2|Rep_id2|Rep_reqQst2|Rep_itemTag2|Rep_itemQty2|];
+{gaela|Swift is my blade. Poisoned is my tongue. Or was it the other way around?|||Thieves|gaela_1||||Bye|X|||||||||};
+{gaela_1|Yes, we thieves have a strong presence here in Fallhaven.|||Next|gaela_2|andor:30|||Bye|X|||||||||};
+{gaela_2|I heard that you helped Gruil, a fellow thief in Crossglen village.|||Next|gaela_3||||||||||||||};
+{gaela_3|Word has also reached me that you are looking for someone. I might be able to help you.|||Next|gaela_4||||||||||||||};
+{gaela_4|You should go talk to Bucus in the derelict house a bit southwest of here. Tell him you want to know more about the Thieves guild.|andor:40||Thanks|gaela_5||||||||||||||};
+{gaela_5|Consider it a favor done in return for you helping Gruil.|||Bye|X||||||||||||||};
+	</string>
+
+	<string name="conversationlist_fallhaven_vacor">
+[ID|Text|EnblQst|DropList|Rep_text0|Rep_id0|Rep_reqQst0|Rep_itemTag0|Rep_itemQty0|Rep_text1|Rep_id1|Rep_reqQst1|Rep_itemTag1|Rep_itemQty1|Rep_text2|Rep_id2|Rep_reqQst2|Rep_itemTag2|Rep_itemQty2|];
+{vacor|||||vacor_return_complete|vacor:60||||vacor_return2|vacor:40||||vacor_select1||||};
+{vacor_select1|||||vacor_return1|vacor:20||||vacor_begin|||||||||};
+{vacor_begin|Hello.|||Next|vacor_2||||||||||||||};
+{vacor_2|What are you, some kind of adventurer? Hm. Maybe you can be of use to me.|||Next|vacor_3||||||||||||||};
+{vacor_3|Are you willing to help me?|||Sure|vacor_4||||No|vacor_bah|||||||||};
+{vacor_bah|Bah, lowly creature. I knew I shouldn\'t have asked you. Now leave me.|||Leave|X||||||||||||||};
+{vacor_4|A while ago, I was working on a rift spell that I had read about.|||Next|vacor_5||||||||||||||};
+{vacor_5|The spell is supposed to, shall we say, open up new possibilities.|||Next|vacor_6||||||||||||||};
+{vacor_6|Erm, yes, the rift spell will open things up allright. Ahem.|||Next|vacor_7||||||||||||||};
+{vacor_7|So there I was working hard on getting the last pieces together for it.|||Next|vacor_8||||||||||||||};
+{vacor_8|Then all of a sudden, a gang of thugs came around and started bullying me.|||Next|vacor_9||||||||||||||};
+{vacor_9|They said they were messengers of the Shadow, and insisted that I should cease my spellmaking.|||Next|vacor_10||||||||||||||};
+{vacor_10|Preposterous, isn\'t it? I was so close to having the power!|||Next|vacor_11||||||||||||||};
+{vacor_11|Oh the power I could have had. My dear rift spell.|vacor:10||Next|vacor_12||||||||||||||};
+{vacor_12|Anyway, I was just about to finish the last piece of my rift spell when the bandits came and robbed me.|||Next|vacor_13||||||||||||||};
+{vacor_13|The bandits took my recipe for the spell and took off before I could call the guards.|||Next|vacor_14||||||||||||||};
+{vacor_14|Now I can\'t seem to remember the last parts of it.|||Next|vacor_15||||||||||||||};
+{vacor_15|Do you think you could help me locate it? Then I could have the power at last!|||Next|vacor_16||||||||||||||};
+{vacor_16|You will ofcourse be suitably rewarded for your part in me getting this power.|||I\'ll help|vacor_17||||No thanks|vacor_bah|||||||||};
+{vacor_17|I knew I couldn\'t trust... Wait, what? You actually said yes? Hah, well then.|||Next|vacor_18||||||||||||||};
+{vacor_18|Ok, find the four pieces of my rift spell that the bandits took, and bring them to me.|vacor:20||Next|vacor_19||||||||||||||};
+{vacor_19|There were four bandits, and they all headed south of Fallhaven when I was attacked.|||Next|vacor_20||||||||||||||};
+{vacor_20|You should search the southern parts of Fallhaven for the four bandits.|||Next|vacor_21||||||||||||||};
+{vacor_21|Please hurry! I am so eager to open up the rift.. Erm, I mean finish the spell. Nothing odd with that right?|||Leave|X||||||||||||||};
+{vacor_return1|Hello again. How is the search for my missing pieces of the rift spell going?|||Done|vacor_40||vacor_spell|4|Background|vacor_4||||Bye|X||||};
+{vacor_40|Oh, you found all four pieces? Hurry, give them to me.|vacor:30||Next|vacor_41||||||||||||||};
+{vacor_41|Yes, these are the pieces that the bandits took.|||Next|vacor_42||||||||||||||};
+{vacor_42|Now I should be able to finish the rift spell and open up the Shadow rift .. erm I mean open up new possibilites. Yes, that\'s what I meant.|||Next|vacor_43||||||||||||||};
+{vacor_43|The only obstacle left for me now before I can continue researching my rift spell is that stupid Unzel fellow.|||Next|vacor_44||||||||||||||};
+{vacor_44|Unzel was my apprentice a while ago. But he started to annoy me with his questions and talk about morality.|||Next|vacor_45||||||||||||||};
+{vacor_45|He said that my spellmaking was disrupting the will of the Shadow.|||Next|vacor_46||||||||||||||};
+{vacor_46|Bah, the Shadow. What use have we ever had of the Shadow?|||Next|vacor_47||||||||||||||};
+{vacor_47|I shall one day cast my rift spell and we will be rid of the Shadow.|||Next|vacor_48||||||||||||||};
+{vacor_48|Anyway. I have a feeling that Unzel sent those bandits for me, and if I don\'t stop him he will probably send more.|||Next|vacor_49||||||||||||||};
+{vacor_49|I need you to find Unzel and kill him for me. He can probably be found somewhere southeast of Fallhaven.|vacor:40||Next|vacor_50||||||||||||||};
+{vacor_50|Bring me his signet ring as proof when you have killed him.|||Next|vacor_51||||||||||||||};
+{vacor_51|Now hurry, I cannot wait much longer. The power shall be MINE!|||Leave|X||||||||||||||};
+{vacor_return2|Hello again. Any progress yet?|||Unzel|vacor_return2_2||||Background|vacor_43||||Bye|X||||};
+{vacor_return2_2|Have you killed Unzel for me yet? Bring me his signet ring when you have killed him.|||Done|vacor_60||ring_unzel|1|Shadow|vacor_70|vacor:51|||Back|vacor_return2||||};
+{vacor_60|Haha, Unzel is dead! That pathetic creature is gone!|vacor:60||Next|vacor_61||||||||||||||};
+{vacor_61|I can see the blood on your boots. And I even got you to kill his minions beforehand.|||Next|vacor_62||||||||||||||};
+{vacor_62|This is a great day indeed. I will soon have the power!|||Next|vacor_63||||||||||||||};
+{vacor_63|Here, have these coins for your help.||gold200|Next|vacor_64||||||||||||||};
+{vacor_64|Now leave me, I have work to do before I can cast the rift spell.|||Leave|X||||||||||||||};
+{vacor_return_complete|Hello again, my assassin friend. I will soon have my rift spell ready.|||Leave|X||||||||||||||};
+{vacor_70|What? He told you his story? And you actually believed it?|||Next|vacor_71||||||||||||||};
+{vacor_71|I will give you one more chance. Either you kill Unzel for me, and I will reward you handsomely. Or you will have to fight me.|||Fight|vacor_72||||Leave|X|||||||||};
+{vacor_72|Bah, lowly creature. I knew I shouldn\'t have trusted you. Now you will die along with your precious Shadow.|vacor:54||Fight|F||||||||||||||};
+	</string>
+
+	<string name="conversationlist_fallhaven_unzel">
+[ID|Text|EnblQst|DropList|Rep_text0|Rep_id0|Rep_reqQst0|Rep_itemTag0|Rep_itemQty0|Rep_text1|Rep_id1|Rep_reqQst1|Rep_itemTag1|Rep_itemQty1|Rep_text2|Rep_id2|Rep_reqQst2|Rep_itemTag2|Rep_itemQty2|];
+{unzel_1|Hello. I\'m Unzel.|||Camp|unzel_2||||Rift spell|unzel_3|vacor:40|||Bye|||||};
+{unzel_2|Yes, this is my camp. Lovely place, isn\'t it?|||Bye|X||||||||||||||};
+{unzel_3|Vacor sent you huh? I guess I should have figured he would send someone sooner or later.|||Next|unzel_4||||||||||||||};
+{unzel_4|Very well then. Kill me if you must, or allow me to tell you my side of the story.|||Fight|unzel_fight||||Story|unzel_5|||||||||};
+{unzel_fight|Very well, let\'s fight then.|vacor:53||Fight|F||||||||||||||};
+{unzel_5|Thank you for listening.|||Next|unzel_10||||||||||||||};
+{unzel_10|Vacor and I used to travel together. But he started to get obsessed with his spellmaking.|||Next|unzel_11||||||||||||||};
+{unzel_11|He even started to question the Shadow. I knew there was something I had to do to stop him.|||Next|unzel_12||||||||||||||};
+{unzel_12|I started questioning him about what he was up to, but he just wanted to keep on going.|||Next|unzel_13||||||||||||||};
+{unzel_13|After a while, he became obsessed with the thought of a rift spell that he said would grant him unlimited powers against the Shadow.|||Next|unzel_14||||||||||||||};
+{unzel_14|So there was only one thing I could do. I left him and neede to put an end to his making of the rift spell.|||Next|unzel_15||||||||||||||};
+{unzel_15|So I sent some friends over to him to take the spell from him.|||Next|unzel_16_select||||||||||||||};
+{unzel_16_select|||||unzel_16_2|vacor:50||||unzel_16_1|||||||||};
+{unzel_16_1|And here we are.|||Bandits|unzel_17||||||||||||||};
+{unzel_16_2|And here we are.|||Next|unzel_19||||||||||||||};
+{unzel_17|What? You killed my four friends? Argh, I feel the rage coming.|||Next|unzel_18||||||||||||||};
+{unzel_18|But I also realize that all this is the making of Vacor. I\'ll give you a choice now. Choose wisely.|||Next|unzel_19||||||||||||||};
+{unzel_19|Either you side with Vacor and his rift spell, or you help me get rid of him. Who will you help?|vacor:50||You|unzel_20||||Vacor|unzel_fight|||||||||};
+{unzel_20|Thank you my friend. We will keep the shadow safe from Vacor.|vacor:51||Next|unzel_21||||||||||||||};
+{unzel_21|You should go talk to him about the shadow.|||Bye|X||||||||||||||};
+{unzel_return_1|Welcome back. Did you talk to Vacor?|||Done|unzel_30||ring_vacor|1|Background|unzel_10||||Bye|X||||};
+{unzel_30|You killed him? You have my thanks friend. Now we are safe from Vacor\'s rift spell. Here, take these coins for your help.|vacor:61|gold200|Bye|X||||||||||||||};
+{unzel_40|Thank you for your help. Now we are safe from Vacor\'s rift spell.|||Bye|X||||||||||||||};
+{unzel|||||unzel_40|vacor:61||||unzel_return_1|vacor:51||||unzel_1||||};
+	</string>
+
+	<string name="conversationlist_wilderness">
+[ID|Text|EnblQst|DropList|Rep_text0|Rep_id0|Rep_reqQst0|Rep_itemTag0|Rep_itemQty0|Rep_text1|Rep_id1|Rep_reqQst1|Rep_itemTag1|Rep_itemQty1|Rep_text2|Rep_id2|Rep_reqQst2|Rep_itemTag2|Rep_itemQty2|];
+{fallhaven_bandit|Get lost kid. I don\'t have time for you.|||Rift spell|fallhaven_bandit_2|vacor:20|||Bye|X|||||||||};
+{fallhaven_bandit_2|No! Vacor will not gain the power of the rift spell! |||Fight|F||||||||||||||};
+{bandit1|What have we here? A lost wanderer? |||Next|bandit1_2||||||||||||||};
+{bandit1_2|How much is your life worth to you? Give me 100 gold and I\'ll let you go.|||Here|bandit1_3||gold|100|No|bandit1_4|||||||||};
+{bandit1_3|About damn time. You are free to go.|||Bye|X||||||||||||||};
+{bandit1_4|Ok then, your life it is. Let\'s fight. I have been looking forward to a good fight!|||Fight|F||||||||||||||};
+	</string>
+
+	<string name="conversationlist_flagstone">
+[ID|Text|EnblQst|DropList|Rep_text0|Rep_id0|Rep_reqQst0|Rep_itemTag0|Rep_itemQty0|Rep_text1|Rep_id1|Rep_reqQst1|Rep_itemTag1|Rep_itemQty1|Rep_text2|Rep_id2|Rep_reqQst2|Rep_itemTag2|Rep_itemQty2|];
+{zombie1|Fresh flesh!|||Fight|F||||||||||||||};
+{prisoner1|Nooo, I will not be imprisoned again!|||Fight|F||||||||||||||};
+{prisoner2|Aaaa! Who\'s there? I will not be enslaved again!|||Fight|F||||||||||||||};
+{flagstone_guard0|Ah, another mortal. Prepare to become one part of our undead army!|flagstone:31||Fight|F||||||||||||||};
+{flagstone_guard1|Die mortal!|||Fight|F||||||||||||||};
+{flagstone_guard2|What, a mortal in here that is not marked by my touch?|flagstone:50||Next|flagstone_guard2_2||||||||||||||};
+{flagstone_guard2_2|You seem delicious and soft, will you be part of the feast?|||Next|flagstone_guard2_3||||||||||||||};
+{flagstone_guard2_3|Yes, I think you will. My undead army will spread wide outside Flagstone once I am done with you.|||Fight|F||||||||||||||};
+
+{flagstone_sentry|||||flagstone_sentry_return4|flagstone:60||||flagstone_sentry_return3|flagstone:40||||flagstone_sentry_select0||||};
+{flagstone_sentry_select0|||||flagstone_sentry_return2|flagstone:30||||flagstone_sentry_return1|flagstone:10||||flagstone_sentry_1||||};
+{flagstone_sentry_1|Halt! Who\'s there? Noone is allowed to approach Flagstone.|||Next|flagstone_sentry_2||||||||||||||};
+{flagstone_sentry_2|You should turn back while you still can.|||Next|flagstone_sentry_3||||Leave|X|||||||||};
+{flagstone_sentry_3|Flagstone has been overrun by undead, and I\'m standing guard here to make sure no undead escape.|||Next|flagstone_sentry_4||||||||||||||};
+{flagstone_sentry_4|Flagstone used to be a prison camp for runaway workers from when Mount Galmore was dug out.|||Next|flagstone_sentry_5||||||||||||||};
+{flagstone_sentry_5|But once the digging in Mount Galmore stopped, the prison camp lost its purpose.|||Next|flagstone_sentry_6||||||||||||||};
+{flagstone_sentry_6|The lord at the time did not care much for the prisoners that were already in Flagstone, so he left them there.|||Next|flagstone_sentry_7||||||||||||||};
+{flagstone_sentry_7|The warden that ran Flagstone on the other hand took his duty very seriously, and kept on running the prison just like when Mount Galmore was being dug out.|||Next|flagstone_sentry_8||||||||||||||};
+{flagstone_sentry_8|For years, noone took notice of Flagstone. Except for the occasional reports by travellers on this road of terrible screams coming from the camp.|||Next|flagstone_sentry_9||||||||||||||};
+{flagstone_sentry_9|Up until recently, when there was a change in activity from Flagstone. Undead started pouring out in large numbers.|||Next|flagstone_sentry_10||||||||||||||};
+{flagstone_sentry_10|And here we are. I have to guard the road from undead, so that they do not spread to more areas than Flagstone.|||Next|flagstone_sentry_11||||||||||||||};
+{flagstone_sentry_11|So, I would advise you to leave unless you want to be overrun by undead.|||Investigate|flagstone_sentry_12||||Leave|X|||||||||};
+{flagstone_sentry_12|Are you really sure you want to head in there? Well, ok, fine by me.|||Next|flagstone_sentry_13||||||||||||||};
+{flagstone_sentry_13|I won\'t stop you, but I won\'t mourn you if you never return either.|||Next|flagstone_sentry_14||||||||||||||};
+{flagstone_sentry_14|Go ahead. Let me know if there\'s anything I can tell you that would help. |||Next|flagstone_sentry_15||||||||||||||};
+{flagstone_sentry_15|Return here if you need my advice.|flagstone:10||Leave|X||||||||||||||};
+{flagstone_sentry_return1|Hello again. Did you enter Flagstone? I am surprised you actually returned.|||Background|flagstone_sentry_3||||Demon|flagstone_sentry_20|flagstone:20|||Bye|X||||};
+{flagstone_sentry_20|A guardian you say? This is troubling news, since it means there is some larger force behind all this.|||Next|flagstone_sentry_21||||||||||||||};
+{flagstone_sentry_21|Have you found the former warden of Flagstone? The warden used to have a necklace with him at all times.|||Next|flagstone_sentry_22||||||||||||||};
+{flagstone_sentry_22|He was very protective of it. Maybe the necklace was some sort of key.|||Next|flagstone_sentry_23||||||||||||||};
+{flagstone_sentry_23|If you find the warden and retrieve the necklace, then please return here and I will help you decipher any message that we might find on it.|flagstone:30||Found it|flagstone_sentry_40||necklace_flagstone|1|Demon|flagstone_sentry_20||||Leave|X||||};
+{flagstone_sentry_return2|Hello again. Have you found the former warden in Flagstone yet?|||Warden|flagstone_sentry_23||||Background|flagstone_sentry_3||||Bye|X||||};
+{flagstone_sentry_40|You found the necklace? Good. Here, give it to me.|flagstone:40||Next|flagstone_sentry_41||||||||||||||};
+{flagstone_sentry_41|Now, let\'s see here. Ah yes, it is as I thought. The necklace contains a passphrase.|||Next|flagstone_sentry_42||||||||||||||};
+{flagstone_sentry_42|\'Daylight Shadow\'. That must be it. You should try to approach the guardian with this passphrase.|||Leave|X||||||||||||||};
+{flagstone_sentry_return3|Hello again. How is the investigation of the source of the undead in Flagstone going?|||No progress|flagstone_sentry_43||||||||||||||};
+{flagstone_sentry_43|Well, keep looking. Return to me if you need my advice.|||Leave|X||||||||||||||};
+{flagstone_sentry_return4|Hello again. It seems something happened inside Flagstone that made the undead weaker. I\'m sure we have you to thank for it.|||Leave|X||||||||||||||};
+
+{narael|Thank you, thank you for freeing me from that monster.|||Next|narael_select||||||||||||||};
+{narael_select|||||narael_9|flagstone:60||||narael_1|||||||||};
+{narael_1|I have been a captive here for what seems to be an eternity.|||Next|narael_2||||||||||||||};
+{narael_2|Oh, the things they did to me. Thank you so much for freeing me.|||Next|narael_3||||||||||||||};
+{narael_3|I was once a citizen in Nor City, and worked with the excavation of Mount Galmore.|||Next|narael_4||||||||||||||};
+{narael_4|But one day I wanted to quit the assignment and return to my wife.|||Next|narael_5||||||||||||||};
+{narael_5|The officer in charge would not let me, and I was sent to Flagstone as a prisoner for disobeying orders.|||Next|narael_6||||||||||||||};
+{narael_6|If only I could see my wife once more. But I have hardly any life left in me, I don\'t even have enough strength to leave this place.|||Next|narael_7||||||||||||||};
+{narael_7|I guess my fate is to perish here. But now as a free man at least.|||Next|narael_8||||||||||||||};
+{narael_8|Now leave me to my fate. I do not have the strength to leave this place.|flagstone:60||Next|narael_9||||||||||||||};
+{narael_9|If you find my wife Taurum in Nor City, please tell her I\'m alive and that I haven\'t forgotten about her.|||Bye|X||||||||||||||};
+	</string>
+
+	<string name="conversationlist_fallhaven_south">
+[ID|Text|EnblQst|DropList|Rep_text0|Rep_id0|Rep_reqQst0|Rep_itemTag0|Rep_itemQty0|Rep_text1|Rep_id1|Rep_reqQst1|Rep_itemTag1|Rep_itemQty1|Rep_text2|Rep_id2|Rep_reqQst2|Rep_itemTag2|Rep_itemQty2|];
+{fallhaven_lumberjack|Hi, I\'m Jakrar.|||Lumber|fallhaven_lumberjack_2||||Bye|X|||||||||};
+{fallhaven_lumberjack_2|Yes, I\'m Fallhaven\'s woodcutter. Need anything done in the finest of woods? I have probably got it.|||Bye|X||||||||||||||};
+{alaun|Hello. I\'m Alaun. How can I help you?|||Brother|alaun_2||||Bye|X|||||||||};
+{alaun_2|You are looking for your brother you say? Looks like you? Hm.|||Next|alaun_3||||||||||||||};
+{alaun_3|No, I cannot recall seeing anyone by that description. Maybe you should try in Crossglen village west of here.|||Bye|X||||||||||||||};
+{fallhaven_farmer1|Hello there. Please do not bother me, I have a lot of work to do.|||Bye|X||||||||||||||};
+{fallhaven_farmer2|Hello. Could you please move out of the way? I am trying to work here.|||Bye|X||||||||||||||};
+{khorand|Hey you, don\'t even think of touching any of the crates. I am watching you!|||Bye|X||||||||||||||};
 	</string>
 
 </resources>
diff --git a/AndorsTrail/res/values/droplist.xml b/AndorsTrail/res/values/droplist.xml
new file mode 100644
index 000000000..ae782d8c1
--- /dev/null
+++ b/AndorsTrail/res/values/droplist.xml
@@ -0,0 +1,273 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<resources>
+	<string name="droplists_debug">
+[Droplist|ItemTag|Frequency|Quantity|];
+{debuglist1|gold|100|3|};
+{debuglist1|dagger0|100|1|};
+{debuglist1|shirt1|100|1|};
+{debuglist1|club3|100|1|};
+{debugshop1|club1|100|10|};
+{debugshop1|club3|100|5|};
+{debugshop1|hammer0|100|5|};
+{debugshop1|hammer1|100|5|};
+{debugshop1|shirt1|100|5|};
+{debugshop1|shirt2|100|5|};
+{debugshop1|dagger0|100|5|};
+ 
+{startitems|gold|100|12|};
+{startitems|club1|100|1|};
+{startitems|shirt1|100|1|};
+{startitems|dagger0|100|1|};
+	</string>
+	
+	<string name="droplists_crossglen">
+[Droplist|ItemTag|Frequency|Quantity|];
+{startitems|gold|100|12|};
+{startitems|club1|100|1|};
+{startitems|shirt1|100|1|};
+{startitems|ring_mikhail|100|1|};
+{gold20|gold|100|20|};
+{gold51|gold|100|51|};
+{gold-10|gold|100|-10|};
+{gold200|gold|100|200|};
+{shop_priest|health_minor|100|10|};
+{shop_priest|health|100|10|};
+{shop_priest|health_major|100|10|};
+{shop_priest|ring_dmg1|100|1|};
+{shop_priest|ring_dmg2|100|1|};
+{shop_priest|ring_block1|100|1|};
+{shop_priest|ring_atkch1|100|1|};
+{shop_food|apple_green|100|5|};
+{shop_food|meat|100|5|};
+{shop_food|meat_cooked|100|5|};
+{shop_food|Carrot|100|5|};
+{shop_food|Bread|100|5|};
+{shop_food|Mushroom|100|5|};
+{shop_food|Eggs|100|5|};
+{shop_food|Mead|100|5|};
+{shop_clothes|shirt1|100|1|};
+{shop_clothes|shirt2|100|1|};
+{shop_clothes|hat1|100|1|};
+{shop_clothes|hat2|100|1|};
+{shop_clothes|gloves1|100|1|};
+{shop_clothes|gloves2|100|1|};
+{shop_clothes|gloves3|100|1|};
+{shop_clothes|gloves4|100|1|};
+{shop_clothes|boots1|100|1|};
+{shop_clothes|boots2|100|1|};
+{shop_clothes|boots3|100|1|};
+{shop_smith|club1|100|1|};
+{shop_smith|club3|100|1|};
+{shop_smith|ironsword0|100|1|};
+{shop_smith|hammer0|100|1|};
+{shop_smith|hammer1|100|1|};
+{shop_smith|dagger0|100|1|};
+{shop_smith|dagger1|100|1|};
+{shop_smith|dagger2|100|1|};
+{shop_smith|shortsword1|100|1|};
+{shop_smith|ironsword1|100|1|};
+{shop_smith|ironsword2|100|1|};
+{shop_smith|broadsword1|100|1|};
+{shop_smith|broadsword2|100|1|};
+{shop_smith|steelsword1|100|1|};
+{shop_smith|axe1|100|1|};
+{shop_smith|axe2|100|1|};
+{shop_smith|armor1|100|1|};
+{shop_smith|armor2|100|1|};
+{shop_smith|armor3|100|1|};
+{shop_smith|shield1|100|1|};
+{shop_smith|shield3|100|1|};
+{shop_smith|shield4|100|1|};
+{shop_smith|shield5|100|1|};
+{shop_smith|boots1|100|1|};
+{shop_smith|boots5|100|1|};
+{shop_smith|hat3|100|1|};
+{shop_smith|hat4|100|1|};
+{shop_thief|shirt1|100|1|};
+{shop_thief|shirt2|100|1|};
+{shop_thief|gem1|100|5|};
+{shop_thief|gem2|100|5|};
+{shop_thief|gem3|100|5|};
+{shop_thief|ring_dmg5|100|1|};
+{shop_thief|ring_dmg6|100|1|};
+{trainingrat|gold|100|0-2|};
+{trainingrat|tail_trainingrat|100|1|};
+{rat|gold|100|2-4|};
+{rat|rat_tail|30|1|};
+{caveratboss|gold|100|10|};
+{caveratboss|tail_caverat|100|1|};
+{caveratboss|gem1|5|1|};
+{wasp|gold|70|2-4|};
+{wasp|insectwing|30|1|};
+{insect|gold|70|2-4|};
+{insect|shell|30|1|};
+{canine|gold|70|3-6|};
+{canine|gem1|5|1|};
+{canine|meat|30|1|};
+	</string>
+
+<string name="droplists_crossglen_outside">
+{snake|gold|70|3-6|};
+{snake|meat|30|1|};
+{snake|gland|5|1|};
+{lich1|gold|70|5-15|};
+{lich1|gem2|25|1|};
+{lich1|health_minor|25|1|};
+{snakemaster|gold|70|9|};
+{snakemaster|dagger_venom|100|1|};
+{snakemaster|gem3|100|1|};
+{snakemaster|health|100|1|};
+{canineboss|gold|70|7-10|};
+{canineboss|hair|30|1|};
+{canineboss|gem1|25|1|};
+{canineboss|meat|30|1|};
+{canineboss|boots1|25|1|};
+{cavecritter|gold|70|4-8|};
+{cavecritter|gem1|25|1|};
+{cavecritter|claws|30|1|};
+{cavemonster|gold|70|4-12|};
+{cavemonster|gem2|25|1|};
+{cavemonster|hammer0|5|1|};
+{cavemonster|health_minor|25|1|};
+{irogotu|neck_irogotu|100|1|};
+{irogotu|ring_gandir|100|1|};
+{irogotu|health|100|1|};
+{haunt|vial_empty1|25|1|};
+{haunt|gem1|25|1|};
+</string>
+
+<string name="droplists_fallhaven">
+{nocmar|gem1|25|1|};
+{ganos|ring1|100|1|};
+{ganos|ring2|100|1|};
+{ganos|shirt1|100|1|};
+{ganos|shirt2|100|1|};
+{ganos|gem1|100|5|};
+{ganos|gem2|100|5|};
+{ganos|gem3|100|5|};
+{ganos|quickdagger1|100|1|};
+{fallhaven_clothes|shirt1|100|1|};
+{fallhaven_clothes|shirt2|100|1|};
+{fallhaven_clothes|shirt_dmgresist|100|1|};
+{fallhaven_clothes|ring1|100|1|};
+{fallhaven_clothes|ring2|100|1|};
+{fallhaven_clothes|boots3|100|1|};
+{fallhaven_clothes|gloves_attack1|100|1|};
+{fallhaven_clothes|gloves_attack2|100|1|};
+{fallhaven_clothes|jewel_fallhaven|100|1|};
+{fallhaven_clothes|ring_dmg1|100|1|};
+{fallhaven_clothes|ring_dmg2|100|1|};
+{fallhaven_clothes|ring_block1|100|1|};
+{fallhaven_clothes|ring_atkch1|100|1|};
+{fallhaven_clothes|necklace_shield1|100|1|};
+{fallhaven_clothes|necklace_shield2|100|1|};
+{fallhaven_potions|vial_empty1|100|10|};
+{fallhaven_potions|vial_empty2|100|10|};
+{fallhaven_potions|vial_empty3|100|10|};
+{fallhaven_potions|vial_empty4|100|10|};
+{fallhaven_potions|health_minor|100|10|};
+{fallhaven_potions|health|100|10|};
+{fallhaven_potions|health_major|100|10|};
+{fallhaven_potions|milk|100|10|};
+{fallhaven_potions|rat_tail|100|5|};
+{fallhaven_potions|Radish|100|5|};
+{fallhaven_potions|Strawberry|100|5|};
+{thoronir|bonemeal_potion|100|10|};
+{larcal|gold|70|4-12|};
+{larcal|club1|100|1|};
+{larcal|calomyran_secrets|100|1|};
+{larcal|milk|100|1|};
+{catacombguard|gold|70|4-12|};
+{catacombguard|gem2|25|1|};
+{catacombguard|health|25|1|};
+{catacombguard|vial_empty2|25|1|};
+{catacombguard|gloves1|5|1|};
+{catacombrat|gold|70|1-5|};
+{catacombrat|gem1|25|1|};
+{catacombrat|vial_empty1|25|1|};
+{luthor|gold|70|1-5|};
+{luthor|gem1|100|1|};
+{luthor|key_luthor|100|1|};
+{luthor|health_major|100|1|};
+{skeleton|gold|70|16-23|};
+{skeleton|gem2|25|1|};
+{skeleton|health|25|1|};
+{skeleton|bone|30|1|};
+{skeletonmaster|gold|70|16-30|};
+{skeletonmaster|gem3|25|1|};
+{skeletonmaster|health|25|1|};
+{skeletonmaster|bone|100|1|};
+{skeletonmaster|shield1|25|1|};
+</string>
+
+<string name="droplists_wilderness">
+[Droplist|ItemTag|Frequency|Quantity|];
+{unzel|gold|100|16-30|};
+{unzel|health|100|1|};
+{unzel|ring_unzel|100|1|};
+{unzel|boots_unzel|100|1|};
+{vacor|gold|100|16-30|};
+{vacor|health|100|1|};
+{vacor|ring_vacor|100|1|};
+{vacor|boots_vacor|100|1|};
+{bandit1|gold|70|4-41|};
+{fallhaven_bandit|gold|100|4-41|};
+{fallhaven_bandit|vacor_spell|100|1|};
+{snake2|gold|70|7-12|};
+{snake2|meat|30|1|};
+{snake2|gland|5|1|};
+{undead1|gold|70|16-23|};
+{undead1|gem2|25|1|};
+{undead1|health|25|1|};
+{undead1|ironsword1|25|1|};
+{prisoner|rock|100|1|};
+{skeleton2|gold|70|16-23|};
+{skeleton2|gem2|25|1|};
+{skeleton2|health|25|1|};
+{skeleton2|bone|30|1|};
+{skeleton2|ring_dmg1|1|1|};
+{skeleton3|gold|70|20-29|};
+{skeleton3|gem2|25|1|};
+{skeleton3|health|25|1|};
+{skeleton3|bone|30|1|};
+{skeleton3|ring_dmg2|1|1|};
+{canine2|gold|70|3-25|};
+{canine2|gem1|5|1|};
+{canine2|meat|30|1|};
+{canine2|hair|30|1|};
+{pack1|gold|70|3-15|};
+{pack1|gem2|5|1|};
+{pack1|meat|30|1|};
+{pack1|hair|30|1|};
+{pack2|gold|70|3-25|};
+{pack2|gem3|5|1|};
+{pack2|meat|30|1|};
+{pack2|hair|30|1|};
+{pack3|gold|70|3-35|};
+{pack3|gem4|5|1|};
+{pack3|meat|30|1|};
+{pack3|hair|30|1|};
+{pack_boss|gold|100|3-35|};
+{pack_boss|gem4|100|1|};
+{pack_boss|meat|30|1|};
+{pack_boss|packhide|100|1|};
+{pack_boss|hair|30|1|};
+
+{flagstone_guard0|gold|100|20-29|};
+{flagstone_guard0|gem4|100|1|};
+{flagstone_guard0|health|100|1|};
+{flagstone_guard0|necklace_flagstone|100|1|};
+{flagstone_guard1|gold|100|20-52|};
+{flagstone_guard1|gem4|100|1|};
+{flagstone_guard1|health|100|2|};
+{flagstone_guard1|ring_block1|100|1|};
+{flagstone_guard1|ironsword1|100|1|};
+{flagstone_guard2|gold|100|62|};
+{flagstone_guard2|gem4|100|1|};
+{flagstone_guard2|health|100|3|};
+{flagstone_guard2|sword_flagstone|100|1|};
+{flagstone_guard2|ring_jinxed1|100|1|};
+</string>
+
+</resources>
diff --git a/AndorsTrail/res/values/itemlist.xml b/AndorsTrail/res/values/itemlist.xml
index a4d7057b5..a052bf83c 100644
--- a/AndorsTrail/res/values/itemlist.xml
+++ b/AndorsTrail/res/values/itemlist.xml
@@ -27,13 +27,11 @@
 {ironsword2|items_tiles:71|Iron longsword|0|121||5|10|||1-4|||};
 {broadsword1|items_tiles:75|Iron broadsword|0|251||7|2|||1-10|||};
 {broadsword2|items_tiles:76|Steel broadsword|0|582||6|15|||3-10|||};
-{steelsword1|items_tiles:77|Steel sword|0|874||4|25|||3-8|||};
+{steelsword1|items_tiles:77|Steel sword|0|874||4|24|||3-7|||};
 {axe1|items_tiles:140|Woodcutter axe|0|24||5|5|||1-3|||};
 {axe2|items_tiles:140|Iron axe|0|312||6|5|||2-5|||};
 {quickdagger1|items_tiles:84|Quickstrike dagger|0|512||3|20|||0|-20||};
 	</string>
-	
-	
 
 	<string name="itemlist_rings">
 [Tag|Icon|Name|Category|Cost|HP|AtkCost|AtkPct|CritPct|CritMult|DMG|BlkPct|DMG_res|];
@@ -46,6 +44,7 @@
 {ring_atkch1|items_tiles:266|Ring of surehit|7|215|||15||||||};
 {ring1|items_tiles:266|Mundane ring|7|13|||||||||};
 {ring2|items_tiles:266|Polished ring|7|21|||||||||};
+{ring_jinxed1|items_tiles:268|Jinxed ring of damage resistance|7|229|||||||-9|1|};
 	</string>
 
 	<string name="itemlist_necklaces">
@@ -59,7 +58,7 @@
 [Tag|Icon|Name|Category|Cost|HP|AtkCost|AtkPct|CritPct|CritMult|DMG|BlkPct|DMG_res|];
 {shirt1|items_tiles:182|Cloth shirt|3|16|||||||2||};
 {shirt2|items_tiles:182|Fine shirt|3|72|||||||5||};
-{shirt_dmgresist|items_tiles:183|Hardened shirt|3|1633|||||||5|1|};
+{shirt_dmgresist|items_tiles:183|Hardened leather shirt|3|1633|||||||5|1|};
 {armor1|items_tiles:183|Leather armour|3|464|||||||8||};
 {armor2|items_tiles:183|Superior leather armour|3|624|||||||9||};
 {armor3|items_tiles:184|Hard leather armour|3|2407|||||||13||};
@@ -88,7 +87,7 @@
 [Tag|Icon|Name|Category|Cost|HP|AtkCost|AtkPct|CritPct|CritMult|DMG|BlkPct|DMG_res|];
 {apple_green|items_tiles:2|Green apple|21|9|4||||||||};
 {apple_red|items_tiles:3|Red apple|21|15|6||||||||};
-{meat|items_tiles:25|Meat|21|45|12||||||||};
+{meat|items_tiles:25|Meat|21|29|12||||||||};
 {meat_cooked|items_tiles:27|Cooked meat|21|78|21||||||||};
 {|items_tiles:8|Strawberry|21|1|1||||||||};
 {|items_tiles:15|Carrot|21|9|4||||||||};
@@ -153,5 +152,13 @@
 {key_luthor|items_tiles:231|Key of Luthor|31|0|||||||||};
 {calomyran_secrets|items_tiles:406|Calomyran secrets|31|0|||||||||};
 {heartstone|items_tiles:216|Heartstone|31|40|||||||||};
+{vacor_spell|items_tiles:248|Piece of Vacor\'s spell|31|0|||||||||};
+{ring_unzel|items_tiles:266|Unzel\'s ring|31|0|||||||||};
+{ring_vacor|items_tiles:266|Vacor\'s ring|31|0|||||||||};
+{boots_unzel|items_tiles:197|Unzel\'s defensive boots|5|185|||||||8||};
+{boots_vacor|items_tiles:197|Vacor\'s boots of attack|5|185|||9||||2||};
+{necklace_flagstone|items_tiles:272|Flagstone Warden\'s necklace|31|0|||||||||};
+{packhide|items_tiles:183|Wolfpack\'s animal hide|3|121|||-15||||2|1|};
+{sword_flagstone|items_tiles:77|Flagstone\'s pride|0|169||4|21|10|2|1-6|||};
 	</string>
 </resources>
diff --git a/AndorsTrail/res/values/monsterlist.xml b/AndorsTrail/res/values/monsterlist.xml
index 2d2c8c876..afc62969e 100644
--- a/AndorsTrail/res/values/monsterlist.xml
+++ b/AndorsTrail/res/values/monsterlist.xml
@@ -3,140 +3,63 @@
 <resources>
 	<string name="monsterlist_debug">
 [Icon|Name|Tags|Size|Exp|HP_max|AP_max|AP_move|AtkCost|AtkPct|CritPct|CritMult|DMG|BlkPct|DMG_res|Drop|Phrase|];
-{monsters_man1:0|Traveller|Human|1x1|11|10|10|10|10|50|||1-2|||shop1|debug|};
-	</string>
-	
-	<string name="monsterlist_misc">
-[Icon|Name|Tags|Size|Exp|HP_max|AP_max|AP_move|AtkCost|AtkPct|CritPct|CritMult|DMG|BlkPct|DMG_res|Drop|Phrase|];
-{monsters_armor1:0|Armoured guardian|Human|1x1|20|10|10|10|10|50|||1-2|90|1|list1||};
-{monsters_men:0|Madman|Human|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_men:1|Siren|Human|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_men:3|Knight|Human|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_men:4|Monk|Human|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_men:5|Hermit|Human|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_men:6|Nun|Human|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_men:7|Amazon|Human|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_men:8|Thief|Human|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_rogue1:0|Rogue|Human|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_warrior1:0|Warrior|Human|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_misc:4|Dwarf miner|Dwarf|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_misc:5|Troll|Dwarf|1x1|11|10|10|10|2|50|||1-2|||list1||};
-{monsters_misc:6|Dwarf warrior|Dwarf|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_misc:7|Dwarf knight|Dwarf|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_dogs:0|Puppy dog|Animal|1x1|3|1|10|10|10|50|||0-1|||list1||};
-{monsters_dogs:1|Young dog|Animal|1x1|4|5|10|10|10|50|||0-1|||list1||};
-{monsters_dogs:2|Dog|Animal|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_dogs:3|Fox|Animal|1x1|15|20|10|10|10|50|||1-5|||list1||};
-{monsters_dogs:4|Wolf|Animal|1x1|24|40|10|10|10|50|||1-7|||list1||};
-{monsters_dogs:5|Werewolf|Animal|1x1|32|60|10|10|10|100|10|2|3-15|||list1||};
-{monsters_dogs:6|Boar|Animal|1x1|25|30|10|10|10|60|||2-7|||list1||};
-{monsters_rats:0|Tiny rat|Animal|1x1|1|1|10|10|10|50|||1|||list1||};
-{monsters_rats:1|Rat|Animal|1x1|4|3|10|10|10|50|||0-3|||list1||};
-{monsters_rats:2|Rabid rat|Animal|1x1|10|10|10|10|10|50|||1-6|||list1||};
-{monsters_rats:3|Strong rat|Animal|1x1|15|20|10|10|5|50|||1-10|||list1||};
-{monsters_snakes:0|Young snake|Animal|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_snakes:1|Snake|Animal|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_snakes:2|Poison snake|Animal|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_snakes:3|Venomous snake|Animal|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_snakes:4|Large snake|Animal|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_snakes:5|Paralyzing snake|Animal|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_insects:0|Black ant|Insect|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_insects:1|Small wasp|Insect|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_insects:2|Yellow ant|Insect|1x1|11|10|10|10|10|100|||4|||list1||};
-{monsters_insects:3|Red ant|Insect|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_insects:4|Beetle|Insect|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_insects:5|Wasp|Insect|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_dragons:0|Dragon|Dragon|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_dragons:1|Ice dragon|Dragon|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_dragons:2|Young dragon|Dragon|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_dragons:3|Hardened dragon|Dragon|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_dragons:4|Hatchling dragon|Dragon|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_dragons:5|Acid dragon|Dragon|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_dragon1:0|Ancient dragon|Dragon|4x3|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_ghost1:0|Ethereal wraith|Undead|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_ghost2:0|Ghost|Undead|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_wraiths:0|Wraith|Undead|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_wraiths:1|Wraith master|Undead|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_wraiths:2|Ancient wraith|Undead|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_zombie2:0|Rotting zombie|Undead|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_zombie1:0|Zombie|Undead|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_liches:0|Lich apprentice|Undead|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_liches:1|Lich|Undead|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_liches:2|Lich master|Undead|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_liches:3|Ancient lich|Undead|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_skeleton1:0|Skeleton warrior|Undead|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_skeleton2:0|Skeleton champion|Undead|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_demon1:0|Winged demon|Demon|2x2|11|10|10|10|10|50|||10-20|||list1||};
-{monsters_demon2:0|Demon|Demon|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_eye1:0|Eye servant|Beast|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_eye2:0|Gazer|Beast|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_eye3:0|Eye master|Beast|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_eye4:0|Beholder|Beast|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_hydra1:0|Hydra|Beast|2x2|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_misc:0|Gecko|Beast|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_misc:1|Young gargoyle|Beast|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_misc:2|Gargoyle|Beast|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_misc:8|Lusca|Beast|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_misc:9|Lusca master|Beast|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_rats:4|Basilisk|Beast|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_cyclops:0|Cyclops|Beast|2x3|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_mage:0|Mage|Magic|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_mage2:0|Mage apprentice|Magic|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_mage3:0|Mage master|Magic|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_mage4:0|Sorcerer|Magic|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_misc:10|Abomination|Magic|1x1|11|10|10|10|10|50|||1-2|||list1||};
-{monsters_misc:11|Starved abomination|Magic|1x1|11|10|10|10|10|50|||1-2|||list1||};
+{monsters_man1:0|Traveller1|debugNPC1|||10|10|10|10|50|||1-2|||debugshop1|debugshop|};
+{monsters_man1:0|Traveller2|debugNPC2|||10|10|10|10|50|||1-2|||debugshop1|debugquest|};
+{monsters_insects:0|Black ant|Insect|||10|10|10|10|50|||1-2|||debuglist1||};
+{monsters_insects:1|Small wasp|Insect|||10|10|10|10|50|||1-2|||debuglist1||};
+{monsters_demon1:0|Winged demon|Demon|2x2||10|10|10|10|50|||10-20|||debuglist1||};
+{monsters_misc:5|Troll|Dwarf|||10|10|10|2|50|||1-2|||debuglist1||};
 	</string>
 	
 	<string name="monsterlist_crossglen_animals">
 [Icon|Name|Tags|Size|Exp|HP_max|AP_max|AP_move|AtkCost|AtkPct|CritPct|CritMult|DMG|BlkPct|DMG_res|Drop|Phrase|];
-{monsters_rats:0|Tiny rat|trainingrat||2|2|||10|50|||1|||trainingrat||};
-{monsters_rats:1|Cave rat|crossglen_caverat||6|5|||10|90|||2|||rat||};
-{monsters_rats:1|Tough cave rat|crossglen_caverat2||11|5|||5|90|||3|||rat||};
-{monsters_rats:3|Strong cave rat|crossglen_caveboss||20|20|||5|100|||2-4|10||caveratboss||};
-{monsters_insects:0|Black ant|crossglen_ant||4|3|||10|70|||1-2|||insect||};
-{monsters_insects:1|Small wasp|crossglen_wasp||4|4|||10|70|||1-2|||wasp||};
-{monsters_insects:4|Beetle|crossglen_beetle||6|4|||10|70|||3|||insect||};
-{monsters_insects:1|Forest wasp|forestwasp||5|6|||10|70|||1-2|||wasp||};
-{monsters_insects:0|Forest ant|forestant||5|4|||10|90|||1-2|10||insect||};
-{monsters_insects:2|Yellow forest ant|forestant||6|5|||10|100|||2|15||insect||};
-{monsters_dogs:1|Small rabid dog|forestdog||6|6|||10|90|||2|||canine||};
-{monsters_snakes:1|Forest Snake|forestsnake||7|7|||10|110|||1-2|10||snake||};
-{monsters_snakes:3|Young Cave Snake|cavesnake1||13|8|||5|110|10|2|2|10||snake||};
-{monsters_snakes:3|Cave Snake|cavesnake1||17|12|||5|110|20|2|2|15||snake||};
-{monsters_snakes:3|Venomous Cave Snake|cavesnake2||21|15|||5|110|40|2|2|10||snake||};
-{monsters_snakes:3|Tough Cave Snake|cavesnake2||22|21|||5|110|20|2|2|15||snake||};
-{monsters_rats:4|Basilisk|cavesnake2_boss||43|40|||7|40|||3-9|50|2|cavecritter||};
-{monsters_liches:0|Snake servant|cavesnake3||37|35|||5|80|40|3|2-3|10|1|lich1||};
-{monsters_liches:1|Snake master|cavesnake3_boss||67|55|||5|60|100|3|1-4|10|4|snakemaster|snakemaster|};
-{monsters_dogs:6|Rabid Boar|forestboar||23|20|||5|110|||3|30||canineboss||};
-{monsters_dogs:3|Rabid Fox|fox1||28|25|||5|100|||3|50||canine||};
-{monsters_insects:2|Yellow cave ant|pitcave1||20|20|||3|30|||1|80||insect||};
-{monsters_misc:0|Young teeth critter|pitcave2||17|15|||2|50|||1|70||cavecritter||};
-{monsters_misc:0|Teeth critter|pitcave2||28|25|||2|60|10|3|1|70||cavecritter||};
-{monsters_misc:5|Young minotaur|pitcave2||46|45|||6|20|40|3|4|50|2|cavemonster||};
-{monsters_misc:5|Strong minotaur|pitcave2_boss||57|53|||6|40|50|3|5|50|2|cavemonster||};
-{monsters_liches:0|Irogotu|pitcave_boss||88|61|||3|50|40|3|2-5|70|4|irogotu|irogotu|};
+{monsters_rats:0|Tiny rat|trainingrat|||2|||10|50|||1|||trainingrat||};
+{monsters_rats:1|Cave rat|crossglen_caverat|||5|||10|90|||2|||rat||};
+{monsters_rats:1|Tough cave rat|crossglen_caverat2|||5|||5|90|||3|||rat||};
+{monsters_rats:3|Strong cave rat|crossglen_caveboss|||20|||5|100|||2-4|10||caveratboss||};
+{monsters_insects:0|Black ant|crossglen_ant|||3|||10|70|||1-2|||insect||};
+{monsters_insects:1|Small wasp|crossglen_wasp|||4|||10|70|||1-2|||wasp||};
+{monsters_insects:4|Beetle|crossglen_beetle|||4|||10|70|||3|||insect||};
+{monsters_insects:1|Forest wasp|forestwasp|||6|||10|70|||1-2|||wasp||};
+{monsters_insects:0|Forest ant|forestant|||4|||10|90|||1-2|10||insect||};
+{monsters_insects:2|Yellow forest ant|forestant|||5|||10|100|||2|15||insect||};
+{monsters_dogs:1|Small rabid dog|forestdog|||6|||10|90|||2|||canine||};
+{monsters_snakes:1|Forest Snake|forestsnake|||7|||10|110|||1-2|10||snake||};
+{monsters_snakes:3|Young Cave Snake|cavesnake1|||8|||5|110|10|2|2|10||snake||};
+{monsters_snakes:3|Cave Snake|cavesnake1|||12|||5|110|20|2|2|15||snake||};
+{monsters_snakes:3|Venomous Cave Snake|cavesnake2|||15|||5|110|40|2|2|10||snake||};
+{monsters_snakes:3|Tough Cave Snake|cavesnake2|||21|||5|110|20|2|2|15||snake||};
+{monsters_rats:4|Basilisk|cavesnake2_boss|||40|||7|40|||3-9|50|2|cavecritter||};
+{monsters_liches:0|Snake servant|cavesnake3|||35|||5|80|40|3|2-3|10|1|lich1||};
+{monsters_liches:1|Snake master|cavesnake3_boss|||55|||5|60|100|3|1-4|10|4|snakemaster|snakemaster|};
+{monsters_dogs:6|Rabid Boar|forestboar|||20|||5|110|||3|30||canineboss||};
+{monsters_dogs:3|Rabid Fox|fox1|||25|||5|100|||3|50||canine||};
+{monsters_insects:2|Yellow cave ant|pitcave1|||20|||3|30|||1|80||insect||};
+{monsters_misc:0|Young teeth critter|pitcave2|||15|||2|50|||1|70||cavecritter||};
+{monsters_misc:0|Teeth critter|pitcave2|||25|||2|60|10|3|1|70||cavecritter||};
+{monsters_misc:5|Young minotaur|pitcave2|||45|||6|20|40|3|4|50|2|cavemonster||};
+{monsters_misc:5|Strong minotaur|pitcave2_boss|||53|||6|40|50|3|5|50|2|cavemonster||};
+{monsters_liches:0|Irogotu|pitcave_boss|||61|||3|50|40|3|2-5|70|4|irogotu|irogotu|};
 	</string>
 	
 	<string name="monsterlist_fallhaven_animals">
 [Icon|Name|Tags|Size|Exp|HP_max|AP_max|AP_move|AtkCost|AtkPct|CritPct|CritMult|DMG|BlkPct|DMG_res|Drop|Phrase|];
-{monsters_ghost2:0|Lost spirit|minorhaunt1||23|15|||10|50|||1-2|10|3|haunt|haunt|};
-{monsters_ghost2:0|Lost soul|minorhaunt2||28|15|||10|50|||1-2|10|4|haunt||};
-{monsters_ghost1:0|Haunting|haunt3|1x1|40|31|10|10|5|120|20|2|1-5|30|1|haunt||};
-{monsters_skeleton1:0|Skeletal warrior|skeleton1|1x1|45|52|10|10|5|60|||1-3|40|1|skeleton||};
-{monsters_skeleton2:0|Skeletal master|skeletonmaster|1x1|47|52|10|10|5|70|||1-3|30|2|skeleton||};
-{monsters_skeleton1:0|Skeleton|skeleton1|1x1|27|35|10|10|10|60|||1-4|40||skeleton||};
+{monsters_ghost2:0|Lost spirit|minorhaunt1|||15|||10|50|||1-2|10|3|haunt|haunt|};
+{monsters_ghost2:0|Lost soul|minorhaunt2|||15|||10|50|||1-2|10|4|haunt||};
+{monsters_ghost1:0|Haunting|haunt3|||31|10|10|5|120|20|2|1-5|30|1|haunt||};
+{monsters_skeleton1:0|Skeletal warrior|skeleton1|||52|10|10|5|60|||1-3|40|1|skeleton||};
+{monsters_skeleton2:0|Skeletal master|skeletonmaster|||52|10|10|5|70|||1-3|30|2|skeleton||};
+{monsters_skeleton1:0|Skeleton|skeleton1|||35|10|10|10|60|||1-4|40||skeleton||};
 
-{monsters_ghost2:0|Guardian of the catacombs|catacombguard1|1x1|18|6|10|10|10|10|||1-6|10|3|catacombguard|catacombguard|};
-{monsters_rats:0|Catacomb rat|catacombrat1|1x1|14|15|10|10|3|60|||1|40||catacombrat||};
-{monsters_rats:3|Large catacomb rat|catacombrat1|1x1|20|21|10|10|3|60|10|2|1-2|40||catacombrat||};
-{monsters_ghost1:0|Ghostly visage|catacombguard2|1x1|21|16|10|10|5|20|||1-4|20|2|catacombguard||};
-{monsters_ghost2:0|Spectre|catacombguard2|1x1|28|15|10|10|3|50|||1-5|60|2|catacombguard||};
-{monsters_ghost2:0|Apparition|catacombguard3|1x1|24|17|10|10|3||||1-5|70|2|catacombguard||};
-{monsters_ghost1:0|Shade|catacombguard3|1x1|25|16|10|10|5|20|||1-4|20|3|catacombguard||};
-{monsters_misc:2|Young gargoyle|catacombguard3|1x1|42|35|10|10|10|110|10|2|2-5|70|1|catacombguard||};
-{monsters_liches:2|Ghost of Luthor|luthor|1x1|95|86|10|10|5|120|15|2|2-5|50|3|luthor|luthor|};
+{monsters_ghost2:0|Guardian of the catacombs|catacombguard1|||6|10|10|10|10|||1-6|10|3|catacombguard|catacombguard|};
+{monsters_rats:0|Catacomb rat|catacombrat1|||15|10|10|3|60|||1|40||catacombrat||};
+{monsters_rats:3|Large catacomb rat|catacombrat1|||21|10|10|3|60|10|2|1-2|40||catacombrat||};
+{monsters_ghost1:0|Ghostly visage|catacombguard2|||16|10|10|5|20|||1-4|20|2|catacombguard||};
+{monsters_ghost2:0|Spectre|catacombguard2|||15|10|10|3|50|||1-5|60|2|catacombguard||};
+{monsters_ghost2:0|Apparition|catacombguard3|||17|10|10|3||||1-5|70|2|catacombguard||};
+{monsters_ghost1:0|Shade|catacombguard3|||16|10|10|5|20|||1-4|20|3|catacombguard||};
+{monsters_misc:2|Young gargoyle|catacombguard3|||35|10|10|10|110|10|2|2-5|70|1|catacombguard||};
+{monsters_liches:2|Ghost of Luthor|luthor|||86|10|10|5|120|15|2|2-5|50|3|luthor|luthor|};
 	</string>
 	
 	<string name="monsterlist_crossglen_npcs">
@@ -185,6 +108,50 @@
 {monsters_men2:9|Gaela|gaela|1x1|0|1|1|1|1|0|||0||||gaela|};
 {monsters_mage2:0|Unnmir|unnmir|1x1|0|1|1|1|1|0|||0||||unnmir|};
 {monsters_men:1|Rigmor|rigmor|1x1|0|1|1|1|1|0|||0||||rigmor|};
+
+{monsters_men2:2|Jakrar|fallhaven_lumberjack|||1|1|1|1|1|||1|1|||fallhaven_lumberjack|};
+{monsters_mage2:0|Alaun|alaun|||1|1|1|1|1|||1|1|||alaun|};
+{monsters_man1:0|Busy Farmer|fallhaven_farmer1|||1|1|1|1|1|||1|1|||fallhaven_farmer1|};
+{monsters_mage2:0|Old Farmer|fallhaven_farmer2|||1|1|1|1|1|||1|1|||fallhaven_farmer2|};
+{monsters_men:3|Khorand|khorand|||1|1|1|1|1|||1|1|||khorand|};
+
+{monsters_mage:0|Vacor|vacor|||72|||5|110|||4-8|40|2|vacor|vacor|};
+{monsters_men:8|Unzel|unzel|||59|||10|80|30|3|5-9|40|2|unzel|unzel|};
+{monsters_men2:9|Shady Bandit|fallhaven_bandit|||45|||5|70|30|3|3-9|50|2|fallhaven_bandit|fallhaven_bandit|};
+	</string>
+
+	<string name="monsterlist_wilderness">
+[Icon|Name|Tags|Size|Exp|HP_max|AP_max|AP_move|AtkCost|AtkPct|CritPct|CritMult|DMG|BlkPct|DMG_res|Drop|Phrase|];
+{monsters_dogs:3|Wild Fox|fox2|||25|||5|100|||4-5|40||canine||};
+{monsters_insects:1|Stinging wasp|forestwasp2|||15|||10|150|||1-2|60||wasp||};
+{monsters_dogs:6|Wild Boar|forestboar2|||20|||5|110|||3|30||canineboss||};
+{monsters_insects:4|Forest Beetle|forestbeetle|||14|||10|150|||2-4|60|2|insect||};
+{monsters_dogs:4|Wolf|forestwolf1|||30|10|3|5|110|||3-6|30||canine||};
+{monsters_snakes:4|Forest serpent|forestserpent1|||20|10|5|3|150|30|2|2-3|60||snake2||};
+{monsters_snakes:4|Vicious forest serpent|forestserpent2|||27|10|5|3|150|30|2|3-4|50||snake2||};
+{monsters_dogs:6|Anklebiter|forestboar3|||31|||5|150|||3-9|60|3|canine2||};
+{monsters_men:3|Flagstone Sentry|flagstone_sentry|||1|1|1|1|1|||1|1|||flagstone_sentry|};
+{monsters_men:0|Escaped prisoner|prisoner1|||15|||10|50|||3-7|20||prisoner|prisoner1|};
+{monsters_misc:11|Starving prisoner|prisoner2|||10|||3|60|||3-5|60||prisoner|prisoner2|};
+{monsters_skeleton1:0|Bone warrior|skeleton2|||32|||5|120|||3-9|60|2|skeleton2||};
+{monsters_skeleton1:0|Bone champion|skeleton3|||49|||5|130|||4-9|60|2|skeleton3||};
+{monsters_liches:0|Undead warden|flagstone_guard0|||57|||5|120|20|2|4-8|60|1|flagstone_guard0|flagstone_guard0|};
+{monsters_demon2:0|Cave guardian|flagstone_guard1|||61|||5|150|10|3|4-10|90|2|flagstone_guard1|flagstone_guard1|};
+{monsters_demon1:0|Winged demon|flagstone_guard2|2x2||82|||5|90|10|2|4-12|70|5|flagstone_guard2|flagstone_guard2|};
+{monsters_man1:0|Narael|narael|||1|1|1|1|1|||1|1|||narael|};
+{monsters_zombie1:0|Rotting corpse|undead1|||71|||10|30|50|2|2-5|30|2|undead1|zombie1|};
+{monsters_zombie1:0|Walking corpse|undead1|||90|||10|30|40|2|2-4|30|2|undead1||};
+{monsters_misc:2|Gargoyle|undead1|||47|||10|110|10|2|3-7|70|2|undead1||};
+{monsters_misc:1|Fledgling Gargoyle|undead1|||35|||10|110|||3-6|60|2|undead1||};
+{monsters_rats:3|Large cave rat|undeadrat1|||21|10|10|3|60|10|2|3-4|40||catacombrat||};
+{monsters_dogs:5|Pack Leader|pack_boss|||65|||5|90|20|2|2-10|40|4|pack_boss||};
+{monsters_dogs:4|Pack hunter|pack3|||45|||5|90|10|2|2-7|40|3|pack3||};
+{monsters_dogs:4|Rabid Wolf|pack2|||42|||5|90|||2-6|50|3|pack2||};
+{monsters_dogs:3|Fledgling wolf|pack2|||42|||3|70|||2-5|50|3|pack2||};
+{monsters_dogs:4|Young wolf|pack1|||35|||3|60|||2-5|30|2|pack1||};
+{monsters_dogs:2|Hunting dog|pack1|||25|||5|60|||2-5|50||pack1||};
+{monsters_men:8|Highwayman|bandit1|||54|||5|90|50|2|2-4|30|2|bandit1|bandit1|};
 	</string>
 	
+	
 </resources>
diff --git a/AndorsTrail/res/values/questlist.xml b/AndorsTrail/res/values/questlist.xml
new file mode 100644
index 000000000..571ae69b1
--- /dev/null
+++ b/AndorsTrail/res/values/questlist.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<resources>
+	<string name="questlist_debug">
+[ID|Name|DisplayText|ShowInLog|];
+{debugquest|Debug Quest|You should give some items to the NPC. (Iron swords)\n\nTest.|1|};
+	</string>
+	
+	<string name="questlist">
+[ID|Name|DisplayText|ShowInLog|];
+{andor|Search for Andor|Find out where Andor went.|1|};
+{mikhail_bread|Breakfast bread||1|};
+{mikhail_rats|Rats!||1|};
+{leta|Missing husband||1|};
+{odair|Rat infestation||1|};
+{bonemeal|Disallowed substance||1|};
+{crossglen|TODO|Not complete yet.|0|};
+{jan|Fallen friends||1|};
+{bucus|Key of Luthor||1|};
+{fallhavendrunk|Drunken tale||1|};
+{calomyran|Calomyran secrets||1|};
+{fallhaventavern|Room to rent|Access to the room in Fallhaven tavern.|0|};
+{nocmar|Lost treasures||1|};
+{arcir|Elythara|Not done yet.|0|};
+
+{flagstone|Ancient secrets|Investigate the secrets of Flagstone.|1|};
+{vacor|Missing pieces|Help Vacor find the missing pieces of his rift spell.|1|};
+	</string>
+</resources>
diff --git a/AndorsTrail/res/values/questlog.xml b/AndorsTrail/res/values/questlog.xml
new file mode 100644
index 000000000..93bedffd7
--- /dev/null
+++ b/AndorsTrail/res/values/questlog.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<resources>
+	<string name="questlog_debug">
+[QuestID|Progress|LogText|RewardExp|ResolvesQuest|];
+{debugquest|10|I have talked to the NPC||0|};
+{debugquest|20|I have asked the NPC for more info.|20|0|};
+{debugquest|100|I have given the items to the NPC|40|1|};
+	</string>
+	
+	<string name="questlog_crossglen">
+[QuestID|Progress|LogText|RewardExp|ResolvesQuest|];
+{andor|1|My father Mikhail says that Andor has not been home since yesterday. I should go look for him in the village.||0|};
+{mikhail_bread|100|I have brought the bread to Mikhail.||1|};
+{mikhail_bread|10|Mikhail wants me to go buy a loaf of bread from Mara at the town hall.||0|};
+{mikhail_rats|100|I have killed the two rats in our garden.|20|1|};
+{mikhail_rats|10|Mikhail wants me two go check our garden for some rats. I should kill the rats in our garden and return to Mikhail. If I get hurt, I can come back to the bed and rest to regain my health.||0|};
+{leta|10|Leta in Crossglen village wants me to look for her husband Oromir.||0|};
+{leta|20|I have found Oromir in Crossglen village, hiding from his wife Leta.||0|};
+{leta|100|I have told Leta that Oromir is hiding in Crossglen village.|30|1|};
+{odair|10|Odair wants me to clear the supply cave in Crossglen village of rats. In particular, I should kill the large rat and return to Odair.||0|};
+{odair|100|I have helped Odair clear out the rats in the supply cave in Crossglen village.|30|1|};
+{bonemeal|10|Leonid in Crossglen town hall tells me that there was a disturbance in the village some weeks ago. Apparently, Lord Geomyr has banned all use of bonemeal as healing substance.\n\nTharal, the town priest should know more.||0|};
+{bonemeal|20|Tharal does not want to talk about bonemeal. I might be able to persuade him by bringing him 5 insect wings.||0|};
+{bonemeal|30|Tharal tells me that bonemeal is very potent as healing substance, and is quite upset that it is not allowed anymore. I should go see Thoronir in Fallhaven if I want to learn more. I should tell him the password \'Glow of the shadow\'.||0|};
+{bonemeal|40|I have talked to Thoronir in Fallhaven. He might be able to mix me a bonemeal potion if I bring him 5 skeletal bones. There should be some skeletons in an abandoned house north of Fallhaven.||0|};
+{bonemeal|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|};
+{andor|10|Leonid tells me that he saw Andor talking to Gruil. I should go ask Gruil if he knows more.||0|};
+{andor|20|Gruil wants me to bring him a poison gland. Then he might talk more. He tells me that some poisonous snakes have such a gland.||0|};
+{andor|30|Gruil tells me that Andor was looking for someone called Umar. I should go ask his friend Gaela in Fallhaven to the east.||0|};
+{crossglen|1|||0|};
+{jan|10|Jan tells me his story about him, Gandir and Irogotu. The three former friends went down the hole to dig for a hidden treasure, but they started fighting. Irogotu killed Gandir in his rage.\nI should bring back Gandir\'s ring from Irogotu, and see Jan when I have it.||0|};
+{jan|100|I have brought Jan the ring of Gandir, and avenged his friend. Irogotu is dead.|150|1|};
+	</string>
+	
+	<string name="questlog_fallhaven">
+[QuestID|Progress|LogText|RewardExp|ResolvesQuest|];
+{bucus|10|Bucus in Fallhaven might know something about Andor. He wants me to bring him the key of Luthor from the catacombs beneath Fallhaven church.||0|};
+{bucus|20|The catacombs beneath Fallhaven church are closed off. Athamyr is the only one with both permission and the bravery to enter them. I should go see him in his house southwest of the church.||0|};
+{bucus|30|Athamyr wants me to bring him some cooked meat, then maybe he will want to talk more.||0|};
+{bucus|40|I have brought some cooked meat to Athamyr.|70|0|};
+{bucus|50|Athamyr has given me permission to enter the catacombs beneath Fallhaven church.||0|};
+{bucus|100|I have brought Bucus the key of Luthor.|215|1|};
+{andor|40|I talked to Gaela in Fallhaven. He tells me to go see Bucus and ask about the thieves guild.||0|};
+{andor|50|Bucus has allowed me to enter the hatch in the derelict house in Fallhaven. I should go talk to Umar.||0|};
+{fallhavendrunk|10|A drunk outside Fallhaven tavern began telling me his story, but wants me to bring him some mead. I don\'t know if his story will lead anywhere though.||0|};
+{fallhavendrunk|100|The drunk told me he used to travel with Unnmir. I should go talk to Unnmir.||1|};
+{nocmar|10|Unnmir told me he used to be an adventurer, and gave me a hint to go see Nocmar. His house is just southwest of the tavern in Fallhaven.||0|};
+{nocmar|20|Nocmar tells me he used to be a smith. But Lord Geomyr has banned the use of heartsteel, so he cannot forge his weapons anymore.\nIf I can find a heartstone and bring it to Nocmar, he should be able to forge the heartsteel again.||0|};
+{nocmar|200|I have brought a heartstone to Nocmar. He should have heartsteel items available now.|120|1|};
+{fallhaventavern|10|||1|};
+{arcir|10|||0|};
+{calomyran|10|An old man standing outside in Fallhaven has lost his book \'Calomyran Secrets\'. I should go look for it. Maybe in Arcir\'s house to the south?||0|};
+{calomyran|20|I found a torn page of a book called \'Calomyran Secrets\' with the name \'Larcal\' written on it.||0|};
+{calomyran|100|I gave the book back to the old man.|60|1|};
+	</string>
+
+	<string name="questlog_wilderness">
+[QuestID|Progress|LogText|RewardExp|ResolvesQuest|];
+{vacor|10|A mage called Vacor in southwest Fallhaven has been trying to cast a rift spell.\nThere was something not right about him, he seemed very obsessed with his spell. Something about him gaining a power from it.||0|};
+{vacor|20|Vacor wants me to bring him four pieces of the rift spell that he claims was stolen from him. The bandits should be somewhere south of Fallhaven.||0|};
+{vacor|30|I have brought the four pieces of the rift spell to Vacor.|120|0|};
+{vacor|40|Vacor tells me about his former apprentice Unzel, that had started to question Vacor. Vacor now wants me to kill Unzel. I should be able to find him to the southwest outside of Fallhaven. I should bring his signet ring to Vacor once I have killed him.||0|};
+{vacor|50|Unzel gives me a choice to side with either him or Vacor.||0|};
+{vacor|51|I have chosen to side with Unzel. I should go to southwest Fallhaven to talk to Vacor about Unzel and the Shadow.||0|};
+{vacor|53|I started a fight with Unzel. I should bring his ring to Vacor once he is dead.||0|};
+{vacor|54|I started a fight with Vacor. I should bring his ring to Unzel once he is dead.||0|};
+{vacor|60|I have killed Unzel and told Vacor about the deed.|160|1|};
+{vacor|61|I have killed Vacor and told Unzel about the deed.|160|1|};
+	</string>
+
+	<string name="questlog_flagstone">
+[QuestID|Progress|LogText|RewardExp|ResolvesQuest|];
+{flagstone|10|I met a guard on sentry outside a fortress called Flagstone. The guard told me about Flagstone that used to be a prison camp for runaway workers from Mount Galmore. Recently, there has been an increase in undead monsters pouring out from Flagstone. I should investigate the source of the undead monsters. The guard tells me to return to him if I need help.||0|};
+{flagstone|20|I found a dug out tunnel beneath Flagstone, that seems to lead to a larger cave. The cave is guarded by a demon that I am not even able to approach. Maybe the guard outside Flagstone knows more?||0|};
+{flagstone|30|The guard tells me that the former warden used to have a necklace that he always wore. The necklace probably has the words required to approach the demon. I should return to the guard to decipher any message on the necklace once I have found it.||0|};
+{flagstone|31|I found the former warden of Flagstone on the upper level.||0|};
+{flagstone|40|I have learned the words required to approach the demon beneath Flagstone. \'Daylight Shadow\'.|160|0|};
+{flagstone|50|Deep beneath Flagstone, I found the source of the undead infestation. A creature born from the grief of the former prisoners of Flagstone.||0|};
+{flagstone|60|I found one prisoner, Narael, alive deep beneath Flagstone. Narael was once a citizen of Nor City. He is too weak to walk by himself, but if I can find his wife in Nor City, I would be handsomely rewarded.|210|1|};
+	</string>
+
+</resources>
diff --git a/AndorsTrail/res/values/strings.xml b/AndorsTrail/res/values/strings.xml
index 1454de8a3..053720923 100644
--- a/AndorsTrail/res/values/strings.xml
+++ b/AndorsTrail/res/values/strings.xml
@@ -7,19 +7,44 @@
 	<string name="exit_to_menu">Exit to menu</string>
 	<string name="menu_pause">Pause</string>
 	<string name="menu_settings">Preferences</string>
+	<string name="menu_save">Save</string>
+	<string name="menu_load">Load</string>
+	<string name="menu_save_gamesaved">Game was saved to slot %1$d</string>
+	<string name="menu_save_failed">Failed to save game! Is the SD card mounted and writable?</string>
 
-	<string-array name="display_loot">
+	<string name="loadsave_title_save">Save game</string>
+	<string name="loadsave_title_load">Load saved game</string>
+	<string name="loadsave_selectslot">Select slot</string>
+	<string name="loadsave_slot_empty">(empty)</string>
+	<string name="savegame_currenthero_displayinfo">level %1$d, %2$d exp, %3$d gold</string>
+	
+	<string-array name="preferences_display_loot">
 		<item>Show loot dialog box</item>
 		<item>Show short notification</item>
 		<item>Do not display</item>
 	</string-array>
-	<string-array name="display_loot_values">
+	<string-array name="preferences_display_loot_values">
 		<item>0</item>
 		<item>1</item>
 		<item>2</item>
 	</string-array>
+	<string-array name="preferences_attackspeed">
+		<item>Instant (no animations)</item>
+		<item>Fast</item>
+		<item>Normal</item>
+		<item>Slow</item>
+	</string-array>
+	<string-array name="preferences_attackspeed_values">
+		<item>0</item>
+		<item>400</item>
+		<item>1000</item>
+		<item>1500</item>
+	</string-array>
 	
 	<string name="dialog_loading_message">Loading resources...</string>
+	<string name="dialog_loading_failed_title">Load Failed</string>
+	<string name="dialog_loading_failed_message">Andor\'s Trail was unable to load the savegame file.\n\n:(\n\nThe file may be damaged or incomplete.</string>
+	<string name="dialog_loading_failed_incorrectversion">Andor\'s Trail was unable to load the savegame file. This savegame file is created with a newer version than what is currently running.</string>
 	
 	<string name="dialog_close">Close</string>
 	
@@ -31,7 +56,7 @@
 	<string name="dialog_paused_resume">Resume</string>
 
 	<string name="dialog_monsterencounter_title">Encounter</string>
-	<string name="dialog_monsterencounter_message">Do you want to attack?\nDifficulty: %s</string>
+	<string name="dialog_monsterencounter_message">Do you want to attack?\nDifficulty: %1$s</string>
 	<string name="dialog_monsterencounter_info">Info</string>
 
 	<string name="status_hp">HP:</string>
@@ -49,46 +74,50 @@
 	<string name="heroinfo_totalexperience">Total experience</string>	
 	<string name="heroinfo_wornequipment">Worn equipment</string>
 	<string name="heroinfo_inventory">Inventory</string>
-	<string name="heroinfo_gold">Gold: %d</string>
+	<string name="heroinfo_gold">Gold: %1$d</string>
 	<string name="heroinfo_actionpoints">Action points (AP):</string>
+	<string name="heroinfo_quests">Quests</string>
 	
-	<string name="combat_attack">Attack (%d AP)</string>
-	<string name="combat_move">Move (%d AP)</string>
+	<string name="combat_attack">Attack (%1$d AP)</string>
+	<string name="combat_move">Move (%1$d AP)</string>
 	<string name="combat_use">Use item</string>
 	<string name="combat_spell">Spell</string>
 	<string name="combat_endturn">End turn</string>
-	<string name="combat_endcombat">End combat</string>
-	<string name="combat_status_ap">AP: %d</string>
+	<!-- <string name="combat_endcombat">End combat</string>-->
+	<string name="combat_flee">Flee</string>
+	<string name="combat_begin_flee">You can now flee combat by clicking in the direction you want to move.</string>
+	<string name="combat_flee_failed">You failed to flee!</string>
+	<string name="combat_status_ap">AP: %1$d</string>
 	<string name="combat_monsterhealth">HP:</string>
-	<string name="combat_monsteraction">%s is attacking.</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_result_monstermiss">%s misses!</string>
-	<string name="combat_result_monsterhit">%s hits you for %d hp!</string>
-	<string name="combat_result_monsterhitcritical">%s gets a critical hit for %d hp!</string>
+	<string name="combat_monsteraction">%1$s is attacking.</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_result_monstermiss">%1$s misses!</string>
+	<string name="combat_result_monsterhit">%1$s hits you for %2$d hp!</string>
+	<string name="combat_result_monsterhitcritical">%1$s gets a critical hit for %2$d hp!</string>
 	<string name="combat_result_heromiss">Your attack misses.</string>
-	<string name="combat_result_herohit">You hit %s for %d hp!</string>
-	<string name="combat_result_herohitcritical">You get a critical hit on %s for %d hp!</string>
-	<string name="combat_result_herokillsmonster">%s dies!</string>
+	<string name="combat_result_herohit">You hit %1$s for %2$d hp!</string>
+	<string name="combat_result_herohitcritical">You get a critical hit on %1$s for %2$d hp!</string>
+	<string name="combat_result_herokillsmonster">%1$s dies!</string>
 	<string name="combat_not_enough_ap">Not enough AP left this round.</string>
-	<string name="combat_hero_dies">You fall unconscious but fortunately wake up alive. You lost %d experience.</string>
+	<string name="combat_hero_dies">You fall unconscious but fortunately wake up alive. You lost %1$d experience.</string>
 		
 	<string name="inventory_info">Info</string>
 	<string name="inventory_equip">Equip</string>
 	<string name="inventory_unequip">Unequip</string>
 	<string name="inventory_use">Use</string>
 	<string name="inventory_drop">Drop</string>
-	<string name="inventory_item_used">You used %s.</string>
-	<string name="inventory_item_dropped">%s was dropped.</string>
-	<string name="inventory_item_equipped">You equipped %s.</string>
+	<string name="inventory_item_used">You used %1$s.</string>
+	<string name="inventory_item_dropped">%1$s was dropped.</string>
+	<string name="inventory_item_equipped">You equipped %1$s.</string>
 
 	<string name="dialog_loot_pickall">Pick up all</string>
-	<string name="dialog_loot_foundgold">You found %d gold. </string>
-	<string name="dialog_loot_pickedupitems">You picked up %d items.</string>
+	<string name="dialog_loot_foundgold">You found %1$d gold. </string>
+	<string name="dialog_loot_pickedupitems">You picked up %1$d items.</string>
 	<string name="dialog_groundloot_title">Items</string>
 	<string name="dialog_groundloot_message">You found some items. </string>
 	<string name="dialog_monsterloot_title">Victory</string>
 	<string name="dialog_monsterloot_message">You survived the encounter. </string>
-	<string name="dialog_monsterloot_gainedexp">You gained %d experience. </string>
+	<string name="dialog_monsterloot_gainedexp">You gained %1$d experience. </string>
     
     <string name="monster_difficulty_veryeasy">Very easy</string>
     <string name="monster_difficulty_easy">Easy</string>
@@ -123,10 +152,10 @@
 	<string name="iteminfo_action_use">Use</string>
 	<string name="iteminfo_action_equip">Equip</string>
 	<string name="iteminfo_action_unequip">Unequip</string>
-	<string name="iteminfo_action_use_ap">Use (%d AP)</string>
-	<string name="iteminfo_action_equip_ap">Equip (%d AP)</string>
-	<string name="iteminfo_action_unequip_ap">Unequip (%d AP)</string>
-	<string name="iteminfo_effect_heal">Restores %s HP</string>	
+	<string name="iteminfo_action_use_ap">Use (%1$d AP)</string>
+	<string name="iteminfo_action_equip_ap">Equip (%1$d AP)</string>
+	<string name="iteminfo_action_unequip_ap">Unequip (%1$d AP)</string>
+	<string name="iteminfo_effect_heal">Restores %1$s HP</string>	
 
 	<string name="itemcategory_money">Money</string>
 	<string name="itemcategory_weapon">Weapon</string>
@@ -144,34 +173,36 @@
 	<string name="startscreen_newgame">New game</string>
 	<string name="startscreen_newgame_confirm">You will lose your current game and your current character, are you sure you want to start a new game?</string>
 	<string name="startscreen_about">About/help</string>
-	<string name="startscreen_currenthero">%s, level %d</string>
 	<string name="startscreen_enterheroname">Enter hero name</string>
+	<string name="startscreen_load">Load</string>
 	
-	<string name="conversation_title">%s says</string>
-	<string name="conversation_rewardexp"> [You gained %d experience]</string>
-	<string name="conversation_rewardgold"> [You gained %d gold]</string>
-	<string name="conversation_lostgold"> [You lost %d gold]</string>
+	<string name="conversation_title">%1$s says</string>
+	<string name="conversation_rewardexp"> [You gained %1$d experience]</string>
+	<string name="conversation_rewardgold"> [You gained %1$d gold]</string>
+	<string name="conversation_lostgold"> [You lost %1$d gold]</string>
+	<string name="conversation_rewarditem"> [You gained an item]</string>
+	<string name="conversation_rewarditems"> [You gained %1$d items]</string>
 	
 	<string name="shop_buy">Buy</string>
 	<string name="shop_sell">Sell</string>
 	<string name="shop_infoitem">Info</string>
-	<string name="shop_buyitem">Buy (%d gold)</string>
-	<string name="shop_sellitem">Sell (%d gold)</string>
-	<string name="shop_yourgold">Your gold: %d</string>
-	<string name="shop_item_bought">%s bought.</string>
-	<string name="shop_item_sold">%s sold.</string>
+	<string name="shop_buyitem">Buy (%1$d gold)</string>
+	<string name="shop_sellitem">Sell (%1$d gold)</string>
+	<string name="shop_yourgold">Your gold: %1$d</string>
+	<string name="shop_item_bought">%1$s bought.</string>
+	<string name="shop_item_sold">%1$s sold.</string>
 	
 	<string name="levelup_title">Level up</string>
-	<string name="levelup_description">Welcome to level %d!</string>
+	<string name="levelup_description">Welcome to level %1$d!</string>
 	<string name="levelup_buttontext">Level up</string>
-	<string name="levelup_add_health">Increase health (+%d HP)</string>
-	<string name="levelup_add_health_description">Adds %d to your maximum health.</string>
-	<string name="levelup_add_attackchance">Increase attack chance (+%d \%)</string>
-	<string name="levelup_add_attackchance_description">Adds %d\% to your base attack chance.</string>
-	<string name="levelup_add_attackdamage">Increase attack damage (+%d)</string>
-	<string name="levelup_add_attackdamage_description">Adds %d\% to your base attack damage.</string>
-	<string name="levelup_add_blockchance">Increase block chance (+%d \%)</string>
-	<string name="levelup_add_blockchance_description">Adds %d\% to your base block chance.</string>
+	<string name="levelup_add_health">Increase health (+%1$d HP)</string>
+	<string name="levelup_add_health_description">Adds %1$d to your maximum health.</string>
+	<string name="levelup_add_attackchance">Increase attack chance (+%1$d %%)</string>
+	<string name="levelup_add_attackchance_description">Adds %1$d%% to your base attack chance.</string>
+	<string name="levelup_add_attackdamage">Increase attack damage (+%1$d)</string>
+	<string name="levelup_add_attackdamage_description">Adds %1$d to your base attack damage.</string>
+	<string name="levelup_add_blockchance">Increase block chance (+%1$d %%)</string>
+	<string name="levelup_add_blockchance_description">Adds %1$d%% to your base block chance.</string>
 	
 	<string name="dialog_rest_title">Rest</string>
 	<string name="dialog_rest_confirm_message">Do you want to rest here?</string>
@@ -219,6 +250,17 @@
 		Please visit the project page to get more info or to contribute to the project (see "about").\n
 		\n
 		Thanks for all the feedback!
-	</string>
+	</string> 
 	
+	<string name="questlog_title">Quests</string>
+	<string name="questlog_includecompleted_prompt">Select quests to show</string>
+	<string-array name="questlog_includecompleted">
+		<item>Hide completed quests</item>
+		<item>Include completed quests</item>
+		<item>Only completed quests</item>
+	</string-array>
+	<string name="questlog_queststatus">Status: %1$s</string>
+	<string name="questlog_queststatus_inprogress">In progress</string>
+	<string name="questlog_queststatus_completed">Completed</string>
+
 </resources>
diff --git a/AndorsTrail/res/xml/clearing_level1.tmx b/AndorsTrail/res/xml/clearing_level1.tmx
new file mode 100644
index 000000000..aef7b0354
--- /dev/null
+++ b/AndorsTrail/res/xml/clearing_level1.tmx
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" orientation="orthogonal" width="20" height="16" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="tiles_1_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_1.png"/>
+ </tileset>
+ <tileset firstgid="129" name="tiles_1_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_2.png"/>
+ </tileset>
+ <tileset firstgid="257" name="tiles_2_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_1.png"/>
+ </tileset>
+ <tileset firstgid="385" name="tiles_2_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_2.png"/>
+ </tileset>
+ <tileset firstgid="513" name="tiles_2_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_3.png"/>
+ </tileset>
+ <tileset firstgid="641" name="tiles_2_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_4.png"/>
+ </tileset>
+ <tileset firstgid="769" name="tiles_2_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_5.png"/>
+ </tileset>
+ <tileset firstgid="897" name="tiles_1_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_3.png"/>
+ </tileset>
+ <tileset firstgid="1025" name="tiles_1_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_4.png"/>
+ </tileset>
+ <tileset firstgid="1153" name="tiles_1_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_5.png"/>
+ </tileset>
+ <tileset firstgid="1281" name="tiles_1_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_6.png"/>
+ </tileset>
+ <tileset firstgid="1409" name="tiles_1_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_7.png"/>
+ </tileset>
+ <tileset firstgid="1537" name="tiles_2_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_8.png"/>
+ </tileset>
+ <tileset firstgid="1649" name="tiles_2_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_6.png"/>
+ </tileset>
+ <tileset firstgid="1777" name="tiles_2_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_7.png"/>
+ </tileset>
+ <tileset firstgid="1905" name="tiles_2_8" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_8.png"/>
+ </tileset>
+ <layer name="Ground" width="20" height="16">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA72T0Q2DMAwF7WzQrtGtswHdADboCN2kRNTCvT6RoEr9OCEZc7bIS3Wz+mZZKcXs4TtetvqS+nK/qtfkua7Pp+9cyqeb/aw37slzs2+ye0Z/1DlLeRThY52zfvX13v3LV0/6Jt9g74Q8jPgia/FNuFW+1I70RdZyhslRJtTuzDBps5qLmejtnu8I7wtd88C/OHvmRJ3paB6Vj2c66j9y9fxE9b8AK5n0dQAFAAA=
+  </data>
+ </layer>
+ <layer name="Objects" width="20" height="16">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgoA94yEqcOl9m/PJGTBBakA1CGzJBzJbAYX4sDvNg5oDACRZUuR0sCLPR1ZeyoIqj6+tkQ6iDAVssboCpgwFsdhEC6O6GgQ4c4oTAR0ZU/g485sxgQVX/iRGhHt0cEPiPFAalWMzFJkYMgIUBPreSA5D9AHL7CTzxTopZ6ADdXFg+QU/PxKYJEEAOS0GkdLYDahfMrBMs+N32CUkOX5oiN+5g5iPH3QwkNj63UQsAAHz0W2AABQAA
+  </data>
+ </layer>
+ <layer name="Above" width="20" height="16">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgwAT/mbEIkgFg5rwn0jx89oLkiDWHGPWk+pGabiPGPFLBYDfvEyN1zQOBDzj0kWseLn343I7PLHxpApfbcQFC6YtaeXakAQC3/eRuAAUAAA==
+  </data>
+ </layer>
+ <layer name="Walkable" width="20" height="16">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAAxNkYGAQHGIYGRCjlhhzsAFc6vGZRchcYv1BLMBlFi45ctyGzS5CYUBMeBOrbyDMIyUdETKP0jRMqnn4AKlhhKyOFPMpiUNyzSIHAwC6K27pAAUAAA==
+  </data>
+ </layer>
+ <objectgroup name="Mapevents" width="20" height="16">
+  <object name="up" type="mapchange" x="512" y="64" width="32" height="32">
+   <properties>
+    <property name="map" value="wild11_clearing"/>
+    <property name="place" value="down"/>
+   </properties>
+  </object>
+  <object name="down" type="mapchange" x="288" y="128" width="32" height="32">
+   <properties>
+    <property name="map" value="clearing_level2"/>
+    <property name="place" value="up"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Spawn" width="20" height="16">
+  <object name="pack1" type="spawn" x="448" y="160" width="160" height="160">
+   <properties>
+    <property name="quantity" value="3"/>
+   </properties>
+  </object>
+  <object name="pack1" type="spawn" x="448" y="384" width="64" height="32">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="pack2" type="spawn" x="192" y="384" width="32" height="32"/>
+  <object name="pack1" type="spawn" x="256" y="384" width="96" height="96">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="pack1" type="spawn" x="64" y="64" width="320" height="192">
+   <properties>
+    <property name="quantity" value="3"/>
+   </properties>
+  </object>
+  <object name="pack2" type="spawn" x="32" y="224" width="32" height="32"/>
+  <object name="pack1" type="spawn" x="32" y="288" width="64" height="32">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Keys" width="20" height="16"/>
+</map>
diff --git a/AndorsTrail/res/xml/clearing_level2.tmx b/AndorsTrail/res/xml/clearing_level2.tmx
new file mode 100644
index 000000000..386858b16
--- /dev/null
+++ b/AndorsTrail/res/xml/clearing_level2.tmx
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" orientation="orthogonal" width="15" height="15" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="tiles_1_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_1.png"/>
+ </tileset>
+ <tileset firstgid="129" name="tiles_1_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_2.png"/>
+ </tileset>
+ <tileset firstgid="257" name="tiles_2_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_1.png"/>
+ </tileset>
+ <tileset firstgid="385" name="tiles_2_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_2.png"/>
+ </tileset>
+ <tileset firstgid="513" name="tiles_2_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_3.png"/>
+ </tileset>
+ <tileset firstgid="641" name="tiles_2_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_4.png"/>
+ </tileset>
+ <tileset firstgid="769" name="tiles_2_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_5.png"/>
+ </tileset>
+ <tileset firstgid="897" name="tiles_1_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_3.png"/>
+ </tileset>
+ <tileset firstgid="1025" name="tiles_1_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_4.png"/>
+ </tileset>
+ <tileset firstgid="1153" name="tiles_1_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_5.png"/>
+ </tileset>
+ <tileset firstgid="1281" name="tiles_1_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_6.png"/>
+ </tileset>
+ <tileset firstgid="1409" name="tiles_1_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_7.png"/>
+ </tileset>
+ <tileset firstgid="1537" name="tiles_2_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_8.png"/>
+ </tileset>
+ <tileset firstgid="1649" name="tiles_2_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_6.png"/>
+ </tileset>
+ <tileset firstgid="1777" name="tiles_2_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_7.png"/>
+ </tileset>
+ <tileset firstgid="1905" name="tiles_2_8" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_8.png"/>
+ </tileset>
+ <layer name="Ground" width="15" height="15">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA52R0Q2AIAxEoRvgGm7dDXAD3cAR3ESbQFKvByZ+3AflHb0WzSnpo6NJm7ZHp1OWyCBnTK9dTkUig5wxe6ut6S1klHAjLzLmFfnnNWYBL2bpPb7eV5KF5UOvZ3wWJfmYlzFsn1izf2N7G83gvUXi3mZZcH+o0f/rYJavWb2X9a6Te81RNUcP3vvzDTE3PqqEAwAA
+  </data>
+ </layer>
+ <layer name="Objects" width="15" height="15">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgoBz4MmOKSbASpzcWqPchHrWGTBB5XOYJskHUoIMTLAj5Dhb8atDBR0YGhk+M+N0NU4cMdiCZB9IP4iPbYcQEEUPXRykgZN4MLP40whIeMDF089D9gM08kNgOHOGJDIhRAwL/oWkKFG/IbkV2G0wcVzwiy4HSAbHgP1J6xha2MHlqxSMAxldhboQDAAA=
+  </data>
+ </layer>
+ <layer name="Above" width="15" height="15">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgwA3+M+ORJKBuuOoFqXlPgV5ixT8wE1aDzS24xAipwWcHITXE6sVlJzbxT4zY7SHGLSCAHn6k6CVkNzFuIwUAAKTIOVSEAwAA
+  </data>
+ </layer>
+ <layer name="Walkable" width="15" height="15" visible="0">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA8WPtxEAMAwCWUH7L+sF4BUaFxQinkpSfYQCp6A5X8pSh9PTnTau3OYP8mz7ptmu65qV4aYb5CG+23RZ6qX/r3g1c0VPhAMAAA==
+  </data>
+ </layer>
+ <objectgroup name="Mapevents" width="15" height="15">
+  <object name="up" type="mapchange" x="64" y="64" width="32" height="32">
+   <properties>
+    <property name="map" value="clearing_level1"/>
+    <property name="place" value="down"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Spawn" width="15" height="15">
+  <object name="pack_boss" type="spawn" x="320" y="384" width="96" height="64">
+   <properties>
+    <property name="respawn" value="false"/>
+   </properties>
+  </object>
+  <object name="pack3" type="spawn" x="352" y="320" width="64" height="32">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="pack3" type="spawn" x="384" y="256" width="32" height="32"/>
+  <object name="pack2" type="spawn" x="224" y="192" width="64" height="32">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="pack2" type="spawn" x="224" y="96" width="224" height="96">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="pack2" type="spawn" x="32" y="320" width="224" height="128">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="pack3" type="spawn" x="224" y="256" width="32" height="32"/>
+  <object name="pack2" type="spawn" x="32" y="224" width="64" height="32">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Keys" width="15" height="15"/>
+</map>
diff --git a/AndorsTrail/res/xml/crossglen.tmx b/AndorsTrail/res/xml/crossglen.tmx
index 0e022da9b..35c450bf9 100644
--- a/AndorsTrail/res/xml/crossglen.tmx
+++ b/AndorsTrail/res/xml/crossglen.tmx
@@ -50,22 +50,22 @@
  </tileset>
  <layer name="Ground" width="30" height="30">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAC+2X0Q3CMAwFU9MRWIJZOgJDMALLdAPYgC5AmQAmoRVYWC82sSBGQurHCUjSnLFiB/ompX6ipZQujc2KHus0js81J2Oe12zSC23MQu47CDjmObahyfF4O8rhOd4XcyP3s3LV0nvvlnJwX09uSqB3Rzk1PCXvnnKivJj7X+A9y4s3xnsuEOUdJ27wKt9HedGFn2t5MYfXArW8Wg61Xt1BrVvjpXnpxRxqvRr7tRzXYrSe4141CnhO69XYry2HFot8bk35OeI5rVdjv5YOLUbr+zKfnhnp0GKMutdK91b0vfZPeOo0Ak+dRuCp0wg8dbrwHfPvyYNBtNf7X6omdxbSpIgQDgAA
+   H4sIAAAAAAAAA+2X0Q3CMAwFU9MRWIJZOgJDMALLdAPYgC5AmQAmoRVYWC82sSBGQurHCUjSnLFiB/ompX6ipZQujc2KHus0js81J2Oe12zSC23MQu47CDjmObahyfF4O8rhOd4XcyP3s3LV0nvvlnJwX09uSqB3Rzk1PCXvnnKivJj7X+A9y4s3xnsuEOUdJ27wKt9HedGFn2t5MYfXArW8Wg61Xt1BrVvjpXnpxRxqvRr7tRzXYrSe4141CnhO69XYry2HFot8bk35OeI5rVdjv5YOLUbr+zKfnhnp0GKMutdK91b0vfZPeOo0Ak+dRuCp0wg8dbrwHfPvyYNBtNf7X6omdxbSpIgQDgAA
   </data>
  </layer>
  <layer name="Objects" width="30" height="30">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAC61WPW8UMRDdnNf8gIg/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==
+   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>
  </layer>
  <layer name="Above" width="30" height="30">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAC8VW2w3CMAwMajtL+UZMAIhF2IUvJBZhBHaCDUCWsGq559hNm3ISKsRuDr8uSWnAq0lV8fntf23Haxak71xevbbfYP8dWM/lpu9S2nbDM/cO8Z4M3oOxjoDyIrkRb4kNoQc8Fndu76X6DXHX7mUEilXX5d4NH29tKrgOU+tXAtnjDOK1YpO/0Xfkm+OSqB2vpTlr5LkGb6RGqA4e761SPhCv1OqHsrNeaz3XOo7sUrMRr9Tqp7KzXms91zru2afWl/1L42VM1Ujyv7Tz410KXt7IbmmIBOp/ayYIXt7+cfYwdLzejEbOoaOTQ8nJPadnlIDuVRHIGbXOBu45PaOEaP/pe5x3DnmIzLW3dwk3z+kaWIunBvR9HdkjOKveRBzRZxTvZvwfS/bR734Bo+VJchAOAAA=
+   H4sIAAAAAAAAA8VW2w3CMAwMajtL+UZMAIhF2IUvJBZhBHaCDUCWsGq559hNm3ISKsRuDr8uSWnAq0lV8fntf23Haxak71xevbbfYP8dWM/lpu9S2nbDM/cO8Z4M3oOxjoDyIrkRb4kNoQc8Fndu76X6DXHX7mUEilXX5d4NH29tKrgOU+tXAtnjDOK1YpO/0Xfkm+OSqB2vpTlr5LkGb6RGqA4e761SPhCv1OqHsrNeaz3XOo7sUrMRr9Tqp7KzXms91zru2afWl/1L42VM1Ujyv7Tz410KXt7IbmmIBOp/ayYIXt7+cfYwdLzejEbOoaOTQ8nJPadnlIDuVRHIGbXOBu45PaOEaP/pe5x3DnmIzLW3dwk3z+kaWIunBvR9HdkjOKveRBzRZxTvZvwfS/bR734Bo+VJchAOAAA=
   </data>
  </layer>
  <layer name="Walkable" width="30" height="30" visible="0">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAC8WUSw7AIAhEvYL3v2y3TVOG+WCcxE0tPEHGvdbalxcSE8sy2NgpLlsD+v/bi5PcSikX5ah4TCxiO6q4iF3FdudV7qLaU+9xSk5dnXcUlnvmjpv6xOV2/EluOoss15U6C+iN6HKc4qrzr3KRj5j7VLh/jFP1vvnVt+lZZmqr+ChP4qFUTK+YfZXZ5XVyMswprjtXaR/dmU49NsFypHrylpeSd4XJm3In5ua7Hq3vp4wQDgAA
+   H4sIAAAAAAAAA8WUSw7AIAhEvYL3v2y3TVOG+WCcxE0tPEHGvdbalxcSE8sy2NgpLlsD+v/bi5PcSikX5ah4TCxiO6q4iF3FdudV7qLaU+9xSk5dnXcUlnvmjpv6xOV2/EluOoss15U6C+iN6HKc4qrzr3KRj5j7VLh/jFP1vvnVt+lZZmqr+ChP4qFUTK+YfZXZ5XVyMswprjtXaR/dmU49NsFypHrylpeSd4XJm3In5ua7Hq3vp4wQDgAA
   </data>
  </layer>
  <objectgroup name="Mapevents" width="30" height="30">
@@ -93,7 +93,7 @@
     <property name="place" value="entrance"/>
    </properties>
   </object>
-  <object name="east" type="mapchange" x="928" y="416" width="32" height="32">
+  <object name="east" type="mapchange" x="928" y="416" width="32" height="64">
    <properties>
     <property name="map" value="wild1"/>
     <property name="place" value="west"/>
diff --git a/AndorsTrail/res/xml/crossglen_smith.tmx b/AndorsTrail/res/xml/crossglen_smith.tmx
index b7d845305..12b8fa152 100644
--- a/AndorsTrail/res/xml/crossglen_smith.tmx
+++ b/AndorsTrail/res/xml/crossglen_smith.tmx
@@ -50,22 +50,22 @@
  </tileset>
  <layer name="Ground" width="10" height="8">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAAwtiZGAIIhI3EsAwdRMJYJg6RwYGBlck7IiG8al7ycLA8IoFoa6REVM/COcB1eRC1TVC7cem7idQzS+oOpCaQAbs2BGNDwDUWgFBQAEAAA==
+   H4sIAAAAAAAACwtiZGAIIhI3EsAwdRMJYJg6RwYGBlck7IiG8al7ycLA8IoFoa6REVM/COcB1eRC1TVC7cem7idQzS+oOpCaQAbs2BGNDwDUWgFBQAEAAA==
   </data>
  </layer>
  <layer name="Objects" width="10" height="8">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgQAAldgaCwIuFgcEIqM4OiG2B+Ag7REwOTW8UUMwJi9hFNgS/h5WBoR2IhdgYMMBDNLE+JLMScLizH00clzpvZgYGT2YEvwBJ3WQiwgAZAACt7MHWQAEAAA==
+   H4sIAAAAAAAAC2NgQAAldgaCwIuFgcEIqM4OiG2B+Ag7REwOTW8UUMwJi9hFNgS/h5WBoR2IhdgYMMBDNLE+JLMScLizH00clzpvZgYGT2YEvwBJ3WQiwgAZAACt7MHWQAEAAA==
   </data>
  </layer>
  <layer name="Walkable" width="10" height="8" visible="0">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAAxNkYGAQHECMC+BTgy6GSy0+dYI41BHjXmQ+AAPtet1AAQAA
+   H4sIAAAAAAAACxNkYGAQHECMC+BTgy6GSy0+dYI41BHjXmQ+AAPtet1AAQAA
   </data>
  </layer>
  <layer name="Above" width="10" height="8">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIB78Z6atugB2/OqSWci3txnJ7PdEmkcMAADFqb7nQAEAAA==
+   H4sIAAAAAAAAC2NgIB78Z6atugB2/OqSWci3txnJ7PdEmkcMAADFqb7nQAEAAA==
   </data>
  </layer>
  <objectgroup name="mapevents" width="10" height="8">
@@ -77,7 +77,7 @@
   </object>
  </objectgroup>
  <objectgroup name="keys" width="10" height="8">
-  <object name="crossglen_smith" type="key" x="160" y="96" width="32" height="32">
+  <object name="crossglen_smith:0" type="key" x="160" y="96" width="32" height="32">
    <properties>
     <property name="message" value="Audir shouts: Hey you, get away! You are not allowed back there."/>
    </properties>
diff --git a/AndorsTrail/res/xml/debugmap.tmx b/AndorsTrail/res/xml/debugmap.tmx
index 3a3af45fd..843d82024 100644
--- a/AndorsTrail/res/xml/debugmap.tmx
+++ b/AndorsTrail/res/xml/debugmap.tmx
@@ -31,8 +31,8 @@
    </properties>
   </object>
   <object name="start" type="mapchange" x="96" y="64" width="32" height="32"/>
-  <object name="key1" type="key" x="32" y="128" width="32" height="32"/>
-  <object name="key2" type="key" x="0" y="128" width="32" height="32">
+  <object name="no_quest:10" type="key" x="32" y="128" width="32" height="32"/>
+  <object name="debugquest:100" type="key" x="0" y="128" width="32" height="32">
    <properties>
     <property name="message" value="A strange force prevents you from entering."/>
    </properties>
@@ -50,7 +50,7 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="10" height="10" visible="0">
+ <objectgroup name="Spawn" width="10" height="10">
   <object name="ant" type="spawn" x="96" y="128" width="192" height="160">
    <properties>
     <property name="quantity" value="2"/>
@@ -65,7 +65,12 @@
   </object>
   <object name="shop" type="spawn" x="288" y="0" width="32" height="32">
    <properties>
-    <property name="type" value="traveller"/>
+    <property name="type" value="debugNPC1"/>
+   </properties>
+  </object>
+  <object name="shop" type="spawn" x="256" y="0" width="32" height="32">
+   <properties>
+    <property name="type" value="debugNPC2"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/fallhaven_alaun.tmx b/AndorsTrail/res/xml/fallhaven_alaun.tmx
new file mode 100644
index 000000000..62d0e7646
--- /dev/null
+++ b/AndorsTrail/res/xml/fallhaven_alaun.tmx
@@ -0,0 +1,83 @@
+<?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"/>
+ </tileset>
+ <tileset firstgid="129" name="tiles_1_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_2.png"/>
+ </tileset>
+ <tileset firstgid="257" name="tiles_2_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_1.png"/>
+ </tileset>
+ <tileset firstgid="385" name="tiles_2_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_2.png"/>
+ </tileset>
+ <tileset firstgid="513" name="tiles_2_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_3.png"/>
+ </tileset>
+ <tileset firstgid="641" name="tiles_2_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_4.png"/>
+ </tileset>
+ <tileset firstgid="769" name="tiles_2_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_5.png"/>
+ </tileset>
+ <tileset firstgid="897" name="tiles_1_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_3.png"/>
+ </tileset>
+ <tileset firstgid="1025" name="tiles_1_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_4.png"/>
+ </tileset>
+ <tileset firstgid="1153" name="tiles_1_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_5.png"/>
+ </tileset>
+ <tileset firstgid="1281" name="tiles_1_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_6.png"/>
+ </tileset>
+ <tileset firstgid="1409" name="tiles_1_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_7.png"/>
+ </tileset>
+ <tileset firstgid="1537" name="tiles_2_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_8.png"/>
+ </tileset>
+ <tileset firstgid="1649" name="tiles_2_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_6.png"/>
+ </tileset>
+ <tileset firstgid="1777" name="tiles_2_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_7.png"/>
+ </tileset>
+ <tileset firstgid="1905" name="tiles_2_8" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_8.png"/>
+ </tileset>
+ <layer name="Ground" width="10" height="8">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA9NlYGDQJRLnM+HHMHX1TPgxTF0WEnbEgmHqsMmhqwPZj0v+JQsDwysWiJp6POp+AtX8YoGoCWTAjh3R+ABIKxCZQAEAAA==
+  </data>
+ </layer>
+ <layer name="Objects" width="10" height="8">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NggAAldgaigBGSOk4WVBoZOEHVTWJjYJCEykuiqZNjg9B/gfQiILZihWBLKA0D+czEua0equ4R0KyHQJwMtU8E6BZJJPPq2RBse6DcRSQ5ESLDAQYAN8s3xUABAAA=
+  </data>
+ </layer>
+ <layer name="Above" width="10" height="8">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgIB78ZyZPnRYrBHsCsRcr+eZdYmNguMhGvL0bWbGre0+kvcQAAHmSWsdAAQAA
+  </data>
+ </layer>
+ <layer name="Walkable" width="10" height="8">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAAxNkYGAQHEDMQII6XACfedjUoJuHjU+sewGlzFb6QAEAAA==
+  </data>
+ </layer>
+ <objectgroup name="Mapevents" width="10" height="8">
+  <object name="entrance" type="mapchange" x="192" y="224" width="32" height="32">
+   <properties>
+    <property name="map" value="fallhaven_sw"/>
+    <property name="place" value="alaun"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Spawn" width="10" height="8">
+  <object name="alaun" type="spawn" x="64" y="128" width="224" height="64"/>
+ </objectgroup>
+ <objectgroup name="Keys" width="10" height="8"/>
+</map>
diff --git a/AndorsTrail/res/xml/fallhaven_arcir_basement.tmx b/AndorsTrail/res/xml/fallhaven_arcir_basement.tmx
index 512c1e1d8..a0c8ae755 100644
--- a/AndorsTrail/res/xml/fallhaven_arcir_basement.tmx
+++ b/AndorsTrail/res/xml/fallhaven_arcir_basement.tmx
@@ -50,22 +50,22 @@
  </tileset>
  <layer name="Ground" width="12" height="9">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA1NlYGBQJRFbMhKHYeo9GYnDMPW+RGJaq4f5g1j1MH8Qqx6ETUnEAJXb3aOwAQAA
+   H4sIAAAAAAAAC1NlYGBQJRFbMhKHYeo9GYnDMPW+RGJaq4f5g1j1MH8Qqx6ETUnEAJXb3aOwAQAA
   </data>
  </layer>
  <layer name="Objects" width="12" height="9">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIB2Es5Om/gpUfTIzA0MKECcxo/JhNAxchqovBoqVAHEREIuyI/gwGhuwJ8JtTlC9SWh243JPEEiMBeIOmN0gPjHuUURzD7L79HHowQcAKoLzT7ABAAA=
+   H4sIAAAAAAAAC2NgIB2Es5Om/gpUfTIzA0MKECcxo/JhNAxchqovBoqVAHEREIuyI/gwGhuwJ8JtTlC9SWh243JPEEiMBeIOmN0gPjHuUURzD7L79HHowQcAKoLzT7ABAAA=
   </data>
  </layer>
  <layer name="Above" width="12" height="9">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIB38Z6a/+mSWweUefOA9iepJAQBdhNW7sAEAAA==
+   H4sIAAAAAAAAC2NgIB38Z6a/+mSWweUefOA9iepJAQBdhNW7sAEAAA==
   </data>
  </layer>
  <layer name="Walkable" width="12" height="9">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAAxNkYGAQHISYgUS1xAB85hOyjxT1pABSwwUAMSyoI7ABAAA=
+   H4sIAAAAAAAACxNkYGAQHISYgUS1xAB85hOyjxT1pABSwwUAMSyoI7ABAAA=
   </data>
  </layer>
  <objectgroup name="Mapevents" width="12" height="9">
@@ -77,13 +77,13 @@
   </object>
   <object name="Statue" type="sign" x="32" y="96" width="64" height="64">
    <properties>
-    <property name="enablekey" value="qarcir"/>
+    <property name="enablekey" value="arcir:10"/>
     <property name="text" value="Elythara, mother of the light. Protect us from the curse of the shadow."/>
    </properties>
   </object>
   <object name="Torn page" type="sign" x="128" y="224" width="32" height="32">
    <properties>
-    <property name="enablekey" value="qcalomyran_tornpage"/>
+    <property name="enablekey" value="calomyran:20"/>
     <property name="text" value="You see a torn page from a book titled 'Calomyran secrets'. Blood stains its edges, and someone has scribbled the words 'Larcal' with the blood."/>
    </properties>
   </object>
diff --git a/AndorsTrail/res/xml/fallhaven_barn.tmx b/AndorsTrail/res/xml/fallhaven_barn.tmx
index 8e5cff0f8..df5458334 100644
--- a/AndorsTrail/res/xml/fallhaven_barn.tmx
+++ b/AndorsTrail/res/xml/fallhaven_barn.tmx
@@ -50,12 +50,12 @@
  </tileset>
  <layer name="Ground" width="17" height="10">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAAwtiZGAIogLOZyIfw8zwYEbgeibSMLIZEVAcDsXmQGwBxN4MEKwGZJsi8WEYZkYEmhyyuzyw6MNmBro4TC/MbeSYAdOL7h9cZoDCllh3Y8P50LCNQHK3KhZzVKHhiS6nBo3HQAbSMEw/shgAAqtc5agCAAA=
+   H4sIAAAAAAAAAwtiZGAIogLOZyIfw8zwYEbgeibSMLIZEVDszQDB5kC2BRJfDcg2ReLDMMyMCDQ5ZHd5YNGHzQx0cZhedLeRYgZML7p/cJkBClti3Y0N50PDNgLJ3apYzFGFhie6nBo0HgMZSMMw/chiAM64JP2oAgAA
   </data>
  </layer>
  <layer name="Objects" width="17" height="10">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoB5wY8HOX8mGXx4bcGeG4DA0NSA+Kysqn1iQzILJ7wWatQaI17JiV7uEBPOJAepAP2kwo7oFlx2CbPjNQvcPNn/QAiDbG8aMXQ5dnFIAAJPbwWSoAgAA
+   H4sIAAAAAAAAA2NgoB5wY8HOX8mGXx4bcGeG4DA0NSA+KysqHxcIZ4ZgGEhGUwvi9wLNWgPEa1kx5UBgCR7zyQHqQPdoMKO6BZcdgmz4zUL3DzZ/0AIg2xvGjF0OXZxSAAA97NwgqAIAAA==
   </data>
  </layer>
  <layer name="Above" width="17" height="10">
diff --git a/AndorsTrail/res/xml/fallhaven_church.tmx b/AndorsTrail/res/xml/fallhaven_church.tmx
index 8a11b35b3..fbfbcc775 100644
--- a/AndorsTrail/res/xml/fallhaven_church.tmx
+++ b/AndorsTrail/res/xml/fallhaven_church.tmx
@@ -50,22 +50,22 @@
  </tileset>
  <layer name="Ground" width="20" height="15">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+NkYGDgBGJVIE5mYmBIYSKdVoWagYxBYsVAuRIm0mlVNHNgWA0HlmWFYFzyqmgY5m5c6glhZH8j+5Nc85D9jc+fpOAEZuqahxyOg9k8SuIVWzxTEq/Y4jmQAYHV0Nj4MDY9IIyc55D5hMzDpgcfJtY8YnEgAYxLHwAX3FJ5sAQAAA==
+   H4sIAAAAAAAAC+NkYGDgBGJVIE5mYmBIYSKdVoWagYxBYsVAuRIm0mlVNHNgWA0HlmWFYFzyqmgY5m5c6glhZH8j+5Nc85D9jc+fpOAEZuqahxyOg9k8SuIVWzxTEq/Y4jmQAYHV0Nj4MDY9IIyc55D5hMzDpgcfJtY8YnEgAYxLHwAX3FJ5sAQAAA==
   </data>
  </layer>
  <layer name="Objects" width="20" height="15">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgwAQuLKSx8YGZ7AwMIVC1BkhsEACxQWIw9kx2wuatBKrZyAphOwDZMqwIOTlWiFgyC0TNSigbHYDcvhnJroOsmGrQAboaFzR/4FNLjHnIZsizorr7IpB/kpmB4RQQXwXio1B8DCp2mhmiBhfoYibsHlLALGbsmFrqkcE8YDyth+IFOOITHSCH3zwi9aGrk0cKz2Ic6RLZbYTciMsMWgJS3DdUAADi1JZHsAQAAA==
+   H4sIAAAAAAAAC2NgwAQuLKSx8YGZ7AwMIVC1BkhsEACxQWIw9kx2wuatBKrZyAphOwDZMqwIOTlWiFgyC0TNSigbHYDcvhnJroOsmGrQAboaFzR/4FNLjHnIZsizorr7IpB/kpmB4RQQXwXio1B8DCp2mhmiBhfoYibsHlLALGbsmFrqkcE8YDyth+IFOOITHSCH3zwi9aGrk0cKz2Ic6RLZbYTciMsMWgJS3DdUAADi1JZHsAQAAA==
   </data>
  </layer>
  <layer name="Above" width="20" height="15">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgQID/zAxUBcjmrYSyeVgZGHihmI8VIraaSHth5iWzIMwDsdEByDx8foHJYXMfNkCsee+R1OwEsncB8W0ksW1Qsd1EmocO9rDiFntPwLwuLBgXwKYWWT0t08lgNA9f2I4C+gIA1uw8t7AEAAA=
+   H4sIAAAAAAAAC2NgQID/zAxUBcjmrYSyeVgZGHihmI8VIraaSHth5iWzIMwDsdEByDx8foHJYXMfNkCsee+R1OwEsncB8W0ksW1Qsd1EmocO9rDiFntPwLwuLBgXwKYWWT0t08lgNA9f2I4C+gIA1uw8t7AEAAA=
   </data>
  </layer>
  <layer name="Walkable" width="20" height="15">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAAxNkYGAQHCKYAQebEnUMaGxcAF09rc1DV4vLHlx60OWpAYiJH2rqw6aXWLXoYoQAqWGLTQ2pasl1H6l5hRQ5cuKIHPPIxQBVn97EsAQAAA==
+   H4sIAAAAAAAACxNkYGAQHCKYAQebEnUMaGxcAF09rc1DV4vLHlx60OWpAYiJH2rqw6aXWLXoYoQAqWGLTQ2pasl1H6l5hRQ5cuKIHPPIxQBVn97EsAQAAA==
   </data>
  </layer>
  <objectgroup name="Mapevents" width="20" height="15">
@@ -97,7 +97,7 @@
   </object>
  </objectgroup>
  <objectgroup name="Keys" width="20" height="15">
-  <object name="qfallhaven_church" type="key" x="416" y="192" width="32" height="32">
+  <object name="bucus:50" type="key" x="416" y="192" width="32" height="32">
    <properties>
     <property name="message" value="You are not allowed to enter these parts of Fallhaven Church without permission."/>
    </properties>
diff --git a/AndorsTrail/res/xml/fallhaven_clothes.tmx b/AndorsTrail/res/xml/fallhaven_clothes.tmx
index 1090509cc..a6c680a6c 100644
--- a/AndorsTrail/res/xml/fallhaven_clothes.tmx
+++ b/AndorsTrail/res/xml/fallhaven_clothes.tmx
@@ -50,12 +50,12 @@
  </tileset>
  <layer name="Ground" width="20" height="12">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA5WQzQ3CMAxGTRJZ6kycemABJNagbJATCwATAMvBBnDCVmTlh7hJDk9Kvziv8jcBwKSw34yjucS3mJxalt61fN7kcHbB+M3nK3HDPt8MkZ0N2R1jxucH8cS+PlIfw3uVmSBvtD4Y2UXe+A5f2VGK7LK1uqf01WbPqL9p+Vr/XfO9HPVCvF3sbsRXzh/J421gMev91ijnP+Q7EV8X7g6QM8N/NsIPFURebcADAAA=
+   H4sIAAAAAAAAA+NkYGDgxIGDGEnHuMyCmZfPhIqxiSHLETKvngkVg8QmsSH4IPZkIJ7CRpx5jgwI7MqMKYaMiQkPdD0gfxEyD1d4gDDMLzA99USYhx5GyBim1poZtzno5mFT28qGWw8h8wjZi8+8lyzAcAHiVyyIsCPFPHT1eUBz6pkhOJ8Jf/hiw+jqfwLNKwDiXywQuVAGVOzIgClGCgYAl0G+cMADAAA=
   </data>
  </layer>
  <layer name="Objects" width="20" height="12">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgGBiwjhk/n1igxQrBe9H0o/OJBZZAs6xYITQymMLOwBDARrp5PayE1ehgUQMKj1x2BJsUsJuFgWEPC6oYcnjgCptkFkwxkNtOA8XPoMm9h4bFFHb8+nEBZD9vJCKMkEE3WjzkMUMwDBzEYh7MjgQk98Lc0MKOqR4ZXISqY2ZH+BEkBnJHAZJeH6g65DAB6aljg2BaAAD4BnpfwAMAAA==
+   H4sIAAAAAAAAA2NgGBiwjhk/n1igxQrBe9H0o/OJBZZAs6xYITQMLGJjYJjCzsAQwAZhLwbiJWzEmdfDSliNDhY1oPDIZUewSQG7WRgY9rCgiiGHBzIb2S/JaHpgbjsNFD+DJvceqmcKO0IMm35cANnPG4kII2TQjRb2ecwQDAMHsZgHsyMByb0wN7SwY6pHBheh6pjZEX4EiYHcUYCk1weqDjlMQHrq2CCYFgAAagsNO8ADAAA=
   </data>
  </layer>
  <layer name="Above" width="20" height="12">
@@ -76,7 +76,7 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="20" height="12">
+ <objectgroup name="Spawn" width="20" height="12" visible="0">
   <object name="fallhaven_clothes" type="spawn" x="160" y="96" width="384" height="224"/>
  </objectgroup>
  <objectgroup name="Keys" width="20" height="12"/>
diff --git a/AndorsTrail/res/xml/fallhaven_derelict.tmx b/AndorsTrail/res/xml/fallhaven_derelict.tmx
index ed3b18e57..f1cc55718 100644
--- a/AndorsTrail/res/xml/fallhaven_derelict.tmx
+++ b/AndorsTrail/res/xml/fallhaven_derelict.tmx
@@ -85,7 +85,7 @@
   <object name="Bucus" type="spawn" x="256" y="96" width="96" height="64"/>
  </objectgroup>
  <objectgroup name="Keys" width="12" height="8">
-  <object name="qfallhaven_derelict" type="key" x="96" y="96" width="32" height="32">
+  <object name="andor:50" type="key" x="96" y="96" width="32" height="32">
    <properties>
     <property name="message" value="Bucus shouts: Hey you, get away from there!"/>
    </properties>
diff --git a/AndorsTrail/res/xml/fallhaven_farmer.tmx b/AndorsTrail/res/xml/fallhaven_farmer.tmx
new file mode 100644
index 000000000..652770b32
--- /dev/null
+++ b/AndorsTrail/res/xml/fallhaven_farmer.tmx
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" orientation="orthogonal" width="12" 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"/>
+ </tileset>
+ <tileset firstgid="129" name="tiles_1_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_2.png"/>
+ </tileset>
+ <tileset firstgid="257" name="tiles_2_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_1.png"/>
+ </tileset>
+ <tileset firstgid="385" name="tiles_2_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_2.png"/>
+ </tileset>
+ <tileset firstgid="513" name="tiles_2_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_3.png"/>
+ </tileset>
+ <tileset firstgid="641" name="tiles_2_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_4.png"/>
+ </tileset>
+ <tileset firstgid="769" name="tiles_2_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_5.png"/>
+ </tileset>
+ <tileset firstgid="897" name="tiles_1_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_3.png"/>
+ </tileset>
+ <tileset firstgid="1025" name="tiles_1_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_4.png"/>
+ </tileset>
+ <tileset firstgid="1153" name="tiles_1_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_5.png"/>
+ </tileset>
+ <tileset firstgid="1281" name="tiles_1_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_6.png"/>
+ </tileset>
+ <tileset firstgid="1409" name="tiles_1_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_7.png"/>
+ </tileset>
+ <tileset firstgid="1537" name="tiles_2_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_8.png"/>
+ </tileset>
+ <tileset firstgid="1649" name="tiles_2_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_6.png"/>
+ </tileset>
+ <tileset firstgid="1777" name="tiles_2_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_7.png"/>
+ </tileset>
+ <tileset firstgid="1905" name="tiles_2_8" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_8.png"/>
+ </tileset>
+ <layer name="Ground" width="12" height="8">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAC9NlYGDQJRHnMxGHYerrmYjDMPWOSFgNCTuiYWzq8WGY24lVnw91F7HqQWoDGSDYkQHBxocBuFLXnYABAAA=
+  </data>
+ </layer>
+ <layer name="Objects" width="12" height="8">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAC2NgIA/EsjMweLFA2BdYITSMjw68gPJaUAwCD6B0FFD9RDYGhhIgbmJDqLcCyluzQuhkqJmyQPkeIF4IxC1QGgYmILFxgV4kNQuA7CnsELYIO6baA0D5uTjMlGRF6PmNpKabCDdgAwD2PLqsgAEAAA==
+  </data>
+ </layer>
+ <layer name="Above" width="12" height="8">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAC2NgIB38ZyZPfRQL6eb3sBKnvoWdNPckE+kWEHhPon9JAQBWcztmgAEAAA==
+  </data>
+ </layer>
+ <layer name="Walkable" width="12" height="8" visible="0">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAACxNkYGAQHOSYgUg1hACxetDtxCaHjU2qm0EYAHl90FqAAQAA
+  </data>
+ </layer>
+ <objectgroup name="Mapevents" width="12" height="8">
+  <object name="entrance" type="mapchange" x="64" y="224" width="32" height="32">
+   <properties>
+    <property name="map" value="fallhaven_se"/>
+    <property name="place" value="farmer"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Spawn" width="12" height="8">
+  <object name="fallhaven_farmer1" type="spawn" x="96" y="128" width="256" height="96"/>
+ </objectgroup>
+ <objectgroup name="Keys" width="12" height="8"/>
+</map>
diff --git a/AndorsTrail/res/xml/fallhaven_gravedigger.tmx b/AndorsTrail/res/xml/fallhaven_gravedigger.tmx
index d592c9eb2..7a179c7ae 100644
--- a/AndorsTrail/res/xml/fallhaven_gravedigger.tmx
+++ b/AndorsTrail/res/xml/fallhaven_gravedigger.tmx
@@ -50,12 +50,12 @@
  </tileset>
  <layer name="Ground" width="10" height="8">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAAwtiZGAIIhLnMuHHMHXFbAwMhUBcAsS1TJgYpq4ZKN8CxV4MmBimDl38JQsDQz4Qv2JBqAPZj6xmN1BuDxAXAPEvIJ7KDlFTi6buNFDuDAuCv5QdoiaQAYK9GBBsbBgAva2AkEABAAA=
+   H4sIAAAAAAAAAwtiZGAIIhLnMuHHMHXFbAwMhUBcAsS1TJgYpq4ZKO/FgBvD1KGLv2RhYMgH4lcsCHUg+5HV7AbK7QHiAiD+BcRT2SFqapnw27mUHaImkAGCvRgQbGwYAE4U9ilAAQAA
   </data>
  </layer>
  <layer name="Objects" width="10" height="8">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIA84sqCyc9mxqwsEyomwIti4QDJQbhlQnSjQHGYgvstGnDveIqnbCLVHBKifDYi5WSFsEPBDUncRqk4WSayHlTj70AEARNZMWEABAAA=
+   H4sIAAAAAAAAA2NgIA84sqCyc9mxqwsEyomwItjooIUNgpOBcsuA6kSB5jAD8V024tzxFkndRqg9IkD9bEDMzQphg4AfkrqLUHWyQLHTQHvPAHEPK3H2oQMAK6eoikABAAA=
   </data>
  </layer>
  <layer name="Above" width="10" height="8">
@@ -63,7 +63,7 @@
    H4sIAAAAAAAAA2NgIB78Z6ZMnQgrdc0jV917ItURAwD9BtUCQAEAAA==
   </data>
  </layer>
- <layer name="Walkable" width="10" height="8">
+ <layer name="Walkable" width="10" height="8" visible="0">
   <data encoding="base64" compression="gzip">
    H4sIAAAAAAAAAxNkYGAQHAQYBvDJYQOEzMGnjlwxZAwAxlfuAUABAAA=
   </data>
@@ -76,6 +76,6 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="10" height="8"/>
+ <objectgroup name="Spawn" width="10" height="8" visible="0"/>
  <objectgroup name="Keys" width="10" height="8"/>
 </map>
diff --git a/AndorsTrail/res/xml/fallhaven_lumberjack.tmx b/AndorsTrail/res/xml/fallhaven_lumberjack.tmx
new file mode 100644
index 000000000..87afae72d
--- /dev/null
+++ b/AndorsTrail/res/xml/fallhaven_lumberjack.tmx
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" orientation="orthogonal" width="12" 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"/>
+ </tileset>
+ <tileset firstgid="129" name="tiles_1_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_2.png"/>
+ </tileset>
+ <tileset firstgid="257" name="tiles_2_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_1.png"/>
+ </tileset>
+ <tileset firstgid="385" name="tiles_2_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_2.png"/>
+ </tileset>
+ <tileset firstgid="513" name="tiles_2_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_3.png"/>
+ </tileset>
+ <tileset firstgid="641" name="tiles_2_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_4.png"/>
+ </tileset>
+ <tileset firstgid="769" name="tiles_2_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_5.png"/>
+ </tileset>
+ <tileset firstgid="897" name="tiles_1_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_3.png"/>
+ </tileset>
+ <tileset firstgid="1025" name="tiles_1_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_4.png"/>
+ </tileset>
+ <tileset firstgid="1153" name="tiles_1_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_5.png"/>
+ </tileset>
+ <tileset firstgid="1281" name="tiles_1_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_6.png"/>
+ </tileset>
+ <tileset firstgid="1409" name="tiles_1_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_7.png"/>
+ </tileset>
+ <tileset firstgid="1537" name="tiles_2_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_8.png"/>
+ </tileset>
+ <tileset firstgid="1649" name="tiles_2_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_6.png"/>
+ </tileset>
+ <tileset firstgid="1777" name="tiles_2_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_7.png"/>
+ </tileset>
+ <tileset firstgid="1905" name="tiles_2_8" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_8.png"/>
+ </tileset>
+ <layer name="Ground" width="12" height="8">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA9NlYGDQJRHnMxGHYerrmYjDMPWORGJy1IPchSy2m4WBYQ8LdvX5UHcRaz5IbSADfuyIxgcAJs+J3IABAAA=
+  </data>
+ </layer>
+ <layer name="Objects" width="12" height="8">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgoBxwsjAwbGRnYMhhh7DRwQQ2BoZiNgRfkgWVPYENVf0CIL8ZiFuAOBmqtoOVgUGGDSGfjMUeEBBhxy7ei2THfjZUtdysmPrmIqk/j8Q+DbT3DA67yQEAZBPgw4ABAAA=
+  </data>
+ </layer>
+ <layer name="Above" width="12" height="8">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgIB38ZyZPfQkb9cw/gGQWue4hFrxHUr+MlTS9hAAATvdO+IABAAA=
+  </data>
+ </layer>
+ <layer name="Walkable" width="12" height="8" visible="0">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAAxNkYGAQHMQYBpD5uNQQAoTMpaZ6fP5B5gMARMhP24ABAAA=
+  </data>
+ </layer>
+ <objectgroup name="Mapevents" width="12" height="8">
+  <object name="entrance" type="mapchange" x="256" y="224" width="32" height="32">
+   <properties>
+    <property name="map" value="fallhaven_sw"/>
+    <property name="place" value="lumberjack"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Spawn" width="12" height="8"/>
+ <objectgroup name="Keys" width="12" height="8"/>
+</map>
diff --git a/AndorsTrail/res/xml/fallhaven_ne.tmx b/AndorsTrail/res/xml/fallhaven_ne.tmx
index 6c5e96961..aed709495 100644
--- a/AndorsTrail/res/xml/fallhaven_ne.tmx
+++ b/AndorsTrail/res/xml/fallhaven_ne.tmx
@@ -50,22 +50,22 @@
  </tileset>
  <layer name="Ground" width="30" height="30">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAC+2XsQ6CMBCGm4M+jCNPUY0zEeOojsZBV+PiyENLUy+U2uvRFkw0Dl+uQOnP/9N4shBCLCLYyOFYyeE5zRpocM4K4gg9j3rp74AG528hjjGZnIAm1a/rW8l33RvQpPp1fbvvdiy5flPJ9ZsK52vfcfDUuf1eOq5aqzQVj3N1KT9YK2FoRT+uMjU1+PxUxXntBFo2FcOUWn++C67Xpdw7Zj2u14UI9UpuvTP4mdvvHfxw6+b6Tc0xlFVMfjGZoV8qK43uBcdymF/uHkG/dceyMBXHyEMY8BqlG5OZnVtT9GPUbCxd7l2GMqP2nY3tNWYP1Ratc+zDvb8pelJ/w7h+qaT/P+ic4LfFp3Wp75pf9Gtr6voE80F1EhAOAAA=
+   H4sIAAAAAAAAA+2XsQ6CMBCGm4M+jCNPUY0zEeOojsZBV+PiyENLUy+U2uvRFkw0Dl+uQOnP/9N4shBCLCLYyOFYyeE5zRpocM4K4gg9j3rp74AG528hjjGZnIAm1a/rW8l33RvQpPp1fbvvdiy5flPJ9ZsK52vfcfDUuf1eOq5aqzQVj3N1KT9YK2FoRT+uMjU1+PxUxXntBFo2FcOUWn++C67Xpdw7Zj2u14UI9UpuvTP4mdvvHfxw6+b6Tc0xlFVMfjGZoV8qK43uBcdymF/uHkG/dceyMBXHyEMY8BqlG5OZnVtT9GPUbCxd7l2GMqP2nY3tNWYP1Ratc+zDvb8pelJ/w7h+qaT/P+ic4LfFp3Wp75pf9Gtr6voE80F1EhAOAAA=
   </data>
  </layer>
  <layer name="Objects" width="30" height="30">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAC7VXO0oEQRCdZXv0AnsBE91URJ3ATBERsxExU1DETAMXzHSzDcT/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==
+   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>
  </layer>
  <layer name="Above" width="30" height="30">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAC9VWUQrCMAytaPEo3ffwBE68iAfat6f0CJMihTiavjZJiz4Y6xaat/cWkjpni8uhHJ9BXLrvBuJXIa90X8J21O2X+BW8c5PX8VLdKNddyUUhrQ8t0H/Wesrp0tYHAqerNy/NT9faumzhfXXWSDGCa/Wfi3vm3iE8z9/3XwDSKtHZA6V5Z93LaL7SvNPOLGk+655S65/1mSPqXSpqy/rMkfMPacuhVS/lTbqRthxa6yT2zBqfa/OhWCDrx8mGd2K499+0Pz9odJdmKDeHNHxhYJ9NPo3kRKidRfFKPi/+f2YYxRvJS7o3EA4AAA==
+   H4sIAAAAAAAAA9VWUQrCMAytaPEo3ffwBE68iAfat6f0CJMihTiavjZJiz4Y6xaat/cWkjpni8uhHJ9BXLrvBuJXIa90X8J21O2X+BW8c5PX8VLdKNddyUUhrQ8t0H/Wesrp0tYHAqerNy/NT9faumzhfXXWSDGCa/Wfi3vm3iE8z9/3XwDSKtHZA6V5Z93LaL7SvNPOLGk+655S65/1mSPqXSpqy/rMkfMPacuhVS/lTbqRthxa6yT2zBqfa/OhWCDrx8mGd2K499+0Pz9odJdmKDeHNHxhYJ9NPo3kRKidRfFKPi/+f2YYxRvJS7o3EA4AAA==
   </data>
  </layer>
  <layer name="Walkable" width="30" height="30" visible="0">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAC+2TUQ7AIAhDewXvf9n9GlJRKMN9jMTMbIxHsQ4A41/phUtMoI9/Gl3sYZ5vsrt95M2T6Ve1ZOLrXO8/kBw223mf9SmrGcmp9ipQ128m7Pyr7top1/uuaFZ8oejMzkud8Q0mpnfdXNbHW9yOc2Z1O3TaupalMOcaK23eOa/qRbwS0atyT8+R5bL9rtedV1YRza9gqqwKn1ffnS7uA22xU3oQDgAA
+   H4sIAAAAAAAAA+2TUQ7AIAhDewXvf9n9GlJRKMN9jMTMbIxHsQ4A41/phUtMoI9/Gl3sYZ5vsrt95M2T6Ve1ZOLrXO8/kBw223mf9SmrGcmp9ipQ128m7Pyr7top1/uuaFZ8oejMzkud8Q0mpnfdXNbHW9yOc2Z1O3TaupalMOcaK23eOa/qRbwS0atyT8+R5bL9rtedV1YRza9gqqwKn1ffnS7uA22xU3oQDgAA
   </data>
  </layer>
  <objectgroup name="Mapevents" width="30" height="30">
@@ -111,9 +111,10 @@
     <property name="place" value="entrance"/>
    </properties>
   </object>
-  <object name="Map not complete" type="sign" x="416" y="928" width="32" height="32">
+  <object name="south" type="mapchange" x="416" y="928" width="32" height="32">
    <properties>
-    <property name="text" value="This map is not yet done. Please come back in a later version of the game."/>
+    <property name="map" value="fallhaven_se"/>
+    <property name="place" value="north"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/fallhaven_nw.tmx b/AndorsTrail/res/xml/fallhaven_nw.tmx
index 07413807e..d10226a08 100644
--- a/AndorsTrail/res/xml/fallhaven_nw.tmx
+++ b/AndorsTrail/res/xml/fallhaven_nw.tmx
@@ -50,22 +50,22 @@
  </tileset>
  <layer name="Ground" width="30" height="30">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAC+2WTQrCMBCFw0APk6WLnkHEtYi41L0L3XuBXkRvoKczQgtDOr9NAi5cfIxJ04Y3My8xhhDiyL4LYd3xMYZ21NxzAzzS3nhuCzzcvgfgodZPOvHcEXg8Or16L8Dj0SnppbgDTy29pdTU6+GUvnuGeWyt95q+e4N5bK13hRjQb6yfek/yqse/cdyXykPu0y+SVy3+teSBOgMlr3r1epC8WqK3BE1vq3xoelvlQzuftedLc6Cdz9rzPAdLvFnSH5N/S73p7Q+pLtTdWqs/pLrg2tS6T7k7m8N6n2rn+G7E2lOPNH4CH/P6WXrFsu6Vxm/go9YnVK9Y1vWIIRv3RP0s/8Os6yYGZv7P7/EBww+lixAOAAA=
+   H4sIAAAAAAAAA+2WTQrCMBCFw0APk6WLnkHEtYi41L0L3XuBXkRvoKczQgtDOr9NAi5cfIxJ04Y3My8xhhDiyL4LYd3xMYZ21NxzAzzS3nhuCzzcvgfgodZPOvHcEXg8Or16L8Dj0SnppbgDTy29pdTU6+GUvnuGeWyt95q+e4N5bK13hRjQb6yfek/yqse/cdyXykPu0y+SVy3+teSBOgMlr3r1epC8WqK3BE1vq3xoelvlQzuftedLc6Cdz9rzPAdLvFnSH5N/S73p7Q+pLtTdWqs/pLrg2tS6T7k7m8N6n2rn+G7E2lOPNH4CH/P6WXrFsu6Vxm/go9YnVK9Y1vWIIRv3RP0s/8Os6yYGZv7P7/EBww+lixAOAAA=
   </data>
  </layer>
  <layer name="Objects" width="30" height="30">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAC6VWvU7DMBAmisMT9AW68QQ0AwMSVVV1pYrITAfECGok2LpApUqFiacozB1gZ2HkATIiITEisUCO3MmXy9lN1E+yktiX+3y/dhrt/KOHTx9iJgPysfIPn3fJAFKhS0NTXW0AvFIvIY78PKtwu73cb/hn6lh/DutzTeIF2A/sGAZ1eznGu+XzMaw+XfvyITfW3kFg9wycr6YqO0Hel4KvE5VPgGG8puEeeF4Rb+r4d4TrXVxfKHJ7LXkvjOVd4hz4Ad5n6BNYXzK9tE7vPL/66Ksz4TMNB0E13nL41iE3uJ/GyDfx8HZFfAFzIS9jLTFA3hzlOmwP/L2v6OG8TbBidTQQ9rr2OXbwzhrEg0D1Ozd1XsLIY0us+JlqE2r2J7TfGjJTzzkAz0XKTZIBTqPwUm3ymj13cEM9uXLONc9BvBn6GnKE/HRVcF57bPblRhLV60/7l9ck15d5Yg9ygwY9Y23KfIBB9X7o8BOgy3TK/pxjfBOUoT7+jfKyJglaf7qLrL2JsEP2Z7KXQDlx64mLC1SbpE+rR15znHdq6vLaeaH1cqrNTb2TRtyy5/Bezmv2g9nrOl/J/7kjfpknz96N9ZesWeJtg3WLfgeAnLvEf6aOuPkg++tKyalhWA6A7z40w/ogG55YHD7x/Y3p5/Wi3b2A86Rhjvt6pwuyvqmegfNU+OXIVGUAC9Gv+Dn6G+rzfH9yn+C3XjEX4/xN8X1srAzXo91tAF/sDJR9R8pOhY0Uj4fimdDeWtxtthkEbc++u1ymyK/FGSvP3Cyy37Le+HcaVe8R2l1E63+uPsJ1/AEQQaAnEA4AAA==
+   H4sIAAAAAAAAA6VWvU7DMBAmisMT9AW68QQ0AwMSVVV1pYrITAfECGok2LpApUqFiacozB1gZ2HkATIiITEisUCO3MmXy9lN1E+yktiX+3y/dhrt/KOHTx9iJgPysfIPn3fJAFKhS0NTXW0AvFIvIY78PKtwu73cb/hn6lh/DutzTeIF2A/sGAZ1eznGu+XzMaw+XfvyITfW3kFg9wycr6YqO0Hel4KvE5VPgGG8puEeeF4Rb+r4d4TrXVxfKHJ7LXkvjOVd4hz4Ad5n6BNYXzK9tE7vPL/66Ksz4TMNB0E13nL41iE3uJ/GyDfx8HZFfAFzIS9jLTFA3hzlOmwP/L2v6OG8TbBidTQQ9rr2OXbwzhrEg0D1Ozd1XsLIY0us+JlqE2r2J7TfGjJTzzkAz0XKTZIBTqPwUm3ymj13cEM9uXLONc9BvBn6GnKE/HRVcF57bPblRhLV60/7l9ck15d5Yg9ygwY9Y23KfIBB9X7o8BOgy3TK/pxjfBOUoT7+jfKyJglaf7qLrL2JsEP2Z7KXQDlx64mLC1SbpE+rR15znHdq6vLaeaH1cqrNTb2TRtyy5/Bezmv2g9nrOl/J/7kjfpknz96N9ZesWeJtg3WLfgeAnLvEf6aOuPkg++tKyalhWA6A7z40w/ogG55YHD7x/Y3p5/Wi3b2A86Rhjvt6pwuyvqmegfNU+OXIVGUAC9Gv+Dn6G+rzfH9yn+C3XjEX4/xN8X1srAzXo91tAF/sDJR9R8pOhY0Uj4fimdDeWtxtthkEbc++u1ymyK/FGSvP3Cyy37Le+HcaVe8R2l1E63+uPsJ1/AEQQaAnEA4AAA==
   </data>
  </layer>
  <layer name="Above" width="30" height="30">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAC8WWzQ3CMAyFg9JuwA7puWKCCrEIJxbhVIlRO0LBhwjLcvKcn8InVWrkJLWf7TTOlRFG56axcFHnvVafXn85tfuF9piZPfpwBWtews/AxjEGtMfC7D3itLL77zvyMSLjrWFj3/1lvJFgyCuC6yA1oXHOrvEPHYhWHTirx3OIXZnXo99nsGZL+Me/XaPHcnDuUlrweGPNabWovSMePq0FivfWeEageJFd6qD9TzQtULy1eqRAOml9YrXLvFt7k0j1Sc5O+uZ6FvVmC7mezeWmtU5zoNwdBeXGcnbKfMT6SGliudNZzk7KR8k9rFdN7ZnzjPtG3If6mtK+a5kTPs/U0O8SrUfPI56D9tL+MRx57vS4Lx5N6V2uZcx5DvU+l/IGyDNzbxAOAAA=
+   H4sIAAAAAAAAA8WWzQ3CMAyFg9JuwA7puWKCCrEIJxbhVIlRO0LBhwjLcvKcn8InVWrkJLWfYzfOlRFG56axcFHnvVafXn85tfuF9piZPfpwBWtews/AxjEGtMfC7D3itLL77zvyMSLjrWFj3/1lvJFgyCuC6yA1oXHOrvEPHYhWHTirx3OIXZnXo95nsGZL+Me/XaPHcnDuUlrweOOZ086i9o54+LQWKN5bY49A8SK71EH7n2haoHhr9UiBdNLqxGqXebfWJpGqk5yd9M3VLKrNFnI1m8tN6znNgXJ3FJQbS++U+YjnI6WJ5U5n6Z2Uj5J7WK8ztWf6GfeNuA/1Z0r7rmVO+DxTQ71LtBo9j3gO2kv7x3Bk3+lxXzya0rtcy5jzHOp9lqD+/gaNUw4EEA4AAA==
   </data>
  </layer>
  <layer name="Walkable" width="30" height="30" visible="0">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAC+WTUQ6AMAhDe4Xd/7J+mRgdoyV0xkjih5PxoNQBYPz0wUvMM+5nbt6M4WRn8+Ly7p6ZCbfWDt91xqy3qNesxk5uVbOs1+p+M7bKjf6jClfx4qovto+OULVn8xRfMTXZ71EeExUum7PyKaPzPS/r2+WXr3FX/uvkAs95u3RR77NcVkd2BnYfTu6M0TlvVE/lYnFP8VSkA+uXqic7Yqdf1P066h64+UhYEA4AAA==
+   H4sIAAAAAAAAA+WTUQ6AMAhDe4Xd/7J+mRgdoyV0xkjih5PxoNQBYPz0wUvMM+5nbt6M4WRn8+Ly7p6ZCbfWDt91xqy3qNesxk5uVbOs1+p+M7bKjf6jClfx4qovto+OULVn8xRfMTXZ71EeExUum7PyKaPzPS/r2+WXr3FX/uvkAs95u3RR77NcVkd2BnYfTu6M0TlvVE/lYnFP8VSkA+uXqic7Yqdf1P066h64+UhYEA4AAA==
   </data>
  </layer>
  <objectgroup name="Mapevents" width="30" height="30">
@@ -140,9 +140,10 @@
     <property name="place" value="entrance"/>
    </properties>
   </object>
-  <object name="Map not completed" type="sign" x="256" y="928" width="32" height="32">
+  <object name="south" type="mapchange" x="256" y="928" width="32" height="32">
    <properties>
-    <property name="text" value="This map is not yet done. Please come back in a later version of the game."/>
+    <property name="map" value="fallhaven_sw"/>
+    <property name="place" value="north"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/fallhaven_rigmor.tmx b/AndorsTrail/res/xml/fallhaven_rigmor.tmx
index a0ccca82a..aeb3ee741 100644
--- a/AndorsTrail/res/xml/fallhaven_rigmor.tmx
+++ b/AndorsTrail/res/xml/fallhaven_rigmor.tmx
@@ -50,12 +50,12 @@
  </tileset>
  <layer name="Ground" width="15" height="10">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAAwtiZGAIogDnM2HHhORAuJ4JFZewMTAUs0HUoMvBMEyvIwMqbgHqa2aDqMliQGBkNTC9b9kw9RPCML2TgXqnYNEPkpsIFJ+EJmfGjNC7GCi3BIfehUDxRUD8kgXofyh+xYIIR1zuQpbLA6rfDcR7gDiXBRGOIDcg61GD8uuR9P4Eqi+A4l8sELlABgh2ZECwicUAeNJCPVgCAAA=
+   H4sIAAAAAAAAAwtiZGAIogDnM2HHhORAuJ4JFZewMTAUs0HUoMvBMEyvIwMmbmaDqMliQGBkeXx6CWGY3slAO6awYZefCBSfhCZnxkzYXmS5lyxA/0PxKxZEOOLSiyyXB1S/G4j3AHEuCyIcQW5A1qMG5dcj6f0JVF8Axb9YIHKBDBDsyIBgE4sBtbBunVgCAAA=
   </data>
  </layer>
  <layer name="Objects" width="15" height="10">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIAyU2PHLc7IwMMSyQ2h0YAQUz2VHqEMHkiyoNDJwgurTZoXIe7Ei5O6yMTBcAOJkoPhDNlR9HVB1PUDaGoitgNiSlWHQgClI4bkRzV3J0HAQIRDmIHARTS9Mzw82TP3JaOH7Gy3MQOA0UM0ZLPFADgAAe3X9BVgCAAA=
+   H4sIAAAAAAAAA2NgIAyU2PHLc7IwMMSyQ2h0YAQUz2VHqEMHkiyoNDJwgurTZoXIe7Ei5O6yMTBcAOJkoPhDIN3ChpDrgKrrAdLWQGwFxJZIet8iqaUnWAy0dwkQT0EKz41Qdy0Eii+C+gcERAiEOQhcZEXlw/T8YMPUn4wWvr+xhMFpoJozWOKBHAAAwAg+lFgCAAA=
   </data>
  </layer>
  <layer name="Above" width="15" height="10">
@@ -63,7 +63,7 @@
    H4sIAAAAAAAAA2NgoAz8ZyZPDl3+Iht+vVqsxJv9ngR7SQUwvS3s5OtNZiHdTZSEM7bwgLkBXW4ZK6ZacgAAUTneEVgCAAA=
   </data>
  </layer>
- <layer name="Walkable" width="15" height="10">
+ <layer name="Walkable" width="15" height="10" visible="0">
   <data encoding="base64" compression="gzip">
    H4sIAAAAAAAAAxNkYGAQHMKYgURxZHlSACH9uOQI2U+sufjchEuMGDcRq5fUeAEAwdhY6VgCAAA=
   </data>
@@ -76,7 +76,7 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="15" height="10">
+ <objectgroup name="Spawn" width="15" height="10" visible="0">
   <object name="Rigmor" type="spawn" x="64" y="96" width="384" height="160"/>
  </objectgroup>
  <objectgroup name="Keys" width="15" height="10"/>
diff --git a/AndorsTrail/res/xml/fallhaven_se.tmx b/AndorsTrail/res/xml/fallhaven_se.tmx
new file mode 100644
index 000000000..977647cbd
--- /dev/null
+++ b/AndorsTrail/res/xml/fallhaven_se.tmx
@@ -0,0 +1,108 @@
+<?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"/>
+ </tileset>
+ <tileset firstgid="129" name="tiles_1_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_2.png"/>
+ </tileset>
+ <tileset firstgid="257" name="tiles_2_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_1.png"/>
+ </tileset>
+ <tileset firstgid="385" name="tiles_2_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_2.png"/>
+ </tileset>
+ <tileset firstgid="513" name="tiles_2_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_3.png"/>
+ </tileset>
+ <tileset firstgid="641" name="tiles_2_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_4.png"/>
+ </tileset>
+ <tileset firstgid="769" name="tiles_2_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_5.png"/>
+ </tileset>
+ <tileset firstgid="897" name="tiles_1_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_3.png"/>
+ </tileset>
+ <tileset firstgid="1025" name="tiles_1_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_4.png"/>
+ </tileset>
+ <tileset firstgid="1153" name="tiles_1_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_5.png"/>
+ </tileset>
+ <tileset firstgid="1281" name="tiles_1_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_6.png"/>
+ </tileset>
+ <tileset firstgid="1409" name="tiles_1_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_7.png"/>
+ </tileset>
+ <tileset firstgid="1537" name="tiles_2_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_8.png"/>
+ </tileset>
+ <tileset firstgid="1649" name="tiles_2_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_6.png"/>
+ </tileset>
+ <tileset firstgid="1777" name="tiles_2_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_7.png"/>
+ </tileset>
+ <tileset firstgid="1905" name="tiles_2_8" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_8.png"/>
+ </tileset>
+ <layer name="Ground" width="30" height="20">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAC82VQQ6CMBBFJ2PwLpxEiAdA49a9R/CMcAM5iTTY0Hw6OtVxdPHyE1r68tsmrYmodmJXEXXVnL9wdoJ3zzI4t+U1uTVTZ9q32Sx5Yhlc78hrpM7Yt51ch8R7YRlcSzMn58bvwR/cV14ycN7OifPTsYjmnHNjsXtMS7zvs6ZvKT3wymnVd5gYHzko9tiq7wjub50v/ncDNHfL+179E5Zn/g4e7pxD6m25H7iW9E5q3s9S56fp4XiWJc47i3CMhmAJAAA=
+  </data>
+ </layer>
+ <layer name="Objects" width="30" height="20">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAC9VUvUrEQBCOJOt72OgLHF4KC0Hw0DbqYSn6COb6BIQrjtMH0MrCRgvxivRapBJ8AJ/BV3DHmzFfxt1lBRs/CPs3mW++mdmdmyRpsuQLV3Y+N8k3ZF1l/b3dlbCdrNHvBti7UNrztYBNwbwF+EWE/kVcOP4NYYd5NU7AT8vzKY9DTyyDyBgJqDeESunxcRNOwfY17Y8Hq8txPf2pV87e2XaUuv27uKeR+f4A3mOPhnG61ED8YqP1C6jO2CeifY997DMX5pl8zkx3dmRtD0HrOO3HNlTzPKK+29b3Jn9baswh7xj7I8dWe7TKXaRzuXutuos1rMU/6UY9t1bfnd2/tns39nsz/lqQ1ti7RD2A+dG8gnu798D7cq57asLrgSf3bSAm4RV9BNJM/zzZcRGobwgV3HvdA7npeFGf4Nlyvqh+XmQdN/qUudTS9Z6ITQG8rreafFyarh+0D9SFaAJaBdjj8p1Db/veNPIdc4cE8rZIPtAvzs8iY6mhT3Xt6cwVt6vfGoinVLHpWBBlFl67oOvgqpkrP38FfN9j38D/jt9o/ASbgteIYAkAAA==
+  </data>
+ </layer>
+ <layer name="Above" width="30" height="20">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAC81TUQ6DMAjFqGep38YT6G6yA+2oO4JLY00IgfLqyNxLGhUovIdARPQaj3PC+s5nK/ZtxO/dhQTUXrq6fy7+rNeKnZ0cGh7OnZX5rdj1Ql0Pe0/0HPyYaPC5svA26vL/nN+nG2fuF+B6T63oLl7tD7JL/9J7ySOCF8+B5EvAPEcA1abNQ43bN/3jeVH9Mk6b8dacLXwsfZpd60dLjyQH2esWuwaPi8yl7bZnRznwZxQsDpE1PKC6PsulycdgCQAA
+  </data>
+ </layer>
+ <layer name="Walkable" width="30" height="20">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAC61TWw7AIAjrFbz/Zf01BvpAScyyrdBWYAFY4cEgp6pxRsKbhOJ1uBX2/PeCYX6dO+z8pn1Tfh1u1y/Qczp+qpxKF8tj2p13dS+vkfRl0t+OT/lN9VdzUeFwPd25m2q5/7tYpaObY8V749n8dhqm+15pYTyTYHls31QdNV9ujWRX3Npu308Nzvd0Pru86c6n/fpxWPziSDQw3AbrAnAZYAkAAA==
+  </data>
+ </layer>
+ <objectgroup name="Mapevents" width="30" height="20">
+  <object name="north" type="mapchange" x="416" y="0" width="32" height="32">
+   <properties>
+    <property name="map" value="fallhaven_ne"/>
+    <property name="place" value="south"/>
+   </properties>
+  </object>
+  <object name="east" type="mapchange" x="928" y="416" width="32" height="128">
+   <properties>
+    <property name="map" value="wild12"/>
+    <property name="place" value="nw"/>
+   </properties>
+  </object>
+  <object name="farmer" type="mapchange" x="544" y="160" width="32" height="32">
+   <properties>
+    <property name="map" value="fallhaven_farmer"/>
+    <property name="place" value="entrance"/>
+   </properties>
+  </object>
+  <object name="storage" type="mapchange" x="320" y="160" width="32" height="32">
+   <properties>
+    <property name="map" value="fallhaven_storage"/>
+    <property name="place" value="entrance"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Spawn" width="30" height="20" visible="0">
+  <object name="fallhaven_farmer1" type="spawn" x="544" y="256" width="224" height="128"/>
+  <object name="fallhaven_bandit" type="spawn" x="96" y="512" width="32" height="32">
+   <properties>
+    <property name="respawn" value="false"/>
+   </properties>
+  </object>
+  <object name="forestant" type="spawn" x="160" y="384" width="224" height="192"/>
+  <object name="fallhaven_citizen4" type="spawn" x="0" y="64" width="800" height="192"/>
+ </objectgroup>
+ <objectgroup name="Keys" width="30" height="20"/>
+</map>
diff --git a/AndorsTrail/res/xml/fallhaven_storage.tmx b/AndorsTrail/res/xml/fallhaven_storage.tmx
new file mode 100644
index 000000000..9a83b443a
--- /dev/null
+++ b/AndorsTrail/res/xml/fallhaven_storage.tmx
@@ -0,0 +1,83 @@
+<?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"/>
+ </tileset>
+ <tileset firstgid="129" name="tiles_1_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_2.png"/>
+ </tileset>
+ <tileset firstgid="257" name="tiles_2_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_1.png"/>
+ </tileset>
+ <tileset firstgid="385" name="tiles_2_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_2.png"/>
+ </tileset>
+ <tileset firstgid="513" name="tiles_2_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_3.png"/>
+ </tileset>
+ <tileset firstgid="641" name="tiles_2_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_4.png"/>
+ </tileset>
+ <tileset firstgid="769" name="tiles_2_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_5.png"/>
+ </tileset>
+ <tileset firstgid="897" name="tiles_1_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_3.png"/>
+ </tileset>
+ <tileset firstgid="1025" name="tiles_1_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_4.png"/>
+ </tileset>
+ <tileset firstgid="1153" name="tiles_1_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_5.png"/>
+ </tileset>
+ <tileset firstgid="1281" name="tiles_1_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_6.png"/>
+ </tileset>
+ <tileset firstgid="1409" name="tiles_1_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_7.png"/>
+ </tileset>
+ <tileset firstgid="1537" name="tiles_2_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_8.png"/>
+ </tileset>
+ <tileset firstgid="1649" name="tiles_2_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_6.png"/>
+ </tileset>
+ <tileset firstgid="1777" name="tiles_2_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_7.png"/>
+ </tileset>
+ <tileset firstgid="1905" name="tiles_2_8" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_8.png"/>
+ </tileset>
+ <layer name="Ground" width="15" height="10">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA9NlYGDQpQDnM5GOYXo9mCG4ngmC0fnYMLpebwYIRud7IrFhGKY3ghmCYeLofGwYphddHJs9uPSiu5EYDAtjYtyIjvOhYUaOm0H6AhmIx95ofAAnYTKZWAIAAA==
+  </data>
+ </layer>
+ <layer name="Objects" width="15" height="10">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgoB5QZ8HNDmfHr9ecBT/bnRmCCYHFQDW9rBB2MlRvODMEEwKbWXGbiQ+A7DmMQ28oHr32aGFSjaR2DtC8uVjMTGbBFAOBbCS9a4D61iLp7UVihzGjmgPSl01E2JAKALD3CxlYAgAA
+  </data>
+ </layer>
+ <layer name="Above" width="15" height="10">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgoAz8Zx5YvehmEGMmTM17NLXofHx6yQEDpZcYf1EbAADb4KdoWAIAAA==
+  </data>
+ </layer>
+ <layer name="Walkable" width="15" height="10">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAAxNkYGAQHMIYBkiVwyWPC+CSF0Sjcekj1g5i3UyqXnQ5XHxC9uNzFzIfAPCyS01YAgAA
+  </data>
+ </layer>
+ <objectgroup name="Mapevents" width="15" height="10">
+  <object name="entrance" type="mapchange" x="352" y="288" width="32" height="32">
+   <properties>
+    <property name="map" value="fallhaven_se"/>
+    <property name="place" value="storage"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Spawn" width="15" height="10" visible="0">
+  <object name="khorand" type="spawn" x="32" y="96" width="416" height="160"/>
+ </objectgroup>
+ <objectgroup name="Keys" width="15" height="10"/>
+</map>
diff --git a/AndorsTrail/res/xml/fallhaven_sw.tmx b/AndorsTrail/res/xml/fallhaven_sw.tmx
new file mode 100644
index 000000000..347d41398
--- /dev/null
+++ b/AndorsTrail/res/xml/fallhaven_sw.tmx
@@ -0,0 +1,119 @@
+<?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"/>
+ </tileset>
+ <tileset firstgid="129" name="tiles_1_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_2.png"/>
+ </tileset>
+ <tileset firstgid="257" name="tiles_2_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_1.png"/>
+ </tileset>
+ <tileset firstgid="385" name="tiles_2_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_2.png"/>
+ </tileset>
+ <tileset firstgid="513" name="tiles_2_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_3.png"/>
+ </tileset>
+ <tileset firstgid="641" name="tiles_2_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_4.png"/>
+ </tileset>
+ <tileset firstgid="769" name="tiles_2_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_5.png"/>
+ </tileset>
+ <tileset firstgid="897" name="tiles_1_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_3.png"/>
+ </tileset>
+ <tileset firstgid="1025" name="tiles_1_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_4.png"/>
+ </tileset>
+ <tileset firstgid="1153" name="tiles_1_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_5.png"/>
+ </tileset>
+ <tileset firstgid="1281" name="tiles_1_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_6.png"/>
+ </tileset>
+ <tileset firstgid="1409" name="tiles_1_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_7.png"/>
+ </tileset>
+ <tileset firstgid="1537" name="tiles_2_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_8.png"/>
+ </tileset>
+ <tileset firstgid="1649" name="tiles_2_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_6.png"/>
+ </tileset>
+ <tileset firstgid="1777" name="tiles_2_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_7.png"/>
+ </tileset>
+ <tileset firstgid="1905" name="tiles_2_8" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_8.png"/>
+ </tileset>
+ <layer name="Ground" width="30" height="20">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAC9NkYGDQHMUUYW8mTIyuJpyVgcGdlTyzsJkHwtFMmBhdDTF24jILm3kgnM+EibH5lxh7sZmFzTwQrmfCxOT6F5tZ2MwbxaMYGyY2nY3iUTyYMCjdEls2UxPD6j9i7Yepw6UelzwuPq76F9kMbDSp6tFpAJXe8kZgCQAA
+  </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>
+ </layer>
+ <layer name="Above" width="30" height="20">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAC81UWwqEMAxUVs9Sv8UTqGfzS5Ddi3oEH2gxlIlp01J2fmozcfLSFMWDpcbP9u7yMXeKqcJ2DebPO98cOZj6OlPE70psbxm7RgvpjYxvf9tDauK0QvQ20HfbY7ffPkB6CKunnwuuHo2eCaxNwvfQ+92aQ2LtWNhZamaqgfTdoTzOPUPfQ7vn5NE+8qkr9bxTxsk1Fw3ecqOcVENMjf/SHzePHHkZRTzpf+d4SR/50lPyRzy1czq5sQPpdoKrYAkAAA==
+  </data>
+ </layer>
+ <layer name="Walkable" width="30" height="20">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAC7WV0Q0AIQhDWcH9l/XXGAoPRBJyCQKtnNZlZitwS9Z/uR3fSavgUnzVR+WoWMaL7EPlKd7TuGR29FzdfdS8PH5qXeGSWrKnyKbPecZP7T3qF/37Li+Sn9UQbhVdIb06nKMY4d7BjPIVJ1JXrenq55QpXDr3bL4v9+L1Tk2Zp9eefv/ArGhL9R264wSb6EUn//QNnP5NBGAJAAA=
+  </data>
+ </layer>
+ <objectgroup name="Mapevents" width="30" height="20">
+  <object name="north" type="mapchange" x="256" y="0" width="32" height="32">
+   <properties>
+    <property name="map" value="fallhaven_nw"/>
+    <property name="place" value="south"/>
+   </properties>
+  </object>
+  <object name="south" type="mapchange" x="480" y="608" width="64" height="32">
+   <properties>
+    <property name="map" value="wild10"/>
+    <property name="place" value="north"/>
+   </properties>
+  </object>
+  <object name="alaun" type="mapchange" x="768" y="160" width="32" height="32">
+   <properties>
+    <property name="map" value="fallhaven_alaun"/>
+    <property name="place" value="entrance"/>
+   </properties>
+  </object>
+  <object name="lumberjack" type="mapchange" x="448" y="192" width="32" height="32">
+   <properties>
+    <property name="map" value="fallhaven_lumberjack"/>
+    <property name="place" value="entrance"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Keys" width="30" height="20"/>
+ <objectgroup name="Citizens" width="30" height="20" visible="0">
+  <object name="fallhaven_citizen3" type="spawn" x="320" y="32" width="576" height="288"/>
+ </objectgroup>
+ <objectgroup name="NPCs, Monsters" width="30" height="20">
+  <object name="fallhaven_lumberjack" type="spawn" x="416" y="256" width="32" height="32"/>
+  <object name="forestant" type="spawn" x="32" y="416" width="288" height="192">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="forestant" type="spawn" x="640" y="416" width="288" height="192">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="vacor" type="spawn" x="128" y="128" width="32" height="32">
+   <properties>
+    <property name="respawn" value="false"/>
+   </properties>
+  </object>
+ </objectgroup>
+</map>
diff --git a/AndorsTrail/res/xml/fallhaven_tavern.tmx b/AndorsTrail/res/xml/fallhaven_tavern.tmx
index 8d47033d7..0d138de88 100644
--- a/AndorsTrail/res/xml/fallhaven_tavern.tmx
+++ b/AndorsTrail/res/xml/fallhaven_tavern.tmx
@@ -50,12 +50,12 @@
  </tileset>
  <layer name="Ground" width="20" height="19">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA62SzQ2DMAyFX/mTOhCHXqgYAcbg0hEyQ0dgDroSO1RWahGZhNqBw1N+7HxS3vN4A8aL9SquEfPejZcr8kXvmTc3Xj30aktgwqY54Fk4R9Ly2A/Z29XAs/arhcd+hL1H+VJ9qYBPtfXLMzN4n8qXVos/vI9lTHWn5FGe/7yh+oC9+sjdgL1/IWv9+XuHXpo8cnmpPHJ5qTxyeak8zvh3No9wVuXcPkp/Z+GRR/SO/ZP/dUZebCalvkJVcnfwBQAA
+   H4sIAAAAAAAAA62S3Q2DMAyEr/xJDMRDX1oxAozRl46QGZiHDledoghkHEgcHk5RbOeTdZf5Acw361vdo8BbOi9X2cX3gTciX0MNfLCJtRKeplRe8EPOvlrg3frTst9+9ixf9tcG+DXbvLxLXixfnpb9tIzZd4k85nnlDfsTjhqV2qT4p/F6pCslDysvloeVF8vDyovlUeJfKW//V+W/fda+lsOjR3wX/JP7uUye9iel/lQWwuXwBQAA
   </data>
  </layer>
  <layer name="Objects" width="20" height="19">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoAwoseOX52RhYNgMVBPAimDnsCPYyGpAwIiAeZJAtS3sCHYmMwNDFjOEjawGBpzwmCcKlZsCpKuZIexKIF0FZWczo6pPhprbwYoq/o0Nv5sHAvxGc5MoO34+qUAIql8ESguD4hTJzD84wgQU95vR7AaZcRoYtmdYMPkiZLgT5BZVLPpgYmHMmHLI4ALQ7XepEKdTKAxjGNjISlgNKeAgknmguMil0J0Xqew+dEBJfLRQKQ5gADlOH7JBcDILbvXEAGz6qZV20AEAnGJDhPAFAAA=
+   H4sIAAAAAAAAA2NgoAwoseOX52RhYNgMVBPAimDnsCPYyGpAwIiAeZJAtS3sCHYmMwNDFjOEjawGBpywmLeQDYJFoXJTgHQ1M4RdCaSroOxsZlR9yVBzO1gh+mHgGxvDoAO/0dwkyo6bDwsPUoAQVL8IlBYGxSmSmX9wmAeK+81obgGZcRoYtmdYMPkiBNIDNgByiyoWfTCxMGZMOWRwAej2u1SI0ylIbnhLgXkbWSl3CzI4iGQeKC5yyQhjZHCRyu5DB5TERwsOv5EbH8hx+pANgpNZcKsnBmDTP4XCOMEFAPWS7JjwBQAA
   </data>
  </layer>
  <layer name="Above" width="20" height="19">
@@ -63,12 +63,12 @@
    H4sIAAAAAAAAA2NgoD74z4xd3IeVuuaRC2DmJbNQ1zxqAWqYh+w3UswjRu1gN+89mea1sBOvjxjzqAFA5rFRwV3I5lETDCXzLrJBMLXMo0baQU6rpKRbcgEA5Xi8NfAFAAA=
   </data>
  </layer>
- <layer name="Walkable" width="20" height="19">
+ <layer name="Walkable" width="20" height="19" visible="0">
   <data encoding="base64" compression="gzip">
    H4sIAAAAAAAAAxNkYGAQHMGYgQCbAQcbmzmUAmLNwmUvPj+Sah4pYUYKn1zzGHDIk+NnQupISTO47CUlfsi1a7iahw6o5UZqmYuul1I3YnMfNcMUGQMAKrZNJfAFAAA=
   </data>
  </layer>
- <objectgroup name="Mapevents" width="20" height="19">
+ <objectgroup name="Mapevents" width="20" height="19" visible="0">
   <object name="entrance" type="mapchange" x="160" y="320" width="32" height="32">
    <properties>
     <property name="map" value="fallhaven_nw"/>
@@ -78,7 +78,7 @@
   <object name="rest" type="rest" x="576" y="320" width="32" height="32"/>
   <object name="rest" type="rest" x="576" y="480" width="32" height="32"/>
  </objectgroup>
- <objectgroup name="Spawn" width="20" height="19">
+ <objectgroup name="Spawn" width="20" height="19" visible="0">
   <object name="drunk" type="spawn" x="64" y="128" width="224" height="128">
    <properties>
     <property name="quantity" value="2"/>
@@ -88,12 +88,12 @@
   <object name="Ganos" type="spawn" x="32" y="224" width="32" height="32"/>
  </objectgroup>
  <objectgroup name="Keys" width="20" height="19">
-  <object name="qfallhaven_tavern_room1" type="key" x="448" y="288" width="32" height="32">
+  <object name="fallhaventavern:20" type="key" x="448" y="288" width="32" height="32">
    <properties>
     <property name="message" value="You are not allowed into the room unless you have rented it."/>
    </properties>
   </object>
-  <object name="qfallhaven_tavern_room2" type="key" x="448" y="448" width="32" height="32">
+  <object name="fallhaventavern:10" type="key" x="448" y="448" width="32" height="32">
    <properties>
     <property name="message" value="You are not allowed into the room unless you have rented it."/>
    </properties>
diff --git a/AndorsTrail/res/xml/flagstone0.tmx b/AndorsTrail/res/xml/flagstone0.tmx
new file mode 100644
index 000000000..6ee37f4ed
--- /dev/null
+++ b/AndorsTrail/res/xml/flagstone0.tmx
@@ -0,0 +1,114 @@
+<?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"/>
+ </tileset>
+ <tileset firstgid="129" name="tiles_1_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_2.png"/>
+ </tileset>
+ <tileset firstgid="257" name="tiles_2_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_1.png"/>
+ </tileset>
+ <tileset firstgid="385" name="tiles_2_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_2.png"/>
+ </tileset>
+ <tileset firstgid="513" name="tiles_2_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_3.png"/>
+ </tileset>
+ <tileset firstgid="641" name="tiles_2_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_4.png"/>
+ </tileset>
+ <tileset firstgid="769" name="tiles_2_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_5.png"/>
+ </tileset>
+ <tileset firstgid="897" name="tiles_1_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_3.png"/>
+ </tileset>
+ <tileset firstgid="1025" name="tiles_1_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_4.png"/>
+ </tileset>
+ <tileset firstgid="1153" name="tiles_1_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_5.png"/>
+ </tileset>
+ <tileset firstgid="1281" name="tiles_1_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_6.png"/>
+ </tileset>
+ <tileset firstgid="1409" name="tiles_1_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_7.png"/>
+ </tileset>
+ <tileset firstgid="1537" name="tiles_2_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_8.png"/>
+ </tileset>
+ <tileset firstgid="1649" name="tiles_2_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_6.png"/>
+ </tileset>
+ <tileset firstgid="1777" name="tiles_2_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_7.png"/>
+ </tileset>
+ <tileset firstgid="1905" name="tiles_2_8" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_8.png"/>
+ </tileset>
+ <layer name="Ground" width="30" height="30">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAAzvCyMBwBIhZmBgYLjOiYmYmiBwML6EihtkhArTjMSMqFmai3B1HcGCYHZoM2DEp7kDH2MIQhnHZR4470DG2MCTkT3LcQW2zR/EoHsWjeBSP4sGM2VmIx8PB3nQm4jE17S1nIh7TI5xp7V9c9iL7M4WF+v7FFZdmDAjsAKXpEb/IahyobKcmA6q/kDG17RkOGAAVulnFEA4AAA==
+  </data>
+ </layer>
+ <layer name="Objects" width="30" height="30">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA81WMU7DQBA8hzMvACl9+AGIDyAFidYFUCdFasAPcKo8KU9IQ5uOAvMRvElGGW92z04EiJHQOtx5Z3duvLoQ/gcu8r/luxmEMGo4X2MIi7j93/Xg92v5jO3fy+Z3JL4y7us4FVz/RHrs6Kdw1i09+Fk0hHY6h3AK9zzfr82p95qeV0oTXivpWbSaZiHcJv7ACWi9BZXa4+V8yw7fFViaIt/S4Jt25LT0hyfA5cVU3d65WjVa/aWiQOsYczsPA37pw2HFLlR523vr3F7TUfZWRsR6RfyFygkNvBq/op37oD46F87FHFpz3UuZt/fIjKsT510kcgngFa7N0lH49Hds9SJYGX0icu349h+yvU6a20PKN1b9grXaN87aGvyEZ7019pfwYm6lPNvHw14O7K/Jm+h3lHjP4kpBf0vWmY2NmehxAtAHZ6PPTufSehd5m3cVfV+fAvRt5RHeru/45URegcxY7nfTWzzUOaXxfewX4RXMEcvbzOt5CniM/eKd0s7qYaOzM2v6+vfpPITLZs9M3XPYz8y5Jl/VhqeA57M076zhHar9k7j1e+XULrxd85zxvqvhYxdFU+vuWzpzfUQ6p2ak1InvdWjkl5rRn2BBfODg+pELOh97V/Du97pPa26At2suM64MPu8OhvctDYV34cypY+5ImovjN6fhMdwQDgAA
+  </data>
+ </layer>
+ <layer name="Above" width="30" height="30">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA8VX2w0CMQwrQrcQYoKDhcrijAA66SKiKC/3Qf2H2tqNa9pcKT98rmUJ3ot0Z8DysG6lvDZ/7SMY90AeWhyHdg//DGQ8mblewvOHtCqbQ79nnWtNrov24I3zumR9PZA+WWMtvMTHfR2dBQukIfW0epE9yVoklwbNx54cIFxZzMoB58xkOFuL5VHPXnkeIr1/ZHg1eI3a3TjqDtK4tAx6nt8vmN4NnE97kHiCPPs5X/qJ/N9bwPudyGsPaO5JF3kjNXjnq51ltkf2+rAD3vnuHbqEljtQ05C9OfoeZRDVRrzovRzV6313aFlG3nMkz6N7L9mXaHu3tL4BeNqREA4AAA==
+  </data>
+ </layer>
+ <layer name="Walkable" width="30" height="30">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA+1UWwrAMAjrFXb/yw72NUaMidp+TRgM2rys7bXWuv7vqd38ap3Wj9bd3jHsqVLzdjwhfJcv05o8V8WPc18yHuRp1z1imMl3AmVkHt1Mas/de4l0Ii6Gcc6m0pfIZ9Wjoqm+G52Zded7al6V9bemo83K3a/4jTAKH9vf7TW7S9EcTOtGeVFN6LIMOzWdXp/My84i85xpISzKOKGNsiB+tO70LPL3/WezXJkPxodwqqbKrWhWeuhoI+wNTLMG0xAOAAA=
+  </data>
+ </layer>
+ <objectgroup name="Mapevents" width="30" height="30">
+  <object name="house" type="mapchange" x="768" y="768" width="32" height="32">
+   <properties>
+    <property name="map" value="flagstone_inner"/>
+    <property name="place" value="entrance"/>
+   </properties>
+  </object>
+  <object name="east" type="mapchange" x="928" y="128" width="32" height="96">
+   <properties>
+    <property name="map" value="wild8"/>
+    <property name="place" value="west"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Spawn" width="30" height="30">
+  <object name="forestboar3" type="spawn" x="832" y="160" width="32" height="32"/>
+  <object name="forestboar2" type="spawn" x="480" y="160" width="352" height="128">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="forestboar3" type="spawn" x="352" y="128" width="160" height="128"/>
+  <object name="forestbeetle" type="spawn" x="64" y="448" width="224" height="448">
+   <properties>
+    <property name="quantity" value="4"/>
+   </properties>
+  </object>
+  <object name="forestwolf1" type="spawn" x="64" y="96" width="288" height="224">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="cavesnake2_boss" type="spawn" x="608" y="384" width="32" height="32"/>
+  <object name="flagstone_sentry" type="spawn" x="384" y="288" width="32" height="32"/>
+  <object name="prisoner1" type="spawn" x="768" y="512" width="32" height="32">
+   <properties>
+    <property name="respawn" value="false"/>
+   </properties>
+  </object>
+  <object name="cavesnake2_boss" type="spawn" x="864" y="672" width="32" height="32"/>
+  <object name="forestserpent1" type="spawn" x="864" y="768" width="32" height="32"/>
+ </objectgroup>
+ <objectgroup name="Keys" width="30" height="30"/>
+</map>
diff --git a/AndorsTrail/res/xml/flagstone1.tmx b/AndorsTrail/res/xml/flagstone1.tmx
new file mode 100644
index 000000000..514babf32
--- /dev/null
+++ b/AndorsTrail/res/xml/flagstone1.tmx
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" orientation="orthogonal" width="20" height="11" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="tiles_1_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_1.png"/>
+ </tileset>
+ <tileset firstgid="129" name="tiles_1_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_2.png"/>
+ </tileset>
+ <tileset firstgid="257" name="tiles_2_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_1.png"/>
+ </tileset>
+ <tileset firstgid="385" name="tiles_2_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_2.png"/>
+ </tileset>
+ <tileset firstgid="513" name="tiles_2_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_3.png"/>
+ </tileset>
+ <tileset firstgid="641" name="tiles_2_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_4.png"/>
+ </tileset>
+ <tileset firstgid="769" name="tiles_2_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_5.png"/>
+ </tileset>
+ <tileset firstgid="897" name="tiles_1_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_3.png"/>
+ </tileset>
+ <tileset firstgid="1025" name="tiles_1_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_4.png"/>
+ </tileset>
+ <tileset firstgid="1153" name="tiles_1_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_5.png"/>
+ </tileset>
+ <tileset firstgid="1281" name="tiles_1_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_6.png"/>
+ </tileset>
+ <tileset firstgid="1409" name="tiles_1_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_7.png"/>
+ </tileset>
+ <tileset firstgid="1537" name="tiles_2_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_8.png"/>
+ </tileset>
+ <tileset firstgid="1649" name="tiles_2_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_6.png"/>
+ </tileset>
+ <tileset firstgid="1777" name="tiles_2_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_7.png"/>
+ </tileset>
+ <tileset firstgid="1905" name="tiles_2_8" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_8.png"/>
+ </tileset>
+ <layer name="Ground" width="20" height="11">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NiZGBgojJOZ0LF5IrBzCtnQsXkisHMM2BAxeSKIfuZmmIgv8PEkMODVDGYWeVIYsjhQaoYLDzRw4VcjC2MKcHpVHQbLAzMGKiLAd9dF2BwAwAA
+  </data>
+ </layer>
+ <layer name="Objects" width="20" height="11">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgoB8QZcUUE2PFLYcORFixs9FBGBt+c3rxyFcD5Z4Q0A8CfOyE1VAC/jPjF4OFF7o6kDg2ve+BYg+Abr4M9NtMIM3KihADgZnsCHW49MIAKHySWSDsx0D2SnYEHwQimTHFQGA3FrEALPZRAvrR4mUekL8eiBcg2U2MGDFpgBwAAF/ZU6lwAwAA
+  </data>
+ </layer>
+ <layer name="Above" width="20" height="11">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgoD74zzyyxKgNQHacY2dguMCOKo5N7CwaH5s6kHn3sKjDJnaXCHXv6RAGwxUAAMVeDIZwAwAA
+  </data>
+ </layer>
+ <layer name="Walkable" width="20" height="11">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAAxNkYGAQHGaYgQh5ZCCIxiZVHSH9g0GMmuGHzQ4GAmIMONRRE+BzC6nhR6u0CQDzYWpicAMAAA==
+  </data>
+ </layer>
+ <objectgroup name="Mapevents" width="20" height="11">
+  <object name="hole" type="mapchange" x="416" y="64" width="32" height="32">
+   <properties>
+    <property name="map" value="flagstone2"/>
+    <property name="place" value="north"/>
+   </properties>
+  </object>
+  <object name="up" type="mapchange" x="0" y="256" width="32" height="32">
+   <properties>
+    <property name="map" value="flagstone_inner"/>
+    <property name="place" value="down"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Spawn" width="20" height="11">
+  <object name="prisoner2" type="spawn" x="352" y="96" width="128" height="96">
+   <properties>
+    <property name="respawn" value="false"/>
+   </properties>
+  </object>
+  <object name="prisoner2" type="spawn" x="32" y="96" width="128" height="96"/>
+  <object name="skeleton2" type="spawn" x="128" y="256" width="64" height="32"/>
+  <object name="undead1" type="spawn" x="288" y="256" width="64" height="32"/>
+ </objectgroup>
+ <objectgroup name="Keys" width="20" height="11"/>
+ <objectgroup name="Spawn2" width="20" height="11" visible="0">
+  <object name="undeadrat1" type="spawn" x="64" y="224" width="544" height="96">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+ </objectgroup>
+</map>
diff --git a/AndorsTrail/res/xml/flagstone2.tmx b/AndorsTrail/res/xml/flagstone2.tmx
new file mode 100644
index 000000000..924f6121d
--- /dev/null
+++ b/AndorsTrail/res/xml/flagstone2.tmx
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" orientation="orthogonal" width="11" 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"/>
+ </tileset>
+ <tileset firstgid="129" name="tiles_1_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_2.png"/>
+ </tileset>
+ <tileset firstgid="257" name="tiles_2_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_1.png"/>
+ </tileset>
+ <tileset firstgid="385" name="tiles_2_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_2.png"/>
+ </tileset>
+ <tileset firstgid="513" name="tiles_2_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_3.png"/>
+ </tileset>
+ <tileset firstgid="641" name="tiles_2_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_4.png"/>
+ </tileset>
+ <tileset firstgid="769" name="tiles_2_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_5.png"/>
+ </tileset>
+ <tileset firstgid="897" name="tiles_1_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_3.png"/>
+ </tileset>
+ <tileset firstgid="1025" name="tiles_1_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_4.png"/>
+ </tileset>
+ <tileset firstgid="1153" name="tiles_1_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_5.png"/>
+ </tileset>
+ <tileset firstgid="1281" name="tiles_1_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_6.png"/>
+ </tileset>
+ <tileset firstgid="1409" name="tiles_1_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_7.png"/>
+ </tileset>
+ <tileset firstgid="1537" name="tiles_2_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_8.png"/>
+ </tileset>
+ <tileset firstgid="1649" name="tiles_2_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_6.png"/>
+ </tileset>
+ <tileset firstgid="1777" name="tiles_2_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_7.png"/>
+ </tileset>
+ <tileset firstgid="1905" name="tiles_2_8" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_8.png"/>
+ </tileset>
+ <layer name="Ground" width="11" height="30">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA5WQwRGCMBREk+jFM5ThwRNnurEEGkoH2IF2YAk2YjJkJzvLh8DhjSbz+H+zwTsXTvAMbeBOoQ3ch2vDruay3Jwl/9dsljsVdysb7xrKdwOB+brv5tZgvu6zXMwfZZ/lzn75HemMO+ad7mLimnbe0/kSlnPccF+JvrhdqN9vudkDZ1zkQO4PEcXlHPkdX1/Jc6wceMfPVzDHcvmOM6K3lptn9wddJZKLXiwPHcDlXmYhiovZ3LN2zm4nPTPW27hnBvmO9KDva3UG9M2zX8/cA/vg/gGWNuiKKAUAAA==
+  </data>
+ </layer>
+ <layer name="Objects" width="11" height="30">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA7WTXw5AMAzG6288y5a4B5dxEHdwXeEdDY1aynT4vZiu/bZ93QDCsdkxLjI5x6zxnM1VbDxc1Li0CUCZ6/fno0+/1bMPz4OYPZe8MYpaiTHavlN0/vfxh69NDNCt3tbxt7pzElYn7QN9556TNvejceq4ztu7g/2ZWI9Qm9a76h3P74T1pdgdmv5o7wlpu+9f8lyL6x3FfGCN1iNiAUvXFbIoBQAA
+  </data>
+ </layer>
+ <layer name="Above" width="11" height="30">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgIA38Zx76anHpf0+CuaTYhwtQwz5KwQci3QDyF7HupVVcfmEkzRxsfsPlD2xm43Mbutn41KLbN1jzBb3V4otPbIDYtEotgGwfAHUr9dsoBQAA
+  </data>
+ </layer>
+ <layer name="Walkable" width="11" height="30">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAAxNkYGAQHAQYHxBEotHZuPQTo5YYc/GZQaxafH4e6WqRASnqqa0Wl3p87mPAoQ5dPTY+MXK4+LjcRKpfKQkXaoc5LoDPbFzqaJGGAVFO29MoBQAA
+  </data>
+ </layer>
+ <objectgroup name="Mapevents" width="11" height="30">
+  <object name="south" type="mapchange" x="256" y="928" width="32" height="32">
+   <properties>
+    <property name="map" value="flagstone3"/>
+    <property name="place" value="north"/>
+   </properties>
+  </object>
+  <object name="north" type="mapchange" x="32" y="224" width="32" height="32">
+   <properties>
+    <property name="map" value="flagstone1"/>
+    <property name="place" value="hole"/>
+   </properties>
+  </object>
+  <object name="Broken steps" type="sign" x="224" y="256" width="32" height="32">
+   <properties>
+    <property name="enablekey" value="flagstone:20"/>
+    <property name="text" value="You notice that this tunnel seems to be dug out from below Flagstone. Probably the work of one of the former prisoners from Flagstone."/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Spawn" width="11" height="30">
+  <object name="flagstone_guard1" type="spawn" x="224" y="320" width="32" height="32">
+   <properties>
+    <property name="respawn" value="false"/>
+   </properties>
+  </object>
+  <object name="skeleton2" type="spawn" x="224" y="384" width="32" height="64"/>
+  <object name="undead1" type="spawn" x="288" y="576" width="32" height="32"/>
+  <object name="skeletonmaster" type="spawn" x="192" y="672" width="64" height="32"/>
+  <object name="undead1" type="spawn" x="32" y="640" width="32" height="128"/>
+  <object name="undead1" type="spawn" x="64" y="576" width="96" height="64"/>
+  <object name="skeleton1" type="spawn" x="128" y="832" width="64" height="32"/>
+  <object name="prisoner2" type="spawn" x="64" y="96" width="96" height="32"/>
+  <object name="cavesnake2_boss" type="spawn" x="160" y="96" width="96" height="128"/>
+ </objectgroup>
+ <objectgroup name="Keys" width="11" height="30">
+  <object name="flagstone:40" type="key" x="224" y="288" width="32" height="32">
+   <properties>
+    <property name="message" value="The demon radiates a force that pushes you back, making it impossible to approach the demon."/>
+   </properties>
+  </object>
+ </objectgroup>
+</map>
diff --git a/AndorsTrail/res/xml/flagstone3.tmx b/AndorsTrail/res/xml/flagstone3.tmx
new file mode 100644
index 000000000..ee1bbd767
--- /dev/null
+++ b/AndorsTrail/res/xml/flagstone3.tmx
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" orientation="orthogonal" width="20" height="13" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="tiles_1_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_1.png"/>
+ </tileset>
+ <tileset firstgid="129" name="tiles_1_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_2.png"/>
+ </tileset>
+ <tileset firstgid="257" name="tiles_2_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_1.png"/>
+ </tileset>
+ <tileset firstgid="385" name="tiles_2_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_2.png"/>
+ </tileset>
+ <tileset firstgid="513" name="tiles_2_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_3.png"/>
+ </tileset>
+ <tileset firstgid="641" name="tiles_2_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_4.png"/>
+ </tileset>
+ <tileset firstgid="769" name="tiles_2_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_5.png"/>
+ </tileset>
+ <tileset firstgid="897" name="tiles_1_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_3.png"/>
+ </tileset>
+ <tileset firstgid="1025" name="tiles_1_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_4.png"/>
+ </tileset>
+ <tileset firstgid="1153" name="tiles_1_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_5.png"/>
+ </tileset>
+ <tileset firstgid="1281" name="tiles_1_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_6.png"/>
+ </tileset>
+ <tileset firstgid="1409" name="tiles_1_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_7.png"/>
+ </tileset>
+ <tileset firstgid="1537" name="tiles_2_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_8.png"/>
+ </tileset>
+ <tileset firstgid="1649" name="tiles_2_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_6.png"/>
+ </tileset>
+ <tileset firstgid="1777" name="tiles_2_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_7.png"/>
+ </tileset>
+ <tileset firstgid="1905" name="tiles_2_8" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_8.png"/>
+ </tileset>
+ <layer name="Ground" width="20" height="13">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA42S0Q2AMAhEaXUDHcOxu4FuoBs4gosoqSSXC6R8XNKU4xUorYjMVWQTkfM7H58e0FR7/C5d6mkkjGv+Sjw9m5ba48ZnnuVbHPM9HsvjYZx5bcDT/rM8nEfE0/6xRvRif/YuznPUM3uxXnuX64/uuFfvznbDy+UZXk6vzLPdGNWy/Pu2Dnieon98Ss4X7VrWp9oDL/uyPOSiMh72vZ4aVAYQBAAA
+  </data>
+ </layer>
+ <layer name="Objects" width="20" height="13">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NggIBSFga6AhFW/PJsSPImTAwMS3C4z5gJIo8PwORx+fE/M4K9A0kNLjth4DMjdjYtAcieL0h2GWPxO8jd+NwDC48OIuIcV9hisxcZIIcpMYAYt+BSt4OItIEvTEDqQOkRppYacUkoP8HikN75jhAAAA9zQdIQBAAA
+  </data>
+ </layer>
+ <layer name="Above" width="20" height="13">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgwAT/mYkTwyWPrhab3vd4zAOpf0+iecS6DRv/CyN1zQOBDyS4kZB56OFByCx0tZS4l5i0gE0NrjAlxjxcfsXmRmxqiU0fA6WOWEBquqQGAAC7IO4ZEAQAAA==
+  </data>
+ </layer>
+ <layer name="Walkable" width="20" height="13">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAAxNkYGAQZIAAQSpiBjQ2A5oYtc0jZD6yPDa1uAAhs3CFHa3MI8a/2PxGjBpcZhIyD5deUsSINY9QuJASVqTagQ4oiXNs6olRg888amAAHnIG3RAEAAA=
+  </data>
+ </layer>
+ <objectgroup name="Mapevents" width="20" height="13">
+  <object name="east" type="mapchange" x="608" y="64" width="32" height="32">
+   <properties>
+    <property name="map" value="flagstone4"/>
+    <property name="place" value="west"/>
+   </properties>
+  </object>
+  <object name="north" type="mapchange" x="64" y="0" width="32" height="32">
+   <properties>
+    <property name="map" value="flagstone2"/>
+    <property name="place" value="south"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Spawn" width="20" height="13">
+  <object name="skeleton3" type="spawn" x="544" y="160" width="32" height="64"/>
+  <object name="cavesnake2_boss" type="spawn" x="512" y="288" width="32" height="32"/>
+  <object name="skeleton2" type="spawn" x="384" y="320" width="160" height="64">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="undead1" type="spawn" x="352" y="256" width="32" height="32"/>
+  <object name="skeleton2" type="spawn" x="192" y="96" width="192" height="96">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="skeleton3" type="spawn" x="192" y="192" width="32" height="32"/>
+  <object name="undead1" type="spawn" x="32" y="128" width="32" height="160">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="cavesnake2_boss" type="spawn" x="32" y="288" width="192" height="96"/>
+ </objectgroup>
+ <objectgroup name="Keys" width="20" height="13"/>
+</map>
diff --git a/AndorsTrail/res/xml/flagstone4.tmx b/AndorsTrail/res/xml/flagstone4.tmx
new file mode 100644
index 000000000..de08681c3
--- /dev/null
+++ b/AndorsTrail/res/xml/flagstone4.tmx
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" orientation="orthogonal" width="25" height="13" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="tiles_1_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_1.png"/>
+ </tileset>
+ <tileset firstgid="129" name="tiles_1_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_2.png"/>
+ </tileset>
+ <tileset firstgid="257" name="tiles_2_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_1.png"/>
+ </tileset>
+ <tileset firstgid="385" name="tiles_2_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_2.png"/>
+ </tileset>
+ <tileset firstgid="513" name="tiles_2_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_3.png"/>
+ </tileset>
+ <tileset firstgid="641" name="tiles_2_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_4.png"/>
+ </tileset>
+ <tileset firstgid="769" name="tiles_2_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_5.png"/>
+ </tileset>
+ <tileset firstgid="897" name="tiles_1_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_3.png"/>
+ </tileset>
+ <tileset firstgid="1025" name="tiles_1_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_4.png"/>
+ </tileset>
+ <tileset firstgid="1153" name="tiles_1_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_5.png"/>
+ </tileset>
+ <tileset firstgid="1281" name="tiles_1_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_6.png"/>
+ </tileset>
+ <tileset firstgid="1409" name="tiles_1_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_7.png"/>
+ </tileset>
+ <tileset firstgid="1537" name="tiles_2_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_8.png"/>
+ </tileset>
+ <tileset firstgid="1649" name="tiles_2_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_6.png"/>
+ </tileset>
+ <tileset firstgid="1777" name="tiles_2_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_7.png"/>
+ </tileset>
+ <tileset firstgid="1905" name="tiles_2_8" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_8.png"/>
+ </tileset>
+ <layer name="Ground" width="25" height="13">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA52T0RGEIAxEA2cHWIZl04F2gB1Ygo1IZi5zJ5M1iR/7A2/ZJEBNRPWrKRMd6a5P/u2P2hUP8zvgt66575/prtLXGuAPxVMyro3rWUgX4vlMjR9rk37nhwzmZQYefqxN+rX48jd3Dy+elnC/aAYRntWC/BtxxhrIWYO8ZMg7sdjx3XozvD7tf0R7sDLQn7Xmqvm8nAjdzZNHfNbZyIN8Fys1Y1IUBQAA
+  </data>
+ </layer>
+ <layer name="Objects" width="25" height="13">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgGBjwkRVCi7ASrwek9iMR6k2YILQQG0LMmIk4PcSq72BB5e9gwa4Ol3oYKGbBbheye8rYsbtNjBW7ehAoRbOPD80MdPVtQPlkND0we0Dhjq4eGfRiCWeQ/bAwsYfaLQV1L3pYobsVGTxhg7hrLpIdyPq/MOLWu4QF4u/PjMSpxwdg+nZjCafPBMyExT16HBDSBwP97NjF/zNDaEJpjxAAuQ+fW4qRzEeOK3x6YG4jpA4ZoMcNsfqoDQBuITEtFAUAAA==
+  </data>
+ </layer>
+ <layer name="Above" width="25" height="13">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgQAX/mRlIBqToAal9T6J6ECBHDy3Vk+oeUtSDAK3VjwLagg9kxgcp+r4wkmcHqemdHL+Q67bBAADoTp3qFAUAAA==
+  </data>
+ </layer>
+ <layer name="Walkable" width="25" height="13" visible="0">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAAxNkYGAQHIYYHZCqhxw7COkjVz2xbsMHiPEvIT3EAEJ+JRUQE27EuIdUf2DTi8s9xIYtMfFIjDtI8Qst8gax+kgxn9w8SAsMADKgFfoUBQAA
+  </data>
+ </layer>
+ <objectgroup name="Mapevents" width="25" height="13">
+  <object name="west" type="mapchange" x="0" y="192" width="32" height="32">
+   <properties>
+    <property name="map" value="flagstone3"/>
+    <property name="place" value="east"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Spawn" width="25" height="13">
+  <object name="narael" type="spawn" x="672" y="192" width="32" height="32"/>
+  <object name="flagstone_guard2" type="spawn" x="256" y="160" width="64" height="64">
+   <properties>
+    <property name="respawn" value="false"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Keys" width="25" height="13"/>
+</map>
diff --git a/AndorsTrail/res/xml/flagstone_inner.tmx b/AndorsTrail/res/xml/flagstone_inner.tmx
new file mode 100644
index 000000000..3fa2bacf3
--- /dev/null
+++ b/AndorsTrail/res/xml/flagstone_inner.tmx
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" orientation="orthogonal" width="20" height="17" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="tiles_1_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_1.png"/>
+ </tileset>
+ <tileset firstgid="129" name="tiles_1_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_2.png"/>
+ </tileset>
+ <tileset firstgid="257" name="tiles_2_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_1.png"/>
+ </tileset>
+ <tileset firstgid="385" name="tiles_2_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_2.png"/>
+ </tileset>
+ <tileset firstgid="513" name="tiles_2_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_3.png"/>
+ </tileset>
+ <tileset firstgid="641" name="tiles_2_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_4.png"/>
+ </tileset>
+ <tileset firstgid="769" name="tiles_2_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_5.png"/>
+ </tileset>
+ <tileset firstgid="897" name="tiles_1_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_3.png"/>
+ </tileset>
+ <tileset firstgid="1025" name="tiles_1_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_4.png"/>
+ </tileset>
+ <tileset firstgid="1153" name="tiles_1_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_5.png"/>
+ </tileset>
+ <tileset firstgid="1281" name="tiles_1_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_6.png"/>
+ </tileset>
+ <tileset firstgid="1409" name="tiles_1_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_7.png"/>
+ </tileset>
+ <tileset firstgid="1537" name="tiles_2_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_8.png"/>
+ </tileset>
+ <tileset firstgid="1649" name="tiles_2_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_6.png"/>
+ </tileset>
+ <tileset firstgid="1777" name="tiles_2_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_7.png"/>
+ </tileset>
+ <tileset firstgid="1905" name="tiles_2_8" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_8.png"/>
+ </tileset>
+ <layer name="Ground" width="20" height="17">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA7WTuw2AMAwFjVOxTSpmYARKOkbI+ugVkSwTf/gVp+ghcyTG4YmIP+bgHLp2lEHjHLp2lMFaiCrFoDbKf/g2w6fr0SMvd192P439HJ3X+5ZVL31YO298/T14vDmNfHImkfFfvHmOfHIm5TOLha5Ule/0aE7wtQ99ie7HXvI+9MW6H0/2N+qxRcZ3AsPPdPhQBQAA
+  </data>
+ </layer>
+ <layer name="Objects" width="20" height="17">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgoA3wZsHkH2FnYKhlh/Ct2PGrRQfRQLHLbAwMH1kZGMrYIXwQuMgGob3YUdWi60UHD4H6HgNxMlCujR1Cw8STkdRXs2H3HzpIxmIHMhBhxy9PrHkbWSF0P9A8USD7PzOqPDofGUixYrrjICsq/z1Q/32gmgdAPJMdlY8OsPnpIpJ5u9lR/bESiW9PZHgE4PEPPncQA4iNW1xAFC3sIpkh/jvAhhl/fHjcCErXrEhmXaTQXbB0DUojT9gw0/RwAKDw5IGGKXI8wuIAX3jTEgAAMZMhU1AFAAA=
+  </data>
+ </layer>
+ <layer name="Above" width="20" height="17">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgoD74z0y+Wmx6QWIX2VDFWFnxmweTx2Uetd03UOadY2dgOA/EF9ix8wmZhy53jx0/n1TziAEgPbj0kWMeJfpwmUWMecTaCVL3ngi1xKghxV5iwWA3DxQuySzUNZNaAAD81FD/UAUAAA==
+  </data>
+ </layer>
+ <layer name="Walkable" width="20" height="17">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA+VSWwoAIAjzCt3/sv2KbMNpfwVSZO5FJyLOxxVpR2fWy/16zxaad/CqZqRvoh/xd3JT+hgfes88dXPt4Dk+tngIl/FO/6vyoPLcZqI8bTHdLFDertfXdQFjmbZJUAUAAA==
+  </data>
+ </layer>
+ <objectgroup name="Mapevents" width="20" height="17">
+  <object name="entrance" type="mapchange" x="512" y="352" width="32" height="32">
+   <properties>
+    <property name="map" value="flagstone0"/>
+    <property name="place" value="house"/>
+   </properties>
+  </object>
+  <object name="up" type="mapchange" x="256" y="256" width="32" height="32">
+   <properties>
+    <property name="map" value="flagstone_upper"/>
+    <property name="place" value="down"/>
+   </properties>
+  </object>
+  <object name="down" type="mapchange" x="288" y="448" width="32" height="32">
+   <properties>
+    <property name="map" value="flagstone1"/>
+    <property name="place" value="up"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Spawn" width="20" height="17">
+  <object name="prisoner2" type="spawn" x="512" y="96" width="96" height="96"/>
+  <object name="prisoner1" type="spawn" x="384" y="96" width="96" height="96"/>
+  <object name="undead1" type="spawn" x="352" y="256" width="32" height="32"/>
+  <object name="skeleton2" type="spawn" x="288" y="160" width="32" height="32"/>
+  <object name="undead1" type="spawn" x="64" y="128" width="160" height="128">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="undead1" type="spawn" x="64" y="288" width="32" height="32"/>
+  <object name="undead1" type="spawn" x="32" y="384" width="224" height="128">
+   <properties>
+    <property name="quantity" value="3"/>
+   </properties>
+  </object>
+  <object name="undead1" type="spawn" x="384" y="224" width="224" height="64"/>
+ </objectgroup>
+ <objectgroup name="Keys" width="20" height="17"/>
+</map>
diff --git a/AndorsTrail/res/xml/flagstone_upper.tmx b/AndorsTrail/res/xml/flagstone_upper.tmx
new file mode 100644
index 000000000..1bc2d91f3
--- /dev/null
+++ b/AndorsTrail/res/xml/flagstone_upper.tmx
@@ -0,0 +1,100 @@
+<?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"/>
+ </tileset>
+ <tileset firstgid="129" name="tiles_1_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_2.png"/>
+ </tileset>
+ <tileset firstgid="257" name="tiles_2_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_1.png"/>
+ </tileset>
+ <tileset firstgid="385" name="tiles_2_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_2.png"/>
+ </tileset>
+ <tileset firstgid="513" name="tiles_2_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_3.png"/>
+ </tileset>
+ <tileset firstgid="641" name="tiles_2_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_4.png"/>
+ </tileset>
+ <tileset firstgid="769" name="tiles_2_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_5.png"/>
+ </tileset>
+ <tileset firstgid="897" name="tiles_1_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_3.png"/>
+ </tileset>
+ <tileset firstgid="1025" name="tiles_1_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_4.png"/>
+ </tileset>
+ <tileset firstgid="1153" name="tiles_1_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_5.png"/>
+ </tileset>
+ <tileset firstgid="1281" name="tiles_1_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_6.png"/>
+ </tileset>
+ <tileset firstgid="1409" name="tiles_1_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_7.png"/>
+ </tileset>
+ <tileset firstgid="1537" name="tiles_2_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_8.png"/>
+ </tileset>
+ <tileset firstgid="1649" name="tiles_2_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_6.png"/>
+ </tileset>
+ <tileset firstgid="1777" name="tiles_2_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_7.png"/>
+ </tileset>
+ <tileset firstgid="1905" name="tiles_2_8" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_8.png"/>
+ </tileset>
+ <layer name="Ground" width="20" height="12">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NiZGBgojJOZ6IOhplXzkQdDDPPgIE6mF7mEWMHLn1D3bwEZtLMA6UbdHFsYsSoSYemG3RxbGLEqAGJmTFQFwMAr41CQcADAAA=
+  </data>
+ </layer>
+ <layer name="Objects" width="20" height="12">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgoC3wZkFlZ7AzMKxkwxS3AopbsqOKw8BFoPrLbBB2NFC+jB3BhgEYG6QOxPYCqvFkRxWHgYdA9mMkfhs7drc/gaqrZsNUh6wfHyjG4h9C4BzQnvNQfAHNbVKsDAwiONyLS989IPs+FD+Aim9khdC4zMKlDwR6kfzOBxW/yIqqF2SuFFRsP5awQjZjLhb5fizugrn1PBb12MxABpHMuOVgfqgmMk5BwBNoXjJS3AojufcJCeZQCgAySKVPwAMAAA==
+  </data>
+ </layer>
+ <layer name="Above" width="20" height="12">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgoD74zzw4zCtjx29eMgtCDJmNDgipGyz+JcU8YuzApWaomocvjvGZ9x6LODYxctRQCgDbpycmwAMAAA==
+  </data>
+ </layer>
+ <layer name="Walkable" width="20" height="12">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAAxNkYGAQHKEYBpDZDGjiyGrR9aCbg8sMYgG13Eqq/8l1C7o6bGYwEJAnRZxcfcSah8tvxJiHLW3gs4daGAAXJkzjwAMAAA==
+  </data>
+ </layer>
+ <objectgroup name="Mapevents" width="20" height="12">
+  <object name="down" type="mapchange" x="256" y="256" width="32" height="32">
+   <properties>
+    <property name="map" value="flagstone_inner"/>
+    <property name="place" value="up"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Spawn" width="20" height="12">
+  <object name="prisoner1" type="spawn" x="480" y="224" width="128" height="128"/>
+  <object name="prisoner2" type="spawn" x="32" y="224" width="128" height="128"/>
+  <object name="skeleton2" type="spawn" x="192" y="96" width="192" height="256">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="flagstone_guard0" type="spawn" x="544" y="96" width="64" height="64">
+   <properties>
+    <property name="respawn" value="false"/>
+   </properties>
+  </object>
+  <object name="skeleton2" type="spawn" x="512" y="96" width="32" height="64">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="skeleton3" type="spawn" x="320" y="128" width="128" height="96"/>
+ </objectgroup>
+ <objectgroup name="Keys" width="20" height="12"/>
+</map>
diff --git a/AndorsTrail/res/xml/hauntedhouse3.tmx b/AndorsTrail/res/xml/hauntedhouse3.tmx
index 7db55bea5..bd8e75101 100644
--- a/AndorsTrail/res/xml/hauntedhouse3.tmx
+++ b/AndorsTrail/res/xml/hauntedhouse3.tmx
@@ -50,7 +50,7 @@
  </tileset>
  <layer name="Ground" width="25" height="20">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA51V0RWCQAw7DjeAMRzEERyQDXADbgNGcBG9B33G2rR9fuTxQXK5phHbUEo7sSTQDESaHTBWX3up33zBFng8T9zGUqb66ym8xxtz/fARlkcD/bUcuI/HE7XdU/R9BuFqaA+cdxu4DvUyA+N484r/CkBtz088vHvgvJrLdoX5ZTzwrKwHZm95WGdJXpFHO8+fHQ92X8yLeUgX9G61B7sv80cP6QLrlb6v56GzjrpvvbcyYT2Pur+Q92wnbOfWzCtkmM3E6xXrIPYsk0nfU9dauaKHfBeFa/XMm3+qcS/luyhcq2eeh7fTDPcfHf42smdjFzI6/Y1aA7D/uAz/BReuG8vQBwAA
+   H4sIAAAAAAAAA51V2xGDMAwLoRvAGB2kI3RANqAbkA0YoYu0OdBVdf26fuj4QI5sWYQ2lNJOLAk0BVHNThirX3up33xgCzSeJ25jKVP91QTv8cZcP3yGpsF9XsuB+3g8ubZror7PAK6E1OB5t8Gu43rMYHG8eaG/Eri2+wcNrw+eV3KtXbF/GQ0+K6vB3msa2lnwK9Jo5/mzo2H1y35ZGsiC3K3UsPq19FkDWbByJfv1NKTXUfa195onVs6j7C/Ge2sn1s61mVfyMOuJlysrg5yzjCd9T71W85U1cC+Cq+XMm3+qcS5xL4Kr5czT8Haa4f5Tx99G9mzOQqZO3lFrAOsfl+G/AAAasNDQBwAA
   </data>
  </layer>
  <layer name="Objects" width="25" height="20">
diff --git a/AndorsTrail/res/xml/home.tmx b/AndorsTrail/res/xml/home.tmx
index 349037f06..3801cc24d 100644
--- a/AndorsTrail/res/xml/home.tmx
+++ b/AndorsTrail/res/xml/home.tmx
@@ -50,22 +50,22 @@
  </tileset>
  <layer name="Ground" width="10" height="10">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAAwtiZGAIIhI3EsAwdRMJYJg6Rwb8mBJ1L1kYGPKh+BULbnV5QDkYyEVS10iEukaof5DV/QTKFUDxL6g6kJpABgR2ZEDlI2MAxi8HupABAAA=
+   H4sIAAAAAAAACwtiZGAIIhI3EsAwdRMJYJg6Rwb8mBJ1L1kYGPKh+BULbnV5QDkYyEVS10iEukaof5DV/QTKFUDxL6g6kJpABgR2ZEDlI2MAxi8HupABAAA=
   </data>
  </layer>
  <layer name="Objects" width="10" height="10">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIB7ksjMweLEg+DD2TzZMtVFAuWKgeAs7hK3FysCgCcSerAg1d4HyzED5ZiA9BUj3AOWskDAMvMViPjZwkUh1D9kgGAR0gPbsBrpvDwuEjQw2ovFxqbuIxAfJnQaqOQMNm19EugkGAGc0HW+QAQAA
+   H4sIAAAAAAAAC2NgIB7ksjMweLEg+DD2TzZMtVFAuWKgeAs7hK3FysCgCcSerAg1d4HyzED5ZiA9BUj3AOWskDAMvMViPjZwkUh1D9kgGAR0gPbsBrpvDwuEjQw2ovFxqbuIxAfJnQaqOQMNm19EugkGAGc0HW+QAQAA
   </data>
  </layer>
  <layer name="Walkable" width="10" height="10">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAAxNkYGAQHOSYECBWLS5zcfHRzSNHHS7/4PIrADR3U0WQAQAA
+   H4sIAAAAAAAACxNkYGAQHOSYECBWLS5zcfHRzSNHHS7/4PIrADR3U0WQAQAA
   </data>
  </layer>
  <layer name="Above" width="10" height="10">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIB58YCZO3X8kdfj0IKt7T6Q6QvZeZCNOHQgks0Boblbi7eVkJ07dMhxmEgIAugjLAZABAAA=
+   H4sIAAAAAAAAC2NgIB58YCZO3X8kdfj0IKt7T6Q6QvZeZCNOHQgks0Boblbi7eVkJ07dMhxmEgIAugjLAZABAAA=
   </data>
  </layer>
  <objectgroup name="mapevents" width="10" height="10">
@@ -79,7 +79,7 @@
   <object name="bed" type="rest" x="32" y="128" width="32" height="32"/>
  </objectgroup>
  <objectgroup name="keys" width="10" height="10">
-  <object name="mikhail_visited" type="key" x="0" y="288" width="320" height="32">
+  <object name="andor:1" type="key" x="0" y="288" width="320" height="32">
    <properties>
     <property name="message" value="You should talk to Mikhail first."/>
    </properties>
diff --git a/AndorsTrail/res/xml/preferences.xml b/AndorsTrail/res/xml/preferences.xml
index a9a3a571e..53253045f 100644
--- a/AndorsTrail/res/xml/preferences.xml
+++ b/AndorsTrail/res/xml/preferences.xml
@@ -25,7 +25,17 @@
 			android:summary="Choose how you want to show the results of a fight to be shown (gold, experience, items)."
 			android:key="display_lootdialog"
 			android:defaultValue="0"
-			android:entries="@array/display_loot"
-			android:entryValues="@array/display_loot_values" />
+			android:entries="@array/preferences_display_loot"
+			android:entryValues="@array/preferences_display_loot_values" />
+	</PreferenceCategory>
+	<PreferenceCategory
+		android:title="Combat">
+		<ListPreference
+			android:title="Combat speed"
+			android:summary="Determines how fast monsters attack."
+			android:key="attackspeed"
+			android:defaultValue="1000"
+			android:entries="@array/preferences_attackspeed"
+			android:entryValues="@array/preferences_attackspeed_values" />
 	</PreferenceCategory>
 </PreferenceScreen>
diff --git a/AndorsTrail/res/xml/wild1.tmx b/AndorsTrail/res/xml/wild1.tmx
index 5c05228fd..1848f9127 100644
--- a/AndorsTrail/res/xml/wild1.tmx
+++ b/AndorsTrail/res/xml/wild1.tmx
@@ -50,22 +50,22 @@
  </tileset>
  <layer name="Ground" width="21" height="21">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAC9NkYGDQHMWjeBSP4lE8iochBgAk9Jxp5AYAAA==
+   H4sIAAAAAAAAA9NkYGDQHMWjeBSP4lE8iochBgAk9Jxp5AYAAA==
   </data>
  </layer>
  <layer name="Objects" width="21" height="21">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAC4VU2w3CMBBrpXSWdgKCGKCV+KcswAJIdID2A7EPPyzCAGxCTuoph+MrlqJKSexz7tGhqapzWoP57tOKzn5fV1Xr3Eee3Q9pCSLsC0QTeYpLOtvVOV5nzhASY1zPD4mzhKxr0a46LB6D3plC5lsey4diCaVehLfModzDfMxEh+na2OiTxUZ4cfTtjP8kecZ3D01ZB/TOzj2e15/WK75fOZb3T5f5wfpG8MH4rL+nUNZM0Tl6TFf4H8i3zMHJie/NO/MxGd0JNG0+cK7RD2op7iHPrPX5MHe1l368gNZiai56L3Ou87Wr87rVpReGcSM3DNcU62i0vT715mwgceRuD35R15tnr+4C1NT7W/2gefb6SDVtn7w3/l3iG/+f+C7VHNfa6v+bfZnOF8CeSGTkBgAA
+   H4sIAAAAAAAAA4VUyw3CMAxtpXSW9sqlQQzQStwpCzACHYAeEPtwYREGYBNiqVbMy3N5UhQpsZ9f/MnYVNU5rdHs+7Sicz7UVdU69uhnz0NaggjnAuFEP8Ul3fV1jteZO4TEmNb7Q/JZQua1aFceFo9BbeaQ/a0fy4diCSVfhLfcQnmG+bgRHsZrY6NOFhvhxdG3M/8nyTO+e2zKOqB2du/5ef1pteL71cf6/eNlerC+EXQwf9bfcyhrpugcPsYr/h/It8zByYnvzTvTMRveGThtPnCuUQ9yKe4hz6zV+TC22ks/WoBrMTUXvpe51/nq67yudamFYdrIDcMu2R0Nt9en3pyNJI7YDqAXeb159uouQE613+oHzbPXR8pp++S98XeJbvw/8V3KOa211f+b7YznC8xy6c7kBgAA
   </data>
  </layer>
  <layer name="Above" width="21" height="21">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAC2NgGDjgxkp9M9WBZmpgMRebGLHmjTSAKwyJAdj0IYchSB6f+TBxdDXkuocQINY9MDeRYz4hAMoHbiTaQ6vwIAVQI29QswyAmUVJXkdOD4TyAbXLBnW0tE9JPiQEkM0lNQ6I9Tchc0kNP3LDAwCSEKc95AYAAA==
+   H4sIAAAAAAAAA2NgGDjgxkp9M9WBZmpgMRebGLHmjTSAKwyJAdj0IYchSB6f+TBxdDXkuocQINY9MDeRYz4hAMoHbiTaQ6vwIAVQI29QswyAmUVJXkdOD4TyAbXLBnW0tE9JPiQEkM0lNQ6I9Tchc0kNP3LDAwCSEKc95AYAAA==
   </data>
  </layer>
  <layer name="Walkable" width="21" height="21">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAC6WTQQ4AIQgD+YL//+xeNwZspzThojCA4KmqA6yg/z+ui1Xn3f1LL+6Ua8tMeYTpiPaeaIpXTDpf4q9qInNymU4tdO9dZhc/9eHytv8g2VfFpFJz3fBSJn0f+tcVM8mfMu85OiI76e7wbR/AMNux5AYAAA==
+   H4sIAAAAAAAAA6WTQQ4AIQgD+YL//+xeNwZspzThojCA4KmqA6yg/z+ui1Xn3f1LL+6Ua8tMeYTpiPaeaIpXTDpf4q9qInNymU4tdO9dZhc/9eHytv8g2VfFpFJz3fBSJn0f+tcVM8mfMu85OiI76e7wbR/AMNux5AYAAA==
   </data>
  </layer>
  <objectgroup name="Mapevents" width="21" height="21">
diff --git a/AndorsTrail/res/xml/wild10.tmx b/AndorsTrail/res/xml/wild10.tmx
new file mode 100644
index 000000000..7dd675056
--- /dev/null
+++ b/AndorsTrail/res/xml/wild10.tmx
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" orientation="orthogonal" width="20" 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"/>
+ </tileset>
+ <tileset firstgid="129" name="tiles_1_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_2.png"/>
+ </tileset>
+ <tileset firstgid="257" name="tiles_2_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_1.png"/>
+ </tileset>
+ <tileset firstgid="385" name="tiles_2_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_2.png"/>
+ </tileset>
+ <tileset firstgid="513" name="tiles_2_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_3.png"/>
+ </tileset>
+ <tileset firstgid="641" name="tiles_2_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_4.png"/>
+ </tileset>
+ <tileset firstgid="769" name="tiles_2_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_5.png"/>
+ </tileset>
+ <tileset firstgid="897" name="tiles_1_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_3.png"/>
+ </tileset>
+ <tileset firstgid="1025" name="tiles_1_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_4.png"/>
+ </tileset>
+ <tileset firstgid="1153" name="tiles_1_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_5.png"/>
+ </tileset>
+ <tileset firstgid="1281" name="tiles_1_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_6.png"/>
+ </tileset>
+ <tileset firstgid="1409" name="tiles_1_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_7.png"/>
+ </tileset>
+ <tileset firstgid="1537" name="tiles_2_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_8.png"/>
+ </tileset>
+ <tileset firstgid="1649" name="tiles_2_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_6.png"/>
+ </tileset>
+ <tileset firstgid="1777" name="tiles_2_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_7.png"/>
+ </tileset>
+ <tileset firstgid="1905" name="tiles_2_8" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_8.png"/>
+ </tileset>
+ <layer name="Ground" width="20" height="20">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAACwtnZWBwB2JNBsI4HKoWnUZWQ6xZuMwmR+9A4nAquxkWrtR0HzXDdSi4b6DTBC3dhp7/qGkWpWZS0yxcZg50HI5iVAwAK9yPpEAGAAA=
+  </data>
+ </layer>
+ <layer name="Objects" width="20" height="20">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAC51UwQ3DIAykEpmECfppo6rvPvqNlAWSDdIOQF/Zp5/sk0WKBZZOjoGkJyEgmOM4OxgT0TbGXJvYOxgTHqc4z4HjOKYtxDIfx/O5kkubdzD2dsuHYO4Z4jrBvVizwdvqfF7Eans1LBm+I8BcEKR/pX2MUhzqW+FefSWPCCf0nSt7yee+oG8MHJfU7jCuNeSinFHOnzv8z91V6uL68OH7B9ZquZDA+rlV9O2tNYkefPgXNe+c+Pcl0Jc1eTcreqSfJU4EejcoHAg6F98c6rF2XomL/Nb08Df5jjDoftrdNGBOyENN+zfETGltOlBbGE+aOEcDcOV63uML63jGD198+DRABgAA
+  </data>
+ </layer>
+ <layer name="Above" width="20" height="20">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAC2NgoB1wZh1Y/diABh3MVGfFbg8ucWR5XGYSA9xo4Ddc5tMiHEGA2Dgn1a+FQPVFSHoIxQVMDaUAZg8xZhHyEzYzyI0HfO4hxkz08CQHUMMMZLNwmU+LcgSX20FipPoLl3p0PyGbja4HWRxZPS6zcAFCetDtAAAZQHJAQAYAAA==
+  </data>
+ </layer>
+ <layer name="Walkable" width="20" height="20">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAC61UUQ5AIQjiCt7/su+rrfUU0GLro1QkGwWAIGuB5USS40D1BP4aXFR3eI3XnNUMsj5q1myurha355T/Rh/j3PduXfc888ekRwedmTlx5T9HD+NSnj61KH1KS8cPTm5Vz+q6YLyTd6k8oN7I+e/P+AehKzs7QAYAAA==
+  </data>
+ </layer>
+ <objectgroup name="Mapevents" width="20" height="20">
+  <object name="west" type="mapchange" x="0" y="480" width="32" height="64">
+   <properties>
+    <property name="map" value="wild9"/>
+    <property name="place" value="east"/>
+   </properties>
+  </object>
+  <object name="north" type="mapchange" x="256" y="0" width="64" height="32">
+   <properties>
+    <property name="map" value="fallhaven_sw"/>
+    <property name="place" value="south"/>
+   </properties>
+  </object>
+  <object name="Signpost" type="sign" x="320" y="224" width="32" height="32">
+   <properties>
+    <property name="text" value="North: Fallhaven\nWest: Stoutford"/>
+   </properties>
+  </object>
+  <object name="east" type="mapchange" x="608" y="256" width="32" height="64">
+   <properties>
+    <property name="map" value="wild11"/>
+    <property name="place" value="west"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Spawn" width="20" height="20">
+  <object name="fallhaven_bandit" type="spawn" x="576" y="544" width="32" height="32">
+   <properties>
+    <property name="respawn" value="false"/>
+   </properties>
+  </object>
+  <object name="forestserpent1" type="spawn" x="64" y="224" width="288" height="384">
+   <properties>
+    <property name="quantity" value="1"/>
+   </properties>
+  </object>
+  <object name="forestwasp" type="spawn" x="96" y="96" width="384" height="192">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="forestboar2" type="spawn" x="384" y="224" width="192" height="192">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Keys" width="20" height="20"/>
+</map>
diff --git a/AndorsTrail/res/xml/wild11.tmx b/AndorsTrail/res/xml/wild11.tmx
new file mode 100644
index 000000000..1ce13e7ee
--- /dev/null
+++ b/AndorsTrail/res/xml/wild11.tmx
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" orientation="orthogonal" width="20" 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"/>
+ </tileset>
+ <tileset firstgid="129" name="tiles_1_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_2.png"/>
+ </tileset>
+ <tileset firstgid="257" name="tiles_2_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_1.png"/>
+ </tileset>
+ <tileset firstgid="385" name="tiles_2_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_2.png"/>
+ </tileset>
+ <tileset firstgid="513" name="tiles_2_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_3.png"/>
+ </tileset>
+ <tileset firstgid="641" name="tiles_2_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_4.png"/>
+ </tileset>
+ <tileset firstgid="769" name="tiles_2_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_5.png"/>
+ </tileset>
+ <tileset firstgid="897" name="tiles_1_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_3.png"/>
+ </tileset>
+ <tileset firstgid="1025" name="tiles_1_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_4.png"/>
+ </tileset>
+ <tileset firstgid="1153" name="tiles_1_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_5.png"/>
+ </tileset>
+ <tileset firstgid="1281" name="tiles_1_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_6.png"/>
+ </tileset>
+ <tileset firstgid="1409" name="tiles_1_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_7.png"/>
+ </tileset>
+ <tileset firstgid="1537" name="tiles_2_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_8.png"/>
+ </tileset>
+ <tileset firstgid="1649" name="tiles_2_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_6.png"/>
+ </tileset>
+ <tileset firstgid="1777" name="tiles_2_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_7.png"/>
+ </tileset>
+ <tileset firstgid="1905" name="tiles_2_8" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_8.png"/>
+ </tileset>
+ <layer name="Ground" width="20" height="20">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAC9NkYGAIZ2VgcAdiTQbyMTXMwGYmNc2jp9vxYZBd2PwGcwOp/oa5HxtNrTAZyvFLi7iiVriOBPcNdByOYtphAE0up71ABgAA
+  </data>
+ </layer>
+ <layer name="Objects" width="20" height="20">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAC7VTwQ2DMAwkUjIJK1SlE/TRLxIL0A1oBwhSJUZjAQZgk2LBFeM4UVqpJ0VJHMfnnOPKFR9clnXl1hnge6wxN8sY7LrnkDEIvS2+AmLWy3xyaV+NE3yTPfqM297bIw9B5pzCnHiP9n6f+X6pJWn8snFO6Z+bjwbSbLShJnxP+UwiD9wBRyO4JnHuGcfZ/DYeZr0/i/pyaHp5q+sxMt874/kXYj0m+yRVuzajpkPi7xBQK4rVKb2Q+285/BYL+QW9ILjAATv1PNmgRen2Mx6rdseYvaJHzI6zMiMG5XGL/AX8G8rlKd4FQHuu8dWEOki0br8j68PtlPPVhBylcr9TbHIu3TG/lP8bfOdh8UAGAAA=
+  </data>
+ </layer>
+ <layer name="Above" width="20" height="20">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAC8VTyw2AMAjtxVlwDxP3afc/qAcSQviLkWN5P0o7Rm8dWwwHN24PYiVelV8pzQuEHKeTCUifzgGM1zWblofm9jL/XZldf/UuqKblYfVmQy7cFdd6M7OX6+kvAYPn0T/PcZKmdR7Nlcli8bm+5zeJpsTF4hqSh7YTq8c9qu8tc6cXGrt0XkAGAAA=
+  </data>
+ </layer>
+ <layer name="Walkable" width="20" height="20">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAC62UQQoAMQgD/UL//9k9FRZJdWwjeCgJMVVxRcQSueP/VrwqX2KqQ7gKd3qmXk74qf+klnMeNzp5TypcvR3h3JUb7kSP9oJg3a51frLW6587rcn+K73snWhWPgm3CzqLST1yl533OusR3gctIlMAQAYAAA==
+  </data>
+ </layer>
+ <objectgroup name="Mapevents" width="20" height="20">
+  <object name="west" type="mapchange" x="0" y="256" width="32" height="64">
+   <properties>
+    <property name="map" value="wild10"/>
+    <property name="place" value="east"/>
+   </properties>
+  </object>
+  <object name="east" type="mapchange" x="608" y="288" width="32" height="64">
+   <properties>
+    <property name="map" value="wild12"/>
+    <property name="place" value="sw"/>
+   </properties>
+  </object>
+  <object name="south" type="mapchange" x="320" y="608" width="32" height="32">
+   <properties>
+    <property name="map" value="wild11_clearing"/>
+    <property name="place" value="north"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Spawn" width="20" height="20">
+  <object name="pack1" type="spawn" x="256" y="480" width="128" height="96"/>
+  <object name="forestwolf1" type="spawn" x="448" y="416" width="160" height="192">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="forestbeetle" type="spawn" x="64" y="160" width="512" height="256">
+   <properties>
+    <property name="quantity" value="4"/>
+   </properties>
+  </object>
+  <object name="forestwasp2" type="spawn" x="32" y="416" width="192" height="192">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Keys" width="20" height="20"/>
+</map>
diff --git a/AndorsTrail/res/xml/wild11_clearing.tmx b/AndorsTrail/res/xml/wild11_clearing.tmx
new file mode 100644
index 000000000..db5a9f658
--- /dev/null
+++ b/AndorsTrail/res/xml/wild11_clearing.tmx
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" orientation="orthogonal" width="15" height="15" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="tiles_1_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_1.png"/>
+ </tileset>
+ <tileset firstgid="129" name="tiles_1_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_2.png"/>
+ </tileset>
+ <tileset firstgid="257" name="tiles_2_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_1.png"/>
+ </tileset>
+ <tileset firstgid="385" name="tiles_2_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_2.png"/>
+ </tileset>
+ <tileset firstgid="513" name="tiles_2_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_3.png"/>
+ </tileset>
+ <tileset firstgid="641" name="tiles_2_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_4.png"/>
+ </tileset>
+ <tileset firstgid="769" name="tiles_2_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_5.png"/>
+ </tileset>
+ <tileset firstgid="897" name="tiles_1_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_3.png"/>
+ </tileset>
+ <tileset firstgid="1025" name="tiles_1_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_4.png"/>
+ </tileset>
+ <tileset firstgid="1153" name="tiles_1_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_5.png"/>
+ </tileset>
+ <tileset firstgid="1281" name="tiles_1_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_6.png"/>
+ </tileset>
+ <tileset firstgid="1409" name="tiles_1_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_7.png"/>
+ </tileset>
+ <tileset firstgid="1537" name="tiles_2_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_8.png"/>
+ </tileset>
+ <tileset firstgid="1649" name="tiles_2_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_6.png"/>
+ </tileset>
+ <tileset firstgid="1777" name="tiles_2_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_7.png"/>
+ </tileset>
+ <tileset firstgid="1905" name="tiles_2_8" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_8.png"/>
+ </tileset>
+ <layer name="Ground" width="15" height="15">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA9NkYGDQHMWjeBQPGAYABmUFeoQDAAA=
+  </data>
+ </layer>
+ <layer name="Objects" width="15" height="15">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA41SwQkDMQxzaTKJtyj020UywkH/7qtr3ia9QNxThN1GEBywFdmRWxXZjtMo6nEeFxFL8r/ia3A7VuttxI5VXa/veI77begavJvxUNOKTNjLWYN8ziPwPa3x/AjspVBute8MFvGoZ+4Ra5yvoON/7LNHHjqH5/X5tM7e9Hi/zprRf305MAN70II9YbwD31qgm+2bJrl/e86eYPwAF62E3oQDAAA=
+  </data>
+ </layer>
+ <layer name="Above" width="15" height="15">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgwA6KWHFIkAAKqWAGMXZQw63Emocuh089Nv/D1FI7bMgNB2R3gPSjm0OK37DpQWaT40Zi1eNyD7KfkO1HFiMFkBtv+PwBAFjPAW6EAwAA
+  </data>
+ </layer>
+ <layer name="Walkable" width="15" height="15">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAAxNkYGAQxIEZ8MgRwgxk6idVHy5AjD5CZmAzhxi1DAyYdmDTj89Mergbn3nUCGNsekmNc3Q5fIBY+8nxBy0xAPZH4PGEAwAA
+  </data>
+ </layer>
+ <objectgroup name="Mapevents" width="15" height="15">
+  <object name="down" type="mapchange" x="352" y="320" width="32" height="32">
+   <properties>
+    <property name="map" value="clearing_level1"/>
+    <property name="place" value="up"/>
+   </properties>
+  </object>
+  <object name="north" type="mapchange" x="224" y="0" width="32" height="32">
+   <properties>
+    <property name="map" value="wild11"/>
+    <property name="place" value="south"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Spawn" width="15" height="15">
+  <object name="pack1" type="spawn" x="288" y="352" width="32" height="64">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="pack2" type="spawn" x="160" y="384" width="32" height="32"/>
+  <object name="pack1" type="spawn" x="64" y="256" width="192" height="96">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="pack1" type="spawn" x="32" y="96" width="384" height="160">
+   <properties>
+    <property name="quantity" value="3"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Keys" width="15" height="15"/>
+</map>
diff --git a/AndorsTrail/res/xml/wild12.tmx b/AndorsTrail/res/xml/wild12.tmx
new file mode 100644
index 000000000..1a4a814e0
--- /dev/null
+++ b/AndorsTrail/res/xml/wild12.tmx
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" orientation="orthogonal" width="20" 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"/>
+ </tileset>
+ <tileset firstgid="129" name="tiles_1_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_2.png"/>
+ </tileset>
+ <tileset firstgid="257" name="tiles_2_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_1.png"/>
+ </tileset>
+ <tileset firstgid="385" name="tiles_2_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_2.png"/>
+ </tileset>
+ <tileset firstgid="513" name="tiles_2_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_3.png"/>
+ </tileset>
+ <tileset firstgid="641" name="tiles_2_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_4.png"/>
+ </tileset>
+ <tileset firstgid="769" name="tiles_2_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_5.png"/>
+ </tileset>
+ <tileset firstgid="897" name="tiles_1_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_3.png"/>
+ </tileset>
+ <tileset firstgid="1025" name="tiles_1_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_4.png"/>
+ </tileset>
+ <tileset firstgid="1153" name="tiles_1_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_5.png"/>
+ </tileset>
+ <tileset firstgid="1281" name="tiles_1_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_6.png"/>
+ </tileset>
+ <tileset firstgid="1409" name="tiles_1_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_7.png"/>
+ </tileset>
+ <tileset firstgid="1537" name="tiles_2_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_8.png"/>
+ </tileset>
+ <tileset firstgid="1649" name="tiles_2_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_6.png"/>
+ </tileset>
+ <tileset firstgid="1777" name="tiles_2_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_7.png"/>
+ </tileset>
+ <tileset firstgid="1905" name="tiles_2_8" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_8.png"/>
+ </tileset>
+ <layer name="Ground" width="20" height="20">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAACwtnZWDQZIDgcCDbHYmPLk4MjawPm1mkmolLP8wMYszEpZ4QJuQeQu4j5GdC/iHVTHx+INfPuOyjlp9JdR8hdxMKD1LDgJgwJjWOiE3fxLiPUrPQ3UeN8MMXlpRiapo1iinHABNYWL9ABgAA
+  </data>
+ </layer>
+ <layer name="Objects" width="20" height="20">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAC5VTyw2DMAwlEpmECXppI9RzD70yQtmgMABI3YkRWKADoC5SLOLy5DhpeBIKSuzn519RbLjY4ge3/r/L8D4HZO8EF2Isj3FOq31vQ17JkeJ0NnxffH6N4JR6NS7E2WxfZ/a7oQz9NH3ENUTqTHVqBa+mN4YlUWeNNwWehV7pK+bKvEtidv7VF3swe56718qz45R5iGFSelGbuI3snZYD6mCwxhx/hMzh4/1voDE315RNDTV8gcacXcT4TcRe2yPJzRy9wkE9oBqe4I3maASt2vwxuO6z3xvayavZ9zP2ydq24r2DurEmGROh+Wr2jzXm0+5nZfV7jIl3jMqGPqnziG3O+QVBqcO/QAYAAA==
+  </data>
+ </layer>
+ <layer name="Above" width="20" height="20">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAC2NgYGDQYGWgOlBnxeRTwx5nNDNo4XYQQHc/qfIwgO5eYuwl10/49BFjJjY/EdJHrnvR9VESj7jiAtlMYt1JKF6JNQOXOmLTDT6zSbEfV/ojJl3SKm8NRVAIDIsiVgRNSBxZDptZ6ABmBj570dXi0kNPAADAB8nNQAYAAA==
+  </data>
+ </layer>
+ <layer name="Walkable" width="20" height="20" visible="0">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAC72UMQ4AIAgD+YL//6yTi6lwRWMTFglnBXVExBCxpHJu7HJrM18uU3lxmaq2EmERXuYv27Prk+YIK+vvvub6I7OmIvfntgedPjr+qNyznvZw/HVn82q+ivlb5K87vb+K8zMmYXU5dEAGAAA=
+  </data>
+ </layer>
+ <objectgroup name="Mapevents" width="20" height="20">
+  <object name="nw" type="mapchange" x="0" y="64" width="32" height="128">
+   <properties>
+    <property name="map" value="fallhaven_se"/>
+    <property name="place" value="east"/>
+   </properties>
+  </object>
+  <object name="sw" type="mapchange" x="0" y="544" width="32" height="64">
+   <properties>
+    <property name="map" value="wild11"/>
+    <property name="place" value="east"/>
+   </properties>
+  </object>
+  <object name="Signpost" type="sign" x="384" y="448" width="32" height="32">
+   <properties>
+    <property name="text" value="North: Fallhaven\nEast: Vilegard\nEast: Nor City"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Spawn" width="20" height="20">
+  <object name="forestwasp" type="spawn" x="96" y="128" width="288" height="192">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="forestboar2" type="spawn" x="96" y="384" width="288" height="192">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="forestserpent1" type="spawn" x="288" y="288" width="256" height="192">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="fallhaven_bandit" type="spawn" x="544" y="96" width="32" height="32">
+   <properties>
+    <property name="respawn" value="false"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Keys" width="20" height="20"/>
+</map>
diff --git a/AndorsTrail/res/xml/wild2.tmx b/AndorsTrail/res/xml/wild2.tmx
index 33a04f192..077f50828 100644
--- a/AndorsTrail/res/xml/wild2.tmx
+++ b/AndorsTrail/res/xml/wild2.tmx
@@ -50,22 +50,22 @@
  </tileset>
  <layer name="Ground" width="20" height="15">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAC1vCyMCwBIq3ALEmA2V4CQ3NW0ID8yh1I7p5lLoRm3kgvBkJU8M8ct0MU38EinGZR2y4gtSyMDEwXGaE4MMUuhFkrwjQvMeMEMzMhOlmGAbZS4x5yHxhJoiZyG6GYREyzIOZiexmGCbWv5TmCfT4IKSGlLSILf0iY1LTDQDTsg5JsAQAAA==
+   H4sIAAAAAAAAA1vCyMCwBIq3ALEmA2V4CQ3NW0ID8yh1I7p5lLoRm3kgvBkJU8M8ct0MU38EinGZR2y4gtSyMDEwXGaE4MMUuhFkrwjQvMeMEMzMhOlmGAbZS4x5yHxhJoiZyG6GYREyzIOZiexmGCbWv5TmCfT4IKSGlLSILf0iY1LTDQDTsg5JsAQAAA==
   </data>
  </layer>
  <layer name="Objects" width="20" height="15">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAC2NgQAVujAwMYawMDOZAHA7E7lhoC6g8iG5kQajVYGXAAA5A80oYIWxcZoKAIppemPno4D8zhPYBmrmDBaHOHM192AA294HAB6iZKUAzzaDu3cKC6QZkPi73wdwIChd0ADMfH6YUINuLy7/kAHzhiguA0tFVLOHojiW9BLERNg8W9yAA8yeueE8CmidBhHvdsKiBuReWJk2YGBi8cMQNI5r+MCLDyA1qnjETQowNqFcQiEWQ7CUGnACGhRXQvFIWhJkgvaVoaRDGB/kL5E6Qn2DhBwJXofKgcF6CJf2CwGe0cPgC5KtD49INykbO1+QAWPi7MWLGLwAmAEhVsAQAAA==
+   H4sIAAAAAAAAA2NgQAVujAwMYawMDOZAHA7E7lhoC6g8iG5kQajVYGXAAA5A80oYIWxcZoKAIppemPno4D8zhPYBmrmDBaHOHM192AA294HAB6iZKUAzzaDu3cKC6QZkPi73wdwIChd0ADMfH6YUINuLy7/kAHzhiguA0tFVLOHojiW9BLERNg8W9yAA8yeueE8CmidBhHvdsKiBuReWJk2YGBi8cMQNI5r+MCLDyA1qnjETQowNqFcQiEWQ7CUGnACGhRXQvFIWhJkgvaVoaRDGB/kL5E6Qn2DhBwJXofKgcF6CJf2CwGe0cPgC5KtD49INykbO1+QAWPi7MWLGLwAmAEhVsAQAAA==
   </data>
  </layer>
  <layer name="Above" width="20" height="15">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAC2NgQAX/mRmoCogxT4OVePO+MBKvVp0VYbY6CXZQCkhxI63MJ9W/IDPdkMIKOU7IDbsPWOIel1nEpBNiwxVk1nsi0zE2N2Izj1hxYuzFZR4+vbjiBp95pABkM6mVfknJ18gAX5wAALKyCkuwBAAA
+   H4sIAAAAAAAAA2NgQAX/mRmoCogxT4OVePO+MBKvVp0VYbY6CXZQCkhxI63MJ9W/IDPdkMIKOU7IDbsPWOIel1nEpBNiwxVk1nsi0zE2N2Izj1hxYuzFZR4+vbjiBp95pABkM6mVfknJ18gAX5wAALKyCkuwBAAA
   </data>
  </layer>
  <layer name="Walkable" width="20" height="15">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAC7VSQQoAMAjqC/3/szsNIlpq24QOIxNxupl5GEtvNIgfwXAQ94fmCXmvZDSFkvsrLUZT1aqyutWqPE57yWhOvXdg+8v+M/KP7rqOn+7YzBFf6c6eBSvGCp+wBAAA
+   H4sIAAAAAAAAA7VSQQoAMAjqC/3/szsNIlpq24QOIxNxupl5GEtvNIgfwXAQ94fmCXmvZDSFkvsrLUZT1aqyutWqPE57yWhOvXdg+8v+M/KP7rqOn+7YzBFf6c6eBSvGCp+wBAAA
   </data>
  </layer>
  <objectgroup name="Mapevents" width="20" height="15">
@@ -87,9 +87,10 @@
     <property name="place" value="south"/>
    </properties>
   </object>
-  <object name="Map not complete" type="sign" x="480" y="448" width="32" height="32">
+  <object name="south" type="mapchange" x="480" y="448" width="32" height="32">
    <properties>
-    <property name="text" value="This map is not yet done. Please come back in a later version of the game."/>
+    <property name="map" value="wild5"/>
+    <property name="place" value="north"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/AndorsTrail/res/xml/wild3.tmx b/AndorsTrail/res/xml/wild3.tmx
index 291e30c35..108743c13 100644
--- a/AndorsTrail/res/xml/wild3.tmx
+++ b/AndorsTrail/res/xml/wild3.tmx
@@ -55,7 +55,7 @@
  </layer>
  <layer name="Objects" width="20" height="20">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA51UOxLCIBANBryHnZZaGMexjjfQsfcCzviptbJK4VlSeBDv4REUhJ08ViDRN8PAht3HW3bJUmXZWo9lYJ7pUYrsg8J9H6pmbVBLa8+cHeMif+IbKD8O1wjSUUT0zcV3TAgD0EcoGNev2EAOZ+nncdf2Tn7HcH/ONxV27DvkNXIDbeIfOT6OrWjOCI3YuZXT/M89pc5EpOoR6w8DU9vK7fHYVBwiVg+KDe1zDRz4ToiP4yB9/zat//ZqSA/2KuWHb3WlrL5V4rw2zVjPC6v3tePbRYTy7/9Yb/RB30nPzs9ca9N5j7V9jHCF7oR64O7u7JU3ewu9fkjLG0Pqng1KvX8TvibzPz6BHePA/jU+hotmQurfhP1dw/4blUBDTkAGAAA=
+   H4sIAAAAAAAAA51UOxKCMBAlAt6DTkothHGs4QY49h7BT62VlYVnoeAg3sMjaGKyw2NNwufNZJJlNy9vsxvKOAh2cpSWOZejEMEPmfm+iNu1Qh1pOze2i4viiS+Ju/twjSAdmUPfRvzvsSEBfYSMcY3FHnK4Rt08GmkvLZw8nvOthR7HAXmlZqBN/Knh4ziI9gzbcJ37MJqn3JPvTISvHq7+UFC1fRgf3+vbh3DVg/ba/FwDB74T4uM4Rd34Pq1Te9WmB3uV8sO3WsVaX+U5r08z1vPG6n0f+HYRtvznI+uNMRi7mun5HUpt6v1K++zgst0J9UBj7uwTtr6tXL8izeuC754VCul/iq4m9T++gO3iwP5VMYqLZoLv34T9XYP/C+15+zFABgAA
   </data>
  </layer>
  <layer name="Above" width="20" height="20">
diff --git a/AndorsTrail/res/xml/wild4.tmx b/AndorsTrail/res/xml/wild4.tmx
index 44ba89913..cb6ca1a12 100644
--- a/AndorsTrail/res/xml/wild4.tmx
+++ b/AndorsTrail/res/xml/wild4.tmx
@@ -69,7 +69,7 @@
   </data>
  </layer>
  <objectgroup name="Mapevents" width="20" height="15">
-  <object name="west" type="mapchange" x="0" y="96" width="32" height="64">
+  <object name="west" type="mapchange" x="0" y="96" width="32" height="32">
    <properties>
     <property name="map" value="wild1"/>
     <property name="place" value="east"/>
diff --git a/AndorsTrail/res/xml/wild5.tmx b/AndorsTrail/res/xml/wild5.tmx
new file mode 100644
index 000000000..f8b16fc37
--- /dev/null
+++ b/AndorsTrail/res/xml/wild5.tmx
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" orientation="orthogonal" width="20" 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"/>
+ </tileset>
+ <tileset firstgid="129" name="tiles_1_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_2.png"/>
+ </tileset>
+ <tileset firstgid="257" name="tiles_2_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_1.png"/>
+ </tileset>
+ <tileset firstgid="385" name="tiles_2_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_2.png"/>
+ </tileset>
+ <tileset firstgid="513" name="tiles_2_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_3.png"/>
+ </tileset>
+ <tileset firstgid="641" name="tiles_2_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_4.png"/>
+ </tileset>
+ <tileset firstgid="769" name="tiles_2_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_5.png"/>
+ </tileset>
+ <tileset firstgid="897" name="tiles_1_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_3.png"/>
+ </tileset>
+ <tileset firstgid="1025" name="tiles_1_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_4.png"/>
+ </tileset>
+ <tileset firstgid="1153" name="tiles_1_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_5.png"/>
+ </tileset>
+ <tileset firstgid="1281" name="tiles_1_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_6.png"/>
+ </tileset>
+ <tileset firstgid="1409" name="tiles_1_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_7.png"/>
+ </tileset>
+ <tileset firstgid="1537" name="tiles_2_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_8.png"/>
+ </tileset>
+ <tileset firstgid="1649" name="tiles_2_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_6.png"/>
+ </tileset>
+ <tileset firstgid="1777" name="tiles_2_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_7.png"/>
+ </tileset>
+ <tileset firstgid="1905" name="tiles_2_8" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_8.png"/>
+ </tileset>
+ <layer name="Ground" width="20" height="20">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA1vCyMCwBA1vAWJNBlQczsrA4M6KKY6uBt0sEGZhwlQLMiucgHkgjM1tIljMI8Z9uMwjpGcgzcMWduSahyvsKDGPErNobR6lYYdsHjXCDt08Ss2ixDxc+Y9c83DlP0r8S033Dfb4wBU/5JiHHm4ws9zJNA9XXINoACgZ4d1ABgAA
+  </data>
+ </layer>
+ <layer name="Objects" width="20" height="20">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA5VUwQ2DMAwMVbJJpS6AVMQAPDoAiyAG4IGUQToEI7BAB8gmrdVYGOM4yUmIJDh27nzBGBlPZ0z3e4bmP0Z07vx9scdcwxzjIF8pcjl3mz4fxWr1PO3NmC3G9M1RG3N97HVNwxBjXhVcN+WMY8yH2sFc47QX9gS1Q06hkicAtIN9ULMv4OszNR5sDf2F+uyE98hi+ZzWwV54Qbc54w8pvsbHAOgX7wdoh6Da5fSXeJZiSXCValIfS/eB7kVgzCTUoT6GPobEWd6CVhAr8fasF1vCH5O9ckzduV7xSi1q/gEAri3F4HTfBUE3DWPMF4g2K9Pp7s5zHOP7C32qDoVABgAA
+  </data>
+ </layer>
+ <layer name="Above" width="20" height="20">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA7VUyQ3AIAxDqpiFTtL9N+kIVHmgotRuEg6/kAKO7QApYdSDFAbR85X8rs/83evhuh36pI+Hf6dXweX0WMg+nZ325PXZuDzZIW2oRyQ7nQPKRfhG7gTDzGz1PFh2Vv5s/hFtugfqad2Tvtbwp3v2XWjfFh/Kaae+lXzWPCLnov8A4uhrDCvyewBm+mtgQAYAAA==
+  </data>
+ </layer>
+ <layer name="Walkable" width="20" height="20">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA7WUwQ0AIAgDu4L7L+vflLagkvhBPBpAFoAlDowPRQx7AxKvLOW5XAkz0ZfkTjTc6kv5ndo5n2J2rJqpCS/txTmnXb0v+lrpU3GKw5gTLUobu1cstTMmvU3++W2d3A7o2s9ZSZidHeX6z5hnzAZPyT2NQAYAAA==
+  </data>
+ </layer>
+ <objectgroup name="Mapevents" width="20" height="20">
+  <object name="north" type="mapchange" x="256" y="0" width="32" height="32">
+   <properties>
+    <property name="map" value="wild2"/>
+    <property name="place" value="south"/>
+   </properties>
+  </object>
+  <object name="south" type="mapchange" x="128" y="608" width="64" height="32">
+   <properties>
+    <property name="map" value="wild6"/>
+    <property name="place" value="north"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Spawn" width="20" height="20">
+  <object name="forestsnake" type="spawn" x="192" y="96" width="224" height="160">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="fox2" type="spawn" x="352" y="64" width="256" height="288">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="forestwasp2" type="spawn" x="128" y="192" width="160" height="288">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="forestboar2" type="spawn" x="288" y="320" width="320" height="288">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Keys" width="20" height="20"/>
+</map>
diff --git a/AndorsTrail/res/xml/wild6.tmx b/AndorsTrail/res/xml/wild6.tmx
new file mode 100644
index 000000000..5502bde8e
--- /dev/null
+++ b/AndorsTrail/res/xml/wild6.tmx
@@ -0,0 +1,135 @@
+<?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"/>
+ </tileset>
+ <tileset firstgid="129" name="tiles_1_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_2.png"/>
+ </tileset>
+ <tileset firstgid="257" name="tiles_2_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_1.png"/>
+ </tileset>
+ <tileset firstgid="385" name="tiles_2_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_2.png"/>
+ </tileset>
+ <tileset firstgid="513" name="tiles_2_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_3.png"/>
+ </tileset>
+ <tileset firstgid="641" name="tiles_2_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_4.png"/>
+ </tileset>
+ <tileset firstgid="769" name="tiles_2_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_5.png"/>
+ </tileset>
+ <tileset firstgid="897" name="tiles_1_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_3.png"/>
+ </tileset>
+ <tileset firstgid="1025" name="tiles_1_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_4.png"/>
+ </tileset>
+ <tileset firstgid="1153" name="tiles_1_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_5.png"/>
+ </tileset>
+ <tileset firstgid="1281" name="tiles_1_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_6.png"/>
+ </tileset>
+ <tileset firstgid="1409" name="tiles_1_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_7.png"/>
+ </tileset>
+ <tileset firstgid="1537" name="tiles_2_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_8.png"/>
+ </tileset>
+ <tileset firstgid="1649" name="tiles_2_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_6.png"/>
+ </tileset>
+ <tileset firstgid="1777" name="tiles_2_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_7.png"/>
+ </tileset>
+ <tileset firstgid="1905" name="tiles_2_8" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_8.png"/>
+ </tileset>
+ <layer name="Ground" width="30" height="30">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA1vCyMCwBAveAsSaDOThcFYGBndWBI1NDTY7KbUX3W5q2IvL/aRiXPayMFHHfFLsBflVhER7cYUnqfbS0q9D1V5Sw5Za9lKStmmVljcTcDs10jI+M3HZT0oYExOuh3GUB4TspTSMmZmIiztqh7EwE8TuI4wIDLIT3Vx0N5kwUV4Gg+y+zIjA2PyCbCelfkXGjxkRGFe6IiV8qVkf0aNcxGYvteo8byZMjEstchhTUt6CcDQTJsZnL7XCrpERE9PD3omMCJzCBqHpYS8peKDsxVZm08vegcq/o/YOX3sBQrr9zBAOAAA=
+  </data>
+ </layer>
+ <layer name="Objects" width="30" height="30">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA61WQU7DMBBMW6cP4AscekNCRFD1AZXotagfCB9AwAOCVKk3+AH8gEMvvfEETvReiR+0VwRe1Uumm7XjtB3JcmInnt3ZXdtJ4scwta2VJIVJkiv73E+34/hs0uocgue+xBohTBxvU0jupvME4l2Z3TG0+dSzBvuGPr53t/1HN8w5M7v+xuqkgW2nmH3W8BKQ1wjOuSntQUwCtv10wzpn7ZLXpyXiEC0QrMs+eRWyJdY+5EX9NK0KUx1jUK7E6DZ03wyAd+rWxfw+hrYI6VuMXoV9f7Jt7WzdtKq5yP+GMHL/zwL6SayVfCD+JXDNPethLkuwj5ot9wH7Nm6tUI3NIZdXUKO+WJK+90eIcy8teZc+LmcP5yjH9lDOvudM0PIEcdHWxzMY1/IK9RxE7hkL5ztrI7mJcxGIfabYqunXj9B2HKk5c1LcKFdHiq/77MH/55CzMRP/98R70325iLBHq1sZ62FEvdHctMGewjysGWuMYyF/tdoi/dq2PXeS5MW2G3e2X9vn3Oj234mxFdwzztMyNnXnyYmdf7U8b51yLLSH8bqP8A3X0K3tL5X2AHrg+UQ5eXaEe10dfHZJ2wjfwvdf0IW05BqivYnqUNa873zHOGD9arYhxjU5xfFoci7KO3AIzMvnTC7Om7p3gpbzrBPazfcazmX2PRfcsX3IJgTVlxE678sZ0zN2fG9VNT6kz5XxPwgb/ZcQDgAA
+  </data>
+ </layer>
+ <layer name="Above" width="30" height="30">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA71V2w3CMAxshNiAHeAbMQEg9ilzMAojsBN88F+owJIxfsZp7welaXzX88V0nYxhoWwmsF7q+xzveGZjnKOIvk95LZ2t4PWZenAy9Gn6R857sL9RPyXeLLgsWPngeLF/NfnywPu9rbkxr+QXRf9+dnbosHI1N6Qst+ipdsekOSXB66+FWo8t7odSFzyeIqfQO867qfKkzT4uT7R3OFtaXw9OvzzzOPN/JGnM+gt1L8E6g5Al7b7hvV35/F4J77b8rnGfsMe1OT5+698I7778awRYHmfmglZ73GsxbwArVEuat5amKaHxeu9hzbln8b3bav5jcDMbeCiftY6Aes19O2iw1hFNXI/7hKeaJvyc8mY4I5j7Lr0Ana8hoxAOAAA=
+  </data>
+ </layer>
+ <layer name="Walkable" width="30" height="30">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA72UQQ7AIAgE/YL//2xPTZpGd2eRlsSDUZkFhDnGmGLd9tyTs5UfxdlxE3M+KsxVrJSdxK2YVevKMc0BYaZxVbV2/CeipfqnlM9Ew0meO3vNzQzCpL1I+oda2pPpzKjOITU7HDPlVeJ1OVb6K9w//mknc+fX6dudr/au5k4jrWlH/hX3xC+tF8mzeuvYhEfjTvtYaXScyj06azqM5quLl5rrodMZQrhddSZGa0/m7futY6p3jl3VlPT4V+tP5gWpTNgREA4AAA==
+  </data>
+ </layer>
+ <objectgroup name="Mapevents" width="30" height="30">
+  <object name="north" type="mapchange" x="256" y="0" width="64" height="32">
+   <properties>
+    <property name="map" value="wild5"/>
+    <property name="place" value="south"/>
+   </properties>
+  </object>
+  <object name="east" type="mapchange" x="928" y="736" width="32" height="96">
+   <properties>
+    <property name="map" value="wild9"/>
+    <property name="place" value="west"/>
+   </properties>
+  </object>
+  <object name="south" type="mapchange" x="96" y="928" width="96" height="32">
+   <properties>
+    <property name="map" value="wild7"/>
+    <property name="place" value="north"/>
+   </properties>
+  </object>
+  <object name="house" type="mapchange" x="704" y="672" width="32" height="32">
+   <properties>
+    <property name="map" value="wild6_house"/>
+    <property name="place" value="entrance"/>
+   </properties>
+  </object>
+  <object name="Signpost" type="sign" x="256" y="672" width="32" height="32">
+   <properties>
+    <property name="text" value="North: Crossglen\nEast: Fallhaven\nSouth: Stoutford"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Spawn" width="30" height="30">
+  <object name="forestboar2" type="spawn" x="192" y="96" width="480" height="256">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="forestbeetle" type="spawn" x="381" y="221" width="582" height="353">
+   <properties>
+    <property name="quantity" value="4"/>
+   </properties>
+  </object>
+  <object name="forestwasp" type="spawn" x="160" y="352" width="320" height="288">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="fox2" type="spawn" x="96" y="512" width="256" height="320">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="forestwolf1" type="spawn" x="352" y="640" width="512" height="256">
+   <properties>
+    <property name="quantity" value="3"/>
+   </properties>
+  </object>
+  <object name="unzel" type="spawn" x="896" y="64" width="32" height="32">
+   <properties>
+    <property name="respawn" value="false"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Keys" width="30" height="30"/>
+</map>
diff --git a/AndorsTrail/res/xml/wild6_house.tmx b/AndorsTrail/res/xml/wild6_house.tmx
new file mode 100644
index 000000000..5112d086c
--- /dev/null
+++ b/AndorsTrail/res/xml/wild6_house.tmx
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" orientation="orthogonal" width="9" height="7" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="tiles_1_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_1.png"/>
+ </tileset>
+ <tileset firstgid="129" name="tiles_1_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_2.png"/>
+ </tileset>
+ <tileset firstgid="257" name="tiles_2_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_1.png"/>
+ </tileset>
+ <tileset firstgid="385" name="tiles_2_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_2.png"/>
+ </tileset>
+ <tileset firstgid="513" name="tiles_2_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_3.png"/>
+ </tileset>
+ <tileset firstgid="641" name="tiles_2_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_4.png"/>
+ </tileset>
+ <tileset firstgid="769" name="tiles_2_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_5.png"/>
+ </tileset>
+ <tileset firstgid="897" name="tiles_1_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_3.png"/>
+ </tileset>
+ <tileset firstgid="1025" name="tiles_1_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_4.png"/>
+ </tileset>
+ <tileset firstgid="1153" name="tiles_1_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_5.png"/>
+ </tileset>
+ <tileset firstgid="1281" name="tiles_1_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_6.png"/>
+ </tileset>
+ <tileset firstgid="1409" name="tiles_1_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_7.png"/>
+ </tileset>
+ <tileset firstgid="1537" name="tiles_2_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_8.png"/>
+ </tileset>
+ <tileset firstgid="1649" name="tiles_2_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_6.png"/>
+ </tileset>
+ <tileset firstgid="1777" name="tiles_2_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_7.png"/>
+ </tileset>
+ <tileset firstgid="1905" name="tiles_2_8" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_8.png"/>
+ </tileset>
+ <layer name="Ground" width="9" height="7">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAAwtiZGAIIgI34sEwNRPxYJgabwbcGGYPPjWNUPPwqQHJBzJgx95IbABdDyEo/AAAAA==
+  </data>
+ </layer>
+ <layer name="Objects" width="9" height="7">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NggAAldgaCwAiopp+ZgWECM4JGB05ANfOB4guYETQy4IPaIwyl9VgZGB6yMTD0siHULGbBbv9cJDU9QH3FQHWRzBAz0M0nBgAAjrp7B/wAAAA=
+  </data>
+ </layer>
+ <layer name="Above" width="9" height="7">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgIA78ZyZNjQgrhL7IhmDjMyeZhTS73iOpQdZLCgAAMkkrHPwAAAA=
+  </data>
+ </layer>
+ <layer name="Walkable" width="9" height="7">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAAxNkYGAQpDNmQKNxqcEGCKkn1m4QBgAuOYx5/AAAAA==
+  </data>
+ </layer>
+ <objectgroup name="Mapevents" width="9" height="7">
+  <object name="entrance" type="mapchange" x="192" y="192" width="32" height="32">
+   <properties>
+    <property name="map" value="wild6"/>
+    <property name="place" value="house"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Spawn" width="9" height="7"/>
+ <objectgroup name="Keys" width="9" height="7"/>
+</map>
diff --git a/AndorsTrail/res/xml/wild7.tmx b/AndorsTrail/res/xml/wild7.tmx
new file mode 100644
index 000000000..6d7f23a35
--- /dev/null
+++ b/AndorsTrail/res/xml/wild7.tmx
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" orientation="orthogonal" width="20" 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"/>
+ </tileset>
+ <tileset firstgid="129" name="tiles_1_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_2.png"/>
+ </tileset>
+ <tileset firstgid="257" name="tiles_2_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_1.png"/>
+ </tileset>
+ <tileset firstgid="385" name="tiles_2_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_2.png"/>
+ </tileset>
+ <tileset firstgid="513" name="tiles_2_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_3.png"/>
+ </tileset>
+ <tileset firstgid="641" name="tiles_2_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_4.png"/>
+ </tileset>
+ <tileset firstgid="769" name="tiles_2_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_5.png"/>
+ </tileset>
+ <tileset firstgid="897" name="tiles_1_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_3.png"/>
+ </tileset>
+ <tileset firstgid="1025" name="tiles_1_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_4.png"/>
+ </tileset>
+ <tileset firstgid="1153" name="tiles_1_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_5.png"/>
+ </tileset>
+ <tileset firstgid="1281" name="tiles_1_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_6.png"/>
+ </tileset>
+ <tileset firstgid="1409" name="tiles_1_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_7.png"/>
+ </tileset>
+ <tileset firstgid="1537" name="tiles_2_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_8.png"/>
+ </tileset>
+ <tileset firstgid="1649" name="tiles_2_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_6.png"/>
+ </tileset>
+ <tileset firstgid="1777" name="tiles_2_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_7.png"/>
+ </tileset>
+ <tileset firstgid="1905" name="tiles_2_8" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_8.png"/>
+ </tileset>
+ <layer name="Ground" width="20" height="20">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA1vCyMCwhABmYWJg0GQgDhMyawsQi1DRPFLcRsg8Ut1GyDxS3YbPPJBZpLoNl3nkmoVu3hEKzQLhI0jmXCYj/NExyAyYOY8ZKTMLhEFmUMOcUTyKhyMGAEu7IXdABgAA
+  </data>
+ </layer>
+ <layer name="Objects" width="20" height="20">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA62UTQ6CMBCFW1Nu4EVMDAvjzsSFW46AN0Dcw4r7sOEIXMNwEdvQSR9DB2riSyb89ps30x+l0nTL5utolLprpRr7XNko2TVVhf13MPO94zlxVpnIOx+Wz//wRx7RX4z5q7faBN5k1sw91SZ4aZk/Uqo/7o3m42J5H8iT4g9ZhfDfEGGm+EI9dDxHE/F3zAKr87mpLhL2DpmVnxvk9Gws5sa5OAl1dZHxONbpacfnEFdYK058Ped6HS8d1gkX1ivtN+oD7xV9Q/bW3qh8vKE+6sHE2NQH4vWRvVH6aIX+otxa+5jtvUH+UKPQN16vVLN03uB78l9kS14XqTnW060zjdfLc++xyN/EzmZpfr95qFcwQAYAAA==
+  </data>
+ </layer>
+ <layer name="Above" width="20" height="20">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA7WT0QkAIQxDhcPJbiJvcUfw6EehFKvRaH6tzyTFlDC1BxwEWdXxSuZ4opdgWJb3xvJEku8j/SHe0B4ti+0N8YW8oV2h/c+YEYfZxepdnT+x/2i3ox6is4iFelzJw+Y+pVFmn6e3t51/ooyb6vVr/d/UDzPCam5ABgAA
+  </data>
+ </layer>
+ <layer name="Walkable" width="20" height="20">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA7WUQQoAIAgE/YL//2zXCLRx1YVuOYxiuZk5PHdoDeV1mRusqZ6zdNwi9pSbypromXhRJnF671ScVOdKbeTViTIrdedoPWWq2Wb93ms2543/ReVSxgEAUtf+QAYAAA==
+  </data>
+ </layer>
+ <objectgroup name="Mapevents" width="20" height="20">
+  <object name="west" type="mapchange" x="0" y="352" width="32" height="96">
+   <properties>
+    <property name="map" value="wild8"/>
+    <property name="place" value="east"/>
+   </properties>
+  </object>
+  <object name="north" type="mapchange" x="352" y="0" width="96" height="32">
+   <properties>
+    <property name="map" value="wild6"/>
+    <property name="place" value="south"/>
+   </properties>
+  </object>
+  <object name="Signpost" type="sign" x="416" y="320" width="32" height="32">
+   <properties>
+    <property name="text" value="West: Stoutford\nNorth: Fallhaven"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Spawn" width="20" height="20" visible="0">
+  <object name="forestwolf1" type="spawn" x="224" y="64" width="352" height="224">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="forestbeetle" type="spawn" x="96" y="256" width="224" height="320">
+   <properties>
+    <property name="quantity" value="3"/>
+   </properties>
+  </object>
+  <object name="forestserpent1" type="spawn" x="224" y="288" width="384" height="288">
+   <properties>
+    <property name="quantity" value="3"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Keys" width="20" height="20"/>
+</map>
diff --git a/AndorsTrail/res/xml/wild8.tmx b/AndorsTrail/res/xml/wild8.tmx
new file mode 100644
index 000000000..b9b241cf0
--- /dev/null
+++ b/AndorsTrail/res/xml/wild8.tmx
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" orientation="orthogonal" width="20" height="15" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="tiles_1_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_1.png"/>
+ </tileset>
+ <tileset firstgid="129" name="tiles_1_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_2.png"/>
+ </tileset>
+ <tileset firstgid="257" name="tiles_2_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_1.png"/>
+ </tileset>
+ <tileset firstgid="385" name="tiles_2_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_2.png"/>
+ </tileset>
+ <tileset firstgid="513" name="tiles_2_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_3.png"/>
+ </tileset>
+ <tileset firstgid="641" name="tiles_2_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_4.png"/>
+ </tileset>
+ <tileset firstgid="769" name="tiles_2_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_5.png"/>
+ </tileset>
+ <tileset firstgid="897" name="tiles_1_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_3.png"/>
+ </tileset>
+ <tileset firstgid="1025" name="tiles_1_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_4.png"/>
+ </tileset>
+ <tileset firstgid="1153" name="tiles_1_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_5.png"/>
+ </tileset>
+ <tileset firstgid="1281" name="tiles_1_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_6.png"/>
+ </tileset>
+ <tileset firstgid="1409" name="tiles_1_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_7.png"/>
+ </tileset>
+ <tileset firstgid="1537" name="tiles_2_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_8.png"/>
+ </tileset>
+ <tileset firstgid="1649" name="tiles_2_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_6.png"/>
+ </tileset>
+ <tileset firstgid="1777" name="tiles_2_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_7.png"/>
+ </tileset>
+ <tileset firstgid="1905" name="tiles_2_8" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_8.png"/>
+ </tileset>
+ <layer name="Ground" width="20" height="15">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA1vCyMCwhAh8BAtmYWJguMyIignpwaUPhEWA4o8ZUTEhPbj0gbAmAyYmpAeXPlyYHD2jeBSPYvIwAEty+TiwBAAA
+  </data>
+ </layer>
+ <layer name="Objects" width="20" height="15">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA82S0Q3CMAxE3SpZADECIyAW6QiwQekAyUr8dAQm4L9lERJRK6drkgJfnGRFVe/ZF7ci/6m93fa0GQ9yx1bk8EEf5XY2cVGDSe876HNpRE5LKatM1BS4EVhv1lysa5M8D5tYFDPMReEs5J3NM11hJ0+arbnPwd/b96m6g3cgriYHvfqlWLqL6PWhZlPPjfmUYY2ZjJobGc6n8sTrnmv/15zZH/Z0hftzZtw19+Ke+Hzb+C6lXt/MmAp3/PXEveQ8L7sVK16wBAAA
+  </data>
+ </layer>
+ <layer name="Above" width="20" height="15">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgGBjwnxm7+Hsc4vj0YNPnzErYDfjsGghQiMPNxPgF3ZwiEvXgMwsZ4DMX3V5i3U2qW5HtwRVm1ALIbiMnXLG5D90MYs3E51eQGcjyhNxNTrjhsoOacUAoLABo2Pw3sAQAAA==
+  </data>
+ </layer>
+ <layer name="Walkable" width="20" height="15">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAAxNkYGAQHMYYHVCiDxvAp4cUQKl+Uswk1S5q+RHdLEJhjS5PTByQ405kPZSYQ8h8bP6hJC4oNZPcvITNDmrmV3zyAKtd8bGwBAAA
+  </data>
+ </layer>
+ <objectgroup name="Mapevents" width="20" height="15">
+  <object name="east" type="mapchange" x="608" y="64" width="32" height="96">
+   <properties>
+    <property name="map" value="wild7"/>
+    <property name="place" value="west"/>
+   </properties>
+  </object>
+  <object name="west" type="mapchange" x="0" y="160" width="32" height="96">
+   <properties>
+    <property name="map" value="flagstone0"/>
+    <property name="place" value="east"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Spawn" width="20" height="15">
+  <object name="forestserpent2" type="spawn" x="160" y="288" width="320" height="128"/>
+  <object name="fox1" type="spawn" x="320" y="64" width="256" height="128">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="forestwasp2" type="spawn" x="64" y="128" width="352" height="224">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Keys" width="20" height="15"/>
+</map>
diff --git a/AndorsTrail/res/xml/wild9.tmx b/AndorsTrail/res/xml/wild9.tmx
new file mode 100644
index 000000000..319b2a8d8
--- /dev/null
+++ b/AndorsTrail/res/xml/wild9.tmx
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" orientation="orthogonal" width="30" height="15" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="tiles_1_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_1.png"/>
+ </tileset>
+ <tileset firstgid="129" name="tiles_1_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_2.png"/>
+ </tileset>
+ <tileset firstgid="257" name="tiles_2_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_1.png"/>
+ </tileset>
+ <tileset firstgid="385" name="tiles_2_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_2.png"/>
+ </tileset>
+ <tileset firstgid="513" name="tiles_2_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_3.png"/>
+ </tileset>
+ <tileset firstgid="641" name="tiles_2_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_4.png"/>
+ </tileset>
+ <tileset firstgid="769" name="tiles_2_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_5.png"/>
+ </tileset>
+ <tileset firstgid="897" name="tiles_1_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_3.png"/>
+ </tileset>
+ <tileset firstgid="1025" name="tiles_1_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_4.png"/>
+ </tileset>
+ <tileset firstgid="1153" name="tiles_1_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_5.png"/>
+ </tileset>
+ <tileset firstgid="1281" name="tiles_1_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_6.png"/>
+ </tileset>
+ <tileset firstgid="1409" name="tiles_1_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_7.png"/>
+ </tileset>
+ <tileset firstgid="1537" name="tiles_2_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_1_8.png"/>
+ </tileset>
+ <tileset firstgid="1649" name="tiles_2_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_6.png"/>
+ </tileset>
+ <tileset firstgid="1777" name="tiles_2_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_7.png"/>
+ </tileset>
+ <tileset firstgid="1905" name="tiles_2_8" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tiles_2_8.png"/>
+ </tileset>
+ <layer name="Ground" width="30" height="15">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAC3NnZWAIB2J3KK3JgImR5d1xqCFWHbFmoaunhjpc/hsOGF/80RITSjujeBSP4lE82DEAZDJ/swgHAAA=
+  </data>
+ </layer>
+ <layer name="Objects" width="30" height="15">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAC61TgQ2DMAwrUrhkP2z7h33AOAAkJC7YLTyyAyoeGZGWETKnLdMsVaipaydpCCGNS/0du66xJ23nvPd4JVqicUrwtZbmRfJ5SEu8RsK8xdTVOjzGRBvPQ0+4bjljPBIev8L2cij0EF7Pta+rWddgtGbVIwTUE9HL8YSrPbk/+r0i7ecu1X++Z/UknsOnF4A7q5jtwwL40Wh1isNa9r1QHgi29tQseR63KoTzwSXo6LjWvQoQNvdo9vy/lWp5QPPMsG/cqPm3c6vvSI6Tec8d7+05Jjg8M9azqfN5oDiaPw/Is3ViuW8utxKdo57/+r4AftCQAggHAAA=
+  </data>
+ </layer>
+ <layer name="Above" width="30" height="15">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAC2NgQAUarAwjFrSxUG6GOit1w7AQaFYRK4LGZScMINuNzS3YzCHWzYTChxgzcPmBGkB9ANMuut+pkZYGCtDD7fjSMzZ1xKonZBa56gi5g1L3Ees2ZDcg6yHFbdj0UwMQcttgBgBR+hfdCAcAAA==
+  </data>
+ </layer>
+ <layer name="Walkable" width="30" height="15">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAC8WUUQoAIAhDvYL3v2y/IuVmLhr4o48pSrmZeYqoXMvMqd7xYvmYZ7guc+InjAnqjKq7TPxudlrdEuV2+YqJLJrzlRT+kzuxPi93oNCPd4K4Dq/uif7HjvekJxtoNmUvdSzTqtFPCAcAAA==
+  </data>
+ </layer>
+ <objectgroup name="Mapevents" width="30" height="15">
+  <object name="west" type="mapchange" x="2" y="292" width="32" height="96">
+   <properties>
+    <property name="map" value="wild6"/>
+    <property name="place" value="east"/>
+   </properties>
+  </object>
+  <object name="east" type="mapchange" x="928" y="224" width="32" height="64">
+   <properties>
+    <property name="map" value="wild10"/>
+    <property name="place" value="west"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Spawn" width="30" height="15">
+  <object name="bandit1" type="spawn" x="64" y="256" width="832" height="96"/>
+  <object name="fallhaven_bandit" type="spawn" x="416" y="32" width="32" height="32">
+   <properties>
+    <property name="respawn" value="false"/>
+   </properties>
+  </object>
+  <object name="forestwasp2" type="spawn" x="160" y="96" width="736" height="352">
+   <properties>
+    <property name="quantity" value="3"/>
+   </properties>
+  </object>
+  <object name="forestwolf1" type="spawn" x="128" y="64" width="736" height="352">
+   <properties>
+    <property name="quantity" value="3"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Keys" width="30" height="15"/>
+</map>
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
index b2a53cab7..c666392dd 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
@@ -2,7 +2,6 @@ package com.gpl.rpg.AndorsTrail;
 
 import java.lang.ref.WeakReference;
 
-import com.gpl.rpg.AndorsTrail.activity.Preferences;
 import com.gpl.rpg.AndorsTrail.context.ViewContext;
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
 
@@ -19,12 +18,13 @@ public final class AndorsTrailApplication extends Application {
 	public static final boolean DEVELOPMENT_DEBUGBUTTONS = false;
 	public static final boolean DEVELOPMENT_VALIDATEDATA = false;
 	public static final boolean DEVELOPMENT_DEBUGMESSAGES = false;
-	public static final int CURRENT_VERSION = 13;
-	public static final String CURRENT_VERSION_DISPLAY = "0.6.6";
+	public static final int CURRENT_VERSION = 15;
+	public static final String CURRENT_VERSION_DISPLAY = "0.6.7";
 	
 	public final WorldContext world = new WorldContext();
 	public WorldSetup setup = new WorldSetup(world, this);
 	public WeakReference<ViewContext> currentView;
+	public final AndorsTrailPreferences preferences = new AndorsTrailPreferences();
 	
 	public static AndorsTrailApplication getApplicationFromActivity(Activity activity) {
 		return ((AndorsTrailApplication) activity.getApplication());
@@ -36,15 +36,12 @@ public final class AndorsTrailApplication extends Application {
 		return (Activity) context;
 	}
 	
-	public static void setWindowParameters(Activity activity, boolean fullscreen) {
+	public static void setWindowParameters(Activity activity, final AndorsTrailPreferences preferences) {
 		activity.requestWindowFeature(Window.FEATURE_NO_TITLE);
-		if (fullscreen) {
+		if (preferences.fullscreen) {
 			activity.getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
 		} else {
 			activity.getWindow().setFlags(0, WindowManager.LayoutParams.FLAG_FULLSCREEN);
 		}
 	}
-	public static void setWindowParameters(Activity activity) {
-		setWindowParameters(activity, Preferences.shouldUseFullscreen(activity));
-	}
 }
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailPreferences.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailPreferences.java
new file mode 100644
index 000000000..a883e7a4d
--- /dev/null
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailPreferences.java
@@ -0,0 +1,42 @@
+package com.gpl.rpg.AndorsTrail;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+
+public class AndorsTrailPreferences {
+	public boolean confirmRest = true;
+	public boolean confirmAttack = true;
+	public int displayLoot = DISPLAYLOOT_DIALOG;
+	public static final int DISPLAYLOOT_DIALOG = 0;
+	public static final int DISPLAYLOOT_TOAST = 1;
+	public static final int DISPLAYLOOT_NONE = 2;
+	public boolean fullscreen = true;
+	public int attackspeed_milliseconds = 1000;
+	
+	public static void read(final Context androidContext, AndorsTrailPreferences dest) {
+		try {
+			SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(androidContext);
+			dest.confirmRest = prefs.getBoolean("confirm_rest", true);
+			dest.confirmAttack = prefs.getBoolean("confirm_attack", true);
+			dest.displayLoot = Integer.parseInt(prefs.getString("display_lootdialog", Integer.toString(DISPLAYLOOT_DIALOG)));
+			dest.fullscreen = prefs.getBoolean("fullscreen", true);
+			dest.attackspeed_milliseconds = Integer.parseInt(prefs.getString("attackspeed", "1000"));
+		} catch (Exception e) {
+			dest.confirmRest = true;
+			dest.confirmAttack = true;
+			dest.displayLoot = DISPLAYLOOT_DIALOG;
+			dest.fullscreen = true;
+			dest.attackspeed_milliseconds = 1000;
+		}
+	}
+	
+	public static boolean shouldUseFullscreen(final Context androidContext) {
+		try {
+			SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(androidContext);
+			return prefs.getBoolean("fullscreen", true);
+		} catch (Exception e) {
+		}
+		return true;
+	}
+}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/Dialogs.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/Dialogs.java
index b5ff08122..324fca14f 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/Dialogs.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/Dialogs.java
@@ -18,6 +18,7 @@ import android.widget.AdapterView.OnItemClickListener;
 
 import com.gpl.rpg.AndorsTrail.R;
 import com.gpl.rpg.AndorsTrail.activity.ConversationActivity;
+import com.gpl.rpg.AndorsTrail.activity.LoadSaveActivity;
 import com.gpl.rpg.AndorsTrail.activity.MainActivity;
 import com.gpl.rpg.AndorsTrail.activity.HeroinfoActivity;
 import com.gpl.rpg.AndorsTrail.activity.ItemInfoActivity;
@@ -25,10 +26,11 @@ import com.gpl.rpg.AndorsTrail.activity.LevelUpActivity;
 import com.gpl.rpg.AndorsTrail.activity.MonsterEncounterActivity;
 import com.gpl.rpg.AndorsTrail.activity.MonsterInfoActivity;
 import com.gpl.rpg.AndorsTrail.activity.Preferences;
+import com.gpl.rpg.AndorsTrail.activity.QuestLogActivity;
+import com.gpl.rpg.AndorsTrail.activity.StartScreenActivity;
 import com.gpl.rpg.AndorsTrail.context.ViewContext;
 import com.gpl.rpg.AndorsTrail.controller.Controller;
 import com.gpl.rpg.AndorsTrail.controller.ItemController;
-import com.gpl.rpg.AndorsTrail.model.InterfaceData;
 import com.gpl.rpg.AndorsTrail.model.actor.Monster;
 import com.gpl.rpg.AndorsTrail.model.item.ItemType;
 import com.gpl.rpg.AndorsTrail.model.item.Loot;
@@ -67,36 +69,6 @@ public final class Dialogs {
         .create();
 		showDialogAndPause(d, context);
 	}
-
-	/*
-	public static void showConfirmExit(final Activity activity, final ViewContext context) {
-    	Dialog d = new AlertDialog.Builder(activity)
-        .setIcon(android.R.drawable.ic_dialog_alert)
-        .setTitle(R.string.dialog_confirmexit_title)
-        .setMessage(R.string.dialog_confirmexit_message)
-        .setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-            	activity.finish();    
-            }
-        })
-        .setNegativeButton(android.R.string.no, null)
-        .create();
-
-    	showDialogAndPause(d, context);
-	}
-	*/
-
-	public static void showPaused(final Context androidContext, final ViewContext context) {
-		Dialog d = new AlertDialog.Builder(androidContext)
-        .setIcon(android.R.drawable.ic_dialog_info)
-        .setTitle(R.string.dialog_paused_title)
-        .setMessage(R.string.dialog_paused_message)
-        .setNeutralButton(R.string.dialog_paused_resume, null)
-        .create();
-
-		showDialogAndPause(d, context);
-	}
 	
 	public static void showConversation(final MainActivity currentActivity, final ViewContext context, final String phraseID, final Monster npc) {
 		context.controller.pause();
@@ -120,31 +92,32 @@ public final class Dialogs {
 		currentActivity.startActivity(intent);
 	}
 	
-	public static void showMonsterLoot(final Context androidContext, final ViewContext context, final Loot loot) {
-		showLoot(androidContext, context, loot, R.string.dialog_monsterloot_title, R.string.dialog_monsterloot_message);
+	public static void showMonsterLoot(final MainActivity mainActivity, final ViewContext context, final Loot loot) {
+		showLoot(mainActivity, context, loot, R.string.dialog_monsterloot_title, R.string.dialog_monsterloot_message);
 	}
 
-	public static void showGroundLoot(final Context androidContext, final ViewContext context, final Loot loot) {
-		showLoot(androidContext, context, loot, R.string.dialog_groundloot_title, R.string.dialog_groundloot_message);
+	public static void showGroundLoot(final MainActivity mainActivity, final ViewContext context, final Loot loot) {
+		showLoot(mainActivity, context, loot, R.string.dialog_groundloot_title, R.string.dialog_groundloot_message);
 	}
 	
-	private static void showLoot(final Context androidContext, final ViewContext context, final Loot loot, final int title, final int message) {
+	private static void showLoot(final MainActivity mainActivity, final ViewContext context, final Loot loot, final int title, final int message) {
 		if (ItemController.removeEmptyLoot(context, loot)) return;
 
-		String msg = androidContext.getString(message);
+		String msg = mainActivity.getString(message);
 		if (loot.exp > 0) {
-			msg += androidContext.getString(R.string.dialog_monsterloot_gainedexp, loot.exp);
+			msg += mainActivity.getString(R.string.dialog_monsterloot_gainedexp, loot.exp);
 		}
 		if (loot.gold > 0) {
-			msg += androidContext.getString(R.string.dialog_loot_foundgold, loot.gold);
+			msg += mainActivity.getString(R.string.dialog_loot_foundgold, loot.gold);
 		}
 		
-		if (context.model.uiSelections.displayLoot != InterfaceData.DISPLAYLOOT_DIALOG) {
-			if (context.model.uiSelections.displayLoot == InterfaceData.DISPLAYLOOT_TOAST) {
-				if (!loot.items.items.isEmpty()) {
-					msg += androidContext.getString(R.string.dialog_loot_pickedupitems, loot.items.items.size());
+		if (context.preferences.displayLoot != AndorsTrailPreferences.DISPLAYLOOT_DIALOG) {
+			if (context.preferences.displayLoot == AndorsTrailPreferences.DISPLAYLOOT_TOAST) {
+				int numitems = loot.items.countItems();
+				if (numitems > 0) {
+					msg += mainActivity.getString(R.string.dialog_loot_pickedupitems, numitems);
 				}
-				Toast.makeText(androidContext, msg, Toast.LENGTH_LONG).show();
+				mainActivity.showToast(msg, Toast.LENGTH_LONG);
 			}
 			ItemController.pickupAll(loot, context.model);
         	ItemController.removeEmptyLoot(context, loot);
@@ -152,7 +125,7 @@ public final class Dialogs {
 			return;
 		}
 
-		final ListView itemList = new ListView(androidContext);
+		final ListView itemList = new ListView(mainActivity);
 		itemList.setLayoutParams(new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT));
 		itemList.setPadding(20, 0, 20, 20);
 		itemList.setOnItemClickListener(new OnItemClickListener() {
@@ -165,9 +138,9 @@ public final class Dialogs {
 				((ItemContainerAdapter) itemList.getAdapter()).notifyDataSetChanged();
 			}
 		});
-		itemList.setAdapter(new ItemContainerAdapter(androidContext, context.tileStore, loot.items));
+		itemList.setAdapter(new ItemContainerAdapter(mainActivity, context.tileStore, loot.items));
 		
-		AlertDialog.Builder db = new AlertDialog.Builder(androidContext)
+		AlertDialog.Builder db = new AlertDialog.Builder(mainActivity)
         .setTitle(title)
         .setMessage(msg)
         .setIcon(new BitmapDrawable(context.tileStore.bitmaps[TileStore.iconID_groundbag]))
@@ -211,7 +184,7 @@ public final class Dialogs {
 	}
 
 	public static void showRest(final Activity currentActivity, final ViewContext viewContext) {
-		if (!viewContext.model.uiSelections.confirmRest) {
+		if (!viewContext.preferences.confirmRest) {
 			Controller.ui_playerRested(currentActivity, viewContext);
 			return;
 		}
@@ -251,4 +224,22 @@ public final class Dialogs {
 		Intent intent = new Intent(currentActivity, Preferences.class);
 		currentActivity.startActivityForResult(intent, MainActivity.INTENTREQUEST_PREFERENCES);
 	}
+	
+	public static void showSave(final Activity currentActivity, final ViewContext viewContext) {
+		viewContext.controller.pause();
+    	Intent intent = new Intent(currentActivity, LoadSaveActivity.class);
+    	intent.setData(Uri.parse("content://com.gpl.rpg.AndorsTrail/save"));
+		currentActivity.startActivityForResult(intent, MainActivity.INTENTREQUEST_SAVEGAME);
+	}
+	
+	public static void showLoad(final Activity currentActivity) {
+		Intent intent = new Intent(currentActivity, LoadSaveActivity.class);
+		intent.setData(Uri.parse("content://com.gpl.rpg.AndorsTrail/load"));
+		currentActivity.startActivityForResult(intent, StartScreenActivity.INTENTREQUEST_LOADGAME);
+	}
+	
+	public static void showQuestLog(final Activity currentActivity) {
+		Intent intent = new Intent(currentActivity, QuestLogActivity.class);
+		currentActivity.startActivity(intent);
+	}
 }
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/Savegames.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/Savegames.java
new file mode 100644
index 000000000..096db3c6d
--- /dev/null
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/Savegames.java
@@ -0,0 +1,161 @@
+package com.gpl.rpg.AndorsTrail;
+
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import android.content.Context;
+import android.os.Environment;
+
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.Constants;
+import com.gpl.rpg.AndorsTrail.controller.MovementController;
+import com.gpl.rpg.AndorsTrail.model.ModelContainer;
+import com.gpl.rpg.AndorsTrail.util.L;
+
+public final class Savegames {
+	public static final int SLOT_QUICKSAVE = 0;
+	
+	public static final int LOAD_RESULT_SUCCESS = 0;
+	public static final int LOAD_RESULT_UNKNOWN_ERROR = 1;
+	public static final int LOAD_RESULT_FUTURE_VERSION = 2;
+    
+    public static boolean saveWorld(WorldContext world, Context androidContext, int slot, String displayInfo) {
+    	try {
+    		// Create the savegame in a temporary memorystream first to ensure that the savegame can
+    		// be created correctly. We don't want to trash the user's file unneccessarily if there is an error.
+    		ByteArrayOutputStream bos = new ByteArrayOutputStream();
+	    	saveWorld(world, bos, displayInfo);
+	    	byte[] savegame = bos.toByteArray();
+	    	bos.close();
+	    	bos = null;
+	    	
+	    	FileOutputStream fos = getOutputFile(androidContext, slot);
+	    	fos.write(savegame);
+	    	fos.close();
+	    	return true;
+    	} catch (IOException e) {
+    		L.log("Error saving world: " + e.toString());
+    		return false;
+    	}
+    }
+    public static int loadWorld(WorldContext world, Context androidContext, int slot) {
+    	try {
+	    	FileInputStream fos = getInputFile(androidContext, slot);
+	    	int result = loadWorld(world, fos);
+	    	fos.close();
+	    	return result;
+    	} catch (IOException e) {
+    		L.log("Error loading world: " + e.toString());
+	    	return LOAD_RESULT_UNKNOWN_ERROR;
+    	}
+    }
+    
+    private static FileOutputStream getOutputFile(Context androidContext, int slot) throws IOException {
+    	if (slot == SLOT_QUICKSAVE) {
+    		return androidContext.openFileOutput(Constants.FILENAME_SAVEGAME_QUICKSAVE, Context.MODE_PRIVATE);
+    	} else {
+    		ensureSavegameDirectoryExists();
+	    	return new FileOutputStream(getSlotFile(slot));
+    	}
+    }
+    private static void ensureSavegameDirectoryExists() {
+    	File root = Environment.getExternalStorageDirectory();
+		File dir = new File(root, Constants.FILENAME_SAVEGAME_DIRECTORY);
+		if (!dir.exists()) dir.mkdir();
+    }
+    private static FileInputStream getInputFile(Context androidContext, int slot) throws IOException {
+    	if (slot == SLOT_QUICKSAVE) {
+    		return androidContext.openFileInput(Constants.FILENAME_SAVEGAME_QUICKSAVE);
+    	} else {
+    		return new FileInputStream(getSlotFile(slot));
+    	}
+    }
+    private static File getSlotFile(int slot) {
+    	File root = Environment.getExternalStorageDirectory();
+		return new File(root, Constants.FILENAME_SAVEGAME_SLOT + slot);
+    }
+	
+	private static void saveWorld(WorldContext world, OutputStream outStream, String displayInfo) throws IOException {
+    	DataOutputStream dest = new DataOutputStream(outStream);
+    	final int flags = 0;
+    	FileHeader.writeToParcel(dest, world.model.player.traits.name, displayInfo);
+    	world.maps.writeToParcel(dest, flags);
+    	world.model.writeToParcel(dest, flags);
+    	dest.close();
+    }
+    private static int loadWorld(WorldContext world, InputStream inState) throws IOException {
+    	DataInputStream src = new DataInputStream(inState);
+    	final FileHeader header = new FileHeader(src);
+    	if (header.fileversion > AndorsTrailApplication.CURRENT_VERSION) return LOAD_RESULT_FUTURE_VERSION;
+    	
+    	world.maps.readFromParcel(src, world, header.fileversion);
+    	world.model = new ModelContainer(src, world, header.fileversion);
+    	src.close();
+    	
+    	MovementController.moveBlockedActors(world);
+    	
+    	return LOAD_RESULT_SUCCESS;
+    }
+    
+	public static FileHeader quickload(Context androidContext, int slot) {
+		try {
+			if (slot != SLOT_QUICKSAVE) {
+				File f = getSlotFile(slot);
+				if (!f.exists()) return null;
+			}
+			FileInputStream fos = getInputFile(androidContext, slot);
+	    	DataInputStream src = new DataInputStream(fos);
+	    	final FileHeader header = new FileHeader(src);
+	    	src.close();
+	    	fos.close();
+	    	return header;
+		} catch (Exception e) {
+			return null;
+		}
+	}
+	
+	public static final class FileHeader {
+		public final int fileversion;
+		public final String playerName;
+		public final String displayInfo;
+		
+		public FileHeader(String playerName, String displayInfo) {
+			this.fileversion = AndorsTrailApplication.CURRENT_VERSION;
+			this.playerName = playerName;
+			this.displayInfo = displayInfo;
+		}
+		
+		public String describe() {
+			return playerName + ", " + displayInfo;
+		}
+
+			
+		// ====== PARCELABLE ===================================================================
+
+		public FileHeader(DataInputStream src) throws IOException {
+			int fileversion = src.readInt();
+	    	if (fileversion == 11) fileversion = 5; // Fileversion 5 had no version identifier, but the first byte was 11.
+	    	this.fileversion = fileversion;
+	    	if (fileversion >= 14) { // Before fileversion 14 (0.6.7), we had no file header.
+	    		this.playerName = src.readUTF();
+	    		this.displayInfo = src.readUTF();
+	    	} else {
+	    		this.playerName = null;
+	    		this.displayInfo = null;
+	    	}
+		}
+		
+		public static void writeToParcel(DataOutputStream dest, String playerName, String displayInfo) throws IOException {
+			dest.writeInt(AndorsTrailApplication.CURRENT_VERSION);
+	    	dest.writeUTF(playerName);
+	    	dest.writeUTF(displayInfo);
+		}
+	}
+}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/WorldSetup.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/WorldSetup.java
index 3a3d6ae0b..603cbd2d6 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/WorldSetup.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/WorldSetup.java
@@ -1,23 +1,16 @@
 package com.gpl.rpg.AndorsTrail;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
 import java.lang.ref.WeakReference;
 
 import android.content.Context;
 import android.content.res.Resources;
 import android.os.AsyncTask;
 
-import com.gpl.rpg.AndorsTrail.activity.Preferences;
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
 import com.gpl.rpg.AndorsTrail.controller.Controller;
 import com.gpl.rpg.AndorsTrail.controller.MovementController;
 import com.gpl.rpg.AndorsTrail.model.ModelContainer;
 import com.gpl.rpg.AndorsTrail.resource.ResourceLoader;
-import com.gpl.rpg.AndorsTrail.util.L;
 
 public final class WorldSetup {
 	
@@ -28,8 +21,10 @@ public final class WorldSetup {
 	private WeakReference<OnSceneLoadedListener> listener;
 
 	public boolean createNewCharacter = false;
+	public int loadFromSlot = Savegames.SLOT_QUICKSAVE;
 	public boolean isSceneReady = false;
 	public String newHeroName;
+	private int loadResult;
 	
 	public WorldSetup(WorldContext world, Context androidContext) {
 		this.world = world;
@@ -77,13 +72,15 @@ public final class WorldSetup {
 		(new AsyncTask<Void, Void, Void>() {
 			@Override
 			protected Void doInBackground(Void... arg0) {
+				if (world.model != null) world.reset();
 				if (createNewCharacter) {
 					createNewWorld();
+					loadResult = Savegames.LOAD_RESULT_SUCCESS;
 				} else {
-					continueWorld();
+					loadResult = continueWorld();
 				}
-		    	Preferences.read(androidContext.get(), world.model.uiSelections);
-				return null;
+				createNewCharacter = false;
+		    	return null;
 			}
 
 			@Override
@@ -94,17 +91,20 @@ public final class WorldSetup {
 				OnSceneLoadedListener o = listener.get();
 				listener = null;
 				if (o == null) return;
-				o.onSceneLoaded();
+				if (loadResult == Savegames.LOAD_RESULT_SUCCESS) {
+					o.onSceneLoaded();
+				} else {
+					o.onSceneLoadFailed(loadResult);
+				}
 			}
         }).execute();
 	}
 	
-	private void continueWorld() {
-		loadWorld(world, androidContext.get());
+	private int continueWorld() {
+		return Savegames.loadWorld(world, androidContext.get(), loadFromSlot);
 	}
 	
 	private void createNewWorld() {
-		if (world.model != null) world.reset();
 		world.model = new ModelContainer();
 		world.model.player.initializeNewPlayer(world.itemTypes, world.dropLists, newHeroName);
 		Controller.playerRested(world);
@@ -114,35 +114,6 @@ public final class WorldSetup {
 
     public interface OnSceneLoadedListener {
     	void onSceneLoaded();
-    }
-    
-    private static final String FILENAME_SAVEGAME = "savegame";
-    public static void saveWorld(WorldContext world, Context androidContext) {
-    	try {
-	    	FileOutputStream fos = androidContext.openFileOutput(FILENAME_SAVEGAME, Context.MODE_PRIVATE);
-	    	DataOutputStream dest = new DataOutputStream(fos);
-	    	final int flags = 0;
-	    	dest.writeInt(AndorsTrailApplication.CURRENT_VERSION);
-	    	world.maps.writeToParcel(dest, flags);
-	    	world.model.writeToParcel(dest, flags);
-	    	dest.close();
-	    	fos.close();
-    	} catch (IOException e) {
-    		L.log("Error saving world: " + e.toString());
-    	}
-    }
-    private static void loadWorld(WorldContext world, Context androidContext) {
-    	try {
-	    	FileInputStream fos = androidContext.openFileInput(FILENAME_SAVEGAME);
-	    	DataInputStream src = new DataInputStream(fos);
-	    	int fileversion = src.readInt();
-	    	if (fileversion == 11) fileversion = 5;
-	    	world.maps.readFromParcel(src, world, fileversion);
-	    	world.model = new ModelContainer(src, world, fileversion);
-	    	src.close();
-	    	fos.close();
-    	} catch (IOException e) {
-    		L.log("Error loading world: " + e.toString());
-    	}
+    	void onSceneLoadFailed(int loadResult);
     }
 }
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/AboutActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/AboutActivity.java
index c766fdd92..e2e172b30 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/AboutActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/AboutActivity.java
@@ -13,14 +13,15 @@ import android.widget.TextView;
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.R;
 
-public class AboutActivity extends Activity {
+public final class AboutActivity extends Activity {
 	
 	/** Called when the activity is first created. */
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         
-        AndorsTrailApplication.setWindowParameters(this);
+        AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
+        AndorsTrailApplication.setWindowParameters(this, app.preferences);
         
         setContentView(R.layout.about);
     	final Resources res = getResources();
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java
index 5c66e665d..6ec820184 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java
@@ -21,12 +21,14 @@ import com.gpl.rpg.AndorsTrail.conversation.Phrase.Reply;
 import com.gpl.rpg.AndorsTrail.model.actor.Monster;
 import com.gpl.rpg.AndorsTrail.model.actor.MonsterType;
 import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.model.item.Loot;
 
 public final class ConversationActivity extends Activity {
 	public static final int RESULT_ATTACK = Activity.RESULT_FIRST_USER + 1;
 	
 	private WorldContext world;
 	private Player player;
+	private String phraseID;
 	
 	private TextView text;
 	private Button reply1;
@@ -45,7 +47,10 @@ public final class ConversationActivity extends Activity {
         
         Uri uri = getIntent().getData();
         final int monsterTypeID = Integer.parseInt(uri.getQueryParameter("monsterTypeID"));
-        final String phraseID = uri.getLastPathSegment().toString(); 
+        String phraseID = uri.getLastPathSegment().toString(); 
+        if (savedInstanceState != null) {
+        	phraseID = savedInstanceState.getString("phraseID");
+        }
         
         monsterType = world.monsterTypes.getMonsterType(monsterTypeID);
         
@@ -72,6 +77,7 @@ public final class ConversationActivity extends Activity {
     }
     
 	public void setPhrase(String phraseID) {
+		this.phraseID = phraseID;
     	if (phraseID.equalsIgnoreCase(ConversationCollection.PHRASE_CLOSE)) {
     		ConversationActivity.this.finish();
     		return;
@@ -89,7 +95,7 @@ public final class ConversationActivity extends Activity {
     	}
     	
     	final Phrase phrase = world.conversations.getPhrase(phraseID);
-    	ConversationController.applyPhraseEffect(player, phrase);
+    	Loot loot = ConversationController.applyPhraseEffect(player, phrase, world.quests);
     	
     	if (phrase.message == null || phrase.message.length() <= 0) {
     		for (Reply r : phrase.replies) {
@@ -100,16 +106,23 @@ public final class ConversationActivity extends Activity {
     	}
     	
     	String message = phrase.message;
-    	if (phrase.rewardGold != 0 || phrase.rewardExperience > 0) {
+    	if (loot != null && !loot.isEmpty()) {
     		message += "\n";
-	    	if (phrase.rewardExperience > 0) {
-	    		message += "\n" + getResources().getString(R.string.conversation_rewardexp, phrase.rewardExperience);
+	    	if (loot.exp > 0) {
+	    		message += "\n" + getResources().getString(R.string.conversation_rewardexp, loot.exp);
 	    	}
-	    	if (phrase.rewardGold > 0) {
-	    		message += "\n" + getResources().getString(R.string.conversation_rewardgold, phrase.rewardGold);
+	    	if (loot.gold > 0) {
+	    		message += "\n" + getResources().getString(R.string.conversation_rewardgold, loot.gold);
+	    	} else if (loot.gold < 0) {
+	    		message += "\n" + getResources().getString(R.string.conversation_lostgold, -loot.gold);
 	    	}
-	    	if (phrase.rewardGold < 0) {
-	    		message += "\n" + getResources().getString(R.string.conversation_lostgold, -phrase.rewardGold);
+	    	if (!loot.items.isEmpty()) {
+	    		final int len = loot.items.countItems();
+	    		if (len == 1) {
+	    			message += "\n" + getResources().getString(R.string.conversation_rewarditem);
+	    		} else {
+	    			message += "\n" + getResources().getString(R.string.conversation_rewarditems, len);
+	    		}
 	    	}
     	}
 
@@ -123,13 +136,13 @@ public final class ConversationActivity extends Activity {
     	if (p.replies.length <= replyIndex) {
     		b.setVisibility(View.GONE);
     		return;
-    	} 
+    	}
 
     	final Reply r = p.replies[replyIndex];
 		if (!ConversationController.canSelectReply(player, r)) {
 			b.setVisibility(View.GONE);
 			return;
-    	} 
+    	}
 
 		b.setVisibility(View.VISIBLE);
 		b.setText(r.text);
@@ -151,4 +164,9 @@ public final class ConversationActivity extends Activity {
 			break;
 		}
 	}
+    
+    @Override
+	public void onSaveInstanceState(Bundle outState) {
+    	outState.putString("phraseID", phraseID);
+    }
 }
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/HeroinfoActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/HeroinfoActivity.java
index 0d0294690..69df61f72 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/HeroinfoActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/HeroinfoActivity.java
@@ -32,7 +32,7 @@ import android.widget.TextView;
 import android.widget.AdapterView.AdapterContextMenuInfo;
 import android.widget.AdapterView.OnItemClickListener;
 
-public class HeroinfoActivity extends TabActivity {
+public final class HeroinfoActivity extends TabActivity {
 	private WorldContext world;
 	private ViewContext view;
 
@@ -41,6 +41,7 @@ public class HeroinfoActivity extends TabActivity {
 
 	private ListView inventoryList;
 	private Button levelUpButton;
+	private Button questsButton;
     private TextView heroinfo_ap;
     private TextView heroinfo_movecost;
     private TraitsInfoView heroinfo_basetraits;
@@ -64,7 +65,7 @@ public class HeroinfoActivity extends TabActivity {
         this.world = app.world;
         this.view = app.currentView.get();
         
-        AndorsTrailApplication.setWindowParameters(this, world.model.uiSelections.fullscreen);
+        AndorsTrailApplication.setWindowParameters(this, app.preferences);
         
         this.player = world.model.player;
         
@@ -118,6 +119,18 @@ public class HeroinfoActivity extends TabActivity {
 			@Override
 			public void onClick(View arg0) {
 				Dialogs.showLevelUp(HeroinfoActivity.this);
+				// We disable the button temporarily, so that there is no possibility 
+				//  of clicking it again before the levelup activity has started.
+				// See issue:
+				//  http://code.google.com/p/andors-trail/issues/detail?id=42
+				levelUpButton.setEnabled(false);
+			}
+		});
+        questsButton = (Button) findViewById(R.id.heroinfo_quests);
+        questsButton.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View arg0) {
+				Dialogs.showQuestLog(HeroinfoActivity.this);
 			}
 		});
         
@@ -137,13 +150,14 @@ public class HeroinfoActivity extends TabActivity {
     }
 
 	private void setWearSlot(final int inventorySlot, int viewId, int resourceId) {
-    	ImageView view = (ImageView) findViewById(viewId);
+    	final ImageView view = (ImageView) findViewById(viewId);
     	wornItemImage[inventorySlot] = view;
     	defaultWornItemImageResourceIDs[inventorySlot] = resourceId;
     	view.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View v) {
 				if (player.inventory.isEmptySlot(inventorySlot)) return;
+				view.setClickable(false); // Will be enabled again on update()
 				showEquippedItemInfo(player.inventory.wear[inventorySlot], inventorySlot);
 			}
     	});
@@ -160,7 +174,7 @@ public class HeroinfoActivity extends TabActivity {
 		super.onActivityResult(requestCode, resultCode, data);
 		switch (requestCode) {
 		case MainActivity.INTENTREQUEST_ITEMINFO:
-			if (resultCode != RESULT_OK) return;
+			if (resultCode != RESULT_OK) break;
 			
 			ItemType itemType = world.itemTypes.getItemType(data.getExtras().getInt("itemTypeID"));
 			int actionType = data.getExtras().getInt("actionType");
@@ -215,6 +229,7 @@ public class HeroinfoActivity extends TabActivity {
 		} else {
 			view.setImageResource(resourceIDEmptyImage);
 		}
+		view.setClickable(true);
 	}
 
 	private void updateItemList() {
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ItemInfoActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ItemInfoActivity.java
index b90978bea..0d268a883 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ItemInfoActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ItemInfoActivity.java
@@ -33,7 +33,7 @@ public final class ItemInfoActivity extends Activity {
         AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
         this.world = app.world;
         
-        AndorsTrailApplication.setWindowParameters(this, world.model.uiSelections.fullscreen);
+        AndorsTrailApplication.setWindowParameters(this, app.preferences);
         
         final Intent intent = getIntent();
         Bundle params = intent.getExtras();
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LevelUpActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LevelUpActivity.java
index a90a83ce0..d918fc13a 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LevelUpActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LevelUpActivity.java
@@ -13,7 +13,7 @@ import android.widget.TextView;
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.R;
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
-import com.gpl.rpg.AndorsTrail.controller.Controller;
+import com.gpl.rpg.AndorsTrail.controller.Constants;
 import com.gpl.rpg.AndorsTrail.model.actor.Player;
 
 public final class LevelUpActivity extends Activity {
@@ -37,42 +37,7 @@ public final class LevelUpActivity extends Activity {
         img.setImageBitmap(world.tileStore.bitmaps[player.traits.iconID]);
         TextView tv = (TextView) findViewById(R.id.levelup_description);
         tv.setText(res.getString(R.string.levelup_description, player.level+1));
-        
-        /*
-        ArrayList<LevelUpSelection> items = new ArrayList<LevelUpSelection>();
-        items.add(
-    		new LevelUpSelection(
-        		SELECT_HEALTH
-        		, res.getString(R.string.levelup_add_health)
-        		, res.getString(R.string.levelup_add_health_description, LEVELUP_EFFECT_HEALTH)
-        	)
-        );
-        items.add(
-    		new LevelUpSelection(
-				SELECT_ATK_CH
-        		, res.getString(R.string.levelup_add_attackchance)
-        		, res.getString(R.string.levelup_add_attackchance_description, LEVELUP_EFFECT_ATK_CH)
-        	)
-        );
-        items.add(
-    		new LevelUpSelection(
-				SELECT_ATK_DMG
-        		, res.getString(R.string.levelup_add_attackdamage)
-        		, res.getString(R.string.levelup_add_attackdamage_description, LEVELUP_EFFECT_ATK_DMG)
-        	)
-        );
-        items.add(
-    		new LevelUpSelection(
-    				SELECT_DEF_CH
-        		, res.getString(R.string.levelup_add_blockchance)
-        		, res.getString(R.string.levelup_add_blockchance_description, LEVELUP_EFFECT_DEF_CH)
-        	)
-        );
-        
-        ListView lv = (ListView) findViewById(R.id.levelup_list);
-        lv.setAdapter(new LevelUpSelectionAdapter(this, items));
-        */
-        
+
         Button b;
         
         b = (Button) findViewById(R.id.levelup_add_health);
@@ -82,7 +47,7 @@ public final class LevelUpActivity extends Activity {
 				levelup(SELECT_HEALTH);
 			}
 		});
-        b.setText(getString(R.string.levelup_add_health, Controller.LEVELUP_EFFECT_HEALTH));
+        b.setText(getString(R.string.levelup_add_health, Constants.LEVELUP_EFFECT_HEALTH));
         
         b = (Button) findViewById(R.id.levelup_add_attackchance);
         b.setOnClickListener(new OnClickListener() {
@@ -91,7 +56,7 @@ public final class LevelUpActivity extends Activity {
 				levelup(SELECT_ATK_CH);
 			}
 		});
-        b.setText(getString(R.string.levelup_add_attackchance, Controller.LEVELUP_EFFECT_ATK_CH));
+        b.setText(getString(R.string.levelup_add_attackchance, Constants.LEVELUP_EFFECT_ATK_CH));
         
         b = (Button) findViewById(R.id.levelup_add_attackdamage);
         b.setOnClickListener(new OnClickListener() {
@@ -100,7 +65,7 @@ public final class LevelUpActivity extends Activity {
 				levelup(SELECT_ATK_DMG);
 			}
 		});
-        b.setText(getString(R.string.levelup_add_attackdamage, Controller.LEVELUP_EFFECT_ATK_DMG));
+        b.setText(getString(R.string.levelup_add_attackdamage, Constants.LEVELUP_EFFECT_ATK_DMG));
         
         b = (Button) findViewById(R.id.levelup_add_blockchance);
         b.setOnClickListener(new OnClickListener() {
@@ -109,7 +74,7 @@ public final class LevelUpActivity extends Activity {
 				levelup(SELECT_DEF_CH);
 			}
 		});
-        b.setText(getString(R.string.levelup_add_blockchance, Controller.LEVELUP_EFFECT_DEF_CH));
+        b.setText(getString(R.string.levelup_add_blockchance, Constants.LEVELUP_EFFECT_DEF_CH));
     }
 
     private static final int SELECT_HEALTH = 0;
@@ -125,70 +90,23 @@ public final class LevelUpActivity extends Activity {
     private static void addLevelupEffect(Player player, int selectionID) {
     	switch (selectionID) {
     	case SELECT_HEALTH:
-    		player.health.max += Controller.LEVELUP_EFFECT_HEALTH;
-    		player.traits.maxHP += Controller.LEVELUP_EFFECT_HEALTH;
-    		player.health.current += Controller.LEVELUP_EFFECT_HEALTH;
+    		player.health.max += Constants.LEVELUP_EFFECT_HEALTH;
+    		player.traits.maxHP += Constants.LEVELUP_EFFECT_HEALTH;
+    		player.health.current += Constants.LEVELUP_EFFECT_HEALTH;
     		break;
     	case SELECT_ATK_CH:
-    		player.traits.baseCombatTraits.attackChance += Controller.LEVELUP_EFFECT_ATK_CH;
+    		player.traits.baseCombatTraits.attackChance += Constants.LEVELUP_EFFECT_ATK_CH;
     		break;
     	case SELECT_ATK_DMG:
-    		player.traits.baseCombatTraits.damagePotential.max += Controller.LEVELUP_EFFECT_ATK_DMG;
-    		player.traits.baseCombatTraits.damagePotential.current += Controller.LEVELUP_EFFECT_ATK_DMG;
+    		player.traits.baseCombatTraits.damagePotential.max += Constants.LEVELUP_EFFECT_ATK_DMG;
+    		player.traits.baseCombatTraits.damagePotential.current += Constants.LEVELUP_EFFECT_ATK_DMG;
     		break;
     	case SELECT_DEF_CH:
-    		player.traits.baseCombatTraits.blockChance += Controller.LEVELUP_EFFECT_DEF_CH;
+    		player.traits.baseCombatTraits.blockChance += Constants.LEVELUP_EFFECT_DEF_CH;
     		break;
     	}
     	player.level++;
     	player.recalculateLevelExperience();
     	player.recalculateCombatTraits();
     }
-    
-    /*
-    private static final class LevelUpSelection {
-    	public final int id;
-    	public final String title;
-    	public final String description;
-		public LevelUpSelection(int id, String title, String description) {
-			this.id = id;
-			this.title = title;
-			this.description = description;
-		}
-    }
-    
-    private final class LevelUpSelectionAdapter extends ArrayAdapter<LevelUpSelection> {
-    	public LevelUpSelectionAdapter(Context context, List<LevelUpSelection> items) {
-    		super(context, 0, items);
-    	}
-
-    	@Override
-    	public View getView(final int position, View convertView, ViewGroup parent) {
-    		final LevelUpSelection item = getItem(position);
-    		
-    		View result = convertView;
-    		if (result == null) {
-    			result = View.inflate(getContext(), R.layout.levelupitemview, null);
-    		}
-    		
-    		TextView tv = (TextView) result.findViewById(R.id.levelupitem_title);
-    		tv.setText(item.title);
-    		//tv = (TextView) result.findViewById(R.id.levelupitem_description);
-    		//tv.setText(item.description);
-    		
-    		((Button) result.findViewById(R.id.levelupitem_button)).setOnClickListener(new OnClickListener() {
-    			@Override
-    			public void onClick(View arg0) {
-    				levelup(item.id);
-    			}
-    		});
-    		return result;
-    	}
-    	
-    	@Override
-    	public long getItemId(int position) {
-    		return getItem(position).id;
-    	}
-    }
-*/
 }
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LoadSaveActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LoadSaveActivity.java
new file mode 100644
index 000000000..6384d022a
--- /dev/null
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LoadSaveActivity.java
@@ -0,0 +1,78 @@
+package com.gpl.rpg.AndorsTrail.activity;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.view.Window;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.Savegames;
+import com.gpl.rpg.AndorsTrail.Savegames.FileHeader;
+
+public final class LoadSaveActivity extends Activity {
+	private boolean isLoading = true;
+	
+    /** Called when the activity is first created. */
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        
+        requestWindowFeature(Window.FEATURE_NO_TITLE);
+        
+        String loadsave = getIntent().getData().getLastPathSegment().toString();
+        isLoading = (loadsave.equalsIgnoreCase("load"));
+                
+        setContentView(R.layout.loadsave);
+    	
+        ImageView img = (ImageView) findViewById(R.id.loadsave_image);
+        TextView tv = (TextView) findViewById(R.id.loadsave_title);
+        if (isLoading) {
+        	img.setImageResource(android.R.drawable.ic_menu_search);
+        	tv.setText(R.string.loadsave_title_load);
+        } else {
+        	img.setImageResource(android.R.drawable.ic_menu_save);
+        	tv.setText(R.string.loadsave_title_save);
+        }
+        
+        handleSlotButton(R.id.loadsave_slot_1, 1);
+        handleSlotButton(R.id.loadsave_slot_2, 2);
+        handleSlotButton(R.id.loadsave_slot_3, 3);
+        handleSlotButton(R.id.loadsave_slot_4, 4);
+    }
+    
+    private void handleSlotButton(int resId, final int slot) {
+    	final Button b = (Button) findViewById(resId);
+        b.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View arg0) {
+				loadsave(slot);
+			}
+		});
+        final FileHeader header = Savegames.quickload(this, slot);
+        final boolean exists = (header != null);
+        if (isLoading) {
+        	b.setEnabled(exists);
+        } else {
+        	b.setEnabled(true);
+        }
+        String s = slot + ". ";
+        if (header != null) {
+        	s += header.describe();
+        } else {
+        	s += getString(R.string.loadsave_slot_empty);
+        }
+        b.setText(s);
+	}
+    
+	public void loadsave(int slot) {
+    	Intent i = new Intent();
+    	i.putExtra("slot", slot);
+    	setResult(Activity.RESULT_OK, i);
+    	LoadSaveActivity.this.finish();
+    }
+}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LoadingActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LoadingActivity.java
index 04b3fa000..0df588cee 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LoadingActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LoadingActivity.java
@@ -1,29 +1,34 @@
 package com.gpl.rpg.AndorsTrail.activity;
 
 import android.app.Activity;
+import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.ProgressDialog;
+import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.DialogInterface.OnDismissListener;
 import android.os.Bundle;
 
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.Savegames;
 import com.gpl.rpg.AndorsTrail.WorldSetup.OnSceneLoadedListener;
 import com.gpl.rpg.AndorsTrail.util.L;
 
-public class LoadingActivity extends Activity implements OnSceneLoadedListener {
+public final class LoadingActivity extends Activity implements OnSceneLoadedListener {
 
     private static final int DIALOG_LOADING = 1;
+    private static final int DIALOG_LOADING_FAILED = 2;
+    private static final int DIALOG_LOADING_WRONGVERSION = 3;
 
 	@Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        AndorsTrailApplication.setWindowParameters(this, Preferences.shouldUseFullscreen(this));
+        AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
+        AndorsTrailApplication.setWindowParameters(this, app.preferences);
         
         L.log("LoadingActivity::onCreate");
         
-        AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
-        
         showDialog(DIALOG_LOADING);
         app.setup.startCharacterSetup(this);
     }
@@ -32,14 +37,38 @@ public class LoadingActivity extends Activity implements OnSceneLoadedListener {
 	public void onSceneLoaded() {
     	L.log("LoadingActivity::onSceneLoaded");
         
-    	AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
-    	app.setup.createNewCharacter = false;
     	removeDialog(DIALOG_LOADING);
-    	
     	startActivity(new Intent(this, MainActivity.class));
     	this.finish();
 	}
+	
+	@Override
+	public void onSceneLoadFailed(int loadResult) {
+    	L.log("LoadingActivity::onSceneLoadFailed");
+        
+    	removeDialog(DIALOG_LOADING);
+    	if (loadResult == Savegames.LOAD_RESULT_FUTURE_VERSION) {
+    		showDialog(DIALOG_LOADING_WRONGVERSION);	
+    	} else {
+    		showDialog(DIALOG_LOADING_FAILED);
+    	}
+	}
 
+	private Dialog createLoadingFailedDialog(int messageResourceID) {
+		Dialog d = new AlertDialog.Builder(this)
+	        .setTitle(R.string.dialog_loading_failed_title)
+	        .setMessage(messageResourceID)
+	        .setNeutralButton(android.R.string.ok, null)
+	        .create();
+	    d.setOnDismissListener(new OnDismissListener() {
+			@Override
+			public void onDismiss(DialogInterface dialog) {
+				LoadingActivity.this.finish();
+			}
+		});
+	    return d;
+	}
+	
     @Override
     protected Dialog onCreateDialog(final int id) {
         switch(id) {
@@ -49,6 +78,10 @@ public class LoadingActivity extends Activity implements OnSceneLoadedListener {
             dialog.setIndeterminate(true);
             dialog.setCancelable(false);
             return dialog;
+        case DIALOG_LOADING_FAILED:
+        	return createLoadingFailedDialog(R.string.dialog_loading_failed_message); 
+        case DIALOG_LOADING_WRONGVERSION:
+        	return createLoadingFailedDialog(R.string.dialog_loading_failed_incorrectversion); 
         }
         return super.onCreateDialog(id);
     }
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java
index 0578536b7..4d0ed8cf0 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java
@@ -2,15 +2,17 @@ package com.gpl.rpg.AndorsTrail.activity;
 
 import java.lang.ref.WeakReference;
 
+import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
 import com.gpl.rpg.AndorsTrail.Dialogs;
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.R;
-import com.gpl.rpg.AndorsTrail.WorldSetup;
+import com.gpl.rpg.AndorsTrail.Savegames;
 import com.gpl.rpg.AndorsTrail.context.ViewContext;
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
-import com.gpl.rpg.AndorsTrail.model.ModelContainer;
+import com.gpl.rpg.AndorsTrail.controller.CombatController;
 import com.gpl.rpg.AndorsTrail.model.actor.Monster;
 import com.gpl.rpg.AndorsTrail.model.actor.MonsterType;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
 import com.gpl.rpg.AndorsTrail.util.Coord;
 import com.gpl.rpg.AndorsTrail.util.L;
 import com.gpl.rpg.AndorsTrail.view.CombatView;
@@ -19,7 +21,6 @@ import com.gpl.rpg.AndorsTrail.view.StatusView;
 
 import android.app.Activity;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -31,7 +32,7 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
-public class MainActivity extends Activity {
+public final class MainActivity extends Activity {
 
     public static final int INTENTREQUEST_HEROINFO = 1;
     public static final int INTENTREQUEST_MONSTERENCOUNTER = 2;
@@ -40,6 +41,7 @@ public class MainActivity extends Activity {
     public static final int INTENTREQUEST_SHOP = 5;
     public static final int INTENTREQUEST_LEVELUP = 6;
     public static final int INTENTREQUEST_PREFERENCES = 7;
+    public static final int INTENTREQUEST_SAVEGAME = 8;
 	
     private ViewContext view;
     private WorldContext world;
@@ -51,6 +53,7 @@ public class MainActivity extends Activity {
 	private static final int NUM_MESSAGES = 3;
 	private final String[] messages = new String[NUM_MESSAGES];
 	private TextView statusText;
+	public WeakReference<Toast> lastToast = null;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -62,7 +65,7 @@ public class MainActivity extends Activity {
         this.world = app.world;
         this.view = new ViewContext(app, this);
     	app.currentView = new WeakReference<ViewContext>(this.view);
-    	AndorsTrailApplication.setWindowParameters(this, world.model.uiSelections.fullscreen);
+    	AndorsTrailApplication.setWindowParameters(this, app.preferences);
         
         setContentView(R.layout.main);
         mainview = (MainView) findViewById(R.id.main_mainview);
@@ -78,13 +81,6 @@ public class MainActivity extends Activity {
 		});
 		clearMessages();
 		
-        if (world.model.uiSelections.isInCombat) {
-        	view.combatController.enterCombat();
-        	view.combatController.setCombatSelection(world.model.uiSelections.selectedMonster, world.model.uiSelections.selectedPosition);
-        }
-
-        view.controller.resume();
-        
         if (AndorsTrailApplication.DEVELOPMENT_DEBUGBUTTONS) {
         	addDebugButtons(new DebugButton[] {
     			new DebugButton("Add monster", new OnClickListener() {
@@ -105,12 +101,14 @@ public class MainActivity extends Activity {
 		    			world.model.player.traits.damagePotential.set(99, 99);
 		    			world.model.player.traits.attackChance = 200;
 		    			world.model.player.traits.attackCost = 1;
+		    			world.model.player.health.add(100, false);
 		    			Toast.makeText(MainActivity.this, "DEBUG: damagePotential=99, chance=200%, cost=1", Toast.LENGTH_SHORT).show();
 					}
 				})
     			,new DebugButton("dmg=1", new OnClickListener() {
 		    		@Override
 					public void onClick(View arg0) {
+		    			world.model.player.recalculateCombatTraits();
 		    			world.model.player.traits.damagePotential.set(1, 1);
 		    			Toast.makeText(MainActivity.this, "DEBUG: damagePotential=1", Toast.LENGTH_SHORT).show();
 					}
@@ -142,7 +140,7 @@ public class MainActivity extends Activity {
 			break;
 		case INTENTREQUEST_MONSTERENCOUNTER:
 			if (resultCode == Activity.RESULT_OK) {
-				view.combatController.enterCombat();
+				view.combatController.enterCombat(CombatController.BEGIN_TURN_PLAYER);
 			} else {
 				view.combatController.exitCombat(false);
 			}
@@ -153,20 +151,34 @@ public class MainActivity extends Activity {
 				Monster m = world.model.currentMap.getMonsterAt(p);
 				if (m != null) {
 			    	view.combatController.setCombatSelection(m, p);
-					view.combatController.enterCombat();
+					view.combatController.enterCombat(CombatController.BEGIN_TURN_PLAYER);
 				} else {
 					//Shouldn't happen.
 				}
 			}
 			break;
 		case INTENTREQUEST_PREFERENCES:
-			Preferences.read(this, world.model.uiSelections);
+			AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
+	        AndorsTrailPreferences.read(this, app.preferences);
+			break;
+		case INTENTREQUEST_SAVEGAME:
+			if (resultCode != Activity.RESULT_OK) break;
+			final int slot = data.getIntExtra("slot", 1);
+			if (save(slot)) {
+				Toast.makeText(this, getResources().getString(R.string.menu_save_gamesaved, slot), Toast.LENGTH_SHORT).show();
+			} else {
+				Toast.makeText(this, R.string.menu_save_failed, Toast.LENGTH_LONG).show();
+			}
 			break;
 		}
-		mainview.inhibitClicks = false;
 	}
     
-    private class DebugButton {
+    private boolean save(int slot) {
+    	final Player player = world.model.player;
+    	return Savegames.saveWorld(world, this, slot, getString(R.string.savegame_currenthero_displayinfo, player.level, player.totalExperience, player.inventory.gold));
+	}
+
+	private class DebugButton {
     	public final String text;
     	public final OnClickListener listener;
 		public DebugButton(String text, OnClickListener listener) {
@@ -207,21 +219,7 @@ public class MainActivity extends Activity {
         L.log("onPause");
         view.controller.pause();
         
-        SharedPreferences p = getSharedPreferences(ModelContainer.PREFERENCE_MODEL_QUICKSAVE, MODE_PRIVATE);
-        SharedPreferences.Editor e = p.edit();
-        world.model.quicksave(e);
-        e.commit();
-        
-        WorldSetup.saveWorld(world, getApplicationContext());
-        /*
-        Bundle b = new Bundle();
-    	b.putParcelable(ModelContainer.PREFERENCE_MODEL_SAVE, world.model);
-    	onSaveInstanceState(b);
-    	p = getSharedPreferences(ModelContainer.PREFERENCE_MODEL_SAVE, MODE_PRIVATE);
-        e = p.edit();
-        world.model.save(e);
-        e.commit();
-        */
+        save(Savegames.SLOT_QUICKSAVE);
     	
         //Debug.stopMethodTracing();
     }
@@ -233,6 +231,11 @@ public class MainActivity extends Activity {
         if (!AndorsTrailApplication.getApplicationFromActivity(this).setup.isSceneReady) return;
 
         view.controller.resume();
+
+        if (world.model.uiSelections.isInCombat) {
+        	view.combatController.setCombatSelection(world.model.uiSelections.selectedMonster, world.model.uiSelections.selectedPosition);
+        	view.combatController.enterCombat(CombatController.BEGIN_TURN_CONTINUE);
+        }
     }
 
 	@Override
@@ -247,15 +250,15 @@ public class MainActivity extends Activity {
 				return true;
 			}
 		});
-		menu.add(R.string.menu_pause)
-		.setIcon(android.R.drawable.ic_media_pause)
+		menu.add(R.string.menu_save)
+		.setIcon(android.R.drawable.ic_menu_save)
 		.setOnMenuItemClickListener(new OnMenuItemClickListener() {
 			@Override
 			public boolean onMenuItemClick(MenuItem arg0) {
-				Dialogs.showPaused(MainActivity.this, view);
+				Dialogs.showSave(MainActivity.this, view);
 				return true;
 			}
-		}).setEnabled(false);
+		});
 		menu.add(R.string.menu_settings)
 		.setIcon(android.R.drawable.ic_menu_preferences)
 		.setOnMenuItemClickListener(new OnMenuItemClickListener() {
@@ -268,12 +271,6 @@ public class MainActivity extends Activity {
 		return true;
 	}
 	
-	@Override
-	public boolean onPrepareOptionsMenu(Menu menu) {
-		menu.getItem(1).setEnabled(world.model.uiSelections.isTicking);
-		return super.onPrepareOptionsMenu(menu);
-	}
-	
 	public void redrawAll(int why) {
 		this.mainview.redrawAll(why);
 	}
@@ -301,4 +298,17 @@ public class MainActivity extends Activity {
 		statusText.setVisibility(View.GONE);
 	}
 
+	public void showToast(String msg, int duration) {
+		Toast t = null;
+		if (lastToast != null) t = lastToast.get();
+		if (t == null) {
+			t = Toast.makeText(this, msg, duration);
+			lastToast = new WeakReference<Toast>(t);
+		} else {
+			t.setText(msg);
+			t.setDuration(duration);
+		}
+		t.show();
+	}
+
 }
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MonsterEncounterActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MonsterEncounterActivity.java
index 5bdcdd60e..b00c02032 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MonsterEncounterActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MonsterEncounterActivity.java
@@ -19,7 +19,6 @@ import com.gpl.rpg.AndorsTrail.model.actor.MonsterType;
 public final class MonsterEncounterActivity extends Activity {
 	private WorldContext world;
 	
-    /** Called when the activity is first created. */
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MonsterInfoActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MonsterInfoActivity.java
index b83e0463b..5d3739c3c 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MonsterInfoActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MonsterInfoActivity.java
@@ -22,7 +22,6 @@ public final class MonsterInfoActivity extends Activity {
 	private WorldContext world;
 	private MonsterType monsterType;
 	
-    /** Called when the activity is first created. */
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -42,13 +41,6 @@ public final class MonsterInfoActivity extends Activity {
         tv = (TextView) findViewById(R.id.monsterinfo_difficulty);
         tv.setText(getMonsterDifficultyResource(world, monsterType));
 
-        /*
-        tv = (TextView) findViewById(R.id.monsterinfo_apt);
-        tv.setText(Integer.toString(monsterType.getAttacksPerTurn()));
-        tv = (TextView) findViewById(R.id.monsterinfo_mpt);
-        tv.setText(Integer.toString(monsterType.getMovesPerTurn()));
-        */
-        
         Button b = (Button) findViewById(R.id.monsterinfo_close);
         b.setOnClickListener(new OnClickListener() {
 			@Override
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/Preferences.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/Preferences.java
index 54ef072fc..87217fb0a 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/Preferences.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/Preferences.java
@@ -1,42 +1,14 @@
 package com.gpl.rpg.AndorsTrail.activity;
 
 import com.gpl.rpg.AndorsTrail.R;
-import com.gpl.rpg.AndorsTrail.model.InterfaceData;
 
-import android.content.Context;
-import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
-import android.preference.PreferenceManager;
 
-public class Preferences extends PreferenceActivity {
+public final class Preferences extends PreferenceActivity {
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		addPreferencesFromResource(R.xml.preferences);
 	}
-	
-	public static void read(final Context androidContext, InterfaceData dest) {
-		try {
-			SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(androidContext);
-			dest.confirmRest = prefs.getBoolean("confirm_rest", true);
-			dest.confirmAttack = prefs.getBoolean("confirm_attack", true);
-			dest.displayLoot = Integer.parseInt(prefs.getString("display_lootdialog", Integer.toString(InterfaceData.DISPLAYLOOT_DIALOG)));
-			dest.fullscreen = prefs.getBoolean("fullscreen", true);
-		} catch (Exception e) {
-			dest.confirmRest = true;
-			dest.confirmAttack = true;
-			dest.displayLoot = InterfaceData.DISPLAYLOOT_DIALOG;
-			dest.fullscreen = true;
-		}
-	}
-	
-	public static boolean shouldUseFullscreen(final Context androidContext) {
-		try {
-			SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(androidContext);
-			return prefs.getBoolean("fullscreen", true);
-		} catch (Exception e) {
-		}
-		return true;
-	}
 }
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/QuestLogActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/QuestLogActivity.java
new file mode 100644
index 000000000..396b7072a
--- /dev/null
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/QuestLogActivity.java
@@ -0,0 +1,127 @@
+package com.gpl.rpg.AndorsTrail.activity;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.ExpandableListView;
+import android.widget.SimpleExpandableListAdapter;
+import android.widget.Spinner;
+import android.widget.AdapterView.OnItemSelectedListener;
+
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.model.quest.Quest;
+import com.gpl.rpg.AndorsTrail.model.quest.QuestCollection;
+import com.gpl.rpg.AndorsTrail.model.quest.QuestLogEntry;
+
+public final class QuestLogActivity extends Activity {
+	
+	private Spinner questlog_includecompleted;
+	private SimpleExpandableListAdapter questlog_contents_adapter;
+
+	private QuestCollection questCollection;
+	private Player player;
+	
+	private final List<Map<String, ?>> groupList = new ArrayList<Map<String, ?>>();
+	private final List<List<Map<String, ?>>> childList = new ArrayList<List<Map<String,?>>>();
+	
+	@Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        
+        final AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
+        AndorsTrailApplication.setWindowParameters(this, app.preferences);
+        this.questCollection = app.world.quests;
+        this.player = app.world.model.player;
+        
+        setContentView(R.layout.questlog);
+    	
+    	questlog_includecompleted = (Spinner) findViewById(R.id.questlog_includecompleted);
+    	ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(this, R.array.questlog_includecompleted, android.R.layout.simple_spinner_item);
+        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        questlog_includecompleted.setAdapter(adapter);
+        questlog_includecompleted.setOnItemSelectedListener(new OnItemSelectedListener() {
+			@Override
+			public void onItemSelected(AdapterView<?> arg0, View arg1, int arg2, long arg3) {
+				app.world.model.uiSelections.selectedQuestFilter = questlog_includecompleted.getSelectedItemPosition();
+				reloadQuests();
+			}
+
+			@Override
+			public void onNothingSelected(AdapterView<?> arg0) {}
+		});
+    	questlog_includecompleted.setSelection(app.world.model.uiSelections.selectedQuestFilter);
+    	
+    	ExpandableListView questlog_contents = (ExpandableListView) findViewById(R.id.questlog_contents);
+    	questlog_contents_adapter = new SimpleExpandableListAdapter(
+    			this
+    			, groupList 
+    			, android.R.layout.simple_expandable_list_item_2 
+                , new String[] { mn_questName, mn_questStatus }
+                , new int[] { android.R.id.text1, android.R.id.text2 }
+                , childList 
+                , R.layout.questlogentry
+                , new String[] { mn_logText }
+                , new int[] { R.id.questlog_entrytext }
+    		);
+    	questlog_contents.setAdapter(questlog_contents_adapter);
+    	reloadQuests();
+    }
+
+	private static final String mn_questName = "questName";
+	private static final String mn_questStatus = "questStatus";
+	private static final String mn_logText = "logText";
+	
+	private void reloadQuests() {
+		groupList.clear();
+		childList.clear();
+		
+		for (Quest q : questCollection.quests) {
+			if (!q.showInLog) continue; // Do not show
+			if (player.hasAnyQuestProgress(q.questID)) {
+				boolean isCompleted = q.isCompleted(player);
+				
+				int v = questlog_includecompleted.getSelectedItemPosition();
+				if (v == 0) { // Hide completed quests
+					if (isCompleted) continue;
+				} else if (v == 1) { // Include completed quests
+					// Always show.
+				} else if (v == 2) { // Only completed quests
+					if (!isCompleted) continue;
+				}
+				
+	            int statusResId;
+	    		if (isCompleted) {
+	    			statusResId = R.string.questlog_queststatus_completed;
+	    		} else {
+	    			statusResId = R.string.questlog_queststatus_inprogress;
+	    		}
+
+				Map<String, Object> item = new HashMap<String, Object>();
+	            item.put(mn_questName, q.name);
+	            item.put(mn_questStatus, getString(R.string.questlog_queststatus, getString(statusResId)));
+                groupList.add(item);
+
+	            List<Map<String, ?>> logItemList = new ArrayList<Map<String, ?>>();
+	            for (QuestLogEntry e : q.stages) {
+	    			if (e.logtext.length() <= 0) continue; // Do not show if displaytext is empty.
+	    			if (player.hasExactQuestProgress(q.questID, e.progress)) {
+	    				item = new HashMap<String, Object>();
+	                    item.put(mn_logText, e.logtext);
+	                    logItemList.add(item);
+	    			}
+	    		}
+	            childList.add(logItemList);
+			}
+		}
+		questlog_contents_adapter.notifyDataSetChanged();
+	}
+}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ShopActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ShopActivity.java
index e42047de4..f96457ef9 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ShopActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ShopActivity.java
@@ -23,7 +23,7 @@ import com.gpl.rpg.AndorsTrail.model.item.Loot;
 import com.gpl.rpg.AndorsTrail.view.ShopItemContainerAdapter;
 import com.gpl.rpg.AndorsTrail.view.ShopItemContainerAdapter.OnContainerItemClickedListener;
 
-public class ShopActivity extends TabActivity implements OnContainerItemClickedListener {
+public final class ShopActivity extends TabActivity implements OnContainerItemClickedListener {
 
 	private WorldContext world;
 	private Player player;
@@ -34,7 +34,6 @@ public class ShopActivity extends TabActivity implements OnContainerItemClickedL
 	private TextView shop_buy_gc;
 	private TextView shop_sell_gc;
 	
-    /** Called when the activity is first created. */
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -43,7 +42,7 @@ public class ShopActivity extends TabActivity implements OnContainerItemClickedL
         this.world = app.world;
         this.player = world.model.player;
         
-        AndorsTrailApplication.setWindowParameters(this, world.model.uiSelections.fullscreen);
+        AndorsTrailApplication.setWindowParameters(this, app.preferences);
         
         Uri uri = getIntent().getData();
         String monsterTypeID = uri.getLastPathSegment().toString();
@@ -67,31 +66,7 @@ public class ShopActivity extends TabActivity implements OnContainerItemClickedL
         shop_sell_gc = (TextView) h.findViewById(R.id.shop_sell_gc);
         
         shoplist_buy = (ListView) h.findViewById(R.id.shop_buy_list);
-        /*
-        shoplist_buy.setOnItemClickListener(new OnItemClickListener() {
-			@Override
-			public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-				int itemTypeID = (int) id;
-				ItemType itemType = world.itemTypes.getItemType(itemTypeID);
-				int price = ItemController.getBuyingPrice(player, itemType);
-				String text = res.getString(R.string.shop_buyitem, price);
-				Dialogs.showItemInfo(ShopActivity.this, itemTypeID, ItemInfoActivity.ITEMACTION_BUY, text, ItemController.canAfford(player, price), -1);
-			}
-		});
-		*/
         shoplist_sell = (ListView) h.findViewById(R.id.shop_sell_list);
-        /*
-        shoplist_sell.setOnItemClickListener(new OnItemClickListener() {
-			@Override
-			public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-				int itemTypeID = (int) id;
-				ItemType itemType = world.itemTypes.getItemType(itemTypeID);
-				int price = ItemController.getBuyingPrice(player, itemType);
-				String text = res.getString(R.string.shop_sellitem, price);
-				Dialogs.showItemInfo(ShopActivity.this, itemTypeID, ItemInfoActivity.ITEMACTION_SELL, text, true, -1);
-			}
-		});
-		*/
         
         Loot merchantLoot = new Loot();
         npcType.dropList.createRandomLoot(merchantLoot);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/StartScreenActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/StartScreenActivity.java
index fba7bc345..ca13ccd6b 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/StartScreenActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/StartScreenActivity.java
@@ -1,11 +1,13 @@
 package com.gpl.rpg.AndorsTrail.activity;
 
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
 import com.gpl.rpg.AndorsTrail.Dialogs;
 import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.Savegames;
 import com.gpl.rpg.AndorsTrail.WorldSetup;
-import com.gpl.rpg.AndorsTrail.model.ModelContainer;
-import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.Savegames.FileHeader;
+import com.gpl.rpg.AndorsTrail.controller.Constants;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -16,13 +18,15 @@ import android.content.SharedPreferences.Editor;
 import android.os.Bundle;
 import android.view.View;
 import android.view.View.OnClickListener;
-import android.view.inputmethod.EditorInfo;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.Toast;
 
-public class StartScreenActivity extends Activity {
+public final class StartScreenActivity extends Activity {
+	
+    public static final int INTENTREQUEST_LOADGAME = 9;
+    
 	private boolean hasExistingGame = false;
 	private Button startscreen_continue;
 	private Button startscreen_newgame;
@@ -33,7 +37,10 @@ public class StartScreenActivity extends Activity {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        AndorsTrailApplication.setWindowParameters(this);
+        AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
+        AndorsTrailPreferences.read(this, app.preferences);
+		AndorsTrailApplication.setWindowParameters(this, app.preferences);
+		
         setContentView(R.layout.startscreen);
 
         TextView tv = (TextView) findViewById(R.id.startscreen_version);
@@ -41,13 +48,13 @@ public class StartScreenActivity extends Activity {
         
         startscreen_currenthero = (TextView) findViewById(R.id.startscreen_currenthero);
         startscreen_enterheroname = (EditText) findViewById(R.id.startscreen_enterheroname);
-        startscreen_enterheroname.setImeOptions(EditorInfo.IME_ACTION_DONE);
+        //startscreen_enterheroname.setImeOptions(EditorInfo.IME_ACTION_DONE);
 
         startscreen_continue = (Button) findViewById(R.id.startscreen_continue);
         startscreen_continue.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View arg0) {
-				continueGame(false, null);
+				continueGame(false, Savegames.SLOT_QUICKSAVE, null);
 			}
 		});
         
@@ -80,12 +87,19 @@ public class StartScreenActivity extends Activity {
 			}
 		});
         
-        AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
+        b = (Button) findViewById(R.id.startscreen_load);
+        b.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View arg0) {
+				Dialogs.showLoad(StartScreenActivity.this);
+			}
+		});
+        
         app.setup.startResourceLoader(getResources());
         
         if (AndorsTrailApplication.DEVELOPMENT_QUICKSTART) {
         	final boolean startNewGame = false;
-        	continueGame(startNewGame, "Debug player");
+        	continueGame(startNewGame, Savegames.SLOT_QUICKSAVE, "Debug player");
         }
     }
 	
@@ -94,19 +108,44 @@ public class StartScreenActivity extends Activity {
 	protected void onResume() {
 		super.onResume();
 		
-		ModelContainer model = new ModelContainer();
-		hasExistingGame = model.quickload(getSharedPreferences(ModelContainer.PREFERENCE_MODEL_QUICKSAVE, MODE_PRIVATE));
-        
-		setButtonState(model.player);
+		String playerName = null;
+		String displayInfo = null;
+		
+		FileHeader header = Savegames.quickload(this, Savegames.SLOT_QUICKSAVE);
+		if (header != null && header.playerName != null) {
+			playerName = header.playerName;
+			displayInfo = header.displayInfo;
+		} else {
+			// Before fileversion 14 (v0.6.7), quicksave was stored in Shared preferences 
+			SharedPreferences p = getSharedPreferences("quicksave", MODE_PRIVATE);
+			playerName = p.getString("playername", null);
+            if (playerName != null) {
+            	displayInfo = "level " + p.getInt("level", -1);
+            }
+		}
+		hasExistingGame = (playerName != null);
+		setButtonState(playerName, displayInfo);
 		
 		if (isNewVersion()) {
 			Dialogs.showNewVersion(this);
 		}
 	}
 	
+    @Override
+	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+		super.onActivityResult(requestCode, resultCode, data);
+		switch (requestCode) {
+		case INTENTREQUEST_LOADGAME:
+			if (resultCode != Activity.RESULT_OK) break;
+			final int slot = data.getIntExtra("slot", 1);
+			continueGame(false, slot, null);
+			break;
+		}
+	}
+	
 	private boolean isNewVersion() {
 		final String v = "lastversion";
-		SharedPreferences s = getSharedPreferences(ModelContainer.PREFERENCE_MODEL_LASTRUNVERSION, MODE_PRIVATE);
+		SharedPreferences s = getSharedPreferences(Constants.PREFERENCE_MODEL_LASTRUNVERSION, MODE_PRIVATE);
 		int lastversion = s.getInt(v, 0);
 		if (lastversion >= AndorsTrailApplication.CURRENT_VERSION) return false;
 		Editor e = s.edit();
@@ -116,22 +155,23 @@ public class StartScreenActivity extends Activity {
 	}
 
 
-	private void setButtonState(final Player player) {
+	private void setButtonState(final String playerName, final String displayInfo) {
 		startscreen_continue.setEnabled(hasExistingGame);
         startscreen_newgame.setEnabled(true);
         if (hasExistingGame) {
-        	startscreen_currenthero.setText(getResources().getString(R.string.startscreen_currenthero, player.traits.name, player.level));
-        	startscreen_enterheroname.setText(player.traits.name);
-        	startscreen_enterheroname.setVisibility(View.GONE);
+        	startscreen_currenthero.setText(playerName  + ", " + displayInfo);
+        	startscreen_enterheroname.setText(playerName);
+    		startscreen_enterheroname.setVisibility(View.GONE);
         } else {
         	startscreen_currenthero.setText(R.string.startscreen_enterheroname);
         	startscreen_enterheroname.setVisibility(View.VISIBLE);
         }
 	}
 
-	private void continueGame(boolean createNewCharacter, String name) {
+	private void continueGame(boolean createNewCharacter, int loadFromSlot, String name) {
 		final WorldSetup setup = AndorsTrailApplication.getApplicationFromActivity(this).setup;
 		setup.createNewCharacter = createNewCharacter;
+		setup.loadFromSlot = loadFromSlot;
 		setup.newHeroName = name;
         startActivity(new Intent(this, LoadingActivity.class));
 	}
@@ -142,7 +182,7 @@ public class StartScreenActivity extends Activity {
 			Toast.makeText(this, R.string.startscreen_enterheroname, Toast.LENGTH_SHORT).show();
 			return;
 		}
-		continueGame(true, name);
+		continueGame(true, 0, name);
 	}
 	
 	private void comfirmNewGame() {
@@ -155,7 +195,7 @@ public class StartScreenActivity extends Activity {
 			public void onClick(DialogInterface dialog, int which) {
 				//continueGame(true);
 				hasExistingGame = false;
-				setButtonState(null);
+				setButtonState(null, null);
 			}
 		})
         .setNegativeButton(android.R.string.cancel, null)
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/context/ViewContext.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/context/ViewContext.java
index f2fc619e9..0302df178 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/context/ViewContext.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/context/ViewContext.java
@@ -1,6 +1,7 @@
 package com.gpl.rpg.AndorsTrail.context;
 
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
 import com.gpl.rpg.AndorsTrail.activity.MainActivity;
 import com.gpl.rpg.AndorsTrail.controller.CombatController;
 import com.gpl.rpg.AndorsTrail.controller.Controller;
@@ -21,9 +22,12 @@ public class ViewContext extends WorldContext {
 	public final MonsterMovementController monsterMovementController;
 	public final MovementController movementController;
 	
+	public final AndorsTrailPreferences preferences;
+	
 	public ViewContext(AndorsTrailApplication application, MainActivity mainActivity) {
 		super(application.world);
 		this.mainActivity = mainActivity;
+		this.preferences = application.preferences;
 
 		this.controller = new Controller(this);
 		this.combatController = new CombatController(this);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/context/WorldContext.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/context/WorldContext.java
index b77b17641..2b2e81dcd 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/context/WorldContext.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/context/WorldContext.java
@@ -8,6 +8,7 @@ import com.gpl.rpg.AndorsTrail.model.actor.MonsterTypeCollection;
 import com.gpl.rpg.AndorsTrail.model.item.DropListCollection;
 import com.gpl.rpg.AndorsTrail.model.item.ItemTypeCollection;
 import com.gpl.rpg.AndorsTrail.model.map.MapCollection;
+import com.gpl.rpg.AndorsTrail.model.quest.QuestCollection;
 import com.gpl.rpg.AndorsTrail.resource.TileStore;
 
 public class WorldContext {
@@ -17,6 +18,7 @@ public class WorldContext {
 	public final MonsterTypeCollection monsterTypes;
 	public final EffectCollection effectTypes;
 	public final DropListCollection dropLists;
+	public final QuestCollection quests;
 
 	//Objectcollections
 	public final TileStore tileStore;
@@ -33,6 +35,7 @@ public class WorldContext {
 		this.dropLists = new DropListCollection();
 		this.tileStore = new TileStore();
 		this.maps = new MapCollection();
+		this.quests = new QuestCollection();
 		//this.model = new ModelContainer();
 	}
 	public WorldContext(WorldContext copy) {
@@ -43,6 +46,7 @@ public class WorldContext {
 		this.dropLists = copy.dropLists;
 		this.tileStore = copy.tileStore;
 		this.maps = copy.maps;
+		this.quests = copy.quests;
 		this.model = copy.model;
 	}
 	public void reset() {
@@ -58,6 +62,12 @@ public class WorldContext {
 			//Ensure that all phrases are requested at least once, either by NPCs or by other phrases.
 			conversations.verifyData(monsterTypes);
 			
+			//Ensure that all required quest stages exist
+			conversations.verifyData(quests);
+			
+			//Ensure that all quest stages are reachable by mapareas or by phrases
+			quests.verifyData(maps, conversations);
+			
 			//TODO: Ensure that all items have at least one corresponding droplist
 			//TODO: Ensure that all droplists are used by monsters
 			//TODO: Ensure that all monsters are used in spawnareas
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
index 9acfe58eb..e95344199 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
@@ -38,13 +38,20 @@ public final class CombatController {
     	this.model = world.model;
     }
 
-    public void enterCombat() {
+	public static final int BEGIN_TURN_PLAYER = 0;
+	public static final int BEGIN_TURN_MONSTERS = 1;
+	public static final int BEGIN_TURN_CONTINUE = 2;
+	
+	public void enterCombat(int beginTurnAs) {
     	context.mainActivity.combatview.setVisibility(View.VISIBLE);
     	context.mainActivity.combatview.bringToFront();
     	model.uiSelections.isInCombat = true;
     	killedMonsters.clear();
     	context.mainActivity.clearMessages();
-    	newPlayerTurn();
+    	if (beginTurnAs == BEGIN_TURN_PLAYER) newPlayerTurn();
+    	else if (beginTurnAs == BEGIN_TURN_MONSTERS) endPlayerTurn();
+    	else maybeAutoEndTurn();
+    	updateTurnInfo();
     }
     public void exitCombat(boolean displayLootDialog) {
     	setCombatSelection(null, null);
@@ -75,6 +82,10 @@ public final class CombatController {
 		return currentActiveMonster != null;
 	}
 
+	public void setCombatSelection(Monster selectedMonster) {
+		Coord p = selectedMonster.rectPosition.findPositionAdjacentTo(model.player.position);
+		setCombatSelection(selectedMonster, p);
+	}
 	public void setCombatSelection(Monster selectedMonster, Coord selectedPosition) {
 		if (selectedMonster != null) {
 			if (!selectedMonster.isAgressive()) return;
@@ -84,12 +95,14 @@ public final class CombatController {
 			model.uiSelections.selectedPosition = null;
 			context.mainActivity.redrawTile(previousSelection, MainView.REDRAW_TILE_SELECTION_REMOVED);
 		}
-		model.uiSelections.selectedMonster = selectedMonster;
-		model.uiSelections.selectedPosition = selectedPosition;
 		context.mainActivity.combatview.updateCombatSelection(selectedMonster, selectedPosition);
+		model.uiSelections.selectedMonster = selectedMonster;
 		if (selectedPosition != null) {
+			model.uiSelections.selectedPosition = new Coord(selectedPosition);
 			model.uiSelections.isInCombat = true;
 			context.mainActivity.redrawTile(selectedPosition, MainView.REDRAW_TILE_SELECTION_ADDED);
+		} else {
+			model.uiSelections.selectedPosition = null;
 		}
 	}
 	public void setCombatSelection(Coord p) {
@@ -128,18 +141,27 @@ public final class CombatController {
 		return null;
 	}
 
-	public void executeMoveAttack() {
+	public void executeMoveAttack(int dx, int dy) {
 		if (isMonsterTurn()) {
 			forceFinishMonsterAction();
 		} else if (world.model.uiSelections.selectedMonster != null) {
 			executeAttack();
 		} else if (world.model.uiSelections.selectedPosition != null) {
-			executeMove();
+			executeCombatMove(world.model.uiSelections.selectedPosition);
 		} else if (canExitCombat()) {
 			exitCombat(true);
+		} else if (dx != 0 || dy != 0) {
+			executeFlee(dx, dy);
 		}
 	}
 	
+	private void executeFlee(int dx, int dy) {
+		if (!context.movementController.findWalkablePosition(dx, dy)) return;
+		Monster m = model.currentMap.getMonsterAt(model.player.nextPosition);
+		if (m != null) return;
+		executeCombatMove(world.model.player.nextPosition);
+	}
+	
 	private void executeAttack() {
 		context.effectController.waitForCurrentEffect();
 		
@@ -161,12 +183,7 @@ public final class CombatController {
 				msg += " " + r.getString(R.string.combat_result_herokillsmonster, monsterName, attack.damage);
 			}
 			message(msg);
-			context.effectController.startEffect(
-					context.mainActivity.mainview
-					, model.uiSelections.selectedPosition
-					, EffectCollection.EFFECT_BLOOD
-					, attack.damage);
-
+			startAttackEffect(attack, model.uiSelections.selectedPosition);
 			if (!attack.targetDied) {
 				context.mainActivity.combatview.updateMonsterHealth(target.health);
 			} else {
@@ -176,7 +193,7 @@ public final class CombatController {
 					exitCombat(true);
 					return;
 				} else {
-					setCombatSelection(nextMonster, nextMonster.position);
+					setCombatSelection(nextMonster);
 				}
 			}
 		} else {
@@ -194,15 +211,27 @@ public final class CombatController {
 		}
 	}
 
-	private void executeMove() {
+	private void executeCombatMove(final Coord dest) {
 		if (model.uiSelections.selectedMonster != null) return;
-		if (model.uiSelections.selectedPosition == null) return;
+		if (dest == null) return;
 		if (!useAPs(model.player.traits.moveCost)) return;
 
-		model.player.nextPosition.set(model.uiSelections.selectedPosition);
+		if (Constants.roll100(Constants.FLEE_FAIL_CHANCE_PERCENT)) {
+			fleeingFailed();
+			return;
+		}
+		
+		model.player.nextPosition.set(dest);
 		context.movementController.moveToNextIfPossible(false);
 		
-		maybeAutoEndTurn();
+		if (canExitCombat()) exitCombat(true);
+		else maybeAutoEndTurn();
+	}
+
+	private void fleeingFailed() {
+		Resources r = context.mainActivity.getResources();
+		message(r.getString(R.string.combat_flee_failed));
+		endPlayerTurn();
 	}
 
 	private final Handler monsterTurnHandler = new Handler() {
@@ -213,15 +242,14 @@ public final class CombatController {
 	};
 	public void endPlayerTurn() {
 		model.player.ap.current = 0;
-		
 		for (MonsterSpawnArea a : model.currentMap.spawnAreas) {
 			for (Monster m : a.monsters) {
 				m.setMaxAP();
 			}
 		}
-		
 		handleNextMonsterAction();
 	}
+
 	private void forceFinishMonsterAction() {
 		//TODO:
 		return;
@@ -248,6 +276,8 @@ public final class CombatController {
 	}
 	
 	private void handleNextMonsterAction() {
+		if (!context.model.uiSelections.isMainActivityVisible) return;
+		
 		context.effectController.waitForCurrentEffect();
 		
 		currentActiveMonster = determineNextMonster(currentActiveMonster);
@@ -260,11 +290,7 @@ public final class CombatController {
 		AttackResult attack = monsterAttacks(model, currentActiveMonster);
 		String monsterName = currentActiveMonster.traits.name;
 		if (attack.isHit) {
-			context.effectController.startEffect(
-					context.mainActivity.mainview
-					, model.player.position
-					, EffectCollection.EFFECT_BLOOD
-					, attack.damage);
+			startAttackEffect(attack, model.player.position);
 			if (attack.isCriticalHit) {
 				message(r.getString(R.string.combat_result_monsterhitcritical, monsterName, attack.damage));
 			} else {
@@ -279,17 +305,28 @@ public final class CombatController {
 			message(r.getString(R.string.combat_result_monstermiss, monsterName));
 		}
 		context.mainActivity.statusview.update();
-		monsterTurnHandler.sendEmptyMessageDelayed(0, ModelContainer.monsterAttackDelay);
+		monsterTurnHandler.sendEmptyMessageDelayed(0, context.preferences.attackspeed_milliseconds);
 	}
 
+	private void startAttackEffect(AttackResult attack, final Coord position) {
+		if (context.preferences.attackspeed_milliseconds <= 0) return;
+		context.effectController.startEffect(
+				context.mainActivity.mainview
+				, position
+				, EffectCollection.EFFECT_BLOOD
+				, attack.damage);
+	}
 	private void endMonsterTurn() {
+		currentActiveMonster = null;
 		newPlayerTurn();
 	}
 	
 	private void newPlayerTurn() {
-		currentActiveMonster = null;
-    	model.player.ap.setMax();
-    	context.mainActivity.combatview.updateTurnInfo(null);
+		model.player.setMaxAP();
+    	updateTurnInfo();
+	}
+	private void updateTurnInfo() {
+		context.mainActivity.combatview.updateTurnInfo(currentActiveMonster);
     	context.mainActivity.combatview.updatePlayerAP(model.player.ap);
 	}
 	
@@ -303,12 +340,14 @@ public final class CombatController {
 		return getAverageDamagePerHit(attacker, target) * attacker.getAttacksPerTurn();
 	}
 	private static int getTurnsToKillTarget(ActorTraits attacker, ActorTraits target) {
-		if (attacker.damagePotential.max <= target.damageResistance) return 999;
 		if (attacker.hasCriticalEffect()) {
 			if (attacker.damagePotential.max * attacker.criticalMultiplier <= target.damageResistance) return 999;
+		} else {
+			if (attacker.damagePotential.max <= target.damageResistance) return 999;
 		}
+		
 		float averageDamagePerTurn = getAverageDamagePerTurn(attacker, target);
-		if (averageDamagePerTurn == 0) return 100;
+		if (averageDamagePerTurn <= 0) return 100;
 		return (int) Math.ceil(target.maxHP / averageDamagePerTurn);
 	}
 	public static int getMonsterDifficulty(WorldContext world, MonsterType monsterType) {
@@ -327,6 +366,7 @@ public final class CombatController {
     	
     	if (result.targetDied) {
     		model.currentMap.remove(currentMonster);
+    		context.mainActivity.redrawAll(MainView.REDRAW_ALL_MONSTER_KILLED);
 		}
 
 		return result;
@@ -348,12 +388,12 @@ public final class CombatController {
 	
 	private static AttackResult attack(final Actor attacker, final Actor target) {
 		int hitChance = getAttackHitChance(attacker.traits, target.traits);
-		if (!ModelContainer.roll100(hitChance)) return AttackResult.MISS;
+		if (!Constants.roll100(hitChance)) return AttackResult.MISS;
 		
-		int damage = ModelContainer.rollValue(attacker.traits.damagePotential);
+		int damage = Constants.rollValue(attacker.traits.damagePotential);
 		boolean isCriticalHit = false;
 		if (attacker.traits.hasCriticalEffect()) {
-			isCriticalHit = ModelContainer.roll100(attacker.traits.criticalChance);
+			isCriticalHit = Constants.roll100(attacker.traits.criticalChance);
 			if (isCriticalHit) {
 				damage *= attacker.traits.criticalMultiplier;
 			}
@@ -366,8 +406,13 @@ public final class CombatController {
 	}
 
 	public void monsterSteppedOnPlayer(Monster m) {
-		enterCombat();
-		endPlayerTurn();
-		setCombatSelection(m, m.position);
+		setCombatSelection(m);
+		enterCombat(BEGIN_TURN_MONSTERS);
+	}
+	
+	public void startFlee() {
+		setCombatSelection(null, null);
+		Resources r = context.mainActivity.getResources();
+		message(r.getString(R.string.combat_begin_flee));
 	}
 }
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/Constants.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/Constants.java
new file mode 100644
index 000000000..72c801a51
--- /dev/null
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/Constants.java
@@ -0,0 +1,44 @@
+package com.gpl.rpg.AndorsTrail.controller;
+
+import java.util.Random;
+
+import com.gpl.rpg.AndorsTrail.util.ConstRange;
+import com.gpl.rpg.AndorsTrail.util.Range;
+
+public final class Constants {
+	public static final int PERCENT_EXP_LOST_WHEN_DIED = 30;
+	public static final int LEVELUP_EFFECT_HEALTH = 5;
+	public static final int LEVELUP_EFFECT_ATK_CH = 5;
+	public static final int LEVELUP_EFFECT_ATK_DMG = 1;
+	public static final int LEVELUP_EFFECT_DEF_CH = 3;
+	public static final int MARKET_PRICEFACTOR_PERCENT = 15;
+	public static final int MONSTER_AGGRESSION_CHANCE_PERCENT = 15;
+	public static final int EXP_FACTOR_DAMAGERESISTANCE = 9;
+	public static final float EXP_FACTOR_SCALING = 0.7f;
+	public static final int FLEE_FAIL_CHANCE_PERCENT = 20;
+	public static final long MINIMUM_INPUT_INTERVAL = 200;
+
+	public static final int MONSTER_MOVEMENT_TURN_DURATION_MS = 1200;
+	public static final int ATTACK_ANIMATION_FPS = 10;
+	public static final int TICK_DELAY = 500;
+	public static final ConstRange monsterWaitTurns = new ConstRange(30,4);
+	
+	public static final String PREFERENCE_MODEL_LASTRUNVERSION = "lastversion";
+	public static final String FILENAME_SAVEGAME_QUICKSAVE = "savegame";
+	public static final String FILENAME_SAVEGAME_DIRECTORY = "andors-trail";
+	public static final String FILENAME_SAVEGAME_SLOT = FILENAME_SAVEGAME_DIRECTORY + "/savegame";
+	
+	
+	public static final Random rnd = new Random();
+	public static boolean roll100(final int chance) { return rnd.nextInt(100) < chance; }
+	public static int rollValue(final ConstRange r) { 
+		if (r.isMax()) return r.max;
+		else return rnd.nextInt(r.max - r.current) + r.current;
+	}
+	public static int rollValue(final Range r) { 
+		if (r.isMax()) return r.max;
+		else return rnd.nextInt(r.max - r.current + 1) + r.current;
+	}
+	public static boolean rollResult(final ConstRange r) { return rnd.nextInt(r.max) < r.current; }
+	public static boolean rollResult(final Range r) { return rnd.nextInt(r.max) < r.current; }
+}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/Controller.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/Controller.java
index 882f6a6f0..fd07f5fd5 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/Controller.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/Controller.java
@@ -13,18 +13,12 @@ import com.gpl.rpg.AndorsTrail.context.WorldContext;
 import com.gpl.rpg.AndorsTrail.model.ModelContainer;
 import com.gpl.rpg.AndorsTrail.model.actor.Monster;
 import com.gpl.rpg.AndorsTrail.model.actor.Player;
-import com.gpl.rpg.AndorsTrail.model.map.KeyArea;
 import com.gpl.rpg.AndorsTrail.model.map.LayeredWorldMap;
 import com.gpl.rpg.AndorsTrail.model.map.MapObject;
 import com.gpl.rpg.AndorsTrail.util.Coord;
 import com.gpl.rpg.AndorsTrail.view.MainView;
 
 public final class Controller {
-	private static final int PERCENT_EXP_LOST_WHEN_DIED = 30;
-	public static final int LEVELUP_EFFECT_HEALTH = 5;
-	public static final int LEVELUP_EFFECT_ATK_CH = 5;
-	public static final int LEVELUP_EFFECT_ATK_DMG = 1;
-	public static final int LEVELUP_EFFECT_DEF_CH = 3;
     
     private final ViewContext view;
     private final WorldContext world;
@@ -59,12 +53,12 @@ public final class Controller {
     public void queueAnotherTick() {
     	if (hasQueuedTick) return;
     	hasQueuedTick = true;
-    	mTickHandler.sleep(ModelContainer.tickDelay);
+    	mTickHandler.sleep(Constants.TICK_DELAY);
     }
     
 	private void tick() {
 		//L.log(id + " : Controller::tick()");
-    	if (!model.uiSelections.isTicking) return;
+    	if (!model.uiSelections.isMainActivityVisible) return;
     	if (model.uiSelections.isInCombat) return;
     	
     	boolean hasChanged = false;
@@ -73,35 +67,35 @@ public final class Controller {
     	
     	if (hasChanged) view.mainActivity.redrawAll(MainView.REDRAW_ALL_MONSTER_MOVED); //TODO: should only redraw spawned tiles
     	
+    	view.monsterMovementController.attackWithAgressiveMonsters();
+    	
     	queueAnotherTick();
     }
     
     public void resume() {
     	//L.log(id + " : Controller::resume()");
 		view.mainActivity.statusview.update();
-		model.uiSelections.isTicking = true;
-    	view.mainActivity.mainview.inhibitClicks = false;
+		model.uiSelections.isMainActivityVisible = true;
     	queueAnotherTick();
     }
     public void pause() {
     	//L.log(id + " : Controller::pause()");
     	hasQueuedTick = false;
-    	model.uiSelections.isTicking = false;
-    	view.mainActivity.mainview.inhibitClicks = true;
+    	model.uiSelections.isMainActivityVisible = false;
     }
     
-    public void handleMapEvent(MapObject o) {
+    public void handleMapEvent(MapObject o, Coord position) {
 		switch (o.type) {
 		case MapObject.MAPEVENT_SIGN:
-			if (o.place_or_key != null && o.place_or_key.length() > 0) {
-				model.player.addKey(o.place_or_key);
-			}
+			if (o.questProgress != null) model.player.addQuestProgress(o.questProgress);
 			if (o.text == null) return;
 			Dialogs.showMapSign(view.mainActivity, view, o.title, o.text);
 			break;
 		case MapObject.MAPEVENT_NEWMAP:
-			if (o.map == null || o.place_or_key == null) return;
-			view.movementController.placePlayerAt(o.map, o.place_or_key);
+			if (o.map == null || o.place == null) return;
+			int offset_x = position.x - o.position.topLeft.x;
+			int offset_y = position.y - o.position.topLeft.y;
+			view.movementController.placePlayerAt(o.map, o.place, offset_x, offset_y);
 			break;
 		case MapObject.MAPEVENT_REST:
 			Dialogs.showRest(view.mainActivity, view);
@@ -112,8 +106,8 @@ public final class Controller {
 	public void steppedOnMonster(Monster m, Coord p) {
 		if (m.isAgressive()) {
 			view.combatController.setCombatSelection(m, p);
-			if (!model.uiSelections.confirmAttack) {
-				view.combatController.enterCombat();
+			if (!view.preferences.confirmAttack) {
+				view.combatController.enterCombat(CombatController.BEGIN_TURN_PLAYER);
 			} else {
 				Dialogs.showMonsterEncounter(view.mainActivity, view, m);
 			}
@@ -125,7 +119,8 @@ public final class Controller {
 	public void handlePlayerDeath() {
 		view.effectController.waitForCurrentEffect();		
 		final Player player = model.player;
-		int lostExp = player.levelExperience.current / (100 / PERCENT_EXP_LOST_WHEN_DIED);
+		int lostExp = player.levelExperience.current / (100 / Constants.PERCENT_EXP_LOST_WHEN_DIED);
+		if (lostExp < 0) lostExp = 0; // Shouldn't happen, but just to be sure.
 		player.addExperience(-lostExp);
 		model.statistics.addPlayerDeath(lostExp);
 		playerRested(world);
@@ -144,18 +139,18 @@ public final class Controller {
         	if (m.visited) m.spawnAll(world);
         }
 	}
+
 	public static void ui_playerRested(final Activity currentActivity, final ViewContext viewContext) {
 		playerRested(viewContext);
 		viewContext.mainActivity.statusview.update();
     	Dialogs.showRested(currentActivity, viewContext);
 	}
-
 	
-	public boolean handleKeyArea(KeyArea area) {
-		if (view.model.player.hasKey(area.requiredKey)) return true;
+	public boolean handleKeyArea(MapObject area) {
+		if (view.model.player.hasExactQuestProgress(area.questProgress)) return true;
 		final Context androidContext = view.mainActivity;
 
-		String message = area.message;
+		String message = area.text;
 		if (message == null || message.length() == 0) {
 			message = androidContext.getResources().getString(R.string.key_required);
 		}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java
index 408c71755..13e7aff16 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java
@@ -3,39 +3,60 @@ package com.gpl.rpg.AndorsTrail.controller;
 import com.gpl.rpg.AndorsTrail.conversation.Phrase;
 import com.gpl.rpg.AndorsTrail.conversation.Phrase.Reply;
 import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.model.item.ItemTypeCollection;
+import com.gpl.rpg.AndorsTrail.model.item.Loot;
+import com.gpl.rpg.AndorsTrail.model.quest.QuestCollection;
+import com.gpl.rpg.AndorsTrail.model.quest.QuestLogEntry;
+import com.gpl.rpg.AndorsTrail.model.quest.QuestProgress;
 
-public class ConversationController {
+public final class ConversationController {
 
-	public static void applyPhraseEffect(final Player player, final Phrase phrase) {
-		if (phrase.enablesKey != null) player.addKey(phrase.enablesKey);
-		if (phrase.rewardExperience > 0) player.addExperience(phrase.rewardExperience);
-		if (phrase.rewardGold != 0) player.inventory.gold += phrase.rewardGold;
+	public static Loot applyPhraseEffect(final Player player, final Phrase phrase, final QuestCollection questcollection) {
+		if (phrase.rewardDropList == null && phrase.progressQuest == null) return null;
+		
+		final Loot loot = new Loot();
+		if (phrase.rewardDropList != null) {
+			phrase.rewardDropList.createRandomLoot(loot);
+			player.inventory.add(loot);
+		}
+		if (phrase.progressQuest != null) {
+			player.addQuestProgress(phrase.progressQuest);
+			QuestLogEntry stage = questcollection.getQuestLogEntry(phrase.progressQuest);
+			if (stage != null) {
+				loot.exp = stage.rewardExperience;
+				player.addExperience(stage.rewardExperience);
+			}
+		}
+		return loot;
 	}
 	
 	public static void applyReplyEffect(final Player player, final Reply reply) {
-		if (reply.requiresItemTypeID > 0 && reply.requiresItemQuantity > 0) {
+		if (reply.requiresItemTypeID < 0) return;
+		if (reply.requiresItemQuantity <= 0) return;
+		
+		if (reply.requiresItemTypeID == ItemTypeCollection.ITEMTYPE_GOLD) {
+			player.inventory.gold -= reply.requiresItemQuantity;
+		} else {
 			player.inventory.removeItem(reply.requiresItemTypeID, reply.requiresItemQuantity);
 		}
 	}
     
 	public static boolean canSelectReply(final Player player, final Reply reply) {
-		if (!hasRequiredKey(player, reply.requiresKey)) return false;
+		if (!hasRequiredQuestProgress(player, reply.requiresProgress)) return false;
 		if (!hasRequiredItems(player, reply.requiresItemTypeID, reply.requiresItemQuantity)) return false;
 		return true;
     }
 	
-	private static boolean hasRequiredKey(final Player player, final String key) {
-    	if (key == null) return true;
-    	if (key.startsWith("!")) {
-    		return !player.hasKey(key.substring(1));
-    	} else {
-    		return player.hasKey(key);
-    	}
+	private static boolean hasRequiredQuestProgress(final Player player, final QuestProgress progress) {
+    	if (progress == null) return true;
+    	return player.hasExactQuestProgress(progress);
     }
 	
 	private static boolean hasRequiredItems(final Player player, int requiresItemTypeID, int requiresItemQuantity) {
-    	if (requiresItemTypeID <= 0) return true;
+    	if (requiresItemTypeID < 0) return true;
     	if (requiresItemQuantity <= 0) return true;
+    	if (requiresItemTypeID == ItemTypeCollection.ITEMTYPE_GOLD) return player.inventory.gold >= requiresItemQuantity;
+    		
     	return player.inventory.hasItem(requiresItemTypeID, requiresItemQuantity);
     }
 }
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ItemController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ItemController.java
index 148d95fc8..f5df336b1 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ItemController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ItemController.java
@@ -13,7 +13,6 @@ import com.gpl.rpg.AndorsTrail.model.item.Loot;
 import com.gpl.rpg.AndorsTrail.view.MainView;
 
 public final class ItemController {
-	private static final int MARKET_PRICEFACTOR_PERCENT = 15;
 	
 	private final ViewContext view;
     private final WorldContext world;
@@ -93,7 +92,7 @@ public final class ItemController {
 	
 	private void applyUseEffect(Actor actor, ItemType t) {
 		if (t.effect_ap != null) {
-			int value = ModelContainer.rollValue(t.effect_ap);
+			int value = Constants.rollValue(t.effect_ap);
 			actor.ap.add(value, false);
 			view.effectController.startEffect(
 					view.mainActivity.mainview
@@ -102,7 +101,7 @@ public final class ItemController {
 					, value);
 		}
 		if (t.effect_health != null) {
-			int value = ModelContainer.rollValue(t.effect_health);
+			int value = Constants.rollValue(t.effect_health);
 			actor.health.add(value, false);
 			view.effectController.startEffect(
 					view.mainActivity.mainview
@@ -138,10 +137,10 @@ public final class ItemController {
 	}
 	
 	public static int getBuyingPrice(Player player, ItemType itemType) {
-		return itemType.baseMarketCost * (100 + MARKET_PRICEFACTOR_PERCENT) / 100;
+		return itemType.baseMarketCost * (100 + Constants.MARKET_PRICEFACTOR_PERCENT) / 100;
 	}
 	public static int getSellingPrice(Player player, ItemType itemType) {
-		return itemType.baseMarketCost * (100 - MARKET_PRICEFACTOR_PERCENT) / 100;
+		return itemType.baseMarketCost * (100 - Constants.MARKET_PRICEFACTOR_PERCENT) / 100;
 	}
 
 	public static boolean canAfford(Player player, ItemType itemType) {
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MonsterMovementController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MonsterMovementController.java
index a449a1a94..76b94e6cd 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MonsterMovementController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MonsterMovementController.java
@@ -6,7 +6,6 @@ import com.gpl.rpg.AndorsTrail.model.ModelContainer;
 import com.gpl.rpg.AndorsTrail.model.actor.Monster;
 import com.gpl.rpg.AndorsTrail.model.map.MonsterSpawnArea;
 import com.gpl.rpg.AndorsTrail.util.Coord;
-import com.gpl.rpg.AndorsTrail.util.CoordRect;
 
 public final class MonsterMovementController {
 	private final ViewContext view;
@@ -20,55 +19,65 @@ public final class MonsterMovementController {
     }
 	
 	public boolean moveMonsters() {
-    	boolean hasMoved = false;
+    	boolean atLeastOneMonsterMoved = false;
     	long currentTime = System.currentTimeMillis();
     	
     	for (MonsterSpawnArea a : model.currentMap.spawnAreas) {
 	    	for (Monster m : a.monsters) {
 	    		if (m.nextActionTime <= currentTime) {
-	    			if (moveMonster(m, a, currentTime)) hasMoved = true;
+	    			if (moveMonster(m, a, currentTime)) atLeastOneMonsterMoved = true;
 	    		}
 	    	}
     	}
     	
-    	return hasMoved;
+    	return atLeastOneMonsterMoved;
+    }
+	
+	public void attackWithAgressiveMonsters() {
+    	for (MonsterSpawnArea a : model.currentMap.spawnAreas) {
+	    	for (Monster m : a.monsters) {
+	    		if (!m.isAgressive()) continue;
+	    		if (!m.rectPosition.isAdjacentTo(model.player.position)) continue;
+	    		if (Constants.roll100(Constants.MONSTER_AGGRESSION_CHANCE_PERCENT)) {
+	    			view.combatController.monsterSteppedOnPlayer(m);
+	    			return;
+	    		}
+	    	}
+    	}
     }
     
-    private boolean moveMonster(final Monster m, final MonsterSpawnArea area, long currentTime) {
-		m.nextActionTime += m.millisecondsPerMove;
+	private boolean moveMonster(final Monster m, final MonsterSpawnArea area, long currentTime) {
+    	m.nextActionTime += m.millisecondsPerMove;
     	if (m.movementDestination == null) {
     		// Monster has waited and should start to move again.
     		m.movementDestination = new Coord(m.position);
-    		if (ModelContainer.rnd.nextBoolean()) {
-    			m.movementDestination.x = area.area.topLeft.x + ModelContainer.rnd.nextInt(area.area.size.width);
+    		if (Constants.rnd.nextBoolean()) {
+    			m.movementDestination.x = area.area.topLeft.x + Constants.rnd.nextInt(area.area.size.width);
     		} else {
-    			m.movementDestination.y = area.area.topLeft.y + ModelContainer.rnd.nextInt(area.area.size.height);
+    			m.movementDestination.y = area.area.topLeft.y + Constants.rnd.nextInt(area.area.size.height);
     		}
     	} else if (m.position.equals(m.movementDestination)) {
     		// Monster has been moving and arrived at the destination.
     		cancelCurrentMonsterMovement(m);
     	} else {
     		// Monster is moving.
-    		CoordRect p = new CoordRect(
-    				new Coord(
-						m.position.x + sgn(m.movementDestination.x - m.position.x)
-						,m.position.y + sgn(m.movementDestination.y - m.position.y)
-					)
-    				,m.monsterType.tileSize
+    		m.nextPosition.topLeft.set(
+    				m.position.x + sgn(m.movementDestination.x - m.position.x)
+					,m.position.y + sgn(m.movementDestination.y - m.position.y)
 				);
     		
-    		if (!model.currentMap.monsterCanMoveTo(p)) {
+    		if (!model.currentMap.monsterCanMoveTo(m.nextPosition)) {
     			cancelCurrentMonsterMovement(m);
     			return false;
     		}
-			if (p.contains(model.player.position)) {
+			if (m.nextPosition.contains(model.player.position)) {
 				if (!m.isAgressive()) {
 					cancelCurrentMonsterMovement(m);
 					return false;
 				}
 				view.combatController.monsterSteppedOnPlayer(m);
 			} else {
-				m.position.set(p.topLeft);
+				m.position.set(m.nextPosition.topLeft);
 			}
 			return true;
     	}
@@ -77,7 +86,7 @@ public final class MonsterMovementController {
     
     private void cancelCurrentMonsterMovement(final Monster m) {
     	m.movementDestination = null;
-		m.nextActionTime += m.millisecondsPerMove * ModelContainer.rollValue(ModelContainer.monsterWaitTurns);
+		m.nextActionTime += m.millisecondsPerMove * Constants.rollValue(Constants.monsterWaitTurns);
     }
 
 	private static int sgn(int i) {
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MovementController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MovementController.java
index 6625ab5e2..77e6fa94a 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MovementController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MovementController.java
@@ -6,9 +6,9 @@ import com.gpl.rpg.AndorsTrail.model.ModelContainer;
 import com.gpl.rpg.AndorsTrail.model.actor.Monster;
 import com.gpl.rpg.AndorsTrail.model.actor.Player;
 import com.gpl.rpg.AndorsTrail.model.item.Loot;
-import com.gpl.rpg.AndorsTrail.model.map.KeyArea;
 import com.gpl.rpg.AndorsTrail.model.map.LayeredWorldMap;
 import com.gpl.rpg.AndorsTrail.model.map.MapObject;
+import com.gpl.rpg.AndorsTrail.model.map.MonsterSpawnArea;
 import com.gpl.rpg.AndorsTrail.util.Coord;
 import com.gpl.rpg.AndorsTrail.util.L;
 
@@ -23,12 +23,12 @@ public final class MovementController {
     	this.model = world.model;
     }
 	
-	public void placePlayerAt(String mapName, String placeName) { 
-		placePlayerAt(world, mapName, placeName); 
+	public void placePlayerAt(String mapName, String placeName, int offset_x, int offset_y) { 
+		placePlayerAt(world, mapName, placeName, offset_x, offset_y); 
 		view.mainActivity.clearMessages();
 		view.mainActivity.mainview.notifyMapChanged();
     }
-	public static void placePlayerAt(final WorldContext world, String mapName, String placeName) {
+	public static void placePlayerAt(final WorldContext world, String mapName, String placeName, int offset_x, int offset_y) {
     	if (mapName == null || placeName == null) return;
 		LayeredWorldMap newMap = world.maps.findPredefinedMap(mapName);
 		if (newMap == null) {
@@ -43,6 +43,8 @@ public final class MovementController {
 		final ModelContainer model = world.model;
 		model.currentMap = newMap;
 		model.player.position.set(place.position.topLeft);
+		model.player.position.x += Math.min(offset_x, place.position.size.width-1);
+		model.player.position.y += Math.min(offset_y, place.position.size.height-1);
 		model.player.lastPosition.set(model.player.position);
 		if (!newMap.visited) newMap.spawnAll(world);
 		newMap.visited = true;
@@ -68,7 +70,7 @@ public final class MovementController {
 		moveToNextIfPossible(true);
     }
     
-    private boolean findWalkablePosition(int dx, int dy) {
+    public boolean findWalkablePosition(int dx, int dy) {
     	if (tryWalkablePosition(sgn(dx), sgn(dy))) return true;
     	if (dx == 0 || dy == 0) return false;
     	if (abs(dx) > abs(dy)) return tryWalkablePosition(sgn(dx), 0);
@@ -100,9 +102,11 @@ public final class MovementController {
     	final LayeredWorldMap currentMap = model.currentMap;
     	final Coord newPosition = player.nextPosition;
     	
-    	for (KeyArea a : currentMap.keyAreas) {
-    		if (a.position.contains(newPosition)) {
-    			if (!view.controller.handleKeyArea(a)) return;
+    	for (MapObject o : currentMap.eventObjects) {
+    		if (o.type == MapObject.MAPEVENT_KEYAREA) {
+	    		if (o.position.contains(newPosition)) {
+	    			if (!view.controller.handleKeyArea(o)) return;
+	    		}
     		}
     	}
 		
@@ -113,7 +117,7 @@ public final class MovementController {
 		
 		if (handleEvents) {
 			MapObject o = currentMap.getEventObjectAt(newPosition);
-			if (o != null) view.controller.handleMapEvent(o);
+			if (o != null) view.controller.handleMapEvent(o, newPosition);
 	    	
 	    	Loot loot = currentMap.getBagAt(newPosition);
 	    	if (loot != null) view.itemController.handleLootBag(loot);
@@ -121,6 +125,38 @@ public final class MovementController {
     }
 
 	public static void respawnPlayer(final WorldContext world) {
-		placePlayerAt(world, world.model.player.spawnMap, world.model.player.spawnPlace);
+		placePlayerAt(world, world.model.player.spawnMap, world.model.player.spawnPlace, 0, 0);
+	}
+
+	public static void moveBlockedActors(final WorldContext world) {
+		final ModelContainer model = world.model;
+		if (!world.model.currentMap.isWalkable(world.model.player.position)) {
+			// If the player somehow spawned on an unwalkable tile, we move the player to the first mapchange area.
+			// This could happen if we change some tile to non-walkable in a future version.
+			MapObject dest = null;
+			for (MapObject o : model.currentMap.eventObjects) {
+	    		if (o.type == MapObject.MAPEVENT_NEWMAP) {
+		    		dest = o;
+		    		break;
+	    		}
+	    	}
+			if (dest != null) {
+				model.player.position.set(dest.position.topLeft);
+			}
+		}
+		
+		// If any monsters somehow spawned on an unwalkable tile, we move the monster to a new position on the spawnarea
+		// This could happen if we change some tile to non-walkable in a future version.
+		for (LayeredWorldMap map : world.maps.predefinedMaps) {
+			for (MonsterSpawnArea a : map.spawnAreas) {
+				for (Monster m : a.monsters) {
+					if (!world.model.currentMap.isWalkable(m.rectPosition)) {
+						Coord p = map.getRandomFreePosition(a.area, m.traits.tileSize, model.player.position);
+						if (p == null) continue;
+						m.position.set(p);
+					}
+				}
+			}
+		}
 	}
 }
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/conversation/ConversationCollection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/conversation/ConversationCollection.java
index 6d50962ba..41c1c9ae3 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/conversation/ConversationCollection.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/conversation/ConversationCollection.java
@@ -12,10 +12,12 @@ import com.gpl.rpg.AndorsTrail.model.actor.MonsterTypeCollection;
 import com.gpl.rpg.AndorsTrail.model.item.DropListCollection;
 import com.gpl.rpg.AndorsTrail.model.item.ItemType;
 import com.gpl.rpg.AndorsTrail.model.item.ItemTypeCollection;
+import com.gpl.rpg.AndorsTrail.model.quest.QuestCollection;
+import com.gpl.rpg.AndorsTrail.model.quest.QuestProgress;
 import com.gpl.rpg.AndorsTrail.resource.ResourceLoader;
 import com.gpl.rpg.AndorsTrail.util.L;
 
-public class ConversationCollection {
+public final class ConversationCollection {
 	public static final String PHRASE_CLOSE = "X";
 	public static final String PHRASE_SHOP = "S";
 	public static final String PHRASE_ATTACK = "F";
@@ -40,14 +42,21 @@ public class ConversationCollection {
 		return phrases.get(id);
 	}
 	
-	public void initialize(ItemTypeCollection itemTypes, String phraselist) {
+	public void initialize(ItemTypeCollection itemTypes, DropListCollection droplists, String phraselist) {
 		Matcher rowMatcher = ResourceLoader.rowPattern.matcher(phraselist);
     	while(rowMatcher.find()) {
     		String[] parts = rowMatcher.group(1).split(ResourceLoader.columnSeparator, -1);
-    		if (parts.length < 21) continue;
+    		if (parts.length < 19) {
+    			if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {
+    				if (parts.length > 2) {
+    					L.log("WARNING: Conversation resource contains row with invalid length: " + rowMatcher.group(1));
+    				}
+    			}
+    			continue;
+    		}
     		
     		ArrayList<Reply> replies = new ArrayList<Reply>();
-    		final int startReplyOffset = 5;
+    		final int startReplyOffset = 4;
     		final int replyLength = 5;
     		for (int i = 0; i < 3; ++i) {
     			int v = startReplyOffset + i * replyLength;
@@ -69,38 +78,42 @@ public class ConversationCollection {
     		phrases.put(phraseID, new Phrase(
         			parts[1]
         			, _replies
-        			, parts[2]
-		        	, ResourceLoader.parseInt(parts[3], 0)
-		        	, ResourceLoader.parseInt(parts[4], 0)
+        			, QuestProgress.parseQuestProgress(parts[2])
+		        	, droplists.getDropList(parts[3])
     			));
     	}
 	}
 	
 	private static Reply parseReply(String[] parts, int startIndex, ItemTypeCollection itemTypes) {
 		String requiresItemTypeTag = parts[startIndex+3];
-		int requiresItemTypeID = 0;
+		int requiresItemTypeID = -1;
 		if (requiresItemTypeTag.length() > 0) {
 			ItemType type = itemTypes.getItemTypeByTag(requiresItemTypeTag);
 			if (type != null) requiresItemTypeID = type.id;
 		}
 		return new Reply(
 				parts[startIndex]
-				,parts[startIndex+1]
-				,parts[startIndex+2]
-		       	,requiresItemTypeID
-       	       	,ResourceLoader.parseInt(parts[startIndex+4], 0)
+				, parts[startIndex+1]
+				, QuestProgress.parseQuestProgress(parts[startIndex+2])
+		       	, requiresItemTypeID
+       	       	, ResourceLoader.parseInt(parts[startIndex+4], 0)
 			);
 	}
 	
 	// Selftest method. Not part of the game logic.
 	public void verifyData() {
     	if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {
-    		HashSet<String> requiredKeys = new HashSet<String>();
-    		HashSet<String> suppliedKeys = new HashSet<String>();
+    		HashMap<String, Integer> requiredQuestStages = new HashMap<String, Integer>();
+    		HashMap<String, Integer> suppliedQuestStages = new HashMap<String, Integer>();
 			for (Entry<String, Phrase> e : phrases.entrySet()) {
 				Phrase p = e.getValue();
-				if (p.enablesKey != null && p.enablesKey.length() > 0) {
-					suppliedKeys.add(p.enablesKey);	
+				if (p.progressQuest != null) {
+					String q = p.progressQuest.questID;
+					int v = p.progressQuest.progress;
+					if (suppliedQuestStages.containsKey(q)) {
+						v = Math.max(v, suppliedQuestStages.get(q));
+					}
+					suppliedQuestStages.put(q, v);
 				}
 				if (e.getValue().replies.length <= 0) {
 					L.log("WARNING: Phrase \"" + e.getKey() + "\" has no replies.");
@@ -109,23 +122,30 @@ public class ConversationCollection {
 					if (!isValidPhraseID(r.nextPhrase)) {
 						L.log("WARNING: Phrase \"" + e.getKey() + "\" has reply to non-existing phrase \"" + r.nextPhrase + "\".");
 					}
-					if (r.requiresKey != null && r.requiresKey.length() > 0) {
-						String s = r.requiresKey;
-						if (s.startsWith("!")) s = s.substring(1);
-						requiredKeys.add(s);
+					if (r.requiresProgress != null) {
+						String q = r.requiresProgress.questID;
+						int v = r.requiresProgress.progress;
+						if (requiredQuestStages.containsKey(q)) {
+							v = Math.max(v, requiredQuestStages.get(q));
+						}
+						requiredQuestStages.put(q, v);	
 					}
 				}
     		}
 			
-			for(String s : requiredKeys) {
-				if (!suppliedKeys.contains(s)) {
-					L.log("WARNING: Key \"" + s + "\" is required but never supplied by any phrases.");
+			for(Entry<String, Integer> e : requiredQuestStages.entrySet()) {
+				if (!suppliedQuestStages.containsKey(e.getKey())) {
+					L.log("WARNING: Quest \"" + e.getKey() + "\" is required but never supplied by any phrases.");
+				} else if (suppliedQuestStages.get(e.getKey()) < e.getValue()) {
+					L.log("WARNING: Quest \"" + e.getKey() + "\" requires stage " + e.getValue() + ", but that stage is never supplied by any phrases.");
 				}
 			}
 
-			for(String s : suppliedKeys) {
-				if (!requiredKeys.contains(s)) {
-					L.log("OPTIMIZE: Key \"" + s + "\" is supplied but never required by any phrases.");
+			for(Entry<String, Integer> e : suppliedQuestStages.entrySet()) {
+				if (!requiredQuestStages.containsKey(e.getKey())) {
+					L.log("WARNING: Quest \"" + e.getKey() + "\" is supplied but never required by any phrases.");
+				} else if (requiredQuestStages.get(e.getKey()) < e.getValue()) {
+					L.log("WARNING: Quest \"" + e.getKey() + "\" supplies stage " + e.getValue() + ", but that stage is never required by any phrases.");
 				}
 			}
     	}
@@ -165,4 +185,25 @@ public class ConversationCollection {
     		}
     	}
     }
+	
+	// Selftest method. Not part of the game logic.
+	public void verifyData(QuestCollection quests) {
+    	if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {
+    		for (Phrase p : phrases.values()) {
+				if (p.progressQuest != null) {
+					quests.getQuestLogEntry(p.progressQuest); // Will warn inside if invalid.
+    			}
+    		}
+    	}
+    }
+
+	// Selftest method. Not part of the game logic.
+	public void DEBUG_getRequiredQuestStages(HashSet<String> requiredStages) {
+		if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {
+			for (Phrase p : phrases.values()) {
+				if (p.progressQuest == null) continue;
+				requiredStages.add(p.progressQuest.toString());
+			}
+		}
+	}
 }
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/conversation/Phrase.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/conversation/Phrase.java
index f363eaf67..14c7ab5df 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/conversation/Phrase.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/conversation/Phrase.java
@@ -1,36 +1,35 @@
 package com.gpl.rpg.AndorsTrail.conversation;
 
+import com.gpl.rpg.AndorsTrail.model.item.DropList;
+import com.gpl.rpg.AndorsTrail.model.quest.QuestProgress;
+
 public final class Phrase {
 	public static final Reply[] NO_REPLIES = new Reply[0];
 	
 	public final String message;
 	public final Reply[] replies;
-	public final String enablesKey;
-	public final int rewardExperience;
-	public final int rewardGold;
+	public final QuestProgress progressQuest; 	// If this phrase is reached, this quest will be updated.
+	public final DropList rewardDropList; 	// If this phrase is reached, player will be awarded all these items
 	
-	public Phrase(String message, Reply[] replies, String enablesKey, int rewardExperience, int rewardGold) {
+	public Phrase(String message, Reply[] replies, QuestProgress progressQuest, DropList rewardDropList) {
 		this.message = message;
 		if (replies == null) replies = NO_REPLIES;
 		this.replies = replies;
-		if (enablesKey != null && enablesKey.length() <= 0) enablesKey = null;
-		this.enablesKey = enablesKey;
-		this.rewardExperience = rewardExperience;
-		this.rewardGold = rewardGold;
+		this.progressQuest = progressQuest;
+		this.rewardDropList = rewardDropList;
 	}
 
 	public static final class Reply {
 		public final String text;
 		public final String nextPhrase;
-		public final String requiresKey;
+		public final QuestProgress requiresProgress;
 		public final int requiresItemTypeID;
 		public final int requiresItemQuantity;
 		
-		public Reply(String text, String nextPhrase, String requiresKey, int requiresItemTypeID, int requiresItemQuantity) {
+		public Reply(String text, String nextPhrase, QuestProgress requiresProgress, int requiresItemTypeID, int requiresItemQuantity) {
 			this.text = text;
 			this.nextPhrase = nextPhrase;
-			if (requiresKey != null && requiresKey.length() <= 0) requiresKey = null;
-			this.requiresKey = requiresKey;
+			this.requiresProgress = requiresProgress;
 			this.requiresItemTypeID = requiresItemTypeID;
 			this.requiresItemQuantity = requiresItemQuantity;
 		}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/InterfaceData.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/InterfaceData.java
index a8fbbadd2..8c3db9cf7 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/InterfaceData.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/InterfaceData.java
@@ -9,21 +9,12 @@ import com.gpl.rpg.AndorsTrail.model.actor.Monster;
 import com.gpl.rpg.AndorsTrail.util.Coord;
 
 public final class InterfaceData {
-	public boolean isTicking = false;
+	public boolean isMainActivityVisible = false;
 	public boolean isInCombat = false;
     public Monster selectedMonster;
 	public Coord selectedPosition;
 	public String selectedTabHeroInfo = "";
-	
-	//Loaded from shared preferences, should not be parceled.
-	public boolean confirmRest = true;
-	public boolean confirmAttack = true;
-	public int displayLoot = DISPLAYLOOT_DIALOG;
-	public static final int DISPLAYLOOT_DIALOG = 0;
-	public static final int DISPLAYLOOT_TOAST = 1;
-	public static final int DISPLAYLOOT_NONE = 2;
-	public boolean fullscreen = true;
-	
+	public int selectedQuestFilter = 0; // Should not be parceled
 	
 	public InterfaceData() { }
 	
@@ -31,7 +22,7 @@ public final class InterfaceData {
 	// ====== PARCELABLE ===================================================================
 
 	public InterfaceData(DataInputStream src, WorldContext world, int fileversion) throws IOException {
-		this.isTicking = src.readBoolean();
+		this.isMainActivityVisible = src.readBoolean();
 		this.isInCombat = src.readBoolean();
 		final boolean hasSelectedPosition = src.readBoolean();
 		if (hasSelectedPosition) {
@@ -43,7 +34,7 @@ public final class InterfaceData {
 	}
 	
 	public void writeToParcel(DataOutputStream dest, int flags) throws IOException {
-		dest.writeBoolean(isTicking);
+		dest.writeBoolean(isMainActivityVisible);
 		dest.writeBoolean(isInCombat);
 		if (selectedPosition != null) {
 			dest.writeBoolean(true);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ModelContainer.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ModelContainer.java
index 12066e6d8..4ce01b862 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ModelContainer.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ModelContainer.java
@@ -3,30 +3,13 @@ package com.gpl.rpg.AndorsTrail.model;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.util.Random;
-
-import android.content.SharedPreferences;
-import android.content.SharedPreferences.Editor;
 
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
 import com.gpl.rpg.AndorsTrail.model.actor.Player;
 import com.gpl.rpg.AndorsTrail.model.map.LayeredWorldMap;
-import com.gpl.rpg.AndorsTrail.util.ConstRange;
-import com.gpl.rpg.AndorsTrail.util.Range;
 
 public final class ModelContainer {
 	
-	public static final int millisecondsPerTurn = 1200;
-	public static final int attackAnimationDuration = 1000;
-	public static final int attackAnimationFPS = 10;
-	public static final int monsterAttackDelay = 1000;
-	public static final int tickDelay = 500;
-	public static final ConstRange monsterWaitTurns = new ConstRange(30,4);
-	public static final Random rnd = new Random();
-	//public static final String PREFERENCE_MODEL_SAVE = "savegame";
-	public static final String PREFERENCE_MODEL_QUICKSAVE = "quicksave";
-	public static final String PREFERENCE_MODEL_LASTRUNVERSION = "lastversion";
-	
 	public final Player player;
 	public final InterfaceData uiSelections;
 	public final GameStatistics statistics;
@@ -37,33 +20,6 @@ public final class ModelContainer {
 		uiSelections = new InterfaceData();
 		statistics = new GameStatistics();
 	}
-    
-	public static boolean roll100(final int chance) { return rnd.nextInt(100) < chance; }
-	public static int rollValue(final ConstRange r) { 
-		if (r.isMax()) return r.max;
-		else return rnd.nextInt(r.max - r.current) + r.current;
-	}
-	public static int rollValue(final Range r) { 
-		if (r.isMax()) return r.max;
-		else return rnd.nextInt(r.max - r.current + 1) + r.current;
-	}
-	public static boolean rollResult(final ConstRange r) { return rnd.nextInt(r.max) < r.current; }
-	public static boolean rollResult(final Range r) { return rnd.nextInt(r.max) < r.current; }
-
-
-	public void quicksave(Editor e) {
-		e.putString("playername", player.traits.name);
-		e.putInt("level", player.level);
-	}
-	
-	public boolean quickload(SharedPreferences p) {
-		String name = p.getString("playername", null);
-		if (name == null) return false;
-		player.traits.name = name;
-		player.level = p.getInt("level", -1);
-		return true;
-	}
-
 
 	// ====== PARCELABLE ===================================================================
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Monster.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Monster.java
index 125299b46..a238d4b49 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Monster.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Monster.java
@@ -5,9 +5,10 @@ import java.io.DataOutputStream;
 import java.io.IOException;
 
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
-import com.gpl.rpg.AndorsTrail.model.ModelContainer;
+import com.gpl.rpg.AndorsTrail.controller.Constants;
 import com.gpl.rpg.AndorsTrail.model.item.Loot;
 import com.gpl.rpg.AndorsTrail.util.Coord;
+import com.gpl.rpg.AndorsTrail.util.CoordRect;
 
 public final class Monster extends Actor {
 	public final MonsterType monsterType;
@@ -16,12 +17,14 @@ public final class Monster extends Actor {
 	public Coord movementDestination = null;
 	public long nextActionTime = 0;
 	public boolean forceAggressive = false;
+	public final CoordRect nextPosition;
 	
 	public Monster(MonsterType monsterType, Coord position) {
 		super(monsterType);
 		this.monsterType = monsterType;
 		this.position.set(position);
-		this.millisecondsPerMove = ModelContainer.millisecondsPerTurn / monsterType.getMovesPerTurn();
+		this.millisecondsPerMove = Constants.MONSTER_MOVEMENT_TURN_DURATION_MS / monsterType.getMovesPerTurn();
+		this.nextPosition = new CoordRect(new Coord(), traits.tileSize);
 	}
 	
 	public void createLoot(Loot container) {
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/MonsterTypeCollection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/MonsterTypeCollection.java
index d63ac07dd..6c0f8f409 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/MonsterTypeCollection.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/MonsterTypeCollection.java
@@ -7,6 +7,7 @@ import java.util.regex.Matcher;
 
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.Constants;
 import com.gpl.rpg.AndorsTrail.model.CombatTraits;
 import com.gpl.rpg.AndorsTrail.model.item.DropListCollection;
 import com.gpl.rpg.AndorsTrail.resource.DynamicTileLoader;
@@ -56,6 +57,7 @@ public final class MonsterTypeCollection {
         		}
     		}
         	
+    		
     		final int maxHP = ResourceLoader.parseInt(parts[5], 1);
     		final int maxAP = ResourceLoader.parseInt(parts[6], 10);
     		final CombatTraits combatTraits = ResourceLoader.parseCombatTraits(parts, 8);
@@ -64,8 +66,8 @@ public final class MonsterTypeCollection {
 				nextId
 				, monsterTypeName
 				, parts[2]
-				, ResourceLoader.parseImage(tileLoader, parts[0])
-				, ResourceLoader.parseSize(parts[3], size1x1)
+				, ResourceLoader.parseImageID(tileLoader, parts[0])
+				, ResourceLoader.parseSize(parts[3], size1x1) //TODO: This could be loaded from the tileset size instead.
 				, maxHP 	// HP
 				, maxAP		// AP
 				, ResourceLoader.parseInt(parts[7], 10)	// MoveCost
@@ -79,9 +81,6 @@ public final class MonsterTypeCollection {
     	}
     }
 
-	private static final int factor_damageresistance = 9;
-	private static final float factor_expscaling = 0.7f;
-
 	private static float div100(int v) {
 		return (float) v / 100f;
 	}
@@ -90,8 +89,8 @@ public final class MonsterTypeCollection {
 	}
 	private static int getExpectedMonsterExperience(final CombatTraits t, final int maxHP, final int maxAP) {
 		final float avgAttackHP  = t.getAttacksPerTurn(maxAP) * div100(t.attackChance) * t.damagePotential.averagef() * (1 + div100(t.criticalChance) * t.criticalMultiplier);
-		final float avgDefenseHP = maxHP * (1 + div100(t.blockChance)) + factor_damageresistance * t.damageResistance;
-		return (int) Math.ceil((avgAttackHP * 3 + avgDefenseHP) * factor_expscaling);
+		final float avgDefenseHP = maxHP * (1 + div100(t.blockChance)) + Constants.EXP_FACTOR_DAMAGERESISTANCE * t.damageResistance;
+		return (int) Math.ceil((avgAttackHP * 3 + avgDefenseHP) * Constants.EXP_FACTOR_SCALING);
 	}
 	
 	// Selftest method. Not part of the game logic.
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Player.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Player.java
index 03638d4b4..b56ff0c44 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Player.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Player.java
@@ -3,7 +3,9 @@ package com.gpl.rpg.AndorsTrail.model.actor;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Map.Entry;
 
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
@@ -12,6 +14,7 @@ import com.gpl.rpg.AndorsTrail.model.item.DropListCollection;
 import com.gpl.rpg.AndorsTrail.model.item.Inventory;
 import com.gpl.rpg.AndorsTrail.model.item.ItemTypeCollection;
 import com.gpl.rpg.AndorsTrail.model.item.Loot;
+import com.gpl.rpg.AndorsTrail.model.quest.QuestProgress;
 import com.gpl.rpg.AndorsTrail.resource.TileStore;
 import com.gpl.rpg.AndorsTrail.util.Coord;
 import com.gpl.rpg.AndorsTrail.util.Range;
@@ -24,7 +27,8 @@ public final class Player extends Actor {
 	public int totalExperience;
 	public final Range levelExperience; // ranges from 0 to the delta-amount of exp required for next level
 	public final Inventory inventory;
-	private final HashSet<String> keys = new HashSet<String>();
+	//private final HashSet<String> keys = new HashSet<String>();
+	private final HashMap<String, HashSet<Integer> > questProgress = new HashMap<String, HashSet<Integer> >();
 	public int useItemCost;
 	public int reequipCost;
 	public final int[] skillLevels = new int[Skills.NUM_SKILLS];
@@ -78,8 +82,35 @@ public final class Player extends Actor {
 		recalculateCombatTraits();
 	}
 	
-	public boolean hasKey(String key) { return keys.contains(key); }
-	public void addKey(String key) { if (!keys.contains(key)) keys.add(key); }
+	//public boolean hasKey(String key) { return keys.contains(key); }
+	//public void addKey(String key) { if (!keys.contains(key)) keys.add(key); }
+	
+
+	/*public boolean hasAtLeastQuestProgress(QuestProgress progress) { 
+		return getMaxQuestProgress(progress.questID) >= progress.progress; 
+	}*/
+	
+	/*public int getMaxQuestProgress(String questID) { 
+		if (!questProgress.containsKey(questID)) return QuestCollection.QUEST_PROGRESS_NOT_STARTED;
+		int maxProgress = 0;
+		for(int progress : questProgress.get(questID)) {
+			maxProgress = Math.max(maxProgress, progress);
+		}
+		return maxProgress;
+	}*/
+	public boolean hasExactQuestProgress(QuestProgress progress) { return hasExactQuestProgress(progress.questID, progress.progress); }
+	public boolean hasExactQuestProgress(String questID, int progress) {
+		if (!questProgress.containsKey(questID)) return false;
+		return questProgress.get(questID).contains(progress); 
+	}
+	public boolean hasAnyQuestProgress(String questID) {
+		return questProgress.containsKey(questID);
+	}
+	public void addQuestProgress(QuestProgress progress) {
+		if (hasExactQuestProgress(progress.questID, progress.progress)) return;
+		if (!questProgress.containsKey(progress.questID)) questProgress.put(progress.questID, new HashSet<Integer>());
+		questProgress.get(progress.questID).add(progress.progress); 
+	}
 	
 	public void recalculateCombatTraits() {
 		traits.set(traits.baseCombatTraits);
@@ -127,10 +158,50 @@ public final class Player extends Actor {
 		this.levelExperience = new Range();
 		this.recalculateLevelExperience();
 		this.inventory = new Inventory(src, world, fileversion);
-		this.keys.clear();
-		final int size1 = src.readInt();
-		for(int i = 0; i < size1; ++i) {
-			this.keys.add(src.readUTF());
+		
+		if (fileversion <= 13) {
+			final int size1 = src.readInt();
+			for(int i = 0; i < size1; ++i) {
+				String keyName = src.readUTF();
+				if ("mikhail_visited".equals(keyName)) addQuestProgress(new QuestProgress("andor", 1));
+				else if ("qmikhail_bread_complete".equals(keyName)) addQuestProgress(new QuestProgress("mikhail_bread", 100));
+				else if ("qmikhail_bread".equals(keyName)) addQuestProgress(new QuestProgress("mikhail_bread", 10));
+				else if ("qmikhail_rats_complete".equals(keyName)) addQuestProgress(new QuestProgress("mikhail_rats", 100));
+				else if ("qmikhail_rats".equals(keyName)) addQuestProgress(new QuestProgress("mikhail_rats", 10));
+				else if ("oromir".equals(keyName)) addQuestProgress(new QuestProgress("leta", 20));
+				else if ("qleta_complete".equals(keyName)) addQuestProgress(new QuestProgress("leta", 100));
+				else if ("qodair".equals(keyName)) addQuestProgress(new QuestProgress("odair", 10));
+				else if ("qodair_complete".equals(keyName)) addQuestProgress(new QuestProgress("odair", 100));
+				else if ("qleonid_bonemeal".equals(keyName)) {
+					addQuestProgress(new QuestProgress("bonemeal", 10));
+					addQuestProgress(new QuestProgress("bonemeal", 20));
+				}
+				else if ("qtharal_complete".equals(keyName)) addQuestProgress(new QuestProgress("bonemeal", 30));
+				else if ("qthoronir_complete".equals(keyName)) addQuestProgress(new QuestProgress("bonemeal", 100));
+				else if ("qleonid_andor".equals(keyName)) addQuestProgress(new QuestProgress("andor", 10));
+				else if ("qgruil_andor".equals(keyName)) addQuestProgress(new QuestProgress("andor", 20));
+				else if ("qgruil_andor_complete".equals(keyName)) addQuestProgress(new QuestProgress("andor", 30));
+				else if ("qleonid_crossglen".equals(keyName)) addQuestProgress(new QuestProgress("crossglen", 1));
+				else if ("qjan".equals(keyName)) addQuestProgress(new QuestProgress("jan", 10));
+				else if ("qjan_complete".equals(keyName)) addQuestProgress(new QuestProgress("jan", 100));
+				else if ("qbucus_thieves".equals(keyName)) addQuestProgress(new QuestProgress("andor", 40));
+				else if ("qfallhaven_derelict".equals(keyName)) addQuestProgress(new QuestProgress("andor", 50));
+				else if ("qfallhaven_drunk".equals(keyName)) addQuestProgress(new QuestProgress("fallhavendrunk", 10));
+				else if ("qfallhaven_drunk_complete".equals(keyName)) addQuestProgress(new QuestProgress("fallhavendrunk", 100));
+				else if ("qnocmar_unnmir".equals(keyName)) addQuestProgress(new QuestProgress("nocmar", 10));
+				else if ("qnocmar".equals(keyName)) addQuestProgress(new QuestProgress("nocmar", 20));
+				else if ("qnocmar_complete".equals(keyName)) addQuestProgress(new QuestProgress("nocmar", 200));
+				else if ("qfallhaven_tavern_room2".equals(keyName)) addQuestProgress(new QuestProgress("fallhaventavern", 10));
+				else if ("qarcir".equals(keyName)) addQuestProgress(new QuestProgress("arcir", 10));
+				else if ("qfallhaven_oldman".equals(keyName)) addQuestProgress(new QuestProgress("calomyran", 10));
+				else if ("qcalomyran_tornpage".equals(keyName)) addQuestProgress(new QuestProgress("calomyran", 20));
+				else if ("qfallhaven_oldman_complete".equals(keyName)) addQuestProgress(new QuestProgress("calomyran", 100));
+				else if ("qbucus".equals(keyName)) addQuestProgress(new QuestProgress("bucus", 10));
+				else if ("qthoronir_catacombs".equals(keyName)) addQuestProgress(new QuestProgress("bucus", 20));
+				else if ("qathamyr_complete".equals(keyName)) addQuestProgress(new QuestProgress("bucus", 40));
+				else if ("qfallhaven_church".equals(keyName)) addQuestProgress(new QuestProgress("bucus", 50));
+				else if ("qbucus_complete".equals(keyName)) addQuestProgress(new QuestProgress("bucus", 100));
+			}
 		}
 		this.useItemCost = src.readInt();
 		this.reequipCost = src.readInt();
@@ -142,10 +213,23 @@ public final class Player extends Actor {
 		this.spawnPlace = src.readUTF();
 		
 		if (fileversion <= 12) {
-			this.useItemCost = 5;
-			this.health.max += 5;
-			this.health.current += 5;
-			this.traits.maxHP += 5;
+			useItemCost = 5;
+			health.max += 5;
+			health.current += 5;
+			traits.maxHP += 5;
+		}
+
+		if (fileversion <= 13) return;
+		
+		final int numquests = src.readInt();
+		for(int i = 0; i < numquests; ++i) {
+			final String questID = src.readUTF();
+			questProgress.put(questID, new HashSet<Integer>());
+			final int numprogress = src.readInt();
+			for(int j = 0; j < numprogress; ++j) {
+				int progress = src.readInt();
+				questProgress.get(questID).add(progress);
+			}
 		}
 	}
 	
@@ -156,10 +240,6 @@ public final class Player extends Actor {
 		dest.writeInt(level);
 		dest.writeInt(totalExperience);
 		inventory.writeToParcel(dest, flags);
-		dest.writeInt(keys.size());
-		for (String k : keys) {
-			dest.writeUTF(k);
-		}
 		dest.writeInt(useItemCost);
 		dest.writeInt(reequipCost);
 		dest.writeInt(Skills.NUM_SKILLS);
@@ -168,6 +248,14 @@ public final class Player extends Actor {
 		}
 		dest.writeUTF(spawnMap);
 		dest.writeUTF(spawnPlace);
+		dest.writeInt(questProgress.size());
+		for(Entry<String, HashSet<Integer> > e : questProgress.entrySet()) {
+			dest.writeUTF(e.getKey());
+			dest.writeInt(e.getValue().size());
+			for(int progress : e.getValue()) {
+				dest.writeInt(progress);
+			}
+		}
 	}
 }
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/DropList.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/DropList.java
index 9bef4f0a6..ce12b2678 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/DropList.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/DropList.java
@@ -2,22 +2,26 @@ package com.gpl.rpg.AndorsTrail.model.item;
 
 import java.util.Collection;
 
-import com.gpl.rpg.AndorsTrail.model.ModelContainer;
+import com.gpl.rpg.AndorsTrail.controller.Constants;
 import com.gpl.rpg.AndorsTrail.util.ConstRange;
 
 public final class DropList {
 	private final DropItem[] items;
+	public final DropItem[] DEBUG_items;
+	
 	public DropList(DropItem[] items) {
 		this.items = items;
+		this.DEBUG_items = this.items;
 	}
 	public DropList(Collection<DropItem> items) {
 		this.items = items.toArray(new DropItem[items.size()]);
+		this.DEBUG_items = this.items;
 	}
 	public void createRandomLoot(Loot loot) {
 		for (DropItem item : items) {
-			if (ModelContainer.rollResult(item.chance)) {
-				int quantity = ModelContainer.rollValue(item.quantity);
-				if (quantity > 0) {
+			if (Constants.rollResult(item.chance)) {
+				int quantity = Constants.rollValue(item.quantity);
+				if (quantity != 0) {
 					if (item.itemType.id == ItemTypeCollection.ITEMTYPE_GOLD) {
 						loot.gold += quantity;
 					} else {
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/DropListCollection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/DropListCollection.java
index f821b42ee..86e056afa 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/DropListCollection.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/DropListCollection.java
@@ -2,9 +2,12 @@ package com.gpl.rpg.AndorsTrail.model.item;
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Map.Entry;
+import java.util.regex.Matcher;
 
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.model.item.DropList.DropItem;
+import com.gpl.rpg.AndorsTrail.resource.ResourceLoader;
 import com.gpl.rpg.AndorsTrail.util.ConstRange;
 import com.gpl.rpg.AndorsTrail.util.L;
 
@@ -24,293 +27,59 @@ public final class DropListCollection {
 		return droplists.get(name);
 	}
 	
-	public void initialize(ItemTypeCollection itemTypes) {
-		ArrayList<DropItem> items = new ArrayList<DropItem>();
-		final ConstRange one = new ConstRange(1, 1);
-		final ConstRange ten = new ConstRange(10, 10);
-		final ConstRange five = new ConstRange(5, 5);
-		final ConstRange always = one;
-		
-		if (AndorsTrailApplication.DEVELOPMENT_DEBUGRESOURCES) {
-			items.clear();
-			items.add(new DropItem(itemTypes.getItemType(ItemTypeCollection.ITEMTYPE_GOLD), new ConstRange(100, 100), new ConstRange(10, 0)));
-			items.add(new DropItem(itemTypes.getItemType(1), new ConstRange(100, 10), new ConstRange(1, 1)));
-			items.add(new DropItem(itemTypes.getItemType(2), new ConstRange(100, 50), new ConstRange(1, 1)));
-			droplists.put("list1", new DropList(items));
-			
-			items.clear();
-			for(int i = 1; i <= 20; ++i) {
-				items.add(new DropItem(itemTypes.getItemType(i), always, one));
-			}
-			droplists.put("shop1", new DropList(items));
-		}
-		
-		items.clear();
-		items.add(new DropItem(itemTypes.getItemType(ItemTypeCollection.ITEMTYPE_GOLD), always, new ConstRange(12, 12)));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("club1"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("shirt1"), always, one));
-		if (!AndorsTrailApplication.DEVELOPMENT_DEBUGRESOURCES) {
-			items.add(new DropItem(itemTypes.getItemTypeByTag("ring_mikhail"), always, one));
-		}
-		droplists.put(DROPLIST_STARTITEMS, new DropList(items));
-		
-		items.clear();
-		items.add(new DropItem(itemTypes.getItemTypeByTag("health_minor"), always, ten));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("health"), always, ten));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("health_major"), always, ten));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("ring_dmg1"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("ring_dmg2"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("ring_block1"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("ring_atkch1"), always, one));
-		droplists.put("shop_priest", new DropList(items));
-
-		items.clear();
-		items.add(new DropItem(itemTypes.getItemTypeByTag("apple_green"), always, five));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("meat"), always, five));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("meat_cooked"), always, five));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("Carrot"), always, five));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("Bread"), always, five));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("Mushroom"), always, five));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("Eggs"), always, five));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("Mead"), always, five));
-		droplists.put("shop_food", new DropList(items));
-
-		items.clear();
-		items.add(new DropItem(itemTypes.getItemTypeByTag("shirt1"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("shirt2"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("hat1"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("hat2"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("gloves1"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("gloves2"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("gloves3"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("gloves4"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("boots1"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("boots2"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("boots3"), always, one));
-		droplists.put("shop_clothes", new DropList(items));
-		
-		items.clear();
-		items.add(new DropItem(itemTypes.getItemTypeByTag("club1"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("club3"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("ironsword0"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("hammer0"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("hammer1"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("dagger0"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("dagger1"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("dagger2"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("shortsword1"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("ironsword1"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("ironsword2"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("broadsword1"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("broadsword2"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("steelsword1"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("axe1"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("axe2"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("armor1"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("armor2"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("armor3"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("shield1"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("shield3"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("shield4"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("shield5"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("boots1"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("boots5"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("hat3"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("hat4"), always, one));
-		droplists.put("shop_smith", new DropList(items));
-
-		items.clear();
-		items.add(new DropItem(itemTypes.getItemTypeByTag("shirt1"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("shirt2"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("gem1"), always, five));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("gem2"), always, five));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("gem3"), always, five));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("ring_dmg5"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("ring_dmg6"), always, one));
-		droplists.put("shop_thief", new DropList(items));
-		
-		items.clear();
-		items.add(new DropItem(itemTypes.getItemType(ItemTypeCollection.ITEMTYPE_GOLD), always, new ConstRange(2, 0)));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("tail_trainingrat"), always, one));
-		droplists.put("trainingrat", new DropList(items));
-		
-		final ConstRange seldom = new ConstRange(100, 30);
-		final ConstRange very_seldom = new ConstRange(100, 5);
-		//final ConstRange sometimes = new ConstRange(100, 50);
-		final ConstRange often = new ConstRange(100, 70);
-		final ConstRange animalpart = seldom;
-		
-		items.clear();
-		items.add(new DropItem(itemTypes.getItemType(ItemTypeCollection.ITEMTYPE_GOLD), always, new ConstRange(4, 2)));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("rat_tail"), animalpart, one));
-		droplists.put("rat", new DropList(items));
-		
-		items.clear();
-		items.add(new DropItem(itemTypes.getItemType(ItemTypeCollection.ITEMTYPE_GOLD), always, ten));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("tail_caverat"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("gem1"), very_seldom, one));
-		droplists.put("caveratboss", new DropList(items));
-
-		items.clear();
-		items.add(new DropItem(itemTypes.getItemType(ItemTypeCollection.ITEMTYPE_GOLD), often, new ConstRange(4, 2)));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("insectwing"), animalpart, one));
-		droplists.put("wasp", new DropList(items));
-		
-		items.clear();
-		items.add(new DropItem(itemTypes.getItemType(ItemTypeCollection.ITEMTYPE_GOLD), often, new ConstRange(4, 2)));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("shell"), animalpart, one));
-		droplists.put("insect", new DropList(items));
-		
-		items.clear();
-		items.add(new DropItem(itemTypes.getItemType(ItemTypeCollection.ITEMTYPE_GOLD), often, new ConstRange(6, 3)));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("gem1"), very_seldom, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("meat"), animalpart, one));
-		droplists.put("canine", new DropList(items));
-		
-		items.clear();
-		items.add(new DropItem(itemTypes.getItemType(ItemTypeCollection.ITEMTYPE_GOLD), often, new ConstRange(6, 3)));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("meat"), animalpart, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("gland"), very_seldom, one));
-		droplists.put("snake", new DropList(items));
-		
-		items.clear();
-		items.add(new DropItem(itemTypes.getItemType(ItemTypeCollection.ITEMTYPE_GOLD), often, new ConstRange(15, 5)));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("gem2"), seldom, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("health_minor"), seldom, one));
-		droplists.put("lich1", new DropList(items));
-
-		items.clear();
-		items.add(new DropItem(itemTypes.getItemType(ItemTypeCollection.ITEMTYPE_GOLD), often, new ConstRange(9, 9)));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("dagger_venom"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("gem3"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("health"), always, one));
-		droplists.put("snakemaster", new DropList(items));
-
-		items.clear();
-		items.add(new DropItem(itemTypes.getItemType(ItemTypeCollection.ITEMTYPE_GOLD), often, new ConstRange(10, 7)));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("hair"), animalpart, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("gem1"), seldom, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("meat"), animalpart, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("boots1"), seldom, one));
-		droplists.put("canineboss", new DropList(items));
-		
-		items.clear();
-		items.add(new DropItem(itemTypes.getItemType(ItemTypeCollection.ITEMTYPE_GOLD), often, new ConstRange(8, 4)));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("gem1"), seldom, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("claws"), animalpart, one));
-		droplists.put("cavecritter", new DropList(items));
-
-		items.clear();
-		items.add(new DropItem(itemTypes.getItemType(ItemTypeCollection.ITEMTYPE_GOLD), often, new ConstRange(12, 4)));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("gem2"), seldom, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("hammer0"), very_seldom, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("health_minor"), seldom, one));
-		droplists.put("cavemonster", new DropList(items));
-
-		items.clear();
-		items.add(new DropItem(itemTypes.getItemTypeByTag("neck_irogotu"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("ring_gandir"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("health"), always, one));
-		droplists.put("irogotu", new DropList(items));
-
-		items.clear();
-		items.add(new DropItem(itemTypes.getItemTypeByTag("vial_empty1"), seldom, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("gem1"), seldom, one));
-		droplists.put("haunt", new DropList(items));
-
-		items.clear();
-		//TODO: Fill with heartsteel items.
-		droplists.put("nocmar", new DropList(items));
-
-		items.clear();
-		items.add(new DropItem(itemTypes.getItemTypeByTag("ring1"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("ring2"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("shirt1"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("shirt2"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("gem1"), always, five));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("gem2"), always, five));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("gem3"), always, five));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("quickdagger1"), always, one));
-		droplists.put("ganos", new DropList(items));	
-		
-		items.clear();
-		items.add(new DropItem(itemTypes.getItemTypeByTag("shirt1"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("shirt2"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("shirt_dmgresist"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("ring1"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("ring2"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("boots3"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("gloves_attack1"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("gloves_attack2"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("jewel_fallhaven"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("ring_dmg1"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("ring_dmg2"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("ring_block1"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("ring_atkch1"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("necklace_shield1"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("necklace_shield2"), always, one));
-		droplists.put("fallhaven_clothes", new DropList(items));	
-
-		items.clear();
-		items.add(new DropItem(itemTypes.getItemTypeByTag("vial_empty1"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("vial_empty2"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("vial_empty3"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("vial_empty4"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("health_minor"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("health"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("health_major"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("milk"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("rat_tail"), always, five));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("Radish"), always, five));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("Strawberry"), always, five));
-		droplists.put("fallhaven_potions", new DropList(items));
-		
-		items.clear();
-		items.add(new DropItem(itemTypes.getItemTypeByTag("bonemeal_potion"), always, ten));
-		droplists.put("thoronir", new DropList(items));
-		
-		items.clear();
-		items.add(new DropItem(itemTypes.getItemType(ItemTypeCollection.ITEMTYPE_GOLD), often, new ConstRange(12, 4)));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("club1"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("calomyran_secrets"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("milk"), always, one));
-		droplists.put("larcal", new DropList(items));
-
-		items.clear();
-		items.add(new DropItem(itemTypes.getItemType(ItemTypeCollection.ITEMTYPE_GOLD), often, new ConstRange(12, 4)));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("gem2"), seldom, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("health"), seldom, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("vial_empty2"), seldom, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("gloves1"), very_seldom, one));
-		droplists.put("catacombguard", new DropList(items));
-
-		items.clear();
-		items.add(new DropItem(itemTypes.getItemType(ItemTypeCollection.ITEMTYPE_GOLD), often, new ConstRange(5, 1)));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("gem1"), seldom, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("vial_empty1"), seldom, one));
-		droplists.put("catacombrat", new DropList(items));
-
-		items.clear();
-		items.add(new DropItem(itemTypes.getItemType(ItemTypeCollection.ITEMTYPE_GOLD), often, new ConstRange(5, 1)));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("gem1"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("key_luthor"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("health_major"), always, one));
-		droplists.put("luthor", new DropList(items));
-
-		items.clear();
-		items.add(new DropItem(itemTypes.getItemType(ItemTypeCollection.ITEMTYPE_GOLD), often, new ConstRange(23, 16)));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("gem2"), seldom, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("health"), seldom, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("bone"), animalpart, one));
-		droplists.put("skeleton", new DropList(items));
-
-		items.clear();
-		items.add(new DropItem(itemTypes.getItemType(ItemTypeCollection.ITEMTYPE_GOLD), often, new ConstRange(30, 16)));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("gem3"), seldom, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("health"), seldom, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("bone"), always, one));
-		items.add(new DropItem(itemTypes.getItemTypeByTag("shield1"), seldom, one));
-		droplists.put("skeletonmaster", new DropList(items));
+	private final ConstRange one = new ConstRange(1, 1);
+	private final ConstRange ten = new ConstRange(10, 10);
+	private final ConstRange five = new ConstRange(5, 5);
+	private ConstRange parseQuantity(String v) {
+		if (v.equals("1")) return one;
+		else if (v.equals("5")) return five;
+		else if (v.equals("10")) return ten;
+		return ResourceLoader.parseRange(v);
+	}
+	
+	private final ConstRange always = one;
+	private final ConstRange often = new ConstRange(100, 70);
+	private final ConstRange animalpart = new ConstRange(100, 30);
+	private final ConstRange seldom = new ConstRange(100, 25);
+	private final ConstRange very_seldom = new ConstRange(100, 5);
+	private final ConstRange unique = new ConstRange(100, 1);
+	private ConstRange parseChance(String v) {
+		if (v.equals("100")) return always;
+		else if (v.equals("70")) return often;
+		else if (v.equals("30")) return animalpart;
+		else if (v.equals("25")) return seldom;
+		else if (v.equals("5")) return very_seldom;
+		else if (v.equals("1")) return unique;
+		else return new ConstRange(100, ResourceLoader.parseInt(v, 10));
+	}
+	public void initialize(ItemTypeCollection itemTypes, String droplistString) {
+		HashMap<String, ArrayList<DropItem> > rows = new HashMap<String, ArrayList<DropItem> >();
+		Matcher rowMatcher = ResourceLoader.rowPattern.matcher(droplistString);
+    	while(rowMatcher.find()) {
+    		String[] parts = rowMatcher.group(1).split(ResourceLoader.columnSeparator, -1);
+    		if (parts.length < 4) continue;
+    		
+    		final String droplistID = parts[0];
+    		
+    		if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {
+    			if (droplistID.trim().length() <= 0) {
+    				L.log("WARNING: Adding droplist with empty id.");
+    			} else if (droplists.containsKey(droplistID)) {
+    				L.log("WARNING: Droplist \"" + droplistID + "\" may be duplicated.");
+    			}
+    		}
+    		
+    		if (!rows.containsKey(droplistID)) rows.put(droplistID, new ArrayList<DropItem>());
+    		rows.get(droplistID).add(new DropItem(
+        			itemTypes.getItemTypeByTag(parts[1])
+          			, parseChance(parts[2])
+          			, parseQuantity(parts[3])
+      			));
+    	}
+    	
+    	for(Entry<String, ArrayList<DropItem>> e : rows.entrySet()) {
+    		droplists.put(e.getKey(), new DropList(e.getValue()));
+    	}
 	}
 	
 	// Selftest method. Not part of the game logic.
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemContainer.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemContainer.java
index b2c1fff09..da517ffd1 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemContainer.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemContainer.java
@@ -12,6 +12,14 @@ public class ItemContainer {
 	
 	public ItemContainer() {}
 	
+	public int countItems() {
+		int result = 0;
+		for (ItemEntry i : items) {
+			result += i.quantity;
+		}
+		return result;
+	}
+	
 	public static final class ItemEntry {
 		public final ItemType itemType;
 		public int quantity;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemTypeCollection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemTypeCollection.java
index 25bc31775..e0995d371 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemTypeCollection.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemTypeCollection.java
@@ -41,7 +41,7 @@ public final class ItemTypeCollection {
 			
     		itemTypes.add(new ItemType(
         			nextId
-        			, ResourceLoader.parseImage(tileLoader, parts[1])
+        			, ResourceLoader.parseImageID(tileLoader, parts[1])
         			, itemTypeName
 		        	, searchTag
         			, Integer.parseInt(parts[3])
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/KeyArea.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/KeyArea.java
deleted file mode 100644
index b2e2a2168..000000000
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/KeyArea.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.gpl.rpg.AndorsTrail.model.map;
-
-import com.gpl.rpg.AndorsTrail.util.CoordRect;
-
-public final class KeyArea {
-	public final CoordRect position;
-	public final String requiredKey;
-	public final String message;
-	
-	public KeyArea(final CoordRect position, final String requiredKey, final String message) {
-		this.position = new CoordRect(position);
-		this.requiredKey = requiredKey;
-		this.message = message;
-	}
-}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/LayeredWorldMap.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/LayeredWorldMap.java
index 56e6a77c8..460d9e6f9 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/LayeredWorldMap.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/LayeredWorldMap.java
@@ -7,7 +7,7 @@ import java.util.ArrayList;
 
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
-import com.gpl.rpg.AndorsTrail.model.ModelContainer;
+import com.gpl.rpg.AndorsTrail.controller.Constants;
 import com.gpl.rpg.AndorsTrail.model.actor.Monster;
 import com.gpl.rpg.AndorsTrail.model.actor.MonsterType;
 import com.gpl.rpg.AndorsTrail.model.item.ItemType;
@@ -26,7 +26,6 @@ public final class LayeredWorldMap {
 	public final Size size;
 	public final MapLayer[] layers;
 	public final MapObject[] eventObjects;
-	public final KeyArea[] keyAreas;
 	public final MonsterSpawnArea[] spawnAreas;
 	public final ArrayList<Loot> groundBags = new ArrayList<Loot>();
 	//public final boolean hasFOW;
@@ -34,11 +33,10 @@ public final class LayeredWorldMap {
 	public final boolean[][] isWalkable;
 	public boolean visited = false;
 	
-	public LayeredWorldMap(String name, Size size, MapLayer[] layers, boolean[][] isWalkable, MapObject[] eventObjects, KeyArea[] keyAreas, MonsterSpawnArea[] spawnAreas, boolean hasFOW) {
+	public LayeredWorldMap(String name, Size size, MapLayer[] layers, boolean[][] isWalkable, MapObject[] eventObjects, MonsterSpawnArea[] spawnAreas, boolean hasFOW) {
 		this.name = name;
 		this.size = size;
 		this.eventObjects = eventObjects;
-		this.keyAreas = keyAreas;
 		this.spawnAreas = spawnAreas;
 		assert(size.width > 0);
 		assert(size.height > 0);
@@ -111,24 +109,25 @@ public final class LayeredWorldMap {
 		return null;
 	}
 	
-	private boolean spawnInArea(MonsterSpawnArea a, WorldContext context) {
-		return spawnInArea(a, a.getRandomMonsterType(context));
+	private boolean spawnInArea(MonsterSpawnArea a, WorldContext context, Coord playerPosition) {
+		return spawnInArea(a, a.getRandomMonsterType(context), playerPosition);
 	}
-	public boolean TEST_spawnInArea(MonsterSpawnArea a, MonsterType type) { return spawnInArea(a, type); }
-	private boolean spawnInArea(MonsterSpawnArea a, MonsterType type) {
-		Coord p = getRandomFreePosition(a.area, type.tileSize);
+	public boolean TEST_spawnInArea(MonsterSpawnArea a, MonsterType type) { return spawnInArea(a, type, null); }
+	private boolean spawnInArea(MonsterSpawnArea a, MonsterType type, Coord playerPosition) {
+		Coord p = getRandomFreePosition(a.area, type.tileSize, playerPosition);
 		if (p == null) return false;
 		a.spawn(p, type);
 		return true;
 	}
 	
-	private Coord getRandomFreePosition(CoordRect area, Size requiredSize) {
+	public Coord getRandomFreePosition(CoordRect area, Size requiredSize, Coord playerPosition) {
 		CoordRect p = new CoordRect(requiredSize);
 		for(int i = 0; i < 100; ++i) {
 			p.topLeft.set(
-					area.topLeft.x + ModelContainer.rnd.nextInt(area.size.width)
-					,area.topLeft.y + ModelContainer.rnd.nextInt(area.size.height));
+					area.topLeft.x + Constants.rnd.nextInt(area.size.width)
+					,area.topLeft.y + Constants.rnd.nextInt(area.size.height));
 			if (!monsterCanMoveTo(p)) continue;
+			if (playerPosition != null && p.contains(playerPosition)) continue;
 			return p.topLeft;
 		} 
 		return null; // Couldn't find a free spot.
@@ -146,8 +145,10 @@ public final class LayeredWorldMap {
 		if (!visited) respawnUniqueMonsters = true;
 		for (MonsterSpawnArea a : spawnAreas) {
 			while (a.isSpawnable(respawnUniqueMonsters)) {
-				spawnInArea(a, context);
+				final boolean wasAbleToSpawn = spawnInArea(a, context, null);
+				if (!wasAbleToSpawn) break;
 			}
+			a.healAllMonsters();
 		}
 	}
 	public boolean maybeSpawn(WorldContext context) {
@@ -155,7 +156,7 @@ public final class LayeredWorldMap {
 		for (MonsterSpawnArea a : spawnAreas) {
 			if (!a.isSpawnable(false)) continue;
 			if (!a.rollShouldSpawn()) continue;
-			if (spawnInArea(a, context)) hasSpawned = true;
+			if (spawnInArea(a, context, context.model.player.position)) hasSpawned = true;
 		}
 		return hasSpawned;
 	}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapCollection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapCollection.java
index 3c941fbe3..866a8d619 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapCollection.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapCollection.java
@@ -4,6 +4,7 @@ import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.HashSet;
 
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
@@ -39,7 +40,7 @@ public final class MapCollection {
 						final String desc = "Map \"" + m.name + "\", place \"" + o.title + "\"";
 						if (o.map == null || o.map.length() <= 0) {
 							L.log("OPTIMIZE: " + desc + " has no destination map.");
-						} else if (o.place_or_key == null || o.place_or_key.length() <= 0) {
+						} else if (o.place == null || o.place.length() <= 0) {
 							L.log("OPTIMIZE: " + desc + " has no destination place.");
 						} else {
 							LayeredWorldMap destination = findPredefinedMap(o.map);
@@ -47,18 +48,22 @@ public final class MapCollection {
 								L.log("WARNING: " + desc + " references non-existing destination map \"" + o.map + "\".");
 								continue;
 							}
-							MapObject place = destination.findEventObject(MapObject.MAPEVENT_NEWMAP, o.place_or_key);
+							MapObject place = destination.findEventObject(MapObject.MAPEVENT_NEWMAP, o.place);
 							if (place == null) {
-								L.log("WARNING: " + desc + " references non-existing destination place \"" + o.place_or_key + "\" on map \"" + o.map + "\".");
+								L.log("WARNING: " + desc + " references non-existing destination place \"" + o.place + "\" on map \"" + o.map + "\".");
 								continue;
 							}
 							
 							if (!m.name.equalsIgnoreCase(place.map)) {
-								L.log("WARNING: " + desc + " references destination place \"" + o.place_or_key + "\" on map \"" + o.map + "\", but that place does not reference back to this map.");
+								L.log("WARNING: " + desc + " references destination place \"" + o.place + "\" on map \"" + o.map + "\", but that place does not reference back to this map.");
 								continue;
 							}
-							if (!o.title.equalsIgnoreCase(place.place_or_key)) {
-								L.log("WARNING: " + desc + " references destination place \"" + o.place_or_key + "\" on map \"" + o.map + "\", but that place does not reference back to this place.");
+							if (!o.title.equalsIgnoreCase(place.place)) {
+								L.log("WARNING: " + desc + " references destination place \"" + o.place + "\" on map \"" + o.map + "\", but that place does not reference back to this place.");
+								continue;
+							}
+							if (!o.position.size.equals(place.position.size)) {
+								L.log("WARNING: " + desc + " references destination place \"" + o.place + "\" on map \"" + o.map + "\", with different mapchange size.");
 								continue;
 							}
 						}
@@ -68,18 +73,32 @@ public final class MapCollection {
 		}
 	}
 
+	// Selftest method. Not part of the game logic.
+	public void DEBUG_getRequiredQuestStages(HashSet<String> requiredStages) {
+		if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {
+			for (LayeredWorldMap m : predefinedMaps) {
+				for (MapObject o : m.eventObjects) {
+					if (o.type == MapObject.MAPEVENT_SIGN) {
+						if (o.questProgress == null) continue;
+						requiredStages.add(o.questProgress.toString());
+					}
+				}
+			}
+		}
+	}
+
 
 	// ====== PARCELABLE ===================================================================
 
 	public void readFromParcel(DataInputStream src, WorldContext world, int fileversion) throws IOException {
 		int size;
-		if (fileversion == 5) {
-			size = 11;
-		} else {
-			size = src.readInt();
-		}
+		if (fileversion == 5) size = 11;
+		else size = src.readInt();
 		for(int i = 0; i < size; ++i) {
 			predefinedMaps.get(i).readFromParcel(src, world, fileversion);
+			if (i >= 40) {
+				if (fileversion < 15) predefinedMaps.get(i).visited = false;
+			}
 		}
 	}
 	
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapObject.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapObject.java
index d99e61b84..2b7919e1b 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapObject.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapObject.java
@@ -1,35 +1,42 @@
 package com.gpl.rpg.AndorsTrail.model.map;
 
+import com.gpl.rpg.AndorsTrail.model.quest.QuestProgress;
 import com.gpl.rpg.AndorsTrail.util.CoordRect;
 
 public final class MapObject {
 	public static final int MAPEVENT_SIGN = 1;
 	public static final int MAPEVENT_NEWMAP = 2;
 	public static final int MAPEVENT_REST = 3;
+	public static final int MAPEVENT_KEYAREA = 4;
 	
 	public final CoordRect position;
 	public final int type;
 	public final String text;
 	public final String title;
 	public final String map;
-	public final String place_or_key;
+	public final String place;
+	public final QuestProgress questProgress;
 	
-	private MapObject(final CoordRect position, final int type, final String title, final String text, final String map, final String place) {
+	private MapObject(final CoordRect position, final int type, final String title, final String text, final String map, final String place, final QuestProgress questProgress) {
 		this.position = new CoordRect(position);
 		this.type = type;
 		this.title = title;
 		this.text = text;
 		this.map = map;
-		this.place_or_key = place;
+		this.place = place;
+		this.questProgress = questProgress;
 	}
 	
-	public static MapObject createMapSignEvent(final CoordRect position, final String title, final String text, final String enableKey) {
-		return new MapObject(position, MAPEVENT_SIGN, title, text, null, enableKey);
+	public static MapObject createMapSignEvent(final CoordRect position, final String title, final String text, final QuestProgress applyQuestStage) {
+		return new MapObject(position, MAPEVENT_SIGN, title, text, null, null, applyQuestStage);
 	}
 	public static MapObject createNewMapEvent(final CoordRect position, final String thisMapTitle, final String destinationMap, final String destinationPlace) {
-		return new MapObject(position, MAPEVENT_NEWMAP, thisMapTitle, null, destinationMap, destinationPlace);
+		return new MapObject(position, MAPEVENT_NEWMAP, thisMapTitle, null, destinationMap, destinationPlace, null);
 	}
 	public static MapObject createNewRest(final CoordRect position) {
-		return new MapObject(position, MAPEVENT_REST, null, null, null, null);
+		return new MapObject(position, MAPEVENT_REST, null, null, null, null, null);
+	}
+	public static MapObject createNewKeyArea(final CoordRect position, final String text, final QuestProgress requireQuestStage) {
+		return new MapObject(position, MAPEVENT_KEYAREA, null, text, null, null, requireQuestStage);
 	}
 }
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MonsterSpawnArea.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MonsterSpawnArea.java
index 5774a0c5b..79636857f 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MonsterSpawnArea.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MonsterSpawnArea.java
@@ -6,7 +6,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
-import com.gpl.rpg.AndorsTrail.model.ModelContainer;
+import com.gpl.rpg.AndorsTrail.controller.Constants;
 import com.gpl.rpg.AndorsTrail.model.actor.Monster;
 import com.gpl.rpg.AndorsTrail.model.actor.MonsterType;
 import com.gpl.rpg.AndorsTrail.util.Coord;
@@ -43,12 +43,17 @@ public final class MonsterSpawnArea {
 		return null;
 	}
 
+	public void healAllMonsters() {
+		for (Monster m : monsters) {
+			m.setMaxHP();
+		}
+	}
 	public void spawn(Coord p, WorldContext context) {
-		final int monsterTypeID = monsterTypeIDs[ModelContainer.rnd.nextInt(monsterTypeIDs.length)];
+		final int monsterTypeID = monsterTypeIDs[Constants.rnd.nextInt(monsterTypeIDs.length)];
 		spawn(p, monsterTypeID, context);
 	}
 	public MonsterType getRandomMonsterType(WorldContext context) {
-		final int monsterTypeID = monsterTypeIDs[ModelContainer.rnd.nextInt(monsterTypeIDs.length)];
+		final int monsterTypeID = monsterTypeIDs[Constants.rnd.nextInt(monsterTypeIDs.length)];
 		return context.monsterTypes.getMonsterType(monsterTypeID);
 	}
 	public void spawn(Coord p, int monsterTypeID, WorldContext context) {
@@ -69,7 +74,7 @@ public final class MonsterSpawnArea {
 	}
 
 	public boolean rollShouldSpawn() {
-		return ModelContainer.rollResult(spawnChance);
+		return Constants.rollResult(spawnChance);
 	}
 
 	public void reset() {
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/TMXMapReader.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/TMXMapReader.java
index a39a0f2a8..d1df55bf1 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/TMXMapReader.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/TMXMapReader.java
@@ -12,6 +12,7 @@ import org.xmlpull.v1.XmlPullParserException;
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.model.actor.MonsterType;
 import com.gpl.rpg.AndorsTrail.model.actor.MonsterTypeCollection;
+import com.gpl.rpg.AndorsTrail.model.quest.QuestProgress;
 import com.gpl.rpg.AndorsTrail.resource.DynamicTileLoader;
 import com.gpl.rpg.AndorsTrail.util.Base64;
 import com.gpl.rpg.AndorsTrail.util.Coord;
@@ -240,7 +241,6 @@ public final class TMXMapReader {
 			
 			ArrayList<MapObject> mapObjects = new ArrayList<MapObject>();
 			ArrayList<MonsterSpawnArea> spawnAreas = new ArrayList<MonsterSpawnArea>();
-			ArrayList<KeyArea> keyAreas = new ArrayList<KeyArea>();
 			
 			for (TMXObjectGroup group : m.objectGroups) {
 				for (TMXObject object : group.objects) {
@@ -255,14 +255,14 @@ public final class TMXMapReader {
 					if (object.type.equalsIgnoreCase("sign")) {
 						String title = object.name; 
 						String text = null;
-						String enableKey = null;
+						QuestProgress enableQuestStage = null;
 						for (TMXProperty p : object.properties) {
 							if(p.name.equalsIgnoreCase("text")) text = p.value;
 							else if(p.name.equalsIgnoreCase("title")) title = p.value;
-							else if(p.name.equalsIgnoreCase("enablekey")) enableKey = p.value;
+							else if(p.name.equalsIgnoreCase("enablekey")) enableQuestStage = QuestProgress.parseQuestProgress(p.value);
 							else if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) L.log("OPTIMIZE: Map " + m.name + ", sign " + object.name + "  has unrecognized property \"" + p.name + "\".");
 						}
-						mapObjects.add(MapObject.createMapSignEvent(position, title, text, enableKey));
+						mapObjects.add(MapObject.createMapSignEvent(position, title, text, enableQuestStage));
 					} else if (object.type.equalsIgnoreCase("mapchange")) {
 						String map = null;
 						String place = null;
@@ -314,7 +314,13 @@ public final class TMXMapReader {
 							);
 						spawnAreas.add(area);
 					} else if (object.type.equalsIgnoreCase("key")) {
-						String requiredKey = object.name;
+						QuestProgress requireQuestStage = QuestProgress.parseQuestProgress(object.name);
+						if (requireQuestStage == null) {
+							if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {
+								L.log("OPTIMIZE: Map " + m.name + " contains key area that cannot be parsed as a quest stage.");
+							}
+							continue;
+						}
 						String message = "";
 						for (TMXProperty p : object.properties) {
 							if (p.name.equalsIgnoreCase("message")) {
@@ -324,7 +330,7 @@ public final class TMXMapReader {
 							}
 						}
 						
-						keyAreas.add(new KeyArea(position, requiredKey, message));
+						mapObjects.add(MapObject.createNewKeyArea(position, message, requireQuestStage));
 					} else if (object.type.equals("rest")) {
 						mapObjects.add(MapObject.createNewRest(position));
 					} else if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {
@@ -336,10 +342,8 @@ public final class TMXMapReader {
 			_eventObjects = mapObjects.toArray(_eventObjects);
 			MonsterSpawnArea[] _spawnAreas = new MonsterSpawnArea[spawnAreas.size()];
 			_spawnAreas = spawnAreas.toArray(_spawnAreas);
-			KeyArea[] _keyAreas = new KeyArea[keyAreas.size()];
-			_keyAreas = keyAreas.toArray(_keyAreas);
 
-			result.add(new LayeredWorldMap(m.name, mapSize, layers, isWalkable, _eventObjects, _keyAreas, _spawnAreas, false));
+			result.add(new LayeredWorldMap(m.name, mapSize, layers, isWalkable, _eventObjects, _spawnAreas, false));
 		}
 		
 		return result;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/Quest.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/Quest.java
new file mode 100644
index 000000000..7acf41696
--- /dev/null
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/Quest.java
@@ -0,0 +1,27 @@
+package com.gpl.rpg.AndorsTrail.model.quest;
+
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+
+public final class 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 Quest(String questID, String name, QuestLogEntry[] stages, boolean showInLog) {
+		this.questID = questID;
+		this.name = name;
+		this.stages = stages;
+		this.showInLog = showInLog;
+	}
+	
+	public boolean isCompleted(final Player player) {
+		for (QuestLogEntry e : stages) {
+			if (!e.finishesQuest) continue;
+			if (player.hasExactQuestProgress(questID, e.progress)) {
+				return true;
+			}
+		}
+		return false;
+	}
+}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/QuestCollection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/QuestCollection.java
new file mode 100644
index 000000000..61845b22f
--- /dev/null
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/QuestCollection.java
@@ -0,0 +1,55 @@
+package com.gpl.rpg.AndorsTrail.model.quest;
+
+import java.util.HashSet;
+
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.conversation.ConversationCollection;
+import com.gpl.rpg.AndorsTrail.model.map.MapCollection;
+import com.gpl.rpg.AndorsTrail.util.L;
+
+public final class QuestCollection {
+	public static final int QUEST_PROGRESS_NOT_STARTED = -1;
+	
+	public Quest[] quests;
+	public QuestLogEntry getQuestLogEntry(final QuestProgress stage) {
+		Quest q = getQuest(stage.questID);
+		if (q == null) return null;
+		
+		for (QuestLogEntry s : q.stages) {
+			if (s.progress >= stage.progress) return s;
+		}
+		if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {
+			L.log("WARNING: Cannot find stage " + stage.progress + " in quest \"" + stage.questID + "\".");
+		}
+		return null;
+	}
+	
+	public Quest getQuest(final String questID) {
+		for (Quest q : quests) {
+			if (q.questID.equals(questID)) {
+				return q;
+			}
+		}
+		if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {
+			L.log("WARNING: Cannot find quest \"" + questID + "\".");
+		}
+		return null;
+	}
+
+	// Selftest method. Not part of the game logic.
+	public void verifyData(MapCollection maps, ConversationCollection conversations) {
+		if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {
+			HashSet<String> requiredStages = new HashSet<String>();
+			maps.DEBUG_getRequiredQuestStages(requiredStages);
+			conversations.DEBUG_getRequiredQuestStages(requiredStages);
+			for (Quest q : quests) {
+				for (QuestLogEntry e : q.stages) {
+					String s = q.questID + ":" + e.progress;
+	    			if (!requiredStages.contains(s)) {
+	    				L.log("OPTIMIZE: Quest stage \"" + s + "\" cannot be reached by any maparea or conversation phrase.");
+	    			}
+				}
+    		}	
+		}
+	}
+}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/QuestLoader.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/QuestLoader.java
new file mode 100644
index 000000000..ce62e4ca9
--- /dev/null
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/QuestLoader.java
@@ -0,0 +1,105 @@
+package com.gpl.rpg.AndorsTrail.model.quest;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.regex.Matcher;
+
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.resource.ResourceLoader;
+import com.gpl.rpg.AndorsTrail.util.L;
+
+public final class QuestLoader {
+	
+	private HashMap<String, ArrayList<QuestLogEntry> > parsedQuestLogEntries = new HashMap<String, ArrayList<QuestLogEntry> >();
+	public void parseQuestLogsFromString(String questLogEntrylist) {
+		Matcher rowMatcher = ResourceLoader.rowPattern.matcher(questLogEntrylist);
+    	while(rowMatcher.find()) {
+    		String[] parts = rowMatcher.group(1).split(ResourceLoader.columnSeparator, -1);
+    		if (parts.length < 4) continue;
+    		
+    		final String questID = parts[0];
+    		
+    		if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {
+    			if (questID.trim().length() <= 0) {
+    				L.log("WARNING: Quest log phrase with empty quest id.");
+    			}
+    		}
+    		
+    		if (!parsedQuestLogEntries.containsKey(questID)) parsedQuestLogEntries.put(questID, new ArrayList<QuestLogEntry>());
+    		parsedQuestLogEntries.get(questID).add(new QuestLogEntry(
+    				ResourceLoader.parseInt(parts[1], 0)
+    				, parts[2]
+    				, ResourceLoader.parseInt(parts[3], 0)
+    		       	, ResourceLoader.parseInt(parts[4], 0)>0
+    			));
+    	}
+	}
+	
+	public Quest[] parseQuestsFromString(String questlist) {
+		ArrayList<Quest> result = new ArrayList<Quest>();
+		
+		Matcher rowMatcher = ResourceLoader.rowPattern.matcher(questlist);
+    	while(rowMatcher.find()) {
+    		String[] parts = rowMatcher.group(1).split(ResourceLoader.columnSeparator, -1);
+    		if (parts.length < 4) continue;
+    		
+    		final String questID = parts[0];
+    		
+    		if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {
+    			if (questID.trim().length() <= 0) {
+    				L.log("WARNING: Quest phrase with empty id.");
+    			} else if (contains(result, questID)) {
+    				L.log("WARNING: Quest \"" + questID + "\" may be duplicated.");
+    			}
+    		}
+    		
+    		ArrayList<QuestLogEntry> stages;
+    		if (parsedQuestLogEntries.containsKey(questID)) {
+    			stages = parsedQuestLogEntries.get(questID);
+    			Collections.sort(stages, new Comparator<QuestLogEntry>() {
+    				@Override
+    				public int compare(QuestLogEntry a, QuestLogEntry b) {
+    					return a.progress - b.progress;
+    				}
+    			});
+    		} else {
+    			if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {
+    				L.log("WARNING: Quest \"" + questID + "\" has no log entries.");
+    			}
+    			stages = new ArrayList<QuestLogEntry>();
+    		}
+    		if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {
+    			parsedQuestLogEntries.remove(questID);
+    		}
+    		QuestLogEntry[] _stages = new QuestLogEntry[stages.size()];
+    		_stages = stages.toArray(_stages);
+    		
+    		result.add(new Quest(
+    				questID
+        			, parts[1]
+        			, _stages
+        			, ResourceLoader.parseInt(parts[3], 0)>0
+    			));
+    	}
+    	
+    	if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {
+    		for (String s : parsedQuestLogEntries.keySet()) {
+    			L.log("WARNING: Quest log entries for quest \"" + s + "\" has no corresponding quest.");
+    		}
+		}
+    	
+    	
+    	Quest[] _result = new Quest[result.size()];
+    	_result = result.toArray(_result);
+    	return _result;
+	}
+	
+	private boolean contains(ArrayList<Quest> haystack, String needleQuestID) {
+		for (Quest q : haystack) {
+			if (q.questID.equals(needleQuestID)) return true;
+		}
+		return false;
+	}
+}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/QuestLogEntry.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/QuestLogEntry.java
new file mode 100644
index 000000000..4b6d8b131
--- /dev/null
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/QuestLogEntry.java
@@ -0,0 +1,15 @@
+package com.gpl.rpg.AndorsTrail.model.quest;
+
+public final class QuestLogEntry {
+	public final int progress;
+	public final String logtext;
+	public final int rewardExperience;
+	public final boolean finishesQuest;
+	
+	public QuestLogEntry(int progress, String logtext, int rewardExperience, boolean finishesQuest) {
+		this.progress = progress;
+		this.logtext = logtext;
+		this.rewardExperience = rewardExperience;
+		this.finishesQuest = finishesQuest;
+	}
+}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/QuestProgress.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/QuestProgress.java
new file mode 100644
index 000000000..84328565a
--- /dev/null
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/QuestProgress.java
@@ -0,0 +1,32 @@
+package com.gpl.rpg.AndorsTrail.model.quest;
+
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.resource.ResourceLoader;
+import com.gpl.rpg.AndorsTrail.util.L;
+
+public final class QuestProgress {
+	public final String questID;
+	public final int progress;
+	public QuestProgress(String questID, int progress) {
+		this.questID = questID;
+		this.progress = progress;
+	}
+	
+	public static QuestProgress parseQuestProgress(String v) {
+		if (v == null || v.length() <= 0) return null;
+		String[] parts = v.split(":");
+		int requiresQuestProgress = 0;
+		if (parts.length >= 2) {
+			requiresQuestProgress = ResourceLoader.parseInt(parts[1], 0);
+		} else if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {
+			L.log("WARNING: Quest progress \"" + v + "\" does not specify any progress stage.");
+		}
+		final String requiresQuestID = parts[0];
+		return new QuestProgress(requiresQuestID, requiresQuestProgress);
+	}
+	
+	@Override
+	public String toString() {
+		return questID + ":" + progress;
+	}
+}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/DynamicTileLoader.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/DynamicTileLoader.java
index a6c8e4118..f89eb5343 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/DynamicTileLoader.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/DynamicTileLoader.java
@@ -52,7 +52,9 @@ public final class DynamicTileLoader {
 	public int getTileID(int tilesetImageResourceID, int localId) {
 		TilesetBitmap b = getTilesetBitmap(tilesetImageResourceID);
 		if (b == null) {
-			L.log("WARNING: Cannot load tileset " + tilesetImageResourceID);
+			if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {
+				L.log("WARNING: Cannot load tileset " + tilesetImageResourceID);
+			}
 			return currentTileStoreIndex-1;
 		}
 		return getTileID(b, localId);
@@ -64,9 +66,22 @@ public final class DynamicTileLoader {
 				return getTileID(b, localId);
 			}
 		}
-		L.log("WARNING: Cannot load tileset " + tilesetName);
+		if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {
+			L.log("WARNING: Cannot load tileset " + tilesetName);
+		}
 		return currentTileStoreIndex-1;
 	}
+	public Size getTilesetSize(String tilesetName) {
+		for (TilesetBitmap b : preparedTilesets) {
+			if (b.tilesetName.equals(tilesetName)) {
+				return b.destinationTileSize;
+			}
+		}
+		if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {
+			L.log("WARNING: Cannot load tileset " + tilesetName);
+		}
+		return new Size(1, 1);
+	}
 	
 	private int getTileID(TilesetBitmap tileset, int localId) {
 		int tileStoreIndex = 0;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java
index 0cf17aaf2..7c60e380b 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java
@@ -8,6 +8,7 @@ import com.gpl.rpg.AndorsTrail.context.WorldContext;
 import com.gpl.rpg.AndorsTrail.model.CombatTraits;
 import com.gpl.rpg.AndorsTrail.model.item.ItemTypeCollection;
 import com.gpl.rpg.AndorsTrail.model.map.TMXMapReader;
+import com.gpl.rpg.AndorsTrail.model.quest.QuestLoader;
 import com.gpl.rpg.AndorsTrail.util.ConstRange;
 import com.gpl.rpg.AndorsTrail.util.L;
 import com.gpl.rpg.AndorsTrail.util.Size;
@@ -24,10 +25,10 @@ public final class ResourceLoader {
         final int mTileSize = tiles.displayTileSize;
         L.log("mTileSize=" + mTileSize);
         
-        //final Size dst_sz2x2 = new Size(mTileSize*2, mTileSize*2);
+        final Size dst_sz1x1 = new Size(mTileSize, mTileSize);
+        final Size dst_sz2x2 = new Size(mTileSize*2, mTileSize*2);
         //final Size dst_sz2x3 = new Size(mTileSize*2, mTileSize*3);
         //final Size dst_sz4x3 = new Size(mTileSize*4, mTileSize*3);
-        final Size dst_sz1x1 = new Size(mTileSize, mTileSize);
         final Size defaultTileSize = dst_sz1x1;
         final Size src_sz1x1 = new Size(1, 1);
         final Size src_sz6x1 = new Size(6, 1);
@@ -50,6 +51,7 @@ public final class ResourceLoader {
         /*tiles.iconID_mapsign = */loader.getTileID(R.drawable.map_tiles_1_6, 1+16*3);
         loader.flush();
         
+        
         // ========================================================================
         // Load item icons
         loader.prepareTileset(R.drawable.items_tiles, "items_tiles", new Size(14, 30), defaultTileSize);
@@ -71,33 +73,65 @@ public final class ResourceLoader {
         }
         loader.flush();
         
-        world.dropLists.initialize(world.itemTypes);
+        
+        // ========================================================================
+        // Load Droplists
+        if (AndorsTrailApplication.DEVELOPMENT_DEBUGRESOURCES) {
+        	world.dropLists.initialize(world.itemTypes, r.getString(R.string.droplists_debug));
+        } else {
+        	world.dropLists.initialize(world.itemTypes, r.getString(R.string.droplists_crossglen));
+        	world.dropLists.initialize(world.itemTypes, r.getString(R.string.droplists_crossglen_outside));
+        	world.dropLists.initialize(world.itemTypes, r.getString(R.string.droplists_fallhaven));
+        	world.dropLists.initialize(world.itemTypes, r.getString(R.string.droplists_wilderness));
+        }
+        
+        
+        // ========================================================================
+        // Load Quests
+        QuestLoader questLoader = new QuestLoader();
+        if (AndorsTrailApplication.DEVELOPMENT_DEBUGRESOURCES) {
+        	questLoader.parseQuestLogsFromString(r.getString(R.string.questlog_debug));
+        	world.quests.quests = questLoader.parseQuestsFromString(r.getString(R.string.questlist_debug));
+        } else {
+        	questLoader.parseQuestLogsFromString(r.getString(R.string.questlog_crossglen));
+        	questLoader.parseQuestLogsFromString(r.getString(R.string.questlog_fallhaven));
+        	questLoader.parseQuestLogsFromString(r.getString(R.string.questlog_wilderness));
+        	questLoader.parseQuestLogsFromString(r.getString(R.string.questlog_flagstone));
+        	world.quests.quests = questLoader.parseQuestsFromString(r.getString(R.string.questlist));
+        }
+    	questLoader = null;
+        
 
         // ========================================================================
-        // Conversation
+        // Load Conversation
         if (AndorsTrailApplication.DEVELOPMENT_DEBUGRESOURCES) {
-        	world.conversations.initialize(world.itemTypes, r.getString(R.string.conversationlist_debug));
+        	world.conversations.initialize(world.itemTypes, world.dropLists, r.getString(R.string.conversationlist_debug));
         } else {
-	        world.conversations.initialize(world.itemTypes, r.getString(R.string.conversationlist_mikhail));
-	        world.conversations.initialize(world.itemTypes, r.getString(R.string.conversationlist_crossglen));
-	        world.conversations.initialize(world.itemTypes, r.getString(R.string.conversationlist_crossglen_gruil));
-	        world.conversations.initialize(world.itemTypes, r.getString(R.string.conversationlist_crossglen_leonid));
-	        world.conversations.initialize(world.itemTypes, r.getString(R.string.conversationlist_crossglen_tharal));
-	        world.conversations.initialize(world.itemTypes, r.getString(R.string.conversationlist_crossglen_leta));
-	        world.conversations.initialize(world.itemTypes, r.getString(R.string.conversationlist_crossglen_odair));
-	        world.conversations.initialize(world.itemTypes, r.getString(R.string.conversationlist_jan));
-	        world.conversations.initialize(world.itemTypes, r.getString(R.string.conversationlist_fallhaven));
-	        world.conversations.initialize(world.itemTypes, r.getString(R.string.conversationlist_fallhaven_arcir));
-	        world.conversations.initialize(world.itemTypes, r.getString(R.string.conversationlist_fallhaven_bucus));
-	        world.conversations.initialize(world.itemTypes, r.getString(R.string.conversationlist_fallhaven_church));
-	        world.conversations.initialize(world.itemTypes, r.getString(R.string.conversationlist_fallhaven_athamyr));
-	        world.conversations.initialize(world.itemTypes, r.getString(R.string.conversationlist_fallhaven_drunk));
-	        world.conversations.initialize(world.itemTypes, r.getString(R.string.conversationlist_fallhaven_nocmar));
-	        world.conversations.initialize(world.itemTypes, r.getString(R.string.conversationlist_fallhaven_oldman));
-	        world.conversations.initialize(world.itemTypes, r.getString(R.string.conversationlist_fallhaven_tavern));
-	        world.conversations.initialize(world.itemTypes, r.getString(R.string.conversationlist_fallhaven_larcal));
-	        world.conversations.initialize(world.itemTypes, r.getString(R.string.conversationlist_fallhaven_unnmir));
-	        world.conversations.initialize(world.itemTypes, r.getString(R.string.conversationlist_fallhaven_gaela));
+	        world.conversations.initialize(world.itemTypes, world.dropLists, r.getString(R.string.conversationlist_mikhail));
+	        world.conversations.initialize(world.itemTypes, world.dropLists, r.getString(R.string.conversationlist_crossglen));
+	        world.conversations.initialize(world.itemTypes, world.dropLists, r.getString(R.string.conversationlist_crossglen_gruil));
+	        world.conversations.initialize(world.itemTypes, world.dropLists, r.getString(R.string.conversationlist_crossglen_leonid));
+	        world.conversations.initialize(world.itemTypes, world.dropLists, r.getString(R.string.conversationlist_crossglen_tharal));
+	        world.conversations.initialize(world.itemTypes, world.dropLists, r.getString(R.string.conversationlist_crossglen_leta));
+	        world.conversations.initialize(world.itemTypes, world.dropLists, r.getString(R.string.conversationlist_crossglen_odair));
+	        world.conversations.initialize(world.itemTypes, world.dropLists, r.getString(R.string.conversationlist_jan));
+	        world.conversations.initialize(world.itemTypes, world.dropLists, r.getString(R.string.conversationlist_fallhaven));
+	        world.conversations.initialize(world.itemTypes, world.dropLists, r.getString(R.string.conversationlist_fallhaven_arcir));
+	        world.conversations.initialize(world.itemTypes, world.dropLists, r.getString(R.string.conversationlist_fallhaven_bucus));
+	        world.conversations.initialize(world.itemTypes, world.dropLists, r.getString(R.string.conversationlist_fallhaven_church));
+	        world.conversations.initialize(world.itemTypes, world.dropLists, r.getString(R.string.conversationlist_fallhaven_athamyr));
+	        world.conversations.initialize(world.itemTypes, world.dropLists, r.getString(R.string.conversationlist_fallhaven_drunk));
+	        world.conversations.initialize(world.itemTypes, world.dropLists, r.getString(R.string.conversationlist_fallhaven_nocmar));
+	        world.conversations.initialize(world.itemTypes, world.dropLists, r.getString(R.string.conversationlist_fallhaven_oldman));
+	        world.conversations.initialize(world.itemTypes, world.dropLists, r.getString(R.string.conversationlist_fallhaven_tavern));
+	        world.conversations.initialize(world.itemTypes, world.dropLists, r.getString(R.string.conversationlist_fallhaven_larcal));
+	        world.conversations.initialize(world.itemTypes, world.dropLists, r.getString(R.string.conversationlist_fallhaven_unnmir));
+	        world.conversations.initialize(world.itemTypes, world.dropLists, r.getString(R.string.conversationlist_fallhaven_gaela));
+	        world.conversations.initialize(world.itemTypes, world.dropLists, r.getString(R.string.conversationlist_fallhaven_vacor));
+	        world.conversations.initialize(world.itemTypes, world.dropLists, r.getString(R.string.conversationlist_fallhaven_unzel));
+	        world.conversations.initialize(world.itemTypes, world.dropLists, r.getString(R.string.conversationlist_wilderness));
+	        world.conversations.initialize(world.itemTypes, world.dropLists, r.getString(R.string.conversationlist_flagstone));
+	        world.conversations.initialize(world.itemTypes, world.dropLists, r.getString(R.string.conversationlist_fallhaven_south));	        
         }
         if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {
         	world.conversations.verifyData();
@@ -106,8 +140,8 @@ public final class ResourceLoader {
         // ========================================================================
         // Load monster icons
         //loader.prepareTileset(R.drawable.monsters_armor1, "monsters_armor1", src_sz1x1, defaultTileSize);
-        //loader.prepareTileset(R.drawable.monsters_demon1, "monsters_demon1", src_sz1x1, dst_sz2x2);
-        //loader.prepareTileset(R.drawable.monsters_demon2, "monsters_demon2", src_sz1x1, defaultTileSize);
+        loader.prepareTileset(R.drawable.monsters_demon1, "monsters_demon1", src_sz1x1, dst_sz2x2);
+        loader.prepareTileset(R.drawable.monsters_demon2, "monsters_demon2", src_sz1x1, defaultTileSize);
 	    loader.prepareTileset(R.drawable.monsters_dogs, "monsters_dogs", src_sz7x1, defaultTileSize);
         //loader.prepareTileset(R.drawable.monsters_dragons, "monsters_dragons", src_sz7x1, defaultTileSize);
         //loader.prepareTileset(R.drawable.monsters_eye1, "monsters_eye1", src_sz1x1, defaultTileSize);
@@ -122,7 +156,7 @@ public final class ResourceLoader {
 	    loader.prepareTileset(R.drawable.monsters_mage2, "monsters_mage2", src_sz1x1, defaultTileSize);
 	    //loader.prepareTileset(R.drawable.monsters_mage3, "monsters_mage3", src_sz1x1, defaultTileSize);
 	    //loader.prepareTileset(R.drawable.monsters_mage4, "monsters_mage4", src_sz1x1, defaultTileSize);
-	    //loader.prepareTileset(R.drawable.monsters_mage, "monsters_mage", src_sz1x1, defaultTileSize);
+	    loader.prepareTileset(R.drawable.monsters_mage, "monsters_mage", src_sz1x1, defaultTileSize);
         loader.prepareTileset(R.drawable.monsters_man1, "monsters_man1", src_sz1x1, defaultTileSize);
         loader.prepareTileset(R.drawable.monsters_men, "monsters_men", new Size(9, 1), defaultTileSize);
         loader.prepareTileset(R.drawable.monsters_men2, "monsters_men2", new Size(10, 1), defaultTileSize);
@@ -135,18 +169,18 @@ public final class ResourceLoader {
         //loader.prepareTileset(R.drawable.monsters_cyclops, "monsters_cyclops", src_sz1x1, dst_sz2x3);
         loader.prepareTileset(R.drawable.monsters_warrior1, "monsters_warrior1", src_sz1x1, defaultTileSize);
         //loader.prepareTileset(R.drawable.monsters_wraiths, "monsters_wraiths", new Size(3, 1), defaultTileSize);
-        //loader.prepareTileset(R.drawable.monsters_zombie1, "monsters_zombie1", src_sz1x1, defaultTileSize);
-        //loader.prepareTileset(R.drawable.monsters_zombie2, "monsters_zombie2", src_sz1x1, defaultTileSize);
+        loader.prepareTileset(R.drawable.monsters_zombie1, "monsters_zombie1", src_sz1x1, defaultTileSize);
+        loader.prepareTileset(R.drawable.monsters_zombie2, "monsters_zombie2", src_sz1x1, defaultTileSize);
         //loader.prepareTileset(R.drawable.monsters_dragon1, "monsters_dragon1", src_sz1x1, dst_sz4x3);
         
         if (AndorsTrailApplication.DEVELOPMENT_DEBUGRESOURCES) {
         	world.monsterTypes.initialize(world.dropLists, loader, r.getString(R.string.monsterlist_debug));
-        	world.monsterTypes.initialize(world.dropLists, loader, r.getString(R.string.monsterlist_misc));
         } else {
 	        world.monsterTypes.initialize(world.dropLists, loader, r.getString(R.string.monsterlist_crossglen_animals));
 	    	world.monsterTypes.initialize(world.dropLists, loader, r.getString(R.string.monsterlist_crossglen_npcs));
 	    	world.monsterTypes.initialize(world.dropLists, loader, r.getString(R.string.monsterlist_fallhaven_animals));
 	    	world.monsterTypes.initialize(world.dropLists, loader, r.getString(R.string.monsterlist_fallhaven_npcs));
+	    	world.monsterTypes.initialize(world.dropLists, loader, r.getString(R.string.monsterlist_wilderness));
         }
         loader.flush();
 
@@ -219,6 +253,31 @@ public final class ResourceLoader {
 	        mapReader.read(r.getXml(R.xml.catacombs4), "catacombs4");
 	        mapReader.read(r.getXml(R.xml.hauntedhouse3), "hauntedhouse3");
 	        mapReader.read(r.getXml(R.xml.hauntedhouse4), "hauntedhouse4");
+	        mapReader.read(r.getXml(R.xml.fallhaven_sw), "fallhaven_sw");
+	        mapReader.read(r.getXml(R.xml.wild5), "wild5");
+	        mapReader.read(r.getXml(R.xml.wild6), "wild6");
+	        mapReader.read(r.getXml(R.xml.wild6_house), "wild6_house");
+	        mapReader.read(r.getXml(R.xml.wild7), "wild7");
+	        mapReader.read(r.getXml(R.xml.wild8), "wild8");
+	        mapReader.read(r.getXml(R.xml.wild9), "wild9");
+	        mapReader.read(r.getXml(R.xml.wild10), "wild10");
+	        mapReader.read(r.getXml(R.xml.flagstone0), "flagstone0");
+	        mapReader.read(r.getXml(R.xml.flagstone_inner), "flagstone_inner");
+	        mapReader.read(r.getXml(R.xml.flagstone_upper), "flagstone_upper");
+	        mapReader.read(r.getXml(R.xml.flagstone1), "flagstone1");
+	        mapReader.read(r.getXml(R.xml.flagstone2), "flagstone2");
+	        mapReader.read(r.getXml(R.xml.flagstone3), "flagstone3");
+	        mapReader.read(r.getXml(R.xml.flagstone4), "flagstone4");
+	        mapReader.read(r.getXml(R.xml.wild11), "wild11");
+	        mapReader.read(r.getXml(R.xml.wild12), "wild12");
+	        mapReader.read(r.getXml(R.xml.wild11_clearing), "wild11_clearing");
+	        mapReader.read(r.getXml(R.xml.clearing_level1), "clearing_level1");
+	        mapReader.read(r.getXml(R.xml.clearing_level2), "clearing_level2");
+	        mapReader.read(r.getXml(R.xml.fallhaven_se), "fallhaven_se");
+	        mapReader.read(r.getXml(R.xml.fallhaven_lumberjack), "fallhaven_lumberjack");
+	        mapReader.read(r.getXml(R.xml.fallhaven_alaun), "fallhaven_alaun");
+	        mapReader.read(r.getXml(R.xml.fallhaven_storage), "fallhaven_storage");
+	        mapReader.read(r.getXml(R.xml.fallhaven_farmer), "fallhaven_farmer");
         }
         
         world.maps.predefinedMaps.addAll(mapReader.transformMaps(loader, world.monsterTypes));
@@ -248,14 +307,14 @@ public final class ResourceLoader {
     
 	public static final Pattern rowPattern = Pattern.compile("\\{(.+?)\\};", Pattern.MULTILINE | Pattern.DOTALL);
     public static final String columnSeparator = "\\|";
-	public static int parseImage(DynamicTileLoader tileLoader, String s) {
+	public static int parseImageID(DynamicTileLoader tileLoader, String s) {
 	   	String[] parts = s.split(":");
 	   	return tileLoader.getTileID(parts[0], Integer.parseInt(parts[1]));
 	}
 	public static ConstRange parseRange(String s) {
 		if (s == null || s.length() <= 0) return null;
 	   	String[] parts = s.split("-");
-	   	if (parts.length < 2) {
+	   	if (parts.length < 2 || s.startsWith("-")) {
 	   		int val = Integer.parseInt(s);
 	   		return new ConstRange(val, val);
 	   	} else {
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/CoordRect.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/CoordRect.java
index 81a1f8ee1..f37de82e1 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/CoordRect.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/CoordRect.java
@@ -56,6 +56,11 @@ public final class CoordRect {
 		else if (dy > size.height) return false;
 		return true;
 	}
+	public Coord findPositionAdjacentTo(Coord p) {
+		final int dx = Math.min(size.width-1, Math.max(0, p.x - topLeft.x));
+		final int dy = Math.min(size.height-1, Math.max(0, p.y - topLeft.y));
+		return new Coord(topLeft.x + dx, topLeft.y + dy);
+	}
 	public Coord getCenter() {
 		Coord center = new Coord(topLeft);
 		center.x += size.width / 2;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CombatView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CombatView.java
index 27133de25..25fdc84dc 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CombatView.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CombatView.java
@@ -11,7 +11,6 @@ import android.widget.TextView;
 import com.gpl.rpg.AndorsTrail.Dialogs;
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.R;
-import com.gpl.rpg.AndorsTrail.activity.MainActivity;
 import com.gpl.rpg.AndorsTrail.context.ViewContext;
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
 import com.gpl.rpg.AndorsTrail.controller.CombatController;
@@ -48,7 +47,7 @@ public final class CombatView extends FrameLayout {
         attackMoveButton.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View arg0) {
-				c.executeMoveAttack();
+				c.executeMoveAttack(0, 0);
 			}
 		});
         
@@ -59,15 +58,11 @@ public final class CombatView extends FrameLayout {
 				c.endPlayerTurn();
 			}
 		});
-        Button endCombatButton = (Button) findViewById(R.id.combatview_endcombat);
-        endCombatButton.setOnClickListener(new OnClickListener() {
+        Button fleeButton = (Button) findViewById(R.id.combatview_flee);
+        fleeButton.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View arg0) {
-				if (c.canExitCombat()) {
-					c.exitCombat(true);
-				} else {
-					((MainActivity) context).message(getResources().getString(R.string.combat_cannotexitcombat));
-				}
+				c.startFlee();
 			}
 		});
         
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/MainView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/MainView.java
index a65d03385..76f017281 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/MainView.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/MainView.java
@@ -2,6 +2,7 @@ package com.gpl.rpg.AndorsTrail.view;
 
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.context.ViewContext;
+import com.gpl.rpg.AndorsTrail.controller.Constants;
 import com.gpl.rpg.AndorsTrail.controller.EffectController.EffectAnimation;
 import com.gpl.rpg.AndorsTrail.model.ModelContainer;
 import com.gpl.rpg.AndorsTrail.model.actor.Monster;
@@ -45,10 +46,10 @@ public final class MainView extends SurfaceView implements SurfaceHolder.Callbac
 	private final CoordRect p1x1 = new CoordRect(new Coord(), new Size(1,1));
 	private boolean hasSurface = false;
 
-    private final Coord lastTouchPosition = new Coord();
-    public boolean inhibitClicks = false;
+	private final Coord lastTouchPosition_tileCoords = new Coord();
+    private int lastTouchPosition_dx = 0;
+    private int lastTouchPosition_dy = 0;
     private long lastTouchEventTime = 0;
-    private static final long MINIMUM_INPUT_INTERVAL = 200;
 
 	public MainView(Context context, AttributeSet attr) {
 		super(context, attr);
@@ -79,16 +80,18 @@ public final class MainView extends SurfaceView implements SurfaceHolder.Callbac
     
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent msg) {
+		if (!model.uiSelections.isMainActivityVisible) return true;
+
     	if (keyCode == KeyEvent.KEYCODE_DPAD_UP) {
-    		movePlayer(0, -1);
+    		keyboardAction(0, -1);
     	} else if (keyCode == KeyEvent.KEYCODE_DPAD_DOWN) {
-    		movePlayer(0, 1);
+    		keyboardAction(0, 1);
         } else if (keyCode == KeyEvent.KEYCODE_DPAD_LEFT) {
-        	movePlayer(-1, 0);
+        	keyboardAction(-1, 0);
         } else if (keyCode == KeyEvent.KEYCODE_DPAD_RIGHT) {
-        	movePlayer(1, 0);
+        	keyboardAction(1, 0);
         } else if (keyCode == KeyEvent.KEYCODE_DPAD_CENTER) {
-        	this.onClick();
+        	keyboardAction(0, 0);
         } else {
         	return super.onKeyDown(keyCode, msg);
         }
@@ -96,8 +99,12 @@ public final class MainView extends SurfaceView implements SurfaceHolder.Callbac
     	return true;
     }
 
-	private void movePlayer(int dx, int dy) {
-		view.movementController.movePlayer(dx, dy);
+	private void keyboardAction(int dx, int dy) {
+		if (!allowInputInterval()) return;
+		
+		lastTouchPosition_dx = dx;
+		lastTouchPosition_dy = dy;
+		onClick();
 	}
 
 	@Override
@@ -138,59 +145,60 @@ public final class MainView extends SurfaceView implements SurfaceHolder.Callbac
 
     private void onClick() {
     	if (model.uiSelections.isInCombat) {
-			view.combatController.executeMoveAttack();
+			view.combatController.executeMoveAttack(lastTouchPosition_dx, lastTouchPosition_dy);
+		} else {
+			view.movementController.movePlayer(lastTouchPosition_dx, lastTouchPosition_dy);
 		}
     }
     
     private boolean onLongClick() {
-    	final Coord tilePosition = getScreenToTilePosition(lastTouchPosition);
-		final int dx = tilePosition.x - model.player.position.x;
-		final int dy = tilePosition.y - model.player.position.y;
 		if (model.uiSelections.isInCombat) {
 			//TODO: Should be able to mark positions far away (mapwalk / ranged combat)
-			if (dx == 0 && dy == 0) return false;
-			if (Math.abs(dx) > 1) return false;
-			if (Math.abs(dy) > 1) return false;
+			if (lastTouchPosition_dx == 0 && lastTouchPosition_dy == 0) return false;
+			if (Math.abs(lastTouchPosition_dx) > 1) return false;
+			if (Math.abs(lastTouchPosition_dy) > 1) return false;
 				
-			view.combatController.setCombatSelection(tilePosition);
+			view.combatController.setCombatSelection(lastTouchPosition_tileCoords);
 			return true;
 		}
 		return false;
     }
     
+    private boolean allowInputInterval() {
+		final long now = System.currentTimeMillis();
+		if ((now - lastTouchEventTime) < Constants.MINIMUM_INPUT_INTERVAL) return false;
+		lastTouchEventTime = now;
+		return true;
+    }
+    
 	@Override
 	public boolean onTouchEvent(MotionEvent event) {
-		if (inhibitClicks) return true;
+		if (!model.uiSelections.isMainActivityVisible) return true;
+		
 		switch (event.getAction()) {
 		case MotionEvent.ACTION_DOWN:
 		case MotionEvent.ACTION_MOVE:
-			final long now = System.currentTimeMillis();
-			if ((now - lastTouchEventTime) < MINIMUM_INPUT_INTERVAL) return true;
+			if (!allowInputInterval()) return true;
+			
+			lastTouchPosition_tileCoords.set(
+					(int) Math.floor(((int)event.getX() - screenOffset.x) / displayTileSize) + mapTopLeft.x
+					,(int) Math.floor(((int)event.getY() - screenOffset.y) / displayTileSize) + mapTopLeft.y);
+			lastTouchPosition_dx = lastTouchPosition_tileCoords.x - model.player.position.x;
+			lastTouchPosition_dy = lastTouchPosition_tileCoords.y - model.player.position.y;
 			
-			lastTouchEventTime = now;
-			lastTouchPosition.set((int)event.getX(), (int)event.getY());
 			if (!model.uiSelections.isInCombat) {
-				final Coord tilePosition = getScreenToTilePosition(lastTouchPosition);
-				final int dx = tilePosition.x - model.player.position.x;
-				final int dy = tilePosition.y - model.player.position.y;
-				movePlayer(dx, dy);
+				view.movementController.movePlayer(lastTouchPosition_dx, lastTouchPosition_dy);
 				return true;
 			}
 		}
 		return super.onTouchEvent(event);
 	}
     
-    private Coord getScreenToTilePosition(Coord c) {
-    	return new Coord(
-				(int) Math.floor((c.x - screenOffset.x) / displayTileSize) + mapTopLeft.x
-				,(int) Math.floor((c.y - screenOffset.y) / displayTileSize) + mapTopLeft.y
-				);
-	}
-
     public static final int REDRAW_ALL_SURFACE_CHANGED = 1;
     public static final int REDRAW_ALL_MAP_CHANGED = 2;
     public static final int REDRAW_ALL_PLAYER_MOVED = 3;
     public static final int REDRAW_ALL_MONSTER_MOVED = 4;
+    public static final int REDRAW_ALL_MONSTER_KILLED = 10;
     public static final int REDRAW_AREA_EFFECT_STARTING = 5;
     public static final int REDRAW_AREA_EFFECT_COMPLETED = 6;
     public static final int REDRAW_TILE_SELECTION_REMOVED = 7;
@@ -245,7 +253,7 @@ public final class MainView extends SurfaceView implements SurfaceHolder.Callbac
 	        synchronized (holder) {
 	        	c.translate(screenOffset.x, screenOffset.y);
 	        	doDrawRect(c, area);
-	        	drawFromMapPosition(c, area, effect.position.x, effect.position.y, effect.currentTileID);
+	        	drawFromMapPosition(c, area, effect.position, effect.currentTileID);
     			if (effect.displayText != null) {
     				drawEffectText(c, area, effect);
     			}
@@ -260,6 +268,7 @@ public final class MainView extends SurfaceView implements SurfaceHolder.Callbac
 	    }
 	}
 	private void clearCanvas() {
+		if (!hasSurface) return;
 		Canvas c = null;
 		try {
 			c = holder.lockCanvas(null);
@@ -396,7 +405,7 @@ public final class MainView extends SurfaceView implements SurfaceHolder.Callbac
 		drawFromMapPosition(canvas, area, model.player.position, model.player.traits.iconID);
 		for (MonsterSpawnArea a : currentMap.spawnAreas) {
 			for (Monster m : a.monsters) {
-				drawFromMapPosition(canvas, area, m.position, m.traits.iconID);
+				drawFromMapPosition(canvas, area, m.rectPosition, m.traits.iconID);
 			}
 		}
 		
@@ -432,12 +441,14 @@ public final class MainView extends SurfaceView implements SurfaceHolder.Callbac
     }
 
 	private void drawFromMapPosition(Canvas canvas, final CoordRect area, final Coord p, final int tile) {
-		drawFromMapPosition(canvas, area, p.x, p.y, tile);
+		if (!area.contains(p)) return;
+		_drawFromMapPosition(canvas, area, p.x, p.y, tile);
     }
-
-	private void drawFromMapPosition(Canvas canvas, final CoordRect area, int x, int y, final int tile) {
-		if (!area.contains(x, y)) return;
-		
+	private void drawFromMapPosition(Canvas canvas, final CoordRect area, final CoordRect p, final int tile) {
+		if (!area.intersects(p)) return;
+		_drawFromMapPosition(canvas, area, p.topLeft.x, p.topLeft.y, tile);
+    }
+	private void _drawFromMapPosition(Canvas canvas, final CoordRect area, int x, int y, final int tile) {
     	x -= mapViewArea.topLeft.x;
     	y -= mapViewArea.topLeft.y;
 		if (	   (x >= 0 && x < mapViewArea.size.width)