From 30a49224185db43f410bed5bc1d2985d4ef2190e Mon Sep 17 00:00:00 2001 From: Opaque02 <66582645+Opaque02@users.noreply.github.com> Date: Mon, 17 Jun 2024 09:59:23 +1000 Subject: [PATCH] Updated form name logic to not show on certain pokemon --- src/ui/pokemon-info-container.ts | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/ui/pokemon-info-container.ts b/src/ui/pokemon-info-container.ts index f28cf2e8a48..69147929f84 100644 --- a/src/ui/pokemon-info-container.ts +++ b/src/ui/pokemon-info-container.ts @@ -12,6 +12,7 @@ import ConfirmUiHandler from "./confirm-ui-handler"; import { StatsContainer } from "./stats-container"; import { TextStyle, addBBCodeTextObject, addTextObject, getTextColor } from "./text"; import { addWindow } from "./ui-theme"; +import * as pokemonSpecies from "../data/pokemon-species"; interface LanguageSetting { infoContainerTextSize: string; @@ -226,7 +227,19 @@ export default class PokemonInfoContainer extends Phaser.GameObjects.Container { this.pokemonGenderText.setVisible(false); } - if (pokemon.species.forms?.[pokemon.formIndex]?.formName) { + let isFormVisible = true; + if (pokemon.species.forms?.length > 0) { + const nonFormKeyForms = pokemon.species.forms.filter(object => { + return !pokemonSpecies.noStarterFormKeys.includes(object.formKey); + }); + if (nonFormKeyForms.length === 1) { + isFormVisible = false; + } + } else { + isFormVisible = false; + } + + if (isFormVisible) { this.pokemonFormLabelText.setVisible(true); this.pokemonFormText.setVisible(true); const newForm = BigInt(Math.pow(2, pokemon.formIndex)) * DexAttr.DEFAULT_FORM;