New game objects methods available in scripting language.

New in-game hooks : item.onEquip & item.onUnequip
Many new variables accessible in scripting language :
- player.base.[maxAP, maxHP, ad.min, ad.max, equipCost, moveCost,
useCost]
- actor.[hp.cur, hp.max, ap.cur, ap.max, ad.min, ad.max]

AndorsTrail/.classpath

@@ -4,5 +4,6 @@
 	<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/AndroidManifest.xml

@@ -3,8 +3,8 @@
 <manifest 
 	xmlns:android="http://schemas.android.com/apk/res/android" 
 	package="com.gpl.rpg.AndorsTrail"
-	android:versionCode="39"
-	android:versionName="0.7.0"
+	android:versionCode="40"
+	android:versionName="0.7.1dev"
 	android:installLocation="auto"
 	>
 	<uses-sdk 

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: Sat Oct 26 09:46:51 CEST 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 sakes 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
@@ -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 five bones."
+msgid "Lodar can create a potent defensive potion if I bring him two Arulir skins and a claw from some monster."
 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/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/actorconditions_debug.json

@@ -0,0 +1,24 @@
+[
+     {
+        "id": "chaotic_grip",
+        "iconID": "actorconditions_1:96",
+        "name": "Chaotic grip",
+        "category": "mental",
+        "abilityEffect": {
+            "increaseBlockChance": -10,
+            "increaseDamageResistance": -1
+        }
+    },
+    {
+        "id": "scripted_potion_efficiency",
+        "iconID": "actorconditions_1:89",
+        "name": "Potion Scripter",
+        "category": "mental",
+        "isPositive" : 1,
+        "scripts": [
+       		{
+       			"name": "scripted_potion_boost"
+       		}
+        ]
+    }
+]

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

@@ -176,6 +176,17 @@
     {
         "id": "elwyl_6",
         "message": "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.",
+        "replies": [
+            {
+                "text": "N",
+                "nextPhraseID": "elwyl_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.",
+        "switchToNPC": "elwel",
         "replies": [
             {
                 "text": "N",
@@ -186,6 +197,7 @@
     {
         "id": "elwyl_8",
         "message": "Argh. I am so upset at her!",
+        "switchToNPC": "elwyl",
         "replies": [
             {
                 "text": "Good luck with that. I'll leave you to your fighting.",

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_kantya.json

@@ -120,7 +120,7 @@
                 "nextPhraseID": "kantya10"
             }
         ],
-        "message": "Strange noises filled the whole mine, lour rumbles and shrieking noises from within the rock."
+        "message": "Strange noises filled the whole mine, loud rumbles and shrieking noises from within the rock."
     },
     {
         "id": "kantya10",

AndorsTrail/res/raw/droplists_debug.json

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

AndorsTrail/res/raw/itemlist_debug.json

@@ -3,7 +3,7 @@
         "id": "debug_dagger1",
         "iconID": "items_weapons:20",
         "name": "Black heart dagger",
-        "category": 0,
+        "category": "dagger",
         "displaytype": "extraordinary",
         "hasManualPrice": 1,
         "baseMarketCost": 6,
@@ -22,7 +22,7 @@
         "id": "debug_ring1",
         "iconID": "items_jewelry:4",
         "name": "Black heart ring",
-        "category": 7,
+        "category": "ring",
         "displaytype": "quest",
         "hasManualPrice": 1,
         "baseMarketCost": 3,
@@ -32,13 +32,18 @@
                 "min": 10,
                 "max": 10
             }
-        }
+        },
+        "privateScripts": [
+        	{
+        		"name": "player_boostAC"
+        	}
+        ]
     },
     {
         "id": "shadow_slayer",
         "iconID": "items_weapons:60",
         "name": "Shadow of the slayer",
-        "category": 0,
+        "category": "ssword",
         "displaytype": "extraordinary",
         "hasManualPrice": 1,
         "baseMarketCost": 0,
@@ -59,5 +64,19 @@
                 "max": 1
             }
         }
+    },
+    {
+        "id": "health_minor",
+        "iconID": "items_consumables:35",
+        "name": "Minor vial of health",
+        "category": "pot",
+        "hasManualPrice": 1,
+        "baseMarketCost": 5,
+        "useEffect": {
+            "increaseCurrentHP": {
+                "min": 1,
+                "max": 1
+            }
+        }
     }
 ]

AndorsTrail/res/raw/monsterlist_v0611_npcs2.json

@@ -9,7 +9,7 @@
     },
     {
         "id": "elwyl",
-        "iconID": "monsters_rltiles3:17",
+        "iconID": "monsters_ld1:187",
         "name": "Elwyl",
         "spawnGroup": "elwyl",
         "monsterClass": "humanoid",
@@ -17,7 +17,7 @@
     },
     {
         "id": "elwel",
-        "iconID": "monsters_rltiles3:17",
+        "iconID": "monsters_ld1:188",
         "name": "Elwel",
         "spawnGroup": "elwel",
         "monsterClass": "humanoid",

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 five bones.",
+        "logText": "Lodar can create a potent defensive potion if I bring him two Arulir skins and a claw from some monster.",
         "progress": 43
       }
     ]

AndorsTrail/res/raw/scripts_debug.ats

