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

Implemented workaround for Blackberry port users.
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).
2025-12-27 14:59:00 +01:00 · 2014-03-04 22:44:16 +01:00 · 2014-03-04 22:36:55 +01:00 · 2014-02-22 16:57:58 +01:00 · 2013-12-08 09:36:02 +01:00 · 2013-12-07 13:49:18 +01:00
555 changed files with 72088 additions and 40402 deletions
--- a/AndorsTrail/.classpath
+++ b/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>
--- a/AndorsTrail/.svnignore
+++ b/AndorsTrail/.svnignore
@@ -1,4 +0,0 @@
-gen
-bin
-.metadata
-.git
--- a/AndorsTrail/AndorsTrail.iml
+++ b/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" />
--- a/AndorsTrail/AndroidManifest.xml
+++ b/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
--- a/AndorsTrail/assets/translation/de.po
+++ b/AndorsTrail/assets/translation/de.po
--- a/AndorsTrail/assets/translation/english.pot
+++ b/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
--- a/AndorsTrail/assets/translation/es.po
+++ b/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"
--- a/AndorsTrail/assets/translation/fr.po
+++ b/AndorsTrail/assets/translation/fr.po
--- a/AndorsTrail/assets/translation/id.po
+++ b/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"
--- a/AndorsTrail/assets/translation/it.po
+++ b/AndorsTrail/assets/translation/it.po
--- a/AndorsTrail/assets/translation/ja.po
+++ b/AndorsTrail/assets/translation/ja.po
--- a/AndorsTrail/assets/translation/ms.po
+++ b/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)"
--- a/AndorsTrail/assets/translation/pl.po
+++ b/AndorsTrail/assets/translation/pl.po
--- a/AndorsTrail/assets/translation/pt.po
+++ b/AndorsTrail/assets/translation/pt.po
--- a/AndorsTrail/assets/translation/pt-rBR.po
+++ b/AndorsTrail/assets/translation/pt-rBR.po
--- a/AndorsTrail/assets/translation/reformatPo.sh
+++ b/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
--- a/AndorsTrail/assets/translation/ru.po
+++ b/AndorsTrail/assets/translation/ru.po
--- a/AndorsTrail/assets/translation/sl.po
+++ b/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"
--- a/AndorsTrail/project.properties
+++ b/AndorsTrail/project.properties
@@ -8,4 +8,4 @@
 # project structure.

 # Project target.
