diff options
| author | mckinlee <mckinlee@ymail.com> | 2026-01-05 20:52:39 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-01-05 20:52:39 -0500 |
| commit | 2b139c215f478ef5deca007dfa6f9b6052db3d1d (patch) | |
| tree | fe84164b375f7bdb9ede52359efb1d1b3060100d /mm/2s2h/Rando/StaticData/Options.cpp | |
| parent | 51209378530531e237893ef78cda16f5b6a4b186 (diff) | |
[Rando] Clock Shuffle + Logic (#1275)
* Add Clocks as Items feature
* refactor
* some clean up
* forgot to clangify
* use proper randoinf flags and some fixes
* proper skipsotcutscene fix
* Animated Clock Item (Thank you Caladius!)
* Close attempt at animating the clock, not perfect but a good start.
* Git gud Clock
* fix clock item get crash
Co-Authored-By: Caladius <Caladius@users.noreply.github.com>
* some enhancements
* logic refactor, minor changes, and new enhancements
* huge rework
* clang
* fix a oops; any day, not current day
* housekeeping and starting items menu support
* splits up some milkroad regions and fixes a audio bug
* i suck at merging
* feedback update
* scarecrow dance fix
* add clocks to new item tracker
* day 2 bean patches
* add time logic to enemy drops and simplify day 2 bean macro
* rebrand to "Shuffle Time"
* more eblo feedback
* some more feedback
* rename feedback
* pauseSaveEntrance fix
* fix take 2
* Time Shuffle cleanup
Fix pause save Time Shuffle bug
Fix event queue daytelop bug
Finish merge commit header include
Clean up with shouldRegister
Co-authored-by: mckinlee <mckinlee@ymail.com>
---------
Co-authored-by: Caladius <Caladius@users.noreply.github.com>
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
Diffstat (limited to 'mm/2s2h/Rando/StaticData/Options.cpp')
| -rw-r--r-- | mm/2s2h/Rando/StaticData/Options.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mm/2s2h/Rando/StaticData/Options.cpp b/mm/2s2h/Rando/StaticData/Options.cpp index eb05930b0..ed1550166 100644 --- a/mm/2s2h/Rando/StaticData/Options.cpp +++ b/mm/2s2h/Rando/StaticData/Options.cpp @@ -58,6 +58,9 @@ std::map<RandoOptionId, RandoStaticOption> Options = { RO(RO_STARTING_RUPEES, RO_GENERIC_OFF), RO(RO_TRIFORCE_PIECES_MAX, DEFAULT_TRIFORCE_PIECES_MAX), RO(RO_TRIFORCE_PIECES_REQUIRED, DEFAULT_TRIFORCE_PIECES_MAX), + RO(RO_CLOCK_SHUFFLE, RO_GENERIC_OFF), + RO(RO_CLOCK_SHUFFLE_PROGRESSIVE, RO_CLOCK_SHUFFLE_RANDOM), + RO(RO_CLOCK_TERMINAL_TIME, 0), // Default: 00:00 (midnight) }; // clang-format on |