diff --git a/src/data/mystery-encounters/encounters/the-pokemon-salesman-encounter.ts b/src/data/mystery-encounters/encounters/the-pokemon-salesman-encounter.ts index 99132e6aa5c..cfff59b45f5 100644 --- a/src/data/mystery-encounters/encounters/the-pokemon-salesman-encounter.ts +++ b/src/data/mystery-encounters/encounters/the-pokemon-salesman-encounter.ts @@ -30,8 +30,6 @@ import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode"; import { Abilities } from "#enums/abilities"; import { NON_LEGEND_PARADOX_POKEMON, NON_LEGEND_ULTRA_BEASTS } from "#app/data/balance/special-species-groups"; import { timedEventManager } from "#app/global-event-manager"; -import { BASE_SHINY_CHANCE } from "#app/data/balance/rates"; -import { ShinyRateBoosterModifier } from "#app/modifier/modifier"; /** the i18n namespace for this encounter */ const namespace = "mysteryEncounters/thePokemonSalesman"; @@ -124,13 +122,10 @@ export const ThePokemonSalesmanEncounter: MysteryEncounter = MysteryEncounterBui ) { // If you roll 20%, give event encounter with 2 extra shiny rolls and its HA, if it has one const enc = randSeedItem(validEventEncounters); - const threshold = new NumberHolder(BASE_SHINY_CHANCE); - globalScene.applyModifiers(ShinyRateBoosterModifier, true, threshold); - threshold.value *= timedEventManager.getShinyMultiplier(); species = getPokemonSpecies(enc.species); pokemon = new PlayerPokemon(species, 5, species.abilityHidden === Abilities.NONE ? undefined : 2, enc.formIndex); - pokemon.trySetShinySeed(threshold.value); // Apply event shiny boost even though it's a PlayerPokemon - pokemon.trySetShinySeed(threshold.value); // Try again + pokemon.trySetShinySeed(); + pokemon.trySetShinySeed(); } else { pokemon = new PlayerPokemon(species, 5, 2, species.formIndex); } diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index cebc08502eb..e76a35760f0 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -3190,13 +3190,11 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { if (timedEventManager.isEventActive()) { shinyThreshold.value *= timedEventManager.getShinyMultiplier(); } - if (!this.hasTrainer()) { - globalScene.applyModifiers( - ShinyRateBoosterModifier, - true, - shinyThreshold, - ); - } + globalScene.applyModifiers( + ShinyRateBoosterModifier, + true, + shinyThreshold, + ); } else { shinyThreshold.value = thresholdOverride;