mirror of
https://github.com/pagefaultgames/pokerogue.git
synced 2025-07-05 16:02:20 +02:00
Fix merge overwrite issues
This commit is contained in:
parent
53731e6bca
commit
95a5ba2349
@ -2913,7 +2913,8 @@ export function initAbilities() {
|
|||||||
.attr(DownloadAbAttr),
|
.attr(DownloadAbAttr),
|
||||||
new Ability(Abilities.IRON_FIST, 4)
|
new Ability(Abilities.IRON_FIST, 4)
|
||||||
.attr(MovePowerBoostAbAttr, (user, target, move) => move.hasFlag(MoveFlags.PUNCHING_MOVE), 1.2),
|
.attr(MovePowerBoostAbAttr, (user, target, move) => move.hasFlag(MoveFlags.PUNCHING_MOVE), 1.2),
|
||||||
new Ability(Abilities.POISON_HEAL, 4),
|
new Ability(Abilities.POISON_HEAL, 4)
|
||||||
|
.unimplemented(),
|
||||||
new Ability(Abilities.ADAPTABILITY, 4)
|
new Ability(Abilities.ADAPTABILITY, 4)
|
||||||
.attr(StabBoostAbAttr),
|
.attr(StabBoostAbAttr),
|
||||||
new Ability(Abilities.SKILL_LINK, 4)
|
new Ability(Abilities.SKILL_LINK, 4)
|
||||||
|
Loading…
Reference in New Issue
Block a user