Skip to content

Commit

Permalink
[Hotfix] Removed isFreshStartChallenge() check (pagefaultgames#3599)
Browse files Browse the repository at this point in the history
* Removed isFreshStartChallenge() check

* Better conditional

---------

Co-authored-by: Frutescens <info@laptop>
  • Loading branch information
frutescens and Frutescens authored Aug 17, 2024
1 parent e192e57 commit 616219d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/phases.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2036,7 +2036,7 @@ export class CommandPhase extends FieldPhase {
}
break;
case Command.BALL:
if (!this.scene.gameMode.isFreshStartChallenge() && this.scene.arena.biomeType === Biome.END && (!this.scene.gameMode.isClassic || (this.scene.getEnemyField().filter(p => p.isActive(true)).some(p => !p.scene.gameData.dexData[p.species.speciesId].caughtAttr) && this.scene.gameData.getStarterCount(d => !!d.caughtAttr) < Object.keys(speciesStarters).length - 1))) {
if (this.scene.arena.biomeType === Biome.END && (!this.scene.gameMode.isClassic || this.scene.gameMode.isFreshStartChallenge() || (this.scene.getEnemyField().filter(p => p.isActive(true)).some(p => !p.scene.gameData.dexData[p.species.speciesId].caughtAttr) && this.scene.gameData.getStarterCount(d => !!d.caughtAttr) < Object.keys(speciesStarters).length - 1))) {
this.scene.ui.setMode(Mode.COMMAND, this.fieldIndex);
this.scene.ui.setMode(Mode.MESSAGE);
this.scene.ui.showText(i18next.t("battle:noPokeballForce"), null, () => {
Expand Down

0 comments on commit 616219d

Please sign in to comment.