Skip to content

fix: Song pool logic #165

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

Merged
Tacoman369 merged 3 commits into from
Jun 12, 2026
Merged

fix: Song pool logic #165

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
82814b5
fix: place Song of Time before removing songs from item pool to ensur…
ScArWlvrne Jun 9, 2026
cb3cb7e
Revert "fix: place Song of Time before removing songs from item pool …
ScArWlvrne Jun 9, 2026
b428bbc
fix: actually place Song of Time in a cNoOcarinaStart location
ScArWlvrne Jun 9, 2026
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
3 changes: 2 additions & 1 deletion source/fill.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -882,7 +882,8 @@ int Fill() {
//If Song of Time is shuffled do that first with a restricted location pool to prevent softlocks
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; });
//Pull Song of Time from songs pool instead of main pool so we actually get it placed first
std::vector<ItemKey> SoTItem = FilterAndEraseFromPool(songs, [](const ItemKey i) { return ItemTable(i).GetHintKey() == SONG_OF_TIME; });
NoRepeatOnTokens = true;
AssumedFill(SoTItem, ocarinaLocations, true);
NoRepeatOnTokens = false;
Expand Down