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

[Enhancement] Custom Zora Egg Count #624

Merged
merged 10 commits into from
Aug 24, 2024

Conversation

Mothstery
Copy link
Contributor

@Mothstery Mothstery commented May 31, 2024

Allows users to set the required zora egg count for unlocking new wave bossa nova from any value in the 1 to 7 range.

  • Not sure if this should be in the "songs" category, even though it does technically relate to unlocking a song. Would like some input from a senior dev on that.
  • Numeric variable instead of toggle. In case some players only want to do the pirates fortress for example, or however many bottles they have in their run at the time.

Build Artifacts

@Mothstery
Copy link
Contributor Author

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.

@garrettjoecox
Copy link
Contributor

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!

@garrettjoecox garrettjoecox added the enhancement New feature or request label Jun 2, 2024
@Mothstery Mothstery marked this pull request as draft June 3, 2024 14:35
@Mothstery Mothstery marked this pull request as ready for review June 5, 2024 23:32
@Mothstery
Copy link
Contributor Author

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.

Copy link
Contributor

@Archez Archez left a 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.

@Mothstery
Copy link
Contributor Author

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.

Copy link
Contributor

@Archez Archez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great!

@Archez Archez merged commit 136a928 into HarbourMasters:develop Aug 24, 2024
5 checks passed
mckinlee pushed a commit to mckinlee/2ship2harkinian that referenced this pull request Oct 4, 2024
* 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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants