Fix issue with regional evolutions

This commit is contained in:
Flashfyre 2024-01-01 20:10:48 -05:00
parent 308b264246
commit f7bfb925a1

View File

@ -374,9 +374,9 @@ export default class PokemonSpecies extends PokemonSpeciesForm {
let evolutionChance: number; let evolutionChance: number;
const evolutionSpecies = getPokemonSpecies(ev.speciesId); const evolutionSpecies = getPokemonSpecies(ev.speciesId);
const isRegional = evolutionSpecies.isRegional(); const isRegionalEvolution = !this.isRegional() && evolutionSpecies.isRegional();
if (!forTrainer && isRegional) if (!forTrainer && isRegionalEvolution)
evolutionChance = 0; evolutionChance = 0;
else if (ev.wildDelay === SpeciesWildEvolutionDelay.NONE) { else if (ev.wildDelay === SpeciesWildEvolutionDelay.NONE) {
const maxLevelDiff = forTrainer || isBoss ? forTrainer && isBoss ? 10 : 20 : 40; const maxLevelDiff = forTrainer || isBoss ? forTrainer && isBoss ? 10 : 20 : 40;
@ -396,7 +396,7 @@ export default class PokemonSpecies extends PokemonSpeciesForm {
} }
if (evolutionChance > 0) { if (evolutionChance > 0) {
if (isRegional) if (isRegionalEvolution)
evolutionChance /= (evolutionSpecies.isRareRegional() ? 16 : 4); evolutionChance /= (evolutionSpecies.isRareRegional() ? 16 : 4);
totalWeight += evolutionChance; totalWeight += evolutionChance;