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

Correct percent display

Browse Source
This commit is contained in:
Cathy J. Fitzpatrick
2013-02-24 18:48:19 -07:00
parent 8a4324d141
commit e97f68d51f
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
js/battle.js
View File

@@ -2291,7 +2291,8 @@ function Battle(frame, logFrame, noPreload) {
i = 0;
}
var w = pokemon.hpWidth(150);
self.resultAnim(pokemon, '−' + pokemon.hpWidth(100) + '%', 'bad', i);
var percent = Math.round(Math.ceil(damage * 48 / 100) / 48 * 100);
self.resultAnim(pokemon, '−' + percent + '%', 'bad', i);
pokemon.statbarElem.find('.hptext').html(pokemon.hpDisplay());
if (!self.fastForward) pokemon.statbarElem.find('div.hp').delay(self.animationDelay).animate({
width: w,
@@ -2304,7 +2305,8 @@ function Battle(frame, logFrame, noPreload) {
i = 0;
}
var w = pokemon.hpWidth(150);
self.resultAnim(pokemon, '+' + pokemon.hpWidth(100) + '%', 'good', i);
var percent = Math.round(Math.ceil(damage * 48 / 100) / 48 * 100);
self.resultAnim(pokemon, '+' + percent + '%', 'good', i);
pokemon.statbarElem.find('.hptext').html(pokemon.hpDisplay());
if (!self.fastForward) pokemon.statbarElem.find('div.hp').animate({
width: w,