diff --git a/binaries/data/mods/public/art/textures/ui/loading/border-bottom.png b/binaries/data/mods/public/art/textures/ui/loading/border/border-bottom.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/loading/border-bottom.png
rename to binaries/data/mods/public/art/textures/ui/loading/border/border-bottom.png
diff --git a/binaries/data/mods/public/art/textures/ui/loading/border-corner.png b/binaries/data/mods/public/art/textures/ui/loading/border/border-corner.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/loading/border-corner.png
rename to binaries/data/mods/public/art/textures/ui/loading/border/border-corner.png
diff --git a/binaries/data/mods/public/art/textures/ui/loading/border-left.png b/binaries/data/mods/public/art/textures/ui/loading/border/border-left.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/loading/border-left.png
rename to binaries/data/mods/public/art/textures/ui/loading/border/border-left.png
diff --git a/binaries/data/mods/public/art/textures/ui/loading/border-right.png b/binaries/data/mods/public/art/textures/ui/loading/border/border-right.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/loading/border-right.png
rename to binaries/data/mods/public/art/textures/ui/loading/border/border-right.png
diff --git a/binaries/data/mods/public/art/textures/ui/loading/border-top.png b/binaries/data/mods/public/art/textures/ui/loading/border/border-top.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/loading/border-top.png
rename to binaries/data/mods/public/art/textures/ui/loading/border/border-top.png
diff --git a/binaries/data/mods/public/art/textures/ui/loading/border/line_corner_bottom_left.png b/binaries/data/mods/public/art/textures/ui/loading/border/line_corner_bottom_left.png
new file mode 100644
index 0000000000..7d6518087c
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/loading/border/line_corner_bottom_left.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ea2817a5e252ad24a373df1740021afc4416cf3d7807a6619ea7572a957eb6ea
+size 2818
diff --git a/binaries/data/mods/public/art/textures/ui/loading/border/line_corner_bottom_right.png b/binaries/data/mods/public/art/textures/ui/loading/border/line_corner_bottom_right.png
new file mode 100644
index 0000000000..b8274e0b3c
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/loading/border/line_corner_bottom_right.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7297d423de3835ea6dbaa79731a338f72f2a229cf5388ffb6e2bfc2e62277ce3
+size 2809
diff --git a/binaries/data/mods/public/art/textures/ui/loading/border/line_corner_top_left.png b/binaries/data/mods/public/art/textures/ui/loading/border/line_corner_top_left.png
new file mode 100644
index 0000000000..74b3ddccb6
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/loading/border/line_corner_top_left.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ecad1a8180c5b469b30474465aa75655a84ef355bdecfe63c8842b045f68888f
+size 2820
diff --git a/binaries/data/mods/public/art/textures/ui/loading/border/line_corner_top_right.png b/binaries/data/mods/public/art/textures/ui/loading/border/line_corner_top_right.png
new file mode 100644
index 0000000000..b5831995b7
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/loading/border/line_corner_top_right.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e661c5514ece5cdf796e8dc29f524109b4c99b15b82b8bd41048fd8282f827bf
+size 2815
diff --git a/binaries/data/mods/public/art/textures/ui/loading/border/line_horiz.png b/binaries/data/mods/public/art/textures/ui/loading/border/line_horiz.png
new file mode 100644
index 0000000000..0ad7e76414
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/loading/border/line_horiz.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:be36ba0d242cd546d03d993a563195dee885ac0b2da68ddbc38d64257bf78d0a
+size 2810
diff --git a/binaries/data/mods/public/art/textures/ui/loading/border/line_vert.png b/binaries/data/mods/public/art/textures/ui/loading/border/line_vert.png
new file mode 100644
index 0000000000..97f640d183
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/loading/border/line_vert.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5c6444860075392ab0a81ae807de9a5be7eb2cbd86fa2126956aa892e216780b
+size 2807
diff --git a/binaries/data/mods/public/art/textures/ui/loading/loading-bar.png b/binaries/data/mods/public/art/textures/ui/loading/loading-bar.png
deleted file mode 100644
index 0bca59ab53..0000000000
--- a/binaries/data/mods/public/art/textures/ui/loading/loading-bar.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:df89b3cff5042cf98bd54e98b25a73c71885ff82c9e72ddf29847dcd5c1bcd42
-size 2835
diff --git a/binaries/data/mods/public/art/textures/ui/loading/loading-tray-mask.png b/binaries/data/mods/public/art/textures/ui/loading/loading-tray-mask.png
deleted file mode 100644
index b56bc1ab4e..0000000000
--- a/binaries/data/mods/public/art/textures/ui/loading/loading-tray-mask.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e30c405c273acccc4bbae7c48e233c09abda5b637e984f1ea2b464827a6feee5
-size 11428
diff --git a/binaries/data/mods/public/art/textures/ui/loading/loading-tray.png b/binaries/data/mods/public/art/textures/ui/loading/loading-tray.png
deleted file mode 100644
index 61730430a9..0000000000
--- a/binaries/data/mods/public/art/textures/ui/loading/loading-tray.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:24543b572322e92a14ff7bded805d4bc9300e32b4c550697b83a172000642568
-size 13461
diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/parchment.png b/binaries/data/mods/public/art/textures/ui/loading/parchment.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/loading/tips/parchment.png
rename to binaries/data/mods/public/art/textures/ui/loading/parchment.png
diff --git a/binaries/data/mods/public/art/textures/ui/loading/progressbar/progressbar_background_left.png b/binaries/data/mods/public/art/textures/ui/loading/progressbar/progressbar_background_left.png
new file mode 100644
index 0000000000..11b53c874f
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/loading/progressbar/progressbar_background_left.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:19fae5e9c3c68ca1d4fc6b53274f01acd17204f2b376fb3a97622665e1435bcb
+size 5279
diff --git a/binaries/data/mods/public/art/textures/ui/loading/progressbar/progressbar_background_middle.png b/binaries/data/mods/public/art/textures/ui/loading/progressbar/progressbar_background_middle.png
new file mode 100644
index 0000000000..7fdedfe9f2
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/loading/progressbar/progressbar_background_middle.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0123d390509aed34e5cfca3bd962e80f90e3d151213af82eb8d8f772dfe016d7
+size 2368
diff --git a/binaries/data/mods/public/art/textures/ui/loading/progressbar/progressbar_background_right.png b/binaries/data/mods/public/art/textures/ui/loading/progressbar/progressbar_background_right.png
new file mode 100644
index 0000000000..f59f7ec3c4
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/loading/progressbar/progressbar_background_right.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7c5fdf19b33fd2401e3af9b930fabcd5c2126a72612a810b308c4fbc264613db
+size 5106
diff --git a/binaries/data/mods/public/art/textures/ui/loading/progressbar/progressbar_left.png b/binaries/data/mods/public/art/textures/ui/loading/progressbar/progressbar_left.png
new file mode 100644
index 0000000000..9c2f02b23e
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/loading/progressbar/progressbar_left.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d2eefadc5ee8c1cf6087c3ffe21bf31a7a8516161f0aad88cf9e740871c635ec
+size 367
diff --git a/binaries/data/mods/public/art/textures/ui/loading/progressbar/progressbar_middle.png b/binaries/data/mods/public/art/textures/ui/loading/progressbar/progressbar_middle.png
new file mode 100644
index 0000000000..dac8331a8f
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/loading/progressbar/progressbar_middle.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d581daae96c66bd7ae989b49e1f54e59fc25fc347400ce4ecf8766370f78c1d9
+size 2798
diff --git a/binaries/data/mods/public/art/textures/ui/loading/progressbar/progressbar_right.png b/binaries/data/mods/public/art/textures/ui/loading/progressbar/progressbar_right.png
new file mode 100644
index 0000000000..c08f034e08
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/loading/progressbar/progressbar_right.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0b5d95a9fe87a3e4180c4859bdf70d38ba59c37d49dd2244442456124bc303fb
+size 387
diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/tip01.txt b/binaries/data/mods/public/art/textures/ui/loading/tips/tip01.txt
deleted file mode 100644
index 62b0889fde..0000000000
--- a/binaries/data/mods/public/art/textures/ui/loading/tips/tip01.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-
-TEMPLES
-
- Town Phase structure required
-to upgrade to the City Phase.
-
- Recruit Healers to heal your
-troops on the battlefield.
-
- Research healing and religious
-devotion technologies.
-
- Its aura heals nearby units.
-
- Garrison damaged units inside
-for quicker healing.
\ No newline at end of file
diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/tip02.png b/binaries/data/mods/public/art/textures/ui/loading/tips/tip02.png
new file mode 100644
index 0000000000..81978b9561
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/loading/tips/tip02.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:911d30fd10b369aa6e6b3b476e5975da5ece8951dd417a726d17b3d0fe9dff01
+size 468227
diff --git a/binaries/data/mods/public/gui/loading/loading.js b/binaries/data/mods/public/gui/loading/loading.js
index bafb21b692..ee272f7f0e 100644
--- a/binaries/data/mods/public/gui/loading/loading.js
+++ b/binaries/data/mods/public/gui/loading/loading.js
@@ -11,38 +11,58 @@ function init(data)
// Set to "hourglass" cursor.
setCursor("cursor-wait");
- // Choose random concept art for loading screen background (should depend on the selected civ later when this is specified).
+ // Get tip image and corresponding tip text
var sprite = "";
- var loadingBkgArray = buildDirEntList("art/textures/ui/loading/", "*.dds", false);
- if (loadingBkgArray.length == 0)
- error("Failed to find any matching textures for the loading screen background.");
+ var tipText = "";
+ var tipImageLoadingArray = buildDirEntList("art/textures/ui/loading/tips/", "*.png", false);
+ var tipTextLoadingArray = buildDirEntList("gui/text/tips/", "*.txt", false);
+
+ if (tipImageLoadingArray.length == 0)
+ error("Failed to find any matching tip textures for the loading screen.");
+ else if (tipTextLoadingArray.length == 0)
+ error("Failed to find any matching tip text files for the loading screen.");
+ else if (tipImageLoadingArray.length != tipTextLoadingArray.length)
+ error("The there are different amounts of tip images and tip text files.");
else
{
- // Get a random index from the list of loading screen backgrounds.
- sprite = "stretched:" + loadingBkgArray[getRandom (0, loadingBkgArray.length-1)];
+ var randomIndex = getRandom (0, tipImageLoadingArray.length-1);
+
+ sprite = "stretched:" + tipImageLoadingArray[randomIndex];
sprite = sprite.replace("art/textures/ui/", "");
sprite = sprite.replace(".cached.dds", ""); // cope with pre-cached textures
+
+ tipText = readFile(tipTextLoadingArray[randomIndex]);
+ }
+
+ // Set tip image
+ getGUIObjectByName("loadingTipImage").sprite = sprite;
+
+ // Set tip text
+ if (tipText)
+ {
+ var index = tipText.indexOf("\n");
+ tipTextTitle = tipText.substring(0, index);
+ tipTextMessage = tipText.substring(index);
+ getGUIObjectByName("loadingTipTitle").caption = tipTextTitle? tipTextTitle : "";
+ getGUIObjectByName("loadingTipText").caption = tipTextMessage? tipTextMessage : "";
}
- getGUIObjectByName ("ldConcept").sprite = sprite;
// janwas: main loop now sets progress / description, but that won't
// happen until the first timeslice completes, so set initial values.
-
- var ldTitleBar = getGUIObjectByName ("ldTitleBar");
- var ldText = getGUIObjectByName ("ldText");
+ var loadingMapName = getGUIObjectByName ("loadingMapName");
if (data)
{
switch (data.attribs.mapType)
{
case "scenario":
- ldTitleBar.caption = "Loading Scenario";
- ldText.caption = "Loading " + mapName + "\nPlease wait...";
+ //ldTitleBar.caption = "Loading Scenario";
+ loadingMapName.caption = "Loading \"" + mapName + "\"";
break;
case "random":
- ldTitleBar.caption = "Loading Random Map";
- ldText.caption = "Generating " + mapName + "\nPlease wait...";
+ //ldTitleBar.caption = "Loading Random Map";
+ loadingMapName.caption = "Generating \"" + mapName + "\"";
break;
default:
@@ -50,17 +70,34 @@ function init(data)
}
}
- getGUIObjectByName("ldProgressBarText").caption = "";
- getGUIObjectByName("ldProgressBar").caption = 0;
+ getGUIObjectByName("progressText").caption = "";
+ getGUIObjectByName("progressBar").caption = 0;
- // Pick a random tip of the day (each line is a separate tip).
- var tipArray = readFileLines("gui/text/tips.txt");
- // Set tip string.
- getGUIObjectByName("ldTip").caption = tipArray[getRandom(0, tipArray.length-1)];
+ // Pick a random quote of the day (each line is a separate tip).
+ var quoteArray = readFileLines("gui/text/quotes.txt");
+ getGUIObjectByName("loadingQuoteText").caption = quoteArray[getRandom(0, quoteArray.length-1)];
}
// ====================================================================
+function displayProgress()
+{
+ getGUIObjectByName("progressBar").caption = g_Progress; // display current progress
+ getGUIObjectByName("progressText").caption = g_LoadDescription; // display current progess details
+
+ // Keep curved right edge of progress bar in sync with the rest of the progress bar
+ var middle = getGUIObjectByName("progressBar");
+ var rightSide = getGUIObjectByName("loadingProgressbar_right");
+
+ var middleLength = middle.size.right - middle.size.left;
+ var increment = Math.round(g_Progress*middleLength/100);
+ var size = rightSide.size;
+ size.left = increment;
+ size.right = increment+12;
+ rightSide.size = size;
+}
+
+// ====================================================================
function reallyStartGame()
{
// Stop the music
diff --git a/binaries/data/mods/public/gui/loading/loading.xml b/binaries/data/mods/public/gui/loading/loading.xml
index 530f7b8815..348343548f 100644
--- a/binaries/data/mods/public/gui/loading/loading.xml
+++ b/binaries/data/mods/public/gui/loading/loading.xml
@@ -5,101 +5,48 @@
- LOADING SCREEN -
==========================================
-->
-
-
diff --git a/binaries/data/mods/public/gui/loading/sprites.xml b/binaries/data/mods/public/gui/loading/sprites.xml
new file mode 100644
index 0000000000..9bb8c3e603
--- /dev/null
+++ b/binaries/data/mods/public/gui/loading/sprites.xml
@@ -0,0 +1,167 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/binaries/data/mods/public/gui/loading/styles.xml b/binaries/data/mods/public/gui/loading/styles.xml
new file mode 100644
index 0000000000..74eef7ec34
--- /dev/null
+++ b/binaries/data/mods/public/gui/loading/styles.xml
@@ -0,0 +1,54 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/binaries/data/mods/public/gui/page_loading.xml b/binaries/data/mods/public/gui/page_loading.xml
index 9f742834ba..16a1fd48e9 100644
--- a/binaries/data/mods/public/gui/page_loading.xml
+++ b/binaries/data/mods/public/gui/page_loading.xml
@@ -4,6 +4,8 @@
common/styles.xml
common/sprite1.xml
common/init.xml
+ loading/styles.xml
+ loading/sprites.xml
loading/loading.xml
common/global.xml
diff --git a/binaries/data/mods/public/gui/text/tips.txt b/binaries/data/mods/public/gui/text/quotes.txt
similarity index 100%
rename from binaries/data/mods/public/gui/text/tips.txt
rename to binaries/data/mods/public/gui/text/quotes.txt
diff --git a/binaries/data/mods/public/gui/text/tips/tip01.txt b/binaries/data/mods/public/gui/text/tips/tip01.txt
new file mode 100644
index 0000000000..8f342f24e5
--- /dev/null
+++ b/binaries/data/mods/public/gui/text/tips/tip01.txt
@@ -0,0 +1,10 @@
+TEMPLES
+Town Phase structure required to upgrade to the City Phase.
+
+Recruit Healers to heal your troops on the battlefield.
+
+Research healing and religious devotion technologies.
+
+Its "aura" heals nearby units.
+
+Garrison damaged units inside for quicker healing.
\ No newline at end of file
diff --git a/binaries/data/mods/public/gui/text/tips/tip02.txt b/binaries/data/mods/public/gui/text/tips/tip02.txt
new file mode 100644
index 0000000000..91ddd2b21b
--- /dev/null
+++ b/binaries/data/mods/public/gui/text/tips/tip02.txt
@@ -0,0 +1,2 @@
+Tip 2 Title
+Tip 2 info goes here.
\ No newline at end of file