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

Fix Gen 1 partial trapping message (#1178)

Browse Source
This commit is contained in:
urkerab 2018-11-26 03:52:01 +00:00 committed by Guangcong Luo
parent ddfb162b8a
commit 2494aca33b
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/text.js
View File

@ -35,6 +35,7 @@ exports.BattleText = {
// is that the `cant` message REPLACES "Pokemon used Move!", while the `fail`
// message happens AFTER "Pokemon used Move!"
cant: "[POKEMON] can't use [MOVE]!",
cantNoMove: "[POKEMON] can't move!",
fail: " But it failed!",
// n.b. this is the default message for in-battle forme changes

2
src/battle-text-parser.ts
View File

@ -327,7 +327,7 @@ class BattleTextParser {
[pokemon, kwArgs.of] = [kwArgs.of, pokemon];
break;
}
const template = this.template('cant', effect);
const template = this.template(move ? 'cant' : 'cantNoMove', effect);
const line1 = this.maybeAbility(effect, kwArgs.of || pokemon);
return line1 + template.replace('[POKEMON]', this.pokemon(pokemon)).replace('[MOVE]', move);
}