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

More changes to HP display

Browse Source 
- show best available information when hovering over pokeballs
- show an approximate percent in the log and when hovering
This commit is contained in:
Cathy J. Fitzpatrick
2013-02-24 17:04:52 -07:00
parent d74b81b0d2
commit 3b3f8112be
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
js/battle.js
View File

@@ -303,7 +303,9 @@ function Pokemon(species) {
name += ' (fainted)';
} else {
var statustext = '';
if (selfP.hp !== selfP.maxhp) statustext = selfP.hpDisplay();
if (selfP.hp !== selfP.maxhp) {
statustext += selfP.hp + '/' + selfP.maxhp + ' (~' + selfP.hpWidth(100) + '%)';
}
if (selfP.status) {
if (statustext) statustext += '|';
statustext += selfP.status;
@@ -2542,7 +2544,11 @@ function Battle(frame, logFrame, noPreload) {
break;
}
} else {
hiddenactions += "" + poke.getName() + " lost " + self.damageDisplay(damage) + " of its health!";
// The server sends Math.floor(pixels * 100 / 48), but we want to
// show a rounded percent. Fortunately, this is possible. Do not
// tamper with this expression unless you understand the math.
var percent = Math.round(Math.ceil(damage * 48 / 100) / 48 * 100);
hiddenactions += "" + poke.getName() + " lost " + self.damageDisplay(damage) + " (~" + percent + "%) of its health!";
}
break;
case '-heal':