Leahnaya/pokemon-showdown-client
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown-client.git synced 2026-10-27 04:37:56 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #140 from Slayer95/patch-1

Browse Source 
Add messages for Toxic Orb and Flame Orb
This commit is contained in:
Guangcong Luo
2014-02-27 20:57:47 -06:00
parent e04eb7d113 ae8fdf3469
commit e2b40c9568
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
js/battle.js
View File

@@ -3387,11 +3387,11 @@ function Battle(frame, logFrame, noPreload) {
switch (args[2]) {
case 'brn':
self.resultAnim(poke, 'Burned', 'brn', animDelay);
actions += "" + poke.getName() + " was burned!";
actions += "" + poke.getName() + " was burned" + (effect.exists ? " by the " + effect.name : "") + "!";
break;
case 'tox':
self.resultAnim(poke, 'Toxic poison', 'psn', animDelay);
actions += "" + poke.getName() + " was badly poisoned!";
actions += "" + poke.getName() + " was badly poisoned" + (effect.exists ? " by the " + effect.name : "") + "!";
break;
case 'psn':
self.resultAnim(poke, 'Poisoned', 'psn', animDelay);