From 6f5287b3921c843a6b322ccbdfcbef00a8f16980 Mon Sep 17 00:00:00 2001 From: Star Rauchenberger Date: Thu, 6 Jun 2024 15:51:32 -0400 Subject: Handle special cases (ECH + Sun Painting) --- src/tracker_state.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/tracker_state.cpp') diff --git a/src/tracker_state.cpp b/src/tracker_state.cpp index 46bdbec..66e7751 100644 --- a/src/tracker_state.cpp +++ b/src/tracker_state.cpp @@ -52,9 +52,12 @@ class RequirementCalculator { Requirements requirements; const Door& door_obj = GD_GetDoor(door_id); - if (!AP_IsPilgrimageEnabled() && - door_obj.type == DoorType::kSunPainting) { - requirements.items.insert(door_obj.ap_item_id); + if (door_obj.type == DoorType::kSunPainting) { + if (!AP_IsPilgrimageEnabled()) { + requirements.items.insert(door_obj.ap_item_id); + } else { + requirements.disabled = true; + } } else if (door_obj.type == DoorType::kSunwarp) { switch (AP_GetSunwarpAccess()) { case kSUNWARP_ACCESS_NORMAL: -- cgit 1.4.1