From: oskar.wiksten <oskar.wiksten@08aca716-68be-ccc6-4d58-36f5abd142ac>
Date: Sun, 13 May 2012 15:58:46 +0000 (+0000)
Subject: Minor conversation fixes (thanks ctnbeh13 & sdevaney)
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=cf744a7b9252e4cea0f37b71b08c2d3d38f45749;p=users%2Fmchehab%2Fandors-trail.git

Minor conversation fixes (thanks ctnbeh13 & sdevaney)
Implemented actual gameplay help in the about section (thanks Nyktos & sdevaney!)

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

diff --git a/AndorsTrail/res/drawable/ui_doubleattackexample.png b/AndorsTrail/res/drawable/ui_doubleattackexample.png
new file mode 100644
index 0000000..9a839db
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_doubleattackexample.png differ
diff --git a/AndorsTrail/res/drawable/ui_flee_example.png b/AndorsTrail/res/drawable/ui_flee_example.png
new file mode 100644
index 0000000..b6d094a
Binary files /dev/null and b/AndorsTrail/res/drawable/ui_flee_example.png differ
diff --git a/AndorsTrail/res/layout/about.xml b/AndorsTrail/res/layout/about.xml
index d49ea06..7e518fd 100644
--- a/AndorsTrail/res/layout/about.xml
+++ b/AndorsTrail/res/layout/about.xml
@@ -51,7 +51,7 @@
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_weight="1"
-			android:text="@string/about_button1"
+			android:text="@string/about_button4"
 			/>
 		<Button
 			android:id="@+id/about_button2"
@@ -67,6 +67,13 @@
 			android:layout_weight="1"
 			android:text="@string/about_button3"
 			/>
+		<Button
+			android:id="@+id/about_button4"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:text="@string/about_button1" 
+			/>
 	</LinearLayout>
 
 	<ScrollView
diff --git a/AndorsTrail/res/values/content_conversationlist.xml b/AndorsTrail/res/values/content_conversationlist.xml
index f31bac8..6316aa8 100644
--- a/AndorsTrail/res/values/content_conversationlist.xml
+++ b/AndorsTrail/res/values/content_conversationlist.xml
@@ -3343,8 +3343,8 @@
 {algangror_fight_1a||{{0|algangror|101|}}|{{|algangror_fight_2|||||}}|};
 {algangror_fight_2|||{{|algangror_fight_2a|fiveidols:10||||}{|algangror_fight_3|||||}}|};
 {algangror_fight_2a||{{0|fiveidols|100|}}|{{|algangror_fight_3|||||}}|};
-{algangror_fight_3|Jhaeld, the fool. He hides behind his guards and his stone walls. Such a pitiful man he is. Yes, I made those people disappear, but they were all worth it. I will have my revenge!|{{0|remgard2|30|}}|{{|algangror_fight_4|||||}}|};
-{algangror_fight_4|And you, what are you trying to accomplish by running his errands? How fortunate that you entered my house. He he.||{{|algangror_fight_5|||||}}|};
+{algangror_fight_3|Jhaeld, the fool. He hides behind his guards and his stone walls. Such a pitiful man he is. Yes, I made those people disappear, but they were all worth it. I will have my revenge!|{{0|remgard2|30|}}|{{N|algangror_fight_4|||||}}|};
+{algangror_fight_4|And you, what are you trying to accomplish by running his errands? How fortunate that you entered my house. He he.||{{N|algangror_fight_5|||||}}|};
 {algangror_fight_5|Do you really think you can defeat *me*? Ha ha, this will be fun!||{{Fight!|algangror_fight_6|||||}}|};
 {algangror_fight_6||{{0|remgard2|35|}}|{{|F|||||}}|};
 {algangror_told_1|||{{|algangror_told_1a|algangror:10||||}{|algangror_told_2|||||}}|};
