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

Rando: Shuffle Beehives (Rando V3) (#3763)

Browse source 
* Shuffle Beehives

* Address review

* Fix build
This commit is contained in:
Pepe20129 2024-01-14 19:16:32 +01:00 • committed by GitHub
parent 4cbf3a5621
commit 080038c39e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
31 changed files with 505 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -153,6 +153,7 @@ void RandomizerCheckObjects::UpdateImGuiVisibility() {
RandomizerCheckObjects::AreaIsOverworld(location.GetArea())) ||
((CVarGetInteger("gRandomizeShuffleTokens", RO_TOKENSANITY_OFF) == RO_TOKENSANITY_DUNGEONS) &&
RandomizerCheckObjects::AreaIsDungeon(location.GetArea()))) &&
(location.GetRCType() != RCTYPE_BEEHIVE || CVarGetInteger("gRandomizeShuffleBeehives", RO_GENERIC_NO)) &&
(location.GetRCType() != RCTYPE_COW || CVarGetInteger("gRandomizeShuffleCows", RO_GENERIC_NO)) &&
(location.GetRCType() != RCTYPE_FISH || ctx->GetFishsanity()->GetFishLocationIncluded(&location, FSO_SOURCE_CVARS)) &&
(location.GetRCType() != RCTYPE_ADULT_TRADE ||