nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Changed name of scarecrow's song enhancement and added to the description to clarify that it only skips song playback without the rando setting. (#6423)

Browse Source
This commit is contained in:
Malkierian
2026-03-27 20:43:55 -07:00
committed by GitHub
parent 42ba25449e
commit 6fea1821a1
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
soh/soh/SohGui/SohMenuEnhancements.cpp
View File

@@ -491,16 +491,18 @@ void SohMenu::AddMenuEnhancements() {
AddWidget(path, "Skip Tower Escape", WIDGET_CVAR_CHECKBOX) AddWidget(path, "Skip Tower Escape", WIDGET_CVAR_CHECKBOX)
.CVar(CVAR_ENHANCEMENT("TimeSavers.SkipTowerEscape")) .CVar(CVAR_ENHANCEMENT("TimeSavers.SkipTowerEscape"))
.Options(CheckboxOptions().Tooltip("Skip the tower escape sequence between Ganondorf and Ganon.")); .Options(CheckboxOptions().Tooltip("Skip the tower escape sequence between Ganondorf and Ganon."));
AddWidget(path, "Skip Scarecrow's Song", WIDGET_CVAR_CHECKBOX) AddWidget(path, "Skip Playing Scarecrow's Song", WIDGET_CVAR_CHECKBOX)
.CVar(CVAR_ENHANCEMENT("InstantScarecrow")) .CVar(CVAR_ENHANCEMENT("InstantScarecrow"))
.PreFunc([](WidgetInfo& info) { .PreFunc([](WidgetInfo& info) {
info.options->disabled = info.options->disabled =
IS_RANDO && OTRGlobals::Instance->gRandoContext->GetOption(RSK_SKIP_SCARECROWS_SONG); IS_RANDO && OTRGlobals::Instance->gRandoContext->GetOption(RSK_SKIP_SCARECROWS_SONG);
info.options->disabledTooltip = "This setting is forcefully enabled because a randomized " info.options->disabledTooltip = "This setting is forcefully enabled because a randomized save "
"save file with the option \"Skip Scarecrow Song\" is currently loaded."; "file with the option \"Skip Scarecrow's Song\" is currently loaded.";
}) })
.Options(CheckboxOptions().Tooltip( .Options(CheckboxOptions().Tooltip(
"Pierre appears when an Ocarina is pulled out. Requires learning the Scarecrow's Song first.")); "Pierre appears when an Ocarina is pulled out. Requires learning the Scarecrow's Song first.\n"
"Without the randomizer option \"Skip Scarecrow's Song\" enabled for a seed, this still requires you "
"to teach the scarecrow the song as both ages before summoning."));
AddWidget(path, "Faster Rupee Accumulator", WIDGET_CVAR_CHECKBOX) AddWidget(path, "Faster Rupee Accumulator", WIDGET_CVAR_CHECKBOX)
.CVar(CVAR_ENHANCEMENT("FasterRupeeAccumulator")) .CVar(CVAR_ENHANCEMENT("FasterRupeeAccumulator"))
.Options(CheckboxOptions().Tooltip("Causes your Wallet to fill and empty faster when you gain or lose money.")); .Options(CheckboxOptions().Tooltip("Causes your Wallet to fill and empty faster when you gain or lose money."));