From 9e8664f8c676f901cc152ddb34b324e1efcf4870 Mon Sep 17 00:00:00 2001 From: yenatch Date: Wed, 2 Sep 2015 21:33:16 -0700 Subject: [PATCH] Fix the reported HP difference for -sethp. -sethp would report the percentage of remaining HP as the difference. This would also always result in a positive delta, even if HP was lost. --- js/battle.js | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/js/battle.js b/js/battle.js index e42e68cc4..2b96871ef 100644 --- a/js/battle.js +++ b/js/battle.js @@ -3340,16 +3340,14 @@ var Battle = (function () { for (var k = 0; k < 2; k++) { var cpoke = this.getPokemon(args[1 + 2 * k]); if (cpoke) { - var oldhp = cpoke.hp; - cpoke.healthParse(args[2 + 2 * k]); - var diff = parseFloat(args[2 + 2 * k]); - if (isNaN(diff)) { - diff = cpoke.hp - oldhp; - } + var damage = cpoke.healthParse(args[2 + 2 * k]); + var range = cpoke.getDamageRange(damage); + var formattedRange = cpoke.getFormattedRange(range, 0, ' to '); + var diff = damage[0]; if (diff > 0) { - this.healAnim(cpoke, diff, animDelay); + this.healAnim(cpoke, formattedRange, animDelay); } else { - this.damageAnim(cpoke, -diff, animDelay); + this.damageAnim(cpoke, formattedRange, animDelay); } } if (k == 0) poke = cpoke;