Equip Tunic and Boots while performing most actions#3239
Merged
garrettjoecox merged 3 commits intoHarbourMasters:developfrom Oct 15, 2023
Merged
Equip Tunic and Boots while performing most actions#3239garrettjoecox merged 3 commits intoHarbourMasters:developfrom
garrettjoecox merged 3 commits intoHarbourMasters:developfrom
Conversation
todo: find an appropriate place to first put Player_AssignTunicBoots
Contributor
|
sounds like this one addresses #623 |
Member
Author
|
Undrafting now, feel better about placement of the function being just after the player actionFunc (this->func_674) is called in the players update, and testing on my end has been successful. |
Archez
reviewed
Oct 2, 2023
garrettjoecox
approved these changes
Oct 4, 2023
|
|
||
| if (!(this->stateFlags3 & PLAYER_STATE3_PAUSE_ACTION_FUNC)) { | ||
| this->func_674(this, play); | ||
| Player_UseTunicBoots(this, play); |
Contributor
There was a problem hiding this comment.
My only question is, could we just place this in a PlayerUpdate hook?
Member
Author
There was a problem hiding this comment.
Im not sure exactly where that hook is, but i think its preferrable to have it here since state flags change variously throughout the player update function. If it turns out to not matter then id be happy for that too
garrettjoecox
added a commit
that referenced
this pull request
Oct 16, 2023
* typo on asset attribute for pal1.1 (#3264) * typo on asset attribute * base address fix * [Cosmetic] Adds Bunny Hood to Cosmetic Editor (#3245) * Color and Invisible Checkbox GI model crashes when talking to mask salesman * Update z_player.c Co-authored-by: Garrett Cox <garrettjcox@gmail.com> * Update z_player.c Co-authored-by: Garrett Cox <garrettjcox@gmail.com> * Move bunny hood coloring to patch --------- Co-authored-by: Garrett Cox <garrettjcox@gmail.com> * redicle -> reticle (#3257) * Equip Tunic and Boots while performing most actions (#3239) * tunics and boot equips initial todo: find an appropriate place to first put Player_AssignTunicBoots * move to more appropriate place * assign -> use * [Difficulty Options] All Dogs are Richard (#3243) * Oops, all Richards! * Sure is * Randomizer - Colored hints (#3259) * Colored hints * Missed 2 french translations * add save editor field for current b button item (#3262) * TWEAK: Add transition to the Time Travel feature (#3276) * ADD/ Proper Transition * REM: Dupe * MM Bunny Hood effect separated from ability to equip as adult (#3253) * adult separator * use cross instead of checkmark Co-authored-by: Garrett Cox <garrettjcox@gmail.com> * suggested load fix --------- Co-authored-by: Garrett Cox <garrettjcox@gmail.com> --------- Co-authored-by: Adam Bird <Archez@users.noreply.github.com> Co-authored-by: Patrick12115 <115201185+Patrick12115@users.noreply.github.com> Co-authored-by: inspectredc <78732756+inspectredc@users.noreply.github.com> Co-authored-by: aMannus <mannusmenting@gmail.com> Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>
Merged
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Takes the equipping of tunic and boots out of the other item equipping flow and sets own restrictions for when tunics and boots can be equipped.
This now allows for boots/tunic to be equipped while: Shielding, Rolling, Holding explosives
This does not let the player equip boots/tunic while: Playing ocarina, pausing, in a cutscene, has a textbox open
Planning on figuring out the most appropriate place to put the Player_AssignTunicBoots function in the code but otherwise happy with it functionally (although will need more testing).
Build Artifacts