diff --git a/gulp/html.js b/gulp/html.js
index 48c5547a..b8af0e53 100644
--- a/gulp/html.js
+++ b/gulp/html.js
@@ -133,7 +133,7 @@ function gulptasksHTML($, gulp, buildFolder, browserSync) {
const images = buildUtils.getAllResourceImages();
// Preload essentials
- const preloads = ["fonts/LouisGeorgeCafe.woff2"];
+ const preloads = ["fonts/GameFont.woff2"];
// for (let i = 0; i < images.length; ++i) {
// if (preloads.indexOf(images[i]) < 0) {
@@ -180,7 +180,7 @@ function gulptasksHTML($, gulp, buildFolder, browserSync) {
font-style: normal;
font-weight: normal;
font-display: swap;
- src: url('${cachebust("res/fonts/LouisGeorgeCafe.woff2")}') format('woff2');
+ src: url('${cachebust("res/fonts/GameFont.woff2")}') format('woff2');
}
#ll_fp {
diff --git a/res/fonts/GameFont.woff2 b/res/fonts/GameFont.woff2
new file mode 100644
index 00000000..dcce6163
Binary files /dev/null and b/res/fonts/GameFont.woff2 differ
diff --git a/res/fonts/LouisGeorgeCafe.woff2 b/res/fonts/LouisGeorgeCafe.woff2
deleted file mode 100644
index 7e4ebe03..00000000
Binary files a/res/fonts/LouisGeorgeCafe.woff2 and /dev/null differ
diff --git a/res/logo.png b/res/logo.png
index 4edea174..6873fe1d 100644
Binary files a/res/logo.png and b/res/logo.png differ
diff --git a/res/ui/main_menu/bg_pattern.png b/res/ui/main_menu/bg_pattern.png
new file mode 100644
index 00000000..00291768
Binary files /dev/null and b/res/ui/main_menu/bg_pattern.png differ
diff --git a/res/ui/menu_bg.noinline.jpg b/res/ui/menu_bg.noinline.jpg
index a9e5c689..73b9915e 100644
Binary files a/res/ui/menu_bg.noinline.jpg and b/res/ui/menu_bg.noinline.jpg differ
diff --git a/res_raw/atlas.tps b/res_raw/atlas.tps
index 211d1659..9d94a757 100644
--- a/res_raw/atlas.tps
+++ b/res_raw/atlas.tps
@@ -284,6 +284,9 @@
sprites/belt/right_3.png
sprites/belt/right_4.png
sprites/belt/right_5.png
+ sprites/blueprints/belt_left.png
+ sprites/blueprints/belt_right.png
+ sprites/blueprints/belt_top.png
sprites/buildings/belt_left.png
sprites/buildings/belt_right.png
sprites/buildings/belt_top.png
@@ -301,11 +304,11 @@
scale9FromFile
- sprites/buildings/cutter.png
- sprites/buildings/mixer.png
- sprites/buildings/painter.png
- sprites/buildings/splitter.png
- sprites/buildings/stacker.png
+ sprites/blueprints/cutter.png
+ sprites/blueprints/mixer.png
+ sprites/blueprints/painter.png
+ sprites/blueprints/splitter.png
+ sprites/blueprints/stacker.png
pivotPoint
0.5,0.5
@@ -314,13 +317,19 @@
scale9Enabled
scale9Borders
- 64,32,128,64
+ 96,48,192,96
scale9Paddings
- 64,32,128,64
+ 96,48,192,96
scale9FromFile
- sprites/buildings/hub.png
+ sprites/blueprints/miner.png
+ sprites/blueprints/rotater.png
+ sprites/blueprints/trash.png
+ sprites/blueprints/underground_belt_entry.png
+ sprites/blueprints/underground_belt_exit.png
+ sprites/buildings/underground_belt_entry.png
+ sprites/buildings/underground_belt_exit.png
pivotPoint
0.5,0.5
@@ -329,14 +338,17 @@
scale9Enabled
scale9Borders
- 192,192,384,384
+ 48,48,96,96
scale9Paddings
- 192,192,384,384
+ 48,48,96,96
scale9FromFile
- sprites/buildings/underground_belt_entry.png
- sprites/buildings/underground_belt_exit.png
+ sprites/buildings/cutter.png
+ sprites/buildings/mixer.png
+ sprites/buildings/painter.png
+ sprites/buildings/splitter.png
+ sprites/buildings/stacker.png
pivotPoint
0.5,0.5
@@ -345,9 +357,24 @@
scale9Enabled
scale9Borders
- 48,48,96,96
+ 64,32,128,64
scale9Paddings
- 48,48,96,96
+ 64,32,128,64
+ scale9FromFile
+
+
+ sprites/buildings/hub.png
+
+ pivotPoint
+ 0.5,0.5
+ spriteScale
+ 1
+ scale9Enabled
+
+ scale9Borders
+ 192,192,384,384
+ scale9Paddings
+ 192,192,384,384
scale9FromFile
@@ -370,6 +397,7 @@
scale9FromFile
+ sprites/misc/deletion_marker.png
sprites/misc/slot_bad_arrow.png
sprites/misc/slot_good_arrow.png
diff --git a/src/css/ingame_hud/mass_selector.scss b/src/css/ingame_hud/mass_selector.scss
index 3ac4b763..91a0820b 100644
--- a/src/css/ingame_hud/mass_selector.scss
+++ b/src/css/ingame_hud/mass_selector.scss
@@ -3,10 +3,9 @@
@include S(top, 50px);
left: 50%;
transform: translateX(-50%);
- @include S(width, 300px);
- background: #f77;
+ background: rgba(#f77, 0.8);
@include S(border-radius, 4px);
- @include S(padding, 10px);
+ @include S(padding, 9px);
@include PlainText;
color: #fff;
diff --git a/src/css/states/main_menu.scss b/src/css/states/main_menu.scss
index 27fca0ea..198cefa3 100644
--- a/src/css/states/main_menu.scss
+++ b/src/css/states/main_menu.scss
@@ -3,7 +3,8 @@
justify-content: center;
flex-direction: column;
- background: uiResource("menu_bg.noinline.jpg") center center / cover no-repeat !important;
+ background: $colorGreenBright uiResource("main_menu/bg_pattern.png") top left / #{D(10px)} !important;
+ // background: $colorGreenBright !important;
.logo {
display: flex;
@@ -21,46 +22,49 @@
flex-grow: 1;
align-items: flex-start;
justify-content: center;
+
.playButton {
@include SuperHeading;
- @include S(width, 150px);
- @include S(padding, 15px, 20px);
+ @include S(width, 130px);
+ @include S(padding, 15px, 20px, 10px);
+ letter-spacing: 0.3em !important;
color: #fff;
- background-color: $accentColorDark;
+ background-color: #55585a;
+ text-shadow: #{D(1px)} #{D(2px)} 0 rgba(0, 0, 0, 0.1);
}
}
.footer {
display: flex;
- justify-content: flex-end;
+ justify-content: center;
@include S(padding, 15px);
> a {
display: flex;
- flex-direction: column;
+ flex-direction: row;
align-items: center;
justify-content: center;
- background: #eee;
+ background: lighten(#44484a, 55);
@include S(padding, 5px);
@include S(border-radius, 4px);
@include S(margin-left, 10px);
@include SuperSmallText();
- border: #{D(1px)} solid #aaa;
- border-bottom: #{D(3px)} solid #aaa;
+ border: #{D(1px)} solid #44484a;
+ border-bottom: #{D(3px)} solid #44484a;
box-shadow: #{D(1px)} #{D(2px)} #{D(3px)} 0 rgba(0, 10, 20, 0.1);
font-weight: bold;
text-transform: uppercase;
- color: #999da3;
+ color: #616266;
transition: background-color 0.12s ease-in-out;
pointer-events: all;
- @include S(width, 50px);
+ @include S(width, 120px);
@include S(height, 50px);
cursor: pointer;
&:hover {
- background-color: #fafafa;
+ background-color: lighten(#44484a, 65);
}
.thirdpartyLogo {
diff --git a/src/css/variables.scss b/src/css/variables.scss
index 680b40d6..5648c0ea 100644
--- a/src/css/variables.scss
+++ b/src/css/variables.scss
@@ -18,7 +18,6 @@ $plainTextLineHeight: 17px;
$supersmallTextFontSize: 10px;
$supersmallTextLineHeight: 13px;
-
$buttonFontSize: 14px;
$buttonLineHeight: 18px;
diff --git a/src/js/game/hud/parts/mass_selector.js b/src/js/game/hud/parts/mass_selector.js
index f3a205d4..ed9a8aa7 100644
--- a/src/js/game/hud/parts/mass_selector.js
+++ b/src/js/game/hud/parts/mass_selector.js
@@ -19,7 +19,7 @@ export class HUDMassSelector extends BaseHUDPart {
[],
`
Press DEL to remove selected buildings
- and ESCAPE to cancel.
+ and ESC to cancel.
`
);
}
diff --git a/src/js/states/main_menu.js b/src/js/states/main_menu.js
index 385db5e5..40d43359 100644
--- a/src/js/states/main_menu.js
+++ b/src/js/states/main_menu.js
@@ -21,11 +21,13 @@ export class MainMenuState extends GameState {