From 064a2296045bc9a2e90cb1a22092b28c7c0592b4 Mon Sep 17 00:00:00 2001
From: Imarok <Imarok@3db68df2-c116-0410-a063-a993310a9797>
Date: Fri, 3 Feb 2017 15:08:32 +0000
Subject: [PATCH] Show the defeat/active state of players in the diplomacy
 window Patch by javiergodas, rebased and negative review by elexis. Fixes
 #4237.

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@19199 3db68df2-c116-0410-a063-a993310a9797
---
 .../data/mods/public/gui/common/gamedescription.js  | 21 +++++++++++++++++++++
 .../mods/public/gui/session/diplomacy_window.xml    | 13 +++++++------
 binaries/data/mods/public/gui/session/menu.js       |  3 +++
 binaries/data/mods/public/gui/summary/summary.js    | 12 +-----------
 binaries/data/mods/public/gui/summary/summary.xml   |  1 +
 5 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/binaries/data/mods/public/gui/common/gamedescription.js b/binaries/data/mods/public/gui/common/gamedescription.js
index 0c1d07a943..76c27571fd 100644
--- a/binaries/data/mods/public/gui/common/gamedescription.js
+++ b/binaries/data/mods/public/gui/common/gamedescription.js
@@ -329,3 +329,24 @@ function getGameDescription(extended = false)
 			title.value
 	})).join("\n");
 }
+
+/**
+ * Sets the win/defeat icon to indicate current player's state.
+ * @param {string} state - The current in-game state of the player.
+ * @param {string} imageID - The name of the XML image object to update.
+ */
+function setOutcomeIcon(state, imageID)
+{
+	let image = Engine.GetGUIObjectByName(imageID);
+
+	if (state == "won")
+	{
+		image.sprite = "stretched:session/icons/stances/violent.png";
+		image.tooltip = translate("Victory");
+	}
+	else if (state == "defeated")
+	{
+		image.sprite = "stretched:session/icons/stances/passive.png";
+		image.tooltip = translate("Defeated");
+	}
+}
diff --git a/binaries/data/mods/public/gui/session/diplomacy_window.xml b/binaries/data/mods/public/gui/session/diplomacy_window.xml
index 4e4bcbba8a..0d0789a781 100644
--- a/binaries/data/mods/public/gui/session/diplomacy_window.xml
+++ b/binaries/data/mods/public/gui/session/diplomacy_window.xml
@@ -41,12 +41,13 @@
 	</object>
 
 	<object size="32 64 100%-32 384">
-		<repeat count="16" var="n">
-			<object name="diplomacyPlayer[n]" size="0 0 100% 20" type="image" hidden="false">
-				<object name="diplomacyPlayerName[n]" size="0 0 150 100%" type="text" style="DiplomacyText" ghost="true"/>
-				<object name="diplomacyPlayerCiv[n]" size="150 0 250 100%" type="text" style="DiplomacyText" ghost="true"/>
-				<object name="diplomacyPlayerTeam[n]" size="250 0 300 100%" type="text" style="DiplomacyText" ghost="true"/>
-				<object name="diplomacyPlayerTheirs[n]" size="300 0 360 100%" type="text" style="DiplomacyText" ghost="true"/>
+		<repeat count="8" var="n">
+			<object name="diplomacyPlayer[n]" size="0 0 100% 20" type="image" hidden="true">
+				<object name="diplomacyPlayerOutcome[n]" size="0 0 25 100%" type="image" tooltip_style="sessionToolTipBold"/>
+				<object name="diplomacyPlayerName[n]" size="25 0 150 100%" type="text" style="DiplomacyText"/>
+				<object name="diplomacyPlayerCiv[n]" size="150 0 250 100%" type="text" style="DiplomacyText"/>
+				<object name="diplomacyPlayerTeam[n]" size="250 0 300 100%" type="text" style="DiplomacyText"/>
+				<object name="diplomacyPlayerTheirs[n]" size="300 0 360 100%" type="text" style="DiplomacyText"/>
 
 				<!-- Diplomatic stance - selection -->
 				<object name="diplomacyPlayerAlly[n]" size="360 0 380 100%" type="button" style="StoneButton" hidden="true"/>
diff --git a/binaries/data/mods/public/gui/session/menu.js b/binaries/data/mods/public/gui/session/menu.js
index e6145e5dfd..68df350146 100644
--- a/binaries/data/mods/public/gui/session/menu.js
+++ b/binaries/data/mods/public/gui/session/menu.js
@@ -343,9 +343,12 @@ function diplomacySetupTexts(i, rowsize)
 	size.top = rowsize * (i-1);
 	size.bottom = rowsize * i;
 	row.size = size;
+	row.hidden = false;
 
 	row.sprite = "color: " + rgbToGuiColor(g_Players[i].color) + " 32";
 
+	setOutcomeIcon(g_Players[i].state, "diplomacyPlayerOutcome["+(i-1)+"]");
+
 	Engine.GetGUIObjectByName("diplomacyPlayerName["+(i-1)+"]").caption = colorizePlayernameByID(i);
 	Engine.GetGUIObjectByName("diplomacyPlayerCiv["+(i-1)+"]").caption = g_CivData[g_Players[i].civ].Name;
 
diff --git a/binaries/data/mods/public/gui/summary/summary.js b/binaries/data/mods/public/gui/summary/summary.js
index c3cf891ae1..e8b9664078 100644
--- a/binaries/data/mods/public/gui/summary/summary.js
+++ b/binaries/data/mods/public/gui/summary/summary.js
@@ -118,17 +118,7 @@ function updatePanelData(panelInfo)
 		boxSize.right = rowPlayerObjectWidth;
 		rowPlayerObject.size = boxSize;
 
-		let outcome = Engine.GetGUIObjectByName(playerOutcome);
-		if (playerState.state == "won")
-		{
-			outcome.sprite = "stretched:session/icons/stances/violent.png";
-			outcome.tooltip = translate("Victory");
-		}
-		else if (playerState.state == "defeated")
-		{
-			outcome.sprite = "stretched:session/icons/stances/passive.png";
-			outcome.tooltip = translate("Defeated");
-		}
+		setOutcomeIcon(playerState.state, playerOutcome);
 
 		Engine.GetGUIObjectByName(playerNameColumn).caption = g_GameData.sim.playerStates[i+1].name;
 
diff --git a/binaries/data/mods/public/gui/summary/summary.xml b/binaries/data/mods/public/gui/summary/summary.xml
index 137d1c4e2a..e2fa6eebec 100644
--- a/binaries/data/mods/public/gui/summary/summary.xml
+++ b/binaries/data/mods/public/gui/summary/summary.xml
@@ -4,6 +4,7 @@
 	<script file="gui/common/functions_global_object.js"/>
 	<script file="gui/common/functions_civinfo.js"/>
 	<script file="gui/common/functions_utility.js"/>
+	<script file="gui/common/gamedescription.js"/>
 	<script file="gui/common/settings.js"/>
 
 	<!-- After settings.js, which defines g_Settings and g_MaxPlayers. -->
-- 
2.11.4.GIT