Fix pilgrimage detection for vanilla doors

Also add new pilgrimage options.

1 files changed, 18 insertions, 0 deletions

@@ -64,6 +64,8 @@ struct APState {
   VictoryCondition victory_condition = kTHE_END;
   bool early_color_hallways = false;
   bool pilgrimage_enabled = false;
+  bool pilgrimage_allows_roof_access = false;
+  bool pilgrimage_allows_paintings = false;
   SunwarpAccess sunwarp_access = kSUNWARP_ACCESS_NORMAL;
 
   std::map<std::string, std::string> painting_mapping;
@@ -135,6 +137,8 @@ struct APState {
     victory_condition = kTHE_END;
     early_color_hallways = false;
     pilgrimage_enabled = false;
+    pilgrimage_allows_roof_access = false;
+    pilgrimage_allows_paintings = false;
     sunwarp_access = kSUNWARP_ACCESS_NORMAL;
 
     connected = false;
@@ -240,6 +244,12 @@ struct APState {
                              slot_data["early_color_hallways"].get<int>() == 1;
       pilgrimage_enabled = slot_data.contains("enable_pilgrimage") &&
                            slot_data["enable_pilgrimage"].get<int>() == 1;
+      pilgrimage_allows_roof_access =
+          slot_data.contains("pilgrimage_allows_roof_access") &&
+          slot_data["pilgrimage_allows_roof_access"].get<int>() == 1;
+      pilgrimage_allows_paintings =
+          slot_data.contains("pilgrimage_allows_paintings") &&
+          slot_data["pilgrimage_allows_paintings"].get<int>() == 1;
       sunwarp_access = slot_data["sunwarp_access"].get<SunwarpAccess>();
 
       if (painting_shuffle && slot_data.contains("painting_entrance_to_exit")) {
@@ -454,6 +464,14 @@ bool AP_HasEarlyColorHallways() { return GetState().early_color_hallways; }
 
 bool AP_IsPilgrimageEnabled() { return GetState().pilgrimage_enabled; }
 
+bool AP_DoesPilgrimageAllowRoofAccess() {
+  return GetState().pilgrimage_allows_roof_access;
+}
+
+bool AP_DoesPilgrimageAllowPaintings() {
+  return GetState().pilgrimage_allows_paintings;
+}
+
 SunwarpAccess AP_GetSunwarpAccess() { return GetState().sunwarp_access; }
 
 bool AP_HasReachedGoal() { return GetState().HasReachedGoal(); }