Skip to content

Freestanding Rupees/Hearts Shuffle#4686

Merged
Malkierian merged 40 commits intoHarbourMasters:developfrom
Pepper0ni:Freestanding
Dec 22, 2024
Merged

Freestanding Rupees/Hearts Shuffle#4686
Malkierian merged 40 commits intoHarbourMasters:developfrom
Pepper0ni:Freestanding

Conversation

@Pepper0ni
Copy link
Contributor

@Pepper0ni Pepper0ni commented Dec 14, 2024

#4297 revived, thanks to @boomshroom for starting this off. I just patched up the logic a bit after merging latest and fixing the conflicts. I did some other logic fixes I noticed at the same time while I was there.

2 known issues are keeping this in draft until they are patched up:
- There's a shared flag between a freestanding in DMC and a pot
- There's an issue with 2 checks in shadow being mistaken for each other.

Converting every freestanding rupee and heart to identify based on location should have solved the above, the branch just needs playtesting to make sure there's no typos or side effects to that change

Build Artifacts

boomshroom and others added 30 commits August 7, 2024 18:00
This does not include the spinning pots rupees, even though
they're included with freestanding rupees in the N64 randomizer
as they would require dedicated overrides for the code for
the pots in question.
@boomshroom
Copy link
Contributor

Those two issues are really the same issue, just in two different places. It's honestly a little surprising that I haven't seen it anywhere else. Without modifying the vanilla scene, the only way I can think to resolve them is to use location instead of params to identify the items in question, except currently the presence of a flag is how it decides whether to use params or location. Fixing these two items would require either special casing or making every freestanding heart or rupee use location instead of params.

Copy link
Contributor

@aMannus aMannus left a comment

Choose a reason for hiding this comment

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

Will review more thoroughly at some point but just noticed this.

@Pepper0ni Pepper0ni marked this pull request as ready for review December 17, 2024 17:01
@ScorelessPine
Copy link

After completing a seed, here are all the freestanding heart/rupee locations I found that did not seem to collect properly:
Graveyard - Dampe's Grave Rupee 6 (fixed in db55bd5)
Graveyard - Dampe's Grave Rupee 8 (fixed in db55bd5)
Zora's River - Beneath Domain Red Middle Left Rupee (Potentially might be clashing with Beneath Domain Red Left Rupee, I thought middle left was the one that showed an item collected and far left wasn't, but am not entirely sure)
Deku Tree - Lobby Upper Heart
Forest Temple - Well West Heart
Ganon's Castle MQ - MQ Light Trial Right Heart

According to the check tracker I seemed to have collected all the rest of them just fine, though I had 4 MQ dungeons this seed, and did skip Ice Cavern MQ due to it being junk, so for the dungeon variants I did not play through, I can't verify those locations.

@Pepper0ni
Copy link
Contributor Author

All 4 of those should be fixed now

@Malkierian Malkierian merged commit 9ea9100 into HarbourMasters:develop Dec 22, 2024
Pepper0ni added a commit to Pepper0ni/Shipwright that referenced this pull request Dec 23, 2024
* Enable freestanding items other than heart pieces and keys

* Add option to disable freestanding rupee & heart shuffle

* Add items to pool

* Actually add shuffle setting

* Define overworld locations

* Add logic for overworld freestanding checks

* Add freestanding items for child dungeons.

* Add checks for Ice Cavern and Bottom of the Well

* Add checks for Forest Temple and Gerudo Training Grounds

* Add checks for Fire Temple and Water Temple

* Add Shadow Temple checks

This does not include the spinning pots rupees, even though
they're included with freestanding rupees in the N64 randomizer
as they would require dedicated overrides for the code for
the pots in question.

* Define Spirit Temple and Ganon's Castle hearts

* Add remaining checks to dungeon definitions

* Fix missing logic

* Add freestanding checks to Save Flags Editor

* Fix flags for Zora Fountain underwater rupees

* Add option to enable freestanding shuffle for either dungeons or overworld

* Add missing MQ checks and fix mac & windows compile error

* Improve description and add hint text

* Update logic for Bombchu fixes

* Add missing Spirit Temple MQ hearts

* Add missing settings entries

* Actually add Forest Temple trick to the tricks menu.

* Re-add Ice Cavern lobby rupee

* go over MQ logic

* review logic on non-MQ checks

* convert all freestandings to location based

* add option enum and fix jabu exit logic

* fix mislocated freestandings

* fix mislocted freestandings

* Fix some mislocationed checks

---------

Co-authored-by: Angel Bulfone <mbulfone@gmail.com>
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.

6 participants