diff options
author | Star Rauchenberger <fefferburbia@gmail.com> | 2024-06-06 14:15:14 -0400 |
---|---|---|
committer | Star Rauchenberger <fefferburbia@gmail.com> | 2024-06-06 14:15:14 -0400 |
commit | 3d7d4b216d630ec65bc008cd9d7979f8de191825 (patch) | |
tree | 684da55948bd181da7be72ff36b9a654a87aa55b | |
parent | b78a7361c9f9f4a9edc30b45a90a3ff94e919b19 (diff) | |
download | lingo-ap-tracker-3d7d4b216d630ec65bc008cd9d7979f8de191825.tar.gz lingo-ap-tracker-3d7d4b216d630ec65bc008cd9d7979f8de191825.tar.bz2 lingo-ap-tracker-3d7d4b216d630ec65bc008cd9d7979f8de191825.zip |
Added remaining painting areas
-rwxr-xr-x | assets/areas.yaml | 12 | ||||
-rw-r--r-- | 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 @@ | |||
67 | map: [2642, 872] | 67 | map: [2642, 872] |
68 | Eight Room: | 68 | Eight Room: |
69 | fold_into: The Incomparable | 69 | fold_into: The Incomparable |
70 | Eight Alcove: | ||
71 | fold_into: The Incomparable | ||
70 | Orange Tower First Floor: | 72 | Orange Tower First Floor: |
71 | map: [1285, 928] | 73 | map: [1285, 928] |
72 | Color Hunt: | 74 | Color Hunt: |
@@ -83,8 +85,10 @@ | |||
83 | map: [1252, 1259] | 85 | map: [1252, 1259] |
84 | Orange Tower Seventh Floor: | 86 | Orange Tower Seventh Floor: |
85 | map: [1587, 1900] | 87 | map: [1587, 1900] |
86 | Orange Tower Basement: | 88 | Orange Tower Sixth Floor: |
87 | map: [1587, 2000] | 89 | map: [1587, 2000] |
90 | Orange Tower Basement: | ||
91 | map: [1587, 2100] | ||
88 | Courtyard: | 92 | Courtyard: |
89 | map: [863, 387] | 93 | map: [863, 387] |
90 | First Second Third Fourth: | 94 | First Second Third Fourth: |
@@ -224,11 +228,15 @@ | |||
224 | The Eyes They See: | 228 | The Eyes They See: |
225 | map: [955, 933] | 229 | map: [955, 933] |
226 | Far Window: | 230 | Far Window: |
227 | fold_into: The Eyes They See | 231 | fold_into: The Eyes They See |
232 | Wondrous Lobby: | ||
233 | fold_into: The Eyes They See | ||
228 | Outside The Wondrous: | 234 | Outside The Wondrous: |
229 | map: [691, 524] | 235 | map: [691, 524] |
230 | The Wondrous: | 236 | The Wondrous: |
231 | map: [648, 338] | 237 | map: [648, 338] |
238 | The Wondrous (Doorknob): | ||
239 | fold_into: The Wondrous | ||
232 | The Wondrous (Bookcase): | 240 | The Wondrous (Bookcase): |
233 | fold_into: The Wondrous | 241 | fold_into: The Wondrous |
234 | The Wondrous (Chandelier): | 242 | 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() { | |||
143 | for (AreaIndicator &area : areas_) { | 143 | for (AreaIndicator &area : areas_) { |
144 | const MapArea &map_area = GD_GetMapArea(area.area_id); | 144 | const MapArea &map_area = GD_GetMapArea(area.area_id); |
145 | if (!AP_IsLocationVisible(map_area.classification) && | 145 | if (!AP_IsLocationVisible(map_area.classification) && |
146 | !(map_area.hunt && GetTrackerConfig().show_hunt_panels)) { | 146 | !(map_area.hunt && GetTrackerConfig().show_hunt_panels) && |
147 | !(AP_IsPaintingShuffle() && !map_area.paintings.empty())) { | ||
147 | area.active = false; | 148 | area.active = false; |
148 | continue; | 149 | continue; |
149 | } else { | 150 | } else { |