From 70ebbf1fd645578ac2eb309ce1833c7cd62312d6 Mon Sep 17 00:00:00 2001 From: Slayer95 Date: Sat, 3 May 2014 16:32:51 -0500 Subject: [PATCH] =?UTF-8?q?Pass=20target=20location=20to=20=C2=B4beforeTur?= =?UTF-8?q?nCallback=C2=B4=20This=20fixes=20Assurance=20sometimes=20failin?= =?UTF-8?q?g=20to=20track=20damage=20dealt=20in=20the=20turn.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- battle-engine.js | 2 +- mods/gen2/scripts.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/battle-engine.js b/battle-engine.js index d273395e14..923048a2d4 100644 --- a/battle-engine.js +++ b/battle-engine.js @@ -3115,7 +3115,7 @@ var Battle = (function () { } if (decision.choice === 'move') { if (this.getMove(decision.move).beforeTurnCallback) { - this.addQueue({choice: 'beforeTurnMove', pokemon: decision.pokemon, move: decision.move}, true); + this.addQueue({choice: 'beforeTurnMove', pokemon: decision.pokemon, move: decision.move, targetLoc: decision.targetLoc}, true); } } else if (decision.choice === 'switch') { if (decision.pokemon.switchFlag && decision.pokemon.switchFlag !== true) { diff --git a/mods/gen2/scripts.js b/mods/gen2/scripts.js index 2b413965b4..fd19f91478 100644 --- a/mods/gen2/scripts.js +++ b/mods/gen2/scripts.js @@ -275,7 +275,7 @@ exports.BattleScripts = { } if (decision.choice === 'move') { if (this.getMove(decision.move).beforeTurnCallback) { - this.addQueue({choice: 'beforeTurnMove', pokemon: decision.pokemon, move: decision.move}, true); + this.addQueue({choice: 'beforeTurnMove', pokemon: decision.pokemon, move: decision.move, targetLoc: decision.targetLoc}, true); } } else if (decision.choice === 'switch') { if (decision.pokemon.switchFlag && decision.pokemon.switchFlag !== true) {