cleaned up the clear buildings button code and renamed it to reset puzzle in all modes

src/js/game/buildings/block.js

@@ -22,6 +22,14 @@ export class MetaBlockBuilding extends MetaBuilding {
         return root.gameMode.getIsEditor();
     }
 
+    /**
+     * @param {import("../../savegame/savegame_serializer").GameRoot} root
+     * @returns {boolean}
+     */
+    getIsPuzzleRemovable(root) {
+        return false;
+    }
+
     /**
      * Creates the entity at the given location
      * @param {Entity} entity

src/js/game/buildings/constant_producer.js

@@ -26,6 +26,14 @@ export class MetaConstantProducerBuilding extends MetaBuilding {
         return root.gameMode.getIsEditor();
     }
 
+    /**
+     * @param {import("../../savegame/savegame_serializer").GameRoot} root
+     * @returns {boolean}
+     */
+    getIsPuzzleRemovable(root) {
+        return false;
+    }
+
     /**
      * Creates the entity at the given location
      * @param {Entity} entity

src/js/game/buildings/goal_acceptor.js

@@ -26,6 +26,14 @@ export class MetaGoalAcceptorBuilding extends MetaBuilding {
         return root.gameMode.getIsEditor();
     }
 
+    /**
+     * @param {import("../../savegame/savegame_serializer").GameRoot} root
+     * @returns {boolean}
+     */
+    getIsPuzzleRemovable(root) {
+        return false;
+    }
+
     /**
      * Creates the entity at the given location
      * @param {Entity} entity

src/js/game/hud/parts/mass_selector.js

@@ -1,6 +1,5 @@
 import { globalConfig } from "../../../core/config";
 import { DrawParameters } from "../../../core/draw_parameters";
-import { gMetaBuildingRegistry } from "../../../core/global_registries";
 import { createLogger } from "../../../core/logging";
 import { STOP_PROPAGATION } from "../../../core/signal";
 import { formatBigNumberFull } from "../../../core/utils";
@@ -8,8 +7,6 @@ import { Vector } from "../../../core/vector";
 import { ACHIEVEMENTS } from "../../../platform/achievement_provider";
 import { T } from "../../../translations";
 import { Blueprint } from "../../blueprint";
-import { MetaBlockBuilding } from "../../buildings/block";
-import { MetaConstantProducerBuilding } from "../../buildings/constant_producer";
 import { enumMouseButton } from "../../camera";
 import { Component } from "../../component";
 import { Entity } from "../../entity";

src/js/game/hud/parts/puzzle_editor_settings.js

@@ -1,14 +1,10 @@
 /* typehints:start */
 /* typehints:end */
 import { globalConfig } from "../../../core/config";
-import { gMetaBuildingRegistry } from "../../../core/global_registries";
 import { createLogger } from "../../../core/logging";
 import { Rectangle } from "../../../core/rectangle";
 import { makeDiv } from "../../../core/utils";
 import { T } from "../../../translations";
-import { MetaBlockBuilding } from "../../buildings/block";
-import { MetaConstantProducerBuilding } from "../../buildings/constant_producer";
-import { MetaGoalAcceptorBuilding } from "../../buildings/goal_acceptor";
 import { StaticMapEntityComponent } from "../../components/static_map_entity";
 import { PuzzleGameMode } from "../../modes/puzzle";
 import { BaseHUDPart } from "../base_hud_part";
