diff --git a/res/ui/building_icons/belt.png b/res/ui/building_icons/belt.png
index d0f5e11b..f9ed2542 100644
Binary files a/res/ui/building_icons/belt.png and b/res/ui/building_icons/belt.png differ
diff --git a/res/ui/building_icons/miner.png b/res/ui/building_icons/miner.png
index 0e5c209c..6bf727ec 100644
Binary files a/res/ui/building_icons/miner.png and b/res/ui/building_icons/miner.png differ
diff --git a/res/ui/building_icons/underground_belt.png b/res/ui/building_icons/underground_belt.png
index 4a4c2dc5..240e08a6 100644
Binary files a/res/ui/building_icons/underground_belt.png and b/res/ui/building_icons/underground_belt.png differ
diff --git a/src/css/main.scss b/src/css/main.scss
index 2bb2ff4d..db586d65 100644
--- a/src/css/main.scss
+++ b/src/css/main.scss
@@ -92,7 +92,7 @@ body.uiHidden {
body.modalDialogActive,
body.ingameDialogOpen {
- > *:not(.ingameDialog):not(.modalDialogParent):not(.loadingDialog) {
+ > *:not(.ingameDialog):not(.modalDialogParent):not(.loadingDialog):not(.gameLoadingOverlay) {
filter: blur(5px) !important;
}
}
diff --git a/src/css/textual_game_state.scss b/src/css/textual_game_state.scss
index d8c980cd..83c8d171 100644
--- a/src/css/textual_game_state.scss
+++ b/src/css/textual_game_state.scss
@@ -13,11 +13,17 @@
.headerBar {
display: flex;
align-items: center;
+ justify-content: flex-start;
h1 {
+ display: flex;
+ pointer-events: all;
+ align-items: center;
+ cursor: pointer;
@include SuperHeading;
text-transform: uppercase;
color: #333438;
+ @include IncreasedClickArea(10px);
}
.backButton {
diff --git a/src/html/index.html b/src/html/index.html
index 1d4553c0..ff9c77f4 100644
--- a/src/html/index.html
+++ b/src/html/index.html
@@ -1,7 +1,7 @@
- shapez.io
+ shapez.io - Combine Shapes!
@@ -19,13 +19,16 @@
+
-
diff --git a/src/js/core/textual_game_state.js b/src/js/core/textual_game_state.js
index a35d301b..52a1f946 100644
--- a/src/js/core/textual_game_state.js
+++ b/src/js/core/textual_game_state.js
@@ -97,8 +97,8 @@ export class TextualGameState extends GameState {
if (this.getStateHeaderTitle()) {
headerHtml = `
`;
}
@@ -138,7 +138,7 @@ export class TextualGameState extends GameState {
}
this.containerElement = this.htmlElement.querySelector(".widthKeeper .container");
- this.headerElement = this.htmlElement.querySelector(".headerBar > .backButton");
+ this.headerElement = this.htmlElement.querySelector(".headerBar > h1");
if (this.headerElement) {
this.trackClicks(this.headerElement, this.onBackButton);
diff --git a/src/js/game/hud/parts/buildings_toolbar.js b/src/js/game/hud/parts/buildings_toolbar.js
index 6c2aec81..011e245e 100644
--- a/src/js/game/hud/parts/buildings_toolbar.js
+++ b/src/js/game/hud/parts/buildings_toolbar.js
@@ -1,26 +1,25 @@
-import { BaseHUDPart } from "../base_hud_part";
-import { makeDiv } from "../../../core/utils";
import { gMetaBuildingRegistry } from "../../../core/global_registries";
-import { MetaBuilding } from "../../meta_building";
import { Signal } from "../../../core/signal";
-import { MetaSplitterBuilding } from "../../buildings/splitter";
-import { MetaMinerBuilding } from "../../buildings/miner";
+import { TrackedState } from "../../../core/tracked_state";
+import { makeDiv } from "../../../core/utils";
+import { MetaBeltBaseBuilding } from "../../buildings/belt_base";
import { MetaCutterBuilding } from "../../buildings/cutter";
-import { MetaRotaterBuilding } from "../../buildings/rotater";
-import { MetaStackerBuilding } from "../../buildings/stacker";
+import { MetaMinerBuilding } from "../../buildings/miner";
import { MetaMixerBuilding } from "../../buildings/mixer";
import { MetaPainterBuilding } from "../../buildings/painter";
+import { MetaRotaterBuilding } from "../../buildings/rotater";
+import { MetaSplitterBuilding } from "../../buildings/splitter";
+import { MetaStackerBuilding } from "../../buildings/stacker";
import { MetaTrashBuilding } from "../../buildings/trash";
-import { MetaBeltBaseBuilding } from "../../buildings/belt_base";
import { MetaUndergroundBeltBuilding } from "../../buildings/underground_belt";
-import { globalConfig } from "../../../core/config";
-import { TrackedState } from "../../../core/tracked_state";
+import { MetaBuilding } from "../../meta_building";
+import { BaseHUDPart } from "../base_hud_part";
const toolbarBuildings = [
MetaBeltBaseBuilding,
- MetaMinerBuilding,
- MetaUndergroundBeltBuilding,
MetaSplitterBuilding,
+ MetaUndergroundBeltBuilding,
+ MetaMinerBuilding,
MetaCutterBuilding,
MetaRotaterBuilding,
MetaStackerBuilding,
diff --git a/src/js/game/key_action_mapper.js b/src/js/game/key_action_mapper.js
index 00e4db5a..d0a9913e 100644
--- a/src/js/game/key_action_mapper.js
+++ b/src/js/game/key_action_mapper.js
@@ -36,9 +36,9 @@ export const defaultKeybindings = {
toolbar: {
building_belt: { keyCode: key("1") },
- building_miner: { keyCode: key("2") },
+ building_splitter: { keyCode: key("2") },
building_underground_belt: { keyCode: key("3") },
- building_splitter: { keyCode: key("4") },
+ building_miner: { keyCode: key("4") },
building_cutter: { keyCode: key("5") },
building_rotater: { keyCode: key("6") },
building_stacker: { keyCode: key("7") },