From 6daadbd81a7a916cb2905c72316f3ea5933291f1 Mon Sep 17 00:00:00 2001 From: Flashfyre Date: Fri, 9 Feb 2024 01:06:21 -0500 Subject: [PATCH] Fix bug with rival dialogue not using gender --- src/battle-phases.ts | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/battle-phases.ts b/src/battle-phases.ts index db21f3738..9e0d253bc 100644 --- a/src/battle-phases.ts +++ b/src/battle-phases.ts @@ -581,7 +581,10 @@ export class EncounterPhase extends BattlePhase { doSummon(); else { let message: string; - this.scene.executeWithSeedOffset(() => message = Phaser.Math.RND.pick(this.scene.currentBattle.trainer.config.encounterMessages), this.scene.currentBattle.waveIndex); + if (trainer.config.hasGenders && trainer.config.encounterMessages.length === 2) + message = this.scene.currentBattle.trainer.config.encounterMessages[trainer.female ? 1 : 0]; + else + this.scene.executeWithSeedOffset(() => message = Phaser.Math.RND.pick(this.scene.currentBattle.trainer.config.encounterMessages), this.scene.currentBattle.waveIndex); this.scene.ui.showDialogue(message, trainer.getName(), null, doSummon, null, true); } } @@ -2748,7 +2751,10 @@ export class TrainerVictoryPhase extends BattlePhase { let showMessageAndEnd = () => this.end(); if (defeatMessages.length) { let message: string; - this.scene.executeWithSeedOffset(() => message = Phaser.Math.RND.pick(this.scene.currentBattle.trainer.config.victoryMessages), this.scene.currentBattle.waveIndex); + if (this.scene.currentBattle.trainer.config.hasGenders && this.scene.currentBattle.trainer.config.victoryMessages.length === 2) + message = this.scene.currentBattle.trainer.config.encounterMessages[this.scene.currentBattle.trainer.female ? 1 : 0]; + else + this.scene.executeWithSeedOffset(() => message = Phaser.Math.RND.pick(this.scene.currentBattle.trainer.config.victoryMessages), this.scene.currentBattle.waveIndex); const messagePages = message.split(/\$/g).map(m => m.trim()); for (let p = messagePages.length - 1; p >= 0; p--) {