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.

Sign up for GitHub

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

Jump to bottom

[Enhancement] Adds options for when the deku palace guard search balls will appear #866

Merged
merged 5 commits into from
Nov 26, 2024
Merged

[Enhancement] Adds options for when the deku palace guard search balls will appear #866

merged 5 commits into from
Nov 26, 2024

Conversation

lscholte
Copy link
Contributor

@lscholte lscholte commented Nov 18, 2024 •
edited by github-actions bot
Loading

This addresses #860

I have added 3 options for when the deku palace guard search balls will appear:

  • An option to never show them, aligning with MM3D behaviour
  • An option to only show them at night, aligning with original N64 behaviour
  • An option to always show them, which I thought may have some value to people who may want an easier time navigating the palace without waiting until night

I am not sure if this belongs under restorations or elsewhere. It also kinda feels like it could fit under difficulty options.

Build Artifacts

Archez
Archez reviewed Nov 18, 2024
View reviewed changes
mm/2s2h/Enhancements/Restorations/DekuGuardSearchBalls.cpp Outdated Show resolved Hide resolved
mm/2s2h/Enhancements/Enhancements.h Outdated Show resolved Hide resolved
mm/2s2h/GameInteractor/GameInteractor.h Outdated Show resolved Hide resolved
@Archez
Copy link
Contributor

Archez commented Nov 25, 2024

Code wise I think this is in a good spot.

Regarding Restorations vs Difficulty Options in the menu, I think I am leaning towards this being moved to Difficulty Options. That would also align with a similar setting in SoH for the child stealth guard search balls.

garrettjoecox
garrettjoecox approved these changes Nov 26, 2024
View reviewed changes
Copy link
Contributor

@garrettjoecox garrettjoecox left a comment

Choose a reason for hiding this comment

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

I also think difficulty options makes more sense 👍 otherwise LGTM great work

mm/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.c Outdated Show resolved Hide resolved
@lscholte
Copy link
Contributor Author

I have moved the this enhancement to difficulty options as requested.

@lscholte lscholte force-pushed the deku-guard-search-balls branch from 3816ec1 to d93a939 Compare November 26, 2024 02:57
@lscholte
Merge branch 'develop' of https://github.com/lscholte/2ship2harkinian …
1c3167b 
…into deku-guard-search-balls

# Conflicts:
#	mm/2s2h/GameInteractor/GameInteractor.h
@lscholte
Remove unused variadic argument
b300bad
@Archez Archez linked an issue Nov 26, 2024 that may be closed by this pull request
Deku Guard vision particles visible at night #860
Closed
4 tasks
@Archez Archez merged commit af0ea33 into HarbourMasters:develop Nov 26, 2024
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@garrettjoecox garrettjoecox garrettjoecox approved these changes

@Archez Archez Archez approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Deku Guard vision particles visible at night
3 participants
@lscholte @Archez @garrettjoecox