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

Fix default heal messages

Browse Source 
And avoid repeating Ability names upon activation.
This commit is contained in:
Marty-D
2015-11-21 22:27:48 -05:00
parent 4692234af3
commit f5a8bba54c
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
js/battle.js
View File

@@ -3385,9 +3385,6 @@ var Battle = (function () {
case 'aquaring':
actions += "Aqua Ring restored " + poke.getLowerName() + "'s HP!";
break;
case 'raindish': case 'dryskin': case 'icebody':
actions += "" + poke.getName() + "'s " + effect.name + " heals it!";
break;
case 'healingwish':
actions += "The healing wish came true for " + poke.getLowerName() + "!";
this.lastmove = 'healing-wish';
@@ -3417,15 +3414,15 @@ var Battle = (function () {
default:
if (kwargs.absorb) {
actions += "" + poke.getName() + "'s " + effect.name + " absorbs the attack!";
} else if (effect.id) {
} else if (effect.id && effect.effectType !== 'Ability') {
actions += "" + poke.getName() + " restored HP using its " + effect.name + "!";
} else {
actions += poke.getName() + ' regained health!';
actions += poke.getName() + ' restored its HP.';
}
break;
}
} else {
actions += poke.getName() + ' regained health!';
actions += poke.getName() + ' restored its HP.';
}
break;
case '-sethp':