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

Renamed overrideTypes to customTypes to avoid confusion with override

Browse Source
This commit is contained in:
Wlowscha 2025-02-01 18:27:44 +01:00
parent fdb33ce48a
commit 1fb2796d9e
No known key found for this signature in database
GPG Key ID: 3C8F1AD330565D04
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/field/pokemon.ts
View File

@ -1262,17 +1262,17 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
} else { } else {
const speciesForm = this.getSpeciesForm(ignoreOverride); const speciesForm = this.getSpeciesForm(ignoreOverride);
const fusionSpeciesForm = this.getFusionSpeciesForm(ignoreOverride); const fusionSpeciesForm = this.getFusionSpeciesForm(ignoreOverride);
const overrideTypes = this.customPokemonData.types && this.customPokemonData.types.length > 0; const customTypes = this.customPokemonData.types?.length > 0;
// First type, checking for "permanently changed" types from ME // First type, checking for "permanently changed" types from ME
const firstType = (overrideTypes && this.customPokemonData.types[0] !== Type.UNKNOWN) ? this.customPokemonData.types[0] : speciesForm.type1; const firstType = (customTypes && this.customPokemonData.types[0] !== Type.UNKNOWN) ? this.customPokemonData.types[0] : speciesForm.type1;
types.push(firstType); types.push(firstType);
// Second type // Second type
let secondType: Type | null = null; let secondType: Type | null = null;
if (fusionSpeciesForm) { if (fusionSpeciesForm) {
// Check if the fusion Pokemon also had "permanently changed" types when determining the fusion types // Check if the fusion Pokemon also had permanently changes when determining the fusion types
const fusionType1 = (this.fusionCustomPokemonData?.types && this.fusionCustomPokemonData.types.length > 0 && this.fusionCustomPokemonData.types[0] !== Type.UNKNOWN) const fusionType1 = (this.fusionCustomPokemonData?.types && this.fusionCustomPokemonData.types.length > 0 && this.fusionCustomPokemonData.types[0] !== Type.UNKNOWN)
? this.fusionCustomPokemonData.types[0] : fusionSpeciesForm.type1; ? this.fusionCustomPokemonData.types[0] : fusionSpeciesForm.type1;
const fusionType2 = (this.fusionCustomPokemonData?.types && this.fusionCustomPokemonData.types.length > 1 && this.fusionCustomPokemonData.types[1] !== Type.UNKNOWN) const fusionType2 = (this.fusionCustomPokemonData?.types && this.fusionCustomPokemonData.types.length > 1 && this.fusionCustomPokemonData.types[1] !== Type.UNKNOWN)
@ -1285,8 +1285,8 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
secondType = fusionType1; secondType = fusionType1;
} }
} else { } else {
// If not a fusion, just get the second type from the species, checking for overrides // If not a fusion, just get the second type from the species, checking for permanent changes from ME
secondType = (overrideTypes && this.customPokemonData.types.length > 1 && this.customPokemonData.types[1] !== Type.UNKNOWN) secondType = (customTypes && this.customPokemonData.types.length > 1 && this.customPokemonData.types[1] !== Type.UNKNOWN)
? this.customPokemonData.types[1] : speciesForm.type2; ? this.customPokemonData.types[1] : speciesForm.type2;
} }