From a44a2d5b486f4f32d88e21cb13f3da491b4a5ef5 Mon Sep 17 00:00:00 2001 From: Guangcong Luo Date: Thu, 19 Mar 2020 22:08:21 -0700 Subject: [PATCH] Fix crash in Beat Up --- data/text.js | 2 +- src/battle-text-parser.ts | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/data/text.js b/data/text.js index 5e89e1535..75a8457e3 100644 --- a/data/text.js +++ b/data/text.js @@ -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]!", diff --git a/src/battle-text-parser.ts b/src/battle-text-parser.ts index aab5bb1e5..b9c4d511f 100644 --- a/src/battle-text-parser.ts +++ b/src/battle-text-parser.ts @@ -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)); }