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

Fix crash in Beat Up

Browse Source
This commit is contained in:
Guangcong Luo
2020-03-19 22:08:21 -07:00
parent cc5ac46210
commit a44a2d5b48
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/text.js
View File

@@ -387,7 +387,7 @@ exports.BattleText = {
start: " [POKEMON] started heating up its beak!",
},
beatup: {
activate: " [TARGET]'s attack!", // past gen only
activate: " [NAME]'s attack!", // past gen only
},
bestow: {
takeItem: " [SOURCE] gave [POKEMON] its [ITEM]!",

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

@@ -109,6 +109,8 @@ class BattleTextParser {
if (id === 'wonderguard') return {args: ['-immune', pokemon], kwArgs: {from: 'ability:Wonder Guard'}};
if (id === 'beatup' && kwArgs.of) return {args, kwArgs: {name: kwArgs.of}};
if ([
'ingrain', 'quickguard', 'wideguard', 'craftyshield', 'matblock', 'protect', 'mist', 'safeguard',
'electricterrain', 'mistyterrain', 'psychicterrain', 'telepathy', 'stickyhold', 'suctioncups', 'aromaveil',
@@ -829,8 +831,8 @@ class BattleTextParser {
if (kwArgs.ability2) {
line1 += this.ability(kwArgs.ability2, target);
}
if (kwArgs.move || kwArgs.number || kwArgs.item) {
template = template.replace('[MOVE]', kwArgs.move).replace('[NUMBER]', kwArgs.number).replace('[ITEM]', kwArgs.item);
if (kwArgs.move || kwArgs.number || kwArgs.item || kwArgs.name) {
template = template.replace('[MOVE]', kwArgs.move).replace('[NUMBER]', kwArgs.number).replace('[ITEM]', kwArgs.item).replace('[NAME]', kwArgs.name);
}
return line1 + template.replace('[POKEMON]', this.pokemon(pokemon)).replace('[TARGET]', this.pokemon(target)).replace('[SOURCE]', this.pokemon(kwArgs.of));
}