From 07f0a67c781107239499dcc0588bbf258b5d965d Mon Sep 17 00:00:00 2001 From: Xavion3 Date: Sun, 9 Jun 2024 11:08:30 +1000 Subject: [PATCH] Make getTypes ignore transform when ignoring overrides (#1976) --- src/field/pokemon.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index 9a44f9ba144..580e873a410 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -857,11 +857,11 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { if (!ignoreOverride && this.summonData?.types) { this.summonData.types.forEach(t => types.push(t)); } else { - const speciesForm = this.getSpeciesForm(); + const speciesForm = this.getSpeciesForm(ignoreOverride); types.push(speciesForm.type1); - const fusionSpeciesForm = this.getFusionSpeciesForm(); + const fusionSpeciesForm = this.getFusionSpeciesForm(ignoreOverride); if (fusionSpeciesForm) { if (fusionSpeciesForm.type2 !== null && fusionSpeciesForm.type2 !== speciesForm.type1) { types.push(fusionSpeciesForm.type2);