Leahnaya/pokemon-showdown
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown.git synced 2026-10-01 22:01:41 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Update non-Instructable moves

Browse Source
This commit is contained in:
Marty-D
2016-12-15 10:46:38 -05:00
committed by GitHub
parent f026acc43a
commit bc3413a8fa
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/moves.js
View File

@@ -8591,9 +8591,9 @@ exports.BattleMovedex = {
if (!target.lastMove) return false;
let lastMove = this.getMove(target.lastMove);
let noInstruct = {
instruct:1, outrage:1, petaldance:1, thrash:1, // TODO: fill this up
beakblast:1, copycat:1, focuspunch:1, instruct:1, mefirst:1, metronome:1, mimic:1, mirrormove:1, outrage:1, petaldance:1, shelltrap:1, thrash:1, // TODO: fill this up
};
if (noInstruct[lastMove.id] || lastMove.isZ || lastMove.flags['charge'] || lastMove.flags['recharge']) {
if (noInstruct[lastMove.id] || lastMove.isZ || lastMove.flags['charge'] || lastMove.flags['recharge'] || target.volatiles['beakblast'] || target.volatiles['focuspunch'] || target.volatiles['shelltrap']) {
return false;
}
this.add('-singleturn', target, 'move: Instruct', '[of] ' + source);