From 3d7d4b216d630ec65bc008cd9d7979f8de191825 Mon Sep 17 00:00:00 2001 From: Star Rauchenberger Date: Thu, 6 Jun 2024 14:15:14 -0400 Subject: Added remaining painting areas --- assets/areas.yaml | 12 ++++++++++-- src/tracker_panel.cpp | 3 ++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/assets/areas.yaml b/assets/areas.yaml index d38ceb8..cbcf23a 100755 --- a/assets/areas.yaml +++ b/assets/areas.yaml @@ -67,6 +67,8 @@ map: [2642, 872] Eight Room: fold_into: The Incomparable + Eight Alcove: + fold_into: The Incomparable Orange Tower First Floor: map: [1285, 928] Color Hunt: @@ -83,8 +85,10 @@ map: [1252, 1259] Orange Tower Seventh Floor: map: [1587, 1900] - Orange Tower Basement: + Orange Tower Sixth Floor: map: [1587, 2000] + Orange Tower Basement: + map: [1587, 2100] Courtyard: map: [863, 387] First Second Third Fourth: @@ -224,11 +228,15 @@ The Eyes They See: map: [955, 933] Far Window: - fold_into: The Eyes They See + fold_into: The Eyes They See + Wondrous Lobby: + fold_into: The Eyes They See Outside The Wondrous: map: [691, 524] The Wondrous: map: [648, 338] + The Wondrous (Doorknob): + fold_into: The Wondrous The Wondrous (Bookcase): fold_into: The Wondrous The Wondrous (Chandelier): diff --git a/src/tracker_panel.cpp b/src/tracker_panel.cpp index f0810c9..d60c1b6 100644 --- a/src/tracker_panel.cpp +++ b/src/tracker_panel.cpp @@ -143,7 +143,8 @@ void TrackerPanel::Redraw() { for (AreaIndicator &area : areas_) { const MapArea &map_area = GD_GetMapArea(area.area_id); if (!AP_IsLocationVisible(map_area.classification) && - !(map_area.hunt && GetTrackerConfig().show_hunt_panels)) { + !(map_area.hunt && GetTrackerConfig().show_hunt_panels) && + !(AP_IsPaintingShuffle() && !map_area.paintings.empty())) { area.active = false; continue; } else { -- cgit 1.4.1