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

Add various Z-move messages (#819)

Browse Source
This commit is contained in:
urkerab
2016-11-26 01:24:37 +00:00
committed by Marty-D
parent 243fc5288e
commit 01cd487b8a
1 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
js/battle.js
View File

@@ -3214,6 +3214,9 @@ var Battle = (function () {
target = pokemon.side.foe.missedPokemon;
}
if (!kwargs.silent) {
if (kwargs.zeffect) {
this.message('<small>' + pokemon.getName() + ' unleashes its full force Z-Move!</small>', '');
}
switch (fromeffect.id) {
case 'snatch':
break;
@@ -3678,6 +3681,8 @@ var Battle = (function () {
}
break;
}
} else if (kwargs.zeffect) {
actions += "" + poke.getName() + " restored its HP using its Z-Power!";
} else {
actions += poke.getName() + ' restored its HP.';
}
@@ -3750,6 +3755,8 @@ var Battle = (function () {
}
break;
}
} else if (kwargs.zeffect) {
actions += "" + poke.getName() + " boosted its " + BattleStats[stat] + " " + amountString + " using its Z-Power!";
} else {
actions += "" + poke.getName() + "'s " + BattleStats[stat] + " rose" + amountString + "! ";
}
@@ -4146,6 +4153,11 @@ var Battle = (function () {
actions += "The two moves have become one! It's a combined move!";
break;
case '-zpower':
var poke = this.getPokemon(args[1]);
actions += "" + poke.getName() + " surrounded itself with its Z-Power! ";
break;
case '-prepare':
var poke = this.getPokemon(args[1]);
var move = Tools.getMove(args[2]);
@@ -4883,6 +4895,8 @@ var Battle = (function () {
this.resultAnim(poke, '+Crit rate', 'good');
if (fromeffect.effectType === 'Item') {
actions += "" + poke.getName() + " used the " + fromeffect.name + " to get pumped!";
} else if (kwargs.zeffect) {
actions += "" + poke.getName() + " boosted its critical-hit ratio using its Z-Power!";
} else {
actions += "" + poke.getName() + " is getting pumped!";
}
@@ -5151,7 +5165,11 @@ var Battle = (function () {
break;
case 'followme':
case 'ragepowder':
actions += '' + poke.getName() + ' became the center of attention!';
if (kwargs.zeffect) {
actions += '' + poke.getName() + ' became the center of attention using its Z-Power!';
} else {
actions += '' + poke.getName() + ' became the center of attention!';
}
break;
case 'powder':
actions += '' + poke.getName() + ' is covered in powder!';