From 70cd42b934d2dddda6a08a937d85106d7c5fc870 Mon Sep 17 00:00:00 2001 From: Flashfyre Date: Sun, 23 Apr 2023 01:37:58 -0400 Subject: [PATCH] Add stack limit to Golden Pokeball modifier --- src/data/move.ts | 2 +- src/modifier/modifier.ts | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/data/move.ts b/src/data/move.ts index ab22a3458cd..a9f5fad17a0 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -1889,7 +1889,7 @@ export const allMoves = [ new AttackMove(Moves.GIGA_DRAIN, "Giga Drain", Type.GRASS, MoveCategory.SPECIAL, 75, 100, 10, 111, "User recovers half the HP inflicted on opponent.", -1, 4, 2, new HitHealAttr()), new SelfStatusMove(Moves.ENDURE, "Endure (N)", Type.NORMAL, -1, 10, 47, "Always left with at least 1 HP, but may fail if used consecutively.", -1, 0, 2), new StatusMove(Moves.CHARM, "Charm", Type.FAIRY, 100, 20, 2, "Sharply lowers opponent's Attack.", -1, 0, 2, new StatChangeAttr(BattleStat.ATK, -2)), - new AttackMove(Moves.ROLLOUT, "Rollout", Type.ROCK, MoveCategory.PHYSICAL, 30, 90, 20, -1, "Doubles in power each turn for 5 turns.", -1, 0, 2, new ConsecutiveUseDoublePowerAttr(5, true, true)), + new AttackMove(Moves.ROLLOUT, "Rollout", Type.ROCK, MoveCategory.PHYSICAL, 30, 90, 20, -1, "Doubles in power each turn for 5 turns.", -1, 0, 2, new ConsecutiveUseDoublePowerAttr(5, true, true)), // TODO: Defense Curl logic new AttackMove(Moves.FALSE_SWIPE, "False Swipe (N)", Type.NORMAL, MoveCategory.PHYSICAL, 40, 100, 40, 57, "Always leaves opponent with at least 1 HP.", -1, 0, 2), new StatusMove(Moves.SWAGGER, "Swagger", Type.NORMAL, 85, 15, -1, "Confuses opponent, but sharply raises its Attack.", -1, 0, 2, new StatChangeAttr(BattleStat.ATK, 2), new ConfuseAttr()), new SelfStatusMove(Moves.MILK_DRINK, "Milk Drink", Type.NORMAL, -1, 5, -1, "User recovers half its max HP.", -1, 0, 2, new HealAttr(0.5)), diff --git a/src/modifier/modifier.ts b/src/modifier/modifier.ts index 3baf44bdab9..32b09b21f99 100644 --- a/src/modifier/modifier.ts +++ b/src/modifier/modifier.ts @@ -884,4 +884,8 @@ export class ExtraModifierModifier extends PersistentModifier { return true; } + + getMaxStackCount(): integer { + return 3; + } } \ No newline at end of file