github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-21 13:53:49 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Restore combobox functionality to Bunny Hood Effect (#5167)

Browse source 
* Restore combobox functionality to Bunny Hood Effect, and tweak the tooltip.

* Tweak the description a bit more.

* Final tweak?
This commit is contained in:
Malkierian 2025-03-21 10:42:59 -07:00 • committed by GitHub
commit 69a32ffba6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
soh/soh/SohGui/SohMenuEnhancements.cpp
View file

@ -10,6 +10,7 @@
static std::string comboboxTooltip = ""; static std::string comboboxTooltip = "";
static int32_t enhancementPresetSelected = ENHANCEMENT_PRESET_DEFAULT; static int32_t enhancementPresetSelected = ENHANCEMENT_PRESET_DEFAULT;
bool isBetaQuestEnabled = false; bool isBetaQuestEnabled = false;
static std::unordered_map<int32_t, const char*> bunnyHoodEffectMap = {{ BUNNY_HOOD_VANILLA, "Vanilla" }, { BUNNY_HOOD_FAST, "Faster Run" }, { BUNNY_HOOD_FAST_AND_JUMP, "Faster + Longer Jump" }};
extern "C" { extern "C" {
void enableBetaQuest() { isBetaQuestEnabled = true; } void enableBetaQuest() { isBetaQuestEnabled = true; }
@ -678,10 +679,11 @@ void SohMenu::AddMenuEnhancements() {
" - Not within range of Ocarina Playing spots.")); " - Not within range of Ocarina Playing spots."));
AddWidget(path, "Masks", WIDGET_SEPARATOR_TEXT); 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")) .CVar(CVAR_ENHANCEMENT("MMBunnyHood"))
.Options(CheckboxOptions().Tooltip("Wearing the Bunny Hood grants a speed increase link in Majora's Mask. " .Options(ComboboxOptions().ComboMap(bunnyHoodEffectMap).Tooltip("Wearing the Bunny Hood grants a speed and jump boost like in Majora's Mask.\n"
"The longer jump option is not accounted for in Randomizer logic.\n\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.")); "Also disables NPC's reactions to wearing the Bunny Hood."));
AddWidget(path, "Masks Equippable as Adult", WIDGET_CVAR_CHECKBOX) AddWidget(path, "Masks Equippable as Adult", WIDGET_CVAR_CHECKBOX)
.CVar(CVAR_ENHANCEMENT("AdultMasks")) .CVar(CVAR_ENHANCEMENT("AdultMasks"))