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

Fix merge issues

Browse Source
This commit is contained in:
NightKev 2025-06-08 04:33:10 -07:00 committed by GitHub
parent da1aa0d985
commit 04bb1c4c09
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts
View File

@ -243,7 +243,7 @@ export const FieryFalloutEncounter: MysteryEncounter = MysteryEncounterBuilder.w
queueEncounterMessage(`${namespace}:option.2.target_burned`); queueEncounterMessage(`${namespace}:option.2.target_burned`);
// Also permanently change the burned Pokemon's ability to Heatproof // Also permanently change the burned Pokemon's ability to Heatproof
applyAbilityOverrideToPokemon(chosenPokemon, Abilities.HEATPROOF, false); applyAbilityOverrideToPokemon(chosenPokemon, AbilityId.HEATPROOF, false);
} }
} }

5
test/mystery-encounter/encounters/clowning-around-encounter.test.ts
View File

@ -246,14 +246,14 @@ describe("Clowning Around - Mystery Encounter", () => {
const leadPokemon = scene.getPlayerParty()[0]; const leadPokemon = scene.getPlayerParty()[0];
// offer Prankster abiliy for winning the battle // offer Prankster abiliy for winning the battle
const abilityToTrain = Abilities.PRANKSTER; const abilityToTrain = AbilityId.PRANKSTER;
game.onNextPrompt("PostMysteryEncounterPhase", UiMode.MESSAGE, () => { game.onNextPrompt("PostMysteryEncounterPhase", UiMode.MESSAGE, () => {
game.scene.ui.getHandler().processInput(Button.ACTION); game.scene.ui.getHandler().processInput(Button.ACTION);
}); });
// Give fto the first Pokemon the Prankster ability // Give fto the first Pokemon the Prankster ability
vi.spyOn(leadPokemon, "getAbility").mockReturnValue(allAbilities[Abilities.PRANKSTER]); vi.spyOn(leadPokemon, "getAbility").mockReturnValue(allAbilities[AbilityId.PRANKSTER]);
// Run to ability train option selection // Run to ability train option selection
const optionSelectUiHandler = game.scene.ui.handlers[UiMode.OPTION_SELECT] as OptionSelectUiHandler; const optionSelectUiHandler = game.scene.ui.handlers[UiMode.OPTION_SELECT] as OptionSelectUiHandler;
@ -284,7 +284,6 @@ describe("Clowning Around - Mystery Encounter", () => {
// Stop next battle before it runs // Stop next battle before it runs
await game.phaseInterceptor.to(NewBattlePhase, false); await game.phaseInterceptor.to(NewBattlePhase, false);
//game.override.ability(Abilities.PRANKSTER);
expect(leadPokemon.getAbility().id).toBe(abilityToTrain); expect(leadPokemon.getAbility().id).toBe(abilityToTrain);
}); });