From 4d4d0e55cc9fdc6f7a4ff38df8759a8450b6c07a Mon Sep 17 00:00:00 2001 From: Felix Staud Date: Thu, 11 Jul 2024 15:24:40 -0700 Subject: [PATCH] fix myster-encounter-ui-handler duplicate req. check --- src/ui/mystery-encounter-ui-handler.ts | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/ui/mystery-encounter-ui-handler.ts b/src/ui/mystery-encounter-ui-handler.ts index c446481b744..7eb93f9b4ab 100644 --- a/src/ui/mystery-encounter-ui-handler.ts +++ b/src/ui/mystery-encounter-ui-handler.ts @@ -307,6 +307,8 @@ export default class MysteryEncounterUiHandler extends UiHandler { // Options Window for (let i = 0; i < this.filteredEncounterOptions.length; i++) { + const option = this.filteredEncounterOptions[i]; + let optionText; switch (this.filteredEncounterOptions.length) { case 2: @@ -319,10 +321,9 @@ export default class MysteryEncounterUiHandler extends UiHandler { optionText = addBBCodeTextObject(this.scene, i % 2 === 0 ? 0 : 100, i < 2 ? 0 : 16, "-", TextStyle.WINDOW, { wordWrap: { width: 558 }, fontSize: "80px", lineSpacing: -8 }); break; } - const option = this.filteredEncounterOptions[i]; - this.optionsMeetsReqs.push(this.filteredEncounterOptions[i].meetsRequirements(this.scene)); - const optionDialogue = option.dialogue ?? mysteryEncounter.dialogue.encounterOptionsDialogue.options[i]; + this.optionsMeetsReqs.push(option.meetsRequirements(this.scene)); + const optionDialogue = option.dialogue; let text: string; if (option.hasRequirements() && this.optionsMeetsReqs[i]) { // Options with special requirements that are met are automatically colored green @@ -336,8 +337,6 @@ export default class MysteryEncounterUiHandler extends UiHandler { optionText.setText(text); } - this.optionsMeetsReqs.push(option.meetsRequirements(this.scene)); - if (!this.optionsMeetsReqs[i]) { optionText.setAlpha(0.5); }