Archive/Shipwright
0
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-04-28 21:27:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

More minor menu/cvar fixes (#5213)

Browse source 
* Minor fixes

* Hide unshuffled shop checks default fix
This commit is contained in:
aMannus 2025-03-26 11:07:26 +01:00 • committed by GitHub
parent 8832bcaf12
commit c1ff45a240
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
soh/soh/Enhancements/cosmetics/CustomLogoTitle.cpp
View file

@ -117,7 +117,7 @@ extern "C" void CustomLogoTitle_Draw(TitleContext* titleContext, uint8_t logoToD
CLOSE_DISPS(titleContext->state.gfxCtx); CLOSE_DISPS(titleContext->state.gfxCtx);
} }
#define CVAR_BOOTSEQUENCE_NAME CVAR_ENHANCEMENT("BootSequence") #define CVAR_BOOTSEQUENCE_NAME CVAR_SETTING("BootSequence")
#define CVAR_BOOTSEQUENCE_DEFAULT BOOTSEQUENCE_DEFAULT #define CVAR_BOOTSEQUENCE_DEFAULT BOOTSEQUENCE_DEFAULT
#define CVAR_BOOTSEQUENCE_VALUE CVarGetInteger(CVAR_BOOTSEQUENCE_NAME, CVAR_BOOTSEQUENCE_DEFAULT) #define CVAR_BOOTSEQUENCE_VALUE CVarGetInteger(CVAR_BOOTSEQUENCE_NAME, CVAR_BOOTSEQUENCE_DEFAULT)

2
soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
View file

@ -879,7 +879,7 @@ void CheckTrackerWindow::DrawElement() {
mystery = CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("MysteriousShuffle"), 0); mystery = CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("MysteriousShuffle"), 0);
showLogicTooltip = CVarGetInteger(CVAR_TRACKER_CHECK("ShowLogic"), 0); showLogicTooltip = CVarGetInteger(CVAR_TRACKER_CHECK("ShowLogic"), 0);
hideShopUnshuffledChecks = CVarGetInteger(CVAR_TRACKER_CHECK("HideUnshuffledShopChecks"), 1); hideShopUnshuffledChecks = CVarGetInteger(CVAR_TRACKER_CHECK("HideUnshuffledShopChecks"), 0);
alwaysShowGS = CVarGetInteger(CVAR_TRACKER_CHECK("AlwaysShowGSLocs"), 0); alwaysShowGS = CVarGetInteger(CVAR_TRACKER_CHECK("AlwaysShowGSLocs"), 0);
if (CVarGetInteger(CVAR_TRACKER_CHECK("WindowType"), TRACKER_WINDOW_WINDOW) == TRACKER_WINDOW_FLOATING) { if (CVarGetInteger(CVAR_TRACKER_CHECK("WindowType"), TRACKER_WINDOW_WINDOW) == TRACKER_WINDOW_FLOATING) {
if (CVarGetInteger(CVAR_TRACKER_CHECK("ShowOnlyPaused"), 0) && (gPlayState == nullptr || gPlayState->pauseCtx.state == 0)) { if (CVarGetInteger(CVAR_TRACKER_CHECK("ShowOnlyPaused"), 0) && (gPlayState == nullptr || gPlayState->pauseCtx.state == 0)) {

6
soh/soh/SohGui/SohMenuSettings.cpp
View file

@ -354,7 +354,7 @@ void SohMenu::AddMenuSettings() {
.Tooltip("Which corner of the screen notifications appear in.") .Tooltip("Which corner of the screen notifications appear in.")
.ComboMap(notificationPosition) .ComboMap(notificationPosition)
.DefaultIndex(3)); .DefaultIndex(3));
AddWidget(path, "Duration: %.0f seconds", WIDGET_CVAR_SLIDER_FLOAT) AddWidget(path, "Duration (seconds):", WIDGET_CVAR_SLIDER_FLOAT)
.CVar(CVAR_SETTING("Notifications.Duration")) .CVar(CVAR_SETTING("Notifications.Duration"))
.Options(FloatSliderOptions() .Options(FloatSliderOptions()
.Tooltip("How long notifications are displayed for.") .Tooltip("How long notifications are displayed for.")
@ -363,13 +363,13 @@ void SohMenu::AddMenuSettings() {
.Min(3.0f) .Min(3.0f)
.Max(30.0f) .Max(30.0f)
.DefaultValue(10.0f)); .DefaultValue(10.0f));
AddWidget(path, "Background Opacity: %.0f%%", WIDGET_CVAR_SLIDER_FLOAT) AddWidget(path, "Background Opacity", WIDGET_CVAR_SLIDER_FLOAT)
.CVar(CVAR_SETTING("Notifications.BgOpacity")) .CVar(CVAR_SETTING("Notifications.BgOpacity"))
.Options(FloatSliderOptions() .Options(FloatSliderOptions()
.Tooltip("How opaque the background of notifications is.") .Tooltip("How opaque the background of notifications is.")
.DefaultValue(0.5f) .DefaultValue(0.5f)
.IsPercentage()); .IsPercentage());
AddWidget(path, "Size %.1f", WIDGET_CVAR_SLIDER_FLOAT) AddWidget(path, "Size:", WIDGET_CVAR_SLIDER_FLOAT)
.CVar(CVAR_SETTING("Notifications.Size")) .CVar(CVAR_SETTING("Notifications.Size"))
.Options(FloatSliderOptions() .Options(FloatSliderOptions()
.Tooltip("How large notifications are.") .Tooltip("How large notifications are.")