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

Make sure a Pokemon faints properly after using Explosion

Browse Source
This commit is contained in:
Guangcong Luo 2012-12-13 04:10:14 -08:00
parent 7ed807aacc
commit 54bcd9ab33
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
battles.js
View File

@ -1353,7 +1353,9 @@ function Battle(roomid, format, rated) {
return Math.random()-0.5;
});
for (var i=0; i<actives.length; i++) {
if (actives[i].isStarted) selfB.runEvent(eventid, actives[i], null, effect, relayVar);
if (actives[i].isStarted) {
selfB.runEvent(eventid, actives[i], null, effect, relayVar);
}
}
};
this.residualEvent = function(eventid, relayVar) {

1
data/scripts.js
View File

@ -138,6 +138,7 @@ exports.BattleScripts = {
}
return true;
}
if (!pokemon.hp) pokemon.faint();
} else {
if (target.fainted && target.side !== pokemon.side) {
// if a targeted foe faints, the move is retargeted