From 7b3e504410a969260eb1e0b6fbe67acdf0c18b1e Mon Sep 17 00:00:00 2001 From: TcePrepK <56453014+TcePrepK@users.noreply.github.com> Date: Sat, 7 Nov 2020 22:00:56 +0300 Subject: [PATCH] Fixed All The Things Now It Is Ready For Pull Request --- .../blueprints/wire_tunnel-double_elbow.png | Bin 4275 -> 0 bytes res_raw/sprites/blueprints/wire_tunnel-elbow.png | Bin 2899 -> 0 bytes .../sprites/blueprints/wire_tunnel-straight.png | Bin 2536 -> 0 bytes .../buildings/wire_tunnel-double_elbow.png | Bin 5518 -> 0 bytes res_raw/sprites/buildings/wire_tunnel-elbow.png | Bin 5179 -> 0 bytes .../sprites/buildings/wire_tunnel-straight.png | Bin 4733 -> 0 bytes res_raw/sprites/wires/sets/third_cross.png | Bin 708 -> 0 bytes res_raw/sprites/wires/sets/third_forward.png | Bin 653 -> 0 bytes res_raw/sprites/wires/sets/third_split.png | Bin 529 -> 0 bytes res_raw/sprites/wires/sets/third_turn.png | Bin 517 -> 0 bytes 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 | 8 +++++++- 15 files changed, 13 insertions(+), 3 deletions(-) delete mode 100755 res_raw/sprites/blueprints/wire_tunnel-double_elbow.png delete mode 100755 res_raw/sprites/blueprints/wire_tunnel-elbow.png delete mode 100755 res_raw/sprites/blueprints/wire_tunnel-straight.png delete mode 100755 res_raw/sprites/buildings/wire_tunnel-double_elbow.png delete mode 100755 res_raw/sprites/buildings/wire_tunnel-elbow.png delete mode 100755 res_raw/sprites/buildings/wire_tunnel-straight.png delete mode 100755 res_raw/sprites/wires/sets/third_cross.png delete mode 100755 res_raw/sprites/wires/sets/third_forward.png delete mode 100755 res_raw/sprites/wires/sets/third_split.png delete mode 100755 res_raw/sprites/wires/sets/third_turn.png diff --git a/res_raw/sprites/blueprints/wire_tunnel-double_elbow.png b/res_raw/sprites/blueprints/wire_tunnel-double_elbow.png deleted file mode 100755 index 9961b356720f18184ef65cd5187675131c51d9eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4275 zcmdT|S5(vOlm3NbLXQvxAp)UD=%1(v3Q|Hz05O0NddG+~1won+BvfhA6#RftR1^(} z^saP4sv;7kmngl4NPy*k_Ga()cK2dt&NEkY<~{Gs^GrO}#DI%kh#dd`E(}`N>?F4S z#~`OpyxD{o_#}Y*%?xw^azFg{31Go%-_Qnt4=EfBXVw$Ub`Nds4*=Y4|1nUPZ;2ZK zK+zao?OQ<(tGTvbaNOChf$U!LstU2)2L*@RcSl7DMVb{Pl%^v2A73Xvfj$j-*DlPX z4$N|~1!)!ToReh9IKS}fo}5AnQ`Lg3kOd5e9ad$lqMT1g@lrywg^zu2k6MS~S95pA z8?G%Kr#G+k{k*f(*GIed?B{Oc5u*-$+C|p#uVLI%EWtr6_m1Xcue02d)lA&>(=U4; zeGc4AG0DP&BeiOZdm?rx)E$;RX8K(kq%L3Az_3*VtkkSqgkHR23CY2TzZX=2rR@>gW7{>eJo)JV zu|U)j8~{~@${=!LwVDz;p+?mgVuCcP4?VukP)d5EO41t*{B%Hmk9Ez_wVNH={sM=8 z5)uk)!H-TMF!ko`I!=`1jH@KY*VxxZW>?a9*i*stAym1C_XCfXFk4+`X{s)IXZ~vO z2Ly2jydjySkbFXCwRwLF_Jg(vsOb20MdL8v;vYvh#eKRz%Z>}7w&hV7d3^bAkg%UQ z(djN=zFAh|xSK9IjL*q?dMIwzZj^YdDvK2XQ2x!hE}q8%8Lyz(R)^*fhg`9AHyN}o z?B-xz4}qPE=opv7I2%Ji4q%W-G;mV~$os}!0I0=v9rFj=n^{@uXf5sCUkZ)W1u7ZU z=HXh_S(W`tZ(I=ExZEjThD2Q@9+;FsAc5J7DZ25pp z$R9|V6{0euH(dM{?B%g55MM|#9mx7CA(A(gy?_$lq@x3yYSVndOJN|$bn660I+f0{A!6F#xK$XnY*>DPq94-WX{k99}q z%>DsTB;hzEghM{LW}|5Cq2s}~_=t53E>`5gCnYZ{IKux2HyjcZ#TJu zQW@iAZ#O%B((_}(4}W2ti9Tq3)}j2(fs6O8K@jGMHpvfOOLIYV>x!&FJgB(;_wXX= z=*Mse!k|UKKaVy&-Q}5OzO`p^qq*y>>1%|xLDK^RrsAICSO5Ld*|)+2Ao3jkaZ?Co zX@@pQ8YcM;g_)0j)D##z|DaxI#1};5WXqu;`gtWI@CuXnrp49_R#0QAVDd%fS9_BI z(}I%w7Sg<4+d~2SPvAF9P}5id+Ks_w)btK!%Doq6M4`L`5O6|12*9l8BLPB zQQBO`cRxNsf{2*?T_fs&XEA@JiIB`{M#897oh)YxOSm^@*J6#8@5;6DrQs&Ni{?{) z`rnJjzes2e|6Pv$xShWvXQY`>NOjM+{EzX{LpjSR{^)}tx$6Yyf-nR{b?@ou-*f%c)v14Czm>5{UN-FB5{nyDxYNZxW#ulWnKHH^;QxY6D+hY|uZ;Hd&E+oS zr3+>L!-5O=#66kTR0)(=1xOG~x5!3yIR5Drc$iZFpa_)=>-U;JVN+#f;>UsO{7pMM ze0TStldeONS#d*AUqgGPv@I)(E*JU+-^QYKP>>xeI9Lj zjwNvartRnB2-RTrK}6ITbN3X}C2-F`43m{f&kvia$PS%f2d|MEIMR!Xo<}p|Y$PeV zMJ;V`-srd6hW-6uLq^f?ysz=kl@+M<6w{Iio#XJzr>A~T)0b&C!&#c((ax9c2i!gi zyRJ5bEq*T5ZaOb2p2Bk1%gxw!k2!0VjC}tjz)?&MZsW*vSicjJeXxMbTC47rz>jn~QlJ4Leog_?5=`)^)OSxpU$t ze)H(&2M2!xU)n3p9aGI_HT{q$8796-NKx4ueXnNFSM5uh2AgVn4Hy5#*DX{Z%vtz^ zOK%+(-Jr3KOC4Wgi8Ja>j=Yq4pEPj^)8F;778_THEWs`LH2WRtK{i4&zBQaCRo)8> z?swlxM9Id5&WRhvB@FYM}f&@zY2Qfz6u zOx#I})Erbd^U5a#v*Ix~S`fYuYDcC|D zh6Y9*ZMGW~uEuz7rBzL}ok@bf>wPY&(6Wk?jvGUwAh zh$uPvJkPn3V>UhThoJ`MfpiL&#*^Kw`zY!`>}H;N3x+6j%0@EKM&@^ zdQ&>oc-Wv~^=$l#G0yj7-r*eI+l6{_x8-dkpW%OCwyyB1f6)M2@kkC9h-$`cf88HD z++q+;Hr%tJ?+jLVPjXF6Gwx^;zZQJi{#?j)Mv}Q7D%_LysVzlPDynNPKYSTKqF0g3 z^JsN*Xu_Yc+pRIWnpS`Q=0xjqdYovX9)ooH@`d<=mJl;>5%u)h z!CWBM6au;`^$sVbu+sDlCXZtJY&zj!-eE@a&^ zNVs4#b}=BOMksd8BUB@sQ)O*zHPT$fHkYA7bpXPk=i5%0gW0d(eXM8WD)z5v?29Y# z>^JTA2aFez8}K-QdaOX z;S(lvPcpSBDDD9jEyYJyCD1yZK+*$bqE9EsVV+eU1v-~#VX za@p{u-&2SzeX6mDsqHGCPpC^_%1jFm8AMQqb5UR5$cK|o6 zYHD-Z2?cJyg9I)Jv1=v9FhPs{H+XhKpkh(${{sE&j$g|;?r>z#R=U89vA$+7lVPvBAVLf}4gwXwD8H0WDDY*=~|b9-x|Nlt`X>3x1^yxu_fITA#`6x(RgFU zj6Rzi%cJ4l_4w6GH*=(x2rtNx1Hbf)@ufmoZ^jjAZ#ZeEw|I)8rU~85u|3xEEL}{T z+*@hyoA-xKE3;BhBttq;u z5@4g1HkpHyU*d>sI^E^P$q*=2dRB7Py&L}p->c$g%Q3d6iH%J!=`}Ag=XaNshBF0l za0@RotDJ8aZ6#V6dbLZ=CdE;pO(OBV@oDtVUXMQK+0e6mQ$n4Gy>Qw?@QE7M1z15| z5V0PmrZ`X}ZK@Awm z)(k|>d(lC2!55vjoNyB}|qOWl6RM$!F;;Swa|l5y=cMB28-WTCz+blispr zD`S+Gp{XG$>ojB;J7W!lZ~F25{eHZEzU%vO&V8Nhxvq0P=RD^=&z)j#Yq1xGfB^vZ zT3McT;9>JG6Nd7y$Ogn?AI*C_jc1x=bi zBE9DBQ}JJ@SC_i%7^tyNDp{h&@4_MB=l-eUCci#{*^K|XO5NJD`ol(pm#;f+|0GHd=wL)!0Ts~!uos=zReuge%rNaHg-fK$8c zsIty-=9HGCWVS#d?bXSHK^@V+??J#mpgIK^t2v_0o&NYU?oRKqqKT6Qg>$9xdO|L7 ze{p(0W%(XHd<09Rh+Z=3FfP95FUPl9oolAnkcRGI)-N0hg;U!q4U@cxgJcwxgwodj z16t=b!5wQYJ{_D#kM4@J@3!o8(C2^ z%V?q(sQM~nU&f^~51dafMISnSPlVHPb1pRr$#4I+DTqLUFT(iq23JkJ)4|BbJM}Zd z3fcvcQo7!@T~`^cx&+^R42$+{JTYG;6=2Q40~84U4a7Ly{u}InNZ1YV>0HT4N%cc^ z{AAaW6T$FD1;=wu!7*1EjMAWmh4LzkhJ}#H z18hJsO@A*v__#rH)qUqf=l<#CYAXD;p`vfBA2%$b!0nGW_qX&Cw}@MQay}(`&xC1C zG_+G6_cjgeAMICqa}qbsreHfgPt3ZeYT=G;tY^W?L(bDeu}3OCuwR4IF0CB_JH7U@ zs~_x6>h!d6FHMVk0ZSby-tm6`HM0Q@g*mSTg^q@@u`}E4b!$xC{AX8aax)Nyj2!I~dlD7Z?u_g<44@Vj9|>-cP431fw3aWn@5<8$6%3L1w6n2EMYqtx zEq+LNuEmC+$Jg0Ds;mw6uSG@DECdEC`>GMubVl|*R=(Me`6e1+VTI5MiEy;9ya9R9 z0y1p0GOBtUOlmKW*e63&#G=&ep41l2J6&Kf??yFCk~Q3ID-O`hs_RPt0|Fz`pY|zj z3oUOOQ^8KW!rAxyzjK4jl=oWW6B|L~EI8yz_1o6FMCd@_jRsgSPH zJ8+|q%Dx+Q_8L!O@49g^d2AGq_o5`>A*8B@FIJe?J@2;ZpG2hb5*)*FyM;7S9g%l* zVUs`~&uPKO*>jNy=`e}QT_{Za_VjgS)?+K#WoPt(?-{}B6FK5IUtO{zZP}>gVNIYf zn{%;r~NE{YJu^kKM44$7&phf2*MUey(BxOCRL%!wcon)s}a)=sAw9n-_Y4=72Q_kw^zU7HhU31N-BPUmUz}yg~c&> z-92GL+-%IhwSGKuzC1WPC2}W-2wkgP5rBhCgaJquudk2TLr`EE4{9d!o`U|JFT8uP zS|Jq;9R1ZXWk35@^Mj#yYx-f%lZF5V+~Bhg^#syr`8h4%=(Fw#MG8gRPA;kUgP;+c@JAOw2P&VJ*%E7h>_Y`>s@}}6WBkN_cp1uA@Mjun2``P)$7!u zVbZA|FtZV1(Wq_@>E<`&e7KwDzMA!}ePUFue9yJ}m!*=wrG`JjjG9emjuTa0_6pv^ zA_FPtsEI2>I|j9~Ba?sL+ATU``ThcSTtVI&L@N=lq5!MqhpWKwjZ)B8|Cu8pCkNjw zl!f)@uv{CyJ-WOz=1_Z)^uo4ibLPXR(!Cs-7n%37 zX6=%)_vfE4{E8yH=Lbq~#i678v*}T?h@EZ_!kg{@yE~XSU#iLJ}g7)~RX7eSQ;Qq{A*o3C*ei5V*q-Svu7 zJ0TNd#OT22`RS7NZgMCRcMVq8kym<5G!FLAL!3|3GhJz^1#>7#Qp~F^CUos&^%>MC zu9GF{Xfgh=dLl1V!@L25NRVRXQsPT)EXhTgblF%Y3GxjG{lLY39#|m~rVD#sUCsHs zf^E2F_anlOyHqbs({Dbi!-kj-H)fQ-G}3QcZKRs4PinXYQZ8xpcZr#sX_EI!5Jn4P zYT(yYdSXc4l$&p#dja0RuGqaO#Ko#fiKv-%oT7vYUYD7-?8qarg$f`l?LKs+?+n#-8>K^}Zbfp}C diff --git a/res_raw/sprites/blueprints/wire_tunnel-straight.png b/res_raw/sprites/blueprints/wire_tunnel-straight.png deleted file mode 100755 index da36be68a751cdddc0d76cecf5c9129135e3ee2c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2536 zcmc&$XH*l|621wc7zL>oG=gHmf`nxe76cQDAtFT}p$QgrS&%@K5+#I06zQO7Kvqg9 zVnP!aK?Mm|mbf5A0w_gcK}0|Z5J?Dx=t(2hBBzQumQ2sSCP&>pmB)9EZL8bWzsU_Z3m9^bKbc%^t~p(5m#eCkFG;|Lzt#`mnJl057x81}Ii4N{EJ=Yk9!TzkA2n&qFveD>i>rD)qhZ3T zA;tv*5AWHv$n2GA^EZ+qfPAe<5H@fvp~51RDc z7&3$T1iix5oOdHE<@HDYkh`CFY<%}|SagXR)?#c=-?4sDZJ0zvdsIiMbeGB!hj2byFe#XP6*PF(|AzwFK zpoOp;0@D!X1_vAO42it(mQRpqA>lV8UCWtaHr}WH7r&wft8A@ zqY9N!M(Dv1tK1>c71NJ=SV|m#~Ea?eAx?8M%=&BI6YA`#g-GD66MOllkUULR#I!Hpz6E`BYYoh#eGAXasX( zNSRt5FTDx4)Dyx@lrt4GyMHeE&fK%>LG*#xwXTX~Q-59-1b^7+bE2%TSKH15BiA!; zg9=qboj?;^PdT4=zR@m-=se=hLQ)R=q;(eV-f8;jWVD@!4t3*KM>9 z54Go=H6*XdRdUh*dz32@)^J7fw9wYXU=2H@yf)%_)-Gb#ziC}oWPC2wHaoTnl5{LX zi{jgoH_X%ncFIB?#HEuBvA+wQ=14~<_Ee3OLV*g+oI1Fzba}7|bvOiW3y|}ka;v$s z5O}^<2Y26na#a`+W79xWN*pO>v|pJJo&tk`pC518QeT3Gfyi%jtp2=5`0RjS*4?EHNjQ;HRmY#>lF%#S5%&qn;a{BV#szy5ziL1GKn^)*FR;k^G z*g@^0WKW1US+2XcS`?4-nS9tznd+GF z=JaVWixwVvP}(XbRIKbTZk=t@{#P=4KXu2-a8;wEVtd`=aA)l&4PprKOkOlX?#*OL7`4 z{t6Xvmwr<~UNvd5KMVWkdh_oC0bc4pHLa^;RnRsU+(C4?*W6tjCDHWV0Y1W`$4PUn z3D!M&P#aGaU3Vnw+$ry+U)g5J#IgxbiCOO1n!uxk<&^#p^8`DR5(;v4J-W@;*))gj zy}+p6Gk0{W39rs93Ox|uew*^p%)H2dkw^8w48Bpxfp?drch`D4I#egjz_P}FI_1k{ zC3(-hZW$bDVD`--i1;3-Q>}+bV_TAwIJf&}mhEr)iK^SFz6-+efD+lK8IsRNu1q17 ze_?NwZiMLXSc{@8G|xwo`7s9Ak+S~!yoRT*9x5w5vzmP|^?V6~b_sM(KQcG)2j7ji z5A26A$S?+DXYVd*Dw*+;5;&Gs* zY7km1Z;-H(=VEeysd#b?t}$Rlk~%+?O8rt(9LG!Az*cTs<{9%0<5yRJroEs5I&9IX z=7Hg;rU@7cHC#^167SF3*r+jAOx_1zm7Z2eQp10UWl45aBdEFs4TPZ5|9} zpXx2j&(wKdg(u0{M7D*%7#puBsc7Ujn!*@5DpQ(WbL3`1XUr^O4hgsX-{gIjv#itq Xj?(Jk)mJOq&H&cV$+pt^bnL$XdWebd diff --git a/res_raw/sprites/buildings/wire_tunnel-double_elbow.png b/res_raw/sprites/buildings/wire_tunnel-double_elbow.png deleted file mode 100755 index 4993595cba19df53c51f797513cd97fa96c403c2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5518 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 K(3Zd%^ZyM>$%@?o diff --git a/res_raw/sprites/buildings/wire_tunnel-elbow.png b/res_raw/sprites/buildings/wire_tunnel-elbow.png deleted file mode 100755 index 6d18d4242f03c7d60e4a3294ab84f165b43c8892..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5179 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 diff --git a/res_raw/sprites/buildings/wire_tunnel-straight.png b/res_raw/sprites/buildings/wire_tunnel-straight.png deleted file mode 100755 index 520009e05e8ae18bf663e04c670c3d9fdfaacb72..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4733 zcmd5=dvFwY9pCT@51|j#w%T^qi&LQOX5Y8BOD-Ygc*NcdzfG2V?Dck& zT#yEAwWTtcanLG}KucyigDDRQ6eUpUA0^JvfN4M)j3~_%R6-e{p#x-szrDL$4!l5G z6}_3u?S6mX-{<@Oet*Bbx~OEq)X86)jA7W+;)R}4^n1wuPMm=Lmi7d*(NC6Hx?nE0 zE)9r5-*0||G44XDi_xUZq_bEv+Lb*US zWSAQZMG!ZJ@K`7qHl>)`5eJsgvrQ%)c$~!wxE+PIMBMLPgcli6i1WElLZLYx z7sOoJ$#SCjB+gK@i=@Z`sV#Nl{eRMn(X&-|n~^yYR{Syn_M$=cf5 z+*&r*h*pxcD2gP-kPJg04#KPpTOdY+&71^C62=2fC8|d(-3a40ERcRw*3z&nUJd_SEJ`m0=lXl`(=7Qp-2F z!qT-71llV%vBH=>0;|1}VvR^eQ3xy}>NAYsP!25`(hV;vvU5hnXD-&ms!?msvTaZ9 zfgWH%w}YV=il8`x7JQT_aW07$pP(3tq7tlLl%*=LKsvKXFoKU3C7zPFo0$z&*Xr)b zsw$FZL_+|@P7i@fNJheyacN$!R2()f5LRHZ$L&C>=IXjCQ7)%ID+*6&il!jhoIuDL z1OzJxKz50g;1uA{evhG4+j(X0Pn4Q!CeK95M+TNRE>j#O92ew1PV}~ z#_}5P9720Ks-toT!E{txD-|JfDg~V)qY)wp1%jhEh5(8p6HX|&082q$&=dzgEVsxA z8d0yIBA>Gk+zz;e;E}4pE-|-*P7?igwg#&cM1i5uhotSl$@L|7SRY<~CafbDGY;HN z87VHm47D+&fRpE0K1pAs$6(O!(UI58gd*b5miW?=TbAOD#_l?K@oJS8>L$v+x)eFt zKFZ+pX{01EsN?aXm4K44PqDKXs*WUC&k+65`8fewTLqCPZwwR#i_Le|V<^+LK37Lg5q4FF{$Oh1NqUdTBQv+7WS8y{N8I=M0|IzAWd(4bC#3x5LXF%XK(9sw)4_Bqg= z7y${nWe7PjgSNN#_edU1>`J@5#O+T|(ai|Gp-wS$ zEwkTJS34L+^Dv4oZWne4Gtr%KOtGiX7c0MT>R>qMnFrg!jQfB8mgnoQw)~~}`$s?jTl2sC+U{>3?)~wCs|5|8t~fkv z)%?zZRlykx&iAj(+V-RC_ca2)n#k+j;5*C8KV@q`Hr|M>eQb^Xu$SxG zh+XMzZk)jv93LoeZLB(F?&D8A7xK=(|4^(UP=0*R)6Mq;N>;r2!REH@oqt#nczf?d z@9vwEv#E*Pa^j42`L7k5moF<{)qU)t-%Z=qy#MMSTQ0s~44&Pye9G)yWBXnY|N6>c z+rjZ0H#7uh#JZ3DCTI4caQ=mMabqvvvH6jT?7d_681kuCI*E%1uAlzs-IqRlpuN58 zz>c?`ZF#T1|NMIet8biGz5C<#Q(2Gpo1Y*Fzc_a7`6E9OR(Bz7{_$0zeEPoWhvxME z{m+AVb?@S)veN@M+Ti*P^`S4}*w%#U$j<-eW5w$&N7hvreEjIWSm(G%!-q{TPe%`P zxU74wF#GQI6qr=H@rJx|NaC1lV=(_nnNuoe!0ba?lr!= zKcHY)eP_?r_gp&Hf4(@!zkTq9*27DCV&0xlst#V+N+0jOda3x4TxWyUt6#v(wl}+5 z$M&85S^cIBVtH5Jq>AkRZ(ZL#E%d<8*TH37>*|kUr^l>cWc*z|KJawz}somvyu>ZX0;^@(UfkjrRoJ*$&2K^)2}B zjX%Bfy*j^H+Eu@^?EP$h%gI$`mjhFC_AY^rB2@dA5ihU63>pg6)*l1Yr+s$ diff --git a/res_raw/sprites/wires/sets/third_cross.png b/res_raw/sprites/wires/sets/third_cross.png deleted file mode 100755 index 50cdc7bf1120a18c1adde11939ed108a4355c4d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 708 zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE4M+yv$zcalY)RhkE)4%caKYZ?lNlJ8Dm`5s zLn`LHy|Xcw$x*-|F!>^fsDhA@l|ngtfbbPZ_7s&4u8unm(i@n?8%j<@J^UZHXS-D9 zSJRtk?^T@ox#fnf)#jMB{K4<`#p?fdPdB^$yYSTAKUMO!3_U6gmslKTF?a|wWHKrE zGA!Y2FkzgaHbe!_o?m`6?~8!X^S|?wnX&j{%gyW0kAHumm>?oe(3`XGubck&h2p>6 zPqS)ge44xcXSEr&Aex=O?fc^wig7nz{Qq3N|M`s}9)jr6Z@-00w(vE_^WGge=YyAa>A+0Ul?YnFkE7Bn8n~B%#g{X;LEUtvti5A_bi3VW^W{F?&z%>4Pygq++jr)1qZ$TL8Fu^b`NXOt%CrCNZ~DHw m533q9SHP@5aoXS%{Ko!ipU}gdcGK2^;>6R{&t;ucLK6UH`I$uk diff --git a/res_raw/sprites/wires/sets/third_turn.png b/res_raw/sprites/wires/sets/third_turn.png deleted file mode 100755 index 3880d2d4e4fd3cd32857247bdf03d86bbb40c7c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 517 zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE4M+yv$zcalY)RhkE)4%caKYZ?lNlHocX_%v zhE&XXduyX$qoagtV2@i!f{Kysiso4>oY{>!0~^Ck6oex7SNpN*@BGZVd$T0a6mmh$ z{hBWgD|g3*wO^F}aVO~ugM=r;63zw_#tCW+mslKTF?a|wWS+jr%yn({+srR)_lg-o z0!#|Nn5tlc`yK0VJg&3uyZ7OJ48jbUEaQY{iaC$Uem}4L(xyp-X($ds7=q-wK_nQ* X$;I)^?zh8!P;_{@`njxgN@xNA8ia^z diff --git a/src/css/resources.scss b/src/css/resources.scss index 08bfa43f..9412c83e 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, virtual_processor, reader, storage, + constant_signal, logic_gate, lever, filter, wire_tunnel, display, wireless_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, constant_signal, wire, wire_tunnel, logic_gate-or, logic_gate-not, + reader, rotater-rotate180, display, wireless_display, wireless_display-remote_control, 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 5298ef18..6bcc44b1 100644 --- a/src/js/game/game_system_manager.js +++ b/src/js/game/game_system_manager.js @@ -20,6 +20,7 @@ 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 05ffc795..bed5c80f 100644 --- a/src/js/game/hud/parts/buildings_toolbar.js +++ b/src/js/game/hud/parts/buildings_toolbar.js @@ -1,6 +1,7 @@ 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"; @@ -39,6 +40,7 @@ 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 9fa4ffe1..0c8bbac8 100644 --- a/src/js/game/key_action_mapper.js +++ b/src/js/game/key_action_mapper.js @@ -65,6 +65,7 @@ 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 33e157ee..105727ff 100644 --- a/src/js/game/meta_building_registry.js +++ b/src/js/game/meta_building_registry.js @@ -25,7 +25,8 @@ import { MetaTrashBuilding } from "./buildings/trash"; import { enumUndergroundBeltVariants, MetaUndergroundBeltBuilding } from "./buildings/underground_belt"; import { enumVirtualProcessorVariants, MetaVirtualProcessorBuilding } from "./buildings/virtual_processor"; import { MetaWireBuilding } from "./buildings/wire"; -import { MetaWireTunnelBuilding, enumWireTunnelVariants } from "./buildings/wire_tunnel"; +import { MetaWireTunnelBuilding } from "./buildings/wire_tunnel"; +import { MetaWirelessDisplayBuilding, enumWirelessDisplayVariants } from "./buildings/wireless_display"; import { buildBuildingCodeCache, gBuildingVariants, registerBuildingVariant } from "./building_codes"; import { enumWireVariant } from "./components/wire"; import { KEYMAPPINGS } from "./key_action_mapper"; @@ -59,6 +60,7 @@ export function initMetaBuildingRegistry() { gMetaBuildingRegistry.register(MetaAnalyzerBuilding); gMetaBuildingRegistry.register(MetaComparatorBuilding); gMetaBuildingRegistry.register(MetaItemProducerBuilding); + gMetaBuildingRegistry.register(MetaWirelessDisplayBuilding); // Belt registerBuildingVariant(1, MetaBeltBuilding, defaultBuildingVariant, 0); @@ -165,6 +167,10 @@ 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(