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

Merge pull request #460 from yenatch/sethp

Browse Source 
Fix the reported HP difference for -sethp.
This commit is contained in:
Guangcong Luo
2015-09-03 18:24:40 -05:00
parent a02a93123a 9e8664f8c6
commit f2deb92d52
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
js/battle.js
View File

@@ -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;