From c24f630cafd4f460d44848127e5855fd47311ad1 Mon Sep 17 00:00:00 2001 From: Bertie690 Date: Sat, 14 Jun 2025 14:52:09 -0400 Subject: [PATCH] fixed stockpile to no longer fail on stack full --- src/data/moves/move.ts | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/data/moves/move.ts b/src/data/moves/move.ts index b488dbc19df..8a79be84070 100644 --- a/src/data/moves/move.ts +++ b/src/data/moves/move.ts @@ -4433,6 +4433,11 @@ export class SwallowHealAttr extends HealAttr { return false; } + + // TODO: Is this correct? Should stockpile count as "succeeding" even at full HP? + override getCondition(): MoveConditionFunc { + return hasStockpileStacksCondition; + } } const hasStockpileStacksCondition: MoveConditionFunc = (user) => { @@ -9266,10 +9271,11 @@ export function initMoves() { .attr(SpitUpPowerAttr, 100) .attr(RemoveBattlerTagAttr, [ BattlerTagType.STOCKPILING ], true), new SelfStatusMove(MoveId.SWALLOW, PokemonType.NORMAL, -1, 10, -1, 0, 3) - .condition(hasStockpileStacksCondition) .attr(SwallowHealAttr) .attr(RemoveBattlerTagAttr, [ BattlerTagType.STOCKPILING ], true) - .triageMove(), + .triageMove() + // TODO: Verify if using Swallow at full HP still consumes stacks or not + .edgeCase(), new AttackMove(MoveId.HEAT_WAVE, PokemonType.FIRE, MoveCategory.SPECIAL, 95, 90, 10, 10, 0, 3) .attr(HealStatusEffectAttr, true, StatusEffect.FREEZE) .attr(StatusEffectAttr, StatusEffect.BURN)