Leahnaya/pokemon-showdown
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown.git synced 2026-09-14 04:05:39 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Don't let Gorilla Tactics lock into Max moves

Browse Source
This commit is contained in:
Guangcong Luo
2019-11-17 18:02:02 +13:00
parent ab38ef82cd
commit 8565fd6d02
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
data/abilities.js
View File

@@ -1290,8 +1290,8 @@ let BattleAbilities = {
pokemon.abilityData.choiceLock = "";
},
onBeforeMove(pokemon, target, move) {
if (move.isZPowered || move.maxPowered || move.id === 'struggle') return;
if (pokemon.abilityData.choiceLock && pokemon.abilityData.choiceLock !== move.id) {
if (move.isZPowered || move.maxPowered || move.id === 'struggle') return;
// Fails unless ability is being ignored (these events will not run), no PP lost.
this.addMove('move', pokemon, move.name);
this.attrLastMove('[still]');
@@ -1301,6 +1301,7 @@ let BattleAbilities = {
}
},
onModifyMove(move, pokemon) {
if (move.isZPowered || move.maxPowered || move.id === 'struggle') return;
pokemon.abilityData.choiceLock = move.id;
},
onModifyAtkPriority: 1,