diff --git a/src/js/game/buildings/wire.js b/src/js/game/buildings/wire.js index d57ffc25..5a96b271 100644 --- a/src/js/game/buildings/wire.js +++ b/src/js/game/buildings/wire.js @@ -37,6 +37,7 @@ const enumWireVariantToVariant = { export class MetaWireBuilding extends MetaBuilding { constructor() { super("wire"); + this.a = "a"; } getHasDirectionLockAvailable() { @@ -177,7 +178,6 @@ export class MetaWireBuilding extends MetaBuilding { // First, reset rotation rotation = 0; - switch (flag) { case 0b0000: // Nothing diff --git a/src/js/game/buildings/wireless_display.js b/src/js/game/buildings/wireless_display.js index 51054078..f0779ff5 100644 --- a/src/js/game/buildings/wireless_display.js +++ b/src/js/game/buildings/wireless_display.js @@ -1,6 +1,5 @@ import { enumDirection, Vector } from "../../core/vector"; import { enumPinSlotType, WiredPinsComponent } from "../components/wired_pins"; -import { WirelessCodeComponent } from "../components/wireless_code"; import { Entity } from "../entity"; import { defaultBuildingVariant, MetaBuilding } from "../meta_building"; import { GameRoot } from "../root"; diff --git a/src/js/game/components/wireless_code.js b/src/js/game/components/wireless_code.js index 77e7ec46..2c732e22 100644 --- a/src/js/game/components/wireless_code.js +++ b/src/js/game/components/wireless_code.js @@ -1,9 +1,5 @@ -import { enumDirection, Vector } from "../../core/vector"; -import { BaseItem } from "../base_item"; import { Component } from "../component"; import { types } from "../../savegame/serialization"; -import { typeItemSingleton } from "../item_resolver"; -import { gComponentRegistry } from "../../core/global_registries"; export class WirelessCodeComponent extends Component { static getId() { @@ -24,8 +20,4 @@ export class WirelessCodeComponent extends Component { super(); this.wireless_code = id; } - - getWirelessCode() { - return this.wireless_code; - } } diff --git a/src/js/game/entity_manager.js b/src/js/game/entity_manager.js index e71900d0..b4101fc8 100644 --- a/src/js/game/entity_manager.js +++ b/src/js/game/entity_manager.js @@ -74,7 +74,6 @@ export class EntityManager extends BasicSerializableObject { this.entities.push(entity); - //console.log(entity.components); // Register into the componentToEntity map for (const componentId in entity.components) { if (entity.components[componentId]) { diff --git a/src/js/game/logic.js b/src/js/game/logic.js index 923af47c..9951ca36 100644 --- a/src/js/game/logic.js +++ b/src/js/game/logic.js @@ -79,7 +79,7 @@ export class GameLogic { } // Perform additional placement checks - if (this.root.signals.prePlacementCheck.dispatch(entity, offset) === STOP_PROPAGATION && !entity.components.Wire) { + if (this.root.signals.prePlacementCheck.dispatch(entity, offset) === STOP_PROPAGATION) { return false; } diff --git a/src/js/game/meta_building.js b/src/js/game/meta_building.js index bf50ee23..a2ba3307 100644 --- a/src/js/game/meta_building.js +++ b/src/js/game/meta_building.js @@ -6,8 +6,6 @@ import { StaticMapEntityComponent } from "./components/static_map_entity"; import { Entity } from "./entity"; import { GameRoot } from "./root"; import { getCodeFromBuildingData } from "./building_codes"; -import { WirelessCodeComponent } from "./components/wireless_code"; -import { WirelessDisplayComponent } from "./components/wireless_display"; export const defaultBuildingVariant = "default"; diff --git a/src/js/game/systems/wireless_display.js b/src/js/game/systems/wireless_display.js index 244a4d06..53ed572a 100644 --- a/src/js/game/systems/wireless_display.js +++ b/src/js/game/systems/wireless_display.js @@ -7,20 +7,13 @@ import { GameSystemWithFilter } from "../game_system_with_filter"; import { isTrueItem } from "../items/boolean_item"; import { ColorItem, COLOR_ITEM_SINGLETONS } from "../items/color_item"; import { MapChunkView } from "../map_chunk_view"; -import trim from "trim"; import { THIRDPARTY_URLS } from "../../core/config"; import { DialogWithForm } from "../../core/modal_dialog_elements"; import { FormElementInput, FormElementItemChooser } from "../../core/modal_dialog_forms"; import { fillInLinkIntoTranslation } from "../../core/utils"; import { T } from "../../translations"; import { Entity } from "../entity"; -import { ShapeDefinition } from "../shape_definition"; -import { BOOL_FALSE_SINGLETON, BOOL_TRUE_SINGLETON } from "../items/boolean_item"; -import { init } from "logrocket"; -import { Signal } from "../../core/signal"; -import { serializeError } from "../../core/logging"; import { WirelessCodeComponent } from "../components/wireless_code"; -import { enumInvertedDirections } from "../../core/vector"; export class WirelessDisplaySystem extends GameSystemWithFilter { constructor(root) {