@@ -0,0 +1,37 @@
+"map_boostAC" map.onEnter [
+	player.addActorCondition("scripted_potion_efficiency",5, 2, 50);
+]
+
+"map_unboostAC" map.onLeave [
+	player.clearActorCondition("scripted_potion_efficiency", 50);
+]
+
+"player_boostAC" player.statsUpdated [
+	player.ac = player.ac * 1.5;
+][Boosts your AC by 50% of current value.]
+
+"useless_one" map.onEnter [
+	num a = 5;
+	if (a < 3) {
+		bool b = true;
+		num c = 2;
+	} else if (a == 5 ) {
+		string d = "TestString";
+	} else {
+		num b = 12.3;
+		bool c = true;
+		while (c) {
+			a = a - 1;
+			if (a == 0) {
+				c = false;
+			}
+		}
+	}
+][Simple test of local variables scoping]
+
+"scripted_potion_boost" item.onUse [
+	if (item.category == "pot") {
+		item.reward.hp.max = item.reward.hp.max * 2;
+		item.reward.hp.min = item.reward.hp.min * 2;
+	}
+][Doubles the health gained by drinking potions]

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.xml

@@ -638,4 +638,8 @@
 		<item>@xml/tradehouse1</item>
 		<item>@xml/tradehouse0a</item>
 	</array>
+	
+	<array name="loadresource_scripts">
+		
+	</array>
 </resources>

AndorsTrail/res/values/loadresources_debug.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+        
 	<array name="loadresource_items_debug">
 		<item>@raw/itemlist_money</item>
 		<item>@raw/itemlist_weapons</item>
@@ -25,5 +26,14 @@
 
 	<array name="loadresource_maps_debug">
 		<item>@xml/debugmap</item>
+		<item>@xml/debugmap_scripts</item>
+	</array>
+	
+	<array name="loadresource_scripts_debug">
+		<item>@raw/scripts_debug</item>
+	</array>
+	
+	<array name="loadresource_actorconditions_debug">
+		<item>@raw/actorconditions_debug</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>
@@ -605,4 +574,11 @@ Every skill level increases the attack chance of weapons with %1$d %% of their o
 	<string name="heroinfo_gamestats_fav_monsters">Most commonly killed monsters</string>
 	<string name="heroinfo_gamestats_name_and_qty">%1$s (%2$d)</string>
 
+	<!-- =========================================== -->
+	<!-- Added in v0.7.1 -->
+
+	<string name="preferences_ui_use_localized_resources_title">Use localized resources</string>
+	<string name="preferences_ui_use_localized_resources">Use translation of interface and content, where available. (requires restart)</string>
+	<string name="change_locale_requires_restart">Changing locale requires restart. Andor\'s Trail has been closed.</string>
+
 </resources>

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"/>

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"/>

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"/>

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"/>

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"/>

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"/>

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"/>

AndorsTrail/res/xml/blackwater_mountain16.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"/>

AndorsTrail/res/xml/blackwater_mountain2.tmx

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map version="1.0" orientation="orthogonal" width="20" height="10" 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"/>

AndorsTrail/res/xml/blackwater_mountain21.tmx

@@ -170,6 +170,9 @@
   <object name="prim_innquest:50" type="key" x="512" y="256" width="96" height="32">
    <properties>
     <property name="phrase" value="bwm_primsleep"/>
+    <property name="requireType" value="questProgress"/>
+    <property name="requireId" value="prim_innquest"/>
+    <property name="requireValue" value="50"/>
    </properties>
   </object>
  </objectgroup>

AndorsTrail/res/xml/blackwater_mountain3.tmx

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map version="1.0" orientation="orthogonal" width="15" height="10" 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"/>

AndorsTrail/res/xml/blackwater_mountain30.tmx

@@ -2,7 +2,7 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <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"/>

AndorsTrail/res/xml/blackwater_mountain32.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"/>

AndorsTrail/res/xml/blackwater_mountain38.tmx

@@ -172,6 +172,9 @@
   <object name="bwm_agent:60" type="key" x="640" y="352" width="64" height="96">
    <properties>
     <property name="phrase" value="keyarea_bwm_agent_60"/>
+    <property name="requireType" value="questProgress"/>
+    <property name="requireId" value="bwm_agent"/>
+    <property name="requireValue" value="60"/>
    </properties>
   </object>
  </objectgroup>

AndorsTrail/res/xml/blackwater_mountain4.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="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"/>

AndorsTrail/res/xml/blackwater_mountain40.tmx

@@ -2,7 +2,7 @@
 <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="11" height="11" 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"/>

AndorsTrail/res/xml/blackwater_mountain44.tmx

@@ -180,16 +180,25 @@
   <object name="nondisplay:16" type="key" x="224" y="160" width="32" height="160">
    <properties>
     <property name="phrase" value="bwm_sleephall_1"/>
+    <property name="requireType" value="questProgress"/>
+    <property name="requireId" value="nondisplay"/>
+    <property name="requireValue" value="16"/>
    </properties>
   </object>
   <object name="nondisplay:16" type="key" x="128" y="160" width="32" height="160">
    <properties>
     <property name="phrase" value="bwm_sleephall_1"/>
+    <property name="requireType" value="questProgress"/>
+    <property name="requireId" value="nondisplay"/>
+    <property name="requireValue" value="16"/>
    </properties>
   </object>
   <object name="nondisplay:16" type="key" x="32" y="96" width="32" height="224">
    <properties>
     <property name="phrase" value="bwm_sleephall_1"/>
+    <property name="requireType" value="questProgress"/>
+    <property name="requireId" value="nondisplay"/>
+    <property name="requireValue" value="16"/>
    </properties>
   </object>
  </objectgroup>

AndorsTrail/res/xml/blackwater_mountain5.tmx

@@ -165,6 +165,9 @@
   <object name="bwm_agent:10" type="key" x="320" y="128" width="96" height="32">
    <properties>
     <property name="phrase" value="keyarea_bwm_agent_1"/>
+    <property name="requireType" value="questProgress"/>
+    <property name="requireId" value="bwm_agent"/>
+    <property name="requireValue" value="10"/>
    </properties>
   </object>
  </objectgroup>