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

Check Tracker - Fixes scroll for Hyrule Market and Bazaar

Browse Source
This commit is contained in:
sonoftunk 2022-11-13 11:02:40 -05:00
parent 8ca1dbeb8a
commit bf17abdf03
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -901,6 +901,9 @@ std::map<SceneID, RandomizerCheckArea> RandomizerCheckObjects::GetAllRCAreaBySce
for (auto& [randomizerCheck, rcObject] : rcObjects) { for (auto& [randomizerCheck, rcObject] : rcObjects) {
rcAreaBySceneID[rcObject.sceneId] = rcObject.rcArea; rcAreaBySceneID[rcObject.sceneId] = rcObject.rcArea;
} }
//Add checkless Hyrule Market areas to the area return
for (int id = (int)SCENE_ENTRA; id <= (int)SCENE_MARKET_RUINS; id++)
rcAreaBySceneID[(SceneID)id] = RCAREA_MARKET;
} }
return rcAreaBySceneID; return rcAreaBySceneID;
} }

5
soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
View File

@ -744,7 +744,7 @@ void DrawLocations() {
doAreaScroll = doAreaScroll =
(currentArea != RCAREA_INVALID && sceneId != SCENE_KAKUSIANA && // Don't move for grottos (currentArea != RCAREA_INVALID && sceneId != SCENE_KAKUSIANA && // Don't move for grottos
sceneId != SCENE_YOUSEI_IZUMI_TATE && sceneId != SCENE_YOUSEI_IZUMI_YOKO && // Don't move for fairy fountains sceneId != SCENE_YOUSEI_IZUMI_TATE && sceneId != SCENE_YOUSEI_IZUMI_YOKO && // Don't move for fairy fountains
sceneId != SCENE_SHOP1 && // Don't move for Bazaar, as it moves between Kak and Market sceneId != SCENE_SHOP1 && sceneId != SCENE_SYATEKIJYOU && // Don't move for Bazaar/Gallery, as it moves between Kak and Market
currentArea != lastArea && currentArea == rcArea); currentArea != lastArea && currentArea == rcArea);
break; break;
} }
@ -828,7 +828,7 @@ void DrawLocations() {
doAreaScroll = doAreaScroll =
(currentArea != RCAREA_INVALID && sceneId != SCENE_KAKUSIANA && // Don't move for kakusiana/grottos (currentArea != RCAREA_INVALID && sceneId != SCENE_KAKUSIANA && // Don't move for kakusiana/grottos
sceneId != SCENE_YOUSEI_IZUMI_TATE && sceneId != SCENE_YOUSEI_IZUMI_YOKO && // Don't move for fairy fountains sceneId != SCENE_YOUSEI_IZUMI_TATE && sceneId != SCENE_YOUSEI_IZUMI_YOKO && // Don't move for fairy fountains
sceneId != SCENE_SHOP1 && //Don't move for Bazaar, as it moves between Kak and Market sceneId != SCENE_SHOP1 && sceneId != SCENE_SYATEKIJYOU && // Don't move for Bazaar/Gallery, as it moves between Kak and Market
currentArea != lastArea && currentArea == rcArea); currentArea != lastArea && currentArea == rcArea);
break; break;
} }
@ -880,6 +880,7 @@ void DrawLocations() {
if (sceneId != SCENE_KAKUSIANA && if (sceneId != SCENE_KAKUSIANA &&
sceneId != SCENE_YOUSEI_IZUMI_TATE && sceneId != SCENE_YOUSEI_IZUMI_TATE &&
sceneId != SCENE_YOUSEI_IZUMI_YOKO && sceneId != SCENE_YOUSEI_IZUMI_YOKO &&
sceneId != SCENE_SYATEKIJYOU &&
sceneId != SCENE_SHOP1) sceneId != SCENE_SHOP1)
lastArea = currentArea; lastArea = currentArea;
} }