mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-08-22 07:04:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

[Rando] Shuffle Butterfly Fairies (#6430)

Browse Source
This commit is contained in:
A Green Spoon
2026-03-29 16:54:01 +09:00
committed by GitHub
parent e0a1b23525
commit a461d8f6fb
22 changed files with 145 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
+6
View File
@@ -84,6 +84,7 @@ bool showFountainFairies;
bool showStoneFairies;
bool showBeanFairies;
bool showSongFairies;
bool showButterflyFairies;
bool showStartingMapsCompasses;
bool showKeysanity;
bool showGerudoFortressKeys;
@@ -1361,6 +1362,10 @@ void LoadSettings() {
showSongFairies =
IS_RANDO ? OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_SONG_FAIRIES) == RO_GENERIC_YES
: false;
showButterflyFairies =
IS_RANDO
? OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_BUTTERFLY_FAIRIES) == RO_GENERIC_YES
: false;
showStartingMapsCompasses = IS_RANDO ? OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(
RSK_SHUFFLE_MAPANDCOMPASS) != RO_DUNGEON_ITEM_LOC_VANILLA
: false;
@@ -1611,6 +1616,7 @@ bool IsCheckShuffled(RandomizerCheck rc) {
(loc->GetRCType() != RCTYPE_STONE_FAIRY || showStoneFairies) &&
(loc->GetRCType() != RCTYPE_BEAN_FAIRY || showBeanFairies) &&
(loc->GetRCType() != RCTYPE_SONG_FAIRY || showSongFairies) &&
(loc->GetRCType() != RCTYPE_BUTTERFLY_FAIRY || showButterflyFairies) &&
(loc->GetRCType() != RCTYPE_SMALL_KEY || showKeysanity) &&
(loc->GetRCType() != RCTYPE_BOSS_KEY || showBossKeysanity) &&
(loc->GetRCType() != RCTYPE_GANON_BOSS_KEY || showGanonBossKey) &&