From 69a32ffba671b1bc55b4bbc9b13040687abe40ec Mon Sep 17 00:00:00 2001 From: Malkierian Date: Fri, 21 Mar 2025 10:42:59 -0700 Subject: [PATCH] Restore combobox functionality to Bunny Hood Effect (#5167) * Restore combobox functionality to Bunny Hood Effect, and tweak the tooltip. * Tweak the description a bit more. * Final tweak? --- soh/soh/SohGui/SohMenuEnhancements.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/soh/soh/SohGui/SohMenuEnhancements.cpp b/soh/soh/SohGui/SohMenuEnhancements.cpp index 2e0cb55af..ad12c92aa 100644 --- a/soh/soh/SohGui/SohMenuEnhancements.cpp +++ b/soh/soh/SohGui/SohMenuEnhancements.cpp @@ -10,6 +10,7 @@ static std::string comboboxTooltip = ""; static int32_t enhancementPresetSelected = ENHANCEMENT_PRESET_DEFAULT; bool isBetaQuestEnabled = false; +static std::unordered_map bunnyHoodEffectMap = {{ BUNNY_HOOD_VANILLA, "Vanilla" }, { BUNNY_HOOD_FAST, "Faster Run" }, { BUNNY_HOOD_FAST_AND_JUMP, "Faster + Longer Jump" }}; extern "C" { void enableBetaQuest() { isBetaQuestEnabled = true; } @@ -678,10 +679,11 @@ void SohMenu::AddMenuEnhancements() { " - Not within range of Ocarina Playing spots.")); AddWidget(path, "Masks", WIDGET_SEPARATOR_TEXT); - AddWidget(path, "Bunny Hood Effect", WIDGET_CVAR_CHECKBOX) + AddWidget(path, "Bunny Hood Effect", WIDGET_CVAR_COMBOBOX) .CVar(CVAR_ENHANCEMENT("MMBunnyHood")) - .Options(CheckboxOptions().Tooltip("Wearing the Bunny Hood grants a speed increase link in Majora's Mask. " - "The longer jump option is not accounted for in Randomizer logic.\n\n" + .Options(ComboboxOptions().ComboMap(bunnyHoodEffectMap).Tooltip("Wearing the Bunny Hood grants a speed and jump boost like in Majora's Mask.\n" + "Can also be limited to only the speed boost.\n" + "The effects of either option are not accounted for in Randomizer logic.\n" "Also disables NPC's reactions to wearing the Bunny Hood.")); AddWidget(path, "Masks Equippable as Adult", WIDGET_CVAR_CHECKBOX) .CVar(CVAR_ENHANCEMENT("AdultMasks"))