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

Add Cute Charm and Cursed Body animation

Browse Source
This commit is contained in:
Marty-D
2016-07-26 22:30:54 -04:00
committed by GitHub
parent d5beedd401
commit cef607b9fc
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
js/battle.js
View File

@@ -4680,6 +4680,11 @@ var Battle = (function () {
actions += "" + poke.getName() + " sealed any moves its target shares with it!";
break;
case 'disable':
if (fromeffect.effectType === 'Ability') {
this.resultAnim(ofpoke, fromeffect.name, 'ability');
this.message('', "<small>[" + ofpoke.getName(true) + "'s " + fromeffect.name + "!]</small>");
ofpoke.markAbility(fromeffect.name);
}
this.resultAnim(poke, 'Disabled', 'bad');
actions += "" + poke.getName() + "'s " + Tools.escapeHTML(args[3]) + " was disabled!";
break;
@@ -4743,8 +4748,13 @@ var Battle = (function () {
actions += "" + poke.getName() + " can't get it going!";
break;
case 'attract':
if (fromeffect.effectType === 'Ability') {
this.resultAnim(ofpoke, fromeffect.name, 'ability');
this.message('', "<small>[" + ofpoke.getName(true) + "'s " + fromeffect.name + "!]</small>");
ofpoke.markAbility(fromeffect.name);
}
this.resultAnim(poke, 'Attracted', 'bad');
if (fromeffect.id) {
if (fromeffect.effectType === 'Item') {
actions += "" + poke.getName() + " fell in love from the " + fromeffect.name + "!";
} else {
actions += "" + poke.getName() + " fell in love!";