From 002397bee6b4a2ab41fe1a9831d19a7a1f9424d2 Mon Sep 17 00:00:00 2001 From: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com> Date: Sat, 20 Sep 2025 22:59:48 -0500 Subject: [PATCH] Adjust tera blast's getTypesForItemSpawn method --- src/data/moves/move.ts | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/data/moves/move.ts b/src/data/moves/move.ts index e9e48754b8c..27a1052465e 100644 --- a/src/data/moves/move.ts +++ b/src/data/moves/move.ts @@ -94,7 +94,7 @@ import i18next from "i18next"; import { applyChallenges } from "#utils/challenge-utils"; import { MovePhaseTimingModifier } from "#enums/move-phase-timing-modifier"; import type { AbstractConstructor } from "#types/type-helpers"; -import { willTerastallize } from "#utils/pokemon-utils"; +import { canTerastallize, willTerastallize } from "#utils/pokemon-utils"; /** * A function used to conditionally determine execution of a given {@linkcode MoveAttr}. @@ -5320,20 +5320,15 @@ export class TeraBlastTypeAttr extends VariableMoveTypeAttr { const coreType = move.type; const teraType = user.getTeraType(); /** Whether the user is allowed to tera. In the case of an enemy Pokémon, whether it *will* tera. */ - const hasTeraAccess = user.isPlayer() ? globalScene.findModifier(m => m.is("TerastallizeAccessModifier")) != null : willTerastallize(user); + const hasTeraAccess = user.isPlayer() ? canTerastallize(user) : willTerastallize(user); if ( // tera type matches the move's type; no change - teraType === coreType + !hasTeraAccess + || teraType === coreType || teraType === PokemonType.STELLAR || teraType === PokemonType.UNKNOWN - || user.isMega() - || user.isMax() - || user.hasSpecies(SpeciesId.NECROZMA, "ultra") - || (!hasTeraAccess) ) { return [coreType]; - } else { - } return [coreType, teraType]; }