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

make ghosts not effected by arena trap.

pull/542/head
Reldnahc 2024-05-06 10:39:30 -05:00
parent 6e11324182
commit 6a2cd634e2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/data/ability.ts
View File

@ -2215,7 +2215,7 @@ export class ConditionalArenaTrapAbAttr extends ArenaTrapAbAttr {
}
applyCheckTrapped(pokemon: Pokemon, opponent: Pokemon, passive: boolean, trapped: Utils.BooleanHolder, args: any[]): boolean {
if (this.condition(opponent)) {
if (this.condition(opponent) && !opponent.isOfType(Type.GHOST)) {
trapped.value = true;
return true;
}
@ -2750,7 +2750,7 @@ export function initAbilities() {
new Ability(Abilities.INTIMIDATE, 3)
.attr(PostSummonStatChangeAbAttr, BattleStat.ATK, -1, false, true),
new Ability(Abilities.SHADOW_TAG, 3)
.attr(ConditionalArenaTrapAbAttr, (opponent: Pokemon) => !opponent.isOfType(Type.GHOST)),
.attr(ConditionalArenaTrapAbAttr, (opponent: Pokemon) => true),
new Ability(Abilities.ROUGH_SKIN, 3)
.attr(PostDefendContactDamageAbAttr, 8)
.bypassFaint(),