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

Properly handle pokemon that transformed into each other (#930)

Browse Source 
- prevent infinite recursion
- prevent copies of tracked moves from stacking up
This commit is contained in:
asgdf
2017-05-28 07:59:17 +02:00
committed by Guangcong Luo
parent db77e5625b
commit 77cc4e3a04
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
js/battle.js
View File

@@ -504,12 +504,15 @@ var Pokemon = (function () {
this.clearTurnstatuses();
this.clearMovestatuses();
};
Pokemon.prototype.markMove = function (moveName, pp) {
Pokemon.prototype.markMove = function (moveName, pp, recursionSource) {
if (recursionSource === this.ident) return;
if (pp === undefined) pp = 1;
moveName = Tools.getMove(moveName).name;
if (moveName === 'Struggle') return;
if (this.volatiles.transform) {
this.volatiles.transform[2].markMove(moveName, 0);
// make sure there is no infinite recursion if both Pokemon are transformed into each other
if (!recursionSource) recursionSource = this.ident;
this.volatiles.transform[2].markMove(moveName, 0, recursionSource);
moveName = '*' + moveName;
}
for (var i = 0; i < this.moveTrack.length; i++) {
@@ -4689,7 +4692,7 @@ var Battle = (function () {
poke.volatiles.formechange[2] = (tpoke.volatiles.formechange ? tpoke.volatiles.formechange[2] : tpoke.species);
poke.volatiles.transform[2] = tpoke;
for (var i = 0; i < tpoke.moveTrack.length; i++) {
poke.moveTrack.push(['*' + tpoke.moveTrack[i][0], 0]);
poke.markMove(tpoke.moveTrack[i][0], 0);
}
this.resultAnim(poke, 'Transformed', 'good');
break;