mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-02-22 21:51:55 -05:00
Code Issues Projects Releases Wiki Activity

Fix gerudo keys, add disabled checkbox

Browse Source
This commit is contained in:
aMannus 2022-09-05 16:48:59 +02:00
parent fe413fd675
commit 9afe3ca746
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -907,6 +907,7 @@ void Randomizer::ParseRandomizerSettingsFile(const char* spoilerFileName) {
} else if (it.value() == "Anywhere") { } else if (it.value() == "Anywhere") {
gSaveContext.randoSettings[index].value = 3; gSaveContext.randoSettings[index].value = 3;
} }
break;
case RSK_KEYSANITY: case RSK_KEYSANITY:
if(it.value() == "Start With") { if(it.value() == "Start With") {
gSaveContext.randoSettings[index].value = 0; gSaveContext.randoSettings[index].value = 0;

17
soh/soh/GameMenuBar.cpp
View File

@ -1392,7 +1392,22 @@ namespace GameMenuBar {
UIWidgets::Tooltip( UIWidgets::Tooltip(
"When obtaining rupees, randomize what the rupee is called in the textbox." "When obtaining rupees, randomize what the rupee is called in the textbox."
); );
UIWidgets::PaddedEnhancementCheckbox("Key Colors Match Dungeon", "gRandoMatchKeyColors", true, false);
// Only disable the key colors checkbox when none of the keysanity settings are set to "Any Dungeon", "Overworld" or "Anywhere"
bool disableKeyColors = true;
if (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_KEYSANITY) > 2 ||
OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_GERUDO_KEYS) > 0 ||
OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_BOSS_KEYSANITY) > 2 ||
OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_GANONS_BOSS_KEY) > 2 ||
!gSaveContext.n64ddFlag) {
disableKeyColors = false;
}
const char* disableKeyColorsText = "This setting is disabled because a savefile is loaded without any key shuffle settings set to \"Any Dungeon\", \"Overworld\" or \"Anywhere\"";
UIWidgets::PaddedEnhancementCheckbox("Key Colors Match Dungeon", "gRandoMatchKeyColors", true, false,
disableKeyColors, disableKeyColorsText);
UIWidgets::Tooltip( UIWidgets::Tooltip(
"Matches the color of small keys and boss keys to the dungeon they belong to. " "Matches the color of small keys and boss keys to the dungeon they belong to. "
"This helps identify keys from afar and adds a little bit of flair.\n\nThis only " "This helps identify keys from afar and adds a little bit of flair.\n\nThis only "