[Rando] Clock Shuffle + Logic #1275

mckinlee · 2025-09-20T20:54:23Z

Turns the 3-day cycle into collectible items that you need to find before accessing different time periods.

How it works:

Each half-day (Day 1, Night 1, Day 2, Night 2, Day 3, Night 3) becomes a randomized item
You can only visit time periods you've collected
If you try to access a locked time period, you'll be redirected to the earliest one you own
If you don't own any half-days, you'll be sent to the start of the final hours

Settings:

Random: Half-days are shuffled randomly
Ascending: Unlock in order (Day 1 → Night 1 → Day 2, etc.)
Descending: Unlock in reverse order (Night 3 → Day 3 → Night 2, etc.)

Must Have

~~Logic, I think is fully implemented, but could use a few passes~~
~~Logic needed for pots, crates, snowballs, you name it.~~
Needs a thorough review and testing

Nice to Have

~~Animated clock item (Cal will work on this, thank you!)~~
~~Make all "remaining hours" calculation based on obtained clock items~~
~~Add daytelops (This is complete on my local machine, gonna test more before pushing)~~
~~Configurable final hours length (Default is 6 hours before moon crash)~~
~~SoDT textbox to state the correct half-day~~
~~BetterSoDT feedback~~

Needs Fixing

~~SkipSoTCutscenes conflicts causing wierd cascading miscalculated overcorrection~~
~~"Queue Randomizer Item Gives" section of save editor should not be conditional on RO_CLOCK_SHUFFLE~~
~~On file load, should not correct for owl saves~~
~~Deku hopping during a correction causes infinite loop of sinking~~
~~seed generation issues for french vanilla and glitchless when clock shuffle is disabled~~
~~SkipSoTCutscene still conflicts on N3 and reverts back to start of N3~~

Build Artifacts

* Close attempt at animating the clock, not perfect but a good start. * Git gud Clock

Co-Authored-By: Caladius <[email protected]>

Eblo

First wave of feedback with plenty of questions. I think you know this already, but it looks like there is strangely a crash in CollisionCheck_SetAC for the clocks. This only seems to happen for the Zora-rangable ones, which call that function. I'm not sure what that's about. Maybe the weirdness with how the animated drawfunc is handled causes it to mess with its collider?

BetterSoDT feedback.. might leave this for a potential v2.. can't come up with a good solution atm

Current behavior is to load the time you selected, then abort and load the next available time if that isn't one. Not great. I think the most painless route is to just check if the selected time is actually available, and if not, tell the player as much instead of charging ahead.

All that aside, while I didn't do a full run, the bits I did were a fairly interesting way of challenging my understanding of this schedule-driven game. I think this will be a fun shuffle for sure.

mm/2s2h/DeveloperTools/SaveEditor.cpp

mm/2s2h/Enhancements/Songs/SkipSoTCutscenes.cpp

mm/2s2h/Rando/CheckTracker/CheckTracker.cpp

mm/2s2h/Rando/Logic/Regions/Central.cpp

mm/2s2h/Rando/Logic/Regions/MilkRoad.cpp

mm/2s2h/Rando/Logic/Regions/East.cpp

Eblo

With enemy drops now being merged, this will now need to account for enemies that are exclusive to certain times. My review on that PR should have you covered for a primer: https://github.com/HarbourMasters/2ship2harkinian/pull/1282/files#diff-69c6aa4d2342ae40aead6a9a0efd7dee2c7ed6788bf2f998c60e36fb769f1e7f

This will also need rebased on the latest develop.

mm/2s2h/Rando/Logic/Regions/MilkRoad.cpp

mm/2s2h/Rando/Logic/Regions/North.cpp

mm/2s2h/Rando/Logic/Regions/South.cpp

mm/2s2h/Rando/MiscBehavior/ClockShuffle.cpp

Eblo · 2025-11-21T23:56:26Z

Quick thought that just occurred to me is that the scarecrow is another way in the game to advance time. I just tried it in a seed where I had Night 2 and Night 3. Tried it on Night 2, which advanced to Day 3, which then panicked and moon crashed. I left the clock tower to see Dawn of the First Day, which then loaded Night 2.

