mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-01-31 07:20:14 -05:00
Code Issues Projects Releases Wiki Activity

don't spoil shops without soul

Browse Source
This commit is contained in:
Demur Rumed 2025-01-26 14:06:21 +00:00
parent 8c24e33900
commit b71b88c57b
1 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -543,13 +543,39 @@ void CheckTrackerTransition(uint32_t sceneNum) {
currentArea = GetCheckArea(); currentArea = GetCheckArea();
switch (sceneNum) { switch (sceneNum) {
case SCENE_KOKIRI_SHOP: case SCENE_KOKIRI_SHOP:
case SCENE_BAZAAR: if (Flags_GetRandomizerInf(RAND_INF_KOKIRI_SHOPKEEPER_SOUL)) {
case SCENE_POTION_SHOP_MARKET:
case SCENE_BOMBCHU_SHOP:
case SCENE_POTION_SHOP_KAKARIKO:
case SCENE_GORON_SHOP:
case SCENE_ZORA_SHOP:
SetShopSeen(sceneNum, false); SetShopSeen(sceneNum, false);
}
break;
case SCENE_BAZAAR:
if (Flags_GetRandomizerInf(RAND_INF_BAZAAR_SHOPKEEPER_SOUL)) {
SetShopSeen(sceneNum, false);
}
break;
case SCENE_POTION_SHOP_MARKET:
if (Flags_GetRandomizerInf(RAND_INF_POTION_SHOPKEEPER_SOUL)) {
SetShopSeen(sceneNum, false);
}
break;
case SCENE_BOMBCHU_SHOP:
if (Flags_GetRandomizerInf(RAND_INF_BOMBCHU_SHOPKEEPER_SOUL)) {
SetShopSeen(sceneNum, false);
}
break;
case SCENE_POTION_SHOP_KAKARIKO:
if (Flags_GetRandomizerInf(RAND_INF_POTION_SHOPKEEPER_SOUL)) {
SetShopSeen(sceneNum, false);
}
break;
case SCENE_GORON_SHOP:
if (Flags_GetRandomizerInf(RAND_INF_GORON_SHOPKEEPER_SOUL)) {
SetShopSeen(sceneNum, false);
}
break;
case SCENE_ZORA_SHOP:
if (Flags_GetRandomizerInf(RAND_INF_ZORA_SHOPKEEPER_SOUL)) {
SetShopSeen(sceneNum, false);
}
break; break;
} }
if (!IsAreaSpoiled(currentArea) && (RandomizerCheckObjects::AreaIsOverworld(currentArea) || std::find(spoilingEntrances.begin(), spoilingEntrances.end(), gPlayState->nextEntranceIndex) != spoilingEntrances.end())) { if (!IsAreaSpoiled(currentArea) && (RandomizerCheckObjects::AreaIsOverworld(currentArea) || std::find(spoilingEntrances.begin(), spoilingEntrances.end(), gPlayState->nextEntranceIndex) != spoilingEntrances.end())) {