From cef607b9fc037151649b35f97fd80ea55b9732f6 Mon Sep 17 00:00:00 2001 From: Marty-D Date: Tue, 26 Jul 2016 22:30:54 -0400 Subject: [PATCH] Add Cute Charm and Cursed Body animation --- js/battle.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/js/battle.js b/js/battle.js index 21868b13a..67ce3ca88 100644 --- a/js/battle.js +++ b/js/battle.js @@ -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('', "[" + ofpoke.getName(true) + "'s " + fromeffect.name + "!]"); + 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('', "[" + ofpoke.getName(true) + "'s " + fromeffect.name + "!]"); + 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!";