Fix logic placing item on saving carpenters when carpenters start free#6661
Merged
serprex merged 2 commits intoMay 31, 2026
Merged
Conversation
Set flag on savefile, fill location when freed, don't junk check when card shuffled
serprex
commented
May 31, 2026
| if (gals.resetSphere) { | ||
| gals.resetSphere = false; | ||
| i = -1; | ||
| i = 0; |
Member
Author
There was a problem hiding this comment.
this is fixing unrelated issue where size_t is unsigned so this would effectively break from loop, rendering this optimization inept
serprex
commented
May 31, 2026
Comment on lines
1012
to
+1015
| std::erase_if(itemPool, [](const auto i) { | ||
| return Rando::StaticData::RetrieveItem(i).GetItemType() == ITEMTYPE_DUNGEONREWARD; | ||
| }); | ||
| AssumedFill(rewards, Rando::StaticData::dungeonRewardLocations); |
Member
Author
There was a problem hiding this comment.
@Pepper0ni pulling this fix from #5659 where this ran into same problem where closed door of time failed to generate seeds. AssumedFill would think itemPool has stones & end up placing stones on Morpha or whatever, causing generation to fail consistently
serprex
commented
May 31, 2026
| // Gerudo Membership Card | ||
| if (ctx->GetOption(RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD)) { | ||
| AddItemToPool(RG_GERUDO_MEMBERSHIP_CARD, 2, 1, 1, 1); | ||
| if (ctx->GetOption(RSK_GERUDO_FORTRESS).IsNot(RO_GF_CARPENTERS_FREE)) { |
Member
Author
There was a problem hiding this comment.
this seems like an existing bug that'd always junk freeing carpenters when card shuffled. These checks shouldn't be coupled, so moved junking freeing carpenters to when carpenters start freed
serprex
force-pushed
the
fix-freed-carpenter-logic
branch
from
582ec60 to
09516be
Compare
Pepper0ni
approved these changes
May 31, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Set flag on savefile, fill location when freed, don't junk check when card shuffled
fixes #6652
Build Artifacts