From 3ecf02d425da4bccfcf58de62a4568a7b8a7f7c4 Mon Sep 17 00:00:00 2001 From: ImperialSympathizer Date: Thu, 25 Jul 2024 21:34:17 -0400 Subject: [PATCH] add delibird-y encounter --- .../encounters/pokemon-salesman-encounter.ts | 2 +- .../encounters/pokemon-salesman-encounter.test.ts | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/data/mystery-encounters/encounters/pokemon-salesman-encounter.ts b/src/data/mystery-encounters/encounters/pokemon-salesman-encounter.ts index 76077bf748b..b5625cd349d 100644 --- a/src/data/mystery-encounters/encounters/pokemon-salesman-encounter.ts +++ b/src/data/mystery-encounters/encounters/pokemon-salesman-encounter.ts @@ -106,7 +106,7 @@ export const PokemonSalesmanEncounter: IMysteryEncounter = }) .withOption( new MysteryEncounterOptionBuilder() - .withOptionMode(MysteryEncounterOptionMode.DEFAULT_OR_SPECIAL) + .withOptionMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT) .withHasDexProgress(true) .withSceneMoneyRequirement(null, MAX_POKEMON_PRICE_MULTIPLIER) // Wave scaling money multiplier of 2 .withDialogue({ diff --git a/src/test/mystery-encounter/encounters/pokemon-salesman-encounter.test.ts b/src/test/mystery-encounter/encounters/pokemon-salesman-encounter.test.ts index 29d17917bcd..bbd2d92e26c 100644 --- a/src/test/mystery-encounter/encounters/pokemon-salesman-encounter.test.ts +++ b/src/test/mystery-encounter/encounters/pokemon-salesman-encounter.test.ts @@ -148,6 +148,7 @@ describe("The Pokemon Salesman - Mystery Encounter", () => { }); it("Should add the Pokemon to the party", async () => { + scene.money = 20000; await game.runToMysteryEncounter(MysteryEncounterType.POKEMON_SALESMAN, defaultParty); const initialPartySize = scene.getParty().length; @@ -161,7 +162,7 @@ describe("The Pokemon Salesman - Mystery Encounter", () => { it("should be disabled if player does not have enough money", async () => { scene.money = 0; - await game.runToMysteryEncounter(MysteryEncounterType.POKEMON_SALESMAN, [Species.ARCANINE]); + await game.runToMysteryEncounter(MysteryEncounterType.POKEMON_SALESMAN, defaultParty); await game.phaseInterceptor.to(MysteryEncounterPhase, false); const encounterPhase = scene.getCurrentPhase(); @@ -180,6 +181,7 @@ describe("The Pokemon Salesman - Mystery Encounter", () => { }); it("should leave encounter without battle", async () => { + scene.money = 20000; const leaveEncounterWithoutBattleSpy = vi.spyOn(EncounterPhaseUtils, "leaveEncounterWithoutBattle"); await game.runToMysteryEncounter(MysteryEncounterType.POKEMON_SALESMAN, defaultParty);