From d8ac33ab3e763d221ca3178b2fcb7c95986805a4 Mon Sep 17 00:00:00 2001 From: tobspr <> Date: Mon, 18 May 2020 20:30:03 +0200 Subject: [PATCH] Improve iconography in toolbar --- res/ui/building_icons/belt.png | Bin 5789 -> 3694 bytes res/ui/building_icons/miner.png | Bin 2604 -> 5866 bytes res/ui/building_icons/underground_belt.png | Bin 4700 -> 5079 bytes src/css/main.scss | 2 +- src/css/textual_game_state.scss | 6 ++++++ src/html/index.html | 11 ++++++---- src/js/core/textual_game_state.js | 6 +++--- src/js/game/hud/parts/buildings_toolbar.js | 23 ++++++++++----------- src/js/game/key_action_mapper.js | 4 ++-- 9 files changed, 30 insertions(+), 22 deletions(-) diff --git a/res/ui/building_icons/belt.png b/res/ui/building_icons/belt.png index d0f5e11b5baf6e89c3d7155e4ed868e52f3ed2a4..f9ed2542fcfaa21797815b18a06264b40792450a 100644 GIT binary patch literal 3694 zcmcIm3se->8NLfD1dznEO6n1rt~F?7b{;#sJ2PbkWKl@7$U%%?M46qLg{`|ghm+zXMm;e;u`wqRU%j*JuCxcyrp@e` zojZ5F`~Cm@{{Q~>E-1*KFfeXt8~|WoUaq4MKI`;5b^!d}JC-{PAJ53SB`N^%KhbXk zSn#jxt?YE!k@Bq`+>!7vPllNd>&5P_;SevJ#Desx5c!6B-=;*m9v z6-1PXivCs!)opmBl6M6c)*{hA7~ zL<9>}ayldMUTJ;42wK&0s-Q=qx%G-xi)v&MD->0!QsKp%Drj*;*fCWr6dy_R6vH7r zGFYyVG)b+H9wS2Jb3_W6%~nKClawM!@`j^a5N1KLv-PMl$fzkEzaUksqjfJsV?+n1 ziFPB2lQ@c7P=YQZVaRcoAjjY&i{sr;C(I*()3{#2Ru;GZ8(0!N?wTh;1)gM?^Z7rYOeDTL~2BC@X3)QzS~;XcDD(hT>hcRp89- zFxy1M1J@(x?a8WpB|t_C%@HC)xKZ3~GflaS$RoSil2=lk zk^nU~>#HG{m29p@h0&`Ct*=SqtWeAAL4t|Ma=gA)>_%RXvnUut-JV`_dODA~X{#$l zNZLp6yJ4#2)~Y#0%qoYPK23gMkMm#Us`~bxbkhvOGgg!#co)jJC>Ki8ZX4<%alwXL z%w}A)hG*Za_asYD;cWbY-iO5HD>#3-2+J>K{NeLqXbTM!i$mQO7mf;6%8j~2H;=k3 zB4uM3TqLYypY!Rtx_L!Sar$;9Av=VUv`9IowV%|Mnb?IZ({Ah8)^bNARBw+tpExO+w-C~Z{ z!xP+i*xu^G(`F*viC9=IBlYvYt90G=rT?{J>WLG{DK=bqv*4DX7fLl$UdD0dkwP;z z>?Z>&hs9CMPF48BB8a-tvB4+WmnPPblwXTg3y&vRrI1^#jU^wIoDSuY&8WsMtS{qm&?8`s9a zIpz$Ql{N0&m%dL+d3#8@_1J*spH7YY&8da$^GvrBiv!rZS7%MXJgVNjfAx0!g~W*++#s;W2oTqS1797q!~oElnE65R$wttnMXicnH6l4@1Jm3x zsi4%h$&h}E5&k&v(&n9u&l-xwfb(ecM6e}c!^lHjVC|Z$ZPfji=(0BH{_;H~;PvhC zYx37k_VW|otIAma&kk(g^Cc-IsU@3+#t#2D4v9^E;GH`7@ZbT{CJ4KPGiiWqiK1ga zDI0XO;OdeMEBo)UO)hh!NU&SWRpS$AF*E!$r>`Vl!KxS=6>W53e0=XZ$3!4k> zfx4;z^>eo-v2&K~JH6$XjTwfu$%cdIbpN;8&#yd^8eRUN)=>ANsNUVxx*scrsQtH_ zAMAV`{3RNE-u}_^e|k8)^^meT5u7u4o5nUT|6Dt>*VfSX4ESO+V2&L6z3ED)^J2pw zu-Y){`YWfd-8=lwe5~Q40X4HhT`IWP4@)@I2e-pa<(S{Iu_ZsbmrHc&LOvx$KRlU9J^;>t$X*v^DEcAvIWTf zGwTn{fL|}(jjFS~(Nm$`+Hdv)2Kc)Vz}gf5ZbyT5aO#zCNhdra;qOhRZQeYMhPzvR8wD0QJM(F5NKZX8WBXCAPzzbJvtsH-TYqmCAm8 z{=D&b&h_8r=dRwlw*SbpQw;sMq_j-}%)ED|ws*Yz-m=R0SKAtnFZgsl=<>eScn>Xg zY)zh4+tF0HVtc|25~uF%n+%rj9U7B#qHOh&k+lb0f1ciCNOu)%JbdhALsq*XS4miZ z=lE+68xzjOfTd~KGp}^UyT5M*^|#d*E9SJd|MmX7t$W*dT#5(F?y{S-)+_g1n=R^w zHQ(%BvS_iCkdTk8CUkk FzW|6W;Zy(s delta 4677 zcmYjVbx_m`*ZwWJODx?iEU~bp)CC0TlI}*jBqUZkb_MB_UATb6A|28opuiGx1r?AE zB_&i^5D|pW`_A{yyyyIJ=ENV*Jaf*>ndgABSS(wF209D?&|y%n2$TZ=NI6>+B0$)C zM3UGhkUut)NS{L1LP|nGQcB@32`nu!&;O@#3es}eO(MSkO%;i`u(wE9B;kSH0S^OE z-T{FMx*8fL!2zE4{XCR-QD!>oa9u48S;^b7vSL!=lDzP6|3E`S1zjv2%!n<5@G<_k zq8Z>8;_va`p{}M9FBS_Ch5WZ+jD+V3CNPx05^AZzuiXbXQERbrJ;L%7dXpxp0MASnUv)MG z^aXJJN{m{KaZ5V4OTAkoX~)pds`ArNah}&^l3gZMQ!LSE(iL{xh2AN)H#)rMTiiSG z@H{3AZS&|=Us%=IvTxJ+i#f;5h!r%u;Cqn+K6#)kYYkW%1`$$-F%0CG`K@|;yW$4k zARzFM*Tnl-oG>BCbBip3O-FBV;XDyqqY;Qz%c=6u(|Rihz+_i&X%4q=w^^mPd4$zy zPRY{3vkse3pWTn!zye=@*@=x&D$QH;wBA9Z2*CU! zrneTcu!Cl+Y`FK5(lN|shJ&m4hk*X&tAdO8l3$m;?xE|ZO*YDF8HVp7dWjhv?RPLQ zLZV(mX}Nex-h$xdTeq}?s@uF4mZc?)h41KXpDR}pTIauU7oBzFCw|0i3$^ z+tD}5sR9uQ+;uuWG!HhiJM)JTugsiY8!&R`b-x~REDOjYiA#b3QQ_rPUivpn*VB3N#%Iphw

czen;u^Op zL*F^KG)`%T?V$h(>nmzKsD6E{mv0t#{k;A0`qiT~*2WNE()v0n*C89XIxD@AV(Ud1G;+F4zcwj& zYtf@g21P)N)Xt`Tn-J&JD-v~;N+gE?-dlg;uC(;N65bj`^>cBFM8WQ9^jSg_b6+k+ z{bHD>+vT4G+`CHZI~UIa$KPJ*zOMM&uZ#EfxId zu#f-TEX{qo79P|yG{4yV!@HKG(D{#=BXJ`Tgbl5`5n1Zv1MEHyQ?v+|Q|`#_L0J{r zo^&4WrCNUHPIrMsl8@B-p2>&-MC#k5_h-Y-Gb5$HC$$&JO*5tB1UgKScM{8|2%K|r zl$JM!va2~WzEQ@hRq;hUcLk8auursdG3V_@J3W$Er2iC zM_VDh__u}_O0CNBjlyRamGGf1M(Udmz9_hVpXMy_j=>0 z>-Ti}Z_3J*;Z~jjH(gDq&AdMh#yJq^sBFz=CGi{7&RedE_}JAM8gB)l#_OUX=Wm1# z&BvbZ*WTs|rVgj?#XIN?K^XtUNG{Rsv(wAP4M@158>)tq&>mYNI*~LT@G+ z-wr46YX9S9E;P%_V*xWI3{cq@1;U=)dEwW7MtgoWQAdpFxzUO56tZ$r>UBfgK^d)B zy&9WR-clD6o+wG*39@(uJGlO>mXW-!)uWz(#IzX6me+j>J};A27|Zb;+s>=hg6|7Y$DuI{YJxPV!Numjptj5 zq?n$Gm(S|L{DoglALCjIokzNV%VzHkK&TF4T7In>27}fw3o(GIhMO*@5x}I2?5^hl z;SY}Cm5-0=l6D%~zS2S3JGJuMxOKQ=cdvDPJM#zcih9yslP!bF@#y-)cz+0Kg?xfw zMMtHm^AG@sOLL|8^cT)hACd`{vx_;IwHAbDW|`CsBLSLHn8yRqRS!!`YF8Rtl%Eu1pm#qL)tbb_b z_DbTAeCUZjh8zYJR^sY+Cdy-|#szhFC1xx; zT<9LJFXU$Uywg+9hA?*_qNvgowUED)w-uWz6+A53hYGTPJA_G^eRQF{L55d7#V}>u zG@Zf%M-evkRWp>f?Vd*XUl+Yo$PVSwqKJh;8K15MkvQg1M_@q7GzL5)3!((o{^Uo3 zgV6S5s)IkpjcuicWRi1l#-X+n{FZZkEph5td{-NL@!h78Q60=Jc;$-%(kk0(&PN!{;05dE1h06>8G9C_b~!yD*KR2P zp|DpPbT`9p%Xmxwr-g9GEi00?GfJVBhi}R#U%7=lpyXeZo^UX+Y#RKYI#vrNMgyaB zF!q9R@d)W|)j|)OBGGbUm%o_#aB9r`s-C&@7VqXzj?){Ti7@nMu6M26i+jt>x{_sD z#~CC>pH&-BN zb6X4agkmx*G}u8?U}nZ9dn7+REcOSG9}?2T)43Y>Go+8D81hf#y?#M5@;|po zeYE1EPBc47A!+#b4lrT(bw<(cr$oE=oD$qDwo8?fQ+TI5xoRP^!jC&g?cFMu(E{oT z1Zb3d?(PAJlPKdYIiV38hX$j7CeO>qLZ!QYo+YsRn;d>5gkm(~Q@Q6p+{lj#aMdnI zeSA23CKH(~{08{P*b6Bg9oJs7qwe})tZkKnlP)hU$okEhxHws56H13tSe0%eT2M>t6Yu686(HOA!V zGcClziCC29Yv0GZ_;PI}N=_Nm zfurhqsJn^Ft?XE0IlGyug?9Vzz_I6yLj-0(K4_&53Ek^ z8Y7>W+%#08AeFd~X`+~%deN4D$RRnrKA=$a90vjBOc|s?p#GCe);e;It3AC#S)6P9 zyx0GXO&k6ojNSco`Z z_OGV~E`8GkV_KxW)&3Yc6;5K%NXw+8KETTwK`oviQ6 zk|@8HpZCpL8W=leJJ)YfRehpX|NZ!<5`Wqx>lh*oPc?j9b7P&92B?Kx<~CjBqpq#B zJ6i>@el^u6-+gHMam+DqUy$(7Y99YEMOWXsuK95^nvDQhb7b1V)I4oxRD!Rp=eCMP?rTDzaeCpPej(!`dX^;#{|CVB$ zX07u?tgA@P6BU19y5Eu{|L=n;riBk zH@hw9nr$}1$(8R{;qif3H39pR4M)8}ZWVDzce~?jkX{4e_s*43^JkPRPD{; zE%e}L^pjhq{KYXZ)3yM`G=F47?ztea13d4%;>s5qB^G;DkrypF0mv_=Cl`3L?h)P1 y|7aB09%6znD)|x&1^!hpDWK5X-I)aZFuXnR+Jx diff --git a/res/ui/building_icons/miner.png b/res/ui/building_icons/miner.png index 0e5c209cde25aeb9be003be5fba253ff9a41fe3b..6bf727ecbbedb7e7d52cc44928c5c83d4c62269f 100644 GIT binary patch literal 5866 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 z%0DmIu9o@HX9g={c7AJU{_XdaZqKD#g)3!L@(;)0$blkqOPAkU9BhqE26! zJ-=XG!_~(FMU0QTUz4cGC^W)S&Ca|Fp>MU#3(QHi>Ed^MqU>seO5m!=*C^X zQ)qd1KH0|^+%7ASgD*Di*wy)>m*eXZZ991SVy}5_;n+1|V{MuTD9`{;56Vbcu?=#H gKr;&FyC7!*{<^|zMsB;|dI0?#Ryo<^S@}l)3!DEiuK)l5 delta 1594 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 Q0)LLNp}9eYo@?~K03M;Bz5oCK diff --git a/src/css/main.scss b/src/css/main.scss index 2bb2ff4d..db586d65 100644 --- a/src/css/main.scss +++ b/src/css/main.scss @@ -92,7 +92,7 @@ body.uiHidden { body.modalDialogActive, body.ingameDialogOpen { - > *:not(.ingameDialog):not(.modalDialogParent):not(.loadingDialog) { + > *:not(.ingameDialog):not(.modalDialogParent):not(.loadingDialog):not(.gameLoadingOverlay) { filter: blur(5px) !important; } } diff --git a/src/css/textual_game_state.scss b/src/css/textual_game_state.scss index d8c980cd..83c8d171 100644 --- a/src/css/textual_game_state.scss +++ b/src/css/textual_game_state.scss @@ -13,11 +13,17 @@ .headerBar { display: flex; align-items: center; + justify-content: flex-start; h1 { + display: flex; + pointer-events: all; + align-items: center; + cursor: pointer; @include SuperHeading; text-transform: uppercase; color: #333438; + @include IncreasedClickArea(10px); } .backButton { diff --git a/src/html/index.html b/src/html/index.html index 1d4553c0..ff9c77f4 100644 --- a/src/html/index.html +++ b/src/html/index.html @@ -1,7 +1,7 @@ - shapez.io + shapez.io - Combine Shapes! @@ -19,13 +19,16 @@ + - diff --git a/src/js/core/textual_game_state.js b/src/js/core/textual_game_state.js index a35d301b..52a1f946 100644 --- a/src/js/core/textual_game_state.js +++ b/src/js/core/textual_game_state.js @@ -97,8 +97,8 @@ export class TextualGameState extends GameState { if (this.getStateHeaderTitle()) { headerHtml = `

- -

${this.getStateHeaderTitle()}

+ +

${this.getStateHeaderTitle()}

`; } @@ -138,7 +138,7 @@ export class TextualGameState extends GameState { } this.containerElement = this.htmlElement.querySelector(".widthKeeper .container"); - this.headerElement = this.htmlElement.querySelector(".headerBar > .backButton"); + this.headerElement = this.htmlElement.querySelector(".headerBar > h1"); if (this.headerElement) { this.trackClicks(this.headerElement, this.onBackButton); diff --git a/src/js/game/hud/parts/buildings_toolbar.js b/src/js/game/hud/parts/buildings_toolbar.js index 6c2aec81..011e245e 100644 --- a/src/js/game/hud/parts/buildings_toolbar.js +++ b/src/js/game/hud/parts/buildings_toolbar.js @@ -1,26 +1,25 @@ -import { BaseHUDPart } from "../base_hud_part"; -import { makeDiv } from "../../../core/utils"; import { gMetaBuildingRegistry } from "../../../core/global_registries"; -import { MetaBuilding } from "../../meta_building"; import { Signal } from "../../../core/signal"; -import { MetaSplitterBuilding } from "../../buildings/splitter"; -import { MetaMinerBuilding } from "../../buildings/miner"; +import { TrackedState } from "../../../core/tracked_state"; +import { makeDiv } from "../../../core/utils"; +import { MetaBeltBaseBuilding } from "../../buildings/belt_base"; import { MetaCutterBuilding } from "../../buildings/cutter"; -import { MetaRotaterBuilding } from "../../buildings/rotater"; -import { MetaStackerBuilding } from "../../buildings/stacker"; +import { MetaMinerBuilding } from "../../buildings/miner"; import { MetaMixerBuilding } from "../../buildings/mixer"; import { MetaPainterBuilding } from "../../buildings/painter"; +import { MetaRotaterBuilding } from "../../buildings/rotater"; +import { MetaSplitterBuilding } from "../../buildings/splitter"; +import { MetaStackerBuilding } from "../../buildings/stacker"; import { MetaTrashBuilding } from "../../buildings/trash"; -import { MetaBeltBaseBuilding } from "../../buildings/belt_base"; import { MetaUndergroundBeltBuilding } from "../../buildings/underground_belt"; -import { globalConfig } from "../../../core/config"; -import { TrackedState } from "../../../core/tracked_state"; +import { MetaBuilding } from "../../meta_building"; +import { BaseHUDPart } from "../base_hud_part"; const toolbarBuildings = [ MetaBeltBaseBuilding, - MetaMinerBuilding, - MetaUndergroundBeltBuilding, MetaSplitterBuilding, + MetaUndergroundBeltBuilding, + MetaMinerBuilding, MetaCutterBuilding, MetaRotaterBuilding, MetaStackerBuilding, diff --git a/src/js/game/key_action_mapper.js b/src/js/game/key_action_mapper.js index 00e4db5a..d0a9913e 100644 --- a/src/js/game/key_action_mapper.js +++ b/src/js/game/key_action_mapper.js @@ -36,9 +36,9 @@ export const defaultKeybindings = { toolbar: { building_belt: { keyCode: key("1") }, - building_miner: { keyCode: key("2") }, + building_splitter: { keyCode: key("2") }, building_underground_belt: { keyCode: key("3") }, - building_splitter: { keyCode: key("4") }, + building_miner: { keyCode: key("4") }, building_cutter: { keyCode: key("5") }, building_rotater: { keyCode: key("6") }, building_stacker: { keyCode: key("7") },