From 4e6164943c78588c6a830d73854d295bf4fe20fe Mon Sep 17 00:00:00 2001 From: Flashfyre Date: Sun, 23 Apr 2023 15:13:21 -0400 Subject: [PATCH] Add PP to move summary --- public/images/ui/summary_moves.png | Bin 1249 -> 1304 bytes public/images/ui/summary_moves_cursor.json | 14 ++++---- public/images/ui/summary_moves_cursor.png | Bin 154 -> 166 bytes .../images/ui/summary_moves_overlay_row.png | Bin 205 -> 209 bytes public/images/ui/summary_profile.png | Bin 1377 -> 1507 bytes src/ui/summary-ui-handler.ts | 32 +++++++++++++++--- 6 files changed, 35 insertions(+), 11 deletions(-) diff --git a/public/images/ui/summary_moves.png b/public/images/ui/summary_moves.png index b95755686b77719250f0dd238020d7913de88d78..54ddf0fb2c72bfb02b91c8ced4253168007b95ce 100644 GIT binary patch literal 1304 zcmeAS@N?(olHy`uVBq!ia0vp^*MN9F2OE%V-J;&bz`%0f)5S5Q;?~={3#)F$$Q*cB zzkfNCWM|JCRUai~^>R)RmFWVKCsjj~l$FalC%d~Tz5doIHj5=F%F8O!+(N#yHoF;CUC+(dpRvk* z-nH2?+E?uG`9HV1xjk)maN0hb)QQV=!tAH-&1ir8;c5Ds?Pq*;-_)I#zH|DcIqOeH zw0S%3%Z$k9+8`w_%{F@#y*8`f?A1PX={T;k!;yN=1iL$o)}E_6 z$tf;>?SspGJ%0U%yEX@Y-}&}Ngn@o8yWZJ%@o^>g$7hMno)J2`epm9!Z#&PHPZQ@4 z-#GuQQunsHe>J6Fir2)~2Z{VNQCjxDr2X}x(z4p*{^t)w-#oWk-1J^UuY@WPzN1ynQw27|K&#NDAZx73Rt@G}^QT^^e#{1XT{J$&8 zLWBe1{yF${muz*C6n}ref4s+R{^{)TA+wkN6R*(||2$*;>AfE}KHrvnIJYlbs^gZ?itRYU0PWkksV9(|ljg z&+gmyw?Cbz>(wn!-<6y3VdeXcr?NyVPbv9FuBp?jR)1RXCt$^N8|9u@x1?jgrc8bx zU~u>53)A&~Qn%hZE788~=e@7~a~E!(zTv~lMA=KCw1&E;(L)URUYVmRsEk<(Z+q$2aaiX*ff3+x|T1N6|^I z?)`k7r!F?%__N}g$@<^>Y`+)Ip2+)ky{IoJm`QXFY}{sj^BR^DrGc5rA%4H uu~&ACbKa>bEwavLd|z|^>Ysf-U|?C{>EaktaqI0}{aLde7}`GS z*D6i$cydB!p^;GJO=X3NGK`&1I3`Z?cp|s3NJU8UdY8@{1BXpF&&p5QXFoaBNmDhS zeUcrowrAIN`~O@O6IRtluk8@<-cTmqwCh>NgFL?5Z!KKx4|%jdPA-Ts`&VReXT`>a zn@j>Xop(QdtnF{ryBk-2RR;Ez{kT#V*J>*lXZpTB>|nyqzz;==Y^8UP@7VXO?en6L zWr;qq35!cZ&gC7C{ePz{PSefrZ1|>VquO%qBuS@>=y$4rv zzD=EZ^+v$4Hm&;9<`aJl4V352JK5!bZr-mMuKq{oyeUq7bj7D*JIA&e@}HTF%|ens zU0f;EQgN{~S-j8w^UuwR=C^k)OwCkU8kBc>bsWudn^?c}L)#tmrNLcMYRi_gIM=e0-?+ZL^=V>DA-U4{n~X{O@0~=xmRmFBfFj zJ!;#fS5R|yUV{DipwzWx(#8_Q`9DT3E8lZ(DT`uKr6N(wdvaoFS zgz)d3dp@p{B*Jkh9#dcYd|pS1h26gThfN=+@6}H-DElG*X)`#PJT3+X_`hw>wiW07 zt_-Zp{#*PzGsogqdil?wZxt0+_t;0VHa~Sc_+Ro-cuMA_|8vBb8mXQNfP@ zDgWH%(&4Xks`sB)eO+$<`|;-AD>wcBx%%TnH$|^s6@gtdKl&NUZ2ukB`RQWCvL{cz zt>0#|IllPxJD*#vovrc8&s;T=oh7AL{h7)e=Tcvz^+xr)Me*`dn+i9Z@>6BZ#p%1x zpV6rd{APUVirN0%|H98R+*M^2lY4YU^TLgQ&XexTkL=9${4TYz`r`SsQ|fBA&x)K} zYq$GbhV2vV2#P-Likaz2?HD``2-QpY-ES`LTCpQ|_gwsUESO zS9jjF{1tDP^)tQmt%Z6sg5Phj-#q`HL}T4~t$Y9eXnQ)wes8|Ww9im%{mUP{8|BmI zA1<@Dg{8bBfrqaitzNk)Y|3B2aZhz-!ls=ZBYc-=Y8LvN-PvFVdQ&MBb@0NchQ ARR910 diff --git a/public/images/ui/summary_moves_cursor.json b/public/images/ui/summary_moves_cursor.json index dc391a56427..0a313153c4b 100644 --- a/public/images/ui/summary_moves_cursor.json +++ b/public/images/ui/summary_moves_cursor.json @@ -4,7 +4,7 @@ "image": "summary_moves_cursor.png", "format": "RGBA8888", "size": { - "w": 156, + "w": 208, "h": 32 }, "scale": 1, @@ -14,19 +14,19 @@ "rotated": false, "trimmed": false, "sourceSize": { - "w": 146, + "w": 208, "h": 16 }, "spriteSourceSize": { "x": 0, "y": 0, - "w": 156, + "w": 208, "h": 16 }, "frame": { "x": 0, "y": 0, - "w": 156, + "w": 208, "h": 16 } }, @@ -35,19 +35,19 @@ "rotated": false, "trimmed": false, "sourceSize": { - "w": 156, + "w": 208, "h": 16 }, "spriteSourceSize": { "x": 0, "y": 0, - "w": 156, + "w": 208, "h": 16 }, "frame": { "x": 0, "y": 16, - "w": 156, + "w": 208, "h": 16 } } diff --git a/public/images/ui/summary_moves_cursor.png b/public/images/ui/summary_moves_cursor.png index ca06318e2c42f6fbbefed81e7ad1ddd6800cfbb2..6b8314b66ca660985ff104967ead4df02a693c00 100644 GIT binary patch literal 166 zcmeAS@N?(olHy`uVBq!ia0vp^7l2rSg&9arlz1Hnr1%4TLR@b8)9{WVokm z9uJViSQ6wH%;50sMjDV~a>ju~FiH{i?iRL&S3j3^P6z@dPH4@e2faPS>$ zgis&D4{m+q(-^wt4a@OU2YDmA=WnZt+NRmIX6YV2zrQB(`rp^@XP9RFrGNg8=WqA) fD`t0gR4`53s(8Uv%_|D%3Ir1W^7suIj~&}~&hFVg`^V?rf4=ved+zsq@6EH$b}~>HR6;^R z=CnQPoVX8)DVN+WuGj0evn3=TPfw$4&{szUqZ+Xj80FOWMC880Li>wa3SM4bH>-0{ zi{I1g`=*@F4NalR9b0NumnD>BG zVdGV_FoXys#PO(Zuoez&93Wgh^IlpzHguNXNm%~ufLWi}YiKs=$S&g-^q}P!@vmWH zLVvVqX-CB~-Uu;Qx%MSmPQ2BQZT!9wbB!b+W*h;nT1Q5mx*!{J48DIb+6q@xk&Zp$ zNm+bXV!LqYa(l%G`vGN-z(pG8fk266Tb(lN4+?IAIAG9|<<4C#Nw(oM2mlpA;ztB% zX0bLwS-L{%&X5m=is)Ylal%sRJ9Qv z&TCp@Tq9M-W+&Pi+T{YjNvrvOLMV6uh;18)L1jFYIVkg_6D^xDuyDk~VqbN5%x^4D zvtzwFeN8E#0McnhB{#zvb|}5M%utsuVlh4}qLJHmf3Wpw(Y*;kxNfCEAaa)(xrKmW z`oYTjbEKZ{vP{#!mTwwJGJTwu4){phLY_%SBrGh(*2)hBhM%nX30vvdXT3_RS8c{a ze2-()_2d*KrMAg{Y_okuyNd$$sT+-SWzdcZjW+cb4ao0TEP)Y| z81Pjtr}!z*udq3YDfv+&EGXdhuS^0{A^J|}l&+`G4|O_fyP3+-DwVKTPo3@;ALF15 zH8tZA_^Qd-%{3`Yp&8!DV1nmKshz_e8Xh8?Zx)#I7?cl2N$IB7~o3ZR0%~; z^)iO8*vi+VXT|8x*Ky$6;aq!LYm3OR`)wkBueIjaH7?bIx_Te(o~PddcE4+O1{H-fb(VpvkSc zy-4IVV0`!yKp+C9MPVHr6Qqgz?|=Ru`C2lf25HpnW7R+(^`YEFK7;htm*zrwYu*pv zFaY+e5payEQpe*~={Ewblk=Yg6EK^p$}x^xsbr`)xfn}n|9-^LfS%T1%WPgERWuLH zhFY{2hD`M?%UT(Rb<78}D1GtyUrG6D)c^YWB~*Wxt`b^xQ&^?)LnlX=?O7&eE@fIX s>g+D}8rtEXT`i?cjb_Zxxo_@dwXY7<{&L$u{JbSj+d89aPFzU)1H173{Qv*} literal 1377 zcma)6YgEz)6eo`rS{7((mQS{_!ZIzLGl?X$B*lD0*h$DpQu8e$F&SA@D5h>&S%{_? z?SB$lQBHK>>X@1YKCn>H2wmwkG?u1d*r*RXr?Won!+qZm_x^tO-2DC6Jyw=$EI}ZU zRmfg+q{-Hpqzb&mr0I5M2_Vqo4I${jXxe~w$Sr3$bk!+M;>w!4*7WV90zl?zz@Ip)anyq|16u-zehv%BNemJz1YN6?Qjy>Hyd+U@&~a{3VyB zH`23%P}6yVgLp)!BebGWBb^Yk0hW|IGm)}d=+5{(b>O?}0^KVG^#|Y0k5n|As!9&5 zB{JTB5Y=gmm368rii$y+kt}y(y|u$lyl*@4%=rPal6~v^li=2eUiOt?9N9dk1k#cG zQQbLP9InKU-XC(Qh)CMGBpW)4H>Mzw6vr*0EhNZI&FxwRNpNPHjTb@}W{kZV4d`8L zP5uG%g47il?nX zkQJ!|Iap|qtiz#p(7$`VXkH*`U|^N!(E*||?!M+kwV0m(I2bwX(xy0CVI^|WkeAx9 zshkZ499&^+Fa(M=XMp8x>I(DeccP4rT!0oAD!05L}9>3A%sBN~4c5kc!UZi&WvU zyo;T^#D|MH`0n~tOw@drK9T8Y8)8^lP(HF_oLAc%Ai40S0RqiZp2#p1MvVc-lGkQr z1j3%%>fOxf85hcL-ONlFDr@j`4u31XCh~{RkJtQ}RF`|;Lwz>EP~ZRkFM=~Ym?0RDYJ>CAh9tfI&Gj*n+c(!|GAZQ@^6x$WH3k`vO1&XhiKjX!A=HM3& z`N8}wfD=2Q8Ip<}n6a`7(wPb%9?u$X>x1qd{pnX+OF_Ss{wM`+Pjmk9^W|%;0xnRM z<#rnVaj|07w^I8QFw6={eD2VR=O8HBvI#Z(fq^C%xIQbj zqomiJB`aVoh_5?*Hs-@ge_>K5znaR6W(^v`RAHm7^9r(Ta1PVXPtlme_)8xE#w#aP zW|ylDF^RSN;-AV8lmM*9FwkxR`3-54pV^(JzM9=_jj;DZ0OEz+u(VAhlI;V*m5uE= z?X-$Kwr+-$3q!)=u`Gu74VAHjn*JL2zUY|FhcJoty|^tW3~#UR(fvhLb=*&r@uiD_ z`E;T4q&pJ@j+@!qZ#Z(&W(7SrDx-<^!n#h#3+CNx-iTpPb3KkKBu;n9Lu%;=*SMTW znB|P+`8K*TuEpjzlwReykj}bwI}|J0wi4yskAf?#vBRx}BxR46%RdJo$3e-riZ zNq@=X7i6#Fv5a)u# diff --git a/src/ui/summary-ui-handler.ts b/src/ui/summary-ui-handler.ts index e7547149aea..30df0407b81 100644 --- a/src/ui/summary-ui-handler.ts +++ b/src/ui/summary-ui-handler.ts @@ -322,10 +322,10 @@ export default class SummaryUiHandler extends UiHandler { this.moveCursorObj.setVisible(true); this.moveCursorBlinkTimer = this.scene.time.addEvent({ loop: true, - delay: 600, + delay: new Utils.FixedInt(600) as unknown as integer, callback: () => { this.moveCursorObj.setVisible(false); - this.scene.time.delayedCall(100, () => { + this.scene.time.delayedCall(new Utils.FixedInt(100) as unknown as integer, () => { if (!this.moveCursorObj) return; this.moveCursorObj.setVisible(true); @@ -414,6 +414,15 @@ export default class SummaryUiHandler extends UiHandler { const newMoveTypeIcon = this.scene.add.sprite(0, 0, 'types', Type[this.newMove.type].toLowerCase()); newMoveTypeIcon.setOrigin(0, 1); this.extraMoveRowContainer.add(newMoveTypeIcon); + + const ppOverlay = this.scene.add.image(163, -1, 'summary_moves_overlay_pp'); + ppOverlay.setOrigin(0, 1); + this.extraMoveRowContainer.add(ppOverlay); + + const pp = Utils.padInt(this.newMove.pp, 2, ' '); + const ppText = addTextObject(this.scene, 173, 1, `${pp}/${pp}`, TextStyle.WINDOW); + ppText.setOrigin(0, 1); + this.extraMoveRowContainer.add(ppText); } this.moveRowsContainer = this.scene.add.container(0, 0); @@ -433,16 +442,31 @@ export default class SummaryUiHandler extends UiHandler { const moveText = addTextObject(this.scene, 35, 0, move ? move.getName() : '-', TextStyle.SUMMARY); moveText.setOrigin(0, 1); moveRowContainer.add(moveText); + + const ppOverlay = this.scene.add.image(163, -1, 'summary_moves_overlay_pp'); + ppOverlay.setOrigin(0, 1); + moveRowContainer.add(ppOverlay); + + const ppText = addTextObject(this.scene, 173, 1, '--/--', TextStyle.WINDOW); + ppText.setOrigin(0, 1); + + if (move) { + const maxPP = move.getMove().pp + move.ppUp; + const pp = maxPP - move.ppUsed; + ppText.setText(`${Utils.padInt(pp, 2, ' ')}/${Utils.padInt(maxPP, 2, ' ')}`); + } + + moveRowContainer.add(ppText); } - this.moveDescriptionText = addTextObject(this.scene, 2, 84, '', TextStyle.WINDOW, { wordWrap: { width: 900 } }); + this.moveDescriptionText = addTextObject(this.scene, 2, 84, '', TextStyle.WINDOW, { wordWrap: { width: 1212 } }); this.movesContainer.add(this.moveDescriptionText); const maskRect = this.scene.make.graphics({}); maskRect.setScale(6); maskRect.fillStyle(0xFFFFFF); maskRect.beginPath(); - maskRect.fillRect(112, 130, 150, 46); + maskRect.fillRect(112, 130, 202, 46); const moveDescriptionTextMask = maskRect.createGeometryMask();