Skip to content

fix: place Song of Time before removing songs from item pool #164

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.

Sign up for GitHub

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

Closed
ScArWlvrne wants to merge 1 commit into from
Closed

fix: place Song of Time before removing songs from item pool #164

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions source/fill.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -874,12 +874,12 @@ int Fill() {
RandomizeDungeonItems();

CitraPrint("Trying to place songs");

//Place Songs before inventory to prevent song locations from being used
//get Songs in pool
std::vector<ItemKey> songs = FilterAndEraseFromPool(ItemPool, [](const ItemKey i) {return ItemTable(i).GetItemType() == ITEMTYPE_SONG;});

//If Shuffled in Song Locations restrict location pool to only song locations
//If Song of Time is shuffled do that first with a restricted location pool to prevent softlocks
//Also makes sure that Song of Time isn't fitered out of the pool by building the songs vector
//first as was done in older versions
if (ShuffleSongOfTime) {
std::vector<LocationKey> ocarinaLocations = FilterFromPool(allLocations, []( const LocationKey loc) {return Location(loc)->IsCategory(Category::cNoOcarinaStart);});
std::vector<ItemKey> SoTItem = FilterAndEraseFromPool(ItemPool, [](const ItemKey i) { return ItemTable(i).GetHintKey() == SONG_OF_TIME; });
Expand All @@ -897,6 +897,11 @@ int Fill() {
AssumedFill(ocarinaItem, ocarinaLocations, true);
NoRepeatOnTokens = false;
}

//get Songs in pool after placing Song of Time so it doesn't get placed
//in a location outside the cNoOcarinaStart category
std::vector<ItemKey> songs = FilterAndEraseFromPool(ItemPool, [](const ItemKey i) {return ItemTable(i).GetItemType() == ITEMTYPE_SONG;});

//If Songs are at song locations get all song locations and place them there
if (ShuffleSongs.Value<u8>() == u8(1)){
std::vector<LocationKey> songLocations = FilterFromPool(allLocations, [](const LocationKey loc) {return Location(loc)->IsCategory(Category::cSong);});
Expand Down