Quest Fungi Panic (id bogsten) debugged till stage 30. Hacks in debug

map & data introduced...

AndorsTrail/.classpath

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

AndorsTrail/.svnignore

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

AndorsTrail/AndorsTrail.iml

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

AndorsTrail/AndroidManifest.xml

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

AndorsTrail/assets/translation/english.pot

@@ -1,18 +1,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Andors Trail\n"
-"POT-Creation-Date: Sun Nov 10 11:14:56 CET 2013\n"
+"POT-Creation-Date: Tue Jul 23 13:09:25 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 ""
@@ -5019,10 +5015,6 @@ 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 ""
@@ -10668,7 +10660,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, loud rumbles and shrieking noises from within the rock."
+msgid "Strange noises filled the whole mine, lour rumbles and shrieking noises from within the rock."
 msgstr ""
 
 #: conversationlist_kaori.json:kaori_1
@@ -12066,7 +12058,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, and I believe you can find the type of claws that I require on monsters that dwell underground and in caves somewhere outside Fallhaven."
+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."
 msgstr ""
 
 #: conversationlist_lodar.json:lodar_xul0
@@ -26481,7 +26473,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. 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."
+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
@@ -26563,44 +26555,3 @@ msgstr ""
 #: questlist_v070_misc.json:antifoodp:40
 msgid "I can bring him more ingredients if I want him to create more antidote potions in the future."
 msgstr ""
-
-#: worldmap.xml::blackwater:prim
-msgid "Prim"
-msgstr ""
-
-#: worldmap.xml::world1:charwoodh
-msgid "Charwood"
-msgstr ""
-
-#: worldmap.xml::world1:crossglen
-msgid "Crossglen"
-msgstr ""
-
-#: worldmap.xml::world1:crossroads
-msgid "Crossroads Guardhouse"
-msgstr ""
-
-#: worldmap.xml::world1:fallhaven
-msgid "Fallhaven"
-msgstr ""
-
-#: worldmap.xml::world1:flagstone
-msgid "Flagstone Prison"
-msgstr ""
-
-#: worldmap.xml::world1:fflask
-msgid "Foaming Flask Tavern"
-msgstr ""
-
-#: worldmap.xml::world1:loneford
-msgid "Loneford"
-msgstr ""
-
-#: worldmap.xml::world1:remgard
-msgid "Remgard"
-msgstr ""
-
-#: worldmap.xml::world1:vilegard
-msgid "Vilegard"
-msgstr ""
-

AndorsTrail/assets/translation/reformatPo.sh

@@ -1,10 +0,0 @@
-#!/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/project.properties

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

AndorsTrail/res/drawable/ui_debug_background.xml

@@ -0,0 +1,10 @@
+<?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

@@ -0,0 +1,12 @@
+<?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/drawable/ui_progress_exp.xml

@@ -1,24 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:id="@android:id/background">
-	    <nine-patch android:src="@drawable/ui_bar_background"/>
+	<item android:id="@android:id/background" android:drawable="@drawable/ui_bar_background">
 	</item>
 	<item android:id="@android:id/secondaryProgress">
-	    <clip>
-	        <nine-patch android:src="@drawable/ui_bar_background"/>
-	    </clip>
-	</item>
-	<item android:id="@android:id/progress">
-	    <clip>
-	        <nine-patch android:src="@drawable/ui_yellow_foreground" />
-	    </clip>
-	</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_yellow_foreground" />
 	</item>
- -->
 </layer-list>

AndorsTrail/res/drawable/ui_progress_health.xml

@@ -1,18 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:id="@android:id/background">
-	    <nine-patch android:src="@drawable/ui_bar_background"/>
+	<item android:id="@android:id/background" android:drawable="@drawable/ui_bar_background">
 	</item>
 	<item android:id="@android:id/secondaryProgress">
-	    <clip>
-	        <nine-patch android:src="@drawable/ui_bar_background"/>
-	    </clip>
+		<clip android:drawable="@drawable/ui_bar_background" />
 	</item>
 	<item android:id="@android:id/progress">
-	    <clip>
-	        <nine-patch android:src="@drawable/ui_red_foreground" />
-	    </clip>
+		<clip android:drawable="@drawable/ui_red_foreground" />
 	</item>
 
 <!--

AndorsTrail/res/layout-land/heroinfo_inventory.xml

@@ -41,35 +41,6 @@
 		android:orientation="vertical"
 		android:gravity="left"
 		>
-		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:orientation="horizontal"
-			>
-			<Spinner
-				android:id="@+id/inventorylist_category_filters"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:gravity="left"
-				android:orientation="horizontal"
-				android:prompt="@string/heroinfo_inventory_categories"
-				android:layout_marginLeft="10dp"
-				android:layout_marginTop="10dp"
-				android:layout_marginBottom="5dp" />
-
-			<Spinner
-				android:id="@+id/inventorylist_sort_filters"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:orientation="horizontal"
-				android:layout_toRightOf="@+id/inventorylist_category_filters"
-				android:prompt="@string/heroinfo_inventory_sort"
-				android:layout_margin="@dimen/dialog_margin"
-				android:layout_marginTop="10dp"
-				android:layout_marginRight="5dp"
-				android:layout_marginBottom="5dp"
-				android:layout_marginLeft="5dp" />
-		</LinearLayout>
 
 		<TextView
 			android:layout_width="wrap_content"
