From 9ce26b47cc1413d91c4a3d4a26b3515bf6bdc008 Mon Sep 17 00:00:00 2001 From: Ethan Date: Thu, 9 May 2024 18:24:06 -0400 Subject: [PATCH] Updated attribute names, as well as making the move cancelled instead of 0x multiplier --- src/data/move.ts | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/data/move.ts b/src/data/move.ts index 5ae2a902d12..e842f2ce808 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -2329,14 +2329,13 @@ export class WaterSuperEffectTypeMultiplierAttr extends VariableMoveTypeMultipli } } -export class IceNoEffectTypeMultiplierAttr extends VariableMoveTypeMultiplierAttr { +export class IceNoEffectTypeAttr extends VariableMoveTypeMultiplierAttr { apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { - const multiplier = args[0] as Utils.NumberHolder; if (target.isOfType(Type.ICE)) { - multiplier.value = 0; - return true; + (args[0] as Utils.BooleanHolder).value = false; + return false; } - return false; + return true; } } @@ -2359,7 +2358,7 @@ export class OneHitKOAccuracyAttr extends VariableAccuracyAttr { } } -export class SheerColdAttr extends OneHitKOAccuracyAttr { +export class SheerColdAccuracyAttr extends OneHitKOAccuracyAttr { apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { const accuracy = args[0] as Utils.NumberHolder; if (user.level < target.level) { @@ -4654,9 +4653,9 @@ export function initMoves() { .attr(TrapAttr, BattlerTagType.SAND_TOMB) .makesContact(false), new AttackMove(Moves.SHEER_COLD, Type.ICE, MoveCategory.SPECIAL, 200, 20, 5, -1, 0, 3) + .attr(IceNoEffectTypeAttr) .attr(OneHitKOAttr) - .attr(IceNoEffectTypeMultiplierAttr) - .attr(SheerColdAttr), + .attr(SheerColdAccuracyAttr), new AttackMove(Moves.MUDDY_WATER, Type.WATER, MoveCategory.SPECIAL, 90, 85, 10, 30, 0, 3) .attr(StatChangeAttr, BattleStat.ACC, -1) .target(MoveTarget.ALL_NEAR_ENEMIES),