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

Show the move affected by Grudge as having 0 PP (#787)

Browse Source
This commit is contained in:
urkerab
2016-10-21 02:15:32 +01:00
committed by Guangcong Luo
parent 638c117db0
commit 660f1d24c4
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
js/battle.js
View File

@@ -5116,7 +5116,7 @@ var Battle = (function () {
break;
case 'grudge':
actions += "" + poke.getName() + "'s " + Tools.escapeHTML(args[3]) + " lost all of its PP due to the grudge!";
poke.markMove(args[3], 64);
poke.markMove(args[3], Infinity);
break;
case 'quickguard':
poke.addTurnstatus('quickguard');

1
js/client-battle-tooltips.js
View File

@@ -732,6 +732,7 @@ var BattleTooltips = (function () {
}
maxpp = Math.floor(maxpp * 8 / 5);
}
if (ppUsed === Infinity) return move.name + ' <small>(0/' + maxpp + ')</small>';
if (!ppUsed) return move.name + (showKnown ? ' <small>(revealed)</small>' : '');
return move.name + ' <small>(' + (maxpp - ppUsed) + '/' + maxpp + ')</small>';
};