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

Fix Protean for moves targetting the field

Browse Source
This commit is contained in:
Slayer95 2014-07-15 20:18:40 -05:00
parent 126b633ceb
commit c2966e1d51
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
data/scripts.js
View File

@ -115,7 +115,7 @@ exports.BattleScripts = {
if (damage === false) this.add('-fail', target);
return true;
}
damage = this.moveHit(target, pokemon, move);
damage = this.tryMoveHit(target, pokemon, move);
} else if (move.target === 'allAdjacent' || move.target === 'allAdjacentFoes') {
var targets = [];
if (move.target === 'allAdjacent') {
@ -203,6 +203,10 @@ exports.BattleScripts = {
this.runEvent('PrepareHit', pokemon, target, move);
if (move.target === 'all' || move.target === 'foeSide' || move.target === 'allySide' || move.target === 'allyTeam') {
return this.moveHit(target, pokemon, move);
}
if ((move.affectedByImmunities && !target.runImmunity(move.type, true)) || (move.isSoundBased && (pokemon !== target || this.gen <= 4) && !target.runImmunity('sound', true))) {
return false;
}