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

rando: vanilla dungeon rewards #4836

Merged

Conversation

serprex
Copy link
Contributor

@serprex serprex commented Jan 9, 2025

fixes #4671

exists already in ootr. becomes more useful with ootr's option to have compass tell boss reward, which a future update could add

Build Artifacts

@aMannus aMannus added this to the 9.0.0 milestone Jan 11, 2025
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.

Apart from my open question earlier, looks good to me 👍

@Pepper0ni
Copy link
Contributor

Merged in latest to test, it seems to not be properly placing the light medallion, causing generation failure with 6 med bridge.

@serprex
Copy link
Contributor Author

serprex commented Jan 25, 2025

Merged in latest to test, it seems to not be properly placing the light medallion, causing generation failure with 6 med bridge.

will have time to look into later next week if I can't find time this weekend

@serprex
Copy link
Contributor Author

serprex commented Jan 25, 2025

Issue was that location_access.cpp listed Link's Pocket instead of Gift From Rauru in dungeonRewardLocations

Gift from Rauru is the correct choice: it's the location with light medallion as it's vanilla reward. There's some talk about getting rid of Link's Pocket. Let's start by ignoring Link's Pocket for dungeon rewards being at the end of dungeons

Other choice was to remove both gift & pocket from dungeonRewardLocations, adding explicit logic everywhere dungeonRewardLocations is referenced in order to use pocket for non-vanilla options & gift for vanilla options

@serprex serprex force-pushed the rando-vanilla-dungeon-rewards branch from a356b3d to 37b54be Compare January 25, 2025 14:32
@@ -182,6 +182,7 @@ void Context::ItemReset() {
GetItemLocation(il)->ResetVariables();
}

GetItemLocation(RC_GIFT_FROM_RAURU)->ResetVariables();
Copy link
Contributor Author

@serprex serprex Jan 25, 2025

Choose a reason for hiding this comment

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

Little confused here why allLocations isn't sufficient enough to not loop over dungeonRewardLocations at all here

Copy link
Contributor

@Pepe20129 Pepe20129 left a comment

Choose a reason for hiding this comment

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

It works perfectly fine from my testing.

I also think that Link's Pocket should be removed as that's just a carryover multiple times over at this point, it does mean that you will no longer see a dungeon reward in the file before the first load but imo, that's irrelevant.

@serprex serprex force-pushed the rando-vanilla-dungeon-rewards branch from 08cb5b8 to f00c142 Compare January 29, 2025 16:34
@serprex serprex requested a review from Pepper0ni January 29, 2025 23:12
@Pepper0ni
Copy link
Contributor

I'm taking a break due to burnout until 9.0 release.

@serprex serprex requested a review from Malkierian January 30, 2025 01:19
@aMannus aMannus merged commit e7e0273 into HarbourMasters:develop Feb 3, 2025
5 checks passed
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.

Feature Request: Add a "Vanilla" option for the "Dungeon Rewards" items
5 participants