-target=android-17
+target=android-19
--- a/AndorsTrail/res/drawable-xhdpi/icon.png
+++ b/AndorsTrail/res/drawable-xhdpi/icon.png
--- a/AndorsTrail/res/drawable-xxhdpi/icon.png
+++ b/AndorsTrail/res/drawable-xxhdpi/icon.png
--- a/AndorsTrail/res/drawable/map_bed_1.png
+++ b/AndorsTrail/res/drawable/map_bed_1.png
--- a/AndorsTrail/res/drawable/map_bridge_1.png
+++ b/AndorsTrail/res/drawable/map_bridge_1.png
--- a/AndorsTrail/res/drawable/map_bridge_2.png
+++ b/AndorsTrail/res/drawable/map_bridge_2.png
--- a/AndorsTrail/res/drawable/map_broken_1.png
+++ b/AndorsTrail/res/drawable/map_broken_1.png
--- a/AndorsTrail/res/drawable/map_cavewall_3.png
+++ b/AndorsTrail/res/drawable/map_cavewall_3.png
--- a/AndorsTrail/res/drawable/map_cavewall_4.png
+++ b/AndorsTrail/res/drawable/map_cavewall_4.png
--- a/AndorsTrail/res/drawable/map_chair_table_1.png
+++ b/AndorsTrail/res/drawable/map_chair_table_1.png
--- a/AndorsTrail/res/drawable/map_chair_table_2.png
+++ b/AndorsTrail/res/drawable/map_chair_table_2.png
--- a/AndorsTrail/res/drawable/map_crate_1.png
+++ b/AndorsTrail/res/drawable/map_crate_1.png
--- a/AndorsTrail/res/drawable/map_cupboard_1.png
+++ b/AndorsTrail/res/drawable/map_cupboard_1.png
--- a/AndorsTrail/res/drawable/map_curtain_1.png
+++ b/AndorsTrail/res/drawable/map_curtain_1.png
--- a/AndorsTrail/res/drawable/map_entrance_1.png
+++ b/AndorsTrail/res/drawable/map_entrance_1.png
--- a/AndorsTrail/res/drawable/map_entrance_2.png
+++ b/AndorsTrail/res/drawable/map_entrance_2.png
--- a/AndorsTrail/res/drawable/map_fence_1.png
+++ b/AndorsTrail/res/drawable/map_fence_1.png
--- a/AndorsTrail/res/drawable/map_fence_2.png
+++ b/AndorsTrail/res/drawable/map_fence_2.png
--- a/AndorsTrail/res/drawable/map_fence_3.png
+++ b/AndorsTrail/res/drawable/map_fence_3.png
--- a/AndorsTrail/res/drawable/map_fence_4.png
+++ b/AndorsTrail/res/drawable/map_fence_4.png
--- a/AndorsTrail/res/drawable/map_ground_2.png
+++ b/AndorsTrail/res/drawable/map_ground_2.png
--- a/AndorsTrail/res/drawable/map_house_1.png
+++ b/AndorsTrail/res/drawable/map_house_1.png
--- a/AndorsTrail/res/drawable/map_house_2.png
+++ b/AndorsTrail/res/drawable/map_house_2.png
--- a/AndorsTrail/res/drawable/map_indoor_1.png
+++ b/AndorsTrail/res/drawable/map_indoor_1.png
--- a/AndorsTrail/res/drawable/map_indoor_2.png
+++ b/AndorsTrail/res/drawable/map_indoor_2.png
--- a/AndorsTrail/res/drawable/map_kitchen_1.png
+++ b/AndorsTrail/res/drawable/map_kitchen_1.png
--- a/AndorsTrail/res/drawable/map_outdoor_1.png
+++ b/AndorsTrail/res/drawable/map_outdoor_1.png
--- a/AndorsTrail/res/drawable/map_pillar_2.png
+++ b/AndorsTrail/res/drawable/map_pillar_2.png
--- a/AndorsTrail/res/drawable/map_plant_1.png
+++ b/AndorsTrail/res/drawable/map_plant_1.png
--- a/AndorsTrail/res/drawable/map_plant_2.png
+++ b/AndorsTrail/res/drawable/map_plant_2.png
--- a/AndorsTrail/res/drawable/map_rock_1.png
+++ b/AndorsTrail/res/drawable/map_rock_1.png
--- a/AndorsTrail/res/drawable/map_rock_2.png
+++ b/AndorsTrail/res/drawable/map_rock_2.png
--- a/AndorsTrail/res/drawable/map_roof_1.png
+++ b/AndorsTrail/res/drawable/map_roof_1.png
--- a/AndorsTrail/res/drawable/map_roof_3.png
+++ b/AndorsTrail/res/drawable/map_roof_3.png
--- a/AndorsTrail/res/drawable/map_sign_ladder_1.png
+++ b/AndorsTrail/res/drawable/map_sign_ladder_1.png
--- a/AndorsTrail/res/drawable/map_transition_1.png
+++ b/AndorsTrail/res/drawable/map_transition_1.png
--- a/AndorsTrail/res/drawable/map_transition_2.png
+++ b/AndorsTrail/res/drawable/map_transition_2.png
--- a/AndorsTrail/res/drawable/map_transition_3.png
+++ b/AndorsTrail/res/drawable/map_transition_3.png
--- a/AndorsTrail/res/drawable/map_transition_4.png
+++ b/AndorsTrail/res/drawable/map_transition_4.png
--- a/AndorsTrail/res/drawable/map_tree_1.png
+++ b/AndorsTrail/res/drawable/map_tree_1.png
--- a/AndorsTrail/res/drawable/map_tree_2.png
+++ b/AndorsTrail/res/drawable/map_tree_2.png
--- a/AndorsTrail/res/drawable/map_wall_1.png
+++ b/AndorsTrail/res/drawable/map_wall_1.png
--- a/AndorsTrail/res/drawable/map_wall_4.png
+++ b/AndorsTrail/res/drawable/map_wall_4.png
--- a/AndorsTrail/res/drawable/map_window_2.png
+++ b/AndorsTrail/res/drawable/map_window_2.png
--- a/AndorsTrail/res/drawable/monsters_men.png
+++ b/AndorsTrail/res/drawable/monsters_men.png
--- a/AndorsTrail/res/drawable/monsters_men2.png
+++ b/AndorsTrail/res/drawable/monsters_men2.png
--- a/AndorsTrail/res/drawable/monsters_rltiles3.png
+++ b/AndorsTrail/res/drawable/monsters_rltiles3.png
--- a/AndorsTrail/res/drawable/monsters_snakes.png
+++ b/AndorsTrail/res/drawable/monsters_snakes.png
--- a/AndorsTrail/res/drawable/ui_debug_background.xml
+++ b/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>
--- a/AndorsTrail/res/drawable/ui_progress_ap.xml
+++ b/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>
--- a/AndorsTrail/res/layout/about.xml
+++ b/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>
--- a/AndorsTrail/res/layout/heroinfo_stats.xml
+++ b/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>

