github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-19 13:00:11 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix song fairy shuffle locations

Browse source
This commit is contained in:
Cameron 2025-08-06 07:36:09 -04:00
commit 6afd018b6d
No known key found for this signature in database
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
View file

@ -1023,7 +1023,7 @@ void GenerateItemPool() {
// Shuffle Song Fairies // Shuffle Song Fairies
if (ctx->GetOption(RSK_SHUFFLE_SONG_FAIRIES)) { if (ctx->GetOption(RSK_SHUFFLE_SONG_FAIRIES)) {
for (auto rc : Rando::StaticData::GetBeanFairyLocations()) { for (auto rc : Rando::StaticData::GetSongFairyLocations()) {
AddItemToMainPool(GetJunkItem()); AddItemToMainPool(GetJunkItem());
} }
// 3 Shadow Temple // 3 Shadow Temple

3
soh/soh/Enhancements/randomizer/option_descriptions.cpp
View file

@ -476,7 +476,8 @@ void Settings::CreateOptionDescriptions() {
"Overworld - Only freestanding rupees & hearts that are outside of dungeons.\n" "Overworld - Only freestanding rupees & hearts that are outside of dungeons.\n"
"\n" "\n"
"All Items - Shuffle all freestanding rupees & hearts."; "All Items - Shuffle all freestanding rupees & hearts.";
mOptionDescriptions[RSK_SHUFFLE_FOUNTAIN_FAIRIES] = "Shuffle fairies in fountain locations."; mOptionDescriptions[RSK_SHUFFLE_FOUNTAIN_FAIRIES] = "Shuffle fairies in fountain locations. "
"This includes the sets of fairies found in Ganon's Castle and the Desert Oasis.";
mOptionDescriptions[RSK_SHUFFLE_STONE_FAIRIES] = "Shuffle fairies from gossip stone locations."; mOptionDescriptions[RSK_SHUFFLE_STONE_FAIRIES] = "Shuffle fairies from gossip stone locations.";
mOptionDescriptions[RSK_SHUFFLE_BEAN_FAIRIES] = "Shuffle fairies from magic bean locations."; mOptionDescriptions[RSK_SHUFFLE_BEAN_FAIRIES] = "Shuffle fairies from magic bean locations.";
mOptionDescriptions[RSK_SHUFFLE_SONG_FAIRIES] = mOptionDescriptions[RSK_SHUFFLE_SONG_FAIRIES] =