From 1eb9a7872ba19907b512fbdfb568d1b99e02d4e2 Mon Sep 17 00:00:00 2001
From: Acumen <stuart@wildfiregames.com>
Date: Tue, 18 Jan 2005 18:09:37 +0000
Subject: [PATCH] Integrated Player attributes with the status pane and manual,
 and created a really rough test map with different player civs.

This was SVN commit r1742.
---
 .../data/mods/official/gui/test/2_mainmenu.xml     |  6 +++---
 .../mods/official/gui/test/functions_manual.js     | 14 ++++++++++++++
 .../gui/test/functions_session_status_orb.js       |  2 +-
 binaries/data/mods/official/maps/scenarios/ph2.pmp |  3 +++
 binaries/data/mods/official/maps/scenarios/ph2.xml |  3 +++
 5 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 binaries/data/mods/official/maps/scenarios/ph2.pmp
 create mode 100644 binaries/data/mods/official/maps/scenarios/ph2.xml

diff --git a/binaries/data/mods/official/gui/test/2_mainmenu.xml b/binaries/data/mods/official/gui/test/2_mainmenu.xml
index 6be5912ef0..749a2fb6a5 100755
--- a/binaries/data/mods/official/gui/test/2_mainmenu.xml
+++ b/binaries/data/mods/official/gui/test/2_mainmenu.xml
@@ -118,7 +118,7 @@
                                 Player Name (temporary):
                         </object>
                         
-                        <object type="input" name="pregame_mp_ip_playername" sprite="only_black" absolute="false" size="220 80 350 100" textcolor="0 0 0">
+                        <object type="input" name="pregame_mp_ip_playername" sprite="only_black" absolute="false" size="220 80 350 100" textcolor="255 255 255">
                                 Player
                         </object>
                         <!-- END PLAYER NAME controls -->
@@ -134,7 +134,7 @@
                                 Map Name:
                         </object>
 
-                        <object type="input" name="pregame_mp_ip_host_mapname" sprite="only_black" absolute="false" size="50 150 200 170" textcolor="0 0 0">
+                        <object type="input" name="pregame_mp_ip_host_mapname" sprite="only_black" absolute="false" size="50 150 200 170" textcolor="255 255 255">
                                 test01.pmp
                         </object>
 
@@ -160,7 +160,7 @@
                                 IP address:
                         </object>
 
-                        <object type="input" name="pregame_mp_ip_joinip" sprite="only_black" absolute="false" size="50 210 200 230" textcolor="0 0 0">
+                        <object type="input" name="pregame_mp_ip_joinip" sprite="only_black" absolute="false" size="50 210 200 230" textcolor="255 255 255">
                                 127.0.0.1
                         </object>
 
diff --git a/binaries/data/mods/official/gui/test/functions_manual.js b/binaries/data/mods/official/gui/test/functions_manual.js
index 64ef36432b..ab7a11366d 100755
--- a/binaries/data/mods/official/gui/test/functions_manual.js
+++ b/binaries/data/mods/official/gui/test/functions_manual.js
@@ -44,6 +44,20 @@ function manualDisplay()
 						ManualRollover.caption += "Civilisation: " + selection[0].traits.id.civ + " (" + selection[0].traits.id.civ_code + ")" + "\n";
 					if (!selection[0].traits.id.civ_code)
 						ManualRollover.caption += "Civilisation: " + selection[0].traits.id.civ + "\n";
+
+					// Display player info.
+					if (selection[0].player){
+						if (selection[0].player.name)
+							ManualRollover.caption += "Player Name: " + selection[0].player.name + "\n";
+						if (selection[0].player.id)
+							ManualRollover.caption += "Player ID: " + selection[0].player.id + "\n";
+						if (selection[0].player.colour)
+							ManualRollover.caption += "Player Colour: " + selection[0].player.colour + "\n";
+						if (selection[0].player.controlled)
+							ManualRollover.caption += "Player Controlled: " + selection[0].player.controlled + "\n";
+//						if (players[])
+//							ManualRollover.caption += "Players[]: " + players[] + "\n";
+					}
 					
 					// Display hitpoints.
 					if (selection[0].traits.health.curr && selection[0].traits.health.max && selection[0].traits.health)
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 1a6ae70101..397f336e06 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
@@ -700,7 +700,7 @@ function UpdateStatusOrb()
 {
 	// Update heading.
 	GUIObject = getGUIObjectByName("session_panel_status_heading");
-	GUIObject.caption = "Acumen"; // Player name (placeholder; replace with proper callsign).
+	GUIObject.caption = selection[0].player.name; // Player name (placeholder; replace with proper callsign).
 	if (selection[0].traits.id.civ)
 		GUIObject.caption += " [icon=bullet_icon] " + selection[0].traits.id.civ;
 
diff --git a/binaries/data/mods/official/maps/scenarios/ph2.pmp b/binaries/data/mods/official/maps/scenarios/ph2.pmp
new file mode 100644
index 0000000000..98fc3bfedb
--- /dev/null
+++ b/binaries/data/mods/official/maps/scenarios/ph2.pmp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7e46227e6f014b9da29b0e85ad61393044e6b88adfc9050e5f6594eaaa2fc5e3
+size 445382
diff --git a/binaries/data/mods/official/maps/scenarios/ph2.xml b/binaries/data/mods/official/maps/scenarios/ph2.xml
new file mode 100644
index 0000000000..f51fea7646
--- /dev/null
+++ b/binaries/data/mods/official/maps/scenarios/ph2.xml
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:192407849e2c911adaa80bfd05cb81c41e9b15dfb17926ca26d4a08c431a0bec
+size 22309