mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-17 23:15:11 -05:00
Code Issues Projects Releases Wiki Activity

Irmproved handling incompatibilities

Browse Source
This commit is contained in:
aMannus 2022-07-22 18:44:46 +02:00
parent 0ee898bd56
commit cbf4a9267f
1 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3711,6 +3711,8 @@ void DrawRandoEditor(bool& open) {
"Timer", "Timer",
"Zelda Gasp (Adult)" }; "Zelda Gasp (Adult)" };
bool disableZeldaRelatedOptions = CVar_GetS32("gRandomizeSkipChildZelda", 0);
ImGui::SetNextWindowSize(ImVec2(750, 530), ImGuiCond_FirstUseEver); ImGui::SetNextWindowSize(ImVec2(750, 530), ImGuiCond_FirstUseEver);
if (!ImGui::Begin("Randomizer Editor", &open, ImGuiWindowFlags_NoFocusOnAppearing)) { if (!ImGui::Begin("Randomizer Editor", &open, ImGuiWindowFlags_NoFocusOnAppearing)) {
ImGui::End(); ImGui::End();
@ -3968,17 +3970,21 @@ void DrawRandoEditor(bool& open) {
// Shuffle Weird Egg // Shuffle Weird Egg
// Disabled when Skip Child Zelda is active // Disabled when Skip Child Zelda is active
if (CVar_GetS32("gRandomizeSkipChildZelda", 0) != 0) { if (disableZeldaRelatedOptions) {
ImGui::PushStyleColor(ImGuiCol_Text, IM_COL32(130, 130, 130, 255));
CVar_SetS32("gRandomizeShuffleWeirdEgg", 0); CVar_SetS32("gRandomizeShuffleWeirdEgg", 0);
} else {
ImGui::PushStyleColor(ImGuiCol_Text, IM_COL32(255, 255, 255, 255));
} }
ImGui::PushItemFlag(ImGuiItemFlags_Disabled, disableZeldaRelatedOptions);
ImGui::PushStyleVar(ImGuiStyleVar_Alpha,
ImGui::GetStyle().Alpha * disableZeldaRelatedOptions ? 0.5f : 1.0f);
SohImGui::EnhancementCheckbox(Settings::ShuffleWeirdEgg.GetName().c_str(), "gRandomizeShuffleWeirdEgg"); SohImGui::EnhancementCheckbox(Settings::ShuffleWeirdEgg.GetName().c_str(), "gRandomizeShuffleWeirdEgg");
ImGui::PopStyleColor(); ImGui::PopStyleVar();
if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) && disableZeldaRelatedOptions) {
ImGui::SetTooltip("%s", "This option is disabled because \"Skip Child Zelda\" is enabled");
}
ImGui::PopItemFlag();
InsertHelpHoverText( InsertHelpHoverText(
"Shuffles the Weird Egg from Malon in to the item pool. Enabling Skip\n" "Shuffles the Weird Egg from Malon in to the item pool. Enabling\n"
"Child Zelda disables this feature.\n" "\"Skip Child Zelda\" disables this feature.\n"
"\n" "\n"
"The Weird Egg is required to unlock several events:\n" "The Weird Egg is required to unlock several events:\n"
" - Zelda's Lullaby from Impa\n" " - Zelda's Lullaby from Impa\n"
@ -4079,17 +4085,21 @@ void DrawRandoEditor(bool& open) {
// Skip child stealth // Skip child stealth
// Disabled when Skip Child Zelda is active // Disabled when Skip Child Zelda is active
if (CVar_GetS32("gRandomizeSkipChildZelda", 0) != 0) { if (disableZeldaRelatedOptions) {
ImGui::PushStyleColor(ImGuiCol_Text, IM_COL32(130, 130, 130, 255));
CVar_SetS32("gRandomizeSkipChildStealth", 0); CVar_SetS32("gRandomizeSkipChildStealth", 0);
// Also disable Weird Egg because it's on a different tab and wouldn't be updated otherwise // Also disable Weird Egg because it's on a different tab and wouldn't be updated otherwise
CVar_SetS32("gRandomizeShuffleWeirdEgg", 0); CVar_SetS32("gRandomizeShuffleWeirdEgg", 0);
} else {
ImGui::PushStyleColor(ImGuiCol_Text, IM_COL32(255, 255, 255, 255));
} }
ImGui::PushItemFlag(ImGuiItemFlags_Disabled, disableZeldaRelatedOptions);
ImGui::PushStyleVar(ImGuiStyleVar_Alpha,
ImGui::GetStyle().Alpha * disableZeldaRelatedOptions ? 0.5f : 1.0f);
SohImGui::EnhancementCheckbox(Settings::SkipChildStealth.GetName().c_str(), SohImGui::EnhancementCheckbox(Settings::SkipChildStealth.GetName().c_str(),
"gRandomizeSkipChildStealth"); "gRandomizeSkipChildStealth");
ImGui::PopStyleColor(); ImGui::PopStyleVar();
if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) && disableZeldaRelatedOptions) {
ImGui::SetTooltip("%s", "This option is disabled because \"Skip Child Zelda\" is enabled");
}
ImGui::PopItemFlag();
InsertHelpHoverText("The crawlspace into Hyrule Castle goes straight to Zelda, skipping\n" InsertHelpHoverText("The crawlspace into Hyrule Castle goes straight to Zelda, skipping\n"
"the guards."); "the guards.");
ImGui::Separator(); ImGui::Separator();