[Rando] Shuffle Crates#5017
Merged
aMannus merged 85 commits intoHarbourMasters:developfrom Mar 26, 2025
Merged
Conversation
…into feature/cratesanity
…into feature/cratesanity
…into feature/cratesanity
…into feature/cratesanity
…into feature/cratesanity
aMannus
approved these changes
Mar 26, 2025
Contributor
aMannus
left a comment
There was a problem hiding this comment.
One comment just for future reference and one tiny question, looks good otherwise.
Comment on lines
+183
to
+202
| void ObjKibako2_RandomizerSpawnCollectible(ObjKibako2* crateActor, PlayState* play) { | ||
| EnItem00* item00 = (EnItem00*)Item_DropCollectible2(play, &crateActor->dyna.actor.world.pos, ITEM00_SOH_DUMMY); | ||
| item00->randoInf = crateActor->crateIdentity.randomizerInf; | ||
| item00->itemEntry = Rando::Context::GetInstance()->GetFinalGIEntry(crateActor->crateIdentity.randomizerCheck, true, GI_NONE); | ||
| item00->actor.draw = (ActorFunc)EnItem00_DrawRandomizedItem; | ||
| item00->actor.velocity.y = 8.0f; | ||
| item00->actor.speedXZ = 2.0f; | ||
| item00->actor.world.rot.y = Rand_CenteredFloat(65536.0f); | ||
| } | ||
|
|
||
| void ObjKibako_RandomizerSpawnCollectible(ObjKibako* smallCrateActor, PlayState* play) { | ||
| EnItem00* item00 = (EnItem00*)Item_DropCollectible2(play, &smallCrateActor->actor.world.pos, ITEM00_SOH_DUMMY); | ||
| item00->randoInf = smallCrateActor->smallCrateIdentity.randomizerInf; | ||
| item00->itemEntry = | ||
| Rando::Context::GetInstance()->GetFinalGIEntry(smallCrateActor->smallCrateIdentity.randomizerCheck, true, GI_NONE); | ||
| item00->actor.draw = (ActorFunc)EnItem00_DrawRandomizedItem; | ||
| item00->actor.velocity.y = 8.0f; | ||
| item00->actor.speedXZ = 2.0f; | ||
| item00->actor.world.rot.y = Rand_CenteredFloat(65536.0f); | ||
| } |
Contributor
There was a problem hiding this comment.
Once we get the extendible actor structs these can probably be combined as the randomizerInf will probably live on actor level instead of ObjKibako level.
aMannus
approved these changes
Mar 26, 2025
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.
Follows along with most features and settings for pots and grass: overworld/dungeon/all, including MQ, a custom model set, courtesy of @DanaTheElf, for when a crate holds a randomized item (including CTMC), and logic support. One additional feature is a set of GV/GF crates that aren't accessible in glitchless logic (outside of ER), but are shuffled in No Logic settings.
Thanks also to @leggettc18 for splitting up the location list to make room for the additional locations!
Build Artifacts