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

Shiny reroll affects 'trainer' mons too

Browse Source
This commit is contained in:
AJ Fontaine 2025-04-20 18:58:02 -04:00
parent 1f47aab8bb
commit bd71e42f07
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/data/mystery-encounters/encounters/the-pokemon-salesman-encounter.ts
View File

@ -30,8 +30,6 @@ import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
import { Abilities } from "#enums/abilities"; import { Abilities } from "#enums/abilities";
import { NON_LEGEND_PARADOX_POKEMON, NON_LEGEND_ULTRA_BEASTS } from "#app/data/balance/special-species-groups"; import { NON_LEGEND_PARADOX_POKEMON, NON_LEGEND_ULTRA_BEASTS } from "#app/data/balance/special-species-groups";
import { timedEventManager } from "#app/global-event-manager"; 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 */ /** the i18n namespace for this encounter */
const namespace = "mysteryEncounters/thePokemonSalesman"; 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 // If you roll 20%, give event encounter with 2 extra shiny rolls and its HA, if it has one
const enc = randSeedItem(validEventEncounters); const enc = randSeedItem(validEventEncounters);
const threshold = new NumberHolder(BASE_SHINY_CHANCE);
globalScene.applyModifiers(ShinyRateBoosterModifier, true, threshold);
threshold.value *= timedEventManager.getShinyMultiplier();
species = getPokemonSpecies(enc.species); species = getPokemonSpecies(enc.species);
pokemon = new PlayerPokemon(species, 5, species.abilityHidden === Abilities.NONE ? undefined : 2, enc.formIndex); 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();
pokemon.trySetShinySeed(threshold.value); // Try again pokemon.trySetShinySeed();
} else { } else {
pokemon = new PlayerPokemon(species, 5, 2, species.formIndex); pokemon = new PlayerPokemon(species, 5, 2, species.formIndex);
} }

12
src/field/pokemon.ts
View File

@ -3190,13 +3190,11 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
if (timedEventManager.isEventActive()) { if (timedEventManager.isEventActive()) {
shinyThreshold.value *= timedEventManager.getShinyMultiplier(); shinyThreshold.value *= timedEventManager.getShinyMultiplier();
} }
if (!this.hasTrainer()) { globalScene.applyModifiers(
globalScene.applyModifiers( ShinyRateBoosterModifier,
ShinyRateBoosterModifier, true,
true, shinyThreshold,
shinyThreshold, );
);
}
} }
else { else {
shinyThreshold.value = thresholdOverride; shinyThreshold.value = thresholdOverride;