mirror of
https://github.com/pagefaultgames/pokerogue.git
synced 2025-07-06 00:12:16 +02:00
fix abilities that might get the illusion type as well
This commit is contained in:
parent
426b56a847
commit
c10f01c7ac
@ -6574,7 +6574,7 @@ export function initAbilities() {
|
|||||||
.ignorable(),
|
.ignorable(),
|
||||||
new Ability(Abilities.MAGNET_PULL, 3)
|
new Ability(Abilities.MAGNET_PULL, 3)
|
||||||
.attr(ArenaTrapAbAttr, (user, target) => {
|
.attr(ArenaTrapAbAttr, (user, target) => {
|
||||||
if (target.getTypes(true).includes(PokemonType.STEEL) || (target.getTypes(true).includes(PokemonType.STELLAR) && target.getTypes().includes(PokemonType.STEEL))) {
|
if (target.getTypes(true, false, undefined, false).includes(PokemonType.STEEL) || (target.getTypes(true).includes(PokemonType.STELLAR) && target.getTypes().includes(PokemonType.STEEL))) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
@ -6976,16 +6976,16 @@ export function initAbilities() {
|
|||||||
.ignorable(),
|
.ignorable(),
|
||||||
new Ability(Abilities.FLOWER_VEIL, 6)
|
new Ability(Abilities.FLOWER_VEIL, 6)
|
||||||
.attr(ConditionalUserFieldStatusEffectImmunityAbAttr, (target: Pokemon, source: Pokemon | null) => {
|
.attr(ConditionalUserFieldStatusEffectImmunityAbAttr, (target: Pokemon, source: Pokemon | null) => {
|
||||||
return source ? target.getTypes().includes(PokemonType.GRASS) && target.id !== source.id : false;
|
return source ? target.getTypes(false, false, undefined, false).includes(PokemonType.GRASS) && target.id !== source.id : false;
|
||||||
})
|
})
|
||||||
.attr(ConditionalUserFieldBattlerTagImmunityAbAttr,
|
.attr(ConditionalUserFieldBattlerTagImmunityAbAttr,
|
||||||
(target: Pokemon) => {
|
(target: Pokemon) => {
|
||||||
return target.getTypes().includes(PokemonType.GRASS);
|
return target.getTypes(false, false, undefined, false).includes(PokemonType.GRASS);
|
||||||
},
|
},
|
||||||
[ BattlerTagType.DROWSY ],
|
[ BattlerTagType.DROWSY ],
|
||||||
)
|
)
|
||||||
.attr(ConditionalUserFieldProtectStatAbAttr, (target: Pokemon) => {
|
.attr(ConditionalUserFieldProtectStatAbAttr, (target: Pokemon) => {
|
||||||
return target.getTypes().includes(PokemonType.GRASS);
|
return target.getTypes(false, false, undefined, false).includes(PokemonType.GRASS);
|
||||||
})
|
})
|
||||||
.ignorable(),
|
.ignorable(),
|
||||||
new Ability(Abilities.CHEEK_POUCH, 6)
|
new Ability(Abilities.CHEEK_POUCH, 6)
|
||||||
|
Loading…
Reference in New Issue
Block a user