Skip to content

Always use dungeon specific items#3041

Merged
garrettjoecox merged 1 commit intoHarbourMasters:developfrom
garrettjoecox:always-use-dungeon-specific
Aug 7, 2023
Merged

Always use dungeon specific items#3041
garrettjoecox merged 1 commit intoHarbourMasters:developfrom
garrettjoecox:always-use-dungeon-specific

Conversation

@garrettjoecox
Copy link
Contributor

@garrettjoecox garrettjoecox commented Jun 26, 2023

Need this for #3016

This makes it to where we are always using dungeon specific item IDs in rando, rather than optionally based on settings.
We're now optionally rendering the message and key colors depending on those settings.

This allows us to give dungeon items outside of their dungeon scene (necessary for boss entrance rando and upcoming dungeon reward changes in #3016)

Build Artifacts

@garrettjoecox garrettjoecox force-pushed the always-use-dungeon-specific branch from 7653835 to 325dd80 Compare June 26, 2023 19:35
@Archez
Copy link
Contributor

Archez commented Jun 26, 2023

In the scenario of OWN_DUNGEON and Boss room shuffle, would we want the keys colored and using dungeon specific text, or are we ok with the generic text/no color?

I'm fine either way. If we wanted to make it use color/custom text to avoid confusion, we may have to do an ER and scene check for boss rooms, which adds complexity.

@garrettjoecox
Copy link
Contributor Author

In the scenario of OWN_DUNGEON and Boss room shuffle, would we want the keys colored and using dungeon specific text, or are we ok with the generic text/no color?

IMO I don't think it's necessary, and the keytracker will sort out any questions anyway.

After #3016 any keys/maps/compasses that end up being the dungeon reward will also have this ... problem? I think the playerbase will get used to it.

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.

much cleaner than what was there before! some of the RSK names sounds a bit odd when reading them with DUNGEON_ITEMS_CAN_BE_OUTSIDE_DUNGEON but that's not an issue.

:shipit:

Comment on lines +328 to +331
#define DUNGEON_ITEMS_CAN_BE_OUTSIDE_DUNGEON(randomizerSettingsKey) \
(Randomizer_GetSettingValue(randomizerSettingsKey) != RO_DUNGEON_ITEM_LOC_STARTWITH && \
Randomizer_GetSettingValue(randomizerSettingsKey) != RO_DUNGEON_ITEM_LOC_VANILLA && \
Randomizer_GetSettingValue(randomizerSettingsKey) != RO_DUNGEON_ITEM_LOC_OWN_DUNGEON)
Copy link
Contributor

Choose a reason for hiding this comment

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

beautiful! explicit and descriptive!

@garrettjoecox garrettjoecox force-pushed the always-use-dungeon-specific branch from 325dd80 to aa93c0f Compare July 3, 2023 03:28
@garrettjoecox garrettjoecox merged commit b2aa24b into HarbourMasters:develop Aug 7, 2023
@garrettjoecox garrettjoecox deleted the always-use-dungeon-specific branch August 7, 2023 01:58
louist103 pushed a commit to louist103/Shipwright-1 that referenced this pull request Aug 11, 2023
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