Rando v2 - #450
Open
aMannus wants to merge 11 commits into
Open
Conversation
* Added types and basic functionality * Added checks to regions for logic * Added extra lives to Checks.cpp * Fixed bundle support for extra life in MM and RBB
* Shuffle Blue Eggs - MM PoC * clang * Add Blue Eggs to the shuffle pool * clang * clean up * Move options in Rando Menu * clang again
* Added functionality to shuffle honeycombs from beehives * Added logic to each region for Beehive Shuffle Deleted an extra check for FP Witch Switch in GruntildasLair.cpp Moved Extra Life Shuffle to advanced shuffle menu * Adjusted name for option in LighthouseMenuRando.cpp
* Eliminate shuffledObject (HarbourMasters#239) * Fixed Check Tracker to solve slowdown issues (HarbourMasters#241) * Custom collectible * it builds now * Fix spawn code under Gameplay Tools * Not working pulling functions from map * Added semi working draw stuff * GL warps added to debug (HarbourMasters#242) * [RANDO] Develop rando v2 extra lives (HarbourMasters#244) * Added types and basic functionality * Added checks to regions for logic * Added extra lives to Checks.cpp * Fixed bundle support for extra life in MM and RBB * Vanilla sprites and models work now * [RANDO V2] Shuffle Blue Eggs (HarbourMasters#245) * Shuffle Blue Eggs - MM PoC * clang * Add Blue Eggs to the shuffle pool * clang * clean up * Move options in Rando Menu * clang again * Custom models working but update function doesn't always * Fix broken actor info referencing and cleanup * [RANDO] Develop rando v2 beehive shuffle (HarbourMasters#249) * Added functionality to shuffle honeycombs from beehives * Added logic to each region for Beehive Shuffle Deleted an extra check for FP Witch Switch in GruntildasLair.cpp Moved Extra Life Shuffle to advanced shuffle menu * Adjusted name for option in LighthouseMenuRando.cpp * Switch focus to molehills + AP items only * Custom actor mostly done, item queue half done * More item gives done * Start work on jinjos * More draw work * AP item improvements, more item queue work * Randomized props fully replaced * Fix saving * Shuffle molehills with custom collectible * Clean up rando molehills * Implemented jiggies * Fix build post merge * Fix jiggies, implement jinjos * Finish jinjos * implement bundles + mumbo tokens * Handle honeycombs and extra lives * Remove rando junk options * Fix jiggie totals and bundle crash * Clang * Fix includes * Fix animations * Fix build hopefully --------- Co-authored-by: Douglas Simpson <scorched11@gmail.com> Co-authored-by: Fredomato <86324131+Fredomato@users.noreply.github.com> Co-authored-by: Caladius <Caladius@users.noreply.github.com>
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
5 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.
Has some commits from develop-splitrock so we may want to merge in that first after we're done with merging everything for Delta, but it looks like I fixed all the git shenanigans properly in this branch.
PLEASE NO SQUASH