mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-07-27 10:42:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix issues with ending DamageAnimPhase during tests

Browse Source
This commit is contained in:
Michael Li 2025-01-10 17:16:23 -05:00 committed by Sirz Benjie
parent c66be1997e
commit 6154306f80
No known key found for this signature in database
GPG Key ID: 4A524B4D196C759E
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/field/pokemon.ts
View File

@ -2471,6 +2471,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
this.switchOutStatus = status; this.switchOutStatus = status;
} }
/**
* Updates the Pokemon's battle info UI. This is purely a visual update.
* @param instant Whether or not the update should be instant.
*/
updateInfo(instant?: boolean): Promise<void> { updateInfo(instant?: boolean): Promise<void> {
return this.battleInfo.updateInfo(this, instant); return this.battleInfo.updateInfo(this, instant);
} }

18
test/mystery-encounter/encounter-test-utils.ts
View File

@ -33,15 +33,15 @@ export async function runMysteryEncounterToEnd(game: GameManager, optionNo: numb
}, () => game.isCurrentPhase(MysteryEncounterBattlePhase) || game.isCurrentPhase(MysteryEncounterRewardsPhase)); }, () => game.isCurrentPhase(MysteryEncounterBattlePhase) || game.isCurrentPhase(MysteryEncounterRewardsPhase));
if (isBattle) { if (isBattle) {
game.onNextPrompt("DamageAnimPhase", Mode.MESSAGE, () => { game.onNextPrompt(
game.setMode(Mode.MESSAGE); "CheckSwitchPhase",
game.endPhase(); Mode.CONFIRM,
}, () => game.isCurrentPhase(CommandPhase)); () => {
game.setMode(Mode.MESSAGE);
game.onNextPrompt("CheckSwitchPhase", Mode.CONFIRM, () => { game.endPhase();
game.setMode(Mode.MESSAGE); },
game.endPhase(); () => game.isCurrentPhase(CommandPhase),
}, () => game.isCurrentPhase(CommandPhase)); );
game.onNextPrompt("CheckSwitchPhase", Mode.MESSAGE, () => { game.onNextPrompt("CheckSwitchPhase", Mode.MESSAGE, () => {
game.setMode(Mode.MESSAGE); game.setMode(Mode.MESSAGE);

2
test/utils/gameWrapper.ts
View File

@ -186,6 +186,8 @@ export class GameWrapper {
this.scene.time = new MockClock(this.scene); this.scene.time = new MockClock(this.scene);
this.scene.remove = vi.fn(); // TODO: this should be stubbed differently this.scene.remove = vi.fn(); // TODO: this should be stubbed differently
this.scene.eventManager = new MockTimedEventManager(); // Disable Timed Events this.scene.eventManager = new MockTimedEventManager(); // Disable Timed Events
Pokemon.prototype.updateInfo = async () => {};
} }
} }