summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGarrett Cox <garrettjcox@gmail.com>2026-07-08 00:37:20 -0500
committerGitHub <noreply@github.com>2026-07-08 00:37:20 -0500
commit2188b01ac1409c495c317719b68378fb66405597 (patch)
tree20e02f750f73d5ca225dee366884984c0f2ce36d
parent8061b4443fcc242454dd6efe1fd93f491bbc5f5d (diff)
parent1efa02edeff3e4de82e77d4615fd62d83cc0c7b8 (diff)
Merge pull request #1781 from garrettjoecox/adjust-terminal-time-defau
Adjust terminal time default for shuffle time
-rw-r--r--mm/2s2h/Rando/Menu.cpp4
-rw-r--r--mm/2s2h/Rando/StaticData/Options.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/mm/2s2h/Rando/Menu.cpp b/mm/2s2h/Rando/Menu.cpp
index 557732738..2d26e834c 100644
--- a/mm/2s2h/Rando/Menu.cpp
+++ b/mm/2s2h/Rando/Menu.cpp
@@ -635,7 +635,7 @@ static void DrawItemsTab() {
}
// Terminal time slider (Final Hours start time)
{
- int32_t terminalMinutes = CVarGetInteger(Rando::StaticData::Options[RO_CLOCK_TERMINAL_TIME].cvar, 0);
+ int32_t terminalMinutes = CVarGetInteger(Rando::StaticData::Options[RO_CLOCK_TERMINAL_TIME].cvar, 350);
int hours = terminalMinutes / 60;
int minutes = terminalMinutes % 60;
@@ -647,7 +647,7 @@ static void DrawItemsTab() {
UIWidgets::IntSliderOptions()
.Min(0)
.Max(359)
- .DefaultValue(0)
+ .DefaultValue(350)
.LabelPosition(UIWidgets::LabelPosition::None)
.Tooltip("Controls when the final hours countdown begins (00:00 to 05:59). "
"When you run out of owned half-days, this allows the player control over how much "
diff --git a/mm/2s2h/Rando/StaticData/Options.cpp b/mm/2s2h/Rando/StaticData/Options.cpp
index 7db80c0b2..5fe0fe6d8 100644
--- a/mm/2s2h/Rando/StaticData/Options.cpp
+++ b/mm/2s2h/Rando/StaticData/Options.cpp
@@ -25,7 +25,7 @@ std::map<RandoOptionId, RandoStaticOption> Options = {
RO(RO_ACCESS_TRIALS, RO_ACCESS_TRIALS_20_MASKS),
RO(RO_CLOCK_SHUFFLE_PROGRESSIVE, RO_CLOCK_SHUFFLE_RANDOM),
RO(RO_CLOCK_SHUFFLE, RO_GENERIC_OFF),
- RO(RO_CLOCK_TERMINAL_TIME, 0), // Default: 00:00 (midnight)
+ RO(RO_CLOCK_TERMINAL_TIME, 350), // Default: 05:50 (10 "minutes" before crash)
RO(RO_HINTS_BANK_SIGN, RO_GENERIC_OFF),
RO(RO_HINTS_BOSS_REMAINS, RO_GENERIC_OFF),
RO(RO_HINTS_GOSSIP_STONE_STRENGTH, 50),