[Enhancement] Cycle Arrows#901
Merged
garrettjoecox merged 25 commits intoHarbourMasters:developfrom Jan 6, 2025
Merged
Conversation
Contributor
Instead of changing the behavior of magic consumption, could we instead just "give back" the consumed magic if the arrow was switched without firing? Seems like that would simplify some of the handling, like auto switching to normal arrows, since the game naturally makes magic arrows fire as normal without the proper magic. |
Co-Authored-By: Archez <Archez@users.noreply.github.com>
46 tasks
garrettjoecox
approved these changes
Jan 6, 2025
Contributor
garrettjoecox
left a comment
garrettjoecox
left a comment
There was a problem hiding this comment.
Two tiny comments otherwise LGTM. nice job keeping this isolated
Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
4 tasks
Malkierian
pushed a commit
to Malkierian/2ship2harkinian
that referenced
this pull request
Jan 23, 2025
* Allow Better SoDT to work on Night of the Final Day (HarbourMasters#913) * Allow Better SoDT to work on Night of Final Day * -1 newline * lol oops * change SoDT VB name to be more descriptive * see if this fixes clang-format * Inline vanilla conditional with GI Should call * clang-format * *long exacerbated sigh* * [Enhancement] Skip owl interactions (HarbourMasters#920) * Add enhancement to skip owl interactions * Use should hook for the owl shrine conversation * Tweak persistent bunny hood to only hide in first person for deku (HarbourMasters#924) * Minigame options for Archery & H&D (HarbourMasters#923) * [Timesaver] Faster Swamp Boat (HarbourMasters#918) * vroom vroom * fix some oversights * feedback update Co-Authored-By: Garrett Cox <garrettjcox@gmail.com> --------- Co-authored-by: Garrett Cox <garrettjcox@gmail.com> * Skip Monkey Encounter (HarbourMasters#921) * go away monkies * feedback update Co-Authored-By: Garrett Cox <garrettjcox@gmail.com> --------- Co-authored-by: Garrett Cox <garrettjcox@gmail.com> * [Enhancement] Cycle Arrows (HarbourMasters#901) * initial implementation * update tooltip * clang format * Fix linux? * how bout now? * pain * ... * linux fix Co-Authored-By: sitton76 <58642183+sitton76@users.noreply.github.com> * clang format * add sfx, requirements, cooldown, etc. * clang format * bug fix and remove unneeded logic * bug fix for the bug fix lol * add auto cycling when out of magic and visual/sfx indicators * forgot about clang format as usual * forgot about that while refactoring * le sigh * Feedback Changes and Refactor Co-Authored-By: Archez <Archez@users.noreply.github.com> * remove VB_MAGIC_ARROW_CONSUME * add more restrictions * Update mm/2s2h/Enhancements/Equipment/ArrowCycle.cpp Co-authored-by: Garrett Cox <garrettjcox@gmail.com> --------- Co-authored-by: sitton76 <58642183+sitton76@users.noreply.github.com> Co-authored-by: Archez <Archez@users.noreply.github.com> Co-authored-by: Garrett Cox <garrettjcox@gmail.com> * Set Sample rate to 32 Khz (HarbourMasters#916) * Set Sample rate to 32 Khz * format * review * Update mm/2s2h/BenPort.cpp --------- Co-authored-by: Garrett Cox <garrettjcox@gmail.com> * Refactor the monkey skip to fix some issues (HarbourMasters#926) * fix c-right (HarbourMasters#927) * Allow reset when in any game state (HarbourMasters#929) * Cleanup so things around the save manager (HarbourMasters#930) * Proper fix to masks showing in first person, and apply it to hyrule warriors enhancement (HarbourMasters#931) * Add EasyFrameAdvance cheat (HarbourMasters#932) * Add enums for sram and save file magic values (HarbourMasters#933) * Add simulated input lag option and a blurb about the bindings window (HarbourMasters#934) * [Enhancement]: Add File Slot 3 (HarbourMasters#900) * [Enhancement]: File Slot 3 * Log out save file imports and reset file select state * Prevent Faster Song Playback During Cutscenes (HarbourMasters#936) * Prevent Faster Song Playback During Cutscenes * Fix toto balad edge case * Port difficulty options from SoH (HarbourMasters#938) * Add default value to Right Stick Invert Y (HarbourMasters#943) * Fix ocarina inputs being dropped at the start of playback (HarbourMasters#941) * Fix ocarina inputs being dropped at the start of playback * Port dropped ocarina inputs patch from Recomp * Goron Rolling Enhancements (HarbourMasters#942) * Goron rolling enhancements * Clang pls * CLANG!? * OK clang you wanna talk about this? * Add infinite deku hop (HarbourMasters#940) * [Cosmetic Editor] Implements Initial Cosmetic Editor (HarbourMasters#886) * Initial Cosmetic Editor Commit * Adds Reset All and Randomize All Options * Cleanup Work * Prefixed sModifiedColor * Replace button modifications with pattern similar to the others. * Cleanup, forgot some entries * update funcs to pass element id * drop with from override funcs * update include paths * add minimap and rename items to hud --------- Co-authored-by: Archez <archez39@me.com> * Convert End of Cycle enhancements to ShipInit (HarbourMasters#945) * convert end of cycle hooks to ship init * fix sot cs ammo drops * remove unneeded stuff * Fix twinmold giant scale factor not clearing on reset (HarbourMasters#954) * Ensure Constant Distance restoration only affects sidehops & backflips (HarbourMasters#953) * Add restoration for pause buffer input window (HarbourMasters#951) * Fix snowhead snowball being placed out of bounds (HarbourMasters#950) * Fix interpolation on chu revive animation (HarbourMasters#959) * Fix Persistent Bunny Hood losing color with other masks (HarbourMasters#961) * Fix persistent bunny hood losing color with other masks * add fix to prevent applying persistent bunnyhood to kafei --------- Co-authored-by: zodiac-ill <109762907+zodiac-ill@users.noreply.github.com> Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> Co-authored-by: mckinlee <mckinlee@ymail.com> Co-authored-by: sitton76 <58642183+sitton76@users.noreply.github.com> Co-authored-by: Archez <Archez@users.noreply.github.com> Co-authored-by: Alejandro Asenjo Nitti <96613413+sonicdcer@users.noreply.github.com> Co-authored-by: aMannus <mannusmenting@gmail.com> Co-authored-by: Caladius <Caladius@users.noreply.github.com> Co-authored-by: Archez <archez39@me.com> Co-authored-by: balloondude2 <55861555+balloondude2@users.noreply.github.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
3 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.
This enhancement adds a quick arrow cycling feature that lets players switch between Normal, Fire, Ice, and Light Arrows by pressing L while holding the bow. It includes a button-flash effect for visual feedback, and takes care of magic usage by refunding magic if you switch away from a magic arrow before firing. Additional checks ensure arrow cycling won’t interfere with minigames or other in-game states. Minimap toggle is disabled while cycling.
Build Artifacts