Archives/tobspr_shapez.io
1
0
Fork 0
mirror of https://github.com/tobspr/shapez.io.git synced 2025-06-13 13:04:03 +00:00
Code Issues Projects Releases Wiki Activity

Changed name of setting to "abortPlacementOnDeletion".

Browse Source
This commit is contained in:
hexagonhexagon 2020-05-30 14:28:11 -04:00
parent 58ce3bcff3
commit b8bc895906
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/js/game/hud/parts/building_placer.js
View File

@ -131,12 +131,12 @@ export class HUDBuildingPlacer extends BaseHUDPart {
if (
button === enumMouseButton.right &&
(!this.currentMetaBuilding.get() ||
this.root.app.settings.getSetting("deletingDoesntClearCursor"))
!this.root.app.settings.getSetting("abortPlacementOnDeletion"))
) {
this.currentlyDragging = true;
this.currentlyDeleting = true;
this.lastDragTile = this.root.camera.screenToWorld(pos).toTileSpace();
if (!this.root.app.settings.getSetting("deletingDoesntClearCursor")) {
if (this.root.app.settings.getSetting("abortPlacementOnDeletion")) {
this.currentMetaBuilding.set(null);
}
return STOP_PROPAGATION;
@ -305,9 +305,9 @@ export class HUDBuildingPlacer extends BaseHUDPart {
this.buildingInfoElements.tutorialImage.setAttribute(
"data-icon",
"building_tutorials/" +
metaBuilding.getId() +
(variant === defaultBuildingVariant ? "" : "-" + variant) +
".png"
metaBuilding.getId() +
(variant === defaultBuildingVariant ? "" : "-" + variant) +
".png"
);
removeAllChildren(this.buildingInfoElements.additionalInfo);
@ -345,10 +345,10 @@ export class HUDBuildingPlacer extends BaseHUDPart {
T.ingame.buildingPlacement.cycleBuildingVariants.replace(
"<key>",
"<code class='keybinding'>" +
this.root.keyMapper
.getBinding(KEYMAPPINGS.placement.cycleBuildingVariants)
.getKeyCodeString() +
"</code>"
this.root.keyMapper
.getBinding(KEYMAPPINGS.placement.cycleBuildingVariants)
.getKeyCodeString() +
"</code>"
)
);
@ -443,7 +443,7 @@ export class HUDBuildingPlacer extends BaseHUDPart {
if (cancelAction) {
if (
this.currentMetaBuilding.get() &&
!this.root.app.settings.getSetting("deletingDoesntClearCursor")
this.root.app.settings.getSetting("abortPlacementOnDeletion")
) {
this.currentMetaBuilding.set(null);
} else {

12
src/js/profile/application_settings.js
View File

@ -111,13 +111,13 @@ export const allApplicationSettings = [
textGetter: rate => rate + " Hz",
category: categoryGame,
restartRequired: false,
changeCb: (app, id) => {},
changeCb: (app, id) => { },
enabled: !IS_DEMO,
}),
new BoolSetting("alwaysMultiplace", categoryGame, (app, value) => {}),
new BoolSetting("deletingDoesntClearCursor", categoryGame, (app, value) => {}),
new BoolSetting("offerHints", categoryGame, (app, value) => {}),
new BoolSetting("alwaysMultiplace", categoryGame, (app, value) => { }),
new BoolSetting("abortPlacementOnDeletion", categoryGame, (app, value) => { }),
new BoolSetting("offerHints", categoryGame, (app, value) => { }),
];
export function getApplicationSettingById(id) {
@ -135,7 +135,7 @@ class SettingsStorage {
this.refreshRate = "60";
this.alwaysMultiplace = false;
this.deletingDoesntClearCursor = false;
this.abortPlacementOnDeletion = true;
this.offerHints = true;
/**
@ -318,7 +318,7 @@ export class ApplicationSettings extends ReadWriteProxy {
}
if (data.version < 8) {
data.settings.deletingDoesntClearCursor = false;
data.settings.abortPlacementOnDeletion = true;
data.version = 8;
}

6
translations/base-en.yaml
View File

@ -542,10 +542,10 @@ settings:
description: >-
If enabled, all buildings will stay selected after placement until you cancel it. This is equivalent to holding SHIFT permanently.
deletingDoesntClearCursor:
title: Deleting doesn't clear cursor
abortPlacementOnDeletion:
title: Abort Placement on Deletion
description: >-
If enabled, buildings will stay selected when you are deleting objects, until you manually cancel it.
If enabled, building placement will be aborted whenever you try to delete a building.
offerHints:
title: Hints & Tutorials