From 4d2ca299403873b3ed24888a83f04c44f1e72bd1 Mon Sep 17 00:00:00 2001 From: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com> Date: Fri, 5 Jan 2024 20:19:23 +0000 Subject: [PATCH] Quickfix skip trials setting (#3800) * quickfix skip trials setting * Change to set trial count to 0 when skipping --- soh/soh/Enhancements/randomizer/settings.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/soh/soh/Enhancements/randomizer/settings.cpp b/soh/soh/Enhancements/randomizer/settings.cpp index d858bb567..64705c31a 100644 --- a/soh/soh/Enhancements/randomizer/settings.cpp +++ b/soh/soh/Enhancements/randomizer/settings.cpp @@ -1853,12 +1853,15 @@ void Settings::FinalizeSettings(const std::set& excludedLocatio ctx->GetDungeon(GANONS_CASTLE)->SetKeyRing(); } } + auto trials = ctx->GetTrials()->GetTrialList(); Shuffle(trials); for (const auto trial : trials) { trial->SetAsSkipped(); } - if (mOptions[RSK_GANONS_TRIALS].Is(RO_GANONS_TRIALS_RANDOM_NUMBER)) { + if(mOptions[RSK_GANONS_TRIALS].Is(RO_GANONS_TRIALS_SKIP)){ + mOptions[RSK_TRIAL_COUNT].SetSelectedIndex(0); + } else if(mOptions[RSK_GANONS_TRIALS].Is(RO_GANONS_TRIALS_RANDOM_NUMBER)) { mOptions[RSK_TRIAL_COUNT].SetSelectedIndex(Random(0, static_cast(mOptions[RSK_TRIAL_COUNT].GetOptionCount()))); } for (uint8_t i = 0; i < mOptions[RSK_TRIAL_COUNT].Value(); i++) {