From 2df5da2f61d20274435666c3b4fe77afaaf62c27 Mon Sep 17 00:00:00 2001 From: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com> Date: Sun, 25 Aug 2024 19:52:07 +0200 Subject: [PATCH] [QOL] Trainers will display their title after defeat in the name box (#3738) * Enemy trainers will now show their title after defeat * Basically titles are now always shown (like in the real games) * Revert "Basically titles are now always shown (like in the real games)" This reverts commit 6943860539a541f2079f79ed9187d0b7f29ba7ab. --- src/phases/trainer-victory-phase.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/phases/trainer-victory-phase.ts b/src/phases/trainer-victory-phase.ts index 7b8ee05de44..a38874c9acd 100644 --- a/src/phases/trainer-victory-phase.ts +++ b/src/phases/trainer-victory-phase.ts @@ -1,6 +1,5 @@ import BattleScene from "#app/battle-scene.js"; import { getCharVariantFromDialogue } from "#app/data/dialogue.js"; -import { TrainerSlot } from "#app/data/trainer-config.js"; import { TrainerType } from "#app/enums/trainer-type.js"; import { modifierTypes } from "#app/modifier/modifier-type.js"; import { vouchers } from "#app/system/voucher.js"; @@ -9,6 +8,7 @@ import * as Utils from "#app/utils.js"; import { BattlePhase } from "./battle-phase"; import { ModifierRewardPhase } from "./modifier-reward-phase"; import { MoneyRewardPhase } from "./money-reward-phase"; +import { TrainerSlot } from "#app/data/trainer-config"; export class TrainerVictoryPhase extends BattlePhase { constructor(scene: BattleScene) { @@ -42,7 +42,7 @@ export class TrainerVictoryPhase extends BattlePhase { const showMessage = () => { const originalFunc = showMessageOrEnd; - showMessageOrEnd = () => this.scene.ui.showDialogue(message, this.scene.currentBattle.trainer?.getName(), null, originalFunc); + showMessageOrEnd = () => this.scene.ui.showDialogue(message, this.scene.currentBattle.trainer?.getName(TrainerSlot.TRAINER, true), null, originalFunc); showMessageOrEnd(); };