diff --git a/docs/style.md b/docs/style.md
index 02563c9..fce6342 100644
--- a/docs/style.md
+++ b/docs/style.md
@@ -13,7 +13,7 @@ Buttons should be lit by a pure white line in top-left corner (~75% of the borde
* First color is for neutral interface and ships
* Second color is for AI
-* Third color is for story
+* Third color is for story / menu / options
* Fourth color is for enemy
http://paletton.com/#uid=63D0c0kcBwN43YM8AMYhnnWlyeQ
diff --git a/graphics/ui/preload.svg b/graphics/ui/preload.svg
index ae4cadd..d89f4fb 100644
--- a/graphics/ui/preload.svg
+++ b/graphics/ui/preload.svg
@@ -15,7 +15,7 @@
viewBox="0 0 507.99999 285.75001"
version="1.1"
id="svg4677"
- inkscape:version="0.92.0 unknown"
+ inkscape:version="0.92.1 r15371"
sodipodi:docname="preload.svg"
inkscape:export-filename="/home/michael/workspace/spacetac/out/assets/images/preload/bar-content.png"
inkscape:export-xdpi="96"
@@ -24,25 +24,32 @@
id="defs4671">
+ id="linearGradient6977">
+ id="stop6973" />
+
+
+
+
+ id="stop6975" />
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+ inkscape:snap-bbox="true"
+ inkscape:snap-bbox-edge-midpoints="true"
+ inkscape:snap-global="false"
+ inkscape:lockguides="false"
+ inkscape:measure-start="962.857,1080"
+ inkscape:measure-end="962.857,614.286" />
@@ -213,49 +275,189 @@
- ... Loading ...
-
-
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ... Loading ...
diff --git a/out/images/preload/bar-background.png b/out/images/preload/bar-background.png
index 89de7ac..7379627 100644
Binary files a/out/images/preload/bar-background.png and b/out/images/preload/bar-background.png differ
diff --git a/out/images/preload/bar-content.png b/out/images/preload/bar-content.png
index ab5c527..130d45c 100644
Binary files a/out/images/preload/bar-content.png and b/out/images/preload/bar-content.png differ
diff --git a/src/ui/AssetLoading.ts b/src/ui/AssetLoading.ts
index e0663a8..b53cd2f 100644
--- a/src/ui/AssetLoading.ts
+++ b/src/ui/AssetLoading.ts
@@ -33,12 +33,13 @@ module TK.SpaceTac.UI {
}
preload() {
- let text = this.add.text(this.getMidWidth(), 400, "... loading ...", { font: "bold 40pt SpaceTac", fill: "#529aee" });
- text.anchor.set(0.5);
- let bg = this.add.image(678, 570, "preload-background");
- let bar = this.add.image(678, 570, "preload-bar");
+ let bg = this.add.image(643, 435, "preload-background");
+ let bar = this.add.image(643, 435, "preload-bar");
this.load.setPreloadSprite(bar);
+ let text = this.add.text(this.getMidWidth(), 466, "... Loading ...", { font: "normal 36pt SpaceTac", fill: "#dbeff9" });
+ text.anchor.set(0.5);
+
if (this.required >= AssetLoadingRange.MENU && AssetLoading.loaded < AssetLoadingRange.MENU) {
console.log("Loading menu assets");
this.load.pack("stage1", `assets/pack1.json?t=${Date.now()}`);
diff --git a/src/ui/Boot.ts b/src/ui/Boot.ts
index 09e18f0..1c43e5d 100644
--- a/src/ui/Boot.ts
+++ b/src/ui/Boot.ts
@@ -18,7 +18,7 @@ module TK.SpaceTac.UI {
this.scale.fullScreenScaleMode = Phaser.ScaleManager.SHOW_ALL;
this.input.maxPointers = 1;
- this.add.image(678, 426, "preload-background");
+ this.add.image(643, 435, "preload-background");
this.game.state.start("router");
}