From 028790437138947426aa9b3f1327e7a4e3e08f83 Mon Sep 17 00:00:00 2001 From: Flashfyre Date: Thu, 6 Apr 2023 00:15:33 -0400 Subject: [PATCH] Minor change to party UI --- public/images/ui/summary_moves.png | Bin 0 -> 1260 bytes public/images/ui/summary_moves_effect.png | Bin 0 -> 463 bytes public/images/ui/summary_profile.png | Bin 0 -> 1377 bytes src/battle-phase.ts | 2 +- src/ui/party-ui-handler.ts | 13 ++++++++----- 5 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 public/images/ui/summary_moves.png create mode 100644 public/images/ui/summary_moves_effect.png create mode 100644 public/images/ui/summary_profile.png diff --git a/public/images/ui/summary_moves.png b/public/images/ui/summary_moves.png new file mode 100644 index 0000000000000000000000000000000000000000..bf5111e4a03dd0a1a6bb8c725302dc1389c593b5 GIT binary patch literal 1260 zcmeAS@N?(olHy`uVBq!ia0vp^i-34O2OE&A5@X6>U|`wo>EaktaqI0}-Kxb74DBE5 zzjZn&O;j#!@lq*zD#zG)MsR{hpMYei%Qp^fccqDiu@jvV6FyyhR(*fI=gbY8bt`G-=Y0x6TLVhJ5{<*)uH8*Dvp3(R`_8_dFaGpN1OM62T5tY+S@mOy-m}(4OhIjJN8sn{aklY zc5m`4rrB>6U$Q=5@IU$Uo}iwXS^7(&FFp&~W;f%}mYr&iqK^xA=T7b7h(EgC+uvgQ ztlIQcQ?n@>7oNKRI`GLmiwHsf^(jX?S1;cecG1~z`R$nO!c4Uz*(}jNj^8=Z!#j0W zP0>m=#d%-%Y~(&3`}5A#4bgAg7OveKa%#z)Y2vk94dOf(c^BU<(_eY`YFLS0?5cjNdEHw6ll|e&{h5oFd~N@sbJ{xY{Yn}I{xA^C-E4Kzc)pCD) zxFG$z{;A2&ULKpuyKV0N=X3t(_R#~zp6)(W+g zjMuic_2Uol)`Oc}Hd7sT%>u+O+D|yYnxywiExRyxwBpX{&d8l;n1& z@H0!VD_g!sr!w%H_N6;>?C<{H9p3OxlU2^<$WHGC8y5ym_Sfs&_k7af=N)&O>vEQs zJl=in)U3SX_a7hgDgFvu@UWsjUhV0&IWCvuUvbs@{Oy)XSAF#_M*N-SN8Wfz{^x;Z zv!_lK$glWmTXuh;xW?g)54Y*}Bp;NiYOOt0xGS0EmvOgB-R}uY7OeYy@C9St0lD>= z|CztVhtH3dIlsQ6{$G@;+9Z*}YXyZT!&a@inwI(}|GtaoZ%M_1qY}PLG&27x&Pq8R zdB}IiT0tc_eU}GuWTYjG)QFi5j|8`6tZp!Fnq3gB>|ztw;VZgo6K^_ac<9ZvFVSz7 z&b*(nADV_NlXvVuOFZekd$QOdDgB-NBfUOL=^ZN*i@op59?;cQ(d@i$XCb;{`l`D4 aKg<*NibeL^Ws?AwVho)LMGpER<0vnktY zLY{fNQge`epCiMA9W2&c8SG}3?cU2jV}-5k;^5m~ZU=5xe*9?mxzA@-X{`2qRTf`z zu5kUe|8HjQxcqeGPfIJ;xn+xA_#Y{FbN7Vt>$Q0?cUFq0E{zF0weA-Gui4rUMdseQ z^YfCw?ew>G?=QYjJ9GO6U)QEdg&TXiL*ITn`TDQ)S1%oX^L;2(c0;TjSf8DArjI?;ydr7q+?pvehFU`r@R^R&YYtKCX z-~X(c%u_d8*?4;SKH~qdr#JHPiP@#{9QV4-FEI!)FtP|ZFex-JFnKTlSqz*&7KZ{O zkj1D1Vl}V;Su7J6fGiZnU!J|&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# literal 0 HcmV?d00001 diff --git a/src/battle-phase.ts b/src/battle-phase.ts index 84d866c1175..21c4b541330 100644 --- a/src/battle-phase.ts +++ b/src/battle-phase.ts @@ -687,7 +687,7 @@ export class SwitchPhase extends BattlePhase { start() { super.start(); - this.scene.ui.setMode(Mode.PARTY, this.isModal ? PartyUiMode.SWITCH : PartyUiMode.FORCE_SWITCH, (slotIndex: integer) => { + this.scene.ui.setMode(Mode.PARTY, this.isModal ? PartyUiMode.SWITCH : PartyUiMode.FAINT_SWITCH, (slotIndex: integer) => { if (slotIndex && slotIndex < 6) this.scene.unshiftPhase(new SwitchSummonPhase(this.scene, slotIndex, this.doReturn)); this.scene.ui.setMode(Mode.MESSAGE); diff --git a/src/ui/party-ui-handler.ts b/src/ui/party-ui-handler.ts index 3d905dfcc62..fed8420c6fc 100644 --- a/src/ui/party-ui-handler.ts +++ b/src/ui/party-ui-handler.ts @@ -10,7 +10,8 @@ const defaultMessage = 'Choose a Pokémon.'; export enum PartyUiMode { SWITCH, - FORCE_SWITCH, + FAINT_SWITCH, + POST_BATTLE_SWITCH, MODIFIER } @@ -193,13 +194,13 @@ export default class PartyUiHandler extends MessageUiHandler { if (this.cursor < 6) { this.showOptions(); ui.playSelect(); - } else if (this.partyUiMode === PartyUiMode.FORCE_SWITCH) + } else if (this.partyUiMode === PartyUiMode.FAINT_SWITCH) ui.playError(); else this.processInput(keyCodes.X); return; } else if (keyCode === keyCodes.X) { - if (this.partyUiMode !== PartyUiMode.FORCE_SWITCH) { + if (this.partyUiMode !== PartyUiMode.FAINT_SWITCH) { if (this.selectCallback) { const selectCallback = this.selectCallback; this.selectCallback = null; @@ -305,8 +306,10 @@ export default class PartyUiHandler extends MessageUiHandler { if (this.cursor) this.options.push(PartyOption.SHIFT); break; - case PartyUiMode.FORCE_SWITCH: - this.options.push(PartyOption.SEND_OUT); + case PartyUiMode.FAINT_SWITCH: + case PartyUiMode.POST_BATTLE_SWITCH: + if (this.cursor) + this.options.push(PartyOption.SEND_OUT); break; case PartyUiMode.MODIFIER: this.options.push(PartyOption.APPLY);