mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-07-06 16:32:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Stopped the pokemon consuming a Lum Berry if the user has Poison Heal and is poisoned/toxic'd

Browse Source
This commit is contained in:
EmoUsedHM01 2024-04-29 21:42:15 +01:00 committed by GitHub
parent 81a7116cfe
commit 8c7fb600ea
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/data/berry.ts
View File

@ -4,7 +4,8 @@ import Pokemon, { HitResult } from "../field/pokemon";
import { getBattleStatName } from "./battle-stat"; import { getBattleStatName } from "./battle-stat";
import { BattleStat } from "./battle-stat"; import { BattleStat } from "./battle-stat";
import { BattlerTagType } from "./enums/battler-tag-type"; import { BattlerTagType } from "./enums/battler-tag-type";
import { getStatusEffectHealText } from "./status-effect"; import { Abilities } from "./enums/abilities";
import { StatusEffect, getStatusEffectHealText } from "./status-effect";
import * as Utils from "../utils"; import * as Utils from "../utils";
import { DoubleBerryEffectAbAttr, ReduceBerryUseThresholdAbAttr, applyAbAttrs } from "./ability"; import { DoubleBerryEffectAbAttr, ReduceBerryUseThresholdAbAttr, applyAbAttrs } from "./ability";
@ -57,7 +58,13 @@ export function getBerryPredicate(berryType: BerryType): BerryPredicate {
case BerryType.SITRUS: case BerryType.SITRUS:
return (pokemon: Pokemon) => pokemon.getHpRatio() < 0.5; return (pokemon: Pokemon) => pokemon.getHpRatio() < 0.5;
case BerryType.LUM: case BerryType.LUM:
return (pokemon: Pokemon) => !!pokemon.status || !!pokemon.getTag(BattlerTagType.CONFUSED); return (pokemon: Pokemon) => {
// Check both POISON and TOXIC statuses and the POISON_HEAL ability
if ((pokemon.status.effect === StatusEffect.POISON || pokemon.status.effect === StatusEffect.TOXIC) && pokemon.hasAbility(Abilities.POISON_HEAL)) {
return false; // Do not consume the berry
}
return !!pokemon.status.effect || !!pokemon.getTag(BattlerTagType.CONFUSED);
};
case BerryType.ENIGMA: case BerryType.ENIGMA:
return (pokemon: Pokemon) => !!pokemon.turnData.attacksReceived.filter(a => a.result === HitResult.SUPER_EFFECTIVE).length; return (pokemon: Pokemon) => !!pokemon.turnData.attacksReceived.filter(a => a.result === HitResult.SUPER_EFFECTIVE).length;
case BerryType.LIECHI: case BerryType.LIECHI: