2 files changed, 39 insertions, 4 deletions

@@ -69,6 +69,12 @@ void SubwayMap::OnConnect() {
 
   std::map<std::string, std::vector<int>> tagged;
   for (const SubwayItem &subway_item : GD_GetSubwayItems()) {
+    if (AP_HasEarlyColorHallways() &&
+        (subway_item.special == "starting_room_paintings" ||
+         subway_item.special == "early_color_hallways")) {
+      tagged["early_color_hallways"].push_back(subway_item.id);
+    }
+
     if (AP_IsPaintingShuffle() && !subway_item.paintings.empty()) {
       continue;
     }
@@ -84,6 +90,12 @@ void SubwayMap::OnConnect() {
 
       tagged[tag.str()].push_back(subway_item.id);
     }
+
+    if (!AP_IsPilgrimageEnabled() &&
+        (subway_item.special == "sun_painting" ||
+         subway_item.special == "sun_painting_exit")) {
+      tagged["sun_painting"].push_back(subway_item.id);
+    }
   }
 
   for (const auto &[tag, items] : tagged) {
@@ -489,7 +501,27 @@ void SubwayMap::Redraw() {
     const wxBrush *brush_color = wxGREY_BRUSH;
     std::optional<wxColour> shade_color;
 
-    if (!subway_item.paintings.empty()) {
+    if (AP_HasEarlyColorHallways() &&
+        (subway_item.special == "starting_room_paintings" ||
+         subway_item.special == "early_color_hallways")) {
+      draw_type = ItemDrawType::kOwl;
+
+      if (subway_item.special == "starting_room_paintings") {
+        shade_color = wxColour(0, 255, 0, 128);
+      } else {
+        shade_color = wxColour(255, 0, 0, 128);
+      }
+    } else if (subway_item.special == "sun_painting") {
+      if (!AP_IsPilgrimageEnabled()) {
+        if (IsDoorOpen(*subway_item.door)) {
+          draw_type = ItemDrawType::kOwl;
+          shade_color = wxColour(0, 255, 0, 128);
+        } else {
+          draw_type = ItemDrawType::kBox;
+          brush_color = wxRED_BRUSH;
+        }
+      }
+    } else if (!subway_item.paintings.empty()) {
       if (AP_IsPaintingShuffle()) {
         bool has_checked_painting = false;
         bool has_unchecked_painting = false;
@@ -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: