From f7bfb925a103bf4497525cea15abd7a579613b74 Mon Sep 17 00:00:00 2001 From: Flashfyre Date: Mon, 1 Jan 2024 20:10:48 -0500 Subject: [PATCH] Fix issue with regional evolutions --- src/data/pokemon-species.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/data/pokemon-species.ts b/src/data/pokemon-species.ts index 22fc5bb8c..f996dd259 100644 --- a/src/data/pokemon-species.ts +++ b/src/data/pokemon-species.ts @@ -374,9 +374,9 @@ export default class PokemonSpecies extends PokemonSpeciesForm { let evolutionChance: number; const evolutionSpecies = getPokemonSpecies(ev.speciesId); - const isRegional = evolutionSpecies.isRegional(); + const isRegionalEvolution = !this.isRegional() && evolutionSpecies.isRegional(); - if (!forTrainer && isRegional) + if (!forTrainer && isRegionalEvolution) evolutionChance = 0; else if (ev.wildDelay === SpeciesWildEvolutionDelay.NONE) { const maxLevelDiff = forTrainer || isBoss ? forTrainer && isBoss ? 10 : 20 : 40; @@ -396,7 +396,7 @@ export default class PokemonSpecies extends PokemonSpeciesForm { } if (evolutionChance > 0) { - if (isRegional) + if (isRegionalEvolution) evolutionChance /= (evolutionSpecies.isRareRegional() ? 16 : 4); totalWeight += evolutionChance;