mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-08-19 22:09:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Minor if Change

Browse Source
This commit is contained in:
xsn34kzx 2024-12-01 00:32:35 -05:00
parent 7d0cf39caa
commit b04b137455
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/modifier/modifier-type.ts
View File

@ -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 ] 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)); .some(a => p.hasAbility(a, false, true));
if (!isHoldingOrb) {
if (canSetStatus) { if (canSetStatus) {
return !isHoldingOrb && (hasRelevantAbilities || hasStatusMoves); return hasRelevantAbilities || hasStatusMoves;
} else { } else {
return !isHoldingOrb && hasItemMoves; return hasItemMoves;
} }
}
return false;
}) ? 10 : 0; }) ? 10 : 0;
}, 10), }, 10),
new WeightedModifierType(modifierTypes.FLAME_ORB, (party: Pokemon[]) => { 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 ] const hasRelevantAbilities = [ Abilities.QUICK_FEET, Abilities.GUTS, Abilities.MARVEL_SCALE, Abilities.FLARE_BOOST, Abilities.MAGIC_GUARD ]
.some(a => p.hasAbility(a, false, true)); .some(a => p.hasAbility(a, false, true));
if (!isHoldingOrb) {
if (canSetStatus) { if (canSetStatus) {
return !isHoldingOrb && (hasRelevantAbilities || hasStatusMoves); return hasRelevantAbilities || hasStatusMoves;
} else { } else {
return !isHoldingOrb && hasItemMoves; return hasItemMoves;
} }
}
return false;
}) ? 10 : 0; }) ? 10 : 0;
}, 10), }, 10),
new WeightedModifierType(modifierTypes.WHITE_HERB, (party: Pokemon[]) => { new WeightedModifierType(modifierTypes.WHITE_HERB, (party: Pokemon[]) => {