Archives/tobspr_shapez.io
1
0
Fork 0
mirror of https://github.com/tobspr/shapez.io.git synced 2026-02-12 10:59:23 +00:00
Code Issues Projects Releases Wiki Activity

Fixed issues and regained compatibility with other PR's

Browse Source
This commit is contained in:
Sense101 2021-07-27 20:00:42 +01:00
parent bca7440f14
commit 2442d6d655
7 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/js/game/buildings/block.js
View File

@ -19,7 +19,8 @@ export class MetaBlockBuilding extends MetaBuilding {
* @returns
*/
getIsRemovable(root) {
return root.gameMode.getIsEditor();
const settings = root.hud.parts.puzzleEditorSettings;
return settings ? !settings.getIsTestMode() : false;
}
/**

3
src/js/game/buildings/constant_producer.js
View File

@ -23,7 +23,8 @@ export class MetaConstantProducerBuilding extends MetaBuilding {
* @returns
*/
getIsRemovable(root) {
return root.gameMode.getIsEditor();
const settings = root.hud.parts.puzzleEditorSettings;
return settings ? !settings.getIsTestMode() : false;
}
/**

3
src/js/game/buildings/goal_acceptor.js
View File

@ -23,7 +23,8 @@ export class MetaGoalAcceptorBuilding extends MetaBuilding {
* @returns
*/
getIsRemovable(root) {
return root.gameMode.getIsEditor();
const settings = root.hud.parts.puzzleEditorSettings;
return settings ? !settings.getIsTestMode() : false;
}
/**

6
src/js/game/hud/parts/base_toolbar.js
View File

@ -123,7 +123,8 @@ export class HUDBaseToolbar extends BaseHUDPart {
});
//lock icon for puzzle editor
if (this.root.gameMode.getIsEditor()) {
const settings = this.root.hud.parts.puzzleEditorSettings;
if (settings && !settings.getIsTestMode()) {
itemContainer.classList.toggle("editor", true);
if (!this.inRequiredBuildings(metaBuilding)) {
const puzzleLock = makeDiv(itemContainer, null, ["puzzle-lock"]);
@ -260,7 +261,8 @@ export class HUDBaseToolbar extends BaseHUDPart {
const handle = this.buildingHandles[metaBuilding.getId()];
if (handle.puzzleLocked) {
if (this.root.gameMode.getIsEditor()) {
const settings = this.root.hud.parts.puzzleEditorSettings;
if (settings && !settings.getIsTestMode()) {
handle.puzzleLocked = false;
handle.element.classList.toggle("unlocked", false);
this.root.soundProxy.playUiClick();

6
src/js/game/hud/parts/puzzle_editor_settings.js
View File

@ -116,7 +116,7 @@ export class HUDPuzzleEditorSettings extends BaseHUDPart {
this.root.entityMgr.destroyEntity(entity);
}
this.root.entityMgr.processDestroyList();
} else if (this.storedSolution.length) {
} else if (this.storedSolution.length > 0) {
this.root.logic.performBulkOperation(() => {
this.root.logic.performImmutableOperation(() => {
for (const entity of this.root.entityMgr.getAllWithComponent(StaticMapEntityComponent)) {
@ -275,4 +275,8 @@ export class HUDPuzzleEditorSettings extends BaseHUDPart {
this.element.querySelector(".zoneWidth > .value").textContent = String(mode.zoneWidth);
this.element.querySelector(".zoneHeight > .value").textContent = String(mode.zoneHeight);
}
getIsTestMode() {
return this.testMode;
}
}

4
src/js/game/modes/puzzle_edit.js
View File

@ -68,8 +68,6 @@ export class PuzzleEditGameMode extends PuzzleGameMode {
}
getIsEditor() {
/** @type {HUDPuzzleEditorSettings} */
const editSettings = this.root.hud.parts.puzzleEditorSettings;
return !editSettings.testMode;
return true;
}
}

3
src/js/game/systems/item_processor.js
View File

@ -582,7 +582,8 @@ export class ItemProcessorSystem extends GameSystemWithFilter {
);
}
if (this.root.gameMode.getIsEditor()) {
const settings = this.root.hud.parts.puzzleEditorSettings;
if (settings && !settings.getIsTestMode()) {
// while playing in editor, assign the item
goalComp.item = item;
}