From dcff60b54cb65026519ade6d4c93e654ddfadbed Mon Sep 17 00:00:00 2001 From: Christopher Schmidt Date: Sat, 29 Mar 2025 10:02:49 -0400 Subject: [PATCH] Adds a boolean check for the Pollen Puff edge case in canBeMultiStrikeEnhanced --- src/data/moves/move.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/data/moves/move.ts b/src/data/moves/move.ts index e18e898bc68..6e28bcb76a8 100644 --- a/src/data/moves/move.ts +++ b/src/data/moves/move.ts @@ -905,7 +905,7 @@ export default class Move implements Localizable { SacrificialAttrOnHit ]; - // ...and cannot enhance these specific moves. + // ...and cannot enhance these specific moves const exceptMoves: Moves[] = [ Moves.FLING, Moves.UPROAR, @@ -914,10 +914,14 @@ export default class Move implements Localizable { Moves.ENDEAVOR ]; + // ...and cannot enhance Pollen Puff when targeting an ally. + const exceptPollenPuffAlly: boolean = this.id === Moves.POLLEN_PUFF && targets.includes(user.getAlly().getBattlerIndex()) + return (!restrictSpread || !isMultiTarget) && !this.isChargingMove() && !exceptAttrs.some(attr => this.hasAttr(attr)) && !exceptMoves.some(id => this.id === id) + && !exceptPollenPuffAlly && this.category !== MoveCategory.STATUS; } }