diff options
| author | Eblo <7004497+Eblo@users.noreply.github.com> | 2025-11-25 21:08:26 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-25 21:08:26 -0500 |
| commit | 3c1775c90153ee6f35a776bf48fbece3ec99833c (patch) | |
| tree | 77f7d6e4c65daa7196eeb3434adb2c9ca42fe733 /mm/2s2h/Rando/Menu.cpp | |
| parent | 665d9edf8324e426793d5970d20f31d848e40b95 (diff) | |
[Rando] Add setting for minimum Skulltula tokens (#1251)
* Add setting for minimum Skulltula tokens
* Display max for tokens and fairies in item tracker
* Not relevant to this PR. Why did develop succeed?
* Use spdlog format
* Remove redundant ternary
* clang format
* Minor edit
* Address feedback
Diffstat (limited to 'mm/2s2h/Rando/Menu.cpp')
| -rw-r--r-- | mm/2s2h/Rando/Menu.cpp | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/mm/2s2h/Rando/Menu.cpp b/mm/2s2h/Rando/Menu.cpp index 4f489d03a..27717d277 100644 --- a/mm/2s2h/Rando/Menu.cpp +++ b/mm/2s2h/Rando/Menu.cpp @@ -5,6 +5,10 @@ #include "build.h" #include "2s2h/BenGui/BenMenu.h" +extern "C" { +#include "overlays/actors/ovl_En_Sth/z_en_sth.h" +} + // TODO: This block should come from elsewhere, tied to data in Rando::StaticData::Options std::unordered_map<int32_t, const char*> logicOptions = { { RO_LOGIC_GLITCHLESS, "Glitchless" }, @@ -217,9 +221,15 @@ static void DrawShufflesTab() { CVarCheckbox("Shuffle Boss Remains", Rando::StaticData::Options[RO_SHUFFLE_BOSS_REMAINS].cvar); CVarCheckbox("Shuffle Cows", Rando::StaticData::Options[RO_SHUFFLE_COWS].cvar); CVarCheckbox("Shuffle Gold Skulltula Tokens", Rando::StaticData::Options[RO_SHUFFLE_GOLD_SKULLTULAS].cvar); - CVarSliderInt( - "Shuffle Gold Skulltula Tokens", "gPlaceholderInt", - IntSliderOptions({ { .disabled = true, .disabledTooltip = "Coming Soon" } }).Min(1).Max(30).DefaultValue(30)); + CVarSliderInt("Minimum Required Gold Skulltula Tokens", + Rando::StaticData::Options[RO_MINIMUM_SKULLTULA_TOKENS].cvar, + IntSliderOptions( + { { .tooltip = "Minimum Gold Skulltula tokens needed to obtain the Spider House checks.", + .disabled = !CVarGetInteger(Rando::StaticData::Options[RO_SHUFFLE_GOLD_SKULLTULAS].cvar, 0), + .disabledTooltip = "Only takes effect if Gold Skulltula Tokens are shuffled." } }) + .Min(1) + .Max(SPIDER_HOUSE_TOKENS_REQUIRED) + .DefaultValue(SPIDER_HOUSE_TOKENS_REQUIRED)); CVarSliderInt( "Minimum Required Stray Fairies", Rando::StaticData::Options[RO_MINIMUM_STRAY_FAIRIES].cvar, IntSliderOptions({ { .tooltip = "Minimum Stray Fairies needed to obtain the corresponding Great Fairy check.\n" |