From ef1fd4b2fd2568c74d26a277cc862148f803bcac Mon Sep 17 00:00:00 2001 From: Flashfyre Date: Sat, 22 Apr 2023 13:16:45 -0400 Subject: [PATCH] Fix Ingrain not working properly --- src/data/battler-tag.ts | 2 ++ src/data/move.ts | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/data/battler-tag.ts b/src/data/battler-tag.ts index 6bc9ad6c5..c9d924e4f 100644 --- a/src/data/battler-tag.ts +++ b/src/data/battler-tag.ts @@ -324,6 +324,8 @@ export function getBattlerTag(tagType: BattlerTagType, turnCount: integer): Batt return new SeedTag(); case BattlerTagType.NIGHTMARE: return new NightmareTag(); + case BattlerTagType.INGRAIN: + return new IngrainTag(); case BattlerTagType.AQUA_RING: return new AquaRingTag(); case BattlerTagType.DROWSY: diff --git a/src/data/move.ts b/src/data/move.ts index 244a15b5d..912fa5ef0 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -1939,8 +1939,8 @@ export const allMoves = [ new SelfStatusMove(Moves.ROLE_PLAY, "Role Play (N)", Type.PSYCHIC, -1, 10, -1, "User copies the opponent's Ability.", -1, 0, 3), new SelfStatusMove(Moves.WISH, "Wish (N)", Type.NORMAL, -1, 10, -1, "The user recovers HP in the following turn.", -1, 0, 3), new SelfStatusMove(Moves.ASSIST, "Assist (N)", Type.NORMAL, -1, 20, -1, "User performs a move known by its allies at random.", -1, 0, 3), - new SelfStatusMove(Moves.INGRAIN, "Ingrain", Type.GRASS, -1, 20, -1, "User restores HP each turn. User cannot escape/switch.", -1, 0, 3, - new NoTagOverlapConditionalAttr(BattlerTagType.INGRAIN, true), new AddBattlerTagAttr(BattlerTagType.INGRAIN, true)), + new SelfStatusMove(Moves.INGRAIN, "Ingrain", Type.GRASS, -1, 20, -1, "User restores HP each turn. User cannot escape/switch.", -1, 0, 3, + new NoTagOverlapConditionalAttr(BattlerTagType.INGRAIN, true), new AddBattlerTagAttr(BattlerTagType.INGRAIN, true)), // TODO new AttackMove(Moves.SUPERPOWER, "Superpower", Type.FIGHTING, MoveCategory.PHYSICAL, 120, 100, 5, -1, "Lowers user's Attack and Defense.", 100, 0, 3, new StatChangeAttr([ BattleStat.ATK, BattleStat.DEF ], -1, true)), new SelfStatusMove(Moves.MAGIC_COAT, "Magic Coat (N)", Type.PSYCHIC, -1, 15, -1, "Reflects moves that cause status conditions back to the attacker.", -1, 4, 3), @@ -2074,7 +2074,7 @@ export const allMoves = [ new StatusMove(Moves.TOXIC_SPIKES, "Toxic Spikes (N)", Type.POISON, -1, 20, 91, "Poisons opponents when they switch into battle.", -1, 0, 4), new StatusMove(Moves.HEART_SWAP, "Heart Swap (N)", Type.PSYCHIC, -1, 10, -1, "Stat changes are swapped with the opponent.", -1, 0, 4), new SelfStatusMove(Moves.AQUA_RING, "Aqua Ring", Type.WATER, -1, 20, -1, "Restores a little HP each turn.", -1, 0, 4, - new NoTagOverlapConditionalAttr(BattlerTagType.INGRAIN, true), new AddBattlerTagAttr(BattlerTagType.AQUA_RING, true)), + new NoTagOverlapConditionalAttr(BattlerTagType.AQUA_RING, true), new AddBattlerTagAttr(BattlerTagType.AQUA_RING, true)), new SelfStatusMove(Moves.MAGNET_RISE, "Magnet Rise (N)", Type.ELECTRIC, -1, 10, -1, "User becomes immune to Ground-type moves for 5 turns.", -1, 0, 4), new AttackMove(Moves.FLARE_BLITZ, "Flare Blitz", Type.FIRE, MoveCategory.PHYSICAL, 120, 100, 15, 165, "User receives recoil damage. May burn opponent.", 10, 0, 4, new RecoilAttr(), new StatusEffectAttr(StatusEffect.BURN)),