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

Revert "Show fail message when status is blocked by Sub"

Browse Source 
This was implemented exactly the wrong way and showed fail messages
in a lot of situations they shouldn't show up, such as when
Close Combat's Def/SpD drops didn't happen.

This reverts commit 1edc40f936.
This commit is contained in:
Guangcong Luo 2015-04-25 21:58:09 -05:00
parent 4133fc3356
commit 4db053befe
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
data/moves.js
View File

@ -13446,8 +13446,7 @@ exports.BattleMovedex = {
}
var damage = this.getDamage(source, target, move);
if (!damage) {
if (damage === 0) return null;
return false;
return null;
}
damage = this.runEvent('SubDamage', target, source, move, damage);
if (!damage) {

1
data/scripts.js
View File

@ -388,7 +388,6 @@ exports.BattleScripts = {
hitResult = true;
}
if (!hitResult) {
if (hitResult === false) this.add('-fail', target);
return false;
}

3
mods/gen5/moves.js
View File

@ -841,8 +841,7 @@ exports.BattleMovedex = {
}
var damage = this.getDamage(source, target, move);
if (!damage) {
if (damage === 0) return null;
return false;
return null;
}
damage = this.runEvent('SubDamage', target, source, move, damage);
if (!damage) {