updated to use actual bogus fileversion numbers on BB port releases.

If version identifier in savegames equals 864 (bogus number to replace
by actual value used in BB release v0.7.0.1), the version number is
forcibly set to 39 (the number used in android version v0.7.0).

AndorsTrail/.classpath

@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="output" path="bin/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry kind="output" path="bin/classes"/>
+</classpath>

AndorsTrail/.svnignore

@@ -1,4 +0,0 @@
-gen
-bin
-.metadata
-.git

AndorsTrail/AndorsTrail.iml

@@ -18,7 +18,7 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

AndorsTrail/AndroidManifest.xml

@@ -3,13 +3,13 @@
 <manifest 
 	xmlns:android="http://schemas.android.com/apk/res/android" 
 	package="com.gpl.rpg.AndorsTrail"
-	android:versionCode="40"
-	android:versionName="0.7.1dev"
+	android:versionCode="42"
+	android:versionName="0.7.1"
 	android:installLocation="auto"
 	>
 	<uses-sdk 
 		android:minSdkVersion="4" 
-		android:targetSdkVersion="17"
+		android:targetSdkVersion="19"
 		/>
 	
 	<supports-screens

AndorsTrail/assets/translation/english.pot

@@ -1,14 +1,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Andors Trail\n"
-"POT-Creation-Date: Tue Jul 23 13:09:25 CEST 2013\n"
+"POT-Creation-Date: Sun Nov 10 11:14:56 CET 2013\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Oskar Wiksten <oskar.wiksten@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: [none]
+msgid "translator-credits"
+msgstr ""
+
 #: actorconditions_v0610.json:chaotic_curse
 msgid "Chaotic curse"
 msgstr ""
@@ -5015,6 +5019,10 @@ msgstr ""
 msgid "She's always nagging me about how I should move out of what she considers to be HER house, when it in fact is MY house and SHE is the one that should move out so that things can settle down."
 msgstr ""
 
+#: conversationlist_elwyl.json:elwyl_7
+msgid "Ahem. As I've told you several times, Elwyl, since it's YOU that is causing all the trouble, I think it would be best for both our sake if YOU moved out."
+msgstr ""
+
 #: conversationlist_elwyl.json:elwyl_8
 msgid "Argh. I am so upset at her!"
 msgstr ""
@@ -10660,7 +10668,7 @@ msgid "Then some people started hearing strange noises coming from below the gro
 msgstr ""
 
 #: conversationlist_kantya.json:kantya9
-msgid "Strange noises filled the whole mine, lour rumbles and shrieking noises from within the rock."
+msgid "Strange noises filled the whole mine, loud rumbles and shrieking noises from within the rock."
 msgstr ""
 
 #: conversationlist_kaori.json:kaori_1
@@ -12058,7 +12066,7 @@ msgid "I have discovered that if you mix some ground up claws from a beast calle
 msgstr ""
 
 #: conversationlist_lodar.json:lodar_spo3_0
-msgid "Up in the north, I have heard tales of beast called the Arulir. Their skin is thick as bark due to the interesting oily substance that they produce. I have learned that if you extract some of that thick oily substance, and mix it with an infectious claw from some monster, you can make a potion that makes your skin almost as tough as theirs. I will require two of those skins for it to be effective."
+msgid "Up in the north, I have heard tales of beast called the Arulir. Their skin is thick as bark due to the interesting oily substance that they produce. I have learned that if you extract some of that thick oily substance, and mix it with an infectious claw from some monster, you can make a potion that makes your skin almost as tough as theirs. I will require two of those skins for it to be effective, and I believe you can find the type of claws that I require on monsters that dwell underground and in caves somewhere outside Fallhaven."
 msgstr ""
 
 #: conversationlist_lodar.json:lodar_xul0
@@ -26473,7 +26481,7 @@ msgid "Lodar can create a potion of strength if I bring him a dead spider and th
 msgstr ""
 
 #: questlist_v070_lodar.json:lodar_pots:43
-msgid "Lodar can create a potent defensive potion if I bring him two Arulir skins and a claw from some monster."
+msgid "Lodar can create a potent defensive potion if I bring him two Arulir skins and a claw from some monster. The Arulir beasts can be found somewhere up in the north, and the claws can apparently be found from creatures that dwell underground and in caves somewhere outside Fallhaven."
 msgstr ""
 
 #: questlist_v070_lodar.json:xulviir

AndorsTrail/assets/translation/es.po

@@ -0,0 +1,158 @@
+# Spanish translation for andors-trail
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the andors-trail package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: andors-trail\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: Sat Oct 26 09:46:51 CEST 2013\n"
+"PO-Revision-Date: 2013-10-26 08:31+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"Language-Team: Spanish <es@li.org>\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-10-26 09:04+0000\n"
+"X-Generator: Launchpad (build 16810)\n"
+
+#: [none]
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Julian Lamus https://launchpad.net/~lamusj\n"
+"  Miguel de Dios https://launchpad.net/~tres-14159"
+
+#: actorconditions_v0611.json:contagion
+msgid "Insect contagion"
+msgstr "Insectos Contagioso"
+
+#: actorconditions_v0611.json:stunned
+msgid "Stunned"
+msgstr "Aturdido"
+
+#: actorconditions_v0611_2.json:concussion
+msgid "Concussion"
+msgstr "Conmoción cerebral"
+
+#: actorconditions_v0611_2.json:crit1
+msgid "Internal bleeding"
+msgstr "Hemorragia interna"
+
+#: actorconditions_v0611_2.json:crit2
+msgid "Fracture"
+msgstr "Fractura"
+
+#: actorconditions_v0612_2.json:foodp
+msgid "Food-poisoning"
+msgstr "Comida Envenenada"
+
+#: actorconditions_v069.json:bless
+msgid "Bless"
+msgstr "Bendecir"
+
+#: actorconditions_v069.json:str
+msgid "Strength"
+msgstr "Fuerza"
+
+#: actorconditions_v069_bwm.json:fatigue_minor
+msgid "Minor fatigue"
+msgstr "Fatiga Menor"
+
+#: actorconditions_v070.json:regen2
+msgid "Regeneration"
+msgstr "Regeneración"
+
+#: conversationlist_wrye.json:wrye_resolved_11
+msgid "Oh my poor boy."
+msgstr "Oh mi pobre niño"
+
+#: itemcategories_1.json:2hsword
+msgid "Two-handed sword"
+msgstr "Espada de dos manos"
+
+#: itemcategories_1.json:animal
+msgid "Animal part"
+msgstr "Partes de Animales"
+
+#: itemcategories_1.json:axe
+msgid "Axe"
+msgstr "Hacha"
+
+#: itemcategories_1.json:axe2h
+msgid "Greataxe"
+msgstr "Gran hacha"
+
+#: itemcategories_1.json:bdy_hide
+msgid "Hide armor"
+msgstr "Ocultar armadura"
+
+#: itemcategories_1.json:bsword
+msgid "Broadsword"
+msgstr "Sable"
+
+#: itemcategories_1.json:buckler
+msgid "Buckler"
+msgstr "Escudo"
+
+#: itemcategories_1.json:dagger
+msgid "Dagger"
+msgstr "Puñal"
+
+#: itemcategories_1.json:drink
+msgid "Drink"
+msgstr "Bebida"
+
+#: itemcategories_1.json:flask
+msgid "Liquid container"
+msgstr "Recipiente de líquido"
+
+#: itemcategories_1.json:gem
+msgid "Gem"
+msgstr "Gemas"
+
+#: itemcategories_1.json:hammer
+msgid "Warhammer"
+msgstr "Martillo de guerra"
+
+#: itemcategories_1.json:hammer2h itemlist_weapons.json:hammer1
+msgid "Giant hammer"
+msgstr "Martillo Gigante"
+
+#: itemcategories_1.json:lsword
+msgid "Longsword"
+msgstr "Espada Larga"
+
+#: itemcategories_1.json:mace
+msgid "Mace"
+msgstr "Maza"
+
+#: itemcategories_1.json:money
+msgid "Money"
+msgstr "Dinero"
+
+#: itemcategories_1.json:pot
+msgid "Potion"
+msgstr "Poción"
+
+#: itemcategories_1.json:rapier
+msgid "Rapier"
+msgstr "Estoque"
+
+#: itemcategories_1.json:shld_mtl_hv
+msgid "Shield, metal (heavy)"
+msgstr "Escudo de Metal (Pesado)"
+
+#: itemcategories_1.json:shld_mtl_li
+msgid "Shield, metal (light)"
+msgstr "Escudo, metal (ligero)"
+
+#: itemcategories_1.json:shld_twr
+msgid "Tower shield"
+msgstr "Torre escudo"
+
+#: itemcategories_1.json:ssword
+msgid "Shortsword"
+msgstr "Espada Corta"

AndorsTrail/assets/translation/id.po

@@ -0,0 +1,97 @@
+# Indonesian translation for andors-trail
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the andors-trail package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: andors-trail\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: Sat Oct 26 09:46:51 CEST 2013\n"
+"PO-Revision-Date: 2013-10-26 08:31+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"Language-Team: Indonesian <id@li.org>\n"
+"Language: id\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-10-26 09:06+0000\n"
+"X-Generator: Launchpad (build 16810)\n"
+
+#: [none]
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Noza Putra Pratama https://launchpad.net/~mas-noza"
+
+#: itemcategories_1.json:2hsword
+msgid "Two-handed sword"
+msgstr "Pedang dua tangan"
+
+#: itemcategories_1.json:axe
+msgid "Axe"
+msgstr "Kapak"
+
+#: itemcategories_1.json:bsword
+msgid "Broadsword"
+msgstr "Pedang"
+
+#: itemcategories_1.json:buckler
+msgid "Buckler"
+msgstr "Pembelaan"
+
+#: itemcategories_1.json:club
+msgid "Club"
+msgstr "Gada"
+
+#: itemcategories_1.json:dagger
+msgid "Dagger"
+msgstr "Pisau belati"
+
+#: itemcategories_1.json:hammer
+msgid "Warhammer"
+msgstr "Palu"
+
+#: itemcategories_1.json:hammer2h itemlist_weapons.json:hammer1
+msgid "Giant hammer"
+msgstr "Palu Raksasa"
+
+#: itemcategories_1.json:lsword
+msgid "Longsword"
+msgstr "Pedang panjang"
+
+#: itemcategories_1.json:mace
+msgid "Mace"
+msgstr "Lawang"
+
+#: itemcategories_1.json:rapier
+msgid "Rapier"
+msgstr "Pedang tipis"
+
+#: itemcategories_1.json:scepter
+msgid "Scepter"
+msgstr "Tongkat kerajaan"
+
+#: itemcategories_1.json:shld_mtl_hv
+msgid "Shield, metal (heavy)"
+msgstr "Tameng, logam (berat)"
+
+#: itemcategories_1.json:shld_mtl_li
+msgid "Shield, metal (light)"
+msgstr "Tameng, logam (ringan)"
+
+#: itemcategories_1.json:shld_twr
+msgid "Tower shield"
+msgstr "Pelindung istana"
+
+#: itemcategories_1.json:shld_wd_hv
+msgid "Shield, wood (heavy)"
+msgstr "Tameng, kayu (berat)"
+
+#: itemcategories_1.json:shld_wd_li
+msgid "Shield, wood (light)"
+msgstr "Tameng, kayu (ringan)"
+
+#: itemcategories_1.json:ssword
+msgid "Shortsword"
+msgstr "Pedang pendek"

