diff --git a/res/ui/icons/blueprint_marker_inverted.png b/res/ui/icons/blueprint_marker_inverted.png new file mode 100644 index 00000000..79140f19 Binary files /dev/null and b/res/ui/icons/blueprint_marker_inverted.png differ diff --git a/res/ui/icons/current_goal_marker_inverted.png b/res/ui/icons/current_goal_marker_inverted.png new file mode 100644 index 00000000..327ce170 Binary files /dev/null and b/res/ui/icons/current_goal_marker_inverted.png differ diff --git a/src/css/ingame_hud/keybindings_overlay.scss b/src/css/ingame_hud/keybindings_overlay.scss index 5a238f81..d6235406 100644 --- a/src/css/ingame_hud/keybindings_overlay.scss +++ b/src/css/ingame_hud/keybindings_overlay.scss @@ -58,11 +58,20 @@ } } - &:not(.placementActive) .binding.placementOnly { + &:not(.placementActive) .binding.placementOnly, + &.mapOverviewActive .binding.placementOnly { display: none; } - &.placementActive .noPlacementOnly { + &.placementActive:not(.mapOverviewActive) .noPlacementOnly { + display: none; + } + + &:not(.mapOverviewActive) .binding.overviewOnly { + display: none; + } + + &.mapOverviewActive .noOverviewOnly { display: none; } diff --git a/src/css/ingame_hud/pinned_shapes.scss b/src/css/ingame_hud/pinned_shapes.scss index 1c944e35..c11d9b64 100644 --- a/src/css/ingame_hud/pinned_shapes.scss +++ b/src/css/ingame_hud/pinned_shapes.scss @@ -74,24 +74,39 @@ &.goal, &.blueprint { - .amountLabel { - &::after { - content: " "; - position: absolute; - display: inline-block; - @include S(width, 8px); - @include S(height, 8px); - @include S(top, 4px); - @include S(left, -7px); - background: uiResource("icons/current_goal_marker.png") center center / contain no-repeat; + .amountLabel::after { + content: " "; + position: absolute; + display: inline-block; + @include S(width, 8px); + @include S(height, 8px); + @include S(top, 4px); + @include S(left, -7px); + background: center center / contain no-repeat; + } - @include DarkThemeInvert; + &.goal .amountLabel { + &::after { + background-image: uiResource("icons/current_goal_marker.png"); + background-size: 90%; + } + @include DarkThemeOverride { + &::after { + background-image: uiResource("icons/current_goal_marker_inverted.png") !important; + } } } - &.blueprint .amountLabel::after { - background-image: uiResource("icons/blueprint_marker.png"); - background-size: 90%; + &.blueprint .amountLabel { + &::after { + background-image: uiResource("icons/blueprint_marker.png"); + background-size: 90%; + } + @include DarkThemeOverride { + &::after { + background-image: uiResource("icons/blueprint_marker_inverted.png") !important; + } + } } } } diff --git a/src/css/ingame_hud/unlock_notification.scss b/src/css/ingame_hud/unlock_notification.scss index 0750bd6f..56720d7a 100644 --- a/src/css/ingame_hud/unlock_notification.scss +++ b/src/css/ingame_hud/unlock_notification.scss @@ -29,7 +29,7 @@ display: flex; align-items: center; flex-direction: column; - max-height: 90vh; + max-height: 100vh; color: #fff; text-align: center; @@ -55,7 +55,7 @@ .subTitle { @include PlainText; display: inline-block; - @include S(margin, 0px, 0, 20px); + @include S(margin, 5px, 0, 20px); color: $colorGreenBright; @include S(border-radius, $globalBorderRadius); diff --git a/src/js/changelog.js b/src/js/changelog.js index f3397810..218be1b4 100644 --- a/src/js/changelog.js +++ b/src/js/changelog.js @@ -5,6 +5,10 @@ export const CHANGELOG = [ entries: [ "Support for translations! Interested in helping out? Check out the translation guide!", "Update stacker artwork to clarify how it works", + "Update keybinding hints on the top left to be more accurate", + "Make it more clear when blueprints are unlocked when trying to use them", + "Fix pinned shape icons not being visible in dark mode", + "Fix being able to select buildings via hotkeys in map overview mode", "Make shapes unpinnable in the upgrades tab (By hexy)", ], }, diff --git a/src/js/core/config.js b/src/js/core/config.js index 540bccfd..1fad8e2e 100644 --- a/src/js/core/config.js +++ b/src/js/core/config.js @@ -92,9 +92,9 @@ export const globalConfig = { // disableZoomLimits: true, // showChunkBorders: true, // rewardsInstant: true, - allBuildingsUnlocked: true, - blueprintsNoCost: true, - upgradesNoCost: true, + // allBuildingsUnlocked: true, + // blueprintsNoCost: true, + // upgradesNoCost: true, // disableUnlockDialog: true, // disableLogicTicks: true, // testClipping: true, diff --git a/src/js/game/hud/parts/buildings_toolbar.js b/src/js/game/hud/parts/buildings_toolbar.js index 691185c9..305d3eee 100644 --- a/src/js/game/hud/parts/buildings_toolbar.js +++ b/src/js/game/hud/parts/buildings_toolbar.js @@ -151,6 +151,11 @@ export class HUDBuildingsToolbar extends BaseHUDPart { return; } + if (this.root.camera.getIsMapOverlayActive()) { + this.root.soundProxy.playUiError(); + return; + } + // Allow clicking an item again to deselect it for (const buildingId in this.buildingHandles) { const handle = this.buildingHandles[buildingId]; diff --git a/src/js/game/hud/parts/keybinding_overlay.js b/src/js/game/hud/parts/keybinding_overlay.js index 05455065..25774305 100644 --- a/src/js/game/hud/parts/keybinding_overlay.js +++ b/src/js/game/hud/parts/keybinding_overlay.js @@ -2,6 +2,7 @@ import { makeDiv } from "../../../core/utils"; import { T } from "../../../translations"; import { getStringForKeyCode, KEYMAPPINGS } from "../../key_action_mapper"; import { BaseHUDPart } from "../base_hud_part"; +import { TrackedState } from "../../../core/tracked_state"; export class HUDKeybindingOverlay extends BaseHUDPart { initialize() { @@ -9,6 +10,8 @@ export class HUDKeybindingOverlay extends BaseHUDPart { this.onSelectedBuildingForPlacementChanged, this ); + + this.trackedMapOverviewActive = new TrackedState(this.applyCssClasses, this); } createElements(parent) { @@ -35,10 +38,16 @@ export class HUDKeybindingOverlay extends BaseHUDPart { -
+
+ +
+ + +
+
${getKeycode( @@ -65,12 +74,17 @@ export class HUDKeybindingOverlay extends BaseHUDPart {
+ ` + + (this.root.app.settings.getAllSettings().alwaysMultiplace + ? "" + : `
${getKeycode( KEYMAPPINGS.placementModifiers.placeMultiple )} -
+
`) + + ` ` ); } @@ -79,5 +93,11 @@ export class HUDKeybindingOverlay extends BaseHUDPart { this.element.classList.toggle("placementActive", !!selectedMetaBuilding); } - update() {} + applyCssClasses() { + this.element.classList.toggle("mapOverviewActive", this.root.camera.getIsMapOverlayActive()); + } + + update() { + this.trackedMapOverviewActive.set(this.root.camera.getIsMapOverlayActive()); + } } diff --git a/translations/base-en.yaml b/translations/base-en.yaml index 7f529537..bfc0f3c5 100644 --- a/translations/base-en.yaml +++ b/translations/base-en.yaml @@ -253,14 +253,14 @@ dialogs: blueprintsNotUnlocked: title: Not unlocked yet desc: >- - Blueprints have not been unlocked yet! Complete more levels to unlock them. + Complete level 12 to unlock Blueprints! keybindingsIntroduction: title: Useful keybindings desc: >- This game has a lot of keybindings which make it easier to build big factories. Here are a few, but be sure to check out the keybindings!

- CTRL + Drag: Select area to copy / delete.
+ CTRL + Drag: Select area to delete.
SHIFT: Hold to place multiple of one building.
ALT: Invert orientation of placed belts.