Updated to version v0.6.10a3.

Updated dialog of Oluag, Unnmir and Gaela for when the player has already talked to them.
Updated conversation of guard in Prim main hall.
Sort skills according to id.
Renamed old healing potions to differentiate them from the new healing potions.
Spelling corrections to v0.6.10 conversation content.
Removed overScrollFooter for conversation listview (for issue 205)

git-svn-id: https://andors-trail.googlecode.com/svn/trunk@173 08aca716-68be-ccc6-4d58-36f5abd142ac

AndorsTrail/AndroidManifest.xml

@@ -4,7 +4,7 @@
 	xmlns:android="http://schemas.android.com/apk/res/android" 
 	package="com.gpl.rpg.AndorsTrail"
 	android:versionCode="24"
-	android:versionName="0.6.10a2"
+	android:versionName="0.6.10a3"
 	android:installLocation="auto"
 	>
 	<uses-sdk 

AndorsTrail/res/layout/conversation.xml

@@ -15,6 +15,7 @@
 		android:id="@+id/conversation_statements"
 		android:transcriptMode="alwaysScroll"
 		android:padding="@dimen/dialog_margin"
+		style="@style/ConversationListView"
 		/>
 
 	<LinearLayout

AndorsTrail/res/values-fr/content_conversationlist.xml

@@ -328,7 +328,12 @@
 
 	<string name="conversationlist_fallhaven_unnmir">
 [id|message|progressQuest|rewardDropListID|replies[text|nextPhraseID|requires_Progress|requires_itemID|requires_Quantity|]|];
