mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-08-20 14:29:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ability/unburden' of https://github.com/musdraws/pokerogue into ability/unburden

Browse Source
This commit is contained in:
muscode13 2024-11-03 13:13:42 -06:00
commit f5102c4a60
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/data/ability.ts
View File

@ -5008,7 +5008,7 @@ export function applyPostFaintAbAttrs(attrType: Constructor<PostFaintAbAttr>,
}
export function applyPostItemLostAbAttrs(attrType: Constructor<PostItemLostAbAttr>,
pokemon: Pokemon, passive: boolean, simulated: boolean = false, args: any[]): Promise<void> {
pokemon: Pokemon, passive: boolean, simulated: boolean = false, ...args: any[]): Promise<void> {
return applyAbAttrsInternal<PostItemLostAbAttr>(attrType, pokemon, (attr, passive) => attr.applyPostItemLost(pokemon, passive, simulated, args), args);
}

2
src/field/pokemon.ts
View File

@ -972,7 +972,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
if (this.status && this.status.effect === StatusEffect.PARALYSIS) {
ret >>= 1;
}
if (this.getTag(BattlerTagType.UNBURDEN)) {
if (this.getTag(BattlerTagType.UNBURDEN) && !this.scene.getField(true).some(pokemon => pokemon !== this && pokemon.hasAbilityWithAttr(SuppressFieldAbilitiesAbAttr))) {
ret *= 2;
}
break;