Fixed logic to allow mons with no forms

This commit is contained in:
Wlowscha 2025-03-11 23:43:58 +01:00
parent a9ed02d45d
commit aceb922073
No known key found for this signature in database
GPG Key ID: 3C8F1AD330565D04

View File

@ -1299,12 +1299,11 @@ export function checkStarterValidForChallenge(species: PokemonSpecies, props: De
* @returns True if the species is considered valid. * @returns True if the species is considered valid.
*/ */
function checkSpeciesValidForChallenge(species: PokemonSpecies, props: DexAttrProps, soft: boolean) { function checkSpeciesValidForChallenge(species: PokemonSpecies, props: DexAttrProps, soft: boolean) {
if (!soft) { if (!soft || !pokemonFormChanges.hasOwnProperty(species.speciesId)) {
const isValidForChallenge = new Utils.BooleanHolder(true); const isValidForChallenge = new Utils.BooleanHolder(true);
applyChallenges(globalScene.gameMode, ChallengeType.STARTER_CHOICE, species, isValidForChallenge, props); applyChallenges(globalScene.gameMode, ChallengeType.STARTER_CHOICE, species, isValidForChallenge, props);
return isValidForChallenge.value; return isValidForChallenge.value;
} }
if (pokemonFormChanges.hasOwnProperty(species.speciesId)) {
pokemonFormChanges[species.speciesId].forEach(f1 => { pokemonFormChanges[species.speciesId].forEach(f1 => {
species.forms.forEach((f2, formIndex) => { species.forms.forEach((f2, formIndex) => {
if (f1.formKey === f2.formKey) { if (f1.formKey === f2.formKey) {
@ -1324,6 +1323,5 @@ function checkSpeciesValidForChallenge(species: PokemonSpecies, props: DexAttrPr
} }
}); });
}); });
}
return false; return false;
} }