-{unnmir|Bonjour.|||{{J\'ai croisé un ivrogne devant la taverne qui m\'a raconté une histoire à propos de vous deux.|unnmir_1|fallhavendrunk:100|||}}|};
+{unnmir||||{
+	{|unnmir_r|nocmar:10|||}
+	{|unnmir_0||||}
+	}|};
+{unnmir_r|Hello again. You should go talk to Nocmar.|||{{N|unnmir_13||||}}|};
+{unnmir_0|Bonjour.|||{{J\'ai croisé un ivrogne devant la taverne qui m\'a raconté une histoire à propos de vous deux.|unnmir_1|fallhavendrunk:100|||}}|};
 {unnmir_1|Ce vieux radoteur de la taverne t\'a raconté notre histoire ?|||{{N|unnmir_2||||}}|};
 {unnmir_2|C\'est toujours la même vieille histoire. Nous voyagions ensemble il y a de cela quelques années.|||{{N|unnmir_3||||}}|};
 {unnmir_3|La grande aventure, tu vois, avec les épées et les sorts.|||{{N|unnmir_4||||}}|};
@@ -346,7 +351,12 @@
 
 	<string name="conversationlist_fallhaven_gaela">
 [id|message|progressQuest|rewardDropListID|replies[text|nextPhraseID|requires_Progress|requires_itemID|requires_Quantity|]|];
-{gaela|Prompte est ma lame. Empoisonnée est ma langue. À moins que ce ne soit le contraire ?|||{{On dirait qu\'il y a beaucoup de voleurs à Fallhaven.|gaela_1||||}}|};
+{gaela||||{
+	{|gaela_r|andor:40|||}
+	{|gaela_0||||}
+	}|};
+{gaela_r|Hello again. I hope you will find what you are looking for.||||};
+{gaela_0|Prompte est ma lame. Empoisonnée est ma langue. À moins que ce ne soit le contraire ?|||{{On dirait qu\'il y a beaucoup de voleurs à Fallhaven.|gaela_1||||}}|};
 {gaela_1|Oui, ils sont très présents ici.|||{{Qu\'y a-t-il d\'autre ?|gaela_2|andor:30|||}}|};
 {gaela_2|J\'ai entendu dire que tu avais aidé Gruil, un compagnon voleur du village de Crossglen.|||{{N|gaela_3||||}}|};
 {gaela_3|J\'ai aussi eu vent que tu recherchais quelqu\'un. Peut-être pourrais-je t\'aider.|||{{N|gaela_4||||}}|};

AndorsTrail/res/values-it/content_conversationlist.xml

@@ -329,7 +329,12 @@
 
         <string name="conversationlist_fallhaven_unnmir">
 [id|message|progressQuest|rewardDropListID|replies[text|nextPhraseID|requires_Progress|requires_itemID|requires_Quantity|]|];
-{unnmir|Ciao a tutti.|||{{Drunken story|unnmir_1|fallhavendrunk:100|||}}|};
+{unnmir||||{
+	{|unnmir_r|nocmar:10|||}
+	{|unnmir_0||||}
+	}|};
+{unnmir_r|Hello again. You should go talk to Nocmar.|||{{N|unnmir_13||||}}|};
+{unnmir_0|Ciao a tutti.|||{{Drunken story|unnmir_1|fallhavendrunk:100|||}}|};
 {unnmir_1|Quel vecchio ubriacone alla taverna ti ha raccontato la sua storia?|||{{N|unnmir_2||||}}|};
 {unnmir_2|La stessa vecchia storia. Eravamo abituati a viaggiare insieme qualche anno fa.|||{{N|unnmir_3||||}}|};
 {unnmir_3|Avventure vere...sai, spade e incantesimi.|||{{N|unnmir_4||||}}|};
@@ -347,7 +352,12 @@
 
         <string name="conversationlist_fallhaven_gaela">
 [id|message|progressQuest|rewardDropListID|replies[text|nextPhraseID|requires_Progress|requires_itemID|requires_Quantity|]|];
-{gaela|Veloce è la mia lama. velenosa la mia lingua. O era il contrario?|||{{Ladri|gaela_1||||}}|};
+{gaela||||{
+	{|gaela_r|andor:40|||}
+	{|gaela_0||||}
+	}|};
+{gaela_r|Hello again. I hope you will find what you are looking for.||||};
+{gaela_0|Veloce è la mia lama. velenosa la mia lingua. O era il contrario?|||{{Ladri|gaela_1||||}}|};
 {gaela_1|Si, noi ladri abbiamo una forte presenza a Fallhaven.|||{{Qualcos\'altro?|gaela_2|andor:30|||}}|};
 {gaela_2|Ho sentito che hai aiutato Gruil, un ladro compagn del villaggio di Crossglen.|||{{N|gaela_3||||}}|};
 {gaela_3|Voci dicono che stai cercando qualcuno. Potre essere in grado di aiutarti.|||{{N|gaela_4||||}}|};
@@ -957,7 +967,11 @@
 
         <string name="conversationlist_oluag">
 [id|message|progressQuest|rewardDropListID|replies[text|nextPhraseID|requires_Progress|requires_itemID|requires_Quantity|]|];
-{oluag_1|Ciao. Sono Oluag.|||{{Cosa stai facendo qui attorno a queste cassette?|oluag_2||||}}|};
+{oluag_1||||{
+	{|oluag_grave_16|wrye:80|||}
+	{|oluag_1_1||||}
+	}|};
+{oluag_1_1|Ciao. Sono Oluag.|||{{Cosa stai facendo qui attorno a queste cassette?|oluag_2||||}}|};
 {oluag_2|Oh queste. Non sono nulla. Dimenticale. E la tomba lassù e un\'altra cosa di cui non ti devi preoccupare.|||{{Quale tomba?|oluag_grave_select||||}{Niente, veramente? Suona alquanto sospetto.|oluag_boxes_1||||}}|};
 {oluag_boxes_1|No no, niente di sospetto sicuro. Non sono tipo casse che contenevano robe di contrabbando o cose simili, hah!|||{{E allora riguardo a quella tomba?|oluag_grave_select||||}{Ok allora. Suppongo di non aver visto nulla.|oluag_goodbye||||}}|};
 {oluag_goodbye|Giusto. Arrivederci.||||};

AndorsTrail/res/values-ru/content_conversationlist.xml

@@ -328,7 +328,12 @@
 
 	<string name="conversationlist_fallhaven_unnmir">
 [id|message|progressQuest|rewardDropListID|replies[text|nextPhraseID|requires_Progress|requires_itemID|requires_Quantity|]|];
-{unnmir|Эй, привет!|||{{История пьяницы|unnmir_1|fallhavendrunk:100|||}}|};
+{unnmir||||{
+	{|unnmir_r|nocmar:10|||}
+	{|unnmir_0||||}
+	}|};
+{unnmir_r|Hello again. You should go talk to Nocmar.|||{{N|unnmir_13||||}}|};
+{unnmir_0|Эй, привет!|||{{История пьяницы|unnmir_1|fallhavendrunk:100|||}}|};
 {unnmir_1|Этот старый пьянчуга у таверны рассказал тебе историю, не так ли?|||{{N|unnmir_2||||}}|};
 {unnmir_2|Это старая история. Мы путешествовали вместе несколько лет назад.|||{{N|unnmir_3||||}}|};
 {unnmir_3|Это были настоящие приключения, мечи и магия.|||{{N|unnmir_4||||}}|};
@@ -346,7 +351,12 @@
 
 	<string name="conversationlist_fallhaven_gaela">
 [id|message|progressQuest|rewardDropListID|replies[text|nextPhraseID|requires_Progress|requires_itemID|requires_Quantity|]|];
-{gaela|Свифт - мой клинок. Отравленный моим языком. Или это было наоборот?|||{{Воры|gaela_1||||}}|};
+{gaela||||{
+	{|gaela_r|andor:40|||}
+	{|gaela_0||||}
+	}|};
+{gaela_r|Hello again. I hope you will find what you are looking for.||||};
+{gaela_0|Свифт - мой клинок. Отравленный моим языком. Или это было наоборот?|||{{Воры|gaela_1||||}}|};
 {gaela_1|Да, мы воры, имеем сильное влияние в Фоллхейвене.|||{{Далее|gaela_2|andor:30|||}}|};
 {gaela_2|Я слышал, что ты помог Груилу, представителю гильдии в Кроссглене.|||{{N|gaela_3||||}}|};
 {gaela_3|Так же я слышал, что ты ищешь кого-то. Я мог бы тебе помочь.|||{{N|gaela_4||||}}|};

AndorsTrail/res/values-v10/ui_listviewstyle.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="ConversationListView" parent="@android:style/Widget.ListView">
+    	<!-- See http://community.developer.motorola.com/t5/MOTODEV-Blog/Why-Does-My-ListView-Look-Different/ba-p/17462 -->
+    	<item name="android:listSelector">@null</item>
+    	<item name="android:overScrollFooter">@null</item>
+	</style>
+</resources>

AndorsTrail/res/values/content_conversationlist.xml

@@ -328,7 +328,12 @@
 
 	<string name="conversationlist_fallhaven_unnmir">
 [id|message|progressQuest|rewardDropListID|replies[text|nextPhraseID|requires_Progress|requires_itemID|requires_Quantity|]|];
-{unnmir|Hi there.|||{{There was a drunk outside the tavern that told me a story about you two.|unnmir_1|fallhavendrunk:100|||}}|};
+{unnmir||||{
+	{|unnmir_r|nocmar:10|||}
+	{|unnmir_0||||}
+	}|};
+{unnmir_r|Hello again. You should go talk to Nocmar.|||{{N|unnmir_13||||}}|};
+{unnmir_0|Hi there.|||{{There was a drunk outside the tavern that told me a story about you two.|unnmir_1|fallhavendrunk:100|||}}|};
 {unnmir_1|That old drunk over at the tavern told you his story did he?|||{{N|unnmir_2||||}}|};
 {unnmir_2|Same old story. We used to travel together a few years back.|||{{N|unnmir_3||||}}|};
 {unnmir_3|Real adventuring you know, swords and spells.|||{{N|unnmir_4||||}}|};
@@ -346,7 +351,12 @@
 
 	<string name="conversationlist_fallhaven_gaela">
 [id|message|progressQuest|rewardDropListID|replies[text|nextPhraseID|requires_Progress|requires_itemID|requires_Quantity|]|];
-{gaela|Swift is my blade. Poisoned is my tongue. Or was it the other way around?|||{{There seems to be a lot of thieves here in Fallhaven.|gaela_1||||}}|};
+{gaela||||{
+	{|gaela_r|andor:40|||}
+	{|gaela_0||||}
+	}|};
+{gaela_r|Hello again. I hope you will find what you are looking for.||||};
+{gaela_0|Swift is my blade. Poisoned is my tongue. Or was it the other way around?|||{{There seems to be a lot of thieves here in Fallhaven.|gaela_1||||}}|};
 {gaela_1|Yes, we thieves have a strong presence here.|||{{Anything more?|gaela_2|andor:30|||}}|};
 {gaela_2|I heard that you helped Gruil, a fellow thief in Crossglen village.|||{{N|gaela_3||||}}|};
 {gaela_3|Word has also reached me that you are looking for someone. I might be able to help you.|||{{N|gaela_4||||}}|};
@@ -956,7 +966,11 @@
 
 	<string name="conversationlist_oluag">
 [id|message|progressQuest|rewardDropListID|replies[text|nextPhraseID|requires_Progress|requires_itemID|requires_Quantity|]|];
-{oluag_1|Hello. I am Oluag.|||{{What are you doing here around these crates?|oluag_2||||}}|};
+{oluag_1||||{
+	{|oluag_grave_16|wrye:80|||}
+	{|oluag_1_1||||}
+	}|};
+{oluag_1_1|Hello. I am Oluag.|||{{What are you doing here around these crates?|oluag_2||||}}|};
 {oluag_2|Oh these. They are nothing. Never mind them. And that grave over there is nothing to worry about either.|||{{What grave?|oluag_grave_select||||}{Nothing, really? This sounds suspicious.|oluag_boxes_1||||}}|};
 {oluag_boxes_1|No no, nothing suspicious at all. It\'s not like they contain any contraband or anything like that, hah!|||{{What was that about a grave?|oluag_grave_select||||}{Ok then. I guess I didn\'t see anything.|oluag_goodbye||||}}|};
 {oluag_goodbye|Right. Goodbye.||||};
@@ -1858,7 +1872,7 @@
 {prim_guard1|What are you looking at? These weapons in the crates over here are only for us guards.||||};
 {prim_guard2|(The guard looks down on you with a condescending look)||||};
 {prim_guard3|Oh, I am so tired. When will we ever get to rest?||||};
-{prim_guard4|Can\'t talk now. I\'m on guard duty. Talk to Guthbered over there.||||};
+{prim_guard4|Can\'t talk now. I\'m on guard duty. If you need help, talk to someone else over there instead.||||};
 {prim_treasury_guard|See these bars? They will hold for almost anything.||||};
 {prim_acolyte|When my training is complete, I will be one of greatest healers around!||||};
 {prim_pupil1|Can\'t you see I\'m trying to read over here? Talk to me in a while and I might be interested.||||};
@@ -2381,7 +2395,7 @@
 	{You mentioned the Duleian road, what\'s that?|minarra_first_6_1||||}
 	{You mentioned some problems in Loneford, what problems were you referring to?|cr_loneford_st_1||||}
 	}|};
-{minarra_first_5|I handle the equipment storage for us guards here in the Crossroads guardhose, and I keep a lookout of the surrounding areas.|||{
+{minarra_first_5|I handle the equipment storage for us guards here in the Crossroads guardhouse, and I keep a lookout of the surrounding areas.|||{
 	{Do you have anything to trade?|minarra_trade_rej||||}
 	{Have you seen anything interesting lately?|minarra_first_2||||}
 	}|};
@@ -2712,7 +2726,7 @@
 	{Is there any place I can rest here?|gallain_rest_1||||}
 	{What is this place?|gallain_cr_1||||}
 	}|};
-{gallain_cr_1|As I said, this is the Crossroads guardhouse. The guards from Geygard are using this place as a place to rest and gear up.|||{{N|gallain_cr_2||||}}|};
+{gallain_cr_1|As I said, this is the Crossroads guardhouse. The guards from Feygard are using this place as a place to rest and gear up.|||{{N|gallain_cr_2||||}}|};
 {gallain_cr_2|Because of this, it is also a safe haven for merchants travelling through here. And we get at lot of those.|||{{N|gallain_1||||}}|};
 {gallain_trade_1|Here, have a look.|||{{Trade|S||||}}|};
 {gallain_rest_1|The guards have set up some beds downstairs. Go check with them.|||{{N|gallain_1||||}}|};
@@ -2848,7 +2862,7 @@
 {landa_19|Now, get out of here kid, before anyone sees you talking to me. *Looks around anxiously*|||{
 	{Thank you Landa. You secret is safe with me.|X||||}
 	{Thank you Landa. I\'ll consider it.|X||||}
-	{Are you done? Phew, I though you were never going to stop takling.|X||||}
+	{Are you done? Phew, I thought you were never going to stop takling.|X||||}
 	}|};
 {landa_already_1|You again? I already told you. Get out of here before anyone sees you talking to me.||||};
 	</string>
@@ -3106,7 +3120,7 @@
 	{I have some Izthiel claws to sell you.|gauward_sell_1|nondisplay:20|||}
 	}|};
 {gauward_1|This place used to be a safe house for travellers between Loneford and Brimhaven, before they had finished the road between the villages.|||{{N|gauward_2||||}}|};
-{gauward_2|But nowadays, noone rarely comes here - because of those cursed creatures from the river.|||{{N|gauward_3||||}}|};
+{gauward_2|But nowadays, no one rarely comes here - because of those cursed creatures from the river.|||{{N|gauward_3||||}}|};
 {gauward_3|Izthiel, they call them.|||{{N|gauward_4||||}}|};
 {gauward_4|Ack, if it wasn\'t for those things out there, I am sure a lof of people would come by here more often.|||{
 	{Would you like me to kill the creatures for you?|gauward_5||||}

AndorsTrail/res/values/content_itemlist.xml

@@ -97,11 +97,11 @@
 {vial_empty1|items_consumables:56|Small empty vial|31||1|2|||||||||||||||||||||||||||||||||};
 {vial_empty2|items_consumables:57|Empty vial|31||1|4|||||||||||||||||||||||||||||||||};
 {vial_empty3|items_consumables:59|Empty flask|31||1|6|||||||||||||||||||||||||||||||||};
-{vial_empty4|items_consumables:58|Empty potion|31||1|11|||||||||||||||||||||||||||||||||};
-{health_minor|items_consumables:35|Minor potion of health|20||1|5||||||||||||||1|5|5|||||||||||||||||};
+{vial_empty4|items_consumables:58|Empty potion bottle|31||1|11|||||||||||||||||||||||||||||||||};
+{health_minor|items_consumables:35|Minor vial of health|20||1|5||||||||||||||1|5|5|||||||||||||||||};
 {health_minor2|items_consumables:35|Minor potion of health|20|||18||||||||||||||1|5|5|||||||||||||||||};
 {health|items_consumables:49|Regular potion of health|20|||40||||||||||||||1|10|10|||||||||||||||||};
-{health_major|items_consumables:28|Major potion of health|20||1|210||||||||||||||1|40|40|||||||||||||||||};
+{health_major|items_consumables:28|Major flask of health|20||1|210||||||||||||||1|40|40|||||||||||||||||};
 {health_major2|items_consumables:28|Major potion of health|20|||280||||||||||||||1|40|40|||||||||||||||||};
 {mead|items_consumables:51|Mead|20|||15||||||||||||||1|1|1|||||||||||||||||};
 {milk|items_consumables:55|Milk|20|||21||||||||||||||1|2|2|||||||||||||||||};

AndorsTrail/res/values/ui_listviewstyle.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="ConversationListView" parent="@android:style/Widget.ListView">
+    	<!-- Not used here. Overridden in values-v10/ -->
+	</style>
+</resources>

AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java

@@ -20,7 +20,7 @@ public final class AndorsTrailApplication extends Application {
 	public static final boolean DEVELOPMENT_VALIDATEDATA = false;
 	public static final boolean DEVELOPMENT_DEBUGMESSAGES = false;
 	public static final int CURRENT_VERSION = 24;
-	public static final String CURRENT_VERSION_DISPLAY = "0.6.10a2";
+	public static final String CURRENT_VERSION_DISPLAY = "0.6.10a3";
 	
 	public final WorldContext world = new WorldContext();
 	public final WorldSetup setup = new WorldSetup(world, this);

AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/SkillListAdapter.java

@@ -2,6 +2,8 @@ package com.gpl.rpg.AndorsTrail.view;
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 import com.gpl.rpg.AndorsTrail.R;
@@ -34,6 +36,12 @@ public final class SkillListAdapter extends ArrayAdapter<SkillInfo> {
 		for (SkillInfo skill : skills) {
 			if (shouldDisplaySkill(skill, player)) result.add(skill);
 		}
+		Collections.sort(result, new Comparator<SkillInfo>() {
+    		@Override
+			public int compare(SkillInfo a, SkillInfo b) {
+				return a.id - b.id;
+			}
+        });
 		return result;
 	}