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

Fix unique handling of OoT and iron boots and add bow chest

Browse Source
This commit is contained in:
aMannus
2025-10-30 13:54:17 +01:00
parent 22b7c342a8
commit cd1869421a
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -309,7 +309,9 @@ void RandomizerOnExternalCheckHandler(uint32_t randomizerCheck) {
// Receiving the OoT or Iron Boots chest locations without preventing the locations locked behind them.
// OoT locks Song of Time, Iron boots chest locks the song from Sheik in Ice Cavern.
if (rc == RC_HF_OCARINA_OF_TIME_ITEM || rc == RC_ICE_CAVERN_IRON_BOOTS_CHEST) {
// We also skip the bow chest in Forest Temple as the chest would spawn while the Stalfos fight still happens,
// leading to a double chest spawn.
if (rc == RC_HF_OCARINA_OF_TIME_ITEM || rc == RC_ICE_CAVERN_IRON_BOOTS_CHEST || RC_FOREST_TEMPLE_BOW_CHEST) {
randomizerQueuedChecks.push(rc);
return;
}
@@ -391,8 +393,12 @@ void RandomizerOnPlayerUpdateForRCQueueHandler() {
// When Ocarina or Iron Boots chest has been received externally before, and then picked up in the game itself,
// it'll be skipped and not give the song properly because the RC is already checked off. So instead we handle
// it here and send out the check locked behind them manually.
if ((rc == RC_HF_OCARINA_OF_TIME_ITEM || rc == RC_ICE_CAVERN_IRON_BOOTS_CHEST) && loc->HasObtained()) {
RandomizerOnExternalCheckHandler(rc);
if (loc->HasObtained()) {
if (rc == RC_HF_OCARINA_OF_TIME_ITEM) {
RandomizerOnExternalCheckHandler(RC_SONG_FROM_OCARINA_OF_TIME);
} else if (rc == RC_ICE_CAVERN_IRON_BOOTS_CHEST) {
RandomizerOnExternalCheckHandler(RC_SHEIK_IN_ICE_CAVERN);
}
}
if (loc->HasObtained()) {