mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-12-18 22:32:19 -05:00
Code Issues Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
aMannus 2024-01-05 17:04:18 +01:00
parent 8c78154aff
commit 350d521c82
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
View File

@ -759,7 +759,7 @@ void GenerateItemPool() {
} else if (ctx->GetOption(RSK_SHUFFLE_POTS).Is(RO_SHUFFLE_POTS_DUNGEONS)) { } else if (ctx->GetOption(RSK_SHUFFLE_POTS).Is(RO_SHUFFLE_POTS_DUNGEONS)) {
for (RandomizerCheck loc : ctx->GetLocations(ctx->allLocations, Category::cPot)) { for (RandomizerCheck loc : ctx->GetLocations(ctx->allLocations, Category::cPot)) {
if (Rando::StaticData::GetLocation(loc)->IsOverworld()) { if (Rando::StaticData::GetLocation(loc)->IsOverworld()) {
ctx->PlaceItemInLocation((RandomizerCheck)loc, RG_GREEN_RUPEE, false, true); ctx->PlaceItemInLocation(loc, RG_GREEN_RUPEE, false, true);
} else { } else {
AddItemToMainPool(RG_GREEN_RUPEE); AddItemToMainPool(RG_GREEN_RUPEE);
} }
@ -767,7 +767,7 @@ void GenerateItemPool() {
} else if (ctx->GetOption(RSK_SHUFFLE_POTS).Is(RO_SHUFFLE_POTS_OVERWORLD)) { } else if (ctx->GetOption(RSK_SHUFFLE_POTS).Is(RO_SHUFFLE_POTS_OVERWORLD)) {
for (RandomizerCheck loc : ctx->GetLocations(ctx->allLocations, Category::cPot)) { for (RandomizerCheck loc : ctx->GetLocations(ctx->allLocations, Category::cPot)) {
if (Rando::StaticData::GetLocation(loc)->IsDungeon()) { if (Rando::StaticData::GetLocation(loc)->IsDungeon()) {
ctx->PlaceItemInLocation((RandomizerCheck)loc, RG_GREEN_RUPEE, false, true); ctx->PlaceItemInLocation(loc, RG_GREEN_RUPEE, false, true);
} else { } else {
AddItemToMainPool(RG_GREEN_RUPEE); AddItemToMainPool(RG_GREEN_RUPEE);
} }

2
soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
View File

@ -119,7 +119,7 @@ void WriteIngameSpoilerLog() {
continue; continue;
} }
// Shuffle Pots // Shuffle Pots
else if (!ctx->GetOption(RSK_SHUFFLE_POTS) && loc->IsCategory(Category::cPot)) { else if (ctx->GetOption(RSK_SHUFFLE_POTS).Is(RO_SHUFFLE_POTS_OFF) && loc->IsCategory(Category::cPot)) {
continue; continue;
} }
// Merchants // Merchants

2
soh/soh/Enhancements/randomizer/3drando/spoiler_log.hpp
View File

@ -75,7 +75,7 @@ typedef enum {
} SpoilerItemRevealType; } SpoilerItemRevealType;
#define SPOILER_SPHERES_MAX 50 #define SPOILER_SPHERES_MAX 50
#define SPOILER_ITEMS_MAX 512 #define SPOILER_ITEMS_MAX 1024
#define SPOILER_STRING_DATA_SIZE 16384 #define SPOILER_STRING_DATA_SIZE 16384
typedef struct { typedef struct {

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

@ -153,7 +153,7 @@ void RandomizerCheckObjects::UpdateImGuiVisibility() {
((CVarGetInteger("gRandomizeShuffleTokens", RO_TOKENSANITY_OFF) == RO_TOKENSANITY_DUNGEONS) && ((CVarGetInteger("gRandomizeShuffleTokens", RO_TOKENSANITY_OFF) == RO_TOKENSANITY_DUNGEONS) &&
RandomizerCheckObjects::AreaIsDungeon(location.GetArea()))) && RandomizerCheckObjects::AreaIsDungeon(location.GetArea()))) &&
(location.GetRCType() != RCTYPE_COW || CVarGetInteger("gRandomizeShuffleCows", RO_GENERIC_NO)) && (location.GetRCType() != RCTYPE_COW || CVarGetInteger("gRandomizeShuffleCows", RO_GENERIC_NO)) &&
(location.GetRCType() != RCTYPE_POT || CVarGetInteger("gRandomizeShufflePotContents", RO_GENERIC_NO)) && (location.GetRCType() != RCTYPE_POT || CVarGetInteger("gRandomizeShufflePots", RO_GENERIC_NO)) &&
(location.GetRCType() != RCTYPE_ADULT_TRADE || (location.GetRCType() != RCTYPE_ADULT_TRADE ||
CVarGetInteger("gRandomizeShuffleAdultTrade", RO_GENERIC_NO)) && CVarGetInteger("gRandomizeShuffleAdultTrade", RO_GENERIC_NO)) &&
(location.GetRandomizerCheck() != RC_KF_KOKIRI_SWORD_CHEST || (location.GetRandomizerCheck() != RC_KF_KOKIRI_SWORD_CHEST ||

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

@ -1096,8 +1096,8 @@ void LoadSettings() {
OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD) == RO_GENERIC_YES OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD) == RO_GENERIC_YES
: true; : true;
showPots = IS_RANDO ? showPots = IS_RANDO ?
OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_POTS) == RO_GENERIC_YES OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_POTS) != RO_SHUFFLE_POTS_OFF
: true; : false;
showFrogSongRupees = IS_RANDO ? showFrogSongRupees = IS_RANDO ?
OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_FROG_SONG_RUPEES) == RO_GENERIC_YES OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_FROG_SONG_RUPEES) == RO_GENERIC_YES
: false; : false;