mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-07-01 22:12:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'beta' into intim-tests

Browse Source
This commit is contained in:
Bertie690 2025-06-03 07:52:57 -04:00 committed by GitHub
commit 3b45544ebf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "pokemon-rogue-battle", "name": "pokemon-rogue-battle",
"version": "1.9.4", "version": "1.9.5",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "pokemon-rogue-battle", "name": "pokemon-rogue-battle",
"version": "1.9.4", "version": "1.9.5",
"hasInstallScript": true, "hasInstallScript": true,
"dependencies": { "dependencies": {
"@material/material-color-utilities": "^0.2.7", "@material/material-color-utilities": "^0.2.7",

2
package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "pokemon-rogue-battle", "name": "pokemon-rogue-battle",
"private": true, "private": true,
"version": "1.9.4", "version": "1.9.5",
"type": "module", "type": "module",
"scripts": { "scripts": {
"start": "vite", "start": "vite",

2
src/data/mystery-encounters/encounters/the-expert-pokemon-breeder-encounter.ts
View File

@ -581,7 +581,7 @@ function calculateEggRewardsForPokemon(pokemon: PlayerPokemon): [number, number]
} }
function getEggOptions(commonEggs: number, rareEggs: 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[] = []; const eggOptions: IEggOptions[] = [];
if (commonEggs > 0) { if (commonEggs > 0) {

12
src/ui/battle-info/battle-info.ts
View File

@ -447,12 +447,14 @@ export default abstract class BattleInfo extends Phaser.GameObjects.Container {
} }
/** Update the pokemon name inside the 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) { if (this.lastName === name) {
return false; 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; return true;
} }
@ -572,7 +574,7 @@ export default abstract class BattleInfo extends Phaser.GameObjects.Container {
this.genderText.setText(getGenderSymbol(gender)).setColor(getGenderColor(gender)); 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); 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.updateStatusIcon(pokemon);
this.setTypes(pokemon.getTypes(true, false, undefined, true));
if (this.lastHp !== pokemon.hp || this.lastMaxHp !== pokemon.getMaxHp()) { if (this.lastHp !== pokemon.hp || this.lastMaxHp !== pokemon.getMaxHp()) {
return this.updatePokemonHp(pokemon, resolve, instant); return this.updatePokemonHp(pokemon, resolve, instant);
} }

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

@ -33,7 +33,7 @@ enum MenuOptions {
} }
let wikiUrl = "https://wiki.pokerogue.net/start"; 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 githubUrl = "https://github.com/pagefaultgames/pokerogue";
const redditUrl = "https://www.reddit.com/r/pokerogue"; const redditUrl = "https://www.reddit.com/r/pokerogue";
const donateUrl = "https://github.com/sponsors/pagefaultgames"; const donateUrl = "https://github.com/sponsors/pagefaultgames";

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

@ -167,7 +167,12 @@ describe("Moves - Last Respects", () => {
game.move.select(Moves.LAST_RESPECTS); game.move.select(Moves.LAST_RESPECTS);
await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
await game.phaseInterceptor.to("MoveEndPhase"); await game.phaseInterceptor.to("MoveEndPhase");
expect(move.calculateBattlePower).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 () => { it("should reset playerFaints count if we enter new trainer battle", async () => {