From e97f68d51f1b926cb025acae8b4939ca9ccd7e9c Mon Sep 17 00:00:00 2001 From: "Cathy J. Fitzpatrick" Date: Sun, 24 Feb 2013 18:48:19 -0700 Subject: [PATCH] Correct percent display --- js/battle.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/js/battle.js b/js/battle.js index 11c5b1187..8561423ef 100644 --- a/js/battle.js +++ b/js/battle.js @@ -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,