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

tracker etc

Browse source
This commit is contained in:
Demur Rumed 2025-07-07 16:51:04 +00:00
commit 4b27c42e55
3 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
soh/soh/Enhancements/randomizer/context.cpp
View file

@ -194,6 +194,7 @@ void Context::GenerateLocationPool() {
(location.GetRCType() == RCTYPE_FAIRY && !mOptions[RSK_SHUFFLE_FAIRIES]) || (location.GetRCType() == RCTYPE_FAIRY && !mOptions[RSK_SHUFFLE_FAIRIES]) ||
(location.GetRCType() == RCTYPE_FREESTANDING && (location.GetRCType() == RCTYPE_FREESTANDING &&
mOptions[RSK_SHUFFLE_FREESTANDING].Is(RO_SHUFFLE_FREESTANDING_OFF)) || mOptions[RSK_SHUFFLE_FREESTANDING].Is(RO_SHUFFLE_FREESTANDING_OFF)) ||
(location.GetRCType() == RCTYPE_SILVER && !mOptions[RSK_SHUFFLE_SILVER]) ||
(location.GetRCType() == RCTYPE_BEEHIVE && !mOptions[RSK_SHUFFLE_BEEHIVES])) { (location.GetRCType() == RCTYPE_BEEHIVE && !mOptions[RSK_SHUFFLE_BEEHIVES])) {
continue; continue;
} }

2
soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp
View file

@ -175,6 +175,8 @@ void RandomizerCheckObjects::UpdateImGuiVisibility() {
((CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleFreestanding"), RO_SHUFFLE_FREESTANDING_OFF) == ((CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleFreestanding"), RO_SHUFFLE_FREESTANDING_OFF) ==
RO_SHUFFLE_FREESTANDING_DUNGEONS) && RO_SHUFFLE_FREESTANDING_DUNGEONS) &&
RandomizerCheckObjects::AreaIsDungeon(location.GetArea()))) && RandomizerCheckObjects::AreaIsDungeon(location.GetArea()))) &&
(location.GetRCType() != RCTYPE_SILVER ||
CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleSilver"), RO_GENERIC_NO)) &&
(location.GetRCType() != RCTYPE_BEEHIVE || (location.GetRCType() != RCTYPE_BEEHIVE ||
CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleBeehives"), RO_GENERIC_NO)) && CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleBeehives"), RO_GENERIC_NO)) &&
(location.GetRCType() != RCTYPE_COW || (location.GetRCType() != RCTYPE_COW ||

4
soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
View file

@ -56,6 +56,7 @@ bool showBeehives;
bool showCows; bool showCows;
bool showOverworldFreestanding; bool showOverworldFreestanding;
bool showDungeonFreestanding; bool showDungeonFreestanding;
bool showSilver;
bool showAdultTrade; bool showAdultTrade;
bool showKokiriSword; bool showKokiriSword;
bool showMasterSword; bool showMasterSword;
@ -1505,6 +1506,8 @@ void LoadSettings() {
showDungeonFreestanding = false; showDungeonFreestanding = false;
break; break;
} }
showSilver = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_SILVER);
} else { // Vanilla } else { // Vanilla
showOverworldFreestanding = false; showOverworldFreestanding = false;
showDungeonFreestanding = true; showDungeonFreestanding = true;
@ -1583,6 +1586,7 @@ bool IsCheckShuffled(RandomizerCheck rc) {
(loc->GetRCType() != RCTYPE_FREESTANDING || (loc->GetRCType() != RCTYPE_FREESTANDING ||
(showOverworldFreestanding && RandomizerCheckObjects::AreaIsOverworld(loc->GetArea())) || (showOverworldFreestanding && RandomizerCheckObjects::AreaIsOverworld(loc->GetArea())) ||
(showDungeonFreestanding && RandomizerCheckObjects::AreaIsDungeon(loc->GetArea()))) && (showDungeonFreestanding && RandomizerCheckObjects::AreaIsDungeon(loc->GetArea()))) &&
(loc->GetRCType() != RCTYPE_SILVER || showSilver) &&
(loc->GetRCType() != RCTYPE_ADULT_TRADE || showAdultTrade || (loc->GetRCType() != RCTYPE_ADULT_TRADE || showAdultTrade ||
rc == RC_KAK_ANJU_AS_ADULT || // adult trade checks that are always shuffled rc == RC_KAK_ANJU_AS_ADULT || // adult trade checks that are always shuffled
rc == RC_DMT_TRADE_CLAIM_CHECK // even when shuffle adult trade is off rc == RC_DMT_TRADE_CLAIM_CHECK // even when shuffle adult trade is off