mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-07-04 15:32:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'beta' into eggGacha-legUp-timer

Browse Source
This commit is contained in:
damocleas 2025-06-02 19:13:40 -04:00 committed by GitHub
commit 604e771492
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ui/menu-ui-handler.ts
View File

@ -33,7 +33,7 @@ enum MenuOptions {
}
let wikiUrl = "https://wiki.pokerogue.net/start";
const discordUrl = "https://discord.gg/uWpTfdKG49";
const discordUrl = "https://discord.gg/pokerogue";
const githubUrl = "https://github.com/pagefaultgames/pokerogue";
const redditUrl = "https://www.reddit.com/r/pokerogue";
const donateUrl = "https://github.com/sponsors/pagefaultgames";

10
test/moves/last_respects.test.ts
View File

@ -167,10 +167,12 @@ describe("Moves - Last Respects", () => {
game.move.select(Moves.LAST_RESPECTS);
await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
await game.phaseInterceptor.to("MoveEndPhase");
expect(
move.calculateBattlePower,
`Enemy: ${game.field.getEnemyPokemon()}\nPlayer: ${game.field.getPlayerPokemon()}`,
).toHaveLastReturnedWith(basePower);
const enemy = game.field.getEnemyPokemon();
const player = game.field.getPlayerPokemon();
const items = `Player items: ${player.getHeldItems()} | Enemy Items: ${enemy.getHeldItems()} |`;
expect(move.calculateBattlePower, items).toHaveLastReturnedWith(50);
});
it("should reset playerFaints count if we enter new trainer battle", async () => {