Option to randomize the Frogs 2 melody #2064
Open
+89
−54
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fenhl
added
Type: Enhancement
fenhl
force-pushed
the
frogs2-melody
branch
from
ebb0cda
to
4666a5c
Compare
cjohnson57
added
Status: Needs Review
cjohnson57
reviewed
Nov 14, 2023
flagrama
reviewed
May 29, 2024
| @@ -386,34 +387,40 @@ def get_random_song() -> Song: | |||
|
|
|||
|
|
|||
| # create a list of 12 songs, none of which are sub-strings of any other song | |||
| def generate_song_list(world: World, frog: bool, warp: bool) -> dict[str, Song]: | |||
There was a problem hiding this comment.
Is there a technical reason that frogs2 is using this same function? Like will the mini-game break if the frog-song has another song as a sub-string?
If not, I think it would be cleaner to have it have its own function for generating randomly and probably its own dictionary entry for plando. If more enough code is similar perhaps it could be refactored into a few more functions shared between them.
If so, perhaps this could also fix that issue so that the code can be separated.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR turns the “Randomize Ocarina Melodies” setting into a multiselect and adds a 3rd option “Frogs Ocarina Game” which randomizes the song that needs to be played for the “ZR Frogs Ocarina Game” check. The notes appear in the spoiler log and can be plando'd like the other melodies, but the melody is locked to a length of exactly 14 notes. Rather than using the existing algorithm for generating random songs, a fully random sequence of notes with even weights is generated.
Special thanks to @rrealmuto whose
random_frog_songbranch served as the basis for this PR.I've also included a drive-by fix where the misc. location hint for frogs 2 was incorrectly assumed to be reachable as adult.