From e4c2884f5145dcf4e83c6e8624602e3280432e90 Mon Sep 17 00:00:00 2001 From: Joim Date: Fri, 5 Jul 2013 18:22:42 +0200 Subject: [PATCH] Fix Perish Song volatile tag Fix Perish Song being shown more than once if the attack is repeated in subsequent turns. --- js/battle.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/js/battle.js b/js/battle.js index 8b2971410..d821c64ea 100644 --- a/js/battle.js +++ b/js/battle.js @@ -4286,8 +4286,14 @@ function Battle(frame, logFrame, noPreload) { switch (effect.id) { case 'perishsong': actions += 'All Pokémon hearing the song will faint in three turns!'; - if (self.mySide.active[0]) self.mySide.active[0].addVolatile('perish3'); - if (self.yourSide.active[0]) self.yourSide.active[0].addVolatile('perish3'); + if (self.mySide.active[0] && !self.mySide.active[0].volatiles['perish0'] + && !self.mySide.active[0].volatiles['perish1'] && !self.mySide.active[0].volatiles['perish2']) { + self.mySide.active[0].addVolatile('perish3'); + } + if (self.yourSide.active[0] && !self.yourSide.active[0].volatiles['perish0'] + && !self.yourSide.active[0].volatiles['perish1'] && !self.yourSide.active[0].volatiles['perish2']) { + self.yourSide.active[0].addVolatile('perish3'); + } self.mySide.updateStatbar(); self.yourSide.updateStatbar(); break;