IAmChrisAMA
/
pokerogue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle Sticky Hold ability + decrease stack before removing modifier

pull/341/head
Frank 2024-04-29 19:35:30 +02:00
parent 9d7dad91f2
commit 8ef29d13dd
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/data/move.ts
View File

@ -1093,6 +1093,10 @@ export class RemoveHeldBerryAttr extends MoveEffectAttr {
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean | Promise<boolean> { apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean | Promise<boolean> {
return new Promise<boolean>(resolve => { return new Promise<boolean>(resolve => {
if (target.hasAbility(Abilities.STICKY_HOLD)) {
return resolve(false);
}
const heldBerries = this.getTargetHeldBerries(target).filter(b => b.getTransferrable(false)) const heldBerries = this.getTargetHeldBerries(target).filter(b => b.getTransferrable(false))
if (!heldBerries.length) { if (!heldBerries.length) {
@ -1100,10 +1104,13 @@ export class RemoveHeldBerryAttr extends MoveEffectAttr {
} }
const removedBerry = heldBerries[user.randSeedInt(heldBerries.length)]; const removedBerry = heldBerries[user.randSeedInt(heldBerries.length)];
const couldRemoveBerry = target.scene.removeModifier(removedBerry, true);
if (!couldRemoveBerry) { if (!(--removedBerry.stackCount)) {
return resolve(false); const couldRemoveBerry = target.scene.removeModifier(removedBerry, true);
if (!couldRemoveBerry) {
return resolve(false);
}
} }
target.scene.updateModifiers(target.isPlayer(), false) target.scene.updateModifiers(target.isPlayer(), false)