From eedabbf17cd9dbc8a8145ad2d9e908e16325febb Mon Sep 17 00:00:00 2001 From: Mumble Date: Sat, 13 Jul 2024 21:27:42 -0700 Subject: [PATCH] [Bug] Struggle Recoil should ignore Magic Guard (#3017) * Drafted testable conditions for Magic Guard * Weather Test * Update src/test/abilities/magic_guard.test.ts InnerThunder Co-authored-by: innerthunder <168692175+innerthunder@users.noreply.github.com> * Implemented checks for poison/toxic/burn * Added tests for recoil moves and volatile status * Updated Rock Head, Magic Guard, and Reckless interactions with Struggle * Removed stray file * Fixed Typedoc errors * Implemented innerthunder's feedback --------- Co-authored-by: Frutescens Co-authored-by: innerthunder <168692175+innerthunder@users.noreply.github.com> --- src/data/move.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/move.ts b/src/data/move.ts index 2c7ab94cc4c..ff3054ab7b4 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -1085,6 +1085,7 @@ export class RecoilAttr extends MoveEffectAttr { const cancelled = new Utils.BooleanHolder(false); if (!this.unblockable) { applyAbAttrs(BlockRecoilDamageAttr, user, cancelled); + applyAbAttrs(BlockNonDirectDamageAbAttr, user, cancelled); } if (cancelled.value) { @@ -1097,7 +1098,6 @@ export class RecoilAttr extends MoveEffectAttr { return false; } - applyAbAttrs(BlockNonDirectDamageAbAttr, user, cancelled); if (cancelled.value) { return false; }