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 #435 from ascriptmaster/move-messages

Browse Source 
Add -ability messages for Anticipate and Forewarn
This commit is contained in:
Guangcong Luo
2015-08-01 06:57:07 +00:00
parent a6e9e7ee80 52c344adb7
commit 7e0714ebf6
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
js/battle.js
View File

@@ -4058,6 +4058,9 @@ var Battle = (function () {
case 'cloudnine':
actions += "The effects of the weather disappeared.";
break;
case 'anticipation':
actions += "" + poke.getName() + " shuddered!";
break;
case 'aurabreak':
actions += "" + poke.getName() + " reversed all other Pokémon's auras!";
break;
@@ -4787,12 +4790,19 @@ var Battle = (function () {
actions += "" + poke.getName() + "'s' Speed Boost increases its speed!";
break;
case 'forewarn':
actions += "" + poke.getName() + "'s Forewarn alerted it to " + Tools.escapeHTML(args[3]) + "!";
if (poke.side.foe.active.length === 1) {
poke.side.foe.active[0].markMove(args[3], true);
this.resultAnim(poke, 'Forewarn', 'ability', animDelay);
this.message('', "<small>[" + poke.getName(true) + "'s Forewarn!]</small>");
if (this.gen >= 5) {
actions += "It was alerted to " + ofpoke.getLowerName() + "'s " + Tools.escapeHTML(args[3]) + "!";
ofpoke.markMove(args[3], true);
} else {
actions += "" + poke.getName() + "'s Forewarn alerted it to " + Tools.escapeHTML(args[3]) + "!";
if (poke.side.foe.active.length === 1) {
poke.side.foe.active[0].markMove(args[3], true);
}
}
break;
case 'anticipation':
case 'anticipation': // Deprecated, now uses -ability. This is for replay compatability
actions += "" + poke.getName() + " shuddered!";
break;
case 'telepathy':