Skip to content

Randomizer Location Exclusion List#2070

Merged
briaguya0 merged 6 commits intoHarbourMasters:developfrom
sonoftunk:SoH1620
Dec 10, 2022
Merged

Randomizer Location Exclusion List#2070
briaguya0 merged 6 commits intoHarbourMasters:developfrom
sonoftunk:SoH1620

Conversation

@sonoftunk
Copy link
Contributor

@sonoftunk sonoftunk commented Dec 2, 2022

Most fixes for #1620

  • Adds Scrubs, Merchants, Shops. Adult Trade items, MQ Dungeons, and Bean Salesman
  • Fixes Kokiri Sword Chest, Weird Egg, and Frog Song Rupees from misbehaving
  • Updates Gerudo Fortress logic to be dependent on Open/Fast/Normal Fortress
  • Removes Invalid Check
  • Adds RO Enum for MQ settings
  • Updates magic values to RO enum

Build Artifacts

- Adds Scrubs, Merchants, Shops. Adult Trade items, MQ Dungeons, and Bean Salesman
- Fixes Kokiri Sword Chest, Weird Egg, and Frog Song Rupees from misbehaving
- Updates Gerudo Fortress logic to be dependent on Open/Fast/Normal Fortress
- Removes Invalid Check
- Adds RO Enum for MQ settings
- Updates magic values to RO enum
@sonoftunk
Copy link
Contributor Author

@garrettjoecox
Copy link
Contributor

Great work here thanks for doing this!

@briaguya0 briaguya0 added the do not merge Not ready or not valid changes label Dec 5, 2022
@briaguya0
Copy link
Contributor

scrubsanity off still had 3 of the scrubs with items to collect.

once this is taken care of i'll remove the do not merge label, mq cleanup can be done as a separate PR if you'd like

@sonoftunk
Copy link
Contributor Author

once this is taken care of i'll remove the do not merge label, mq cleanup can be done as a separate PR if you'd like

Those 3 scrubs now show always in the exclusion list as per 467131e.

I realized that I leaked some of my code for the Check Tracker in there. While not directly harmful, the RAND_INF flags being added aren't required for this code. This is resolved by e75f971.

@briaguya0
Copy link
Contributor

@sonoftunk is there anything else you're still wrapping up on this one or is it ready for a final look through?

@sonoftunk
Copy link
Contributor Author

sonoftunk commented Dec 6, 2022 via email

… Merge conflict caused by this PR and another PR both adding MQ dungeon count enums.
@briaguya0 briaguya0 removed the do not merge Not ready or not valid changes label Dec 8, 2022
Copy link
Contributor

@briaguya0 briaguya0 left a comment

Choose a reason for hiding this comment

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

couple tiny changes then this should be good to go

Location Exclusion List - Applies suggested dungeon item defaults

Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
@sonoftunk sonoftunk mentioned this pull request Dec 10, 2022
8 tasks
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.

3 participants