nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fix GS not being marked as collected when not shuffled. (#5861)

Browse Source
This commit is contained in:
Malkierian
2025-10-20 10:51:33 -07:00
committed by GitHub
parent c806f23494
commit 7004c1fc4f
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
soh/soh/Enhancements/randomizer/hook_handlers.cpp
View File

@@ -249,11 +249,15 @@ void RandomizerOnFlagSetHandler(int16_t flagType, int16_t flag) {
return; return;
if (flagType == FLAG_GS_TOKEN && if (flagType == FLAG_GS_TOKEN &&
Rando::Context::GetInstance()->GetOption(RSK_SHUFFLE_TOKENS).Is(RO_TOKENSANITY_OFF)) Rando::Context::GetInstance()->GetOption(RSK_SHUFFLE_TOKENS).Is(RO_TOKENSANITY_OFF)) {
Rando::Context::GetInstance()->GetItemLocation(rc)->SetCheckStatus(RCSHOW_COLLECTED);
return; return;
}
auto loc = Rando::Context::GetInstance()->GetItemLocation(rc); auto loc = Rando::Context::GetInstance()->GetItemLocation(rc);
if (loc == nullptr || loc->HasObtained() || loc->GetPlacedRandomizerGet() == RG_NONE) if (loc == nullptr || loc->HasObtained() || loc->GetPlacedRandomizerGet() == RG_NONE) {
Rando::Context::GetInstance()->GetItemLocation(rc)->SetCheckStatus(RCSHOW_COLLECTED);
return; return;
}
SPDLOG_INFO("Queuing RC: {}", static_cast<uint32_t>(rc)); SPDLOG_INFO("Queuing RC: {}", static_cast<uint32_t>(rc));
randomizerQueuedChecks.push(rc); randomizerQueuedChecks.push(rc);