-
Notifications
You must be signed in to change notification settings - Fork 76
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
[Enhancement] Custom Zora Egg Count #624
Conversation
Turns out this introduces a new dialogue bug with the marine researcher if your egg count is anything but 7. Going to work on addressing that, if I need to close this PR until then let me know. |
You are fine to leave it open! Feel free to reach out in #2s2h-development in discord for any questions/pointers! |
This has been cleaned up to use hooks now, and played fine in the general testing I did. Ran it by the #2s2h-development channel last night, no complaints so far. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The changes look good. Only thing is you've created a second BeginMenu("Song/Playback")
instead of adding to the existing one. Please combine them and deal with merge conflicts (preferably we would like the items in alphabetical order after merging).
Placing in songs/playback I think is fine for now. It can always move in the future if the menu options evolve.
If you aren't available to deal with the merge conflicts, let me know and I can push it on your behalf.
Thanks. This should be good now, UIWidget issue was fixed and I resolved the merge conflicts. Did a couple quick tests with different egg counts and they went as expected. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Great!
* initial commit of relevant files * attempt to appease clang formatting * fix edge case of marine researcher dialogue being wrong with low egg counts * refactored to better use hooks and no longer touch main mm code directly * undo GameInteractor.h changes * removed useless egg checks, only need the researcher * trigger remote build * removing useless includes leftover from the old approach. * move UIWidgets for egg into existing section
Allows users to set the required zora egg count for unlocking new wave bossa nova from any value in the 1 to 7 range.
Build Artifacts