random-mirrors/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-02-16 17:27:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Test] Make berries abound test more robust (#4339)

Browse Source 
* make `berries-abound` test more robust

the "should reward the player with X berries based on wave" test was failing due to berry max stacks and the party only having 1 pokemone.
Increased it to 3 to reduce that probability

* berries abound test: change `defaultParty`

increase size of default-party to 3

* add: some missing types in berries-abound encounter

for ease of reading

* fix: berries abound tests

the "Should skip battle when fastest pokemon is faster than boss" test was failing due to the party being more than 1 pokemon.
This commit is contained in:
flx-sta 2024-09-20 14:18:48 -07:00 committed by GitHub
parent 4c9c66f898
commit 4cc3b0daae
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/data/mystery-encounters/encounters/berries-abound-encounter.ts
View File

@ -162,10 +162,10 @@ export const BerriesAboundEncounter: MysteryEncounter =
.withOptionPhase(async (scene: BattleScene) => { .withOptionPhase(async (scene: BattleScene) => {
// Pick race for berries // Pick race for berries
const encounter = scene.currentBattle.mysteryEncounter!; const encounter = scene.currentBattle.mysteryEncounter!;
const fastestPokemon = encounter.misc.fastestPokemon; const fastestPokemon: PlayerPokemon = encounter.misc.fastestPokemon;
const enemySpeed = encounter.misc.enemySpeed; const enemySpeed: number = encounter.misc.enemySpeed;
const speedDiff = fastestPokemon.getStat(Stat.SPD) / (enemySpeed * 1.1); const speedDiff = fastestPokemon.getStat(Stat.SPD) / (enemySpeed * 1.1);
const numBerries = encounter.misc.numBerries; const numBerries: number = encounter.misc.numBerries;
const shopOptions: ModifierTypeOption[] = []; const shopOptions: ModifierTypeOption[] = [];
for (let i = 0; i < 5; i++) { for (let i = 0; i < 5; i++) {

21
src/test/mystery-encounter/encounters/berries-abound-encounter.test.ts
View File

@ -19,7 +19,7 @@ import { CommandPhase } from "#app/phases/command-phase";
import { SelectModifierPhase } from "#app/phases/select-modifier-phase"; import { SelectModifierPhase } from "#app/phases/select-modifier-phase";
const namespace = "mysteryEncounter:berriesAbound"; const namespace = "mysteryEncounter:berriesAbound";
const defaultParty = [Species.PYUKUMUKU]; const defaultParty = [Species.PYUKUMUKU, Species.MAGIKARP, Species.PIKACHU];
const defaultBiome = Biome.CAVE; const defaultBiome = Biome.CAVE;
const defaultWave = 45; const defaultWave = 45;
@ -116,7 +116,9 @@ describe("Berries Abound - Mystery Encounter", () => {
expect(enemyField[0].species.speciesId).toBe(speciesToSpawn); expect(enemyField[0].species.speciesId).toBe(speciesToSpawn);
}); });
// TODO: there is some severe test flakiness occurring for this file, needs to be looked at/addressed in separate issue /**
* Related issue-comment: {@link https://github.com/pagefaultgames/pokerogue/issues/4300#issuecomment-2362849444}
*/
it("should reward the player with X berries based on wave", async () => { it("should reward the player with X berries based on wave", async () => {
await game.runToMysteryEncounter(MysteryEncounterType.BERRIES_ABOUND, defaultParty); await game.runToMysteryEncounter(MysteryEncounterType.BERRIES_ABOUND, defaultParty);
@ -188,15 +190,14 @@ describe("Berries Abound - Mystery Encounter", () => {
}); });
it("Should skip battle when fastest pokemon is faster than boss", async () => { it("Should skip battle when fastest pokemon is faster than boss", async () => {
const leaveEncounterWithoutBattleSpy = vi.spyOn(EncounterPhaseUtils, "leaveEncounterWithoutBattle"); vi.spyOn(EncounterPhaseUtils, "leaveEncounterWithoutBattle");
const encounterTextSpy = vi.spyOn(EncounterDialogueUtils, "showEncounterText"); vi.spyOn(EncounterDialogueUtils, "showEncounterText");
await game.runToMysteryEncounter(MysteryEncounterType.BERRIES_ABOUND, defaultParty); await game.runToMysteryEncounter(MysteryEncounterType.BERRIES_ABOUND, defaultParty);
// Setting party pokemon's level arbitrarily high to outspeed scene.getParty().forEach(pkm => {
const fastestPokemon = scene.getParty()[0]; vi.spyOn(pkm, "getStat").mockReturnValue(9999); // for ease return for every stat
fastestPokemon.level = 1000; });
fastestPokemon.calculateStats();
await runMysteryEncounterToEnd(game, 2); await runMysteryEncounterToEnd(game, 2);
await game.phaseInterceptor.to(SelectModifierPhase, false); await game.phaseInterceptor.to(SelectModifierPhase, false);
@ -210,8 +211,8 @@ describe("Berries Abound - Mystery Encounter", () => {
expect(option.modifierTypeOption.type.id).toContain("BERRY"); expect(option.modifierTypeOption.type.id).toContain("BERRY");
} }
expect(encounterTextSpy).toHaveBeenCalledWith(expect.any(BattleScene), `${namespace}.option.2.selected`); expect(EncounterDialogueUtils.showEncounterText).toHaveBeenCalledWith(expect.any(BattleScene), `${namespace}.option.2.selected`);
expect(leaveEncounterWithoutBattleSpy).toBeCalled(); expect(EncounterPhaseUtils.leaveEncounterWithoutBattle).toBeCalled();
}); });
}); });