4 files changed, 11 insertions, 3 deletions

@@ -279,6 +279,8 @@
     map: [1368, 2103]

   Art Gallery:

     map: [2474, 1366]

+  Art Gallery (First Floor):

+    fold_into: Art Gallery

   Art Gallery (Second Floor):

     fold_into: Art Gallery

   Art Gallery (Third Floor):

@@ -127,6 +127,10 @@ struct GameData {
                 exit_obj.type = EntranceType::kCrossroadsRoofAccess;
               }
 
+              if (option["static_painting"] && option["static_painting"].as<bool>()) {
+                exit_obj.type = EntranceType::kStaticPainting;
+              }
+
               rooms_[from_room_id].exits.push_back(exit_obj);
             };
 
@@ -31,6 +31,7 @@ enum class EntranceType {
   kWarp,
   kPilgrimage,
   kCrossroadsRoofAccess,
+  kStaticPainting,
 };
 
 enum class DoorType {
@@ -342,7 +342,7 @@ class StateCalculator {
             new_boundary.push_back(
                 {.source_room = room_exit.destination_room,
                  .destination_room = GD_GetRoomByName("Color Hallways"),
-                 .type = EntranceType::kPainting});
+                 .type = EntranceType::kStaticPainting});
           }
 
           if (AP_IsPilgrimageEnabled()) {
@@ -368,7 +368,7 @@ class StateCalculator {
                    .destination_room = GD_GetRoomByName("Pilgrim Antechamber"),
                    .door =
                        GD_GetDoorByName("Pilgrim Antechamber - Sun Painting"),
-                   .type = EntranceType::kPainting});
+                   .type = EntranceType::kStaticPainting});
             }
           }
 
@@ -650,7 +650,8 @@ class StateCalculator {
           !AP_DoesPilgrimageAllowRoofAccess()) {
         return kNo;
       }
-      if (room_exit.type == EntranceType::kPainting &&
+      if ((room_exit.type == EntranceType::kPainting ||
+           room_exit.type == EntranceType::kStaticPainting) &&
           !AP_DoesPilgrimageAllowPaintings()) {
         return kNo;
       }