--- a/AndorsTrail/res/layout/inventoryitemview.xml
+++ b/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"
 	/>
--- a/AndorsTrail/res/layout/loadsave.xml
+++ b/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"
--- a/AndorsTrail/res/layout/startscreen.xml
+++ b/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>

--- a/AndorsTrail/res/raw/conversationlist_debug.json
+++ b/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..."
+  }
 ]
--- a/AndorsTrail/res/raw/conversationlist_elwyl.json
+++ b/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": [
            {
--- a/AndorsTrail/res/raw/conversationlist_farrik.json
+++ b/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": [
--- a/AndorsTrail/res/raw/conversationlist_lodar.json
+++ b/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",
--- a/AndorsTrail/res/raw/droplists_debug.json
+++ b/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
+      }
+    ]
+  }
 ]
--- a/AndorsTrail/res/raw/questlist_nondisplayed.json
+++ b/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
            }
        ]
    },
--- a/AndorsTrail/res/raw/questlist_v070_lodar.json
+++ b/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
      }
    ]
--- a/AndorsTrail/res/values-pt-rBR/strings.xml
+++ b/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>
--- a/AndorsTrail/res/values/authors.xml
+++ b/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".
--- a/AndorsTrail/res/values/strings.xml
+++ b/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>
--- a/AndorsTrail/res/values/ui_colors.xml
+++ b/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>
--- a/AndorsTrail/res/xml/blackwater_mountain0.tmx
+++ b/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>
--- a/AndorsTrail/res/xml/blackwater_mountain1.tmx
+++ b/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>
--- a/AndorsTrail/res/xml/blackwater_mountain10.tmx
+++ b/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>
--- a/AndorsTrail/res/xml/blackwater_mountain11.tmx
+++ b/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>
--- a/AndorsTrail/res/xml/blackwater_mountain12.tmx
+++ b/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>
--- a/AndorsTrail/res/xml/blackwater_mountain13.tmx
+++ b/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>
--- a/AndorsTrail/res/xml/blackwater_mountain14.tmx
+++ b/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>
--- a/AndorsTrail/res/xml/blackwater_mountain15.tmx
+++ b/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>
--- a/AndorsTrail/res/xml/blackwater_mountain16.tmx
+++ b/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"/>
@@ -144,7 +144,7 @@
   eJzVlMkJwDAMBF1CmnL/LYV8xa53FD1CBAJjaXT52Nda+0N95K9sEpVH7dd1jUHZGuPEulo7eRPr5tBhla/rg7DKV80usdO86dwn7GnO5O47oW+DsqlfwtJ3SGokfIeZ5k7/T+evesvSPmvNzt7t19knrNIb8thPsQ==
  </data>
 </layer>
- <objectgroup name="Mapevents" width="15" height="30">
+ <objectgroup name="Mapevents">
  <object name="south" type="mapchange" x="128" y="928" width="96" height="32">
   <properties>
    <property name="map" value="blackwater_mountain15"/>
@@ -159,7 +159,7 @@
  </object>
  <object name="sign_blackwater16" type="sign" x="416" y="416" width="32" height="32"/>
 </objectgroup>
- <objectgroup name="Spawn" width="15" height="30" visible="0">
+ <objectgroup name="Spawn" visible="0">
  <object name="gornaud_1" type="spawn" x="32" y="832" width="416" height="64">
   <properties>
    <property name="quantity" value="2"/>
@@ -186,5 +186,5 @@
  </object>
  <object name="gornaud_1" type="spawn" x="320" y="160" width="128" height="352"/>
 </objectgroup>
- <objectgroup name="Keys" width="15" height="30" visible="0"/>
+ <objectgroup name="Keys" visible="0"/>
 </map>
--- a/AndorsTrail/res/xml/blackwater_mountain17.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain17.tmx
@@ -141,7 +141,7 @@
   eJxzFWBgcB0iGASobR4hM5HliVFLrBpkQKxacs3DB8i1lxizSbGTEj/TMo0BAM1lMHs=
  </data>
 </layer>
- <objectgroup name="Mapevents" width="20" height="10" visible="0">
+ <objectgroup name="Mapevents" visible="0">
  <object name="south" type="mapchange" x="512" y="288" width="32" height="32">
   <properties>
    <property name="map" value="blackwater_mountain16"/>
