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

Correct Mental Herb message

Browse Source
This commit is contained in:
Marty-D
2015-06-25 12:30:43 -04:00
parent 5007cf3a38
commit 3987b06098
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
js/battle.js
View File

@@ -3942,13 +3942,6 @@ var Battle = (function () {
this.resultAnim(poke, 'Focus Band', 'neutral', animDelay);
actions += "" + poke.getName() + ' hung on using its Focus Band!';
break;
case 'mentalherb':
poke.removeVolatile('taunt');
poke.removeVolatile('encore');
poke.removeVolatile('torment');
this.resultAnim(poke, 'Cured', 'good', animDelay);
actions += "" + poke.getName() + " used its " + item.name + " to come back to its senses!";
break;
case 'whiteherb':
actions += "" + poke.getName() + " returned its status to normal using its White Herb!";
break;
@@ -4389,10 +4382,13 @@ var Battle = (function () {
actions += "" + poke.getName() + "'s Heal Block wore off!";
break;
case 'attract':
if (!kwargs.silent) {
this.resultAnim(poke, 'Attract ended', 'good', animDelay);
this.resultAnim(poke, 'Attract ended', 'good', animDelay);
if (fromeffect.id === 'oblivious') {
actions += '' + poke.getName() + " got over its infatuation.";
}
if (fromeffect.id === 'mentalherb') {
actions += "" + poke.getName() + " cured its infatuation status using its " + fromeffect.name + "!";
}
break;
case 'taunt':
this.resultAnim(poke, 'Taunt ended', 'good', animDelay);