mirror of
https://github.com/pagefaultgames/pokerogue.git
synced 2025-08-21 14:59:26 +02:00
revert 'offer you can't refuse' giving Silver Pokeball'
This commit is contained in:
parent
a3fb7bc829
commit
6982f34f9a
@ -99,8 +99,8 @@ export const AnOfferYouCantRefuseEncounter: MysteryEncounter =
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const silverPokeball = generateModifierType(scene, modifierTypes.SILVER_POKEBALL);
|
const shinyCharm = generateModifierType(scene, modifierTypes.SHINY_CHARM);
|
||||||
encounter.setDialogueToken("itemName", silverPokeball?.name ?? i18next.t("modifierType:ModifierType.SILVER_POKEBALL.name"));
|
encounter.setDialogueToken("itemName", shinyCharm?.name ?? i18next.t("modifierType:ModifierType.SHINY_CHARM.name"));
|
||||||
encounter.setDialogueToken("liepardName", getPokemonSpecies(Species.LIEPARD).getName());
|
encounter.setDialogueToken("liepardName", getPokemonSpecies(Species.LIEPARD).getName());
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
@ -126,8 +126,8 @@ export const AnOfferYouCantRefuseEncounter: MysteryEncounter =
|
|||||||
return true;
|
return true;
|
||||||
})
|
})
|
||||||
.withOptionPhase(async (scene: BattleScene) => {
|
.withOptionPhase(async (scene: BattleScene) => {
|
||||||
// Give the player a Silver Pokeball
|
// Give the player a Shiny Charm
|
||||||
scene.unshiftPhase(new ModifierRewardPhase(scene, modifierTypes.SILVER_POKEBALL));
|
scene.unshiftPhase(new ModifierRewardPhase(scene, modifierTypes.SHINY_CHARM));
|
||||||
leaveEncounterWithoutBattle(scene, true);
|
leaveEncounterWithoutBattle(scene, true);
|
||||||
})
|
})
|
||||||
.build()
|
.build()
|
||||||
|
@ -15,7 +15,7 @@ import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
|
|||||||
import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils";
|
import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils";
|
||||||
import { getPokemonSpecies } from "#app/data/pokemon-species";
|
import { getPokemonSpecies } from "#app/data/pokemon-species";
|
||||||
import { Moves } from "#enums/moves";
|
import { Moves } from "#enums/moves";
|
||||||
import { TempExtraModifierModifier } from "#app/modifier/modifier";
|
import { ShinyRateBoosterModifier } from "#app/modifier/modifier";
|
||||||
import { SelectModifierPhase } from "#app/phases/select-modifier-phase";
|
import { SelectModifierPhase } from "#app/phases/select-modifier-phase";
|
||||||
import i18next from "i18next";
|
import i18next from "i18next";
|
||||||
import { Abilities } from "#enums/abilities";
|
import { Abilities } from "#enums/abilities";
|
||||||
@ -103,7 +103,7 @@ describe("An Offer You Can't Refuse - Mystery Encounter", () => {
|
|||||||
expect(onInitResult).toBe(true);
|
expect(onInitResult).toBe(true);
|
||||||
});
|
});
|
||||||
|
|
||||||
describe("Option 1 - Sell your Pokemon for money and a Silver Pokeball", () => {
|
describe("Option 1 - Sell your Pokemon for money and a Shiny Charm", () => {
|
||||||
it("should have the correct properties", () => {
|
it("should have the correct properties", () => {
|
||||||
const option = AnOfferYouCantRefuseEncounter.options[0];
|
const option = AnOfferYouCantRefuseEncounter.options[0];
|
||||||
expect(option.optionMode).toBe(MysteryEncounterOptionMode.DEFAULT);
|
expect(option.optionMode).toBe(MysteryEncounterOptionMode.DEFAULT);
|
||||||
@ -134,11 +134,11 @@ describe("An Offer You Can't Refuse - Mystery Encounter", () => {
|
|||||||
expect(scene.money).toBe(initialMoney + price);
|
expect(scene.money).toBe(initialMoney + price);
|
||||||
});
|
});
|
||||||
|
|
||||||
it("Should give the player a Silver Pokeball", async () => {
|
it("Should give the player a Shiny Charm", async () => {
|
||||||
await game.runToMysteryEncounter(MysteryEncounterType.AN_OFFER_YOU_CANT_REFUSE, defaultParty);
|
await game.runToMysteryEncounter(MysteryEncounterType.AN_OFFER_YOU_CANT_REFUSE, defaultParty);
|
||||||
await runMysteryEncounterToEnd(game, 1);
|
await runMysteryEncounterToEnd(game, 1);
|
||||||
|
|
||||||
const itemModifier = scene.findModifier(m => m instanceof TempExtraModifierModifier) as TempExtraModifierModifier;
|
const itemModifier = scene.findModifier(m => m instanceof ShinyRateBoosterModifier) as ShinyRateBoosterModifier;
|
||||||
|
|
||||||
expect(itemModifier).toBeDefined();
|
expect(itemModifier).toBeDefined();
|
||||||
expect(itemModifier?.stackCount).toBe(1);
|
expect(itemModifier?.stackCount).toBe(1);
|
||||||
|
Loading…
Reference in New Issue
Block a user