@@ -155,7 +155,7 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Spawn" width="20" height="10">
+ <objectgroup name="Spawn">
  <object name="gornaud_3" type="spawn" x="256" y="224" width="32" height="32"/>
  <object name="gornaud_2" type="spawn" x="96" y="160" width="128" height="128"/>
  <object name="bwm_agent_4" type="spawn" x="384" y="224" width="32" height="32">
@@ -163,5 +163,5 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Keys" width="20" height="10"/>
+ <objectgroup name="Keys"/>
 </map>
--- a/AndorsTrail/res/xml/blackwater_mountain18.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain18.tmx
@@ -140,7 +140,7 @@
   eJxzFWBgcB0iGASQ2aQCdL3kuoFcveh+IFcvqf5F10vIb8NNLzZ5fHGJLxwHOg1RQy85+rHpxQbwyaHbSywg1X2U+BMXBgALAUy0
  </data>
 </layer>
- <objectgroup name="Mapevents" width="15" height="22">
+ <objectgroup name="Mapevents">
  <object name="south" type="mapchange" x="64" y="608" width="32" height="32">
   <properties>
    <property name="map" value="blackwater_mountain17"/>
@@ -154,7 +154,7 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Spawn" width="15" height="22">
+ <objectgroup name="Spawn">
  <object name="gornaud_3" type="spawn" x="128" y="288" width="32" height="96"/>
  <object name="gornaud_3" type="spawn" x="64" y="224" width="32" height="160"/>
  <object name="gornaud_3" type="spawn" x="128" y="96" width="256" height="32"/>
@@ -165,5 +165,5 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Keys" width="15" height="22"/>
+ <objectgroup name="Keys"/>
 </map>
--- a/AndorsTrail/res/xml/blackwater_mountain19.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain19.tmx
@@ -141,7 +141,7 @@
   eJxzFWBgcKUTBgFCYjAw2MXwieNSQwwGAM1IGD4=
  </data>
 </layer>
- <objectgroup name="Mapevents" width="10" height="10">
+ <objectgroup name="Mapevents">
  <object name="south" type="mapchange" x="64" y="96" width="32" height="32">
   <properties>
    <property name="map" value="blackwater_mountain18"/>
@@ -155,8 +155,8 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Spawn" width="10" height="10">
+ <objectgroup name="Spawn">
  <object name="gornaud_3" type="spawn" x="96" y="256" width="96" height="32"/>
 </objectgroup>
- <objectgroup name="Keys" width="10" height="10"/>
+ <objectgroup name="Keys"/>
 </map>
--- a/AndorsTrail/res/xml/blackwater_mountain2.tmx
+++ b/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"/>
@@ -143,7 +143,7 @@
   eJxzFWBgcCWAkQEhtfjMQDcL2UxizSYFEGsWIXOJCQNKAbFmYXM3rvAlxp+kuB2fG3HFNz4/kRvX5KZBfO7DhQE7nyKJ
  </data>
 </layer>
- <objectgroup name="Mapevents" width="20" height="10">
+ <objectgroup name="Mapevents">
  <object name="south" type="mapchange" x="320" y="288" width="32" height="32">
   <properties>
    <property name="map" value="blackwater_mountain1"/>
@@ -157,7 +157,7 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Spawn" width="20" height="10">
+ <objectgroup name="Spawn">
  <object name="gornaud_1" type="spawn" x="32" y="64" width="576" height="192">
   <properties>
    <property name="quantity" value="4"/>
@@ -165,5 +165,5 @@
  </object>
  <object name="gornaud_1" type="spawn" x="320" y="224" width="32" height="32"/>
 </objectgroup>
- <objectgroup name="Keys" width="20" height="10"/>
+ <objectgroup name="Keys"/>
 </map>
--- a/AndorsTrail/res/xml/blackwater_mountain20.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain20.tmx
@@ -141,7 +141,7 @@
   eJxzFWBgcB3GGASwiWEDhMzBp44S80hxI7GAEj8To5ba5lEahrRKPwDkWSwq
  </data>
 </layer>
- <objectgroup name="Mapevents" width="20" height="10">
+ <objectgroup name="Mapevents">
  <object name="south" type="mapchange" x="32" y="96" width="32" height="32">
   <properties>
    <property name="map" value="blackwater_mountain19"/>