I wouldn't want to lose the scarecrow behavior, so maybe this can be patched to just advance to the next chunk, or imitate vanilla Night 3 behavior if you're already on your latest chunk.

And now that I think about it, granny's stories are another thing to test.

Edit: Upon testing, granny seems fine at least.

Eblo

Small feedback update. One last thing is that my recent enemy drops v2 PR changes how enemy drops are defined. I went ahead and commented any sort of time window logic for your convenience. I'll want to do a more thorough review of this after that enemy drops PR is merged and incorporated into this one, but I found no issues after the scarecrow fix. Clock Shuffle (name pending?) is looking to be in pretty good shape.

Eblo · 2025-12-01T03:04:33Z

mm/2s2h/Rando/Logic/Logic.h

+#define CAN_USE_DAY2_RAIN_BEAN                                               \
+    (HAS_ITEM(ITEM_MAGIC_BEANS) && (CLOCK_DAY2() || CAN_PLAY_SONG(STORMS) || \
+                                    (HAS_BOTTLE && (CAN_ACCESS(SPRING_WATER) || CAN_ACCESS(HOT_SPRING_WATER)))))


Probably simpler to define this as CAN_GROW_BEAN_PLANT or day 2 and bean:

Suggested change

#define CAN_USE_DAY2_RAIN_BEAN \

(HAS_ITEM(ITEM_MAGIC_BEANS) && (CLOCK_DAY2() || CAN_PLAY_SONG(STORMS) || \

(HAS_BOTTLE && (CAN_ACCESS(SPRING_WATER) || CAN_ACCESS(HOT_SPRING_WATER)))))

#define CAN_USE_DAY2_RAIN_BEAN (CAN_GROW_BEAN_PLANT || (HAS_ITEM(ITEM_MAGIC_BEANS) && CLOCK_DAY2()))

mckinlee · 2025-12-08T17:04:16Z

Small feedback update. One last thing is that my recent enemy drops v2 PR changes how enemy drops are defined. I went ahead and commented any sort of time window logic for your convenience. I'll want to do a more thorough review of this after that enemy drops PR is merged and incorporated into this one, but I found no issues after the scarecrow fix. Clock Shuffle (name pending?) is looking to be in pretty good shape.

When that happens, I'll go back and rebrand to "Shuffle Time" as discussed in discord.

Eblo · 2025-12-13T15:03:45Z

With recent merges, this will need to do the following with a rebase:

Move new VBs to GameInteractor_VanillaBehavior.h and document their args and vanilla conditions
Account for enemy drops rework with the embedded checks. I took the liberty of commenting any time windows I caught in my PR, so if I didn't miss anything, it should be as simple as replacing my comments with your appropriate time macros: https://github.com/HarbourMasters/2ship2harkinian/pull/1373/changes#diff-f313e2dd472a45ee68a872384bf0b2aba4188d6b0e0e20e2a0fb9c64b1cef5c1

Eblo

Top notch job on this so far. In practice in gameplay, this whole thing seems to work splendidly and is just plain fun. My feedback is almost entirely concerned with how things are under the hood, with plenty of questions.

I think that a number of my comments from prior reviews got lost in the mix, as they have not been addressed while others have. I'd like you to carefully go through the entire PR files themselves for review comments. Certain views on GitHub might be only showing so much.

Again, bang up job here. This was no small feat.

Eblo · 2025-12-15T01:37:09Z

mm/2s2h/Rando/Logic/Regions/North.cpp

+            CHECK(RC_ENEMY_DROP_TEKTITE, CanKillEnemy(ACTOR_OBJ_SNOWBALL) && CanKillEnemy(ACTOR_EN_TITE) && (IS_DAY1() || IS_DAY3())), // Day 1 and 3 only
+            CHECK(RC_ENEMY_DROP_WOLFOS, CanKillEnemy(ACTOR_OBJ_SNOWBALL) && CanKillEnemy(ACTOR_EN_WF) && IS_DAY2()), // Day 2 only