@@ -85,4 +56,4 @@
 
 	</LinearLayout>
 
-</LinearLayout>
+</LinearLayout>

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="@android:string/unknownName"
+				android:text="version"
 				/>
 		</LinearLayout>
 	</LinearLayout>

AndorsTrail/res/layout/combatview.xml

@@ -4,7 +4,7 @@
 	android:layout_height="wrap_content"
 	android:gravity="center_horizontal"
 	>
-	<LinearLayout 
+	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 		android:id="@+id/combatview_actionbar"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
@@ -14,8 +14,7 @@
 
 		<Button android:id="@+id/combatview_moveattack"
 			android:layout_width="wrap_content"
-	   		android:layout_height="wrap_content"
-	    	android:minHeight="0dp"
+			android:layout_height="@dimen/smalltext_buttonheight"
 			android:textSize="@dimen/actionbar_text"
 			android:text="@string/combat_attack"
 			/>
@@ -35,16 +34,14 @@
 
 		<Button android:id="@+id/combatview_endturn"
 			android:layout_width="wrap_content"
-	    	android:layout_height="wrap_content"
-	    	android:minHeight="0dp"
+			android:layout_height="@dimen/smalltext_buttonheight"
 			android:textSize="@dimen/actionbar_text"
 			android:text="@string/combat_endturn"
 			/>
 
 		<Button android:id="@+id/combatview_flee"
 			android:layout_width="wrap_content"
-	   		android:layout_height="wrap_content"
-	    	android:minHeight="0dp"
+			android:layout_height="@dimen/smalltext_buttonheight"
 			android:textSize="@dimen/actionbar_text"
 			android:text="@string/combat_flee"
 			/>
@@ -65,7 +62,7 @@
 		android:gravity="center"
 		/>
 
-	<LinearLayout
+	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 		android:id="@+id/combatview_monsterbar"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
@@ -76,8 +73,7 @@
 
 		<ImageButton android:id="@+id/combatview_monsterinfo"
 			android:layout_width="wrap_content"
-	    	android:layout_height="wrap_content"
-	    	android:minHeight="0dp"
+			android:layout_height="@dimen/smalltext_buttonheight"
 			android:layout_marginRight="5sp"
 			android:contentDescription="@string/dialog_monsterencounter_info"
 			/>

AndorsTrail/res/layout/heroinfo_inventory.xml

@@ -4,85 +4,39 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:orientation="vertical"
+	android:gravity="left"
 	>
 
-	<LinearLayout
+	<TextView
+		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_width="wrap_content"
-		android:orientation="vertical"
-		android:gravity="left"
-		>
-
-		<TextView
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/heroinfo_wornequipment"
-			/>
-
-		<LinearLayout
-			android:layout_width="wrap_content"
-			android:layout_height="match_parent"
-			android:orientation="horizontal"
-			android:gravity="center_vertical"
-			>
-
-			<include layout="@layout/heroinfo_equipped" />
-
-			<include layout="@layout/heroinfo_statsicons" />
-
-		</LinearLayout>
-
-	</LinearLayout>
-
+		android:text="@string/heroinfo_wornequipment"
+		/>
 
 	<LinearLayout
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:orientation="vertical"
-		android:gravity="left"
+		android:orientation="horizontal"
+		android:gravity="center_vertical"
 		>
-		<LinearLayout
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:orientation="horizontal"
-			>
-			<Spinner
-				android:id="@+id/inventorylist_category_filters"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:gravity="left"
-				android:orientation="horizontal"
-				android:prompt="@string/heroinfo_inventory_categories"
-				android:layout_marginLeft="10dp"
-				android:layout_marginTop="10dp"
-				android:layout_marginBottom="5dp" />
 
-			<Spinner
-				android:id="@+id/inventorylist_sort_filters"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:orientation="horizontal"
-				android:layout_toRightOf="@+id/inventorylist_category_filters"
-				android:prompt="@string/heroinfo_inventory_sort"
-				android:layout_margin="@dimen/dialog_margin"
-				android:layout_marginTop="10dp"
-				android:layout_marginRight="5dp"
-				android:layout_marginBottom="5dp"
-				android:layout_marginLeft="5dp" />
-		</LinearLayout>
+		<include layout="@layout/heroinfo_equipped" />
 
-		<TextView
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/heroinfo_inventory"
-			/>
-
-		<ListView
-			android:id="@+id/inventorylist_root"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			/>
+		<include layout="@layout/heroinfo_statsicons" />
 
 	</LinearLayout>
 
-</LinearLayout>
+
+	<TextView
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:text="@string/heroinfo_inventory"
+		/>
+
+	<ListView
+		android:id="@+id/inventorylist_root"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		/>
+
+</LinearLayout>