From e2d8a28d6deb10e8052d08ab6028416154959480 Mon Sep 17 00:00:00 2001 From: innerthunder Date: Thu, 2 May 2024 19:03:06 -0700 Subject: [PATCH] remove selfTarget option from ResetPartyStatusAttr --- src/data/move.ts | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/data/move.ts b/src/data/move.ts index 904f962bab4..0de12130789 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -926,8 +926,8 @@ export class ResetStatusAttr extends MoveEffectAttr { export class ResetPartyStatusAttr extends MoveEffectAttr { - constructor(selfTarget: boolean, onHitTrigger: boolean) { - super(selfTarget, onHitTrigger ? MoveEffectTrigger.HIT : MoveEffectTrigger.POST_APPLY); + constructor(onHitTrigger: boolean) { + super(true, onHitTrigger ? MoveEffectTrigger.HIT : MoveEffectTrigger.POST_APPLY); } apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { @@ -952,6 +952,7 @@ export class ResetPartyStatusAttr extends MoveEffectAttr { p.updateInfo(); } } + return true; } } @@ -4440,7 +4441,7 @@ export function initMoves() { .condition((user, target, move) => user.status?.effect === StatusEffect.SLEEP) .ignoresVirtual(), new StatusMove(Moves.HEAL_BELL, Type.NORMAL, -1, 5, -1, 0, 2) - .attr(ResetPartyStatusAttr, true, false) + .attr(ResetPartyStatusAttr, false) .soundBased() .partial(), new AttackMove(Moves.RETURN, Type.NORMAL, MoveCategory.PHYSICAL, -1, 100, 20, -1, 0, 2) @@ -4712,7 +4713,7 @@ export function initMoves() { .attr(MovePowerMultiplierAttr, (user, target, move) => [WeatherType.SUNNY, WeatherType.RAIN, WeatherType.SANDSTORM, WeatherType.HAIL, WeatherType.SNOW, WeatherType.FOG, WeatherType.HEAVY_RAIN, WeatherType.HARSH_SUN].includes(user.scene.arena.weather?.weatherType) && !user.scene.arena.weather?.isEffectSuppressed(user.scene) ? 2 : 1) .ballBombMove(), new StatusMove(Moves.AROMATHERAPY, Type.GRASS, -1, 5, -1, 0, 3) - .attr(ResetPartyStatusAttr, true, false), + .attr(ResetPartyStatusAttr, false), new StatusMove(Moves.FAKE_TEARS, Type.DARK, 100, 20, -1, 0, 3) .attr(StatChangeAttr, BattleStat.SPDEF, -2), new AttackMove(Moves.AIR_CUTTER, Type.FLYING, MoveCategory.SPECIAL, 60, 95, 25, -1, 0, 3) @@ -5840,7 +5841,7 @@ export function initMoves() { new AttackMove(Moves.FREEZY_FROST, Type.ICE, MoveCategory.SPECIAL, 100, 90, 10, -1, 0, 7) .attr(ResetStatsAttr), new AttackMove(Moves.SPARKLY_SWIRL, Type.FAIRY, MoveCategory.SPECIAL, 120, 85, 5, -1, 0, 7) - .attr(ResetPartyStatusAttr, false, true), + .attr(ResetPartyStatusAttr, true), new AttackMove(Moves.VEEVEE_VOLLEY, Type.NORMAL, MoveCategory.PHYSICAL, -1, -1, 20, -1, 0, 7) .attr(FriendshipPowerAttr), new AttackMove(Moves.DOUBLE_IRON_BASH, Type.STEEL, MoveCategory.PHYSICAL, 60, 100, 5, 30, 0, 7)