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

Merge pull request #55 from V4Victini/unnerve

Browse Source 
Fix Unnerve's message
This commit is contained in:
Guangcong Luo
2013-09-28 16:18:28 -07:00
parent daf090e673 a27e420f22
commit 0ea30bfd1d
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
js/battle.js
View File

@@ -3532,6 +3532,7 @@ function Battle(frame, logFrame, noPreload) {
var ability = Tools.getAbility(args[2]);
var effect = Tools.getEffect(kwargs.from);
var ofpoke = this.getPokemon(kwargs.of);
var side = this.getSide(args[3]);
poke.ability = ability.name;
if (kwargs.silent) {
@@ -3566,7 +3567,7 @@ function Battle(frame, logFrame, noPreload) {
actions += '' + poke.getName() + ' intimidates ' + ofpoke.getLowerName() + '!';
break;
case 'unnerve':
actions += "" + poke.getName() + "'s Unnerve makes " + args[3] + "'s team too nervous to eat Berries!";
actions += "" + poke.getName() + "'s Unnerve makes " + side.getLowerTeamName() + " too nervous to eat Berries!";
break;
default:
actions += "" + poke.getName() + " has " + ability.name + "!";