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 Pokemon name when trapped (#793)

Browse Source
This commit is contained in:
QuiteQuiet
2016-11-05 01:53:06 +01:00
committed by Guangcong Luo
parent 834327825b
commit 84e69bf1e8
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
js/client-battle.js
View File

@@ -163,7 +163,8 @@
switch (args[0]) {
case 'trapped':
requestData.trapped = true;
this.battle.activityQueue.push('|message|' + pokemon.getName() + ' is trapped and cannot switch!');
var pokeName = pokemon.side.n === 0 ? Tools.escapeHTML(pokemon.name) : "The opposing " + (this.battle.ignoreOpponent || this.battle.ignoreNicks ? pokemon.species : Tools.escapeHTML(pokemon.name));
this.battle.activityQueue.push('|message|' + pokeName + ' is trapped and cannot switch!');
break;
case 'cant':
for (var i = 0; i < requestData.moves.length; i++) {