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

Move Gen 5 Sky Drop's Try handler to TryHit

Browse Source 
Fixes glitches preventing it from working properly due to it inheriting
Gen 6's TryHit handler and effectively locking the users in a loop.
This commit is contained in:
Kevin Lau 2015-06-16 11:37:09 -07:00
parent cebaacb677
commit 05f718f1ff
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
mods/gen5/moves.js
View File

@ -768,25 +768,25 @@ exports.BattleMovedex = {
}, },
skydrop: { skydrop: {
inherit: true, inherit: true,
onTry: function (attacker, defender, move) { onTryHit: function (target, source, move) {
if (defender.fainted) return false; if (target.fainted) return false;
if (attacker.removeVolatile(move.id)) { if (source.removeVolatile(move.id)) {
return; if (target !== source.volatiles['twoturnmove'].source) return false;
}
if (defender.volatiles['substitute'] || defender.side === attacker.side) { if (target.hasType('Flying')) {
return false; this.add('-immune', target, '[msg]');
} this.add('-end', target, 'Sky Drop');
if (defender.volatiles['protect']) { return null;
this.add('-activate', defender, 'Protect'); }
} else {
if (target.volatiles['substitute'] || target.side === source.side) {
return false;
}
this.add('-prepare', source, move.name, target);
source.addVolatile('twoturnmove', target);
return null; return null;
} }
if (defender.volatiles['bounce'] || defender.volatiles['dig'] || defender.volatiles['dive'] || defender.volatiles['fly'] || defender.volatiles['shadowforce']) {
this.add('-miss', attacker, defender);
return null;
}
this.add('-prepare', attacker, move.name, defender);
attacker.addVolatile('twoturnmove', defender);
return null;
} }
}, },
sleeppowder: { sleeppowder: {