mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-09-23 15:03:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Updated assignment of currentBattle to undefined instead of null

Browse Source
This commit is contained in:
Bertie690 2025-09-15 11:15:00 -04:00
parent f8f4552d7e
commit f9892387f5
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/battle-scene.ts
View File

@ -1187,8 +1187,8 @@ export class BattleScene extends SceneBase {
this.field.remove(this.currentBattle.mysteryEncounter?.introVisuals, true); this.field.remove(this.currentBattle.mysteryEncounter?.introVisuals, true);
} }
//@ts-expect-error - allowing `null` for currentBattle causes a lot of trouble //@ts-expect-error - allowing `undefined` for currentBattle causes a lot of trouble
this.currentBattle = null; // TODO: resolve ts-ignore this.currentBattle = undefined; // TODO: resolve ts-ignore
// Reset RNG after end of game or save & quit. // Reset RNG after end of game or save & quit.
// This needs to happen after clearing this.currentBattle or the seed will be affected by the last wave played // This needs to happen after clearing this.currentBattle or the seed will be affected by the last wave played
@ -1403,9 +1403,8 @@ export class BattleScene extends SceneBase {
if (config.doubleOnly) { if (config.doubleOnly) {
doubleTrainer = true; doubleTrainer = true;
} else if ( } else if (
!config.hasDouble // Add a check that special trainers can't be double except for tate and liza - they should use the normal double chance !config.hasDouble // Add a check that special trainers can't be double except for tate and liza - they should use the normal double chance // TODO: Review this
|| // TODO: Review this || (config.trainerTypeDouble && ![TrainerType.TATE, TrainerType.LIZA].includes(trainerType))
(config.trainerTypeDouble && ![TrainerType.TATE, TrainerType.LIZA].includes(trainerType))
) { ) {
doubleTrainer = false; doubleTrainer = false;
} else { } else {