mirror of
https://github.com/tobspr/shapez.io.git
synced 2024-10-27 20:34:29 +00:00
Multiple fixes (see changelog)
This commit is contained in:
parent
1c717b0f37
commit
c434f7a59f
BIN
res/ui/icons/blueprint_marker_inverted.png
Normal file
BIN
res/ui/icons/blueprint_marker_inverted.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 2.1 KiB |
BIN
res/ui/icons/current_goal_marker_inverted.png
Normal file
BIN
res/ui/icons/current_goal_marker_inverted.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 2.2 KiB |
@ -58,11 +58,20 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&:not(.placementActive) .binding.placementOnly {
|
&:not(.placementActive) .binding.placementOnly,
|
||||||
|
&.mapOverviewActive .binding.placementOnly {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
&.placementActive .noPlacementOnly {
|
&.placementActive:not(.mapOverviewActive) .noPlacementOnly {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
&:not(.mapOverviewActive) .binding.overviewOnly {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
&.mapOverviewActive .noOverviewOnly {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -74,8 +74,7 @@
|
|||||||
|
|
||||||
&.goal,
|
&.goal,
|
||||||
&.blueprint {
|
&.blueprint {
|
||||||
.amountLabel {
|
.amountLabel::after {
|
||||||
&::after {
|
|
||||||
content: " ";
|
content: " ";
|
||||||
position: absolute;
|
position: absolute;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
@ -83,16 +82,32 @@
|
|||||||
@include S(height, 8px);
|
@include S(height, 8px);
|
||||||
@include S(top, 4px);
|
@include S(top, 4px);
|
||||||
@include S(left, -7px);
|
@include S(left, -7px);
|
||||||
background: uiResource("icons/current_goal_marker.png") center center / contain no-repeat;
|
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 {
|
&.blueprint .amountLabel {
|
||||||
|
&::after {
|
||||||
background-image: uiResource("icons/blueprint_marker.png");
|
background-image: uiResource("icons/blueprint_marker.png");
|
||||||
background-size: 90%;
|
background-size: 90%;
|
||||||
}
|
}
|
||||||
|
@include DarkThemeOverride {
|
||||||
|
&::after {
|
||||||
|
background-image: uiResource("icons/blueprint_marker_inverted.png") !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -29,7 +29,7 @@
|
|||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
max-height: 90vh;
|
max-height: 100vh;
|
||||||
|
|
||||||
color: #fff;
|
color: #fff;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
@ -55,7 +55,7 @@
|
|||||||
.subTitle {
|
.subTitle {
|
||||||
@include PlainText;
|
@include PlainText;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
@include S(margin, 0px, 0, 20px);
|
@include S(margin, 5px, 0, 20px);
|
||||||
color: $colorGreenBright;
|
color: $colorGreenBright;
|
||||||
|
|
||||||
@include S(border-radius, $globalBorderRadius);
|
@include S(border-radius, $globalBorderRadius);
|
||||||
|
@ -5,6 +5,10 @@ export const CHANGELOG = [
|
|||||||
entries: [
|
entries: [
|
||||||
"Support for translations! Interested in helping out? Check out the <a target='_blank' href='https://github.com/tobspr/shapez.io/tree/master/translations'>translation guide</a>!",
|
"Support for translations! Interested in helping out? Check out the <a target='_blank' href='https://github.com/tobspr/shapez.io/tree/master/translations'>translation guide</a>!",
|
||||||
"Update stacker artwork to clarify how it works",
|
"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)",
|
"Make shapes unpinnable in the upgrades tab (By hexy)",
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
|
@ -92,9 +92,9 @@ export const globalConfig = {
|
|||||||
// disableZoomLimits: true,
|
// disableZoomLimits: true,
|
||||||
// showChunkBorders: true,
|
// showChunkBorders: true,
|
||||||
// rewardsInstant: true,
|
// rewardsInstant: true,
|
||||||
allBuildingsUnlocked: true,
|
// allBuildingsUnlocked: true,
|
||||||
blueprintsNoCost: true,
|
// blueprintsNoCost: true,
|
||||||
upgradesNoCost: true,
|
// upgradesNoCost: true,
|
||||||
// disableUnlockDialog: true,
|
// disableUnlockDialog: true,
|
||||||
// disableLogicTicks: true,
|
// disableLogicTicks: true,
|
||||||
// testClipping: true,
|
// testClipping: true,
|
||||||
|
@ -151,6 +151,11 @@ export class HUDBuildingsToolbar extends BaseHUDPart {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (this.root.camera.getIsMapOverlayActive()) {
|
||||||
|
this.root.soundProxy.playUiError();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// Allow clicking an item again to deselect it
|
// Allow clicking an item again to deselect it
|
||||||
for (const buildingId in this.buildingHandles) {
|
for (const buildingId in this.buildingHandles) {
|
||||||
const handle = this.buildingHandles[buildingId];
|
const handle = this.buildingHandles[buildingId];
|
||||||
|
@ -2,6 +2,7 @@ import { makeDiv } from "../../../core/utils";
|
|||||||
import { T } from "../../../translations";
|
import { T } from "../../../translations";
|
||||||
import { getStringForKeyCode, KEYMAPPINGS } from "../../key_action_mapper";
|
import { getStringForKeyCode, KEYMAPPINGS } from "../../key_action_mapper";
|
||||||
import { BaseHUDPart } from "../base_hud_part";
|
import { BaseHUDPart } from "../base_hud_part";
|
||||||
|
import { TrackedState } from "../../../core/tracked_state";
|
||||||
|
|
||||||
export class HUDKeybindingOverlay extends BaseHUDPart {
|
export class HUDKeybindingOverlay extends BaseHUDPart {
|
||||||
initialize() {
|
initialize() {
|
||||||
@ -9,6 +10,8 @@ export class HUDKeybindingOverlay extends BaseHUDPart {
|
|||||||
this.onSelectedBuildingForPlacementChanged,
|
this.onSelectedBuildingForPlacementChanged,
|
||||||
this
|
this
|
||||||
);
|
);
|
||||||
|
|
||||||
|
this.trackedMapOverviewActive = new TrackedState(this.applyCssClasses, this);
|
||||||
}
|
}
|
||||||
|
|
||||||
createElements(parent) {
|
createElements(parent) {
|
||||||
@ -35,11 +38,17 @@ export class HUDKeybindingOverlay extends BaseHUDPart {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
<div class="binding noPlacementOnly">
|
<div class="binding noPlacementOnly noOverviewOnly">
|
||||||
<code class="keybinding rightMouse"></code>
|
<code class="keybinding rightMouse"></code>
|
||||||
<label>${T.ingame.keybindingsOverlay.delete}</label>
|
<label>${T.ingame.keybindingsOverlay.delete}</label>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="binding noPlacementOnly overviewOnly">
|
||||||
|
<code class="keybinding rightMouse"></code>
|
||||||
|
<label>${T.ingame.keybindingsOverlay.createMarker}</label>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<div class="binding noPlacementOnly">
|
<div class="binding noPlacementOnly">
|
||||||
<code class="keybinding builtinKey">${getKeycode(
|
<code class="keybinding builtinKey">${getKeycode(
|
||||||
KEYMAPPINGS.massSelect.massSelectStart
|
KEYMAPPINGS.massSelect.massSelectStart
|
||||||
@ -65,12 +74,17 @@ export class HUDKeybindingOverlay extends BaseHUDPart {
|
|||||||
<label>${T.ingame.keybindingsOverlay.rotateBuilding}</label>
|
<label>${T.ingame.keybindingsOverlay.rotateBuilding}</label>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
` +
|
||||||
|
(this.root.app.settings.getAllSettings().alwaysMultiplace
|
||||||
|
? ""
|
||||||
|
: `
|
||||||
<div class="binding placementOnly">
|
<div class="binding placementOnly">
|
||||||
<code class="keybinding builtinKey shift">${getKeycode(
|
<code class="keybinding builtinKey shift">${getKeycode(
|
||||||
KEYMAPPINGS.placementModifiers.placeMultiple
|
KEYMAPPINGS.placementModifiers.placeMultiple
|
||||||
)}</code>
|
)}</code>
|
||||||
<label>${T.ingame.keybindingsOverlay.placeMultiple}</label>
|
<label>${T.ingame.keybindingsOverlay.placeMultiple}</label>
|
||||||
</div>
|
</div>`) +
|
||||||
|
`
|
||||||
`
|
`
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@ -79,5 +93,11 @@ export class HUDKeybindingOverlay extends BaseHUDPart {
|
|||||||
this.element.classList.toggle("placementActive", !!selectedMetaBuilding);
|
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());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -253,14 +253,14 @@ dialogs:
|
|||||||
blueprintsNotUnlocked:
|
blueprintsNotUnlocked:
|
||||||
title: Not unlocked yet
|
title: Not unlocked yet
|
||||||
desc: >-
|
desc: >-
|
||||||
Blueprints have not been unlocked yet! Complete more levels to unlock them.
|
Complete level 12 to unlock Blueprints!
|
||||||
|
|
||||||
keybindingsIntroduction:
|
keybindingsIntroduction:
|
||||||
title: Useful keybindings
|
title: Useful keybindings
|
||||||
desc: >-
|
desc: >-
|
||||||
This game has a lot of keybindings which make it easier to build big factories.
|
This game has a lot of keybindings which make it easier to build big factories.
|
||||||
Here are a few, but be sure to <strong>check out the keybindings</strong>!<br><br>
|
Here are a few, but be sure to <strong>check out the keybindings</strong>!<br><br>
|
||||||
<code class='keybinding'>CTRL</code> + Drag: Select area to copy / delete.<br>
|
<code class='keybinding'>CTRL</code> + Drag: Select area to delete.<br>
|
||||||
<code class='keybinding'>SHIFT</code>: Hold to place multiple of one building.<br>
|
<code class='keybinding'>SHIFT</code>: Hold to place multiple of one building.<br>
|
||||||
<code class='keybinding'>ALT</code>: Invert orientation of placed belts.<br>
|
<code class='keybinding'>ALT</code>: Invert orientation of placed belts.<br>
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user