Skip to content

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
serprex:shadow-mq-extension
Dec 31, 2025
Merged

Add missing extension trick to Shadow MQ, bombing spirit trial switch, & add non-combat giant knife logic#5983
serprex merged 1 commit intoHarbourMasters:developfrom
serprex:shadow-mq-extension

Conversation

@serprex
Copy link
Copy Markdown
Member

@serprex serprex commented Nov 24, 2025

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

@serprex serprex force-pushed the shadow-mq-extension branch from 28bb277 to 963abcf Compare November 24, 2025 18:09
@serprex serprex marked this pull request as draft November 24, 2025 18:41
@serprex serprex force-pushed the shadow-mq-extension branch from 963abcf to 64b60e9 Compare November 24, 2025 18:48
@serprex serprex marked this pull request as ready for review November 24, 2025 18:49
@serprex serprex force-pushed the shadow-mq-extension branch 3 times, most recently from cc455e6 to ab95f01 Compare November 24, 2025 22:45
@serprex serprex changed the title Add missing extension trick to Shadow MQ, fix 2 logic mixups in GTG Add missing extension trick to Shadow MQ, bombing spirit trial switch, & add non-combat giant knife logic Nov 25, 2025
@serprex serprex force-pushed the shadow-mq-extension branch from e51fdb6 to fc379dc Compare November 25, 2025 18:11
@Malkierian
Copy link
Copy Markdown
Contributor

This has a conflict in Ganon's locacc now.

@serprex serprex force-pushed the shadow-mq-extension branch from fc379dc to 3c5d90d Compare December 15, 2025 20:03
@serprex
Copy link
Copy Markdown
Member Author

serprex commented Dec 15, 2025

This has a conflict in Ganon's locacc now.

fixed

Copy link
Copy Markdown
Contributor

@Pepper0ni Pepper0ni left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

@serprex serprex force-pushed the shadow-mq-extension branch 3 times, most recently from a8029d7 to aa627e9 Compare December 31, 2025 01:52
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
@serprex serprex merged commit 8cc02fd into HarbourMasters:develop Dec 31, 2025
6 checks passed
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants