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

Fix silent type changes

Browse Source
This commit is contained in:
Ivo Julca
2015-07-02 20:00:32 -05:00
parent 41f994890d
commit 262be0c995
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
js/battle.js
View File

@@ -4104,7 +4104,7 @@ var Battle = (function () {
var fromeffect = Tools.getEffect(kwargs.from);
poke.addVolatile(effect.id);
if (kwargs.silent) {
if (kwargs.silent && effect.id !== 'typechange' && effect.id !== 'typeadd') {
// do nothing
} else switch (effect.id) {
case 'typechange':
@@ -4114,17 +4114,18 @@ var Battle = (function () {
if (fromeffect.id) {
if (fromeffect.id === 'reflecttype') {
poke.copyTypesFrom(ofpoke);
actions += "" + poke.getName() + "'s type became the same as " + ofpoke.getLowerName() + "'s type!";
} else {
if (!kwargs.silent) actions += "" + poke.getName() + "'s type became the same as " + ofpoke.getLowerName() + "'s type!";
} else if (!kwargs.silent) {
actions += "" + poke.getName() + "'s " + fromeffect.name + " made it the " + args[3] + " type!";
}
} else {
} else if (!kwargs.silent) {
actions += "" + poke.getName() + " transformed into the " + args[3] + " type!";
}
break;
case 'typeadd':
args[3] = Tools.escapeHTML(args[3]);
poke.volatiles.typeadd[2] = args[3];
if (kwargs.silent) break;
actions += "" + args[3] + " type was added to " + poke.getLowerName() + "!";
break;
case 'powertrick':