fixing merge conflicts

This commit is contained in:
lucfd 2024-04-25 01:07:08 -04:00 committed by GitHub
parent 8d0a868dbe
commit a762101f64
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -3195,8 +3195,6 @@ export function initAbilities() {
.attr(NoFusionAbilityAbAttr), .attr(NoFusionAbilityAbAttr),
new Ability(Abilities.QUICK_DRAW, "Quick Draw", "Enables the Pokémon to move first occasionally.", 8) new Ability(Abilities.QUICK_DRAW, "Quick Draw", "Enables the Pokémon to move first occasionally.", 8)
.attr(IncrementMovePriorityAbAttr, (pokemon, move) => move.category !== MoveCategory.STATUS && Math.random() <= 1/3, 0.01), .attr(IncrementMovePriorityAbAttr, (pokemon, move) => move.category !== MoveCategory.STATUS && Math.random() <= 1/3, 0.01),
new Ability(Abilities.QUICK_DRAW, 8)
.unimplemented(),
new Ability(Abilities.UNSEEN_FIST, 8) new Ability(Abilities.UNSEEN_FIST, 8)
.unimplemented(), .unimplemented(),
new Ability(Abilities.CURIOUS_MEDICINE, 8) new Ability(Abilities.CURIOUS_MEDICINE, 8)