From b98442cc9f16d063159a1eda786b436a29d11842 Mon Sep 17 00:00:00 2001 From: Garrett Cox Date: Fri, 2 Sep 2022 17:28:38 -0500 Subject: [PATCH] Move shopsanity option in GUI --- .../Enhancements/randomizer/randomizer.cpp | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp index 7cbe06d7d..b40594dbc 100644 --- a/soh/soh/Enhancements/randomizer/randomizer.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer.cpp @@ -4418,21 +4418,6 @@ void DrawRandoEditor(bool& open) { PaddedSeparator(); - // Shopsanity - ImGui::Text(Settings::Shopsanity.GetName().c_str()); - InsertHelpHoverText( - "Off - All shop items will be the same as vanilla.\n" - "\n" - "0 Items - Vanilla shop items will be shuffled among different shops.\n" - "\n" - "1-4 Items - Vanilla shop items will be shuffled among different shops, and each shop will contain 1-4 non-vanilla shop items.\n" - "\n" - "Random - Vanilla shop items will be shuffled among different shops, and each shop will contain a random number of non-vanilla shop items.\n" - ); - SohImGui::EnhancementCombobox("gRandomizeShopsanity", randoShopsanity, 7, 0); - - PaddedSeparator(); - // Shuffle Gerudo Membership Card SohImGui::EnhancementCheckbox(Settings::ShuffleGerudoToken.GetName().c_str(), "gRandomizeShuffleGerudoToken"); @@ -4454,6 +4439,21 @@ void DrawRandoEditor(bool& open) { ImGui::BeginChild("ChildShuffleNpcs", ImVec2(0, -8)); ImGui::PushItemWidth(-FLT_MIN); + // Shopsanity + ImGui::Text(Settings::Shopsanity.GetName().c_str()); + InsertHelpHoverText( + "Off - All shop items will be the same as vanilla.\n" + "\n" + "0 Items - Vanilla shop items will be shuffled among different shops.\n" + "\n" + "1-4 Items - Vanilla shop items will be shuffled among different shops, and each shop will contain 1-4 non-vanilla shop items.\n" + "\n" + "Random - Vanilla shop items will be shuffled among different shops, and each shop will contain a random number of non-vanilla shop items.\n" + ); + SohImGui::EnhancementCombobox("gRandomizeShopsanity", randoShopsanity, 7, 0); + + PaddedSeparator(); + // Shuffle Scrubs ImGui::Text(Settings::Scrubsanity.GetName().c_str()); InsertHelpHoverText(