diff --git a/binaries/data/mods/official/gui/test/1_init.xml b/binaries/data/mods/official/gui/test/1_init.xml
index 80a306f5b6..b3ba24451c 100755
--- a/binaries/data/mods/official/gui/test/1_init.xml
+++ b/binaries/data/mods/official/gui/test/1_init.xml
@@ -46,6 +46,9 @@
+
+
diff --git a/binaries/data/mods/official/gui/test/2_mainmenu.xml b/binaries/data/mods/official/gui/test/2_mainmenu.xml
index 415ebe600c..7f92e049bc 100755
--- a/binaries/data/mods/official/gui/test/2_mainmenu.xml
+++ b/binaries/data/mods/official/gui/test/2_mainmenu.xml
@@ -19,7 +19,6 @@
startGame();
GUIObjectUnhide("session_gui");
GUIObjectHide("pregame_gui");
- GUIObjectUnhide("End_Game_Button");
FlipGUI(GUIType);
]]>
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -804,20 +730,20 @@
-
+
-
+
diff --git a/binaries/data/mods/official/gui/test/6_global.xml b/binaries/data/mods/official/gui/test/6_global.xml
index 6afb20d3a7..d6cb1e4251 100755
--- a/binaries/data/mods/official/gui/test/6_global.xml
+++ b/binaries/data/mods/official/gui/test/6_global.xml
@@ -37,16 +37,10 @@
- End Game
-
+
diff --git a/binaries/data/mods/official/gui/test/functions_session.js b/binaries/data/mods/official/gui/test/functions_session.js
index fb45927150..d46ef1467e 100755
--- a/binaries/data/mods/official/gui/test/functions_session.js
+++ b/binaries/data/mods/official/gui/test/functions_session.js
@@ -2,6 +2,7 @@ function initSession()
{
initCoord();
initGroupPane();
+ initResourcePool();
}
// ====================================================================
diff --git a/binaries/data/mods/official/gui/test/functions_session_coord.js b/binaries/data/mods/official/gui/test/functions_session_coord.js
index 50e0a2c5d0..f7e0ee5051 100755
--- a/binaries/data/mods/official/gui/test/functions_session_coord.js
+++ b/binaries/data/mods/official/gui/test/functions_session_coord.js
@@ -11,6 +11,15 @@ function initCoord()
crd_portrait_lrg_height = crd_portrait_lrg_width;
crd_portrait_sml_width = 32;
crd_portrait_sml_height = crd_portrait_sml_width;
+
+ // Screen percentages.
+ top_screen = 0;
+ mid_screen = 50;
+ bottom_screen = 100;
+
+ // Small icons (eg Movement Rate, Food).
+ crd_mini_icon_width = 20;
+ crd_mini_icon_height = crd_mini_icon_width;
}
// ====================================================================
@@ -139,6 +148,8 @@ function FlipGUI(NewGUIType)
break;
}
}
+
+ UpdateGroupPane();
}
else
{
diff --git a/binaries/data/mods/official/gui/test/functions_session_resource_pool.js b/binaries/data/mods/official/gui/test/functions_session_resource_pool.js
new file mode 100755
index 0000000000..a8a84805a8
--- /dev/null
+++ b/binaries/data/mods/official/gui/test/functions_session_resource_pool.js
@@ -0,0 +1,24 @@
+function initResourcePool()
+{
+ // Resource counter (base).
+ crd_resource_counter_width_base = 53;
+ crd_resource_counter_height_base = 19;
+ // Resource counter (short).
+ crd_resource_counter_width = crd_mini_icon_width+crd_resource_counter_width_base+1;
+ crd_resource_counter_height = crd_mini_icon_height;
+ // Resource counter (long).
+ crd_resource_counter_long_width = crd_resource_counter_width+9;
+ crd_resource_counter_long_height = crd_resource_counter_height;
+ // Resource counter span.
+ crd_resource_counter_span = 5;
+ crd_resource_food_x = -200;
+ crd_resource_food_y = 4;
+ crd_resource_wood_x = crd_resource_food_x+crd_resource_counter_width+crd_resource_counter_span;
+ crd_resource_wood_y = crd_resource_food_y;
+ crd_resource_stone_x = crd_resource_wood_x+crd_resource_counter_width+crd_resource_counter_span;
+ crd_resource_stone_y = crd_resource_wood_y;
+ crd_resource_ore_x = crd_resource_stone_x+crd_resource_counter_width+crd_resource_counter_span;
+ crd_resource_ore_y = crd_resource_stone_y;
+ crd_resource_population_x = crd_resource_ore_x+crd_resource_counter_width+crd_resource_counter_span;
+ crd_resource_population_y = crd_resource_ore_y;
+}
diff --git a/binaries/data/mods/official/gui/test/setup.xml b/binaries/data/mods/official/gui/test/setup.xml
index 8a58194760..4b2c3fa509 100755
--- a/binaries/data/mods/official/gui/test/setup.xml
+++ b/binaries/data/mods/official/gui/test/setup.xml
@@ -42,7 +42,16 @@
sprite-button-top-pressed="sprite2-pressed"
/>
-
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+