From 92fb8b715e86baf085ede2c5d7b96249dfaf6d83 Mon Sep 17 00:00:00 2001
From: Akuma-Reiki <66755974+Akuma-Reiki@users.noreply.github.com>
Date: Sat, 4 May 2024 17:29:48 -0500
Subject: [PATCH] Added Candy Progress UI (#463)

* Added Candy Progress UI

* GetRootSpecies rather than colors of current Species
---
 public/images/ui/candy.png                | Bin 0 -> 415 bytes
 public/images/ui/candy_overlay.png        | Bin 0 -> 211 bytes
 public/images/ui/legacy/candy.png         | Bin 0 -> 415 bytes
 public/images/ui/legacy/candy_overlay.png | Bin 0 -> 211 bytes
 src/loading-scene.ts                      |   2 ++
 src/ui/summary-ui-handler.ts              |  40 +++++++++++++++++++++-
 6 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 public/images/ui/candy.png
 create mode 100644 public/images/ui/candy_overlay.png
 create mode 100644 public/images/ui/legacy/candy.png
 create mode 100644 public/images/ui/legacy/candy_overlay.png

diff --git a/public/images/ui/candy.png b/public/images/ui/candy.png
new file mode 100644
index 0000000000000000000000000000000000000000..6b633a195040a4177cbbcf632e760b0a1d2aea90
GIT binary patch
literal 415
zcmV;Q0bu@#P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px$KS@MER5*==lQFJ>KoEvMjfFi4fs#nGm7yZ>0$#*;2oB&O40oXB0wkP(irBG)
zSXe3DzQXLvy5RehO_+iC{#kZ*#e#$oY8p39vzq(PN$SEp&#nCFbeaWOfe=FFdCqpb
zHMwyd9nciA{#6V(@#S){wzr-u4#RK};`_b@F&!jHVv6-zQktgbd8OR}4u=B(Qc9$h
zR?#?)#-uDu0J1D&qg|zxR8>V3MNS8=*9(BY?+w`VJb*VK2m<4LyWK4J?^76t0nhV@
z<M;z8%aY^qNDu^;%eTTXB#I&c>bm~C5JIS;DAe=${JFZWQ(f1oq9~L;h0WAK|D64P
zZ?*;Scsyv^miztgbY&(=2%)amE4$s!Zf~MAO=;Vf^Z9J1(HUh8nbUW%1JDq7kL*-g
zmI41<ra6$-(slj=4==kS`1iyf0000EWmrjOO-%qQ00008000000002eQ<DGy002ov
JPDHLkV1gN;wX6UD

literal 0
HcmV?d00001

diff --git a/public/images/ui/candy_overlay.png b/public/images/ui/candy_overlay.png
new file mode 100644
index 0000000000000000000000000000000000000000..835cfccb05c62de32b65c083caed04b9f417046d
GIT binary patch
literal 211
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jPK-BC>eK@{oCO|{#S9GG
z!XV7ZFl&wkP_V+&#WAE}PIAHm(I5Z+@3$~g3tem}q;^k1XO<z4qPuZn8-r?|a5jU$
z`D3C91`VefCa7-Tcr&gy=U2T?fppjE#5jgacV3)xH)F}yX)sCtd@NUoZQ<jr72JWQ
z$%ZWA$JR=E&sdQCMBPo<-cGv1h$D@I&*z3{2|GjE|Cwv5Hfw(dx`Dyd)z4*}Q$iB}
D6Kz8k

literal 0
HcmV?d00001

diff --git a/public/images/ui/legacy/candy.png b/public/images/ui/legacy/candy.png
new file mode 100644
index 0000000000000000000000000000000000000000..6b633a195040a4177cbbcf632e760b0a1d2aea90
GIT binary patch
literal 415
zcmV;Q0bu@#P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px$KS@MER5*==lQFJ>KoEvMjfFi4fs#nGm7yZ>0$#*;2oB&O40oXB0wkP(irBG)
zSXe3DzQXLvy5RehO_+iC{#kZ*#e#$oY8p39vzq(PN$SEp&#nCFbeaWOfe=FFdCqpb
zHMwyd9nciA{#6V(@#S){wzr-u4#RK};`_b@F&!jHVv6-zQktgbd8OR}4u=B(Qc9$h
zR?#?)#-uDu0J1D&qg|zxR8>V3MNS8=*9(BY?+w`VJb*VK2m<4LyWK4J?^76t0nhV@
z<M;z8%aY^qNDu^;%eTTXB#I&c>bm~C5JIS;DAe=${JFZWQ(f1oq9~L;h0WAK|D64P
zZ?*;Scsyv^miztgbY&(=2%)amE4$s!Zf~MAO=;Vf^Z9J1(HUh8nbUW%1JDq7kL*-g
zmI41<ra6$-(slj=4==kS`1iyf0000EWmrjOO-%qQ00008000000002eQ<DGy002ov
JPDHLkV1gN;wX6UD

literal 0
HcmV?d00001

diff --git a/public/images/ui/legacy/candy_overlay.png b/public/images/ui/legacy/candy_overlay.png
new file mode 100644
index 0000000000000000000000000000000000000000..835cfccb05c62de32b65c083caed04b9f417046d
GIT binary patch
literal 211
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jPK-BC>eK@{oCO|{#S9GG
z!XV7ZFl&wkP_V+&#WAE}PIAHm(I5Z+@3$~g3tem}q;^k1XO<z4qPuZn8-r?|a5jU$
z`D3C91`VefCa7-Tcr&gy=U2T?fppjE#5jgacV3)xH)F}yX)sCtd@NUoZQ<jr72JWQ
z$%ZWA$JR=E&sdQCMBPo<-cGv1h$D@I&*z3{2|GjE|Cwv5Hfw(dx`Dyd)z4*}Q$iB}
D6Kz8k

literal 0
HcmV?d00001

diff --git a/src/loading-scene.ts b/src/loading-scene.ts
index 05b6c9f50..88e60fb9c 100644
--- a/src/loading-scene.ts
+++ b/src/loading-scene.ts
@@ -31,6 +31,8 @@ export class LoadingScene extends SceneBase {
     this.loadAtlas('bg', 'ui');
     this.loadImage('command_fight_labels', 'ui');
     this.loadAtlas('prompt', 'ui');
+    this.loadImage('candy', 'ui');
+    this.loadImage('candy_overlay', 'ui');
     this.loadImage('cursor', 'ui');
     this.loadImage('cursor_reverse', 'ui');
     for (let wv of Utils.getEnumValues(WindowVariant)) {
diff --git a/src/ui/summary-ui-handler.ts b/src/ui/summary-ui-handler.ts
index 7776e2178..ee514665d 100644
--- a/src/ui/summary-ui-handler.ts
+++ b/src/ui/summary-ui-handler.ts
@@ -1,8 +1,10 @@
-import BattleScene, { Button } from "../battle-scene";
+import BattleScene, { Button, starterColors } from "../battle-scene";
 import { Mode } from "./ui";
 import UiHandler from "./ui-handler";
 import * as Utils from "../utils";
 import { PlayerPokemon } from "../field/pokemon";
+import { default as PokemonSpecies, PokemonSpeciesForm, SpeciesFormKey, getFusedSpeciesName, getPokemonSpecies, getPokemonSpeciesForm, getStarterValueFriendshipCap, speciesStarters, starterPassiveAbilities } from '../data/pokemon-species';
+import { argbFromRgba } from "@material/material-color-utilities";
 import { Type, getTypeRgb } from "../data/type";
 import { TextStyle, addBBCodeTextObject, addTextObject, getBBCodeFrag, getTextColor } from "./text";
 import Move, { MoveCategory } from "../data/move";
@@ -44,6 +46,9 @@ export default class SummaryUiHandler extends UiHandler {
   private genderText: Phaser.GameObjects.Text;
   private shinyIcon: Phaser.GameObjects.Image;
   private fusionShinyIcon: Phaser.GameObjects.Image;
+  private candyShadow: Phaser.GameObjects.Sprite;
+  private candyIcon: Phaser.GameObjects.Sprite;
+  private candyOverlay: Phaser.GameObjects.Sprite;
   private statusContainer: Phaser.GameObjects.Container;
   private status: Phaser.GameObjects.Image;
   private summaryPageContainer: Phaser.GameObjects.Container;
@@ -136,6 +141,20 @@ export default class SummaryUiHandler extends UiHandler {
     this.pokeball.setOrigin(0, 1);
     this.summaryContainer.add(this.pokeball);
 
+    this.candyShadow = this.scene.add.sprite(13, -140, 'candy');
+    this.candyShadow.setTint(0x141414)
+    this.candyShadow.setScale(0.8);
+    this.candyShadow.setInteractive(new Phaser.Geom.Rectangle(0, 0, 16, 16), Phaser.Geom.Rectangle.Contains);
+    this.summaryContainer.add(this.candyShadow);
+
+    this.candyIcon = this.scene.add.sprite(13, -140, 'candy');
+    this.candyIcon.setScale(0.8);
+    this.summaryContainer.add(this.candyIcon);
+
+    this.candyOverlay = this.scene.add.sprite(13, -140, 'candy_overlay');
+    this.candyOverlay.setScale(0.8);
+    this.summaryContainer.add(this.candyOverlay);
+
     this.levelText = addTextObject(this.scene, 36, -17, '', TextStyle.SUMMARY_ALT);
     this.levelText.setOrigin(0, 1);
     this.summaryContainer.add(this.levelText);
@@ -222,6 +241,10 @@ export default class SummaryUiHandler extends UiHandler {
 
     this.shinyOverlay.setVisible(this.pokemon.isShiny());
 
+    const colorScheme = starterColors[this.pokemon.species.getRootSpeciesId()];
+    this.candyIcon.setTint(argbFromRgba(Utils.rgbHexToRgba(colorScheme[0])));
+    this.candyOverlay.setTint(argbFromRgba(Utils.rgbHexToRgba(colorScheme[1])));
+
     this.numberText.setText(Utils.padInt(this.pokemon.species.speciesId, 4));
     this.numberText.setColor(this.getTextColor(!this.pokemon.isShiny() ? TextStyle.SUMMARY : TextStyle.SUMMARY_GOLD));
     this.numberText.setShadowColor(this.getTextColor(!this.pokemon.isShiny() ? TextStyle.SUMMARY : TextStyle.SUMMARY_GOLD, true));
@@ -251,6 +274,21 @@ export default class SummaryUiHandler extends UiHandler {
       this.splicedIcon.on('pointerout', () => (this.scene as BattleScene).ui.hideTooltip());
     }
 
+    var currentFriendship = this.scene.gameData.starterData[this.pokemon.species.getRootSpeciesId()].friendship;
+    if (!currentFriendship || currentFriendship === undefined)
+      currentFriendship = 0;
+
+    const friendshipCap = getStarterValueFriendshipCap(speciesStarters[this.pokemon.species.getRootSpeciesId()]);
+    const candyCropY = 16 - (16 * (currentFriendship / friendshipCap));
+
+    if (this.candyShadow.visible) {
+      this.candyShadow.on('pointerover', () => (this.scene as BattleScene).ui.showTooltip(null, `${currentFriendship}/${friendshipCap}`, true));
+      this.candyShadow.on('pointerout', () => (this.scene as BattleScene).ui.hideTooltip());
+    }
+
+    this.candyIcon.setCrop(0,candyCropY,16, 16);
+    this.candyOverlay.setCrop(0,candyCropY,16, 16);
+
     const doubleShiny = isFusion && this.pokemon.shiny && this.pokemon.fusionShiny;
     const baseVariant = !doubleShiny ? this.pokemon.getVariant() : this.pokemon.variant;