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

Fix message for Jaboca and Rowap Berry (#1200)

Browse Source
This commit is contained in:
urkerab
2018-12-31 08:37:07 +00:00
committed by Guangcong Luo
parent d129b84c13
commit 246a235a59
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/text.js
View File

@@ -63,7 +63,7 @@ exports.BattleText = {
damage: " ([POKEMON] was hurt!)",
damagePercentage: " ([POKEMON] lost [PERCENTAGE] of its health!)",
damageFromPokemon: " [POKEMON] is hurt by [SOURCE]'s [EFFECT]!",
damageFromPokemon: " [POKEMON] is hurt by [SOURCE]'s [ITEM]!", // Jaboca/Rowap Berry
damageFromItem: " [POKEMON] is hurt by its [ITEM]!", // Sticky Barb
damageFromPartialTrapping: " [POKEMON] is hurt by [MOVE]!",
heal: " [POKEMON] restored its HP.",

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

@@ -689,8 +689,8 @@ class BattleTextParser {
return line1 + template.replace('[POKEMON]', this.pokemon(pokemon)).replace('[PERCENTAGE]', percentage);
}
if (kwArgs.from.startsWith('item:')) {
template = this.template('damageFromItem');
return line1 + template.replace('[POKEMON]', this.pokemon(pokemon)).replace('[ITEM]', this.effect(kwArgs.from));
template = this.template(kwArgs.of ? 'damageFromPokemon' : 'damageFromItem');
return line1 + template.replace('[POKEMON]', this.pokemon(pokemon)).replace('[ITEM]', this.effect(kwArgs.from)).replace('[SOURCE]', this.pokemon(kwArgs.of));
}
if (kwArgs.partiallytrapped || id === 'bind' || id === 'wrap') {
template = this.template('damageFromPartialTrapping');