My comments may have been ambiguous. These enemies appear at night also, e.g. Day+Night 2 for the Wolfos:

Suggested change

CHECK(RC_ENEMY_DROP_TEKTITE, CanKillEnemy(ACTOR_OBJ_SNOWBALL) && CanKillEnemy(ACTOR_EN_TITE) && (IS_DAY1() || IS_DAY3())), // Day 1 and 3 only

CHECK(RC_ENEMY_DROP_WOLFOS, CanKillEnemy(ACTOR_OBJ_SNOWBALL) && CanKillEnemy(ACTOR_EN_WF) && IS_DAY2()), // Day 2 only

CHECK(RC_ENEMY_DROP_TEKTITE, CanKillEnemy(ACTOR_OBJ_SNOWBALL) && CanKillEnemy(ACTOR_EN_TITE) && (FIRST_DAY() || THIRD_DAY())), // Day 1 and 3 only

CHECK(RC_ENEMY_DROP_WOLFOS, CanKillEnemy(ACTOR_OBJ_SNOWBALL) && CanKillEnemy(ACTOR_EN_WF) && SECOND_DAY()), // Day 2 only

Eblo · 2025-12-15T01:39:03Z

mm/2s2h/Rando/Logic/Regions/North.cpp

+            CHECK(RC_ENEMY_DROP_WOLFOS, CanKillEnemy(ACTOR_OBJ_SNOWBALL) && CanKillEnemy(ACTOR_EN_WF) && IS_DAY2()), // Day 2 only
+            CHECK(RC_ENEMY_DROP_SNAPPER, CanKillEnemy(ACTOR_OBJ_SNOWBALL) && CanKillEnemy(ACTOR_EN_KAME) && IS_DAY3()), // Day 3 only


Suggested change

CHECK(RC_ENEMY_DROP_WOLFOS, CanKillEnemy(ACTOR_OBJ_SNOWBALL) && CanKillEnemy(ACTOR_EN_WF) && IS_DAY2()), // Day 2 only

CHECK(RC_ENEMY_DROP_SNAPPER, CanKillEnemy(ACTOR_OBJ_SNOWBALL) && CanKillEnemy(ACTOR_EN_KAME) && IS_DAY3()), // Day 3 only

CHECK(RC_ENEMY_DROP_WOLFOS, CanKillEnemy(ACTOR_OBJ_SNOWBALL) && CanKillEnemy(ACTOR_EN_WF) && SECOND_DAY()), // Day 2 only

CHECK(RC_ENEMY_DROP_SNAPPER, CanKillEnemy(ACTOR_OBJ_SNOWBALL) && CanKillEnemy(ACTOR_EN_KAME) && THIRD_DAY()), // Day 3 only

Eblo · 2025-12-15T01:39:17Z

mm/2s2h/Rando/Logic/Regions/North.cpp

+            CHECK(RC_ENEMY_DROP_WOLFOS, CanKillEnemy(ACTOR_OBJ_SNOWBALL) && CanKillEnemy(ACTOR_EN_WF) && IS_DAY2()), // Day 2 only
+            CHECK(RC_ENEMY_DROP_SNAPPER, CanKillEnemy(ACTOR_OBJ_SNOWBALL) && CanKillEnemy(ACTOR_EN_KAME) && IS_DAY3()), // Day 3 only


Suggested change

CHECK(RC_ENEMY_DROP_WOLFOS, CanKillEnemy(ACTOR_OBJ_SNOWBALL) && CanKillEnemy(ACTOR_EN_WF) && IS_DAY2()), // Day 2 only

CHECK(RC_ENEMY_DROP_SNAPPER, CanKillEnemy(ACTOR_OBJ_SNOWBALL) && CanKillEnemy(ACTOR_EN_KAME) && IS_DAY3()), // Day 3 only

CHECK(RC_ENEMY_DROP_WOLFOS, CanKillEnemy(ACTOR_OBJ_SNOWBALL) && CanKillEnemy(ACTOR_EN_WF) && SECOND_DAY()), // Day 2 only

