From 59629dfe9d3941ce41d0da53c2c18aa0a82c17eb Mon Sep 17 00:00:00 2001
From: Acumen <stuart@wildfiregames.com>
Date: Thu, 18 Nov 2004 15:43:34 +0000
Subject: [PATCH] More GUI.

This was SVN commit r1349.
---
 .../data/mods/official/gui/test/3_session.xml |  8 ++++++
 .../gui/test/functions_session_status_orb.js  | 28 ++++++++++++-------
 .../data/mods/official/gui/test/sprite1.xml   |  2 +-
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/binaries/data/mods/official/gui/test/3_session.xml b/binaries/data/mods/official/gui/test/3_session.xml
index e49d2d5f09..a8778f9178 100755
--- a/binaries/data/mods/official/gui/test/3_session.xml
+++ b/binaries/data/mods/official/gui/test/3_session.xml
@@ -730,6 +730,14 @@
 				]]></action>
 			</object>
 
+			<object type="text" name="session_panel_status_attack" font="verdana10" textcolor="200 200 200" ghost="true" z="70" hidden="false">
+			        <action on="Load"><![CDATA[
+					AddSizeCoord(this.name,
+					crd_status_orb_attack_x, crd_status_orb_attack_y, crd_status_orb_attack_x+crd_status_orb_attack_width, crd_status_orb_attack_y+crd_status_orb_attack_height, left_screen, top_screen, left_screen, top_screen,
+					crd_status_orb_attack_x, -crd_status_orb_bkg_y-crd_status_orb_bkg_height+crd_status_orb_attack_y, crd_status_orb_attack_x+crd_status_orb_attack_width, -crd_status_orb_bkg_y-crd_status_orb_bkg_height+crd_status_orb_attack_y+crd_status_orb_attack_height, left_screen, bottom_screen, left_screen, bottom_screen);
+				]]></action>
+			</object>
+
 			<object type="text" name="session_panel_status_armour" font="verdana10" textcolor="200 200 200" ghost="true" z="70" hidden="false">
 			        <action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
diff --git a/binaries/data/mods/official/gui/test/functions_session_status_orb.js b/binaries/data/mods/official/gui/test/functions_session_status_orb.js
index e71c9e3126..73589a7420 100755
--- a/binaries/data/mods/official/gui/test/functions_session_status_orb.js
+++ b/binaries/data/mods/official/gui/test/functions_session_status_orb.js
@@ -77,11 +77,17 @@ function initStatusOrb()
 	crd_status_orb_name1_x = crd_status_orb_name2_x;
 	crd_status_orb_name1_y = crd_status_orb_name2_y-crd_status_orb_name1_height+1;
 
+	// Attack.
+	crd_status_orb_attack_width = crd_status_orb_bkg_width;
+	crd_status_orb_attack_height = ((crd_status_orb_name1_y)-(crd_status_orb_xpbar_y+crd_status_orb_xpbar_height))/2;
+	crd_status_orb_attack_x = crd_status_orb_name3_x;
+	crd_status_orb_attack_y = crd_status_orb_xpbar_y+crd_status_orb_xpbar_height-1;
+
 	// Armour.
-	crd_status_orb_armour_width = crd_status_orb_bkg_width;
-	crd_status_orb_armour_height = (crd_status_orb_name1_y)-(crd_status_orb_xpbar_y+crd_status_orb_xpbar_height)-25;
-	crd_status_orb_armour_x = crd_status_orb_name3_x;
-	crd_status_orb_armour_y = crd_status_orb_xpbar_y+crd_status_orb_xpbar_height+10;
+	crd_status_orb_armour_width = crd_status_orb_attack_width;
+	crd_status_orb_armour_height = crd_status_orb_attack_height;
+	crd_status_orb_armour_x = crd_status_orb_attack_x;
+	crd_status_orb_armour_y = crd_status_orb_attack_y+crd_status_orb_attack_height;
 }
 
 // ====================================================================
@@ -170,16 +176,18 @@ function UpdateStatusOrb()
 	// Update stats
 	if (selection[0].actions.attack && selection[0].actions.attack.damage && selection[0].actions.attack.damage > 0 && selection[0].actions.attack.crush && selection[0].actions.attack.hack && selection[0].actions.attack.pierce)
 	{
-		getGUIObjectByName("session_panel_status_armour").caption = "" + selection[0].actions.attack.damage + " (" + Math.round(selection[0].actions.attack.hack*100) + "% " + Math.round(selection[0].actions.attack.pierce*100) + "% " + Math.round(selection[0].actions.attack.crush*100) + "%)\n";
+		getGUIObjectByName("session_panel_status_attack").caption = "[icon=icon_statistic_attack]" + selection[0].actions.attack.damage + " [icon=icon_statistic_hack]" + Math.round(selection[0].actions.attack.hack*100) + "[icon=icon_statistic_pierce]" + Math.round(selection[0].actions.attack.pierce*100) + "[icon=icon_statistic_crush]" + Math.round(selection[0].actions.attack.crush*100) + "";
+	}
+	else
+		getGUIObjectByName("session_panel_status_attack").caption = "";
+
+	if (selection[0].traits.armour && selection[0].traits.armour.value && selection[0].traits.armour.value > 0 && selection[0].traits.armour.crush && selection[0].traits.armour.hack && selection[0].traits.armour.pierce)
+	{
+		getGUIObjectByName("session_panel_status_armour").caption = "[icon=icon_statistic_armour]" + selection[0].traits.armour.value + " [icon=icon_statistic_hack]" + Math.round(selection[0].traits.armour.hack*100) + "[icon=icon_statistic_pierce]" + Math.round(selection[0].traits.armour.pierce*100) + "[icon=icon_statistic_crush]" + Math.round(selection[0].traits.armour.crush*100) + "";
 	}
 	else
 		getGUIObjectByName("session_panel_status_armour").caption = "";
 
-	if (selection[0].traits.armour && selection[0].traits.armour.value && selection[0].traits.armour.value > 0 && selection[0].traits.armour.crush && selection[0].traits.armour.hack && selection[0].traits.armour.pierce)
-	{
-		getGUIObjectByName("session_panel_status_armour").caption += "" + selection[0].traits.armour.value + " (" + Math.round(selection[0].traits.armour.hack*100) + "% " + Math.round(selection[0].traits.armour.pierce*100) + "% " + Math.round(selection[0].traits.armour.crush*100) + "%)";
-	}
-
 	// Reveal Status Orb
 	getGUIObjectByName("session_status_orb").hidden = false;
 }
diff --git a/binaries/data/mods/official/gui/test/sprite1.xml b/binaries/data/mods/official/gui/test/sprite1.xml
index 64797bc7f4..eea5c25fe0 100755
--- a/binaries/data/mods/official/gui/test/sprite1.xml
+++ b/binaries/data/mods/official/gui/test/sprite1.xml
@@ -330,7 +330,7 @@
                 </sprite>
 
                 <sprite name="statistic_armour">
-                        <image texture="ui_icon_statistic_hack_20.png" texture-size="0 0 32 32" size="0 0 100% 100%" />
+                        <image texture="ui_icon_statistic_armour_20.png" texture-size="0 0 32 32" size="0 0 100% 100%" />
                 </sprite>
 
                 <sprite name="statistic_attack">