From e6c3e5452ec684f7cb44e17b4f3f9ff48bc31001 Mon Sep 17 00:00:00 2001 From: TcePrepK <56453014+TcePrepK@users.noreply.github.com> Date: Thu, 29 Oct 2020 22:10:57 +0300 Subject: [PATCH 1/2] SeeableDisplay --- .../sprites/wires/display_logical_acceptor.png | Bin 0 -> 5764 bytes src/js/game/systems/constant_signal.js | 1 - src/js/game/systems/wired_pins.js | 8 ++++++-- 3 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 res_raw/sprites/wires/display_logical_acceptor.png diff --git a/res_raw/sprites/wires/display_logical_acceptor.png b/res_raw/sprites/wires/display_logical_acceptor.png new file mode 100644 index 0000000000000000000000000000000000000000..7ab63892d43b605967b91d62d61761f39cbb03e7 GIT binary patch literal 5764 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 literal 0 HcmV?d00001 diff --git a/src/js/game/systems/constant_signal.js b/src/js/game/systems/constant_signal.js index aaf31a19..e5c8c4f9 100644 --- a/src/js/game/systems/constant_signal.js +++ b/src/js/game/systems/constant_signal.js @@ -99,7 +99,6 @@ export class ConstantSignalSystem extends GameSystemWithFilter { } if (itemInput.chosenItem) { - console.log(itemInput.chosenItem); constantComp.signal = itemInput.chosenItem; } else { constantComp.signal = this.parseSignalCode(signalValueInput.getValue()); diff --git a/src/js/game/systems/wired_pins.js b/src/js/game/systems/wired_pins.js index e8bc1882..cc1365b1 100644 --- a/src/js/game/systems/wired_pins.js +++ b/src/js/game/systems/wired_pins.js @@ -189,16 +189,20 @@ export class WiredPinsSystem extends GameSystemWithFilter { ); if (staticComp.getMetaBuilding().getRenderPins()) { + this.sprite = this.pinSprites[slot.type]; + if (staticComp.getMetaBuilding().id == "display") { + this.sprite = Loader.getSprite("sprites/wires/display_logical_acceptor.png") + } drawRotatedSprite({ parameters, - sprite: this.pinSprites[slot.type], + sprite: this.sprite, x: worldPos.x, y: worldPos.y, angle: effectiveRotation, size: globalConfig.tileSize + 2, offsetX: 0, offsetY: 0, - }); + }); } // Draw contained item to visualize whats emitted From 455ef08fef633511ef71e37563ee4289867fd33c Mon Sep 17 00:00:00 2001 From: TcePrepK <56453014+TcePrepK@users.noreply.github.com> Date: Fri, 30 Oct 2020 00:02:35 +0300 Subject: [PATCH 2/2] Update 1 --- .../wires/display_logical_acceptor.png | Bin 5764 -> 6565 bytes src/js/game/systems/display.js | 8 ++++++++ 2 files changed, 8 insertions(+) diff --git a/res_raw/sprites/wires/display_logical_acceptor.png b/res_raw/sprites/wires/display_logical_acceptor.png index 7ab63892d43b605967b91d62d61761f39cbb03e7..e4e7aff11e12114ecddc6838a1004d83296b3d24 100644 GIT binary patch delta 3528 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 delta 2755 zcma)7doa`jjB;`*qj48=Ir_e{zQ4};*7vTp*WUYipZ)yx?6u3xQcTWM>`&|H=wPpGt~=V>z%&bU z3)bF%XTiaQH0%AGu$cz@P4^cSwHm z?=16+o_m{6nP*Av3`Mc!XiYlrP=ieG?gWl8*uMYfOghwYoeBS37CBX@$`>j zg7cm>Pslqy@FWQcRfH(3Hd-wXqK#41!nQRghckLDk#*9e{@_C_iub-swa*iCbS9`^ zI9^7HoxOY(gjRDo08KsO@su6ot(dpMH))!cE9x$He{lo6yMFyh++nv>SopP4-BO8JQES@HP8Z?=H< zLKmr^XCt#eTTdQ0)9!jMiUV%=b+UqSN1^ z{E!1$z9fIpQ0l%(tPF=HGK$U$$DmxihaDF)=Y{s^SMu z#O>0PzfMSjf%d-R4(1B5eIWR!1pOoWKR`{UckzSD!WOz1Z95ALa7gMk(tp#HoBz^t zV}5%CFdp?-5W15iTx4BJSP?maxOBB3OT2B@SryIz*Q2p4JznRLFe^3oHxp zFCK6AFYFFZmI%|mQ5Asljiw!KX7rN^1$ z*)IC78x|D(0}UTHjpjyb$LRi4!@ll%Cr9l1z8$?)!B72h6`!y|g%<1EU;GET&gl8_ z6SQKDB^t~P@Abb8iJ4^qk6#T<;-p6+7rfba&8zjiFtEiRx!gPMo8o{~Rkg}9V6K#E z?c)-e(XJtiyy@4)*M45V)i*0BoBEvLyCIXg-h`_2m7re)*B=*%elCD zI%FlD?AkgsxdA0?+Bf`h0k%aRmiW;uI0a#CtE9MDt@I4Cnrx8JTKo$e^z>-a9kGXU%bsZ!$bgWNNy zxu?4Eo*@Bh{rzW6Ew-&sFi=*6iWhx6bjRv@~{( z5A^_`NCkW&UF+L5T|vwCugzZxr?m1HA^xXNty!UE?igMwC!ZE(U;=b>ucSlD0L^G^_@hVC z0_=H~DeYoriBR=phSZA5X6H13C&)=B|VBlH-f|9F*# zd@dv}=aGy{|AE}GB1LaQuv0M@;f!jNp6bGg9ycN$x5Zi>lV-z2^K1?e50$frwI5m; zGe_KvCNip?4>>2^h#I2{9I`Tl3hmc^x*SEY3;dE#p5|!k!e!4+Atk-d&DOP0XYQ8^ zm8-Y06@v-&2V{Z}`g>-#iTWPb44z2kGSCa*km*y#soSd$PTRFJ+!A$NALnB@7)(mIQ z)lFmk*#F1t^3 z&CD**DdK)TB|kjRux?|(zAe3-P15A8q2;ETH&++m*)d#y?&){cx~irRD_N!*dq)x6 z?(~_Y-4#Y?s(L>m?j5ao)#?kC4ejoqR{3&$MjuWpZmDGxf%Uc8e$twwy~`)ca2p?` z3d%)hgb_~X0`0oXyB@&ek$7^>yQm$jsFhpN}){Xn!JAO SVs<82dOLr0vcI$4@5En2M)>>y diff --git a/src/js/game/systems/display.js b/src/js/game/systems/display.js index f11091b9..4540b199 100644 --- a/src/js/game/systems/display.js +++ b/src/js/game/systems/display.js @@ -84,6 +84,14 @@ export class DisplaySystem extends GameSystemWithFilter { globalConfig.tileSize ); } else if (value.getItemType() === "shape") { + if (this.root.currentLayer == "wires") { + value.drawItemCenteredClipped( + (origin.x + 0.5) * globalConfig.tileSize, + (origin.y + 0.5) * globalConfig.tileSize, + parameters, + 30 + ); + } value.drawItemCenteredClipped( (origin.x + 0.5) * globalConfig.tileSize, (origin.y + 0.5) * globalConfig.tileSize,