github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-14 18:48:04 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix CVar mismatches for skip forced dialog and unrestricted items. (#5159)

Browse source
This commit is contained in:
Christopher Leggett 2025-03-20 00:21:31 -04:00 • committed by GitHub
commit 8958db5c2b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
soh/soh/SohGui/SohMenu.h
View file

@ -67,6 +67,13 @@ static const std::unordered_map<int32_t, const char*> dekuStickCheat = {
{ DEKU_STICK_UNBREAKABLE_AND_ALWAYS_ON_FIRE, "Unbreakable + Always on Fire" }
};
static const std::unordered_map<int32_t, const char*> skipForcedDialogOptions = {
{ FORCED_DIALOG_SKIP_NONE, "None" },
{ FORCED_DIALOG_SKIP_NAVI, "Navi" },
{ FORCED_DIALOG_SKIP_NPC, "NPCs" },
{ FORCED_DIALOG_SKIP_ALL, "All" }
};
static const std::unordered_map<int32_t, const char*> skipGetItemAnimationOptions = {
{ SGIA_DISABLED, "Disabled" },
{ SGIA_JUNK, "Junk Items" },

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

@ -330,9 +330,12 @@ void SohMenu::AddMenuEnhancements() {
AddWidget(path, "Skip Pickup Messages", WIDGET_CVAR_CHECKBOX)
.CVar(CVAR_ENHANCEMENT("FastDrops"))
.Options(CheckboxOptions().Tooltip("Skip Pickup Messages for new Consumable Items and Bottle Swipes."));
AddWidget(path, "Skip Forced Dialog", WIDGET_CVAR_CHECKBOX)
AddWidget(path, "Skip Forced Dialog", WIDGET_CVAR_COMBOBOX)
.CVar(CVAR_ENHANCEMENT("TimeSavers.SkipForcedDialog"))
.Options(CheckboxOptions().Tooltip("Prevent forced conversations with Navi or other NPCs."));
.Options(ComboboxOptions()
.ComboMap(skipForcedDialogOptions)
.DefaultIndex(FORCED_DIALOG_SKIP_NONE)
.Tooltip("Prevent forced conversations with Navi and/or other NPCs."));
AddWidget(path, "Skip Text", WIDGET_CVAR_CHECKBOX)
.CVar(CVAR_ENHANCEMENT("SkipText"))
.Options(CheckboxOptions().Tooltip("Holding down B skips text."));
@ -1592,7 +1595,7 @@ void SohMenu::AddMenuEnhancements() {
.Options(CheckboxOptions().Tooltip("Allows any item to be equipped, regardless of age.\n"
"Also allows Child to use Adult strength upgrades."));
AddWidget(path, "Unrestricted Items", WIDGET_CVAR_CHECKBOX)
.CVar(CVAR_CHEAT("Unrestricted Items"))
.CVar(CVAR_CHEAT("NoRestrictItems"))
.Options(CheckboxOptions().Tooltip("Allows you to use any item at any location"));
AddWidget(path, "Super Tunic", WIDGET_CVAR_CHECKBOX)
.CVar(CVAR_CHEAT("SuperTunic"))