@@ -155,10 +155,10 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Spawn" width="20" height="10">
+ <objectgroup name="Spawn">
  <object name="wyrm_1" type="spawn" x="96" y="96" width="160" height="192"/>
  <object name="wyrm_1" type="spawn" x="256" y="160" width="160" height="32"/>
  <object name="wyrm_1" type="spawn" x="416" y="128" width="192" height="160"/>
 </objectgroup>
- <objectgroup name="Keys" width="20" height="10"/>
+ <objectgroup name="Keys"/>
 </map>
--- a/AndorsTrail/res/xml/blackwater_mountain21.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain21.tmx
@@ -141,7 +141,7 @@
   eJxzFWBgcB2GGATI0YMPoKvBpxeXecjipJpHyN3EmkdsOKCzcakhJ/xI1YcvTGhhHqlmEmsnpWkUHQMAuqsvJw==
  </data>
 </layer>
- <objectgroup name="Mapevents" width="20" height="12" visible="0">
+ <objectgroup name="Mapevents" visible="0">
  <object name="south" type="mapchange" x="96" y="352" width="32" height="32">
   <properties>
    <property name="map" value="blackwater_mountain11"/>
@@ -151,7 +151,7 @@
  <object name="rest1" type="rest" x="512" y="96" width="64" height="32"/>
  <object name="container_primsleep" type="container" x="576" y="160" width="32" height="32"/>
 </objectgroup>
- <objectgroup name="Spawn" width="20" height="12">
+ <objectgroup name="Spawn">
  <object name="prim_cook" type="spawn" x="224" y="96" width="160" height="64">
   <properties>
   </properties>
@@ -166,10 +166,13 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Keys" width="20" height="12">
+ <objectgroup name="Keys">
  <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>
--- a/AndorsTrail/res/xml/blackwater_mountain22.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain22.tmx
@@ -141,7 +141,7 @@
   eJxzFWBgcKUTxgUI6SGkH90cXHrIsWeg3EYNPcQCYv2IjgEFSB2O
  </data>
 </layer>
- <objectgroup name="Mapevents" width="13" height="11">
+ <objectgroup name="Mapevents">
  <object name="south" type="mapchange" x="192" y="320" width="32" height="32">
   <properties>
    <property name="map" value="blackwater_mountain11"/>
@@ -149,7 +149,7 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Spawn" width="13" height="11">
+ <objectgroup name="Spawn">
  <object name="birgil" type="spawn" x="256" y="96" width="96" height="32">
   <properties>
   </properties>
@@ -171,5 +171,5 @@
   </properties>
  </object>
 </objectgroup>
- <objectgroup name="Keys" width="13" height="11"/>
+ <objectgroup name="Keys"/>
 </map>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Zukero	e1020f81b9	updated to use actual bogus fileversion numbers on BB port releases.	2014-03-04 22:44:16 +01:00
