Skip to content

Commit

Permalink
Add Cute Charm and Cursed Body animation
Browse files Browse the repository at this point in the history
  • Loading branch information
Marty-D authored Jul 27, 2016
1 parent d5beedd commit cef607b
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion js/battle.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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!";
Expand Down

0 comments on commit cef607b

Please sign in to comment.