From cf744a7b9252e4cea0f37b71b08c2d3d38f45749 Mon Sep 17 00:00:00 2001
From: "oskar.wiksten" <oskar.wiksten@08aca716-68be-ccc6-4d58-36f5abd142ac>
Date: Sun, 13 May 2012 15:58:46 +0000
Subject: [PATCH] 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
---
 .../res/drawable/ui_doubleattackexample.png   | Bin 0 -> 8451 bytes
 AndorsTrail/res/drawable/ui_flee_example.png  | Bin 0 -> 5173 bytes
 AndorsTrail/res/layout/about.xml              |   9 +++-
 .../res/values/content_conversationlist.xml   |  30 +++++++-----
 AndorsTrail/res/values/content_droplist.xml   |  23 ++++++++--
 .../res/values/content_monsterlist.xml        |  16 +++----
 AndorsTrail/res/values/strings.xml            |   4 +-
 AndorsTrail/res/values/strings_about.xml      |  43 ++++++++++++++++++
 .../AndorsTrail/activity/AboutActivity.java   |  33 +++++++++++++-
 .../rpg/AndorsTrail/model/item/ItemType.java  |   8 +++-
 10 files changed, 137 insertions(+), 29 deletions(-)
 create mode 100644 AndorsTrail/res/drawable/ui_doubleattackexample.png
 create mode 100644 AndorsTrail/res/drawable/ui_flee_example.png
 create mode 100644 AndorsTrail/res/values/strings_about.xml

diff --git a/AndorsTrail/res/drawable/ui_doubleattackexample.png b/AndorsTrail/res/drawable/ui_doubleattackexample.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a839db9957f73eabc80c82fe818491a013ea857
GIT binary patch
literal 8451
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

literal 0
HcmV?d00001

diff --git a/AndorsTrail/res/drawable/ui_flee_example.png b/AndorsTrail/res/drawable/ui_flee_example.png
new file mode 100644
index 0000000000000000000000000000000000000000..b6d094ae6c2c5d8600ec803c23cf601db768774b
GIT binary patch
literal 5173
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

literal 0
HcmV?d00001

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) {
-- 
2.49.0