CHECK(RC_ENEMY_DROP_SNAPPER, CanKillEnemy(ACTOR_OBJ_SNOWBALL) && CanKillEnemy(ACTOR_EN_KAME) && THIRD_DAY()), // Day 3 only

Eblo · 2025-12-15T01:43:03Z

mm/2s2h/Rando/Logic/Regions/South.cpp

            CHECK(RC_WOODS_OF_MYSTERY_GRASS_22, true),
            CHECK(RC_WOODS_OF_MYSTERY_GRASS_23, true),


Wrong grass checks got marked:

Suggested change

CHECK(RC_WOODS_OF_MYSTERY_GRASS_22, FINAL_DAY()),

CHECK(RC_WOODS_OF_MYSTERY_GRASS_23, FINAL_DAY()),

Eblo · 2025-12-15T01:43:31Z

mm/2s2h/Rando/Logic/Regions/South.cpp

            CHECK(RC_WOODS_OF_MYSTERY_GRASS_09, FINAL_DAY()),
            CHECK(RC_WOODS_OF_MYSTERY_GRASS_10, FINAL_DAY()),


Suggested change

CHECK(RC_WOODS_OF_MYSTERY_GRASS_09, true),

CHECK(RC_WOODS_OF_MYSTERY_GRASS_10, true),

Eblo · 2025-12-18T02:17:37Z

mm/2s2h/Rando/MiscBehavior/ClockShuffle.cpp

+        }
+
+        // Add remaining (non-starting) time items to pool
+        // Only works in random mode - progressive mode items are added elsewhere


Clarify where that is here, so that anybody working with this knows where to look.

Eblo · 2025-12-18T02:20:35Z

mm/2s2h/Rando/Types.h

+    RI_CLOCK_DAY_1,
+    RI_CLOCK_NIGHT_1,
+    RI_CLOCK_DAY_2,
+    RI_CLOCK_NIGHT_2,
+    RI_CLOCK_DAY_3,
+    RI_CLOCK_NIGHT_3,
+    RI_CLOCK_PROGRESSIVE,


This list is in alphabetical order for the most part, so these RIs don't belong here.

On another note, the RI names are partially user-facing at least due to the save editor. Should these be renamed to RI_TIME_*?

mm/2s2h/Rando/Logic/Regions/MilkRoad.cpp

Eblo · 2025-12-18T02:26:38Z

mm/2s2h/Rando/Logic/Regions/MilkRoad.cpp

-            CHECK(RC_GORMAN_MILK_PURCHASE, CAN_AFFORD(RC_GORMAN_MILK_PURCHASE)),
-            CHECK(RC_GORMAN_TRACK_GARO_MASK, CAN_PLAY_SONG(EPONA)),
+            CHECK(RC_GORMAN_MILK_PURCHASE, CAN_AFFORD(RC_GORMAN_MILK_PURCHASE) && IS_DAY()),
+            CHECK(RC_GORMAN_TRACK_GARO_MASK, CAN_PLAY_SONG(EPONA) && CAN_AFFORD(RC_GORMAN_TRACK_GARO_MASK) && IS_DAY()),


While the Gorman race does cost money, it's a flat 10 Rupee fee and not tied into a shop check with a price. It's not gated by wallet size.

Suggested change

CHECK(RC_GORMAN_TRACK_GARO_MASK, CAN_PLAY_SONG(EPONA) && CAN_AFFORD(RC_GORMAN_TRACK_GARO_MASK) && IS_DAY()),

CHECK(RC_GORMAN_TRACK_GARO_MASK, CAN_PLAY_SONG(EPONA) && IS_DAY()),

Eblo · 2025-12-18T02:27:20Z

mm/2s2h/Rando/Logic/Regions/Central.cpp

            EVENT(RE_ACCESS_FISH, true),
            EVENT(RE_ACCESS_BUGS, true),
