From b0ef053b25eaaa23b266f662befa97b76399f296 Mon Sep 17 00:00:00 2001 From: balloondude2 <55861555+balloondude2@users.noreply.github.com> Date: Mon, 5 May 2025 16:51:47 -0600 Subject: [Rando] Fix the two happy mask salesman checks (#1134) * allow the two mask salesman checks to be awarded when generating from a file * clang format pls --- mm/2s2h/Rando/MiscBehavior/OnFileCreate.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mm/2s2h/Rando/MiscBehavior/OnFileCreate.cpp b/mm/2s2h/Rando/MiscBehavior/OnFileCreate.cpp index 3d3c5ca87..77c9d5f2c 100644 --- a/mm/2s2h/Rando/MiscBehavior/OnFileCreate.cpp +++ b/mm/2s2h/Rando/MiscBehavior/OnFileCreate.cpp @@ -346,9 +346,6 @@ void Rando::MiscBehavior::OnFileCreate(s16 fileNum) { std::to_string(RANDO_SAVE_OPTIONS[RO_LOGIC])); } - RANDO_SAVE_CHECKS[RC_STARTING_ITEM_DEKU_MASK].eligible = true; - RANDO_SAVE_CHECKS[RC_STARTING_ITEM_SONG_OF_HEALING].eligible = true; - if (CVarGetInteger("gRando.GenerateSpoiler", 0)) { nlohmann::json spoiler = Rando::Spoiler::GenerateFromSaveContext(); spoiler["inputSeed"] = inputSeed; @@ -371,6 +368,10 @@ void Rando::MiscBehavior::OnFileCreate(s16 fileNum) { Audio_PlaySfx(NA_SE_SY_ATTENTION_SOUND); } + + RANDO_SAVE_CHECKS[RC_STARTING_ITEM_DEKU_MASK].eligible = true; + RANDO_SAVE_CHECKS[RC_STARTING_ITEM_SONG_OF_HEALING].eligible = true; + } catch (const std::exception& e) { SPDLOG_ERROR("Error with randomizer save creation: {}", e.what()); Audio_PlaySfx(NA_SE_SY_QUIZ_INCORRECT); -- cgit v1.2.3