[Bug][Hotfix] Restrict Use Candies option in the Pokédex during Shop (#…

…5446)
pagefaultgames · Feb 28, 2025 · 942bcac · 942bcac
1 parent 1342944
commit 942bcac
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "pokemon-rogue-battle",
 	"private": true,
-	"version": "1.7.4",
+	"version": "1.7.5",
 	"type": "module",
 	"scripts": {
 		"start": "vite",

diff --git a/src/ui/pokedex-page-ui-handler.ts b/src/ui/pokedex-page-ui-handler.ts
@@ -250,6 +250,8 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
   private availableVariants: number;
   private unlockedVariants: boolean[];
 
+  private canUseCandies: boolean;
+
   constructor() {
     super(Mode.POKEDEX_PAGE);
   }
@@ -556,6 +558,9 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
 
   show(args: any[]): boolean {
 
+    // Allow the use of candies if we are in one of the whitelisted phases
+    this.canUseCandies = [ "TitlePhase", "SelectStarterPhase", "CommandPhase" ].includes(globalScene.getCurrentPhase()?.constructor.name ?? "");
+
     if (args.length >= 1 && args[0] === "refresh") {
       return false;
     } else {
@@ -1626,7 +1631,7 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
             }
             break;
           case Button.STATS:
-            if (!isCaught || !isFormCaught) {
+            if (!isCaught || !isFormCaught || !this.canUseCandies) {
               error = true;
             } else {
               const ui = this.getUi();
@@ -1888,7 +1893,9 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
 
     if (this.isCaught()) {
       if (isFormCaught) {
-        this.updateButtonIcon(SettingKeyboard.Button_Stats, gamepadType, this.candyUpgradeIconElement, this.candyUpgradeLabel);
+        if (this.canUseCandies) {
+          this.updateButtonIcon(SettingKeyboard.Button_Stats, gamepadType, this.candyUpgradeIconElement, this.candyUpgradeLabel);
+        }
         if (this.canCycleShiny) {
           this.updateButtonIcon(SettingKeyboard.Button_Cycle_Shiny, gamepadType, this.shinyIconElement, this.shinyLabel);
         }