AndorsTrail/assets/translation/ms.po

@@ -0,0 +1,49 @@
+# Malay translation for andors-trail
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the andors-trail package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: andors-trail\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: Sat Oct 26 09:46:51 CEST 2013\n"
+"PO-Revision-Date: 2013-10-26 08:31+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"Language-Team: Malay <ms@li.org>\n"
+"Language: ms\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-10-26 09:05+0000\n"
+"X-Generator: Launchpad (build 16810)\n"
+
+#: [none]
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  abuyop https://launchpad.net/~abuyop"
+
+#: itemcategories_1.json:axe
+msgid "Axe"
+msgstr "Kapak"
+
+#: itemcategories_1.json:dagger
+msgid "Dagger"
+msgstr "Pisau"
+
+#: itemcategories_1.json:shld_mtl_hv
+msgid "Shield, metal (heavy)"
+msgstr "Perisai, logam (berat)"
+
+#: itemcategories_1.json:shld_mtl_li
+msgid "Shield, metal (light)"
+msgstr "Perisai, logam (ringan)"
+
+#: itemcategories_1.json:shld_wd_hv
+msgid "Shield, wood (heavy)"
+msgstr "Perisai, kayu (berat)"
+
+#: itemcategories_1.json:shld_wd_li
+msgid "Shield, wood (light)"
+msgstr "Perisai, kayu (ringan)"

AndorsTrail/assets/translation/reformatPo.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+for i in *.po
+do
+	echo "$i"
+	msgmerge --no-fuzzy-matching "${i}" english.pot \
+		| msgattrib --translated \
+		| msguniq --no-wrap --sort-by-file >"${i}.tmp1"
+	mv "${i}.tmp1" "$i"
+done

AndorsTrail/assets/translation/sl.po

@@ -0,0 +1,205 @@
+# Slovenian translation for andors-trail
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the andors-trail package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: andors-trail\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: Sat Oct 26 09:46:51 CEST 2013\n"
+"PO-Revision-Date: 2013-11-03 06:51+0000\n"
+"Last-Translator: Andrej Znidarsic <andrej.znidarsic@gmail.com>\n"
+"Language-Team: Slovenian <sl@li.org>\n"
+"Language: sl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-11-03 15:18+0000\n"
+"X-Generator: Launchpad (build 16820)\n"
+
+#: [none]
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Andrej Znidarsic https://launchpad.net/~andrej.znidarsic"
+
+#: actorconditions_v0610.json:chaotic_curse
+msgid "Chaotic curse"
+msgstr "Kaotično prekletsvo"
+
+#: actorconditions_v0610.json:chaotic_grip
+msgid "Chaotic grip"
+msgstr "Kaotični prijem"
+
+#: actorconditions_v0611.json:blister
+msgid "Blistering skin"
+msgstr "Mehurjasta koža"
+
+#: actorconditions_v0611.json:contagion
+msgid "Insect contagion"
+msgstr "Okužba z insektom"
+
+#: actorconditions_v0611.json:focus_ac
+msgid "Focused accuracy"
+msgstr "Osredotočena natančnost"
+
+#: actorconditions_v0611.json:focus_dmg
+msgid "Focused damage"
+msgstr "Osredotočena škoda"
+
+#: actorconditions_v0611.json:poison_irdegh
+msgid "Irdegh poison"
+msgstr "Strup Irdegha"
+
+#: actorconditions_v0611.json:stunned
+msgid "Stunned"
+msgstr "Ohromljen"
+
+#: actorconditions_v0611_2.json:concussion
+msgid "Concussion"
+msgstr "Pretres"
+
+#: actorconditions_v0611_2.json:crit1
+msgid "Internal bleeding"
+msgstr "Notranja krvavitev"
+
+#: actorconditions_v0611_2.json:crit2
+msgid "Fracture"
+msgstr "Zlom"
+
+#: actorconditions_v0611_2.json:rotworm
+msgid "Kazaul rotworms"
+msgstr "Kazaulovi gnili črvi"
+
+#: actorconditions_v0611_2.json:shadowbless_acc
+msgid "Blessing of Shadow accuracy"
+msgstr "Blagoslov natančnosti Sence"
+
+#: actorconditions_v0611_2.json:shadowbless_guard
+msgid "Shadow guardian blessing"
+msgstr "Blagoslov varuha Sence"
+
+#: actorconditions_v0611_2.json:shadowbless_heal
+msgid "Blessing of Shadow regeneration"
+msgstr "Blagoslov regeneracije Sence"
+
+#: actorconditions_v0611_2.json:shadowbless_str
+msgid "Blessing of Shadow strength"
+msgstr "Blagoslov moči Sence"
+
+#: actorconditions_v0612_2.json:food
+msgid "Sustenance"
+msgstr "Preživetje"
+
+#: actorconditions_v0612_2.json:foodp
+msgid "Food-poisoning"
+msgstr "Zastrupitev s hrano"
+
+#: actorconditions_v069.json:bless
+msgid "Bless"
+msgstr "Blagoslov"
+
+#: actorconditions_v069.json:poison_weak
+msgid "Weak Poison"
+msgstr "Šibek strup"
+
+#: actorconditions_v069.json:regen
+msgid "Shadow Regeneration"
+msgstr "Regeneracija Sence"
+
+#: actorconditions_v069.json:str
+msgid "Strength"
+msgstr "Moč"
+
+#: actorconditions_v069_bwm.json:bleeding_wound
+msgid "Bleeding wound"
+msgstr "Krvaveča rana"
+
+#: actorconditions_v069_bwm.json:intoxicated
+msgid "Intoxicated"
+msgstr "Zastrupljen"
+
+#: actorconditions_v069_bwm.json:speed_minor
+msgid "Minor speed"
+msgstr "Manjša hitrost"
+
+#: itemcategories_1.json:2hsword
+msgid "Two-handed sword"
+msgstr "Dvoročni meč"
+
+#: itemcategories_1.json:axe
+msgid "Axe"
+msgstr "Sekira"
+
+#: itemcategories_1.json:axe2h
+msgid "Greataxe"
+msgstr "Velika sekira"
+
+#: itemcategories_1.json:bsword
+msgid "Broadsword"
+msgstr "Široki meč"
+
+#: itemcategories_1.json:buckler
+msgid "Buckler"
+msgstr "Okrogel ščit"
+
+#: itemcategories_1.json:club
+msgid "Club"
+msgstr "Udrihač"
+
+#: itemcategories_1.json:dagger
+msgid "Dagger"
+msgstr "Bodalo"
+
+#: itemcategories_1.json:hammer
+msgid "Warhammer"
+msgstr "Vojno kladivo"
+
+#: itemcategories_1.json:hammer2h itemlist_weapons.json:hammer1
+msgid "Giant hammer"
+msgstr "Veliko gladivo"
+
+#: itemcategories_1.json:lsword
+msgid "Longsword"
+msgstr "Dolgi meč"
+
+#: itemcategories_1.json:mace
+msgid "Mace"
+msgstr "Palica"
+
+#: itemcategories_1.json:rapier
+msgid "Rapier"
+msgstr "Rapir"
+
+#: itemcategories_1.json:scepter
+msgid "Scepter"
+msgstr "Žezlo"
+
+#: itemcategories_1.json:shld_mtl_hv
+msgid "Shield, metal (heavy)"
+msgstr "Ščit, kovinski (težak)"
+
+#: itemcategories_1.json:shld_mtl_li
+msgid "Shield, metal (light)"
+msgstr "Ščit, kovinski (lahek)"
+
+#: itemcategories_1.json:shld_twr
+msgid "Tower shield"
+msgstr "Kvadratni ščit"
+
+#: itemcategories_1.json:shld_wd_hv
+msgid "Shield, wood (heavy)"
+msgstr "Ščit, lesen (težak)"
+
+#: itemcategories_1.json:shld_wd_li
+msgid "Shield, wood (light)"
+msgstr "Ščit, lesen (lahek)"
+
+#: itemcategories_1.json:ssword
+msgid "Shortsword"
+msgstr "Kratki meč"
+
+#: itemcategories_1.json:staff itemlist_v070.json:qtrstaff
+msgid "Quarterstaff"
+msgstr "Kratka palica"

AndorsTrail/project.properties

@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-17
+target=android-19

AndorsTrail/res/drawable/ui_debug_background.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-	<solid android:color="#FF0000FF"/>
-	<stroke android:width="4dp" android:color="#FFFFFFFF"
-			android:dashWidth="1dp" android:dashGap="2dp" />
-	<padding android:left="7dp" android:top="7dp"
-			android:right="7dp" android:bottom="7dp" />
-	<corners android:radius="4dp" />
-</shape>

AndorsTrail/res/drawable/ui_progress_ap.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:id="@android:id/background" android:drawable="@drawable/ui_bar_background">
-	</item>
-	<item android:id="@android:id/secondaryProgress">
-		<clip android:drawable="@drawable/ui_bar_background" />
-	</item>
-	<item android:id="@android:id/progress">
-		<clip android:drawable="@drawable/ui_purple_foreground" />
-	</item>
-</layer-list>

AndorsTrail/res/layout/about.xml

@@ -35,7 +35,7 @@
 				android:id="@+id/about_version"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:text="version"
+				android:text="@android:string/unknownName"
 				/>
 		</LinearLayout>
 	</LinearLayout>

AndorsTrail/res/layout/heroinfo_stats.xml

@@ -25,7 +25,7 @@
 				android:layout_height="wrap_content"
 				style="@style/titleWithIcon"
 				android:drawableLeft="@drawable/char_hero"
-				android:text="Name"
+				android:text="@android:string/unknownName"
 				/>
 
 			<TableLayout
@@ -35,12 +35,12 @@
 
 				<TableRow>
 					<TextView style="@style/traitsinfo_label" android:text="@string/heroinfo_level" />