+            EVENT(RE_SETUP_MEET_ANJU, HAS_ITEM(ITEM_MASK_KAFEIS_MASK) && BETWEEN(TIME_DAY1_PM_01_45, TIME_NIGHT1_PM_09_00)),
+            EVENT(RE_MEET_ANJU, RANDO_EVENTS[RE_SETUP_MEET_ANJU] && BETWEEN(TIME_NIGHT1_AM_12_00, TIME_DAY2_AM_06_00) && (Flags_GetRandoInf(RANDO_INF_OBTAINED_ROOM_KEY) || CAN_BE_DEKU)),


This seems to be for the midnight meeting, which makes the event name confusing. Maybe just RE_ANJU_MIDNIGHT_MEETING?

Eblo

One miscellaneous thing is that my comment regarding CheckTrackerDrawLogicalList is still not addressed. That, and there are conflicts with the Central.cpp logic file.

This is really close. This review is trivial things. I'm pretty happy with this overall.

mm/2s2h/Rando/StaticData/Items.cpp

Eblo · 2026-01-02T01:38:48Z

mm/2s2h/Rando/Types.h

+    RI_TIME_DAY_1,
+    RI_TIME_NIGHT_1,
+    RI_TIME_DAY_2,
+    RI_TIME_NIGHT_2,
+    RI_TIME_DAY_3,
+    RI_TIME_NIGHT_3,
+    RI_TIME_PROGRESSIVE,


What do you think of naming the time RIs like so, to keep them both alphabetical and also the same order as what you have? I'm not 100% sure myself:

Suggested change

RI_TIME_DAY_1,

RI_TIME_NIGHT_1,

RI_TIME_DAY_2,

RI_TIME_NIGHT_2,

RI_TIME_DAY_3,

RI_TIME_NIGHT_3,

RI_TIME_PROGRESSIVE,

RI_TIME_1_DAY,

RI_TIME_1_NIGHT,

RI_TIME_2_DAY,

RI_TIME_2_NIGHT,

RI_TIME_3_DAY,

RI_TIME_3_NIGHT,

RI_TIME_PROGRESSIVE,

I'm indifferent, but I left it as is for now. Just let me know how ya wanna proceed. The other feedback is addressed though.

mckinlee added 5 commits August 15, 2025 10:17

Add Clocks as Items feature

b2533cc

refactor

f4d81b8

Merge remote-tracking branch 'upstream/develop' into clocks-as-items

b81c027

some clean up

83a0e7c

forgot to clangify

b827c9d

balloondude2 added the help wanted Extra attention is needed label Sep 20, 2025

mckinlee and others added 5 commits September 22, 2025 00:07

use proper randoinf flags and some fixes

d5c6b85

proper skipsotcutscene fix

b16edf4

Animated Clock Item (Thank you Caladius!)

28a96c8

* Close attempt at animating the clock, not perfect but a good start. * Git gud Clock

fix clock item get crash

978e895

Co-Authored-By: Caladius <[email protected]>

some enhancements

d54be73

Eblo requested changes Oct 9, 2025

View reviewed changes

mckinlee added 12 commits October 10, 2025 15:04

logic refactor, minor changes, and new enhancements

72311e2

Merge remote-tracking branch 'upstream/develop' into clocks-as-items

a11a544

huge rework

26a86bb

Merge remote-tracking branch 'upstream/develop' into clocks-as-items

e72b9ca

clang

63868c7

fix a oops; any day, not current day

5e5676d

housekeeping and starting items menu support

519b1d0

Merge remote-tracking branch 'upstream/develop' into clocks-as-items

0c650f4

splits up some milkroad regions and fixes a audio bug

316726b

Merge remote-tracking branch 'upstream/develop' into clocks-as-items

8b8e1ea

i suck at merging

9ff387f

Merge remote-tracking branch 'upstream/develop' into clocks-as-items

c67a73f

Eblo mentioned this pull request Nov 11, 2025

3.1.0 Release #1335

Open

31 tasks

Eblo requested changes Nov 13, 2025

View reviewed changes

mckinlee added 2 commits November 21, 2025 09:22

