From 21382a6f2eae26c74c8717f1d23cf08ffaf9099c Mon Sep 17 00:00:00 2001 From: tobspr Date: Mon, 11 May 2020 15:17:30 +0200 Subject: [PATCH] Add music / sound / setting buttons (dysfunctional) --- res/ui/icons/music_off.png | Bin 0 -> 2692 bytes res/ui/icons/music_on.png | Bin 0 -> 2296 bytes res/ui/icons/settings.png | Bin 0 -> 2416 bytes res/ui/icons/sound_off.png | Bin 0 -> 2327 bytes res/ui/icons/sound_on.png | Bin 0 -> 2545 bytes res/ui/loading.svg | 27 +++++++-- src/css/ingame_hud/building_placer.scss | 2 +- src/css/ingame_hud/game_menu.scss | 70 ++++++++++++++++++------ src/js/game/hud/parts/game_menu.js | 6 ++ src/js/game/upgrades.js | 4 +- 10 files changed, 84 insertions(+), 25 deletions(-) create mode 100644 res/ui/icons/music_off.png create mode 100644 res/ui/icons/music_on.png create mode 100644 res/ui/icons/settings.png create mode 100644 res/ui/icons/sound_off.png create mode 100644 res/ui/icons/sound_on.png diff --git a/res/ui/icons/music_off.png b/res/ui/icons/music_off.png new file mode 100644 index 0000000000000000000000000000000000000000..efe37dc47180fb81a2441873037655376068b2fb GIT binary patch literal 2692 zcmb_e3s4hh9$y5N=m{b|vD9^?Jv`j(ZXP6Ah(Z!dC?-5a5$#cy>;|?Z*(JL`VwnyC zqkB@6E;_wDN=Jb{cuD}|?s)u(X);MeKCy(+`}<^#Z_ zLv+e&ezjpaZepxrf@Cr&vBS!`g@DLq4wf+GP&}APWzjY@G<^6t1k$7$N|hT>1FNO7 zY5h7owPKwy#k4NRq#~hZOTkD7E-0{4JOMha78{2<)X<1tTo}8j5eOWC@HuKI+HDYA zZAb*QjGY4I;&9l6$>g9yCC0*~GL>oxC_ynLf+`VA3S;5848|D&Sa-qo@Q*I zTO*OlE9CWGEfMQ))CV;!x)x= z$#A&>N5jKV367$pPy<8KX6MhLash`+ehd{@LlQjkt67gxwk!zr zWD?gh7RD|Z7QDkAosZLM6YY$dwg?NccESn95>_h#O2m>8UkwI4&c^YC%|ylN)R2%I zF-?;~NEo4zVse;LVi+t{$S{~dr39>05K2rXkxNO+Bd=pjd2R}f%aekIiae~vDR5Z<&KRk zG&n*RoG`iDKn{J>5#RHke^`k#9*@Ki2PV4Tv==>1r7 zP1%GkixPHL1bX&(o{o=Cs>VBE0l+&qP8Xe$z5ZzbnfRH++_pQzP4~3TuC1L5;*$>qRj;Y}CSR`$ z&~!G41Ln@Ejr`AK-GzbKj!ocVU)l82(;LteCA&JFuLz$9HM~=amh7w8H?;p&&(KiM zP(;M=5LbP_zyJRCN2C$MN2K3uNxr@J>zM&-Xs})WYCCZKFQ6ujD8KpF1zXg}D+yKM zYiOeGlXqLvy}IdznojgzLk||tPfV!t4XEx%4m>>gT+x8T&=K4==y<{Fm9h&WunjE< zZ7nOk^QQNNBOyI;ttpxp0!y#WGH(2;G1BMH$y=HR(4F2JM8lRrkqGgiC0?J^9+U_c2k!!XUN1^5&07`YwYZ}(M6*54b~YaN z|7`KLnr$6RYUh=f*LH|n`HxChTADj2e79tO=NHDNQzGCE^8uYGF0)4(TSk77buw*! zc}IChczVsLg6Qpr(2wSQI2l+}zs>r;Yv&BNK4>eyy+(a^?e~=hQy#>ZB^`V3+o1J1 zQGd7;Oo#(o{+2ceaN#{&H7#Mq(x`Pmxb&y)$A)foJzNQHzH~!Up<%sU8g{ZPik-?D zTz4EzeJ5u|2QTF6?NyUr3#Cdz?$jonUw_)UEF*UBrI;=(jV$}J@MXotx(Qn|-hhtH zEsqUUBn|v&8hcN+(y*g2YG=X8#)T^aF`ieJ%DG*SvROyDLjvYX6EE z4cq@{aYbFOJDHxJ+t+t+ZRec9!{Yk7sRweSdPAy+(sx@IysfvGsePj3Ei2Hr*KeKO z9p)b`mVR3CLzjNZl^0bX1lI2XmUhi+=x#V++*lObn8tPJZ$2zeGfvGrx~DheVDs`? zdg*&RH=XB$LoQ9eHTCT|Z*jAoSCf>d8|!A<^kVEdgvj`|gz&Fe0WSi7emi`wF{eeQE+ z(EIjx?a_0L_j>*Q+lzO7ettt;mS5}Kyor6jSZiARJB4R~S0^4n_VUCp#iHp~{4Sik z-hQU~b|jmmaV9E1tlZcDc7|SF{wd;zzF1$lYUV_*^yZh|>P`RZP=^-j&IxNc{M^;% z!RP1yF6rYyrdxaC_}8%myKC|H|9%2l8kkirx(J;sdEgJ{paa7hjsJB2C&tAXbxoR# G;{OAY=f}SQ literal 0 HcmV?d00001 diff --git a/res/ui/icons/music_on.png b/res/ui/icons/music_on.png new file mode 100644 index 0000000000000000000000000000000000000000..e1a679ca7bc65ac9a5a63394fb72bfdd0d1b72aa GIT binary patch literal 2296 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 literal 0 HcmV?d00001 diff --git a/res/ui/icons/sound_on.png b/res/ui/icons/sound_on.png new file mode 100644 index 0000000000000000000000000000000000000000..ac0f88ce0a7f8d291b4ddb1f25dedd953143e317 GIT binary patch literal 2545 zcmbVO3s4hx8edQ-53vQ*0i_TZwTf&unEkuu3jhG0!~|(N^IYM)JZ3U?Kyf0IxqBKDR+#}{_UF#aW!LiA3jn}v zNGs2wb7V;vLFw7Jk}4qC7QNAF1VqJHj5tw9(yRhftu=_j;ghF9mR2bSvjsAa%qSr> z+JsUQnNgZ7CrS$mR0+mJv!W~*L!c*VoMqAL3}(zC2FH0ZX6^h8gRF4~T_^@)oeo(! zvQ(CYGLb9+TL=*dU%(QfY(&W8qi8sb%RwSwP6UkbAVi4qIT)AAn*4!`HDPfoJ*px{PBPfc(94^e|LJR^jTMaaBfehx*DF!KNCQMo*t)&bs zCnH`!713glQ92QV-Z)KbFi)n5Nf>OwjWELII71o-Dv4>FvB;zwcdjI0Qb+1Z18ruo z$TZfdp=ipip`JlKz5N>pOloDaX&+D3qSsHmFw^nHOc;|1c`Dj0w;D+}oitNLCW4GF zW@LssqcLI<6N%H5NlsC^sY0brNoGkT&cdLqrP*48k}5GTd%}j4;xs7+xg0JB;s_uF zkt2LeAi{Xaat;^ca3-KKN~u*@{}(F2I3f)BEtKgRB~Ii27px>O6=l-nOw3w6t|nol zK@GB|Gl@wk9c5x1GwP5hzb8s0sU}LL)iE0@O}Le{64&c-7MIN(*D8}?i3T%`8wfH{ zDh8S4u(etxCM38bgsW0PT$C$-lq8>kP?Up0q5{5(8$oad1VT>PODUqr*#cAcO2)nb z6%Z-`5&@A2hYu-5d?kbn&;p202qT0_UIZZ|L{s)DCM|OWaowNhaUM)(?_dd9GgDRT z*G#T-TGn{GU^wAC24awK)}K^@lb^Lu$-whPFhN_QAsNy?Xo?A#nNrauxQUEa zGue8czJs5o-;5XkvHIt$-?P;Ju227@`pM)H8r+~JnaK)+&Uj$w44Nnn{QIhn?>#ZE zrr^vFbS|f-FY_`zzexi_ZDOYL{hp%`0L(a)D2%O=S4sB=mwRFwLTvQ>2cPwF zSG$}%adzp0TSbzWf~nHfvK*^eAKVKhEaZ)r9rNwpHU@Ug z3LA0TnX&&`kRwdhlh>K{vP5yJ6k=zy5l_MS-CvwaB~9v)%o|ouIhtja^wk)Oe^e8gCuUZ0>vUQK^F0 z6?hhQz42-AdZbB|h4&Y~=6WdIvUfC#9dK za;e`P#OVt`{=Fg3$F1@&p|`8e_Le|z_ko5VgX?P}?Jb<9(}Op4;()3xjlj9S^~@;$s#jL^6~@-^T=xw53FB`cRM>c~tyWm~xB6vEdk)+h-RdxQ9JZ}_ zIQZAd#fnY!|LHpa-cP1iSA=h|M|rxwx}4+ve{!@V+l6`^b(O`x5Wt5uxqP zo;QZ(3G;4O`@8y`^D9p2J|o9v6*F!qKD?8*ShKt7vUUDC7tcnIkzbN)>vrE5;%m0G zZ0wrlSDauB+PZo53+3KvMfvqthxf(y1&`eI3JCgM_0MnLjQD6&)q(%~Qr7DyPYb$8 zf7Dl-WYbp!y$0y6>^tKB^;`#a@nIVtNIo9hQRqC;;D%Y5? z7jl$2WP&kArmiL=4z@?#d&BFK(3-G!b~N33fBRrS*jU?|&))jxO0aC?rcXJP@7B8Y z7nN+zppgDho^kXzTOYx}7T9d#QHUs+eZOnS({f%+Qrt>yqHWfjS>wUxivIO<1A4 z=bq>K=$J^e_Pil>Uep5jNEoQh`G@*Sbx(fCy8-v9xc=phb?wwUsrrZ4Y9Bv3eSHH^ XeyvmUdDK44`KK%~K3RGwPGS2mu57J1 literal 0 HcmV?d00001 diff --git a/res/ui/loading.svg b/res/ui/loading.svg index e8f0d271..ea7dcbbd 100644 --- a/res/ui/loading.svg +++ b/res/ui/loading.svg @@ -1,6 +1,25 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/css/ingame_hud/building_placer.scss b/src/css/ingame_hud/building_placer.scss index 55e9ef4d..68f3d8cd 100644 --- a/src/css/ingame_hud/building_placer.scss +++ b/src/css/ingame_hud/building_placer.scss @@ -1,6 +1,6 @@ #ingame_HUD_building_placer { position: fixed; - @include S(top, 5q0px); + @include S(top, 50px); @include S(right, 10px); display: flex; diff --git a/src/css/ingame_hud/game_menu.scss b/src/css/ingame_hud/game_menu.scss index 16ac3129..72a6fd66 100644 --- a/src/css/ingame_hud/game_menu.scss +++ b/src/css/ingame_hud/game_menu.scss @@ -1,37 +1,67 @@ #ingame_HUD_GameMenu { position: absolute; top: 0; - left: 50%; - display: grid; - transform: translateX(-50%); - @include S(grid-gap, 3px); + left: calc(50% - #{D(50px)}); + right: 0; + display: flex; grid-auto-flow: column; - button { - background: $colorGreenBright; + > .menuButtons { + position: relative; + display: flex; + flex-grow: 1; + @include S(padding, 5px, 4px); + justify-content: flex-end; + + > .button { + @include S(width, 30px); + @include S(height, 30px); + display: inline-block; + background: center center / 60% no-repeat; + pointer-events: all; + cursor: pointer; + transition: all 0.12s ease-in-out; + transition-property: opacity, transform; + + &:hover { + opacity: 0.9; + transform: translateY(3px); + } + &.music { + background-image: uiResource("icons/music_on.png"); + } + + &.sfx { + background-image: uiResource("icons/sound_on.png"); + } + + &.settings { + background-image: uiResource("icons/settings.png"); + } + } + } + + > button { @include PlainText; color: #fff; border-color: rgba(0, 0, 0, 0.1); @include S(padding, 5px, 5px, 5px); - transition: all 0.12s ease-in-out; - transition-property: opacity, transform; - - &:hover { - opacity: 0.9; - transform: translateY(3px); - } - @include IncreasedClickArea(10px); - @include ButtonText; border: #{D(2px)} solid rgba(0, 10, 20, 0.2); @include S(border-width, 2px); border-radius: 0 0 #{D(4px)} #{D(4px)}; @include S(border-top-width, 10px); @include S(padding-left, 30px); @include S(margin-top, -5px); - @include S(letter-spacing, 1px, $important: true); - background: center #{D(10px)} / #{D(20px)} no-repeat; + @include S(margin-right, 3px); + @include IncreasedClickArea(10px); + @include ButtonText; @include S(min-height, 47px); + transition: all 0.12s ease-in-out; + transition-property: opacity, transform; + display: inline-flex; + background: center #{D(10px)} / #{D(20px)} no-repeat; + background-color: $colorGreenBright; &[data-button-id="shop"] { background-color: rgb(141, 70, 223); @@ -42,13 +72,17 @@ background-image: uiResource("icons/statistics.png"); } + &:hover { + opacity: 0.9; + transform: translateY(3px); + } + .keybinding { border: 0; color: #fff; border-top-left-radius: 0; border-top-right-radius: 0; bottom: unset; - // background: rgba(0, 10, 20, 0.5); background: transparent; @include S(top, -5px); right: unset; diff --git a/src/js/game/hud/parts/game_menu.js b/src/js/game/hud/parts/game_menu.js index 105b0970..01b91bbb 100644 --- a/src/js/game/hud/parts/game_menu.js +++ b/src/js/game/hud/parts/game_menu.js @@ -33,5 +33,11 @@ export class HUDGameMenu extends BaseHUDPart { binding.appendLabelToElement(button); } }); + + const menuButtons = makeDiv(this.element, null, ["menuButtons"]); + + this.musicButton = makeDiv(menuButtons, null, ["button", "music"]); + this.sfxButton = makeDiv(menuButtons, null, ["button", "sfx"]); + this.settingsButton = makeDiv(menuButtons, null, ["button", "settings"]); } } diff --git a/src/js/game/upgrades.js b/src/js/game/upgrades.js index 0b354a0f..f9accb79 100644 --- a/src/js/game/upgrades.js +++ b/src/js/game/upgrades.js @@ -76,7 +76,7 @@ export const UPGRADES = { description: improvement => "Speed +" + Math.floor(improvement * 100.0) + "%", tiers: [ { - required: [{ shape: "RuRuRuRu", amount: 200 }], + required: [{ shape: "SuSuSuSu", amount: 200 }], improvement: 1, }, { @@ -99,7 +99,7 @@ export const UPGRADES = { description: improvement => "Speed +" + Math.floor(improvement * 100.0) + "%", tiers: [ { - required: [{ shape: "RuRuRuRu", amount: 200 }], + required: [{ shape: "WuWuWuWu", amount: 200 }], improvement: 1, }, {