-					<TextView android:id="@+id/heroinfo_level" android:text="1" />
+					<TextView android:id="@+id/heroinfo_level" android:text="@android:string/unknownName" />
 				</TableRow>
 
 				<TableRow>
 					<TextView style="@style/traitsinfo_label" android:text="@string/heroinfo_totalexperience" />
-					<TextView android:id="@+id/heroinfo_totalexperience" android:text="1" />
+					<TextView android:id="@+id/heroinfo_totalexperience" android:text="@android:string/unknownName" />
 				</TableRow>
 			</TableLayout>
 

AndorsTrail/res/layout/inventoryitemview.xml

@@ -5,5 +5,5 @@
 	android:layout_height="wrap_content"
 	style="@style/textWithIcon"
 	android:drawableLeft="@drawable/equip_weapon"
-	android:text="Name"
+	android:text="@android:string/unknownName"
 	/>

AndorsTrail/res/layout/loadsave.xml

@@ -36,7 +36,7 @@
 				android:id="@+id/loadsave_slot_n"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:text="1."
+				android:text="@android:string/unknownName"
 				/>
 			<Button
 				android:id="@+id/loadsave_save_to_new_slot"

AndorsTrail/res/layout/startscreen.xml

@@ -29,7 +29,7 @@
 				android:id="@+id/startscreen_currenthero"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:text="Hero name"
+				android:text="@android:string/unknownName"
 				/>
 			<EditText
 				android:id="@+id/startscreen_enterheroname"
@@ -57,7 +57,7 @@
 			android:layout_height="wrap_content"
 			android:layout_alignParentTop="true"
 			android:layout_alignParentRight="true"
-			android:text="v0.0.1"
+			android:text="@android:string/unknownName"
 			/>
 	</RelativeLayout>
 

AndorsTrail/res/raw/conversationlist_bogsten.json

@@ -1,234 +0,0 @@
-[
-  {
-    "id": "sign_bogsten_nokey",
-    "message": "The door is closed"
-  },
-  {
-    "id": "bogsten_start_0",
-    "replies": [
-      {
-        "text": "What's going on ?",
-        "nextPhraseID": "bogsten_start_1"
-      }
-    ],
-    "message": "Oh young boy, you look like someone nice. I don't want you to be injured because of me. I urge you to leave !"
-  },
-  {
-    "id": "bogsten_start_1",
-    "replies": [
-      {
-        "text": "I'm sure I can help",
-        "nextPhraseID": "bogsten_start_2"
-      },
-      {
-        "text": "I'm way stronger than I look",
-        "nextPhraseID": "bogsten_start_2"
-      },
-      {
-        "text": "Ok. Nevermind.",
-        "nextPhraseID": "X"
-      }
-    ],
-    "message": "No. I shouldn't be telling you. It's too dangerous."
-  },
-  {
-    "id": "bogsten_start_2",
-    "replies": [
-      {
-        "text": "N",
-        "nextPhraseID": "bogsten_start_3"
-      }
-    ],
-    "message": "My family has used this place to grow mushrooms for five generations. Our mushrooms are famous from Feygard to Nor City, loved by gourmets and potion makers alike."
-  },
-  {
-    "id": "bogsten_start_3",
-    "replies": [
-      {
-        "text": "N",
-        "nextPhraseID": "bogsten_start_4"
-      }
-    ],
-    "message": "Last month, I went to Nor City to sell an excellent batch and decided to stay a little longer."
-  },
-  {
-    "id": "bogsten_start_4",
-    "replies": [
-      {
-        "text": "N",
-        "nextPhraseID": "bogsten_start_5"
-      }
-    ],
-    "message": "You see, my son is studying across the country to become a Shadow priest and he is currently in the Valanyr temple of Shadow. I had not seen him for so long so I decided to visit him."
-  },
-  {
-    "id": "bogsten_start_5",
-    "replies": [
-      {
-        "text": "Dealing with evil is my favorite hobby.",
-        "nextPhraseID": "bogsten_start_6"
-      },
-      {
-        "text": "Get to the point.",
-        "nextPhraseID": "bogsten_start_6"
-      },
-      {
-        "text": "I will never help a worshipper of the Shadow !",
-        "nextPhraseID": "X"
-      }
-    ],
-    "message": "Anyway, when I came back here, I felt something strange happened. I couldn't tell what, but I knew evil was around as soon as I touched the door knob."
-  },
-  {
-    "id": "bogsten_start_6",
-    "replies": [
-      {
-        "text": "How can I help ?",
-        "nextPhraseID": "bogsten_start_7"
-      }
-    ],
-    "message": "When I got to my mushrooms' cave, I was attacked by some sort of giant living mushroom. I've been sick since then, to the point where I'm afraid I won't live long. I've since locked all access to my cave to prevent anyone from being hurt."
-  },
-  {
-    "id": "bogsten_start_7",
-    "replies": [
-      {
-        "text": "Sure. I'll go there right now.",
-        "nextPhraseID": "bogsten_start_8"
-      },
-      {
-        "text": "You fool ! I'm not here to run your errands !",
-        "nextPhraseID": "X"
-      }
-    ],
-    "message": "I know this potion maker in Fallhaven. Could you go ask him for a cure ?"
-  },
-  {
-    "id": "bogsten_start_8",
-    "rewards": [
-      {
-        "rewardType": "questProgress",
-        "rewardID": "bogsten",
-        "value": 10
-      }
-    ],
-    "replies": [
-      {
-        "text": "N",
-        "nextPhraseID": "X"
-      }
-    ],
-    "message": "Thank you ! I'll be waiting for you."
-  },
-  {
-    "id": "bogsten_start_select",
-    "replies": [
-      {
-        "requires": [
-          {
-            "requireType": "questProgress",
-            "requireID": "bogsten",
-            "value": 30
-          }
-        ],
-        "nextPhraseID": "bogsten_ask_cure_second_0"
-      },
-      {
-        "requires": [
-          {
-            "requireType": "questProgress",
-            "requireID": "bogsten",
-            "value": 10
-          }
-        ],
-        "nextPhraseID": "bogsten_ask_cure_first_0"
-      },
-      {
-        "nextPhraseID": "bogsten_start_0"
-      }
-    ]
-  },
-  {
-    "id": "bogsten_ask_cure_first_0",
-    "replies": [
-      {
-        "requires": [
-          {
-            "requireType": "questProgress",
-            "requireID": "bogsten",
-            "value": 20
-          }
-        ],
-        "text": "Not yet. The potion merchant needs some spore sample to prepare it.",
-        "nextPhraseID": "bogsten_ask_cure_first_1"
-      },
-      {
-        "text": "No, not yet.",
-        "nextPhraseID": "X"
-      }
-    ],
-    "message": "Have you gotten the cure ?"
-  },
-  {
-    "id": "bogsten_ask_cure_first_1",
-    "rewards": [
-      {
-        "rewardType": "questProgress",
-        "rewardID": "bogsten",
-        "value": 30
-      },
-      {
-        "rewardType": "dropList",
-        "rewardID": "bogsten_key_droplist"
-      }
-    ],
-    "replies": [
-      {
-        "text": "N",
-        "nextPhraseID": "X"
-      }
-    ],
-    "message": "I'm sorry to have dragged you into this, boy. Take this key. It will open the way to my mushrooms cave."
-  },
-  {
-    "id": "bogsten_ask_cure_second_0",
-    "replies": [
-      {
-        "requires": [
-          {
-            "requireType": "questProgress",
-            "requireID": "bogsten",
-            "value": 40
-          }
-        ],
-        "text": "Yes. I have them with me.",
-        "nextPhraseID": "bogsten_ask_cure_second_2"
-      },
-      {
-        "text": "No, not yet.",
-        "nextPhraseID": "bogsten_ask_cure_second_1"
-      }
-    ],
-    "message": "Have you collected the spores already ?"
-  },
-  {
-    "id": "bogsten_ask_cure_second_1",
-    "replies": [
-      {
-        "text": "N",
-        "nextPhraseID": "X"
-      }
-    ],
-    "message": "Please get them for me."
-  },
-  {
-    "id": "bogsten_ask_cure_second_2",
-    "replies": [
-      {
-        "text": "N",
-        "nextPhraseID": "X"
-      }
-    ],
-    "message": "Thank you ! Please go give them to the potion merchant."
-  }
-]

AndorsTrail/res/raw/conversationlist_debug.json

@@ -123,5 +123,63 @@
     {
         "id": "debugrequireskey",
         "message": "This tile requires a quest progress."
-    }
+    },
+   {
+    "id": "debugrequires10gold",
+    "replies": [
+      {
+        "text": "Too bad.",
+        "nextPhraseID": "X"
+      },
+      {
+        "text": "Well, gimme 10 gold then !",
+        "nextPhraseID": "debugrequires10gold_1"
+      }
+    ],
+    "message": "This tile costs 10 gold !"
+  },
+  {
+    "id": "debugrequires10gold_1",
+    "replies": [
+      {
+        "requires": [
+          {
+            "requireType": "spentGold",
+            "requireID": "gold",
+            "value": 100
+          }
+        ],
+        "nextPhraseID": "debugrequires10gold_3"
+      },
+      {
+        "nextPhraseID": "debugrequires10gold_2"
+      }
+    ]
+  },
+  {
+    "id": "debugrequires10gold_2",
+    "rewards": [
+            {
+                "rewardType": "dropList",
+                "rewardID": "debugrequires10gold_droplist"
+            }
+    ],
+    "replies": [
+      {
+        "text": "When I come to debugmap, I always feel like a star.",
+        "nextPhraseID": "X"
+      }
+    ],
+    "message": "Okay. But only because it's you M. Coder."
+  },
+  {
+    "id": "debugrequires10gold_3",
+    "replies": [
+      {
+        "text": "Damn.",
+        "nextPhraseID": "X"
+      }
+    ],
+    "message": "Sorry. You already spent 100 gold..."
+  }
 ]

AndorsTrail/res/raw/conversationlist_elwyl.json

