Suppress preSummon attrs off field

This commit is contained in:
Dean 2025-05-07 12:36:27 -07:00
parent 5ba294ffee
commit 5faad7ce73

View File

@ -186,6 +186,7 @@ import {
applyAllyStatMultiplierAbAttrs, applyAllyStatMultiplierAbAttrs,
AllyStatMultiplierAbAttr, AllyStatMultiplierAbAttr,
MoveAbilityBypassAbAttr, MoveAbilityBypassAbAttr,
PreSummonAbAttr,
} from "#app/data/abilities/ability"; } from "#app/data/abilities/ability";
import { allAbilities } from "#app/data/data-lists"; import { allAbilities } from "#app/data/data-lists";
import type PokemonData from "#app/system/pokemon-data"; import type PokemonData from "#app/system/pokemon-data";
@ -2414,8 +2415,9 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
const suppressAbilitiesTag = arena.getTag( const suppressAbilitiesTag = arena.getTag(
ArenaTagType.NEUTRALIZING_GAS, ArenaTagType.NEUTRALIZING_GAS,
) as SuppressAbilitiesTag; ) as SuppressAbilitiesTag;
const suppressOffField = ability.hasAttr(PreSummonAbAttr);
if ( if (
this.isOnField() && (this.isOnField() || suppressOffField) &&
suppressAbilitiesTag && suppressAbilitiesTag &&
!suppressAbilitiesTag.isBeingRemoved() !suppressAbilitiesTag.isBeingRemoved()
) { ) {