Fix: Various Rando generation crashes #3108
Merged
Conversation
This file contains 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
garrettjoecox
approved these changes
Aug 7, 2023
briaguya-ai
approved these changes
Aug 10, 2023
Comment on lines
550
to
558
| while (!locations.empty() && (!endOnItemsEmpty || !items.empty())) { | ||
| uint32_t loc = RandomElement(locations, true); | ||
| Location(loc)->SetAsHintable(); | ||
| PlaceItemInLocation(loc, RandomElement(items, true)); | ||
|
|
||
| if (items.empty() && !endOnItemsEmpty) { | ||
| items.push_back(GetJunkItem()); | ||
| } | ||
|
|
||
| uint32_t loc = RandomElement(locations, true); | ||
| Location(loc)->SetAsHintable(); | ||
| PlaceItemInLocation(loc, RandomElement(items, true)); | ||
| } |
There was a problem hiding this comment.
is this a change that needs to be PR'd to 3drando or is it a fix from 3drando that we didn't have yet?
There was a problem hiding this comment.
This change is not in 3drando, and could be upstreamed
leggettc18
approved these changes
Aug 12, 2023
|
Re-adding merge ready label as criteria is now met (3 approvals & 3+ days since first) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes possible rando generation crashes by:
I also made it so the rando gen success sound (horse goal) only plays when the seed generates correctly. If it fails, it now plays an error tone (failed ocarina song).
Build Artifacts