From 88b8e05ee82c286bc5cdd55ed6d06cbb71a461a9 Mon Sep 17 00:00:00 2001 From: NightKev <34855794+DayKev@users.noreply.github.com> Date: Sun, 1 Jun 2025 16:18:15 -0700 Subject: [PATCH 1/7] [Test] Add extra logging to flaky Last Respects test --- test/moves/last_respects.test.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/moves/last_respects.test.ts b/test/moves/last_respects.test.ts index 89c4896ae56..b9b958869fb 100644 --- a/test/moves/last_respects.test.ts +++ b/test/moves/last_respects.test.ts @@ -167,7 +167,10 @@ 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).toHaveLastReturnedWith(basePower); + expect( + move.calculateBattlePower, + `Enemy: ${game.field.getEnemyPokemon()}\nPlayer: ${game.field.getPlayerPokemon()}`, + ).toHaveLastReturnedWith(basePower); }); it("should reset playerFaints count if we enter new trainer battle", async () => { From 9f892b906ca6020d3e9c21cfdbe3e6242732a994 Mon Sep 17 00:00:00 2001 From: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com> Date: Mon, 2 Jun 2025 07:59:10 -0500 Subject: [PATCH 2/7] [Beta][Bug][UI/UX] Fix name position and types not being updated in battle info (#5913) Fix name position and types not being updated in battle info --- src/ui/battle-info/battle-info.ts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/ui/battle-info/battle-info.ts b/src/ui/battle-info/battle-info.ts index 7e6cc12bd3d..e67000bb243 100644 --- a/src/ui/battle-info/battle-info.ts +++ b/src/ui/battle-info/battle-info.ts @@ -447,12 +447,14 @@ export default abstract class BattleInfo extends Phaser.GameObjects.Container { } /** Update the pokemon name inside the container */ - protected updateName(name: string): boolean { + protected updateName(pokemon: Pokemon): boolean { + const name = pokemon.getNameToRender(); if (this.lastName === name) { return false; } - this.nameText.setText(name).setPositionRelative(this.box, -this.nameText.displayWidth, 0); - this.lastName = name; + + this.updateNameText(pokemon); + this.genderText.setPositionRelative(this.nameText, this.nameText.displayWidth, 0); return true; } @@ -572,7 +574,7 @@ export default abstract class BattleInfo extends Phaser.GameObjects.Container { this.genderText.setText(getGenderSymbol(gender)).setColor(getGenderColor(gender)); - const nameUpdated = this.updateName(pokemon.getNameToRender()); + const nameUpdated = this.updateName(pokemon); const teraTypeUpdated = this.updateTeraType(pokemon.isTerastallized ? pokemon.getTeraType() : PokemonType.UNKNOWN); @@ -584,6 +586,8 @@ export default abstract class BattleInfo extends Phaser.GameObjects.Container { this.updateStatusIcon(pokemon); + this.setTypes(pokemon.getTypes(true, false, undefined, true)); + if (this.lastHp !== pokemon.hp || this.lastMaxHp !== pokemon.getMaxHp()) { return this.updatePokemonHp(pokemon, resolve, instant); } From ea64024e0992198400b6f30d7753cc77184ffec3 Mon Sep 17 00:00:00 2001 From: Madmadness65 <59298170+Madmadness65@users.noreply.github.com> Date: Mon, 2 Jun 2025 09:32:34 -0500 Subject: [PATCH 3/7] [P3 Bug] Remove Expert Breeder trainer type from ME egg source (#5893) Remove Expert Breeder trainer type from ME eggs It effectively duplicated the text in the egg source text box, and overflowed the visual text box as a result. --- .../encounters/the-expert-pokemon-breeder-encounter.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/mystery-encounters/encounters/the-expert-pokemon-breeder-encounter.ts b/src/data/mystery-encounters/encounters/the-expert-pokemon-breeder-encounter.ts index 15063bc2763..74cda6fd205 100644 --- a/src/data/mystery-encounters/encounters/the-expert-pokemon-breeder-encounter.ts +++ b/src/data/mystery-encounters/encounters/the-expert-pokemon-breeder-encounter.ts @@ -581,7 +581,7 @@ function calculateEggRewardsForPokemon(pokemon: PlayerPokemon): [number, number] } function getEggOptions(commonEggs: number, rareEggs: number) { - const eggDescription = i18next.t(`${namespace}:title`) + ":\n" + i18next.t(trainerNameKey); + const eggDescription = i18next.t(`${namespace}:title`); const eggOptions: IEggOptions[] = []; if (commonEggs > 0) { From 7cd89cd4f7f7d70b4fc665ad954b9719a6278ceb Mon Sep 17 00:00:00 2001 From: damocleas Date: Mon, 2 Jun 2025 14:33:39 -0400 Subject: [PATCH 4/7] Update Discord Invite Link --- src/ui/menu-ui-handler.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/menu-ui-handler.ts b/src/ui/menu-ui-handler.ts index 7f0cd4d6a78..cc684111617 100644 --- a/src/ui/menu-ui-handler.ts +++ b/src/ui/menu-ui-handler.ts @@ -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"; From 1b038c5a11180adc2b868132e2c47be72c2fc272 Mon Sep 17 00:00:00 2001 From: NightKev <34855794+DayKev@users.noreply.github.com> Date: Mon, 2 Jun 2025 14:16:06 -0700 Subject: [PATCH 5/7] [Test] Fix flaky test logging --- test/moves/last_respects.test.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/test/moves/last_respects.test.ts b/test/moves/last_respects.test.ts index b9b958869fb..4fe9864546e 100644 --- a/test/moves/last_respects.test.ts +++ b/test/moves/last_respects.test.ts @@ -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(1); }); it("should reset playerFaints count if we enter new trainer battle", async () => { From 6586790768e507c14995f564d6f1e9b7aef67417 Mon Sep 17 00:00:00 2001 From: NightKev <34855794+DayKev@users.noreply.github.com> Date: Mon, 2 Jun 2025 16:12:45 -0700 Subject: [PATCH 6/7] [Test] Fix Last Respects test --- test/moves/last_respects.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/moves/last_respects.test.ts b/test/moves/last_respects.test.ts index 4fe9864546e..e271a5dec62 100644 --- a/test/moves/last_respects.test.ts +++ b/test/moves/last_respects.test.ts @@ -172,7 +172,7 @@ describe("Moves - Last Respects", () => { const player = game.field.getPlayerPokemon(); const items = `Player items: ${player.getHeldItems()} | Enemy Items: ${enemy.getHeldItems()} |`; - expect(move.calculateBattlePower, items).toHaveLastReturnedWith(1); + expect(move.calculateBattlePower, items).toHaveLastReturnedWith(50); }); it("should reset playerFaints count if we enter new trainer battle", async () => { From a26a93098059597e779e932e636061f75a680206 Mon Sep 17 00:00:00 2001 From: NightKev <34855794+DayKev@users.noreply.github.com> Date: Mon, 2 Jun 2025 17:00:23 -0700 Subject: [PATCH 7/7] Fix Version Number 1.9.4 -> 1.9.5 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 66400b14459..3e82c45af62 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "pokemon-rogue-battle", - "version": "1.9.4", + "version": "1.9.5", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "pokemon-rogue-battle", - "version": "1.9.4", + "version": "1.9.5", "hasInstallScript": true, "dependencies": { "@material/material-color-utilities": "^0.2.7", diff --git a/package.json b/package.json index 7d1ba35154a..ce41dfc2a05 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "pokemon-rogue-battle", "private": true, - "version": "1.9.4", + "version": "1.9.5", "type": "module", "scripts": { "start": "vite",