Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add option for Shuffle Individual Ocarina Notes #134

Open
wants to merge 6 commits into
base: ootr
Choose a base branch
from

Conversation

coavins
Copy link

@coavins coavins commented Dec 2, 2023

This PR adds an option to support the shuffle of individual ocarina notes. It is found under the shuffle frogs option.

This PR adds the logic helper has_song. I replaced all instances of ocarina,lullaby with $has_song|lullaby, and all instances of has("ocarina") and has("lullaby") with has_song("lullaby").

TODO:

  • The image files I provided are just placeholders and should be replaced
  • The new row in the item grid should not appear when this option is disabled (I don't know how to do this)
  • From OOTR docs: The skull kid ocarina minigame is not considered to be in glitchless logic until all 5 notes are found
  • Order of note items in the layout should match the order they appear in the pause menu in-game, which is: A down right left up

Should be verified:

  • I made this option disabled by default in all presets
  • Line 261 in logic_helpers.lua has suspicious use of and and or - I replaced this with a single has_song which may affect the logic here. I don't know Lua well enough to confirm
  • Changes to access rules for SFM Storms Grotto and Deku Tree MQ GS Basement Graves Room mean they now require the ocarina

image
image

This commit fixes the calls to has_song from Lua code, we need to check
the count from the return value.

This commit also fixes the frog ocarina game access rules.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant