Leahnaya/pokemon-showdown-client
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown-client.git synced 2026-10-25 11:40:58 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tooltips: Fix crash in switch menu

Browse Source
This commit is contained in:
Marty-D
2017-10-12 22:45:06 -04:00
committed by GitHub
parent d8e0986f8a
commit ca0fc3bd5e
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -414,10 +414,12 @@ var BattleTooltips = (function () {
if (pokemonData) exacthp = ' (' + pokemonData.hp + '/' + pokemonData.maxhp + ')';
else if (pokemon.maxhp == 48) exacthp = ' <small>(' + pokemon.hp + '/' + pokemon.maxhp + ' pixels)</small>';
text += '<p>HP: ' + pokemon.hpDisplay() + exacthp + (pokemon.status ? ' <span class="status ' + pokemon.status + '">' + pokemon.status.toUpperCase() + '</span>' : '');
if (pokemon.status === 'tox') {
text += ' Next damage: ' + Math.floor(100 / 16) * Math.min(pokemon.statusData.toxicTurns, 15) + '%';
} else if (pokemon.status === 'slp') {
text += ' Turns asleep: ' + pokemon.statusData.sleepTurns;
if (pokemon.statusData) {
if (pokemon.status === 'tox') {
text += ' Next damage: ' + Math.floor(100 / 16) * Math.min(pokemon.statusData.toxicTurns, 15) + '%';
} else if (pokemon.status === 'slp') {
text += ' Turns asleep: ' + pokemon.statusData.sleepTurns;
}
}
text += '</p>';
}