ShuriZma
/
pokerogue
mirror of https://github.com/pagefaultgames/pokerogue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed conflict bugs maybe

This commit is contained in:
Bertie690 2025-01-16 17:37:54 -05:00
parent fd1577ee82
commit 131f08a9d7
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/locales

@ -1 +1 @@
Subproject commit acad8499a4ca488a9871902de140f635235f309a Subproject commit 6c6f0af398ae11f8d96c6ac064f171d927812c85

2
src/test/moves/instruct.test.ts
View File

@ -179,7 +179,7 @@ describe("Moves - Instruct", () => {
const amoonguss = game.scene.getPlayerPokemon()!; const amoonguss = game.scene.getPlayerPokemon()!;
game.move.changeMoveset(amoonguss, Moves.SEED_BOMB); game.move.changeMoveset(amoonguss, Moves.SEED_BOMB);
amoonguss.battleSummonData.moveHistory = [{ move: Moves.SEED_BOMB, result: MoveResult.SUCCESS }]; amoonguss.battleSummonData.moveHistory = [{ move: Moves.SEED_BOMB, targets: [ BattlerIndex.ENEMY ], result: MoveResult.SUCCESS }];
game.doSwitchPokemon(1); game.doSwitchPokemon(1);
await game.phaseInterceptor.to("TurnEndPhase", false); await game.phaseInterceptor.to("TurnEndPhase", false);