Leahnaya/pokemon-showdown
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown.git synced 2026-09-07 08:45:32 -05:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #894 from Slayer95/assurance

Browse Source 
Pass target location to ´beforeTurnCallback´
This commit is contained in:
Guangcong Luo
2014-05-04 00:48:00 -05:00
parent 7cab717681 70ebbf1fd6
commit 73198ca282
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
battle-engine.js
View File

@@ -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) {

2
mods/gen2/scripts.js
View File

@@ -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) {