@@ -50,7 +46,7 @@ export class HUDPuzzleEditorSettings extends BaseHUDPart {
                     </div>
 
                     <div class="buildingsButton">
-                        <button class="styledButton clearBuildings">${T.ingame.puzzleEditorSettings.clearBuildings}</button>
+                        <button class="styledButton resetPuzzle">${T.ingame.puzzleEditorSettings.resetPuzzle}</button>
                     </div>
 
                 </div>`
@@ -62,7 +58,7 @@ export class HUDPuzzleEditorSettings extends BaseHUDPart {
             bind(".zoneHeight .plus", () => this.modifyZone(0, 1));
             bind("button.trim", this.trim);
             bind("button.clearItems", this.clearItems);
-            bind("button.clearBuildings", this.clearBuildings);
+            bind("button.resetPuzzle", this.resetPuzzle);
         }
     }
 
@@ -70,15 +66,15 @@ export class HUDPuzzleEditorSettings extends BaseHUDPart {
         this.root.logic.clearAllBeltsAndItems();
     }
 
-    clearBuildings() {
+    resetPuzzle() {
         for (const entity of this.root.entityMgr.getAllWithComponent(StaticMapEntityComponent)) {
             const staticComp = entity.components.StaticMapEntity;
+            const goalComp = entity.components.GoalAcceptor;
 
-            if (
+            if (!staticComp.getMetaBuilding().getIsPuzzleRemovable(this.root)) {
-                [MetaGoalAcceptorBuilding, MetaConstantProducerBuilding, MetaBlockBuilding]
+                if (goalComp) {
-                    .map(metaClass => gMetaBuildingRegistry.findByClass(metaClass).id)
+                    goalComp.clear();
-                    .includes(staticComp.getMetaBuilding().id)
+                }
-            ) {
                 continue;
             }
 

src/js/game/hud/parts/puzzle_play_settings.js

@@ -1,10 +1,6 @@
-import { gMetaBuildingRegistry } from "../../../core/global_registries";
 import { createLogger } from "../../../core/logging";
 import { makeDiv } from "../../../core/utils";
 import { T } from "../../../translations";
-import { MetaBlockBuilding } from "../../buildings/block";
-import { MetaConstantProducerBuilding } from "../../buildings/constant_producer";
-import { MetaGoalAcceptorBuilding } from "../../buildings/goal_acceptor";
 import { StaticMapEntityComponent } from "../../components/static_map_entity";
 import { BaseHUDPart } from "../base_hud_part";
 
@@ -23,13 +19,13 @@ export class HUDPuzzlePlaySettings extends BaseHUDPart {
                 ["section"],
                 `
                         <button class="styledButton clearItems">${T.ingame.puzzleEditorSettings.clearItems}</button>
-                        <button class="styledButton clearBuildings">${T.ingame.puzzleEditorSettings.resetPuzzle}</button>
+                        <button class="styledButton resetPuzzle">${T.ingame.puzzleEditorSettings.resetPuzzle}</button>
 
                 `
             );
 
             bind("button.clearItems", this.clearItems);
-            bind("button.clearBuildings", this.clearBuildings);
+            bind("button.resetPuzzle", this.resetPuzzle);
         }
     }
 
@@ -37,15 +33,15 @@ export class HUDPuzzlePlaySettings extends BaseHUDPart {
         this.root.logic.clearAllBeltsAndItems();
     }
 
-    clearBuildings() {
+    resetPuzzle() {
         for (const entity of this.root.entityMgr.getAllWithComponent(StaticMapEntityComponent)) {
             const staticComp = entity.components.StaticMapEntity;
+            const goalComp = entity.components.GoalAcceptor;
 
-            if (
+            if (!staticComp.getMetaBuilding().getIsPuzzleRemovable(this.root)) {
-                [MetaGoalAcceptorBuilding, MetaConstantProducerBuilding, MetaBlockBuilding]
+                if (goalComp) {
-                    .map(metaClass => gMetaBuildingRegistry.findByClass(metaClass).id)
+                    goalComp.clear();
-                    .includes(staticComp.getMetaBuilding().id)
+                }
-            ) {
                 continue;
             }
 

src/js/game/meta_building.js

@@ -115,6 +115,15 @@ export class MetaBuilding {
         return true;
     }
 
+    /**
+     * Returns whether this building is removable in puzzle mode
+     * @param {GameRoot} root
+     * @returns {boolean}
+     */
+    getIsPuzzleRemovable(root) {
+        return true;
+    }
+
     /**
      * Returns the placement sound
      * @returns {string}

translations/base-en.yaml

@@ -632,7 +632,6 @@ ingame:
         zoneHeight: Height
         trimZone: Trim
         clearItems: Clear Items
-        clearBuildings: Clear Buildings
         resetPuzzle: Reset Puzzle
         share: Share
         report: Report