Leahnaya/pokemon-showdown-client
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown-client.git synced 2026-09-30 06:43:02 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add 'nopp' message, fix 'flinch' message.

Browse Source
This commit is contained in:
Marty-D
2013-06-12 12:27:14 -04:00
parent 8dfdc3c59b
commit e2dc9012ae
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
js/battle.js
View File

@@ -2744,13 +2744,17 @@ function Battle(frame, logFrame, noPreload) {
break;
case 'flinch':
self.resultAnim(pokemon, 'Flinched', 'neutral');
self.message(pokemon.getName() + ' flinched!');
self.message(pokemon.getName() + ' flinched and couldn\'t move!');
pokemon.removeTurnstatus('focuspunch');
break;
case 'attract':
self.resultAnim(pokemon, 'Immobilized', 'neutral');
self.message(pokemon.getName() + ' is immobilized by love!');
break;
case 'nopp':
self.message(pokemon.getName() + ' used <strong>' + move.name + '</strong>!');
self.message('But there was no PP left for the move!');
break;
default:
self.message('<small>' + pokemon.getName() + (move.name ? ' can\'t use ' + move.name + '' : ' can\'t move') + '!</small>');
break;