Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Entrance Rando v2 #2071

Merged
merged 9 commits into from
Dec 6, 2022
Merged

Entrance Rando v2 #2071

merged 9 commits into from
Dec 6, 2022

Conversation

Archez
Copy link
Contributor

@Archez Archez commented Dec 2, 2022

This continues the work for entrance randomizer, bringing in Overworld Spawns, Warp Songs, Owl Drops, and with mixed pools and decoupled entrances.

Features:

  • Overworld Spawns
  • Warp Songs
  • Owl Drops
  • Mixed pools
  • Decoupled
  • Display warp song location in text when playing songs

Most of the code is syncing the related changes from 3ds rando upstream for the entrance logic. The spoiler log is modified to write out decoupled entrance names in the entranceMap.

The new features didn't require much extra work to pull off, taking advantage of the previous entrance rando work. The logic around tracking which grotto was entered/last existed needed to be modified to account for mixed pools and overworld spaws/warp songs.

The savewarp override logic needed to be moved to the end of the init process as a spawn randomized to a grotto exit has to setup values on the respawn flags, that normally are zeroed out during init.

The warp song hint system will store and use the overridden regions hint name, otherwise if not provided (interiors or grottos) use the entrance name itself from the 3ds location code.

In randomizer settings, the options under mixed pools will disappear if mixed pools is turned off, or the corresponding entrance shuffle type isn't shuffled.

image

Build Artifacts

Copy link
Contributor

@briaguya-ai briaguya-ai left a comment

Choose a reason for hiding this comment

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

This looks great! Assuming testing went as well as you say it did @Archez let's :shipit:

@Archez
Copy link
Contributor Author

Archez commented Dec 6, 2022

Added French translations, thanks @PurpleHato

@dcvz dcvz merged commit d9f3844 into HarbourMasters:develop Dec 6, 2022
@briaguya-ai briaguya-ai mentioned this pull request Dec 21, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants