From e0ba1452b21b194747b5ecce8efa0877992ccfe5 Mon Sep 17 00:00:00 2001 From: tobspr Date: Mon, 10 Aug 2020 15:02:49 +0200 Subject: [PATCH] Start to work on logical pins --- res_raw/atlas.tps | 15 --------------- src/js/game/buildings/hub.js | 14 ++++++++++++++ src/js/game/components/wired_pins.js | 2 ++ src/js/game/hud/parts/wires_overlay.js | 7 +------ src/js/game/systems/wired_pins.js | 2 ++ 5 files changed, 19 insertions(+), 21 deletions(-) diff --git a/res_raw/atlas.tps b/res_raw/atlas.tps index a5a6abbd..8b4691d0 100644 --- a/res_raw/atlas.tps +++ b/res_raw/atlas.tps @@ -568,21 +568,6 @@ scale9FromFile - sprites/misc/lock_direction_indicator.png - - pivotPoint - 0.5,0.5 - spriteScale - 1 - scale9Enabled - - scale9Borders - 12,12,24,24 - scale9Paddings - 12,12,24,24 - scale9FromFile - - sprites/misc/storage_overlay.png pivotPoint diff --git a/src/js/game/buildings/hub.js b/src/js/game/buildings/hub.js index 4f0e0d80..07ca4360 100644 --- a/src/js/game/buildings/hub.js +++ b/src/js/game/buildings/hub.js @@ -6,6 +6,7 @@ import { enumItemProcessorTypes, ItemProcessorComponent } from "../components/it import { UnremovableComponent } from "../components/unremovable"; import { Entity } from "../entity"; import { MetaBuilding } from "../meta_building"; +import { WiredPinsComponent, enumPinSlotType } from "../components/wired_pins"; export class MetaHubBuilding extends MetaBuilding { constructor() { @@ -47,6 +48,19 @@ export class MetaHubBuilding extends MetaBuilding { ); entity.addComponent(new UnremovableComponent()); + + entity.addComponent( + new WiredPinsComponent({ + slots: [ + { + pos: new Vector(0, 0), + type: enumPinSlotType.logicalEjector, + direction: enumDirection.top, + }, + ], + }) + ); + entity.addComponent( new ItemAcceptorComponent({ slots: [ diff --git a/src/js/game/components/wired_pins.js b/src/js/game/components/wired_pins.js index 0d331a68..17314639 100644 --- a/src/js/game/components/wired_pins.js +++ b/src/js/game/components/wired_pins.js @@ -8,6 +8,8 @@ export const enumPinSlotType = { negativeEnergyEjector: "negativeEnergyEjector", positiveEnergyAcceptor: "positiveEnergyAcceptor", negativeEnergyAcceptor: "negativeEnergyAcceptor", + logicalEjector: "logicalEjector", + logicalAcceptor: "logicalAcceptor", }; /** @typedef {{ diff --git a/src/js/game/hud/parts/wires_overlay.js b/src/js/game/hud/parts/wires_overlay.js index 8bda5d0d..b861e5f9 100644 --- a/src/js/game/hud/parts/wires_overlay.js +++ b/src/js/game/hud/parts/wires_overlay.js @@ -75,7 +75,7 @@ export class HUDWiresOverlay extends BaseHUDPart { const scaleFactor = 1 / wiresBackgroundDpi; - parameters.context.globalAlpha = 0.9 * this.currentAlpha; + parameters.context.globalAlpha = this.currentAlpha; parameters.context.globalCompositeOperation = "darken"; parameters.context.scale(scaleFactor, scaleFactor); parameters.context.fillStyle = this.cachedPatternBackground; @@ -88,10 +88,5 @@ export class HUDWiresOverlay extends BaseHUDPart { parameters.context.scale(1 / scaleFactor, 1 / scaleFactor); parameters.context.globalCompositeOperation = "source-over"; parameters.context.globalAlpha = 1; - - // parameters.context.fillStyle = "#3a85bf"; - // parameters.context.globalAlpha = 0.0 * this.currentAlpha; - // parameters.context.fillRect(bounds.x, bounds.y, bounds.w, bounds.h); - // parameters.context.globalAlpha = 1; } } diff --git a/src/js/game/systems/wired_pins.js b/src/js/game/systems/wired_pins.js index 853568ef..d64ee9ae 100644 --- a/src/js/game/systems/wired_pins.js +++ b/src/js/game/systems/wired_pins.js @@ -22,6 +22,8 @@ export class WiredPinsSystem extends GameSystemWithFilter { [enumPinSlotType.negativeEnergyAcceptor]: Loader.getSprite( "sprites/wires/pin_negative_accept.png" ), + [enumPinSlotType.logicalEjector]: Loader.getSprite("sprites/wires/pin_negative_eject.png"), + [enumPinSlotType.logicalAcceptor]: Loader.getSprite("sprites/wires/pin_negative_accept.png"), }; this.root.signals.prePlacementCheck.add(this.prePlacementCheck, this);