@@ -4037,7 +4037,11 @@
 	{Anything else?|ingus_t3|||||}
 	{Thank you, goodbye.|X|||||}
 	}|};
-{ingus_t3|Well, there\'s always the Elwille sisters, fighting as always.||{{N|ingus_t4|||||}}|};
+{ingus_t3|Well, there\'s always the Elwille sisters, fighting as always.||{{N|ingus_t4s|||||}}|};
+{ingus_t4s|||{
+	{|ingus_q1|sisterfight:71||||}
+	{|ingus_t4|||||}
+	}|};
 {ingus_t4|Last night, they must have kept the whole town awake, the way they were shouting at each other.||{{What are they fighting about?|ingus_t5|||||}}|};
 {ingus_t5|Oh .. nothing .. everything. I don\'t know. No one really puts much weight in their squabbling.||{{N|ingus_t6|||||}}|};
 {ingus_t6|They live in one of the cabins on the southern shore. *Ingus points to the south*.|{{0|sisterfight|10|}}|{
@@ -4050,6 +4054,9 @@
 	{Thank you. What is happening around town?|ingus_2|||||}
 	{Thank you, goodbye.|X|||||}
 	}|};
+{ingus_q1|Unfortunately, for whatever reason, people that live in their neighborhood have been reporting the situation between the two of them has recently become more..., shall we say.., \'noticeable\'.||{{N|ingus_q2|||||}}|};
+{ingus_q2|I\'m afraid that if they don\'t resolve their differences soon on their own, that the city council will have to act and resolve the matter for them.||{{N|ingus_q3|||||}}|};
+{ingus_q3|It wouldn\'t be the first time the city council had to intervene in private matters that got out of hand.|||};
 	</string>
 
 	<string name="conversationlist_elwyl">
@@ -4119,13 +4126,13 @@
 	{I have one of those potions of accuracy focus for you.|elwyl_res_1||pot_focus_ac|1|0|}
 	{I have a strong potion of accuracy focus for you.|elwyl_res_1||pot_focus_ac2|1|0|}
 	{You talked about some potion before. Could you repeat that?|elwyl_12|||||}
-	{Some people have been complaining that your squabbling has kept people awake at night.|elwyl_10|sisterfight:10||||}
+	{Some people have been complaining that your squabbling has kept them awake at night.|elwyl_10|sisterfight:10||||}
 	}|};
 {elwyl_res_1|Oh good. Give me that.|{{0|sisterfight|70|}}|{{N|elwyl_res_2|||||}}|};
-{elwyl_res_2|Huh, what\'s this? It\'s yellow.. I was sure that it used to be blue. Let me smell it to make sure that it the right kind of potion.||{{N|elwyl_res_3|||||}}|};
+{elwyl_res_2|Huh, what\'s this? It\'s yellow.. I was sure that it used to be blue. Let me smell it to make sure that it\'s the right kind of potion.||{{N|elwyl_res_3|||||}}|};
 {elwyl_res_3|Hm, yes, it smells exactly as I remember it. It must be the right potion.||{{N|elwyl_res_4|||||}}|};
-{elwyl_res_4|But, this means .. that Elwel was wrong anyway!||{{N|elwyl_res_5|||||}}|};
-{elwyl_res_5|Elwel, look at this, you are wrong! The potion wasn\'t green as you said, it\'s yellow! Why didn\'t you just listen to me?!||{{N|elwyl_res_6|||||}}|};
+{elwyl_res_4|This means .. that Elwel was wrong anyway!||{{N|elwyl_res_5|||||}}|};
+{elwyl_res_5|Elwel, look at this, you were wrong! The potion wasn\'t green as you said, it\'s yellow! Why didn\'t you just listen to me?!||{{N|elwyl_res_6|||||}}|};
 {elwyl_res_6|Elwel, you are always trying your best to prove me wrong. Well look at this, now you are wrong for once!||{
 	{Whatever, you two don\'t seem to get along very well. I\'ll leave you to your squabbling.|elwyl_res_7|||||}
 	{I hope that you two will get along some day.|elwyl_res_7|||||}
@@ -4190,9 +4197,9 @@
 {hjaldar_r7|Time has not been on his side, I see.||{{N|hjaldar_r8|||||}}|};
 {hjaldar_r8|Anyway. Let\'s make that potion that you asked for earlier. I even prepared the other ingredients for another potion beforehand.||{{N|hjaldar_r9|||||}}|};
 {hjaldar_r9|Now, let\'s see. Some of these.. *Hjaldar pulls out some dried up berries and puts them in his mortar*||{{N|hjaldar_r10|||||}}|};
-{hjaldar_r10|And some of this into some clean vials..||{{N|hjaldar_r11|||||}}|};
+{hjaldar_r10|Add some of this into some clean vials..||{{N|hjaldar_r11|||||}}|};
 {hjaldar_r11|Just a pinch of these into one of these vials..||{{N|hjaldar_r12|||||}}|};
-{hjaldar_r12|And finally, the Lyson marrow extract..||{{N|hjaldar_r13|||||}}|};
+{hjaldar_r12|Finally, the Lyson marrow extract..||{{N|hjaldar_r13|||||}}|};
 {hjaldar_r13|There. Now we just need to give them a good shake.||{{N|hjaldar_r14|||||}}|};
 {hjaldar_r14|*Hjaldar shakes the vials vigorously, one in each of his hands*||{{N|hjaldar_r15|||||}}|};
 {hjaldar_r15|Ah, that should do it. Here you go. One potion of accuracy focus and one potion of damage focus. I hope they will be useful to you.|{{0|sisterfight|61|}{1|hjaldar_pots|0|}}|{
@@ -4213,11 +4220,11 @@
 	}|};
 {mazeg_1|Welcome friend! Would you like to browse my selection of fine potions and ointments?||{
 	{Sure. Show me what you have.|S|||||}
-	{I am looking for some Lyson Marrow extract, for Hjaldar in Remgard.|mazeg_e_1|sisterfight:45||||}
+	{I am looking for some Lyson marrow extract, for Hjaldar in Remgard.|mazeg_e_1|sisterfight:45||||}
 	}|};
 {mazeg_2|Welcome traveller. Have you come to ask for help from me and my potions?||{
 	{Yes. Please show me what you have.|blackwater_notrust|||||}
-	{I am looking for some Lyson Marrow extract, for Hjaldar in Remgard.|mazeg_e_1|sisterfight:45||||}
+	{I am looking for some Lyson marrow extract, for Hjaldar in Remgard.|mazeg_e_1|sisterfight:45||||}
 	}|};
 {mazeg_e_1|||{
 	{|mazeg_d|sisterfight:55||||}
@@ -4951,6 +4958,7 @@
 {sign_waterway9|West: Loneford\nEast: Brightport, Lake Laeroth|||};
 {sign_waterway11|West: Loneford\nSouth: Brightport|||};
 {sign_remgard0|Welcome to Lake Laeroth and the city of Remgard!|||};
+{wild16_cave|The thicket is too dense for you to get through.|||};
 	</string>
 	
 </resources>
diff --git a/AndorsTrail/res/values/content_droplist.xml b/AndorsTrail/res/values/content_droplist.xml
index a24dd37..3fb4830 100644
--- a/AndorsTrail/res/values/content_droplist.xml
+++ b/AndorsTrail/res/values/content_droplist.xml
@@ -696,16 +696,31 @@
 {marrowtaint|{{marrowtaint|1|1|100|}}|};
 {ervelyn_hat|{{hat_crit|1|1|100|}}|};
 {oegyth1|{{oegyth|1|1|100|}}|};
+{wild16_cave1|{
+	{vial_empty|1|1|100|}
+	{vial_empty2|2|2|100|}
+	{health_minor2|2|2|100|}
+	}|};
+{wild16_cave2|{
+	{health|2|2|100|}
+	{milk|3|3|100|}
+	{pot_speed_1|1|1|5|}
+	{pot_poison_weak|3|3|5|}
+	{pot_poison_weak_antidote|1|1|100|}
+	{pot_blind_rage|1|1|100|}
+	{pot_bleeding_ointment|1|1|100|}
+	{health_major2|1|1|100|}
+	}|};
 </string>
 
 <string name="droplists_v0611_shops">
 [id|items[itemID|quantity_Min|quantity_Max|chance|]|];
 {shop_thorin|{{pot_scaradon|30|30|100|}}|};
 {shop_hjaldar|{
-	{pot_focus_dmg|5|5|100|}
-	{pot_focus_ac|5|5|100|}
-	{pot_focus_dmg2|1|1|100|}
-	{pot_focus_ac2|1|1|100|}
+	{pot_focus_dmg|8|8|100|}
+	{pot_focus_ac|8|8|100|}
+	{pot_focus_dmg2|5|5|100|}
+	{pot_focus_ac2|5|5|100|}
 	}|};
 {shop_rothses|{
 	{remgard_shield_1|1|1|100|}
diff --git a/AndorsTrail/res/values/content_monsterlist.xml b/AndorsTrail/res/values/content_monsterlist.xml
index f05a7f7..5c1b73f 100644
--- a/AndorsTrail/res/values/content_monsterlist.xml
+++ b/AndorsTrail/res/values/content_monsterlist.xml
@@ -507,9 +507,9 @@
 {norath|monsters_ld1:8|Norath|norath||0|||||||||||||||norath||||||||};
 {rothses|monsters_ld1:14|Rothses|rothses||0||||||||||||||shop_rothses|rothses||||||||};
 {duaina|monsters_ld1:154|Duaina|duaina||0|||||||||||||||duaina||||||||};
-{rg_villager1|monsters_ld1:132|Villager|remgard_villager1||0|||||||||||||||remgard_villager1||||||||};
-{rg_villager2|monsters_ld1:20|Villager|remgard_villager2||0|||||||||||||||remgard_villager2||||||||};
-{rg_villager3|monsters_ld1:134|Villager|remgard_villager3||0|||||||||||||||remgard_villager3||||||||};
+{rg_villager1|monsters_ld1:132|Commoner|remgard_villager1||0|||||||||||||||remgard_villager1||||||||};
+{rg_villager2|monsters_ld1:20|Commoner|remgard_villager2||0|||||||||||||||remgard_villager2||||||||};
+{rg_villager3|monsters_ld1:134|Commoner|remgard_villager3||0|||||||||||||||remgard_villager3||||||||};
 {jhaeld|monsters_mage:0|jhaeld|jhaeld||0|||||||||||||||jhaeld||||||||};
 {krell|monsters_men2:6|Krell|krell||0|||||||||||||||krell||||||||};
 {elythom_kn1|monsters_men:3|Knight of Elythom|elythom_knight1||0|||||||||||||||elythom_knight1||||||||};
@@ -542,11 +542,11 @@
 {remgard_g2|monsters_ld1:5|Guard|remgard_guard||0|||||||||||||||blackwater_guard1||||||||};
 {remgard_g3|monsters_ld1:67|Guard|remgard_guard2||0|||||||||||||||remgard_guard1||||||||};
 {remgard_pg|monsters_ld1:11|Prison Guard|remgard_prison_guard||0|||||||||||||||remgard_prison_guard||||||||};
-{rg_villager4|monsters_ld1:164|Villager|remgard_villager4||0|||||||||||||||remgard_villager4||||||||};
-{rg_villager5|monsters_ld1:148|Villager|remgard_villager5||0|||||||||||||||remgard_villager5||||||||};
-{rg_villager6|monsters_ld1:188|Villager|remgard_villager6||0|||||||||||||||remgard_villager6||||||||};
-{rg_villager7|monsters_ld1:10|Villager|remgard_villager7||0|||||||||||||||remgard_villager7||||||||};
-{rg_villager8|monsters_rltiles3:18|Villager|remgard_villager8||0|||||||||||||||remgard_villager8||||||||};
+{rg_villager4|monsters_ld1:164|Commoner|remgard_villager4||0|||||||||||||||remgard_villager4||||||||};
+{rg_villager5|monsters_ld1:148|Commoner|remgard_villager5||0|||||||||||||||remgard_villager5||||||||};
+{rg_villager6|monsters_ld1:188|Commoner|remgard_villager6||0|||||||||||||||remgard_villager6||||||||};
+{rg_villager7|monsters_ld1:10|Commoner|remgard_villager7||0|||||||||||||||remgard_villager7||||||||};
+{rg_villager8|monsters_rltiles3:18|Commoner|remgard_villager8||0|||||||||||||||remgard_villager8||||||||};
 {skylenar|monsters_ld1:3|Skylenar|skylenar||0||||||||||||||shop_skylenar|skylenar||||||||};
 {taylin|monsters_rltiles1:74|Taylin|taylin||0|||||||||||||||taylin||||||||};
 {petdog|monsters_dogs:0|Dog|petdog||4|||||||||||||||petdog||||||||};
diff --git a/AndorsTrail/res/values/strings.xml b/AndorsTrail/res/values/strings.xml
index 0bf9b2d..9e7d8ab 100644
--- a/AndorsTrail/res/values/strings.xml
+++ b/AndorsTrail/res/values/strings.xml
@@ -199,8 +199,6 @@
 		&lt;a href="http://code.google.com/p/andors-trail/"&gt;Project homepage on code.google.com for developers.&lt;/a&gt;&lt;br /&gt;
 		&lt;br /&gt;
 		Please visit the forums to discuss the game with other players.&lt;br /&gt;
-		&lt;br /&gt;
-		We really should add some info here about how to play the game :)&lt;br /&gt;
 	</string>
 
 	<!-- 
@@ -504,5 +502,7 @@
    	<string name="skill_title_concussion">Concussion</string>
     <string name="skill_shortdescription_concussion">Chance of concussion</string>
     <string name="skill_longdescription_concussion">When making an attack on a target whose block chance (BC) is at least %1$d lower than your attack chance (AC), there is a %2$d %% chance that the hit will cause a concussion on the target. A concussion will severely lower the target\'s offensive combat abilities, making the target less able to land successful attacks.</string>
+
+    <string name="about_button4">About</string>
     
 </resources>
diff --git a/AndorsTrail/res/values/strings_about.xml b/AndorsTrail/res/values/strings_about.xml
new file mode 100644
index 0000000..0c49ef9
--- /dev/null
+++ b/AndorsTrail/res/values/strings_about.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+<string name="about_interface"><![CDATA[
+<div><b>Game Settings</b> can be found by pressing your device\'s Menu Button.</div>
+
+<p>________________</p>
+
+<h1>Interface Icons</h1>
+<div><b>The Chest</b><img alt="chest" src="chest.png" /></div>
+<p>Quickslots [Long press the pouches inside to assign items for instant use]</p>
+	
+<div><b>The Hero</b><img alt="hero" src="char_hero.png" /></div>
+<p>Menu [Overview, Quests, Skills &amp; Inventory *]</p>
+<p>* (While in inventory, press an item for information &amp; long press for more options)</p>
+
+<div><b>The Enemy</b><img alt="monster" src="monster.png" /></div>
+<p>Information [Appears during Combat]</p>
+
+<p>________________</p>
+
+<h1>Combat</h1>
+<p>Actions taken during battle cost AP...</p>
+<div><b>Attacking</b> - [3AP] *</div>
+<img alt="attacking" src="doubleattackexample.png" />
+<p>* (Equipping Gear &amp; Using Items may alter AP &amp; usage cost)</p>
+<div><b>Using Items</b> - [5AP]</div>
+<div><b>Fleeing</b> - [6AP]</div>
+
+<p>________________</p>
+
+<h1>Advanced Combat</h1>
+<div>During Combat, long press a tile adjacent to The Hero...</div>
+
+<div><b>To Flee</b></div>
+<p>(chosen tile is highlighted - Attack Button changes to Move)</p>
+<img alt="flee" src="flee_example.png" />
+<p>[flee mode activated - Long press enemy to re-enter combat]</p>
+
+<div><b>To Change Targets</b></div>
+<p>(the red target highlight shifts between enemies)</p>
+<p>[the target has been changed]</p>
+]]></string>
+</resources>
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/AboutActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/AboutActivity.java
index ee6e118..1f1a13e 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/AboutActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/AboutActivity.java
@@ -2,8 +2,10 @@ package com.gpl.rpg.AndorsTrail.activity;
 
 import android.app.Activity;
 import android.content.res.Resources;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.text.Html;
+import android.text.Html.ImageGetter;
 import android.text.method.LinkMovementMethod;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -13,7 +15,7 @@ import android.widget.TextView;
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.R;
 
-public final class AboutActivity extends Activity {
+public final class AboutActivity extends Activity implements ImageGetter {
 	
 	/** Called when the activity is first created. */
     @Override
@@ -54,9 +56,38 @@ public final class AboutActivity extends Activity {
 			}
 		});
         
+        b = (Button) findViewById(R.id.about_button4);
+        b.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				tv.setText(Html.fromHtml(res.getString(R.string.about_interface), AboutActivity.this, null));
+			}
+		});
+        
         tv.setMovementMethod(LinkMovementMethod.getInstance());
         
         TextView t = (TextView) findViewById(R.id.about_version);
         t.setText("v" + AndorsTrailApplication.CURRENT_VERSION_DISPLAY);
     }
+
+	@Override
+	public Drawable getDrawable(String s) {
+		Resources res = getResources();
+		Drawable d;
+		if (s.equals("chest.png")) {
+			Drawable r = res.getDrawable(R.drawable.ui_quickslots);
+			r.setBounds(0, 0, r.getIntrinsicWidth(), r.getIntrinsicHeight());
+			return r;
+		} else if (s.equals("char_hero.png")) {
+			Drawable r = res.getDrawable(R.drawable.char_hero);
+			r.setBounds(0, 0, r.getIntrinsicWidth(), r.getIntrinsicHeight()*4/5);
+			return r;
+		} 
+		else if (s.equals("monster.png")) d = res.getDrawable(R.drawable.monsters_eye4);
+		else if (s.equals("flee_example.png")) d = res.getDrawable(R.drawable.ui_flee_example);
+		else if (s.equals("doubleattackexample.png")) d = res.getDrawable(R.drawable.ui_doubleattackexample);
+		else return null;
+		d.setBounds(0, 0, d.getIntrinsicWidth(), d.getIntrinsicHeight());
+		return d;
+	}
 }
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemType.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemType.java
index 7abe135..3527ce1 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemType.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemType.java
@@ -117,12 +117,16 @@ public final class ItemType {
 			addSpace = true;
 		}
 		if (attackEffect.hasCriticalSkillEffect()) {
-			sb.append(" +");
+			if (addSpace) sb.append(' ');
+			if (attackEffect.criticalSkill >= 0) {
+				sb.append('+');
+			}
 			sb.append(attackEffect.criticalSkill);
 			sb.append("x");
 			if (attackEffect.hasCriticalMultiplierEffect()) {
 				sb.append(attackEffect.criticalMultiplier);				
-			}	
+			}
+			addSpace = true;
 		}
 	}
 	public static String describeAttackEffect(CombatTraits attackEffect) {