Add missing extension trick to Shadow MQ, bombing spirit trial switch, & add non-combat giant knife logic#5983
Merged
serprex merged 1 commit intoHarbourMasters:developfrom Dec 31, 2025
Conversation
28bb277 to
963abcf
Compare
963abcf to
64b60e9
Compare
cc455e6 to
ab95f01
Compare
e51fdb6 to
fc379dc
Compare
Contributor
|
This has a conflict in Ganon's locacc now. |
fc379dc to
3c5d90d
Compare
Member
Author
fixed |
Pepper0ni
approved these changes
Dec 16, 2025
Contributor
Pepper0ni
left a comment
There was a problem hiding this comment.
While I'm happy with the content of this PR, I think we want to quickly start looking at the greater applications of giants knife in logic, which realistically means using CanJumpslash for jumpslashes and not as a shorthand for melee weapon, as one of the most basic uses of a knife is jumpslashing for movement.
That should be a different PR though.
a8029d7 to
aa627e9
Compare
Also allow Giant's Knife to logically hit these switches Ganon's Castle diamond switch can be hit with bomb by setting bomb down instead of shield dropping
Jepvid
pushed a commit
to Jepvid/Shipwright
that referenced
this pull request
Dec 31, 2025
…arbourMasters#5983) Also allow Giant's Knife to logically hit these switches Ganon's Castle diamond switch can be hit with bomb by setting bomb down instead of shield dropping
Jepvid
pushed a commit
to Jepvid/Shipwright
that referenced
this pull request
Dec 31, 2025
…arbourMasters#5983) Also allow Giant's Knife to logically hit these switches Ganon's Castle diamond switch can be hit with bomb by setting bomb down instead of shield dropping
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
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.
noticed while working on logic in #5659
Broken Giant's Knife can hit these switches too, so integrate it into logic. While we're at it also make clearing grass & stalagmites with broken giant's knife in logic. & handle buying giant's knife from medigoron in logic
Ganon's Castle diamond switch can be hit with bomb by setting bomb down instead of shield dropping. Hammer jumpslash reaches too
Also make 2 inconsequential gtg fixes
Build Artifacts