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

Merge pull request #261 from ascriptmaster/move-fixes

Browse Source 
Added some client-side messages to replace placeholder messages
This commit is contained in:
Guangcong Luo
2014-10-21 16:33:00 -05:00
parent 08888b45ba 75f2e1a3de
commit ab9a33fc3f
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
js/battle.js
View File

@@ -3854,6 +3854,9 @@ function Battle(frame, logFrame, noPreload) {
var poke = this.getPokemon(args[1]);
var template = Tools.getTemplate(args[2]);
var spriteData = {'shiny': poke.sprite.sp.shiny};
if (kwargs.msg) {
actions += "" + poke.getName() + " transformed!";
}
poke.sprite.animTransform($.extend(spriteData, template));
poke.addVolatile('formechange'); // the formechange volatile reminds us to revert the sprite change on switch-out
poke.volatiles.formechange[2] = template.species;
@@ -4441,6 +4444,9 @@ function Battle(frame, logFrame, noPreload) {
case 'leppaberry':
actions += '' + poke.getName() + " restored " + Tools.escapeHTML(args[3]) + "'s PP using its Leppa Berry!";
break;
case 'focusband':
actions += '' + poke.getName() + " held on using its Focus Band!";
break;
default:
actions += "" + poke.getName() + "'s " + effect.name + " activated!";
}