From df7a6be65411763caffa250dbf436210b3d5e9e4 Mon Sep 17 00:00:00 2001 From: Flashfyre Date: Sun, 21 Apr 2024 23:05:36 -0400 Subject: [PATCH] Fix errors from merged PRs --- src/data/ability.ts | 4 ++-- src/data/move.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/data/ability.ts b/src/data/ability.ts index e60394c9720..6fa4514409a 100644 --- a/src/data/ability.ts +++ b/src/data/ability.ts @@ -10,7 +10,7 @@ import { BattlerTagType } from "./enums/battler-tag-type"; import { StatusEffect, getStatusEffectDescriptor, getStatusEffectHealText } from "./status-effect"; import { Gender } from "./gender"; import Move, { AttackMove, MoveCategory, MoveFlags, MoveTarget, RecoilAttr, StatusMoveTypeImmunityAttr, FlinchAttr, OneHitKOAttr, HitHealAttr, StrengthSapHealAttr, allMoves } from "./move"; -import { ArenaTagSide } from "./arena-tag"; +import { ArenaTagSide, ArenaTrapTag } from "./arena-tag"; import { ArenaTagType } from "./enums/arena-tag-type"; import { Stat } from "./pokemon-stat"; import { PokemonHeldItemModifier } from "../modifier/modifier"; @@ -558,7 +558,7 @@ export class PostDefendStatChangeAbAttr extends PostDefendAbAttr { export class PostDefendApplyArenaTrapTagAbAttr extends PostDefendAbAttr { private condition: PokemonDefendCondition; - private tagType: ArenaTrapTag; + private tagType: ArenaTagType; constructor(condition: PokemonDefendCondition, tagType: ArenaTagType) { super(true); diff --git a/src/data/move.ts b/src/data/move.ts index 08f03ac05f1..5ae46c55d81 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -845,7 +845,7 @@ export class HitHealAttr extends MoveEffectAttr { apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { const healAmount = Math.max(Math.floor(user.turnData.damageDealt * this.healRatio), 1); - const reverseDrain = pokemon.hasAbilityWithAttr(ReverseDrainAbAttr); + const reverseDrain = user.hasAbilityWithAttr(ReverseDrainAbAttr); user.scene.unshiftPhase(new PokemonHealPhase(user.scene, user.getBattlerIndex(), !reverseDrain ? healAmount : healAmount * -1, !reverseDrain ? getPokemonMessage(target, ` had its\nenergy drained!`) : undefined, @@ -865,7 +865,7 @@ export class StrengthSapHealAttr extends MoveEffectAttr { apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { const healAmount = target.stats[Stat.ATK] * (Math.max(2, 2 + target.summonData.battleStats[BattleStat.ATK]) / Math.max(2, 2 - target.summonData.battleStats[BattleStat.ATK])); - const reverseDrain = pokemon.hasAbilityWithAttr(ReverseDrainAbAttr); + const reverseDrain = user.hasAbilityWithAttr(ReverseDrainAbAttr); user.scene.unshiftPhase(new PokemonHealPhase(user.scene, user.getBattlerIndex(), !reverseDrain ? healAmount : healAmount * -1, !reverseDrain ? getPokemonMessage(user, ` regained\nhealth!`) : undefined,