From 9d8f3fed6d55b42dbfec014bb255d3d6f4e212de Mon Sep 17 00:00:00 2001 From: TcePrepK <56453014+TcePrepK@users.noreply.github.com> Date: Sat, 7 Nov 2020 21:42:39 +0300 Subject: [PATCH] Revert "Testing Some Random Things Because Why Not" This reverts commit 5df1c330fd80e9fa11059266fc409a98c25879c7. --- src/css/resources.scss | 4 ++-- src/js/game/game_system_manager.js | 1 - src/js/game/hud/parts/buildings_toolbar.js | 2 -- src/js/game/key_action_mapper.js | 1 - src/js/game/meta_building_registry.js | 6 ------ 5 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/css/resources.scss b/src/css/resources.scss index 9412c83e..08bfa43f 100644 --- a/src/css/resources.scss +++ b/src/css/resources.scss @@ -1,5 +1,5 @@ $buildings: belt, cutter, miner, mixer, painter, rotater, balancer, stacker, trash, underground_belt, wire, - constant_signal, logic_gate, lever, filter, wire_tunnel, display, wireless_display, virtual_processor, reader, storage, + constant_signal, logic_gate, lever, filter, wire_tunnel, display, virtual_processor, reader, storage, transistor, analyzer, comparator, item_producer; @each $building in $buildings { @@ -11,7 +11,7 @@ $buildings: belt, cutter, miner, mixer, painter, rotater, balancer, stacker, tra $buildingsAndVariants: belt, balancer, underground_belt, underground_belt-tier2, miner, miner-chainable, cutter, cutter-quad, rotater, rotater-ccw, stacker, mixer, painter-double, painter-quad, trash, storage, - reader, rotater-rotate180, display, wireless_display, wireless_display-remote_control, constant_signal, wire, wire_tunnel, logic_gate-or, logic_gate-not, + reader, rotater-rotate180, display, constant_signal, wire, wire_tunnel, logic_gate-or, logic_gate-not, logic_gate-xor, analyzer, virtual_processor-rotater, virtual_processor-unstacker, item_producer, virtual_processor-stacker, virtual_processor-painter, wire-second, painter, painter-mirrored, comparator; @each $building in $buildingsAndVariants { diff --git a/src/js/game/game_system_manager.js b/src/js/game/game_system_manager.js index 6bcc44b1..5298ef18 100644 --- a/src/js/game/game_system_manager.js +++ b/src/js/game/game_system_manager.js @@ -20,7 +20,6 @@ import { ConstantSignalSystem } from "./systems/constant_signal"; import { LogicGateSystem } from "./systems/logic_gate"; import { LeverSystem } from "./systems/lever"; import { DisplaySystem } from "./systems/display"; -import { WirelessDisplaySystem } from "./systems/wireless_display"; import { ItemProcessorOverlaysSystem } from "./systems/item_processor_overlays"; import { BeltReaderSystem } from "./systems/belt_reader"; import { FilterSystem } from "./systems/filter"; diff --git a/src/js/game/hud/parts/buildings_toolbar.js b/src/js/game/hud/parts/buildings_toolbar.js index bed5c80f..05ffc795 100644 --- a/src/js/game/hud/parts/buildings_toolbar.js +++ b/src/js/game/hud/parts/buildings_toolbar.js @@ -1,7 +1,6 @@ import { MetaBeltBuilding } from "../../buildings/belt"; import { MetaCutterBuilding } from "../../buildings/cutter"; import { MetaDisplayBuilding } from "../../buildings/display"; -import { MetaWirelessDisplayBuilding } from "../../buildings/wireless_display"; import { MetaFilterBuilding } from "../../buildings/filter"; import { MetaLeverBuilding } from "../../buildings/lever"; import { MetaMinerBuilding } from "../../buildings/miner"; @@ -40,7 +39,6 @@ export class HUDBuildingsToolbar extends HUDBaseToolbar { MetaLeverBuilding, MetaFilterBuilding, MetaDisplayBuilding, - MetaWirelessDisplayBuilding, ], visibilityCondition: () => !this.root.camera.getIsMapOverlayActive() && this.root.currentLayer === "regular", diff --git a/src/js/game/key_action_mapper.js b/src/js/game/key_action_mapper.js index 0c8bbac8..9fa4ffe1 100644 --- a/src/js/game/key_action_mapper.js +++ b/src/js/game/key_action_mapper.js @@ -65,7 +65,6 @@ export const KEYMAPPINGS = { lever: { keyCode: key("I") }, filter: { keyCode: key("O") }, display: { keyCode: key("P") }, - wireless_display: { keyCode: key("K") }, // Wires toolbar wire: { keyCode: key("1") }, diff --git a/src/js/game/meta_building_registry.js b/src/js/game/meta_building_registry.js index bad02223..33e157ee 100644 --- a/src/js/game/meta_building_registry.js +++ b/src/js/game/meta_building_registry.js @@ -8,7 +8,6 @@ import { MetaComparatorBuilding } from "./buildings/comparator"; import { MetaConstantSignalBuilding } from "./buildings/constant_signal"; import { enumCutterVariants, MetaCutterBuilding } from "./buildings/cutter"; import { MetaDisplayBuilding } from "./buildings/display"; -import { enumWirelessDisplayVariants, MetaWirelessDisplayBuilding } from "./buildings/wireless_display"; import { MetaFilterBuilding } from "./buildings/filter"; import { MetaHubBuilding } from "./buildings/hub"; import { MetaItemProducerBuilding } from "./buildings/item_producer"; @@ -54,7 +53,6 @@ export function initMetaBuildingRegistry() { gMetaBuildingRegistry.register(MetaFilterBuilding); gMetaBuildingRegistry.register(MetaWireTunnelBuilding); gMetaBuildingRegistry.register(MetaDisplayBuilding); - gMetaBuildingRegistry.register(MetaWirelessDisplayBuilding); gMetaBuildingRegistry.register(MetaVirtualProcessorBuilding); gMetaBuildingRegistry.register(MetaReaderBuilding); gMetaBuildingRegistry.register(MetaTransistorBuilding); @@ -167,10 +165,6 @@ export function initMetaBuildingRegistry() { // Item producer registerBuildingVariant(61, MetaItemProducerBuilding); - // Wireless Display - registerBuildingVariant(62, MetaWirelessDisplayBuilding); - registerBuildingVariant(63, MetaWirelessDisplayBuilding, enumWirelessDisplayVariants.remote_control); - // Propagate instances for (const key in gBuildingVariants) { gBuildingVariants[key].metaInstance = gMetaBuildingRegistry.findByClass(