From 03f85e6871603e9984aecb43c98d27797c1859fa Mon Sep 17 00:00:00 2001 From: Christopher-Robin Date: Fri, 9 Oct 2020 02:00:21 +1100 Subject: [PATCH] Added Third wire variant --- src/css/resources.scss | 2 +- src/js/game/buildings/wire.js | 4 +++- src/js/game/components/wire.js | 1 + src/js/game/meta_building_registry.js | 7 ++++++- translations/base-en.yaml | 4 ++++ 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/css/resources.scss b/src/css/resources.scss index 08bfa43f..3fa0bdf6 100644 --- a/src/css/resources.scss +++ b/src/css/resources.scss @@ -13,7 +13,7 @@ $buildingsAndVariants: belt, balancer, underground_belt, underground_belt-tier2, cutter, cutter-quad, rotater, rotater-ccw, stacker, mixer, painter-double, painter-quad, trash, storage, 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; + virtual_processor-stacker, virtual_processor-painter, wire-second, wire-third, painter, painter-mirrored, comparator; @each $building in $buildingsAndVariants { [data-icon="building_tutorials/#{$building}.png"] { /* @load-async */ diff --git a/src/js/game/buildings/wire.js b/src/js/game/buildings/wire.js index 61b75073..de9317e9 100644 --- a/src/js/game/buildings/wire.js +++ b/src/js/game/buildings/wire.js @@ -25,11 +25,13 @@ export const wireOverlayMatrices = { /** @enum {string} */ export const wireVariants = { second: "second", + third: "third" }; const enumWireVariantToVariant = { [defaultBuildingVariant]: enumWireVariant.first, [wireVariants.second]: enumWireVariant.second, + [wireVariants.third]: enumWireVariant.third, }; export class MetaWireBuilding extends MetaBuilding { @@ -46,7 +48,7 @@ export class MetaWireBuilding extends MetaBuilding { } getAvailableVariants() { - return [defaultBuildingVariant, wireVariants.second]; + return [defaultBuildingVariant, wireVariants.second, wireVariants.third]; } getDimensions() { diff --git a/src/js/game/components/wire.js b/src/js/game/components/wire.js index d0e354e2..057ea5d0 100644 --- a/src/js/game/components/wire.js +++ b/src/js/game/components/wire.js @@ -12,6 +12,7 @@ export const enumWireType = { export const enumWireVariant = { first: "first", second: "second", + third: "third", }; export class WireComponent extends Component { diff --git a/src/js/game/meta_building_registry.js b/src/js/game/meta_building_registry.js index 0613103e..3816c043 100644 --- a/src/js/game/meta_building_registry.js +++ b/src/js/game/meta_building_registry.js @@ -121,7 +121,12 @@ export function initMetaBuildingRegistry() { registerBuildingVariant(52, MetaWireBuilding, enumWireVariant.second, 0); registerBuildingVariant(53, MetaWireBuilding, enumWireVariant.second, 1); registerBuildingVariant(54, MetaWireBuilding, enumWireVariant.second, 2); - registerBuildingVariant(55, MetaWireBuilding, enumWireVariant.second, 3); + registerBuildingVariant(55, MetaWireBuilding, enumWireVariant.second, 3); + + registerBuildingVariant(62, MetaWireBuilding, enumWireVariant.third, 0); + registerBuildingVariant(63, MetaWireBuilding, enumWireVariant.third, 1); + registerBuildingVariant(64, MetaWireBuilding, enumWireVariant.third, 2); + registerBuildingVariant(65, MetaWireBuilding, enumWireVariant.third, 3); // Constant signal registerBuildingVariant(31, MetaConstantSignalBuilding); diff --git a/translations/base-en.yaml b/translations/base-en.yaml index 9d145999..ace667b0 100644 --- a/translations/base-en.yaml +++ b/translations/base-en.yaml @@ -636,6 +636,10 @@ buildings: name: *wire description: *wire_desc + third: + name: *wire + description: *wire_desc + wire_tunnel: default: name: &wire_tunnel Wire Crossing