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 Thief, Covet, Frisk messages

Browse Source
This commit is contained in:
Guangcong Luo
2018-11-22 14:26:25 -05:00
parent 6214e1c185
commit 18caa362d4
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -426,16 +426,21 @@ class BattleTextParser {
}
case '-item': {
let [, pokemon, item] = args;
const line1 = this.maybeAbility(kwArgs.from, kwArgs.of || pokemon);
const [, pokemon, item] = args;
const id = this.effectId(kwArgs.from);
let target = '';
if (['thief', 'covet'].includes(id)) {
target = kwArgs.of;
kwArgs.of = '';
}
const line1 = this.maybeAbility(kwArgs.from, kwArgs.of || pokemon);
if (['thief', 'covet', 'bestow'].includes(id)) {
const template = this.template('takeItem', kwArgs.from);
return line1 + template.replace('[POKEMON]', this.pokemon(pokemon)).replace('[ITEM]', this.effect(item)).replace('[SOURCE]', this.pokemon(kwArgs.of));
return line1 + template.replace('[POKEMON]', this.pokemon(pokemon)).replace('[ITEM]', this.effect(item)).replace('[SOURCE]', this.pokemon(target || kwArgs.of));
}
if (id === 'frisk') {
const template = this.template(kwArgs.of && pokemon && kwArgs.of !== pokemon ? 'activate' : 'activateNoTarget', "Frisk");
return line1 + template.replace('[POKEMON]', this.pokemon(pokemon)).replace('[ITEM]', this.effect(item)).replace('[TARGET]', this.pokemon(kwArgs.of));
return line1 + template.replace('[POKEMON]', this.pokemon(kwArgs.of)).replace('[ITEM]', this.effect(item)).replace('[TARGET]', this.pokemon(pokemon));
}
if (kwArgs.from) {
const template = this.template('addItem', kwArgs.from);