From 3892d15ba3447abc89686ae8e03d8d1cf836f184 Mon Sep 17 00:00:00 2001 From: Quite Quiet Date: Mon, 29 Feb 2016 18:00:45 +0100 Subject: [PATCH] Support animating several Pokemon in spread moves --- js/battle.js | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/js/battle.js b/js/battle.js index 122dccfd6..0f9fd2c04 100644 --- a/js/battle.js +++ b/js/battle.js @@ -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;