From ef587be47aedd9f095f0210ff1aac9890c56ad7d Mon Sep 17 00:00:00 2001 From: sonoftunk Date: Fri, 25 Nov 2022 04:08:55 -0500 Subject: [PATCH] Check Tracker - MQ List basic support --- .../Enhancements/randomizer/randomizer_check_objects.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp index 90c0d1bad..9a6e485a5 100644 --- a/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp @@ -972,7 +972,11 @@ bool RandomizerCheckObjects::IsVisibleInCheckTracker(RandomizerCheckObject rcObj return (rcObj.rcArea != RCAREA_INVALID) && // don't show Invalid locations - (rcObj.vOrMQ != RCVORMQ_MQ) && // TODO: don't show MQ checks until check tracker supports MQ + (!AreaIsDungeon(rcObj.rcArea) || + rcObj.vOrMQ == RCVORMQ_BOTH || + rcObj.vOrMQ == RCVORMQ_MQ && OTRGlobals::Instance->gRandomizer->masterQuestDungeons.contains(rcObj.sceneId) || + rcObj.vOrMQ == RCVORMQ_VANILLA && !OTRGlobals::Instance->gRandomizer->masterQuestDungeons.contains(rcObj.sceneId) + ) && (rcObj.rcType != RCTYPE_SHOP || gRandomizeShopsanity > RO_SHOPSANITY_ZERO_ITEMS) && (rcObj.rcType != RCTYPE_SCRUB || gRandomizeShuffleScrubs > RO_SCRUBS_OFF) && (rcObj.rcType != RCTYPE_MERCHANT || gRandomizeShuffleMerchants > RO_SHUFFLE_MERCHANTS_OFF) &&