Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
d5fa56c
initial implementation
mckinlee Dec 22, 2024
6eb49f4
Merge branch 'HarbourMasters:develop' into cycle-arrows
mckinlee Dec 22, 2024
aa77ec5
update tooltip
mckinlee Dec 22, 2024
79db2d5
Merge branch 'cycle-arrows' of https://github.com/mckinlee/2ship2hark…
mckinlee Dec 22, 2024
9b4cc3e
clang format
mckinlee Dec 22, 2024
bba7cbe
Fix linux?
mckinlee Dec 22, 2024
f43a9db
how bout now?
mckinlee Dec 22, 2024
7108c35
pain
mckinlee Dec 22, 2024
383245b
...
mckinlee Dec 22, 2024
66d3059
linux fix
mckinlee Dec 22, 2024
b527c85
clang format
mckinlee Dec 22, 2024
74b48b4
add sfx, requirements, cooldown, etc.
mckinlee Dec 24, 2024
416b724
clang format
mckinlee Dec 24, 2024
f1d3dea
bug fix and remove unneeded logic
mckinlee Dec 26, 2024
fd2bd5c
bug fix for the bug fix lol
mckinlee Dec 26, 2024
9b355c1
add auto cycling when out of magic and visual/sfx indicators
mckinlee Dec 26, 2024
8f1008a
forgot about clang format as usual
mckinlee Dec 26, 2024
5530245
forgot about that while refactoring
mckinlee Dec 26, 2024
a7f1ed3
le sigh
mckinlee Dec 26, 2024
9fbb238
Feedback Changes and Refactor
mckinlee Dec 27, 2024
fc70cbe
remove VB_MAGIC_ARROW_CONSUME
mckinlee Dec 27, 2024
56f748a
add more restrictions
mckinlee Dec 31, 2024
fd2e0d3
Update mm/2s2h/Enhancements/Equipment/ArrowCycle.cpp
mckinlee Jan 6, 2025
de50fb1
Merge remote-tracking branch 'upstream/develop' into cycle-arrows
mckinlee Jan 6, 2025
368c871
Merge remote-tracking branch 'upstream/develop' into cycle-arrows
mckinlee Jan 6, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
clang format
  • Loading branch information
mckinlee committed Dec 24, 2024
commit 416b7244b4501d5c77625be4ce1c570c5dc456e2
7 changes: 3 additions & 4 deletions mm/2s2h/Enhancements/Equipment/ArrowCycle.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,9 @@ static bool canCycleArrows() {
if (INV_CONTENT(SLOT_BOW) != ITEM_BOW) {
return false;
}

// Check if player has at least one magic arrow type
return (INV_CONTENT(ITEM_ARROW_FIRE) == ITEM_ARROW_FIRE) ||
(INV_CONTENT(ITEM_ARROW_ICE) == ITEM_ARROW_ICE) ||
return (INV_CONTENT(ITEM_ARROW_FIRE) == ITEM_ARROW_FIRE) || (INV_CONTENT(ITEM_ARROW_ICE) == ITEM_ARROW_ICE) ||
(INV_CONTENT(ITEM_ARROW_LIGHT) == ITEM_ARROW_LIGHT);
}

Expand Down Expand Up @@ -191,7 +190,7 @@ void RegisterArrowCycle() {
Input* input = CONTROLLER1(&gPlayState->state);

// Don't allow cycling during magic consumption states (link is tired)
if (gSaveContext.magicState >= MAGIC_STATE_CONSUME_SETUP &&
if (gSaveContext.magicState >= MAGIC_STATE_CONSUME_SETUP &&
gSaveContext.magicState <= MAGIC_STATE_METER_FLASH_3) {
if (holdingBow(player) && CHECK_BTN_ALL(input->press.button, BTN_L)) {
Audio_PlaySfx(NA_SE_SY_ERROR);
Expand Down