Leahnaya/pokemon-showdown-client
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown-client.git synced 2026-09-29 14:23:26 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Perish Song volatile tag

Browse Source 
Fix Perish Song being shown more than once if the attack is repeated in subsequent turns.
This commit is contained in:
Joim
2013-07-05 18:22:42 +02:00
parent 5653271232
commit e4c2884f51
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
js/battle.js
View File

@@ -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;