ShuriZma
/
pokerogue
mirror of https://github.com/pagefaultgames/pokerogue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

`ignoreAbilitySource` --> `ignoringEffectSource`

This commit is contained in:
innerthunder 2024-09-11 18:23:56 -07:00
parent 57d167d5c3
commit 25e582ce25
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/field/arena.ts
View File

@ -33,7 +33,7 @@ export class Arena {
public tags: ArenaTag[]; public tags: ArenaTag[];
public bgm: string; public bgm: string;
public ignoreAbilities: boolean; public ignoreAbilities: boolean;
public ignoreAbilitySource: BattlerIndex | null; public ignoringEffectSource: BattlerIndex | null;
private lastTimeOfDay: TimeOfDay; private lastTimeOfDay: TimeOfDay;
@ -570,9 +570,9 @@ export class Arena {
} }
} }
setIgnoreAbilities(ignoreAbilities: boolean, ignoreAbilitySource: BattlerIndex | null = null): void { setIgnoreAbilities(ignoreAbilities: boolean, ignoringEffectSource: BattlerIndex | null = null): void {
this.ignoreAbilities = ignoreAbilities; this.ignoreAbilities = ignoreAbilities;
this.ignoreAbilitySource = ignoreAbilities ? ignoreAbilitySource : null; this.ignoringEffectSource = ignoreAbilities ? ignoringEffectSource : null;
} }
/** /**

2
src/field/pokemon.ts
View File

@ -1222,7 +1222,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
return false; return false;
} }
const arena = this.scene?.arena; const arena = this.scene?.arena;
if (arena.ignoreAbilities && arena.ignoreAbilitySource !== this.getBattlerIndex() && ability.isIgnorable) { if (arena.ignoreAbilities && arena.ignoringEffectSource !== this.getBattlerIndex() && ability.isIgnorable) {
return false; return false;
} }
if (this.summonData?.abilitySuppressed && !ability.hasAttr(UnsuppressableAbilityAbAttr)) { if (this.summonData?.abilitySuppressed && !ability.hasAttr(UnsuppressableAbilityAbAttr)) {