1 files changed, 17 insertions, 15 deletions

@@ -15,11 +15,11 @@ namespace {
 struct Requirements {
   bool disabled = false;
 
-  std::set<int> doors; // non-grouped, handles progressive
-  std::set<int> items; // all other items
-  std::set<int> rooms; // maybe
-  bool mastery = false; // maybe
-  bool panel_hunt = false; // maybe
+  std::set<int> doors;      // non-grouped, handles progressive
+  std::set<int> items;      // all other items
+  std::set<int> rooms;      // maybe
+  bool mastery = false;     // maybe
+  bool panel_hunt = false;  // maybe
 
   void Merge(const Requirements& rhs) {
     if (rhs.disabled) {
@@ -228,7 +228,8 @@ class StateCalculator {
 
           if (AP_IsPaintingShuffle()) {
             for (const PaintingExit& out_edge : room_obj.paintings) {
-              if (AP_GetPaintingMapping().count(out_edge.id)) {
+              if (AP_GetPaintingMapping().count(out_edge.id) &&
+                  AP_GetCheckedPaintings().count(out_edge.id)) {
                 Exit painting_exit;
                 painting_exit.destination_room = GD_GetRoomForPainting(
                     AP_GetPaintingMapping().at(out_edge.id));
@@ -286,7 +287,8 @@ class StateCalculator {
       panel_boundary = new_panel_boundary;
     }
 
-    // Now that we know the full reachable area, let's make sure all doors are evaluated.
+    // Now that we know the full reachable area, let's make sure all doors are
+    // evaluated.
     for (const Door& door : GD_GetDoors()) {
       int discard = IsDoorReachable(door.id);
     }
@@ -320,7 +322,8 @@ class StateCalculator {
     return has_item ? kYes : kNo;
   }
 
-  Decision AreRequirementsSatisfied(const Requirements& reqs, std::map<std::string, bool>* report = nullptr) {
+  Decision AreRequirementsSatisfied(
+      const Requirements& reqs, std::map<std::string, bool>* report = nullptr) {
     if (reqs.disabled) {
       return kNo;
     }
@@ -339,7 +342,7 @@ class StateCalculator {
         final_decision = decision;
       }
     }
-    
+
     for (int item_id : reqs.items) {
       bool has_item = AP_HasItem(item_id);
       if (report) {
@@ -353,10 +356,9 @@ class StateCalculator {
 
     for (int room_id : reqs.rooms) {
       bool reachable = reachable_rooms_.count(room_id);
-      
+
       if (report) {
-        std::string report_name =
-            "Reach \"" + GD_GetRoom(room_id).name + "\"";
+        std::string report_name = "Reach \"" + GD_GetRoom(room_id).name + "\"";
         (*report)[report_name] = reachable;
       }
 
@@ -364,7 +366,7 @@ class StateCalculator {
         final_decision = kMaybe;
       }
     }
-    
+
     if (reqs.mastery) {
       int achievements_accessible = 0;
 
@@ -407,7 +409,7 @@ class StateCalculator {
             std::to_string(AP_GetLevel2Requirement()) + " Panels";
         (*report)[report_name] = can_level2;
       }
-      
+
       if (can_level2 && final_decision != kNo) {
         final_decision = kMaybe;
       }
@@ -422,7 +424,7 @@ class StateCalculator {
     } else {
       door_report_[door_id] = {};
     }
-    
+
     return AreRequirementsSatisfied(GetState().requirements.GetDoor(door_id),
                                     &door_report_[door_id]);
   }