Merge branch 'main' into clocks-as-items

4486ebf

feedback update

c468bc3

scarecrow dance fix

552ffc2

mckinlee added 3 commits November 23, 2025 14:40

Merge branch 'main' into clocks-as-items

67fb82b

add clocks to new item tracker

bdeff9f

day 2 bean patches

1e0db64

Eblo reviewed Dec 1, 2025

View reviewed changes

mckinlee added 3 commits December 13, 2025 18:14

Merge branch 'main' into clocks-as-items

1cec9a0

add time logic to enemy drops and simplify day 2 bean macro

2c1262d

rebrand to "Shuffle Time"

959fdf0

Eblo requested changes Dec 18, 2025

View reviewed changes

mckinlee added 2 commits December 22, 2025 09:28

Merge branch 'main' into clocks-as-items

4764607

more eblo feedback

db8af92

Eblo requested changes Jan 2, 2026

View reviewed changes

mckinlee added 5 commits January 1, 2026 21:58

Merge branch 'main' into clocks-as-items

114d2ea

some more feedback

49ad59e

rename feedback

13ee70a

pauseSaveEntrance fix

d12e248

fix take 2

c0914bc

		CHECK(RC_ENEMY_DROP_TEKTITE, CanKillEnemy(ACTOR_OBJ_SNOWBALL) && CanKillEnemy(ACTOR_EN_TITE) && (IS_DAY1() \|\| IS_DAY3())), // Day 1 and 3 only
		CHECK(RC_ENEMY_DROP_WOLFOS, CanKillEnemy(ACTOR_OBJ_SNOWBALL) && CanKillEnemy(ACTOR_EN_WF) && IS_DAY2()), // Day 2 only

		CHECK(RC_ENEMY_DROP_WOLFOS, CanKillEnemy(ACTOR_OBJ_SNOWBALL) && CanKillEnemy(ACTOR_EN_WF) && IS_DAY2()), // Day 2 only
		CHECK(RC_ENEMY_DROP_SNAPPER, CanKillEnemy(ACTOR_OBJ_SNOWBALL) && CanKillEnemy(ACTOR_EN_KAME) && IS_DAY3()), // Day 3 only

		CHECK(RC_WOODS_OF_MYSTERY_GRASS_22, true),
		CHECK(RC_WOODS_OF_MYSTERY_GRASS_23, true),


	CHECK(RC_WOODS_OF_MYSTERY_GRASS_22, FINAL_DAY()),
	CHECK(RC_WOODS_OF_MYSTERY_GRASS_23, FINAL_DAY()),

		CHECK(RC_WOODS_OF_MYSTERY_GRASS_09, FINAL_DAY()),
		CHECK(RC_WOODS_OF_MYSTERY_GRASS_10, FINAL_DAY()),


	CHECK(RC_WOODS_OF_MYSTERY_GRASS_09, true),
	CHECK(RC_WOODS_OF_MYSTERY_GRASS_10, true),

	CHECK(RC_GORMAN_TRACK_GARO_MASK, CAN_PLAY_SONG(EPONA) && CAN_AFFORD(RC_GORMAN_TRACK_GARO_MASK) && IS_DAY()),
	CHECK(RC_GORMAN_TRACK_GARO_MASK, CAN_PLAY_SONG(EPONA) && IS_DAY()),

[Rando] Clock Shuffle + Logic #1275

Are you sure you want to change the base?

[Rando] Clock Shuffle + Logic #1275

Uh oh!

Conversation

mckinlee commented Sep 20, 2025 • edited by github-actions bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Must Have

Nice to Have

Needs Fixing

Build Artifacts

Uh oh!

Eblo left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Eblo left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Eblo commented Nov 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Eblo left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mckinlee commented Dec 8, 2025

Uh oh!

Eblo commented Dec 13, 2025

Uh oh!

Eblo left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Eblo left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

mckinlee commented Sep 20, 2025 •

edited by github-actions bot

Loading

Eblo commented Nov 21, 2025 •

edited

Loading