Rando: Shuffle Ocarina Buttons#3082
Rando: Shuffle Ocarina Buttons#3082Pepe20129 wants to merge 29 commits intoHarbourMasters:developfrom
Conversation
By PurpleHato
| { RAND_INF_HAS_OCARINA_C_LEFT, "RAND_INF_HAS_OCARINA_C_LEFT"}, | ||
| { RAND_INF_HAS_OCARINA_C_RIGHT, "RAND_INF_HAS_OCARINA_C_RIGHT"}, | ||
| { RAND_INF_HAS_OCARINA_C_UP, "RAND_INF_HAS_OCARINA_C_UP"}, | ||
| { RAND_INF_HAS_OCARINA_C_DOWN, "RAND_INF_HAS_OCARINA_C_DOWN"}, |
There was a problem hiding this comment.
Just remember you're creating a merge conflict for yourself here :)
inspectredc
left a comment
There was a problem hiding this comment.
LGTM! Excited for this one :) (also reminder about the rando changes you made before merging)
|
Yes, anything that added stuff with n64ddFlag should be changed to IS_RANDO before being merged from now on. |
Done |
|
Noticed in playtesting but would be great if you could add the items to the item tracker, and also maybe have some indicator of which songs can then be played on the item tracker |
|
Currently the only way to know which buttons you have is that in the pause menu if you hover over a song, the buttons you don't have will be gray. I did try to make a display like how n64 rando does it but I wasn't able to, I'll look into putting them in the item tracker. |
soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp
Outdated
Show resolved
Hide resolved
| ScarecrowSong = ScarecrowSong || FreeScarecrow || (ChildScarecrow && AdultScarecrow); | ||
| Scarecrow = Hookshot && CanPlay(ScarecrowSong, Song::SONG_SCARECROW); | ||
| DistantScarecrow = Longshot && CanPlay(ScarecrowSong, Song::SONG_SCARECROW); | ||
| Scarecrow = Hookshot && Ocarina && OcarinaButtons >= 2; |
There was a problem hiding this comment.
Either account for FreeScarecrow here and in z_en_kakasi2.c, or clarify in the tooltip that scarecrow still needs 2 buttons. (I gave my intial comment on the setting assuming it would just be in logic with 0 buttons if free, but still requiring buttons and only saving the trip to lake is valid too)
There was a problem hiding this comment.
Updated the tooltip and hopefully made the logic easier to understand
|
#3735 has been merged so this pr is no longer needed. |
Adds a new option to shuffle the 5 ocarina buttons.
If you don't have the buttons, you can't use them while playing songs.
Includes models by Purple Hato:
Build Artifacts