From b77fd1755c8ee551c0c0d9faf59385658dfa6b8b Mon Sep 17 00:00:00 2001
From: Flashfyre <flashfireex@gmail.com>
Date: Thu, 6 Apr 2023 10:05:12 -0400
Subject: [PATCH] Changes to summary UI

---
 public/images/ui/summary_bg.png            | Bin 1136 -> 1163 bytes
 public/images/ui/summary_moves.png         | Bin 1260 -> 1249 bytes
 public/images/ui/summary_overlay_shiny.png | Bin 248 -> 288 bytes
 src/battle-scene.ts                        |   4 +++
 src/ui/party-ui-handler.ts                 |   4 +--
 src/ui/summary-ui-handler.ts               |  37 ++++++++++++++++++++-
 6 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/public/images/ui/summary_bg.png b/public/images/ui/summary_bg.png
index fc73304b85492b2eece29a441ea4bcefab4cad13..1cfe3f58f55076d887dbe0cfbf9c0d69e9cc36ff 100644
GIT binary patch
literal 1163
zcmeAS@N?(olHy`uVBq!ia0y~yU~~Yow{Wll$)``g3NkRT1bMnRhE&{odv{^+tptW+
z5BuX>Rg8>`HW>+Zu36*a7WU15#TpksKc$H$JW^6rge0$b=EhuST6%j@zxTZ3Yu?Hp
z*R#C$@6wu_O?uncH@>)J)BWqu&)P>S23F>L2TN~U^}X_ZefZkR4U9)Pniy5iacnES
z^ZfobKc>ZnuLZv7?>~P(<ofP|nUe%QeeS=%XAQsndAaBDb^nU{@0&+@yq}|dEb)<=
z$Nn^Z`Rlo#f8?=jHd}J?qi9W3t<0Y1zrP+mUw`uP@<`!JyYHMlq-t<?%Ke+`%}*|W
zT6XgK|8F0Es}*lDXkcIyIKc2p-|o%_i?3hb{IGYoEIs`AlC<J<ySiDXeqxIssClrY
zzh`PcU$4F7^zH-p|Lf|sS(rU|(%&(BKPa0J!zAo`<|DVFgguYK#AC;$l^PgL>W=aM
zGN?Sc@3&+^%1@h5sp-#r1teZF=!KnU``}d@U7gHSz-bfIT`4D4Y_7UMyMB+f&&1_@
zCq!4in%m64RWPTn-Z`i-fr0Ut<N?=j0;`^%J$asyEw<tG(@QTHo4-EYek4AHzrFwT
zCZ400&jhlxg*T)|%B?-HNk`T);Rf@MG8RTR^9H@b#*2IpHhRaoa_}5{tGYPc<}Ba*
z-#_IIelXV5zkD4eA@Nkz;J^wlgBF1<Gv1S13Z_(DdAB-1^&Si3qd2DRFCVgc?(Z@)
zZ4xMEm>T~^B*v0WAREX^`Pa=C(7+`?Eaq9j6w;8uAi98wg?R;osDg%r2$`6bL&Jf1
z%of0?<zUdj6~NfU7y@*!hys}y=x`AdFxZn44y-E}9DxpC<=_$^69+Id0UZy=cX<|Y
z^+?q3`{{6pam}PyjXeU3S4;w?mW|vOxCJFPNw+gVQ!<l;0|PS$F!AsxG%&J|BY1$J
zXz8jdaVL(%->>~2{NH8!t?BWuoY{Mu8DjYr!p&;Fp8Mh0uC_2{j}^}WiJy`RB--WR
bUdJ%wT=%YXfm0>`3mFDaS3j3^P6<r_4EA`w

literal 1136
zcmeAS@N?(olHy`uVBq!ia0y~yU~~Yow{Wll$)``g3NkRTn0vZ7hE&{odsi|1b^=4&
z#q}~SDXA$bK&&d%xu(bElkkM8e_A|KRE;(n83A!0=eBu$(}W~UOz!VZYcAfE=lT6p
z3y)dk)Ys1sJh)^d{pIK9*GD`Rti<^ap1*MI?1J<0_GNxdYy!$0Y!edQHmq*1{a5-{
zMWENa{lS+{uWOd?isSX0+%iGF{?Fy2t$%<1`S$AY`T92>XRC3)JY%WECv5KMm%Z;!
z{PyLy!<A>0D*E!Re{lElzXx~Y*H_us&p+<JS#8PYJ0}mR8r%=AbH9II<^8ni`QPim
z0SzeLWYECCCUAh^ll`~6ialTdz4>78UirGs{l2tft-SqNDfMoR9h^oDi_04i|Be^^
zG`GAlzOH_s77OzUfxbJ8cC6(Mg`8&++GO?%G<`hGV07Wfk2a13hTi!fn}cWQY>u~M
zx7hF}>%r-BXUrWH{HDK7eXLP)VOQSaT{mkUuHPZ`jsJ;igLlHOSx++~Vs=I{q{lbx
z&KIeC)$t|Z>f6%-X_xi&932?{71Y}YoT)j$zzj5+@t8?N_Zzj4@BaDwcnw}L)l^g%
zR2_Ix^XorLWQzIi`O{M+yLRtf%-OS^;q)e(h{n`NtEK}x*bB;87#B%9OyA+Kg}LIz
zq;Nr|=Wp)LR@l8b{Lb0!`M>|j8~kFdseSo6NTTDDkc7f2CLYC>Mc&Rvx{Is~?k?jB
zy;RleaAo>|*j=(MH$-BySQMWz_N@K$E%?L5)htP}2P96vzu(Ugr?P-SRDsr5!hv-K
z!$Afu2UZTY07fl`fCerBT4SCCOd$;k45AB|SeRD;{Rno0BhYe%LySE;nHI~}choYh
zUc&3T#5q89Z8*n~xP~?ciN)OQ4AAt&B;f#wJ|2YzMiz1e4=@mE#)q1aQfViS#J|to
zAK1jo{p$9$f1UPN;Xnl2gn5U<w;$toOAtDBbn{_`BPX6SFoM$**^WZ;6Pg(f7k}_h
Y3wQfB_rts@U`fK@>FVdQ&MBb@0Q7Q{Bme*a

diff --git a/public/images/ui/summary_moves.png b/public/images/ui/summary_moves.png
index bf5111e4a03dd0a1a6bb8c725302dc1389c593b5..b95755686b77719250f0dd238020d7913de88d78 100644
GIT binary patch
delta 1061
zcmV+=1ls%T3E>HlB!8$$L_t(|+U?yhnwvlXhVd_bB9KVr$Q+?E5?R?JAdwsaiR1{8
zkx1kop>iY=8P|#|>@YyG+07r4zCV*?LMbJ02a-MwD@lsCKmQ7Nkg9%Lt%wjyuyz-M
zy5@-BZVub+I7C0fNQdKNa9lS2axmPev7xdwQL@iR%f^QNdVlWN)cSc*j&}Iec3y=&
z9$q!?k5<88xl!<PAqI8b$GE=chV!CSreRE7V54<Z&ThwD|J-(7DMn7sSJKUBQ!`s1
zO!2vGjRGr%<96RF5fQ$MAJ^XC)NJ;Znbp`(#)c|?WrN85aWEsEp2><&&Yt?1MNh??
z>~m$})J%xC2!FPiAM*n<HdJEr(Wx4Qc+quZ7mh#k`Lkg++qt1-X(FXkZp*7)0^kKh
z^uy?u{Zpzt+qutmV{?I>+76yy|1T@<=ZI0<YFo4q-7#AQygC;!@!=`<vra=b)yL<-
zv!5gW{$mxJNK*9B9j@Yrx-M{h&7NRC_flo8b{jJoA0K>t6UFV*{DJV?e`%t)oe%L@
zrgyyFr34{jc_9LiLX+G9CX-GC5tEMs1_dBQ5F$X6!2v8wi2ou)TLl~u+=bs7A!2zU
zHdUy~HXJ3~RAn1ARX7-1`z!4>Ms?h3TeOS%8-p`1Zu}e*NS%giDl-~iPp#Zkp>~^)
zSNDm$@va$@*8wAcfDl2503m`90YU^J0w=BKo``ffKE8k9g7KHVFJdru_#g7KG*Pn8
zN8@wPbz}av=C*Tg`*~4*YyETkX>2&!XLtEh_IP;Jygyn6gXKoS{~6*}WNFg>oEN1s
zCCXI}#@%oy*DuOXZKoSo>MVP|&n4@3Kl|ge`>C@3`K$4N;YJ}!`gl=_nek3B9Jl*c
ziSp5SrsU-IueLn1UvtauOxlHsg<m7)MJZ!L85^qnl?`4*e|#$JCC@l>r*%AdMm%@Q
zb^~)~yU)xlc~SN=($qG;yZ%?t0No`879Qf%DbUzZiOEN&#JOup_ZqQ#(a+74etfr@
zS(AM}yZ?B9K!|fQkUQQ#mrA)UN73}Bx?(=2{!NWH6Lr6?3-^-v+;_(Ac9h;{W+lWs
zo_^0gcj^s_JLWFWg>f#JQ}3`pv!DJLfqu^_-v0b6NkLurgV6%MF&3}s_>Hk2XP?7%
zJ3S-*{$mxJNK(X6!_~!msj^nPjhX-WCW_nl2!R_H#%Ll%aXTNPi4Pnl+=bs7A!2zU
z0*^wI+yN$&P6QE?j{*jCAVd%%K!^Y#f)D{h1R(;1h^GkARslx@cj322h*(~TO%<xL
z4Mzz#RoP~6hf-<c?xeeoQO#{~aU;ju<eJfVf4^pFc+Y0w*1CH&k7h*o3E-YqlH|^c
fz}>GI>$lZE4UZL-Gw?}B00000NkvXXu0mjfvPB7S

delta 1061
zcmV+=1ls%I3G4}wB!9C>L_t(|+U?yfdZR!9hw*>*i9jNeBXfjGBy!~*0g22JkVuXY
z8Hq&p2rEY-k#Sv-LSbO?(dK*KpGldpvn+W#B-!-oLXwjB?L)wwRQ3B}L4<e&%i%^)
z*PIdD%r1_nA-WMp+U;+H{kCzpgYl%shFWK-(rrH3Ha6_{8-I???VlIr<bV&&^D6BA
z^s4#1wF*Ytje?g8F{tZ4#^og^&WloOjbrKpo9v^~JI`?cWAnUHj9i*8q+8MER<=Hv
z;<ULYffeI%yKR+<2w%moOHVkrntf+wH8zy7p~~OuQRMD8SP>7eWW|ZAr@mIvLouh@
zTx)S@Cd6w5TYvb++`x<tm708VsRkjQ^}MkQ$6fi{)v#ObhM}#qRLZ2>mKS{rfENtW
z4Wrw3FR8=TZg^ie<_ql5Ja~Tn|Evt(M~sqIanauOz-$%p=$yeMyQetLIt$fQU+)Kd
z-$(rO*D5iQr0A{(TqO;4onil&J;8BqrOH}uR%SFldLH{GO4_IS2jRKDX`-a{hxjbZ
zJ6`Xp1R>(_LIm!Glf(f(10Y0zlga@tO8-TOwhA~SxCys4Ld4^R*i@k^+i;d}Rh4bj
zRN-iB>F%^y8P!RvxM&~hI|fG{+~heHkU9(1RAw^1oZGpnLTy$dkM0wB=T$S4-~k<f
zxSyr(j!3)x?dRuHjl1o9Zq?ZF=NH#ms&t!A#(np7WA0qOd5+DW7v+!kKX#nPhLd9+
zZlBBUPp_KKTdQES-6;4!L;Q|)miAxgMX9w?<tj(x!*FN!FUphV>Bf}}ww=G{oc+76
z-Er@6s_ei1ZhW{>h?2e@l)^LKDaPY}cH1gdJ{eytJvjfxwmrw?+a9i@U6^?A=ZJYx
z%GglGhAMxrM-QSqJ{R^QuQ<NTI_|t89=l`@0~@Y(r>rb_QT8j++?+q%|GQU!?kNQx
zJjA(6ps}G+lTR**zUPv|=ZM{der%<5<Ga?%nr?IN@#795`c|Ofcz<6e<+hxEMAKjD
z3V%%fiyCJo>i%38?m6)dUl|YQQFfb^l@M=u`8{^up%*B_vEjBajAOwZdWC(;ak^s!
z`ZJ3pe*2K5psxGD=mCDf9<OQt1NL86pIsc!uZVyCS|uiu6miyYamiMytkq^^{BPex
zN&6WgaK#u+q$p|qA(~{zS;9>TxUCT)9xp`TUXu_49+Qs(4U^sh8Gj%|5F$W`AVh!=
zL5Kh$f)D{h#8ZZ7tAI0tn{ZnrL_A)IO%<xL4QB~gRoQ0rTkNHo-(bI48P!RvxM(?J
zxVSnC)l_COzMR{+sX}d5A!iM|Y6c+!ga|?e?jPbVjyW5+sbO<V-yOg$EhH(4-#$1M
fxR<JaU;G1+y%t%F-3|sA00000NkvXXu0mjf^G+Jc

diff --git a/public/images/ui/summary_overlay_shiny.png b/public/images/ui/summary_overlay_shiny.png
index 6aaacc8cb72522b9f1f756b578349e53257b8e95..0582b2aadfc186d2520658fcdb985ef66224ba6b 100644
GIT binary patch
literal 288
zcmeAS@N?(olHy`uVBq!ia0vp^2|%31!3HFqnM2}$)N@Z4$B>F!Z?7NZZE_HBxEPtt
zI3-bY%EqN{CkibS@xHNG_Q6q!qz@dkUsRhP%2li9xcGb1wy^6JKWm;vOz-HZoOk%b
z@f~&57k__>^GI`ByH?`5BWudDJl2_+PU$)cyII(D4|GcIY1lh?afh(oq1y|u-}1`d
zxa<FcPPzWw^EWse>$jbc4`$#BVBlh4ZD4X>T)+^(pur$Q4etJ<Ovldci#TL)xkTGP
YbI1GQkZ-4>fL><sboFyt=akR{0Ifn|g#Z8m

literal 248
zcmeAS@N?(olHy`uVBq!ia0vp^4nXY1!3HF`KLzaoQu{q!978H@y}i7V_mF`=+ePCf
zhGPj+dLCYkF*?+Hh(mL8W2Tab;)E5&?_Vzp`TpAS+E>HlFO0w0?LU7{RVgWQ+KQ4d
z8(*)NfBmb1f6~m0zcZGLPM8@lnv&M5ULdnD>OJE*uRre@_f1@{@TkgW*Y}IZIwGI`
z^{&4CZBA%@o@oDdMJ5h~1_mY$0Y)VUmJS9%1tymU{G10mp>heg=WPy^dsw!6yZA@N
W&7Tj-s|W+V!r<xZ=d#Wzp$P!+i(cIT

diff --git a/src/battle-scene.ts b/src/battle-scene.ts
index fd77bcd05..8d131463f 100644
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@@ -134,6 +134,10 @@ export default class BattleScene extends Phaser.Scene {
 		this.loadAtlas('party_cancel', 'ui');
 
 		this.loadImage('summary_bg', 'ui');
+		this.loadImage('summary_overlay_shiny', 'ui');
+		this.loadImage('summary_profile', 'ui');
+		this.loadImage('summary_moves', 'ui');
+		this.loadImage('summary_moves_effect', 'ui');
 
 		// Load arena images
 		Utils.getEnumValues(Biome).map(at => {
diff --git a/src/ui/party-ui-handler.ts b/src/ui/party-ui-handler.ts
index fed8420c6..9235dce66 100644
--- a/src/ui/party-ui-handler.ts
+++ b/src/ui/party-ui-handler.ts
@@ -105,7 +105,7 @@ export default class PartyUiHandler extends MessageUiHandler {
   }
 
   show(args: any[]) {
-    if (!args.length)
+    if (!args.length || this.active)
       return;
 
     super.show(args);
@@ -172,7 +172,7 @@ export default class PartyUiHandler extends MessageUiHandler {
         } else if (option === PartyOption.SUMMARY) {
           this.clearOptions();
           ui.playSelect();
-          ui.setMode(Mode.SUMMARY);
+          ui.setModeWithoutClear(Mode.SUMMARY);
         } else if (option === PartyOption.CANCEL)
           this.processInput(keyCodes.X);
       } else if (keyCode === keyCodes.X) {
diff --git a/src/ui/summary-ui-handler.ts b/src/ui/summary-ui-handler.ts
index d8044dab3..7d13ce715 100644
--- a/src/ui/summary-ui-handler.ts
+++ b/src/ui/summary-ui-handler.ts
@@ -2,8 +2,17 @@ import BattleScene from "../battle-scene";
 import { Mode } from "./ui";
 import UiHandler from "./uiHandler";
 
+enum Page {
+  PROFILE,
+  MOVES
+}
+
 export default class SummaryUiHandler extends UiHandler {
   private summaryContainer: Phaser.GameObjects.Container;
+  private summaryPage: Phaser.GameObjects.Sprite;
+  private summaryPageTransition: Phaser.GameObjects.Sprite;
+
+  private page: integer;
 
   constructor(scene: BattleScene) {
     super(scene, Mode.SUMMARY);
@@ -17,9 +26,29 @@ export default class SummaryUiHandler extends UiHandler {
     ui.add(this.summaryContainer);
 
     const summaryBg = this.scene.add.image(0, 0, 'summary_bg');
+    summaryBg.setOrigin(0, 1);
     this.summaryContainer.add(summaryBg);
 
-    summaryBg.setOrigin(0, 1);
+    this.page = 0;
+
+    this.summaryPage = this.scene.add.sprite(106, 21, this.getPageKey());
+    this.summaryPage.setVisible(false);
+    this.summaryContainer.add(this.summaryPage);
+  }
+
+  setPage(newPage: integer) {
+    this.page = newPage;
+  
+    if (this.summaryPage.visible) {
+
+    } else {
+      this.summaryPage.setTexture(this.getPageKey());
+      this.summaryPage.setVisible(true);
+    }
+  }
+
+  getPageKey() {
+    return `summary_${Page[this.page].toLowerCase()}`;
   }
 
   show(args: any[]) {
@@ -31,6 +60,11 @@ export default class SummaryUiHandler extends UiHandler {
   processInput(keyCode: integer) {
     const ui = this.getUi();
     const keyCodes = Phaser.Input.Keyboard.KeyCodes;
+
+    if (keyCode === keyCodes.X) {
+      ui.setMode(Mode.PARTY);
+      ui.playSelect();
+    }
   }
 
   setCursor(cursor: integer): boolean {
@@ -44,5 +78,6 @@ export default class SummaryUiHandler extends UiHandler {
   clear() {
     super.clear();
     this.summaryContainer.setVisible(false);
+    this.summaryPage.setVisible(false);
   }
 }