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

Merge pull request #662 from QuiteQuiet/ani

Browse Source 
Support animating several Pokemon in spread moves
This commit is contained in:
Guangcong Luo
2016-03-05 03:43:40 -06:00
parent 4623698ac1 3892d15ba3
commit 573c8ae351
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
js/battle.js
View File

@@ -3219,7 +3219,23 @@ var Battle = (function () {
if (kwargs.prepare || kwargs.anim === 'prepare') {
this.prepareMove(pokemon, move, target);
} else if (!kwargs.notarget) {
(kwargs.anim ? Tools.getMove(kwargs.anim) : move).anim(this, [pokemon.sprite, target.sprite]);
var usedMove = kwargs.anim ? Tools.getMove(kwargs.anim) : move;
if (kwargs.spread) {
var targets = [pokemon.sprite];
var hitPokemon = kwargs.spread.split(',');
if (hitPokemon[0] !== '.') {
for (var i = 0; i < hitPokemon.length; i++) {
targets.push(this.getPokemon(hitPokemon[i] + ': ?').sprite);
}
} else {
// if hitPokemon[0] === '.' then no target was hit by the attack
targets.push(target.side.missedPokemon.sprite);
}
usedMove.anim(this, targets);
} else {
usedMove.anim(this, [pokemon.sprite, target.sprite]);
}
}
}
pokemon.lastmove = move.id;