Zukero	32a0f69a63	Implemented workaround for Blackberry port users. 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).	2014-03-04 22:36:55 +01:00
Oskar Wiksten	57ba9dfa69	Bump version to v0.7.1 (versioncode 42)	2014-02-22 16:57:58 +01:00
Oskar Wiksten	8d4adab240	Refactor: Remove unsued 'flags' param when writing savegames * Remove unsued 'flags' parameter in methods for storing savegames. * Refactor static constructors when reading objects from savegames so that the ctors are named "newFromParcel", to differentiate them from "readFromParcel".	2013-12-08 09:36:02 +01:00
Oskar Wiksten	9e799962e9	Reduce compiler and code inspection warnings * Replace single-char strings with chars * Reduce visibility where applicable * Remove unused method parameters	2013-12-07 13:49:18 +01:00
Oskar Wiksten	29973a74dd	Merge pull request #17 from TodorBalabanov/parallelcoords Replace coords with xCoords and yCoords.	2013-12-03 12:29:05 -08:00
Todor Balabanov	8e98805a93	Replace coords with xCoords and yCoords. One parallel array more will help to escape packing and unpacking coordinates as integer values.	2013-12-03 11:57:30 +02:00
Oskar Wiksten	72a229a78a	Code cleanup: intellij->rightclick->optimize imports	2013-11-30 11:05:04 +01:00
Oskar Wiksten	aefa578004	Merge pull request #13 from TodorBalabanov/master We avoid unnecessary boxing of the Integer values.	2013-11-24 06:03:47 -08:00
Todor Balabanov	4b75f06987	We avoid unnecessary boxing of the Integer values. Method implementation suggestion. Issue #12	2013-11-24 15:04:49 +02:00
Oskar Wiksten	61ec20c775	Content editor: allow dragdrop reordering conversation replies	2013-11-24 11:42:52 +01:00
Oskar Wiksten	518ada6a82	Content editor: allow reordering items & monsters in table editor	2013-11-24 11:37:37 +01:00
Oskar Wiksten	660504ca72	Content editor: allow reordering quest stages & droplist content	2013-11-24 11:35:28 +01:00
Oskar Wiksten	f5df781fc9	Content editor: enable dragdrop sorting of resources	2013-11-24 11:29:53 +01:00
Oskar Wiksten	50751390a3	Updated Russian translation (thanks dromoz)	2013-11-23 22:28:38 +01:00
Oskar Wiksten	a24672a3f1	Slight border to monsters_rltiles3.png	2013-11-14 23:36:20 +01:00
Oskar Wiksten	b06c5b9b15	Unblur and add border for monsters_men.png	2013-11-14 23:24:21 +01:00
Oskar Wiksten	7cc2d303ef	Add border to monsters_men2.png monsters_snakes.png	2013-11-14 23:05:57 +01:00
Oskar Wiksten	106203d85b	Read fewer fields from TMX files * Do not read "tilewidth" and "tileheight" from <map>, always assume 32. * Do not read "tilewidth" and "tileheight" from <tileset>, always assume 32. * Do not read "width" and "height" from <layer>, always assume same size as map. * Do not read "width" and "height" from <objectgroup>, always assume same size as map. * Do not read <image> inside <tileset>. Always assume tileset name is same as image resource name from ResourceLoader.	2013-11-10 23:40:01 +01:00
Oskar Wiksten	8b3ac992ce	Remove obsoleted "width" and "height" on <objectgroup> in TMX files	2013-11-10 21:10:48 +01:00
Oskar Wiksten	1fabb499a9	Spelling corrections Elwyl: both our sakes -> both our sake	2013-11-10 13:50:37 +01:00
Oskar Wiksten	51e63167a0	Bump version to 0.7.1a1 (versiocode 41)	2013-11-10 12:49:50 +01:00
Oskar Wiksten	37ef73d9e2	Add xhdpi and xxhdpi icons. Update to SDK 19.	2013-11-10 12:09:36 +01:00
Oskar Wiksten	b950993852	Update French and Russian translations (thanks Marwane K and dromoz!)	2013-11-10 11:27:08 +01:00
Oskar Wiksten	4a2aa90373	Update PO with clarification of Lodar's def pots	2013-11-10 11:16:39 +01:00
Oskar Wiksten	161f516a98	Clarify monster locations in quest & conversation for Lodar def pot (thanks dromoz!)	2013-11-10 11:14:14 +01:00
Oskar Wiksten	c002405008	Updated translations (thanks Marwane K. & Andrej Znidarsic)	2013-11-03 16:24:38 +01:00
Oskar Wiksten	d4ff63d456	Merge branch 'reduce-warnings'	2013-11-03 15:07:13 +01:00
Oskar Wiksten	e8d0162ceb	Refactor: Reduce warnings / reduce scope	2013-11-03 15:05:27 +01:00
Oskar Wiksten	eba387159e	Refactor: Use enum instead of int for result of loading a savegame	2013-11-03 15:05:21 +01:00
Oskar Wiksten	6006fe1eb5	Refactor: Don't use hardcoded text for placeholders	2013-11-03 14:57:07 +01:00
Oskar Wiksten	f6559cac31	Refactor: remove unused resources	2013-11-03 14:55:59 +01:00
Oskar Wiksten	9405ad323a	Bugfix: do not hardcode map names when upgrading savegame	2013-11-03 12:40:13 +01:00
Oskar Wiksten	b0f9ba9abe	Bugfix: Do not assume that all saved maps are visited * Maps that have deactivated spawn areas should be saved, but does not neccessarily have to be visited.	2013-11-03 10:22:05 +01:00
Oskar Wiksten	086fb199cf	Remove Fallhaven prisoner when reaching quest farrik:70	2013-11-03 09:35:21 +01:00
Oskar Wiksten	b898cf7f7c	Rename TMX property "outside" to "outdoors". * Outdoors is a better name for this, because that's what we actually mean by it. Outside is ambiguous in this context. Outside is what it's called in Swedish :)	2013-11-03 08:20:00 +01:00
Oskar Wiksten	aacf97e274	Add requirement type: "hasActorCondition" * Enables scripts and conversations to choose options based on whether the player has a certain actor condition or not.	2013-11-02 10:24:07 +01:00
Oskar Wiksten	d58db6efc4	Merge branch 'activate-spawnareas'	2013-11-02 09:27:11 +01:00
Oskar Wiksten	4a1c6779cf	Enable scripts to activate/deactivate spawn areas & mapobjects Renames "isActive" on spawnareas to "isSpawning" - so that a spawn area can be non-spawning but still have monsters left in it. Adds new scripteffect types: * "spawnAll" = sets spawn area to spawning and spawns all monsters * "removeSpawnArea" = sets a spawn area to non-spawning and removes all mobs * "deactivateSpawnArea" = sets a spawn area to non-spawning * "activateMapChangeArea" = sets a mapchange area to non-active * "deactivateMapChangeArea" = sets a mapchange area to non-active (so that it does not teleport the player) Adds new property "active" to spawn- and mapchange areas in tmx files, that determines whether the areas are active when starting a new game.	2013-11-02 09:26:04 +01:00
Oskar Wiksten	a2caea0a83	Refactor: Flatten some forward-arrow-pattern ifs to vertical code	2013-10-27 15:29:27 +01:00
Oskar Wiksten	4209f91d00	Bugfix: also save maps that use non-default values * For example, maps that have had some spawn area deactivated should be saved in the savegame.	2013-10-27 14:17:40 +01:00
Oskar Wiksten	88f15b9099	Merge pull request #10 from oskarwiksten/persist-isactive-on-mapobjects-in-savegames Save 'isActive' for MapObjects & SpawnArea in savegames	2013-10-27 05:55:42 -07:00
Oskar Wiksten	20ed608523	Save 'isActive' for MapObjects & SpawnArea in savegames * Stores the "isActive" boolean in savegames for map objects and spawn areas * Adds functions in MapController to activate and deactivate MapObject areas * Adds functions in MonsterSpawnController to activate and deactivate MonsterSpawnAreas * When a spawn area is deactivated, all monsters should be removed, since the spawn area is considered to be non-existant. * Adds boolean "isActiveForNewGame" to map objects and spawn areas, that specify what "isActive" should be set to when starting a game. (Initially, all of these are true) * This commit does not add any way to actually activate or deactive areas. That can come as a later commit (possibly using script effects to do that).	2013-10-27 13:04:09 +01:00
Oskar Wiksten	c001532106	Merge branch 'rename-phrase-reward-to-script-effect'	2013-10-27 10:59:56 +01:00
Oskar Wiksten	a8ad00c21c	Refactor: Rename PhraseReward -> ScriptEffect * This commit does not contain changes to json field names when parsing phrases though.	2013-10-27 10:59:21 +01:00
Oskar Wiksten	079511a30c	Rename file Reward.java -> ScriptEffect.java	2013-10-27 10:52:11 +01:00
Oskar Wiksten	6fce649cbb	Always deny monster movement on mapchange,keyarea,rest - regardless of isActive	2013-10-27 10:12:27 +01:00
Oskar Wiksten	d2c3eb9106	Refactor: rename functions for saving PredefinedMap data	2013-10-27 09:33:24 +01:00
Oskar Wiksten	53331aef1b	Code reformat: Ctor arguments should be one arg per line * Vertical list makes it easier to version control additions and removals of single parameters	2013-10-27 09:09:09 +01:00
Oskar Wiksten	0570589ecc	Refactor: Rename reset() -> resetForNewGame() on map data classes	2013-10-27 08:38:27 +01:00
Oskar Wiksten	9af062e36e	Updated PO translations from launchpad	2013-10-26 11:39:19 +02:00
Oskar Wiksten	9fc23ca1fc	Add "translator-credits" to english POT file * Used by Launchpad translations for maintaining list of translators.	2013-10-26 10:23:12 +02:00
Oskar Wiksten	e509b1d75f	Update english.pot, reformat all PO files (sort by source location)	2013-10-26 09:50:18 +02:00
Oskar Wiksten	339c3ee7b2	Renamed Brazilian Portuguese translation file: pt-rBR.po -> pt_BR.po	2013-10-26 09:44:40 +02:00
Oskar Wiksten	0c3b4bded9	Merge pull request #9 from Zukero/requirements_negation Added requirement negation capability :	2013-10-23 09:22:22 -07:00
Zukero	c06dba6b7d	Factorized the checkbox definition in content editor.	2013-10-23 18:08:09 +02:00
Zukero	707940aa14	Added requirement negation capability : - Use "requireNegation" property in Tiled map object - Checkbox for require.negate added in Content Editor	2013-10-22 23:10:24 +02:00
Oskar Wiksten	bdde9cefba	Merge branch 'activable_map_objects'	2013-10-22 18:06:23 +02:00
Zukero	26c412f7f1	MapObject & MonsterSpawnArea can be activated/deactivated using theisActive boolean. No handle exist yet to deactivate these areas. Deactivated areas are never returned by PredefinedMap API. Inactive container areas' Loot are not created on createAllContainerLoot() calls. Think of creating it on area activation when implemented (TODO label placed in the code to never forget :p) Updated comment; fixed old, one-object processing to better match the List type.	2013-10-22 18:05:51 +02:00
Oskar Wiksten	159d977187	Merge pull request #7 from Zukero/debug_resources_bugfix Fixed deprecated use of "consumedMore" instead of "spentGold" in	2013-10-22 06:38:27 -07:00
Zukero	e33ac42c1c	Fixed deprecated use of "consumedMore" instead of "spentGold" in conversationlist_debug.json	2013-10-22 15:18:44 +02:00
Oskar Wiksten	76720094c1	Merge pull request #6 from Zukero/map_object_group_data_kept MapObject & MonsterSpawnArea now keep track of their Tiled group's name.	2013-10-20 23:39:38 -07:00
Zukero	c4896aaab3	Tiled group name also in ReplaceableMapSection	2013-10-20 22:18:42 +02:00
Zukero	bddb3e2a8c	MapObject & MonsterSpawnArea now keep track of their Tiled group's name.	2013-10-20 22:14:35 +02:00
Oskar Wiksten	7f2388904b	Minor gfx update to tiling pine trees	2013-10-20 10:30:01 +02:00
Oskar Wiksten	73e8851f27	Bugfix: Redraw whole screen if double-buffer is not pre-filled * Fixes issue where the screen was only partially drawn after having entered heroinfoactivity before starting combat. * lockCanvas() changes the supplied Rect object occasionally, to indicate that the double buffer has not been filled. In those cases, you need to redraw the whole rect.	2013-10-20 10:00:20 +02:00
Oskar Wiksten	a0f943994f	Bugfix: Continue combat after having seen the combat log * Previously, combat was stopped when entering the combat log. This commit makes the combat continue after having been stopped.	2013-10-20 09:03:53 +02:00
Oskar Wiksten	518934751b	Merge branch 'new_tilesets_20131005'	2013-10-05 17:56:12 +02:00
Ian Haase	36da967dbe	updated tilesets + template.tmx and authors.xml	2013-10-05 17:55:57 +02:00
Oskar Wiksten	9812dc6344	Merge pull request #5 from Zukero/master Egocentric commit. Added my name in the authors...	2013-10-03 13:32:43 -07:00
Zukero	5daf70e739	Egocentric commit. Added my name in the authors...	2013-10-03 22:27:11 +02:00
Oskar Wiksten	0a8859b304	Add explicit quest stages to existing key areas	2013-10-03 08:27:11 +02:00
Oskar Wiksten	3cee7e95d2	Merge branch 'key_area_use_requirements'	2013-10-03 08:26:26 +02:00
Zukero	140dd16408	Key Area now use Requirement, instead of QuestProgress * Requirement class moved from model.conversation to model.script * Added requirement questLatestProgress : quest stage must be reached, but no stage with superior ID must be reached. * New key requirements conditions type (item/gold/bonemeals) consumption (more or less than value, never strict checking, either <= or >=).	2013-10-02 18:21:14 +02:00
Oskar Wiksten	9af294932f	Remove unused code	2013-09-25 22:30:10 +02:00
Oskar Wiksten	5136a7cab0	Merge branch 'headless-scripts'	2013-09-25 17:55:25 +02:00
Oskar Wiksten	b41fffee44	Content editor: Add support for giveItem,createTimer and timerElapsed in convs	2013-09-25 17:54:08 +02:00
Oskar Wiksten	0212dd6bbc	Add world timers and world time (counted in number of rounds) * Increase world time each round. * Add script reward "createTimer" * Add script requirement "timerElapsed"	2013-09-25 17:54:08 +02:00
Oskar Wiksten	d6583a4e33	Add reward type "giveItem", for quest rewards that do not need full droplists.	2013-09-25 17:54:08 +02:00
Oskar Wiksten	02bfeb5625	Enable map scripts to run on every round or tick	2013-09-25 17:54:08 +02:00
Oskar Wiksten	dc278fb5da	First attempt at scripted map areas	2013-09-25 17:54:08 +02:00
Ian Haase	8d91c7375d	recolored dirt transitions	2013-09-25 17:47:10 +02:00