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

Track status-causing items in tooltips

Browse Source 
If Flame Orb or Toxic Orb activate, PS will now show the known item
in tooltips.

As a side effect, this also fixes the Flame Orb / Toxic Orb message
not appearing correctly in replays.
This commit is contained in:
Guangcong Luo
2016-04-11 05:36:12 -04:00
parent 6234d2a58d
commit 45fd9e80ac
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

@@ -4067,7 +4067,8 @@ var Battle = (function () {
this.resultAnim(ofpoke, effect.name, 'ability');
this.message('', "<small>[" + ofpoke.getName(true) + "'s " + effect.name + "!]</small>");
ofpoke.markAbility(effect);
} else if (effect.exists) {
} else if (effect.effectType === 'Item') {
(ofpoke || poke).item = effect.name;
effectMessage = " by the " + effect.name;
}