@@ -185,7 +185,7 @@
     },
     {
         "id": "elwyl_7",
-        "message": "Ahem. As I've told you several times, Elwyl, since it's YOU that is causing all the trouble, I think it would be best for both our sakes if YOU moved out.",
+        "message": "Ahem. As I've told you several times, Elwyl, since it's YOU that is causing all the trouble, I think it would be best for both our sake if YOU moved out.",
         "switchToNPC": "elwel",
         "replies": [
             {

AndorsTrail/res/raw/conversationlist_fallhaven_potions.json

@@ -1,430 +1,388 @@
 [
-  {
-    "id": "fallhaven_potions",
-    "message": "Welcome to my shop. Please browse my fine selection of everyday potions.",
-    "replies": [
-      {
-        "text": "Let me see what potions you have available.",
-        "nextPhraseID": "S"
-      },
-      {
-        "text": "Do you have anything to help against food-poisoning?",
-        "nextPhraseID": "fallhaven_pot_antifoodp1"
-      },
-      {
-        "text": "I was told that I can get some Spotted Hornbeam fungus from you.",
-        "requires": [
-          {
-            "requireType": "questProgress",
-            "requireID": "lodar_pots",
-            "value": 10
-          }
+    {
+        "id": "fallhaven_potions",
+        "message": "Welcome to my shop. Please browse my fine selection of everyday potions.",
+        "replies": [
+            {
+                "text": "Let me see what potions you have available.",
+                "nextPhraseID": "S"
+            },
+            {
+                "text": "Do you have anything to help against food-poisoning?",
+                "nextPhraseID": "fallhaven_pot_antifoodp1"
+            },
+            {
+                "text": "I was told that I can get some Spotted Hornbeam fungus from you.",
+                "requires": [
+                    {
+                        "requireType": "questProgress",
+                        "requireID": "lodar_pots",
+                        "value": "10"
+                    }
+                ],
+                "nextPhraseID": "fallhaven_potions1"
+            }
+        ]
+    },
+    {
+        "id": "fallhaven_potions1",
+        "replies": [
+            {
+                "requires": [
+                    {
+                        "requireType": "questProgress",
+                        "requireID": "lodar_pots",
+                        "value": "20"
+                    }
+                ],
+                "nextPhraseID": "fallhaven_potions4"
+            },
+            {
+                "nextPhraseID": "fallhaven_potions2"
+            }
+        ]
+    },
+    {
+        "id": "fallhaven_potions2",
+        "replies": [
+            {
+                "text": "N",
+                "nextPhraseID": "fallhaven_potions3"
+            }
         ],
-        "nextPhraseID": "fallhaven_potions1"
-      },
-      {
-        "requires": [
-          {
-            "requireType": "questProgress",
-            "requireID": "bogsten",
-            "value": 10
-          }
+        "message": "Oh yes. Really disgusting smell, they have. But good for making potions."
+    },
+    {
+        "id": "fallhaven_potions3",
+        "rewards": [
+            {
+                "rewardID": "lodar_pots",
+                "value": 20,
+                "rewardType": "questProgress"
+            },
+            {
+                "rewardType": "dropList",
+                "rewardID": "hornbeam",
+                "value": 1
+            }
         ],
-        "text": "Old man Bogsten is sick. He was attacked by a giant mushroom. Do you have a cure ?",
-        "nextPhraseID": "fallhaven_pot_bogsten_0"
-      }
-    ]
-  },
-  {
-    "id": "fallhaven_potions1",
-    "replies": [
-      {
-        "requires": [
-          {
-            "requireType": "questProgress",
-            "requireID": "lodar_pots",
-            "value": 20
-          }
+        "replies": [
+            {
+                "text": "Thank you.",
+                "nextPhraseID": "X"
+            }
         ],
-        "nextPhraseID": "fallhaven_potions4"
-      },
-      {
-        "nextPhraseID": "fallhaven_potions2"
-      }
-    ]
-  },
-  {
-    "id": "fallhaven_potions2",
-    "replies": [
-      {
-        "text": "N",
-        "nextPhraseID": "fallhaven_potions3"
-      }
-    ],
-    "message": "Oh yes. Really disgusting smell, they have. But good for making potions."
-  },
-  {
-    "id": "fallhaven_potions3",
-    "rewards": [
-      {
-        "rewardID": "lodar_pots",
-        "value": 20,
-        "rewardType": "questProgress"
-      },
-      {
-        "rewardType": "dropList",
-        "rewardID": "hornbeam",
-        "value": 1
-      }
-    ],
-    "replies": [
-      {
-        "text": "Thank you.",
-        "nextPhraseID": "X"
-      }
-    ],
-    "message": "Here, have some. I don't have that much, so don't lose it!"
-  },
-  {
-    "id": "fallhaven_potions4",
-    "message": "I already gave you some, before. Don't tell me you lost it?"
-  },
-  {
-    "id": "fallhaven_pot_antifoodp1",
-    "replies": [
-      {
-        "requires": [
-          {
-            "requireType": "questProgress",
-            "requireID": "antifoodp",
-            "value": 40
-          }
+        "message": "Here, have some. I don't have that much, so don't lose it!"
+    },
+    {
+        "id": "fallhaven_potions4",
+        "message": "I already gave you some, before. Don't tell me you lost it?"
+    },
+    {
+        "id": "fallhaven_pot_antifoodp1",
+        "replies": [
+            {
+                "requires": [
+                    {
+                        "requireType": "questProgress",
+                        "requireID": "antifoodp",
+                        "value": "40"
+                    }
+                ],
+                "nextPhraseID": "fallhaven_pot_antifoodp5"
+            },
+            {
+                "requires": [
+                    {
+                        "requireType": "questProgress",
+                        "requireID": "antifoodp",
+                        "value": "35"
+                    }
+                ],
+                "nextPhraseID": "fallhaven_pot_antifp_q4"
+            },
+            {
+                "requires": [
+                    {
+                        "requireType": "questProgress",
+                        "requireID": "antifoodp",
+                        "value": "30"
+                    }
+                ],
+                "nextPhraseID": "fallhaven_pot_antifp_q2"
+            },
+            {
+                "requires": [
+                    {
+                        "requireType": "questProgress",
+                        "requireID": "antifoodp",
+                        "value": "20"
+                    }
+                ],
+                "nextPhraseID": "fallhaven_pot_antifoodp5"
+            },
+            {
+                "nextPhraseID": "fallhaven_pot_antifoodp2"
+            }
+        ]
+    },
+    {
+        "id": "fallhaven_pot_antifoodp2",
+        "rewards": [
+            {
+                "rewardID": "antifoodp",
+                "value": 15,
+                "rewardType": "questProgress"
+            }
         ],
-        "nextPhraseID": "fallhaven_pot_antifoodp5"
-      },
-      {
-        "requires": [
-          {
-            "requireType": "questProgress",
-            "requireID": "antifoodp",
-            "value": 35
-          }
+        "replies": [
+            {
+                "text": "Sounds good, what do you need from me?",
+                "nextPhraseID": "fallhaven_pot_antifoodp3"
+            }
         ],
-        "nextPhraseID": "fallhaven_pot_antifp_q4"
-      },
-      {
-        "requires": [
-          {
-            "requireType": "questProgress",
-            "requireID": "antifoodp",
-            "value": 30
-          }
+        "message": "Oh yes, I have a recipe for a mixture that helps against food poisoning. If you want, I could create some of that for you."
+    },
+    {
+        "id": "fallhaven_pot_antifoodp3",
+        "replies": [
+            {
+                "text": "No way, I'm not running your errands.",
+                "nextPhraseID": "fallhaven_pot_antifoodp4"
+            },
+            {
+                "text": "What ingredients are needed?",
+                "nextPhraseID": "fallhaven_pot_antifoodp5"
+            }
         ],
-        "nextPhraseID": "fallhaven_pot_antifp_q2"
-      },
-      {
-        "requires": [
-          {
-            "requireType": "questProgress",
-            "requireID": "antifoodp",
-            "value": 20
-          }
+        "message": "I am all out of the ingredients required for it. Maybe you could help me gather some of them?"
+    },
+    {
+        "id": "fallhaven_pot_antifoodp4",
+        "message": "Fair enough. Welcome back if you change your mind."
+    },
+    {
+        "id": "fallhaven_pot_antifoodp5",
+        "rewards": [
+            {
+                "rewardID": "antifoodp",
+                "value": 20,
+                "rewardType": "questProgress"
+            }
         ],
-        "nextPhraseID": "fallhaven_pot_antifoodp5"
-      },
-      {
-        "nextPhraseID": "fallhaven_pot_antifoodp2"
-      }
-    ]
-  },
-  {
-    "id": "fallhaven_pot_antifoodp2",
-    "rewards": [
-      {
-        "rewardID": "antifoodp",
-        "value": 15,
-        "rewardType": "questProgress"
-      }
-    ],
-    "replies": [
-      {
-        "text": "Sounds good, what do you need from me?",
-        "nextPhraseID": "fallhaven_pot_antifoodp3"
-      }
-    ],
-    "message": "Oh yes, I have a recipe for a mixture that helps against food poisoning. If you want, I could create some of that for you."
-  },
-  {
-    "id": "fallhaven_pot_antifoodp3",
-    "replies": [
-      {
-        "text": "No way, I'm not running your errands.",
-        "nextPhraseID": "fallhaven_pot_antifoodp4"
-      },
-      {
-        "text": "What ingredients are needed?",
-        "nextPhraseID": "fallhaven_pot_antifoodp5"
-      }
-    ],
-    "message": "I am all out of the ingredients required for it. Maybe you could help me gather some of them?"
-  },
-  {
-    "id": "fallhaven_pot_antifoodp4",
-    "message": "Fair enough. Welcome back if you change your mind."
-  },
-  {
-    "id": "fallhaven_pot_antifoodp5",
-    "rewards": [
-      {
-        "rewardID": "antifoodp",
-        "value": 20,
-        "rewardType": "questProgress"
-      }
-    ],
-    "replies": [
-      {
-        "text": "I'll be right back with those ingredients.",
-        "nextPhraseID": "fallhaven_pot_antifoodp6"
-      },
-      {
-        "text": "Any ideas where I can find those ingredients?",
-        "nextPhraseID": "fallhaven_pot_antifoodp7"
-      },
-      {
-        "requires": [
-          {
-            "requireType": "inventoryRemove",
-            "requireID": "gland",
-            "value": 1
-          },
-          {
-            "requireType": "inventoryRemove",
-            "requireID": "hair",
-            "value": 2
-          },
-          {
-            "requireType": "inventoryRemove",
-            "requireID": "gold",
-            "value": 50
-          }
+        "replies": [
+            {
+                "text": "I'll be right back with those ingredients.",
+                "nextPhraseID": "fallhaven_pot_antifoodp6"
+            },
+            {
+                "text": "Any ideas where I can find those ingredients?",
+                "nextPhraseID": "fallhaven_pot_antifoodp7"
+            },
+            {
+                "requires": [
+                    {
+                        "requireType": "inventoryRemove",
+                        "requireID": "gland",
+                        "value": 1
+                    },
+                    {
+                        "requireType": "inventoryRemove",
+                        "requireID": "hair",
+                        "value": 2
+                    },
+                    {
+                        "requireType": "inventoryRemove",
+                        "requireID": "gold",
+                        "value": 50
+                    }
+                ],
+                "text": "I have those ingredients for you.",
+                "nextPhraseID": "fallhaven_pot_antifp_q1"
+            },
+            {
+                "requires": [
+                    {
+                        "requireType": "inventoryRemove",
+                        "requireID": "gland",
+                        "value": 5
+                    },
+                    {
+                        "requireType": "inventoryRemove",
+                        "requireID": "hair",
+                        "value": 10
+                    },
+                    {
+                        "requireType": "inventoryRemove",
+                        "requireID": "gold",
+                        "value": 250
+                    },
+                    {
+                        "requireType": "questProgress",
+                        "requireID": "antifoodp",
+                        "value": 35
+                    }
+                ],
+                "text": "Here, I have enough of those ingredients for five potions.",
+                "nextPhraseID": "fallhaven_pot_antifp_q3x5"
+            },
+            {
+                "requires": [
+                    {
+                        "requireType": "inventoryRemove",
+                        "requireID": "gland",
+                        "value": 10
+                    },
+                    {
+                        "requireType": "inventoryRemove",
+                        "requireID": "hair",
+                        "value": 20
+                    },
+                    {
+                        "requireType": "inventoryRemove",
+                        "requireID": "gold",
+                        "value": 500
+                    },
+                    {
+                        "requireType": "questProgress",
+                        "requireID": "antifoodp",
+                        "value": 35
+                    }
+                ],
+                "text": "Here, I have enough of those ingredients for ten potions.",
+                "nextPhraseID": "fallhaven_pot_antifp_q3x10"
+            }
         ],
-        "text": "I have those ingredients for you.",
-        "nextPhraseID": "fallhaven_pot_antifp_q1"
-      },
-      {
-        "requires": [
-          {
-            "requireType": "inventoryRemove",
-            "requireID": "gland",
-            "value": 5
-          },
-          {
-            "requireType": "inventoryRemove",
-            "requireID": "hair",
-            "value": 10
-          },
-          {
-            "requireType": "inventoryRemove",
-            "requireID": "gold",
-            "value": 250
-          },
-          {
-            "requireType": "questProgress",
-            "requireID": "antifoodp",
-            "value": 35
-          }
+        "message": "To make the potion against food-poisoning, I would need one poison gland and two pieces of animal hair. I will also require 50 gold for the work required."
+    },
+    {
+        "id": "fallhaven_pot_antifoodp6",
+        "message": "Excellent."
+    },
+    {
+        "id": "fallhaven_pot_antifoodp7",
+        "replies": [
+            {
+                "text": "N",
+                "nextPhraseID": "fallhaven_pot_antifoodp8"
+            }
         ],
-        "text": "Here, I have enough of those ingredients for five potions.",
-        "nextPhraseID": "fallhaven_pot_antifp_q3x5"
-      },
-      {
-        "requires": [
-          {
-            "requireType": "inventoryRemove",
-            "requireID": "gland",
-            "value": 10
-          },
-          {
-            "requireType": "inventoryRemove",
-            "requireID": "hair",
-            "value": 20
-          },
-          {
-            "requireType": "inventoryRemove",
-            "requireID": "gold",
-            "value": 500
-          },
-          {
-            "requireType": "questProgress",
-            "requireID": "antifoodp",
-            "value": 35
-          }
+        "message": "Well, animal hair can probably be found on any beast here outside of Fallhaven. I heard some hunters found a pack of wolves a bit south of here."
+    },
+    {
+        "id": "fallhaven_pot_antifoodp8",
+        "replies": [
+            {
+                "text": "I'll be right back with those ingredients for you.",
+                "nextPhraseID": "fallhaven_pot_antifoodp6"
+            },
+            {
+                "text": "Phew, that sounds like a lot of work. I don't know if I'll do it.",
+                "nextPhraseID": "fallhaven_pot_antifoodp4"
+            }
         ],
-        "text": "Here, I have enough of those ingredients for ten potions.",
-        "nextPhraseID": "fallhaven_pot_antifp_q3x10"
-      }
-    ],
-    "message": "To make the potion against food-poisoning, I would need one poison gland and two pieces of animal hair. I will also require 50 gold for the work required."
-  },
-  {
-    "id": "fallhaven_pot_antifoodp6",
-    "message": "Excellent."
-  },
-  {
-    "id": "fallhaven_pot_antifoodp7",
-    "replies": [
-      {
-        "text": "N",
-        "nextPhraseID": "fallhaven_pot_antifoodp8"
-      }
-    ],
-    "message": "Well, animal hair can probably be found on any beast here outside of Fallhaven. I heard some hunters found a pack of wolves a bit south of here."
-  },
-  {
-    "id": "fallhaven_pot_antifoodp8",
-    "replies": [
-      {
-        "text": "I'll be right back with those ingredients for you.",
-        "nextPhraseID": "fallhaven_pot_antifoodp6"
-      },
-      {
-        "text": "Phew, that sounds like a lot of work. I don't know if I'll do it.",
-        "nextPhraseID": "fallhaven_pot_antifoodp4"
-      }
-    ],
-    "message": "Poison glands however, can be a bit trickier to find. I don't know really, but any poisonous creature might do. Maybe some snakes around here are poisonous?"
-  },
-  {
-    "id": "fallhaven_pot_antifp_q1",
-    "rewards": [
-      {
-        "rewardID": "antifoodp",
-        "value": 30,
-        "rewardType": "questProgress"
-      }
-    ],
-    "replies": [
-      {
-        "text": "N",
-        "nextPhraseID": "fallhaven_pot_antifp_q2"
-      }
-    ],
-    "message": "Good. Give me a minute to prepare that antidote for you."
-  },
-  {
-    "id": "fallhaven_pot_antifp_q2",
-    "replies": [
-      {
-        "text": "N",
-        "nextPhraseID": "fallhaven_pot_antifp_q3"
-      }
-    ],
-    "message": "[mixes the ingredients]"
-  },
-  {
-    "id": "fallhaven_pot_antifp_q3",
-    "rewards": [
-      {
-        "rewardID": "antifoodp",
-        "value": 35,
-        "rewardType": "questProgress"
-      },
-      {
-        "rewardType": "dropList",
-        "rewardID": "antifoodp",
-        "value": 1
-      }
-    ],
-    "replies": [
-      {
-        "text": "N",
-        "nextPhraseID": "fallhaven_pot_antifp_q4"
-      }
-    ],
-    "message": "There. One potion against food-poisoning for you."
-  },
-  {
-    "id": "fallhaven_pot_antifp_q3x5",
-    "rewards": [
-      {
-        "rewardType": "dropList",
-        "rewardID": "antifoodp_x5"
-      }
-    ],
-    "replies": [
-      {
-        "text": "N",
-        "nextPhraseID": "fallhaven_pot_antifp_q4"
-      }
-    ],
-    "message": "There. Five potions against food-poisoning for you."
-  },
-  {
-    "id": "fallhaven_pot_antifp_q3x10",
-    "rewards": [
-      {
-        "rewardType": "dropList",
-        "rewardID": "antifoodp_x10"
-      }
-    ],
-    "replies": [
-      {
-        "text": "N",
-        "nextPhraseID": "fallhaven_pot_antifp_q4"
-      }
-    ],
-    "message": "There. Ten potions against food-poisoning for you."
-  },
-  {
-    "id": "fallhaven_pot_antifp_q4",
-    "rewards": [
-      {
-        "rewardID": "antifoodp",
-        "value": 40,
-        "rewardType": "questProgress"
-      }
-    ],
-    "replies": [
-      {
-        "text": "Thank you.",
-        "nextPhraseID": "X"
-      },
-      {
-        "text": "I sure hope this mixture of your works.",
-        "nextPhraseID": "X"
-      }
-    ],
-    "message": "I can create more of those potions if you want. You'll have to bring me more of those ingredients then."
-  },
-  {
-    "id": "fallhaven_pot_bogsten_0",
-    "replies": [
-      {
-        "text": "Sure. Be right back.",
-        "nextPhraseID": "fallhaven_pot_bogsten_1"
-      },
-      {
-        "text": "Spores ? No way !",
-        "nextPhraseID": "X"
-      }
-    ],
-    "message": "That must be a spore infection ! These can be nasty, deadly even. However, to make a cure, I will need a sample of these spores. Can you get some ? Four will do."
-  },
-  {
-    "id": "fallhaven_pot_bogsten_1",
-    "rewards": [
-      {
-        "rewardType": "questProgress",
-        "rewardID": "bogsten",
-        "value": 20
-      }
-    ],
-    "replies": [
-      {
-        "text": "N",
-        "nextPhraseID": "X"
-      }
-    ],
-    "message": "Hurry up. We may not have much time."
-  }
-]
+        "message": "Poison glands however, can be a bit trickier to find. I don't know really, but any poisonous creature might do. Maybe some snakes around here are poisonous?"
+    },
+    {
+        "id": "fallhaven_pot_antifp_q1",
+        "rewards": [
+            {
+                "rewardID": "antifoodp",
+                "value": 30,
+                "rewardType": "questProgress"
+            }
+        ],
+        "replies": [
+            {
+                "text": "N",
+                "nextPhraseID": "fallhaven_pot_antifp_q2"
+            }
+        ],
+        "message": "Good. Give me a minute to prepare that antidote for you."
+    },
+    {
+        "id": "fallhaven_pot_antifp_q2",
+        "replies": [
+            {
+                "text": "N",
+                "nextPhraseID": "fallhaven_pot_antifp_q3"
+            }
+        ],
+        "message": "[mixes the ingredients]"
+    },
+    {
+        "id": "fallhaven_pot_antifp_q3",
+        "rewards": [
+            {
+                "rewardID": "antifoodp",
+                "value": 35,
+                "rewardType": "questProgress"
+            },
+            {
+                "rewardType": "dropList",
+                "rewardID": "antifoodp",
+                "value": 1
+            }
+        ],
+        "replies": [
+            {
+                "text": "N",
+                "nextPhraseID": "fallhaven_pot_antifp_q4"
+            }
+        ],
+        "message": "There. One potion against food-poisoning for you."
+    },
+    {
+        "id": "fallhaven_pot_antifp_q3x5",
+        "rewards": [
+            {
+                "rewardType": "dropList",
+                "rewardID": "antifoodp_x5"
+            }
+        ],
+        "replies": [
+            {
+                "text": "N",
+                "nextPhraseID": "fallhaven_pot_antifp_q4"
+            }
+        ],
+        "message": "There. Five potions against food-poisoning for you."
+    },
+    {
+        "id": "fallhaven_pot_antifp_q3x10",
+        "rewards": [
+            {
+                "rewardType": "dropList",
+                "rewardID": "antifoodp_x10"
+            }
+        ],
+        "replies": [
+            {
+                "text": "N",
+                "nextPhraseID": "fallhaven_pot_antifp_q4"
+            }
+        ],
+        "message": "There. Ten potions against food-poisoning for you."
+    },
+    {
+        "id": "fallhaven_pot_antifp_q4",
+        "rewards": [
+            {
+                "rewardID": "antifoodp",
+                "value": 40,
+                "rewardType": "questProgress"
+            }
+        ],
+        "replies": [
+            {
+                "text": "Thank you.",
+                "nextPhraseID": "X"
+            },
+            {
+                "text": "I sure hope this mixture of your works.",
+                "nextPhraseID": "X"
+            }
+        ],
+        "message": "I can create more of those potions if you want. You'll have to bring me more of those ingredients then."
+    }
+]

AndorsTrail/res/raw/conversationlist_farrik.json

@@ -374,6 +374,11 @@
                 "rewardType": "questProgress",
                 "rewardID": "farrik",
                 "value": 70
+            },
+            {
+                "rewardType": "removeSpawnArea",
+                "mapName": "fallhaven_prison",
+                "rewardID": "fallhaven_prisoner"
             }
         ],
         "replies": [

AndorsTrail/res/raw/conversationlist_lodar.json

@@ -1209,7 +1209,7 @@
                 "nextPhraseID": "lodar_spo3_5x10"
             }
         ],
-        "message": "Up in the north, I have heard tales of beast called the Arulir. Their skin is thick as bark due to the interesting oily substance that they produce. I have learned that if you extract some of that thick oily substance, and mix it with an infectious claw from some monster, you can make a potion that makes your skin almost as tough as theirs. I will require two of those skins for it to be effective."
+        "message": "Up in the north, I have heard tales of beast called the Arulir. Their skin is thick as bark due to the interesting oily substance that they produce. I have learned that if you extract some of that thick oily substance, and mix it with an infectious claw from some monster, you can make a potion that makes your skin almost as tough as theirs. I will require two of those skins for it to be effective, and I believe you can find the type of claws that I require on monsters that dwell underground and in caves somewhere outside Fallhaven."
     },
     {
         "id": "lodar_spo3_5",

AndorsTrail/res/raw/droplists_bogsten.json

@@ -1,15 +0,0 @@
-[
-  {
-    "id": "bogsten_key_droplist",
-    "items": [
-      {
-        "quantity": {
-          "min": 1,
-          "max": 1
-        },
-        "itemID": "bogsten_key",
-        "chance": 100
-      }
-    ]
-  }
-]

AndorsTrail/res/raw/droplists_debug.json

@@ -161,5 +161,18 @@
                 "chance": 100
             }
         ]
-    }
+    },
+     {
+    "id": "debugrequires10gold_droplist",
+    "items": [
+      {
+        "quantity": {
+          "min": 10,
+          "max": 10
+        },
+        "itemID": "gold",
+        "chance": 100
+      }
+    ]
+  }
 ]

AndorsTrail/res/raw/itemlist_bogsten.json

@@ -1,10 +0,0 @@
-[
-  {
-    "id": "bogsten_key",
-    "name": "Bogsten's key",
-    "displaytype": "quest",
-    "iconID": "items_misc:21",
-    "category": "other",
-    "description": "The key to Bogsten's backyard."
-  }
-]

AndorsTrail/res/raw/monsterlist_bogsten.json

@@ -1,52 +0,0 @@
-[
-  {
-    "id": "bogsten",
-    "name": "Bogsten",
-    "unique": 1,
-    "iconID": "monsters_rltiles1:77",
-    "spawnGroup": "bogsten",
-    "phraseID": "bogsten_start_select"
-  },
-  {
-    "id": "zuul_khan",
-    "name": "Zuul'khan",
-    "unique": 1,
-    "iconID": "monsters_rltiles2:88",
-    "spawnGroup": "zuul_khan"
-  },
-  {
-    "id": "weak_fungi",
-    "name": "Weak Fungi",
-    "monsterClass": "animal",
-    "iconID": "monsters_ld2:30",
-    "spawnGroup": "weak_fungi"
-  },
-  {
-    "id": "fungi",
-    "name": "Fungi",
-    "monsterClass": "animal",
-    "iconID": "monsters_ld2:30",
-    "spawnGroup": "mid_fungi"
-  },
-  {
-    "id": "dangerous_fungi",
-    "name": "Dangerous Fungi",
-    "monsterClass": "animal",
-    "iconID": "monsters_ld2:31",
-    "spawnGroup": "dangerous_fungi"
-  },
-  {
-    "id": "lombric_ball",
-    "name": "Lombric Ball",
-    "monsterClass": "animal",
-    "iconID": "monsters_rltiles1:139",
-    "spawnGroup": "lombric_ball"
-  },
-  {
-    "id": "lombric_beast",
-    "name": "Lombric Beast",
-    "monsterClass": "animal",
-    "iconID": "monsters_tometik10:29",
-    "spawnGroup": "lombric_beast"
-  }
-]

AndorsTrail/res/raw/monsterlist_debug.json

@@ -31,7 +31,7 @@
         "attackCost": 10,
         "attackChance": 50,
         "droplistID": "debugshop1",
-        "phraseID": "fallhaven_potions",
+        "phraseID": "debugquest",
         "attackDamage": {
             "min": 1,
             "max": 2

AndorsTrail/res/raw/questlist_bogsten.json

@@ -1,83 +0,0 @@
-[
-  {
-    "id": "bogsten",
-    "name": "Fungi Panic",
-    "showInLog": 1,
-    "stages": [
-      {
-        "progress": 10,
-        "logText": "I met old man Bogsten in his cabin. He is sick after encountering a giant mushroom and wants me to go see the potion merchant in Fallhaven to get a cure."
-      },
-      {
-        "progress": 20,
-        "logText": "The potion merchant needs four spore samples to prepare the cure. I should go back to see Bogsten."
-      },
-      {
-        "progress": 30,
-        "logText": "Bogsten gave me the key to his backyard. I should go to the mushroom cave from there and collect the spore samples."
-      },
-      {
-        "progress": 35,
-        "logText": "I have opened Bogsten's backyard door."
-      },
-      {
-        "progress": 40,
-        "logText": "I have collected the spores. I should go back to see the potion merchant."
-      },
-      {
-        "progress": 50,
-        "logText": "The potion merchant gave me the cure. I can now give it to Bogsten."
-      },
-      {
-        "progress": 60,
-        "logText": "Bogsten is cured, but he says the evil forces in his cave are preventing him from working. He asked me to check his cave and gave me his necklace."
-      },
-      {
-        "progress": 70,
-        "logText": "I met an old sorcerer named Zuul'khan in the cave. He told me Bogsten's family imprisoned him using an ancient petrifying spell, but thanks to Bogsten's laxity, he is now free. He wants me to kill Bogsten and bring him back Bogsten's staff."
-      },
-      {
-        "progress": 80,
-        "logText": "I've decided to slay Zuul'khan."
-      },
-      {
-        "progress": 90,
-        "logText": "I've defeated Zuul'khan, but he is not dead. He disappeared into the ground. I should tell Bogsten about what happened."
-      },
-      {
-        "progress": 100,
-        "logText": "Bogsten now remembers the petrifying spell. He will make sure that Zuul'khan cannot come back. He gave me a bag of mushrooms and told me I should bring them to the potion merchant.",
-        "rewardExperience": 2000
-      },
-      {
-        "progress": 110,
-        "logText": "The potion merchant said these were rare mushrooms, and prepared two \"Underground Fighter\" potions for me. He will sell me some more if I come back.",
-        "finishesQuest": 1
-      },
-      {
-        "progress": 115,
-        "logText": "Zuul'khan's offer seemed interesting. I have to go kill Bogsten."
-      },
-      {
-        "progress": 125,
-        "logText": "I killed Bogsten and found his staff. He was using it as a cane !"
-      },
-      {
-        "progress": 135,
-        "logText": "I've decided to keep Bogsten's staff for me, and kill Zuul'khan."
-      },
-      {
-        "progress": 145,
-        "logText": "I've defeated Zuul'khan, but he is not dead. He disappeared into the ground.",
-        "rewardExperience": 2000,
-        "finishesQuest": 1
-      },
-      {
-        "progress": 155,
-        "logText": "I gave Bogsten's staff to Zuul'khan. He rewarded me with permanent immunity to the spore poison.",
-        "rewardExperience": 2000,
-        "finishesQuest": 1
-      }
-    ]
-  }
-]

AndorsTrail/res/raw/questlist_nondisplayed.json

@@ -4,6 +4,10 @@
         "name": "Placeholder for hidden quest stages (not displayed)",
         "showInLog": 0,
         "stages": [
+            {
+                "progress": 5,
+                "logText": "Back area of the smith in Crossglen"
+            },
             {
                 "progress": 10,
                 "logText": "Tavern room in Foaming Flask"
@@ -53,6 +57,9 @@
             {
                 "progress": 10,
                 "finishesQuest": 1
+            },
+            {
+                "progress": 20
             }
         ]
     },

AndorsTrail/res/raw/questlist_v070_lodar.json

@@ -76,7 +76,7 @@
         "logText": "Lodar can create a potion of strength if I bring him a dead spider and the wings of an insect."
       },
       {
-        "logText": "Lodar can create a potent defensive potion if I bring him two Arulir skins and a claw from some monster.",
+        "logText": "Lodar can create a potent defensive potion if I bring him two Arulir skins and a claw from some monster. The Arulir beasts can be found somewhere up in the north, and the claws can apparently be found from creatures that dwell underground and in caves somewhere outside Fallhaven.",
         "progress": 43
       }
     ]

AndorsTrail/res/values-pt-rBR/strings.xml

@@ -508,6 +508,6 @@
 	<!-- =========================================== -->
 	<!-- Added in v0.7.0 -->
 
-	<string name="localize_resources_from_mo_filename">pt-rBR.mo</string>
+	<string name="localize_resources_from_mo_filename">pt_BR.mo</string>
 
 </resources>

AndorsTrail/res/values/authors.xml

@@ -3,7 +3,7 @@
 <resources>
 
 	<!-- Do not translate this. -->
-	<string name="about_copyright">Copyright (C) 2010-2013 Oskar Wiksten&lt;br /&gt;&lt;br /&gt;</string>
+	<string name="about_copyright">Copyright © 2010–2013 Oskar Wiksten&lt;br /&gt;&lt;br /&gt;</string>
 	<string name="about_authors">
 		Programming by Oskar Wiksten&lt;br /&gt;
 		&lt;a href="http://andorstrail.com/"&gt;Web site provided by Scott Devaney&lt;/a&gt;&lt;br /&gt;
@@ -15,18 +15,19 @@
 		Additional programming by Olivier Samyn&lt;br /&gt;
 		Additional programming by Ethan Wessel&lt;br /&gt;
 		Additional programming by Scott Lund&lt;br /&gt;
+		Additional programming by &lt;a href="https://github.com/Zukero"&gt;Kevin Pochat&lt;/a&gt;&lt;br /&gt;
 		Additional graphics by Karvis&lt;br /&gt;
-		Russian translation by Dreamer..., e.solodookhin, shell.andor, konstmih and istasman&lt;br /&gt;
-		Italian translation by k6blue, liogiu and Joker&lt;br /&gt;
-		French translation by LeSanglier, Misty Soul and zorun.42&lt;br /&gt;
-		German translation by Bomber, Samuel Plentz, cngunners14, Phoenixor and Tutar&lt;br /&gt;
+		Russian translation by Dreamer..., e.solodookhin, shell.andor, konstmih, istasman, Aleksey Kabanov, Alexander Zubok, Paul Sulemenkov and dromoz&lt;br /&gt;
+		Italian translation by k6blue, liogiu, Joker and Andrea Luciano Damico&lt;br /&gt;
+		French translation by LeSanglier, Misty Soul, zorun.42, Marwane K. and olivier&lt;br /&gt;
+		German translation by Bomber, Samuel Plentz, cngunners14, Phoenixor, Tutar and Mütze&lt;br /&gt;
 		English proofreading by taws34 and Elyon&lt;br /&gt;
 		English proofreading and testing by Stephen Stalnaker&lt;br /&gt;
 		Hebrew translation by eitanbm&lt;br /&gt;
 		Portuguese(PT) translation by mira&lt;br /&gt;
 		Portuguese(BR) translation by Mauro Carvalho Chehab&lt;br /&gt;
 		Japanese translation by surgecurrent&lt;br /&gt;
-		Polish translation by tobik9090siemens&lt;br /&gt;
+		Polish translation by tobik9090siemens, DanielS and Piotr Wieczorek&lt;br /&gt;
 		Forum moderated by Tim Davis&lt;br /&gt;
 		Forum moderated by Josh Kloos&lt;br /&gt;
 		Forum moderated by Travis Miller&lt;br /&gt;
@@ -52,6 +53,13 @@
 		&lt;a href="http://opengameart.org/content/farming-tilesets-magic-animations-and-ui-elements"&gt;Additional graphics by Daniel Eddeland&lt;/a&gt;&lt;br /&gt;
 		&lt;a href="http://opengameart.org/content/liberated-pixel-cup-base-assets-sprites-map-tiles"&gt;Additional graphics by Lanea Zimmerman (AKA Sharm)&lt;/a&gt;&lt;br /&gt;
 		&lt;a href="http://art.gnome.org/themes/icon"&gt;Additional graphics by Gnome icon artists&lt;/a&gt;&lt;br /&gt;
+		&lt;a href="http://forums.rpgmakerweb.com/index.php?/topic/5434-its-a-mad-mad-mad-mad-world-maddies-edits-and-clumping/"&gt;Additional graphics by Paladin-Cleric of Awesome&lt;/a&gt;&lt;br /&gt;
+		&lt;a href="http://ayene-chan.deviantart.com/gallery/32324562"&gt;Additional graphics by Ayene-chan&lt;/a&gt;&lt;br /&gt;
+		&lt;a href="http://vxresource.wordpress.com/2010/03/17/the-real-macks-tileset/"&gt;Additional graphics by Mack&lt;/a&gt;&lt;br /&gt;
+		&lt;a href="http://forums.rpgmakerweb.com/index.php?/topic/9178-amazing-avys-awesome-arrrpg-maker-stuff/ "&gt;Additional graphics by Avery, Gits&lt;/a&gt;&lt;br /&gt;
+		&lt;a href="http://vxresource.wordpress.com/category/resources/tilesets/"&gt;Additional graphics by vxresource.wordpress.com&lt;/a&gt;&lt;br /&gt;
+		This website shares tiles with the general public for free with the agreement of their original creators.&lt;br /&gt;
+		&lt;br /&gt;
 		Additional graphics by DeBray Bailey&lt;br /&gt;
 		&lt;a href="http://rltiles.sourceforge.net"&gt;Monster tileset graphics by rltiles.sourceforge.net&lt;/a&gt;&lt;br /&gt;
 		Part of (or All) the graphic tiles used in this program is the public domain roguelike tileset "RLTiles".

AndorsTrail/res/values/loadresources_debug.xml

@@ -5,36 +5,25 @@
 		<item>@raw/itemlist_weapons</item>
 		<item>@raw/itemlist_armour</item>
 		<item>@raw/itemlist_debug</item>
-		<item>@raw/itemlist_bogsten</item>
 	</array>
 
 	<array name="loadresource_droplists_debug">
 		<item>@raw/droplists_debug</item>
-		<item>@raw/droplists_bogsten</item>
 	</array>
 
 	<array name="loadresource_quests_debug">
 		<item>@raw/questlist_debug</item>
-		<item>@raw/questlist_bogsten</item>
 	</array>
 
 	<array name="loadresource_conversationlists_debug">
 		<item>@raw/conversationlist_debug</item>
-		<item>@raw/conversationlist_bogsten</item>
-		<item>@raw/conversationlist_fallhaven_potions</item>
 	</array>
 
 	<array name="loadresource_monsters_debug">
 		<item>@raw/monsterlist_debug</item>
-		<item>@raw/monsterlist_bogsten</item>
 	</array>
 
 	<array name="loadresource_maps_debug">
 		<item>@xml/debugmap</item>
-		<item>@xml/bogsten0</item>
-		<item>@xml/bogsten1</item>
-		<item>@xml/bogsten2</item>
-		<item>@xml/bogsten3</item>
-		<item>@xml/bogsten4</item>
 	</array>
 </resources>

AndorsTrail/res/values/strings.xml

@@ -4,19 +4,15 @@
 	<string name="app_name">Andor\'s Trail</string>
 	<string name="app_description">Quest-driven fantasy RPG</string>
 
-	<string name="exit">Exit</string>
 	<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 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 name="dialog_loading_message">Loading resources…</string>
@@ -26,27 +22,17 @@
 
 	<string name="dialog_close">Close</string>
 
-	<string name="dialog_confirmexit_title">Exit</string>
-	<string name="dialog_confirmexit_message">Are you sure you want to exit?</string>
-
-	<string name="dialog_paused_title">Paused</string>
-	<string name="dialog_paused_message">Game is paused</string>
-	<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: %1$s</string>
 	<string name="dialog_monsterencounter_info">Info</string>
 
 	<string name="status_hp">HP:</string>
-	<string name="status_mp">MP:</string>
 	<string name="status_ap">AP:</string>
 	<string name="status_exp">Level:</string>
 
 	<string name="heroinfo_char">Overview</string>
 	<string name="heroinfo_inv">Items</string>
-	<string name="heroinfo_wear">Equipped</string>
 	<string name="heroinfo_skill">Skills</string>
-	<string name="heroinfo_spell">Spells</string>
 	<string name="heroinfo_levelup">Level up</string>
 	<string name="heroinfo_level">Level</string>
 	<string name="heroinfo_totalexperience">Total experience</string>
@@ -59,7 +45,6 @@
 	<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_flee">Flee</string>
@@ -108,10 +93,7 @@
 	<string name="actorinfo_class">Class:</string>
 	<string name="actorinfo_difficulty">Difficulty:</string>
 	<string name="actorinfo_health">Health:</string>
-	<string name="actorinfo_attacksperturn">Attacks/turn:</string>
-	<string name="actorinfo_movesperturn">Movement/turn:</string>
 	<string name="actorinfo_attack">Attack:</string>
-	<string name="actorinfo_criticalhit">Critical hit:</string>
 	<string name="actorinfo_defense">Defense:</string>
 	<string name="actorinfo_movecost">Move cost (AP):</string>
 	<string name="actorinfo_basetraits">Base combat statistics (without equipment and skills)</string>
@@ -135,18 +117,6 @@
 	<string name="iteminfo_action_equip_ap">Equip (%1$d AP)</string>
 	<string name="iteminfo_action_unequip_ap">Unequip (%1$d AP)</string>
 
-	<string name="itemcategory_money">Money</string>
-	<string name="itemcategory_weapon">Weapon</string>
-	<string name="itemcategory_shield">Shield</string>
-	<string name="itemcategory_wearable_head">Wearable (head)</string>
-	<string name="itemcategory_wearable_body">Wearable (body)</string>
-	<string name="itemcategory_wearable_hand">Wearable (hands)</string>
-	<string name="itemcategory_wearable_feet">Wearable (feet)</string>
-	<string name="itemcategory_wearable_neck">Wearable (neck)</string>
-	<string name="itemcategory_wearable_ring">Wearable (ring)</string>
-	<string name="itemcategory_potion">Potion</string>
-	<string name="itemcategory_other">Other</string>
-
 	<string name="startscreen_continue">Continue current game</string>
 	<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>
@@ -228,7 +198,6 @@
 		Thanks for all the feedback!
 	</string>
 
-	<string name="questlog_title">Quests</string>
 	<string name="questlog_includecompleted_prompt">Select quests to show</string>
 	<string name="questlog_includecompleted_hidecompleted">Hide completed quests</string>
 	<string name="questlog_includecompleted_includecompleted">Include completed quests</string>

AndorsTrail/res/values/ui_colors.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<color name="translucent_black">#80000000</color>
 	<color name="displayworldmap_background">#423921</color>
 </resources>

AndorsTrail/res/xml/blackwater_mountain0.tmx

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map version="1.0" orientation="orthogonal" width="20" height="15" tilewidth="32" tileheight="32">
  <properties>
-  <property name="outside" value="1"/>
+  <property name="outdoors" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -143,7 +143,7 @@
    eJxzFWBgcB3EGAaobR46IGQ3LnW4zCIEYGqQaUJuxGUHNj2k+J1YgG4GJWbicxs1zaXUbHzpiBx3kpM2CZmBS4yQfkJi5LqFWPPIyb8AKL4uKA==
   </data>
  </layer>
- <objectgroup name="Mapevents" width="20" height="15" visible="0">
+ <objectgroup name="Mapevents" visible="0">
   <object name="west" type="mapchange" x="0" y="64" width="32" height="96">
    <properties>
     <property name="map" value="wild17"/>
@@ -158,7 +158,7 @@
   </object>
   <object name="sign_blackwater0" type="sign" x="288" y="256" width="32" height="32"/>
  </objectgroup>
- <objectgroup name="Spawn" width="20" height="15" visible="0">
+ <objectgroup name="Spawn" visible="0">
   <object name="forestwolf1" type="spawn" x="64" y="96" width="512" height="320">
    <properties>
     <property name="quantity" value="4"/>
@@ -170,5 +170,5 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys" width="20" height="15" visible="0"/>
+ <objectgroup name="Keys" visible="0"/>
 </map>

AndorsTrail/res/xml/blackwater_mountain1.tmx

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map version="1.0" orientation="orthogonal" width="20" height="20" tilewidth="32" tileheight="32">
  <properties>
-  <property name="outside" value="1"/>
+  <property name="outdoors" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -143,7 +143,7 @@
    eJy1k8EJADEIBFPCNZX+WzrucRBE3TExgg9Bx1V0PmNM4J+RPFvzm40tb80hPGJrTcSKYtWbzkr2qXiVebK+FfNmoizSK9NHd5Cxsr1E9YrV/R/dN73D8/ZQ+eEK61RnN29Hp8rrZFF9N+9T+QstvEe5
   </data>
  </layer>
- <objectgroup name="Mapevents" width="20" height="20">
+ <objectgroup name="Mapevents">
   <object name="north" type="mapchange" x="320" y="0" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain2"/>
@@ -157,7 +157,7 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="20" height="20">
+ <objectgroup name="Spawn">
   <object name="forestboar4" type="spawn" x="128" y="352" width="448" height="160">
    <properties>
     <property name="quantity" value="3"/>
@@ -171,5 +171,5 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys" width="20" height="20"/>
+ <objectgroup name="Keys"/>
 </map>

AndorsTrail/res/xml/blackwater_mountain10.tmx

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map version="1.0" orientation="orthogonal" width="20" height="20" tilewidth="32" tileheight="32">
  <properties>
-  <property name="outside" value="1"/>
+  <property name="outdoors" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -143,7 +143,7 @@
    eJzNk1EKACAIQzuCl/L+V+pXQuQtRjTwr71SV8ZaWYoqg9XpcfI6v8JTpPAI3/0+cs8vetEjmX/1diy6I9VDd939H5q/zjfNTeFNcuSZztbNq2dUtrpjR2ac+bvlbUOjRBI=
   </data>
  </layer>
- <objectgroup name="Mapevents" width="20" height="20">
+ <objectgroup name="Mapevents">
   <object name="south" type="mapchange" x="256" y="608" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain9"/>
@@ -171,7 +171,7 @@
   <object name="exit" type="mapchange" x="96" y="96" width="32" height="32"/>
   <object name="sign_blackwater10" type="sign" x="288" y="224" width="32" height="32"/>
  </objectgroup>
- <objectgroup name="Spawn" width="20" height="20">
+ <objectgroup name="Spawn">
   <object name="forestboar4" type="spawn" x="320" y="64" width="224" height="256">
    <properties>
     <property name="quantity" value="2"/>
@@ -187,5 +187,5 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys" width="20" height="20"/>
+ <objectgroup name="Keys"/>
 </map>

AndorsTrail/res/xml/blackwater_mountain11.tmx

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map version="1.0" orientation="orthogonal" width="30" height="30" tilewidth="32" tileheight="32">
  <properties>
-  <property name="outside" value="1"/>
+  <property name="outdoors" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -143,7 +143,7 @@
    eJztkssNwDAIQzNCl+r+K1W9RRF2jPi0hyAh5WPyCHBfY9zHjxf5a5V69IbnnVWvxq46hWvFsFjljMVm29+4890uLjpDjIvW3hwYV61RNpflws4iXKb11MLD3WnRf6PceY/W895rkXmOusKtNKXnHVxUG7WGaA6s+VT/29Xfr+YKaSN5MO7aB8XUnCyuNQ9VptaFaTO5GTlH+t/N7uI+g1vAQA==
   </data>
  </layer>
- <objectgroup name="Mapevents" width="30" height="30">
+ <objectgroup name="Mapevents">
   <object name="south" type="mapchange" x="128" y="928" width="320" height="32">
    <properties>
     <property name="map" value="blackwater_mountain10"/>
@@ -207,12 +207,12 @@
   <object name="sign_prim_n" type="sign" x="256" y="416" width="32" height="32"/>
   <object name="sign_prim_s" type="sign" x="256" y="736" width="32" height="32"/>
  </objectgroup>
- <objectgroup name="Spawn" width="30" height="30">
+ <objectgroup name="Spawn">
   <object name="prim_commoner1" type="spawn" x="288" y="768" width="608" height="96"/>
   <object name="prim_commoner2" type="spawn" x="288" y="576" width="352" height="96"/>
   <object name="prim_commoner3" type="spawn" x="224" y="256" width="128" height="160"/>
   <object name="prim_commoner4" type="spawn" x="416" y="160" width="480" height="192"/>
   <object name="moyra" type="spawn" x="64" y="192" width="32" height="32"/>
  </objectgroup>
- <objectgroup name="Keys" width="30" height="30"/>
+ <objectgroup name="Keys"/>
 </map>

AndorsTrail/res/xml/blackwater_mountain12.tmx

@@ -2,7 +2,7 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="28" height="27" tilewidth="32" tileheight="32">
  <properties>
-  <property name="outside" value="1"/>
+  <property name="outdoors" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png"/>
@@ -144,7 +144,7 @@
    eJztU0EOwCAI8wn7lP//0rLDEkOktKCebEKiRmmL0J/W+o0bi+ODXY9nO/g8rPKB/EW8kQ4GKh/SXsUsV9XfLId6jnRFe6W+iDPaM5yZnt85YzbvyMfoVnSh+kfI1DLSraJS4yy8fsv0UEVbxgvzhp01JYfnT/krpk7sW1Wf4lHxh+4hTlaL0luVfqr8o52ff53hOBkvrbqlsA==
   </data>
  </layer>
- <objectgroup name="Mapevents" width="28" height="27">
+ <objectgroup name="Mapevents">
   <object name="east" type="mapchange" x="864" y="544" width="32" height="96">
    <properties>
     <property name="map" value="blackwater_mountain10"/>
@@ -164,7 +164,7 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="28" height="27">
+ <objectgroup name="Spawn">
   <object name="restless_dead_1" type="spawn" x="352" y="704" width="128" height="96"/>
   <object name="forestboar4" type="spawn" x="480" y="128" width="288" height="288"/>
   <object name="forestboar4" type="spawn" x="704" y="576" width="32" height="32"/>
@@ -174,5 +174,5 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys" width="28" height="27"/>
+ <objectgroup name="Keys"/>
 </map>

AndorsTrail/res/xml/blackwater_mountain13.tmx

@@ -141,7 +141,7 @@
    eJxzFWBgcKUxxgUoMQub2YPBPJgZ+PjUCEtaxs1giGdc4UdNv1MrnHClH3xhgEsNsYDYsB8s5qGnXWqaR465lKZpcswiNo0PJfMAxkRY/Q==
   </data>
  </layer>
- <objectgroup name="Mapevents" width="20" height="20">
+ <objectgroup name="Mapevents">
   <object name="south" type="mapchange" x="448" y="608" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain12"/>
@@ -150,11 +150,11 @@
   </object>
   <object name="sign_blackwater13" type="sign" x="320" y="352" width="32" height="32"/>
  </objectgroup>
- <objectgroup name="Spawn" width="20" height="20">
+ <objectgroup name="Spawn">
   <object name="arghest" type="spawn" x="96" y="384" width="160" height="128">
    <properties>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys" width="20" height="20"/>
+ <objectgroup name="Keys"/>
 </map>

AndorsTrail/res/xml/blackwater_mountain14.tmx

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map version="1.0" orientation="orthogonal" width="30" height="20" tilewidth="32" tileheight="32">
  <properties>
-  <property name="outside" value="1"/>
+  <property name="outdoors" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -143,7 +143,7 @@
    eJy9klEKwDAIQ3uEXar3v9LYx6CIqUnVCjLorC+xzmeM2ZhfdPb/GUx0aTzhMrqsNlu73l+/Xl/bB7F3HjwtiMsE8hHV796MZXps7/7JrihcVSf6X8HN7GhUl/HL9lS0MfVsjaLfnjE8RZ/qt2rW0awqdkv1G91RZ42i0m/ERbP2+ivMTGb9ZrjMm9z2vuYLXfB72g==
   </data>
  </layer>
- <objectgroup name="Mapevents" width="30" height="20">
+ <objectgroup name="Mapevents">
   <object name="west" type="mapchange" x="0" y="160" width="32" height="64">
    <properties>
     <property name="map" value="blackwater_mountain10"/>
@@ -163,7 +163,7 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="30" height="20">
+ <objectgroup name="Spawn">
   <object name="primwolf1" type="spawn" x="96" y="64" width="192" height="384">
    <properties>
     <property name="quantity" value="2"/>
@@ -185,5 +185,5 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys" width="30" height="20"/>
+ <objectgroup name="Keys"/>
 </map>

AndorsTrail/res/xml/blackwater_mountain15.tmx

@@ -2,7 +2,7 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="15" height="30" tilewidth="32" tileheight="32">
  <properties>
-  <property name="outside" value="1"/>
+  <property name="outdoors" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png"/>
@@ -144,7 +144,7 @@
    eJzVk0sOACEIQz3CXMr7X2m2hJTaoi5swgZ8/CLzG2MCi0JxZq+zMccqF2OcXirF+Atsjp9mmdg/WCnXrXw362bfzrxob92bcVm1Z2W37rzKO5Vl+dQe1b2gftxb7bBKLjRXZiremavLOv7KfuGYVFc=
   </data>
  </layer>
- <objectgroup name="Mapevents" width="15" height="30" visible="0">
+ <objectgroup name="Mapevents" visible="0">
   <object name="south" type="mapchange" x="96" y="928" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain14"/>
@@ -158,7 +158,7 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="15" height="30">
+ <objectgroup name="Spawn">
   <object name="gornaud_2" type="spawn" x="96" y="864" width="32" height="32"/>
   <object name="gornaud_2" type="spawn" x="288" y="576" width="64" height="64"/>
   <object name="gornaud_1" type="spawn" x="32" y="224" width="128" height="544">
@@ -173,5 +173,5 @@
   </object>
   <object name="gornaud_1" type="spawn" x="192" y="64" width="96" height="64"/>
  </objectgroup>
- <objectgroup name="Keys" width="15" height="30"/>
+ <objectgroup name="Keys"/>
 </map>