From 04bb1c4c093ab492e7e5b2f3945f2235577040e6 Mon Sep 17 00:00:00 2001 From: NightKev <34855794+DayKev@users.noreply.github.com> Date: Sun, 8 Jun 2025 04:33:10 -0700 Subject: [PATCH] Fix merge issues --- .../mystery-encounters/encounters/fiery-fallout-encounter.ts | 2 +- .../encounters/clowning-around-encounter.test.ts | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts b/src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts index b5e1da2b2ed..0a57805ef94 100644 --- a/src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts +++ b/src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts @@ -243,7 +243,7 @@ export const FieryFalloutEncounter: MysteryEncounter = MysteryEncounterBuilder.w queueEncounterMessage(`${namespace}:option.2.target_burned`); // Also permanently change the burned Pokemon's ability to Heatproof - applyAbilityOverrideToPokemon(chosenPokemon, Abilities.HEATPROOF, false); + applyAbilityOverrideToPokemon(chosenPokemon, AbilityId.HEATPROOF, false); } } diff --git a/test/mystery-encounter/encounters/clowning-around-encounter.test.ts b/test/mystery-encounter/encounters/clowning-around-encounter.test.ts index c834a972714..845ebe4dc91 100644 --- a/test/mystery-encounter/encounters/clowning-around-encounter.test.ts +++ b/test/mystery-encounter/encounters/clowning-around-encounter.test.ts @@ -246,14 +246,14 @@ describe("Clowning Around - Mystery Encounter", () => { const leadPokemon = scene.getPlayerParty()[0]; // offer Prankster abiliy for winning the battle - const abilityToTrain = Abilities.PRANKSTER; + const abilityToTrain = AbilityId.PRANKSTER; game.onNextPrompt("PostMysteryEncounterPhase", UiMode.MESSAGE, () => { game.scene.ui.getHandler().processInput(Button.ACTION); }); // 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 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 await game.phaseInterceptor.to(NewBattlePhase, false); - //game.override.ability(Abilities.PRANKSTER); expect(leadPokemon.getAbility().id).toBe(abilityToTrain); });