mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-08-20 06:19:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some bugs which prevented correct usage of balls

Browse Source
This commit is contained in:
Wlowscha 2025-08-16 16:25:35 +02:00
parent 7673d8dfae
commit 98df023c11
No known key found for this signature in database
GPG Key ID: 3C8F1AD330565D04
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/phases/command-phase.ts
View File

@ -402,6 +402,8 @@ export class CommandPhase extends FieldPhase {
} else if ((isClassic && missingMultipleStarters) || (isEndless && isEndlessMinorBoss) || isDaily) {
// Uncatchable final boss in classic and endless
this.queueShowText("battle:noPokeballForceFinalBoss");
} else {
return true;
}
} else if (battleType === BattleType.TRAINER) {
this.queueShowText("battle:noPokeballTrainer");
@ -450,10 +452,12 @@ export class CommandPhase extends FieldPhase {
) {
if (restrictMasterBall) {
this.queueShowText("battle:noPokeballStrongFinalBossCatchable");
} else if (cursor < PokeballType.MASTER_BALL) {
this.queueShowText("battle:noPokeballStrong");
return false;
}
if (cursor < PokeballType.MASTER_BALL) {
this.queueShowText("battle:noPokeballStrong");
return false;
}
return false;
}
globalScene.currentBattle.turnCommands[this.fieldIndex] = {