From b04b1374551b8b474adfac86df36f6f5325266a2 Mon Sep 17 00:00:00 2001 From: xsn34kzx Date: Sun, 1 Dec 2024 00:32:35 -0500 Subject: [PATCH] Minor `if` Change --- src/modifier/modifier-type.ts | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/modifier/modifier-type.ts b/src/modifier/modifier-type.ts index ec851ab155b..57b3ced1813 100644 --- a/src/modifier/modifier-type.ts +++ b/src/modifier/modifier-type.ts @@ -1768,11 +1768,14 @@ const modifierPool: ModifierPool = { const hasRelevantAbilities = [ Abilities.QUICK_FEET, Abilities.GUTS, Abilities.MARVEL_SCALE, Abilities.TOXIC_BOOST, Abilities.POISON_HEAL, Abilities.MAGIC_GUARD ] .some(a => p.hasAbility(a, false, true)); - if (canSetStatus) { - return !isHoldingOrb && (hasRelevantAbilities || hasStatusMoves); - } else { - return !isHoldingOrb && hasItemMoves; + if (!isHoldingOrb) { + if (canSetStatus) { + return hasRelevantAbilities || hasStatusMoves; + } else { + return hasItemMoves; + } } + return false; }) ? 10 : 0; }, 10), new WeightedModifierType(modifierTypes.FLAME_ORB, (party: Pokemon[]) => { @@ -1792,11 +1795,14 @@ const modifierPool: ModifierPool = { const hasRelevantAbilities = [ Abilities.QUICK_FEET, Abilities.GUTS, Abilities.MARVEL_SCALE, Abilities.FLARE_BOOST, Abilities.MAGIC_GUARD ] .some(a => p.hasAbility(a, false, true)); - if (canSetStatus) { - return !isHoldingOrb && (hasRelevantAbilities || hasStatusMoves); - } else { - return !isHoldingOrb && hasItemMoves; + if (!isHoldingOrb) { + if (canSetStatus) { + return hasRelevantAbilities || hasStatusMoves; + } else { + return hasItemMoves; + } } + return false; }) ? 10 : 0; }, 10), new WeightedModifierType(modifierTypes.WHITE_HERB, (party: Pokemon[]) => {