mirror
/
Shipwright
mirror of https://github.com/HarbourMasters/Shipwright.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Improved disabling of settings 

For Skip Child Zelda (and possibly other options in the future)
This commit is contained in:
aMannus 2022-07-22 12:21:12 +02:00
parent 97c37eb46a
commit 0ee898bd56
1 changed files with 37 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
soh/soh/Enhancements/randomizer/randomizer.cpp
View File

@ -3966,12 +3966,19 @@ void DrawRandoEditor(bool& open) {
ImGui::Separator();
}
// hide this option if we're skipping child zelda
if(CVar_GetS32("gRandomizeSkipChildZelda", 0) == 0) {
// Shuffle Weird Egg
// Disabled when Skip Child Zelda is active
if (CVar_GetS32("gRandomizeSkipChildZelda", 0) != 0) {
ImGui::PushStyleColor(ImGuiCol_Text, IM_COL32(130, 130, 130, 255));
CVar_SetS32("gRandomizeShuffleWeirdEgg", 0);
} else {
ImGui::PushStyleColor(ImGuiCol_Text, IM_COL32(255, 255, 255, 255));
}
SohImGui::EnhancementCheckbox(Settings::ShuffleWeirdEgg.GetName().c_str(), "gRandomizeShuffleWeirdEgg");
ImGui::PopStyleColor();
InsertHelpHoverText(
"Shuffles the Weird Egg from Malon in to the item pool.\n"
"Shuffles the Weird Egg from Malon in to the item pool. Enabling Skip\n"
"Child Zelda disables this feature.\n"
"\n"
"The Weird Egg is required to unlock several events:\n"
" - Zelda's Lullaby from Impa\n"
@ -3981,7 +3988,6 @@ void DrawRandoEditor(bool& open) {
" - Happy Mask Shop sidequest\n"
);
ImGui::Separator();
}
// Shuffle Gerudo Membership Card
SohImGui::EnhancementCheckbox(Settings::ShuffleGerudoToken.GetName().c_str(), "gRandomizeShuffleGerudoToken");
@ -4072,12 +4078,23 @@ void DrawRandoEditor(bool& open) {
ImGui::Separator();
// Skip child stealth
SohImGui::EnhancementCheckbox(Settings::SkipChildStealth.GetName().c_str(), "gRandomizeSkipChildStealth");
InsertHelpHoverText(
"The crawlspace into Hyrule Castle goes straight to Zelda, skipping\n"
"the guards."
);
// Disabled when Skip Child Zelda is active
if (CVar_GetS32("gRandomizeSkipChildZelda", 0) != 0) {
ImGui::PushStyleColor(ImGuiCol_Text, IM_COL32(130, 130, 130, 255));
CVar_SetS32("gRandomizeSkipChildStealth", 0);
// Also disable Weird Egg because it's on a different tab and wouldn't be updated otherwise
CVar_SetS32("gRandomizeShuffleWeirdEgg", 0);
} else {
ImGui::PushStyleColor(ImGuiCol_Text, IM_COL32(255, 255, 255, 255));
}
SohImGui::EnhancementCheckbox(Settings::SkipChildStealth.GetName().c_str(),
"gRandomizeSkipChildStealth");
ImGui::PopStyleColor();
InsertHelpHoverText("The crawlspace into Hyrule Castle goes straight to Zelda, skipping\n"
"the guards.");
ImGui::Separator();
// Skip child zelda
SohImGui::EnhancementCheckbox("Skip Child Zelda", "gRandomizeSkipChildZelda");
InsertHelpHoverText(
"Start with Zelda's Letter in your inventory and skip the sequence up\n"