MM Bunny Hood effect separated from ability to equip as adult#3253
Merged
garrettjoecox merged 5 commits intoHarbourMasters:developfrom Oct 15, 2023
Merged
MM Bunny Hood effect separated from ability to equip as adult#3253garrettjoecox merged 5 commits intoHarbourMasters:developfrom
garrettjoecox merged 5 commits intoHarbourMasters:developfrom
Conversation
garrettjoecox
approved these changes
Oct 4, 2023
garrettjoecox
requested changes
Oct 4, 2023
Contributor
garrettjoecox
left a comment
There was a problem hiding this comment.
After some more testing, it looks like you also need this
--- a/soh/src/code/z_play.c
+++ b/soh/src/code/z_play.c
@@ -653,7 +653,7 @@ void Play_Init(GameState* thisx) {
Fault_AddClient(&D_801614B8, ZeldaArena_Display, NULL, NULL);
// In order to keep bunny hood equipped on first load, we need to pre-set the age reqs for the item and slot
- if (CVarGetInteger("gMMBunnyHood", BUNNY_HOOD_VANILLA) != BUNNY_HOOD_VANILLA || CVarGetInteger("gTimelessEquipment", 0)) {
+ if ((CVarGetInteger("gMMBunnyHood", BUNNY_HOOD_VANILLA) != BUNNY_HOOD_VANILLA && CVarGetInteger("gAdultBunnyHood", 0)) || CVarGetInteger("gTimelessEquipment", 0)) {
gItemAgeReqs[ITEM_MASK_BUNNY] = 9;
if(INV_CONTENT(ITEM_TRADE_CHILD) == ITEM_MASK_BUNNY)
gSlotAgeReqs[SLOT_TRADE_CHILD] = 9;Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
Member
Author
|
thanks hadn't thought about that! also completely forgot to look at what checkboxgraphics options there were 🤦🏼 |
…Shipwright into optional-bunny-hood
garrettjoecox
approved these changes
Oct 4, 2023
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>
DeusVexus
pushed a commit
to DeusVexus/Shipwright
that referenced
this pull request
Oct 17, 2023
…rMasters#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>
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
2 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.
Includes an option to toggle on/off the ability to equip the MM bunny hood as adult.
I decided to tie this to the MM bunny hood option so that you can only toggle this option and have it have an effect when the MM bunny hood is on, otherwise the user should probably just be using timeless equips.
Build Artifacts