From 7e3ff28eaa1f2f5c49492fd191717966d3450870 Mon Sep 17 00:00:00 2001 From: Tempoanon <163687446+Tempo-anon@users.noreply.github.com> Date: Tue, 25 Jun 2024 20:08:03 -0400 Subject: [PATCH] Add flooring to ReceivedMoveDamageMultiplierAbAttr (#2606) * Add flooring to ReceivedMoveDamageMultiplierAbAttr * Fix merge conflicts for real --- src/data/ability.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/data/ability.ts b/src/data/ability.ts index 0d6681a56a6..c3881bd4856 100644 --- a/src/data/ability.ts +++ b/src/data/ability.ts @@ -312,7 +312,8 @@ export class ReceivedMoveDamageMultiplierAbAttr extends PreDefendAbAttr { applyPreDefend(pokemon: Pokemon, passive: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): boolean { if (this.condition(pokemon, attacker, move)) { - (args[0] as Utils.NumberHolder).value *= this.damageMultiplier; + (args[0] as Utils.NumberHolder).value = Math.floor((args[0] as Utils.NumberHolder).value * this.damageMultiplier); + return true; }