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

Show a fail message when force-switch moves fail

Browse Source
This commit is contained in:
Guangcong Luo 2013-06-19 17:16:18 -05:00
parent 4e4e10736c
commit fc9725efad
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
data/scripts.js
View File

@ -376,8 +376,6 @@ exports.BattleScripts = {
return false;
}
didSomething = true;
} else if (damage === false && typeof hitResult === 'undefined') {
this.add('-fail', target);
}
if (damage === false || damage === null) {
if (damage === false) {
@ -472,10 +470,11 @@ exports.BattleScripts = {
}
}
}
if (target && target.hp > 0 && pokemon.hp > 0) {
if (moveData.forceSwitch && this.runEvent('DragOut', target, pokemon, move)) {
if (target && target.hp > 0 && pokemon.hp > 0 && moveData.forceSwitch) {
hitResult = this.runEvent('DragOut', target, pokemon, move);
if (hitResult) {
target.forceSwitchFlag = true;
} else {
} else if (hitResult === false) {
this.add('-fail', target);
}
}