1 files changed, 26 insertions, 18 deletions

@@ -58,6 +58,9 @@ struct GameData {
 
   std::map<LingoColor, int> ap_id_by_color_;
 
+  std::vector<int> pilgrimage_;
+  std::vector<int> pilgrimage_with_sunwarps_;
+
   bool loaded_area_data_ = false;
   std::set<std::string> malconfigured_areas_;
 
@@ -125,6 +128,10 @@ struct GameData {
               exit_obj.painting = entrance_it.second["painting"].as<bool>();
             }
 
+            if (entrance_it.second["sunwarp"]) {
+              exit_obj.sunwarp = entrance_it.second["sunwarp"].as<bool>();
+            }
+
             rooms_[from_room_id].exits.push_back(exit_obj);
             break;
           }
@@ -144,6 +151,10 @@ struct GameData {
                 exit_obj.painting = option["painting"].as<bool>();
               }
 
+              if (option["sunwarp"]) {
+                exit_obj.sunwarp = option["sunwarp"].as<bool>();
+              }
+
               rooms_[from_room_id].exits.push_back(exit_obj);
             }
 
@@ -576,31 +587,20 @@ struct GameData {
     }
 
     // Set up fake pilgrimage.
-    int fake_pilgrim_panel_id =
-        AddOrGetPanel("Starting Room", "!! Fake Pilgrimage Panel");
-    Panel &fake_pilgrim_panel_obj = panels_[fake_pilgrim_panel_id];
-    fake_pilgrim_panel_obj.non_counting = true;
-
     for (const auto &config_node : pilgrimage_config) {
-      fake_pilgrim_panel_obj.required_doors.push_back(
-          AddOrGetDoor(config_node["room"].as<std::string>(),
-                       config_node["door"].as<std::string>()));
+      int door_id = AddOrGetDoor(config_node["room"].as<std::string>(),
+                                 config_node["door"].as<std::string>());
+      if (config_node["sunwarp"] && config_node["sunwarp"].as<bool>()) {
+        pilgrimage_with_sunwarps_.push_back(door_id);
+      }
+      pilgrimage_.push_back(door_id);
     }
 
-    int fake_pilgrim_door_id =
-        AddOrGetDoor("Starting Room", "!! Fake Pilgrimage Door");
-    Door &fake_pilgrim_door_obj = doors_[fake_pilgrim_door_id];
-    fake_pilgrim_door_obj.panels.push_back(fake_pilgrim_panel_id);
-    fake_pilgrim_door_obj.skip_location = true;
-    fake_pilgrim_door_obj.skip_item = true;
-    fake_pilgrim_door_obj.is_event = true;
-
     int starting_room_id = AddOrGetRoom("Starting Room");
     Room &starting_room_obj = rooms_[starting_room_id];
-    starting_room_obj.panels.push_back(fake_pilgrim_panel_id);
     starting_room_obj.exits.push_back(
         Exit{.destination_room = AddOrGetRoom("Pilgrim Antechamber"),
-             .door = fake_pilgrim_door_id});
+             .pilgrimage = true});
 
     // Report errors.
     for (const std::string &area : malconfigured_areas_) {
@@ -694,3 +694,11 @@ const std::vector<int> &GD_GetAchievementPanels() {
 int GD_GetItemIdForColor(LingoColor color) {
   return GetState().ap_id_by_color_.at(color);
 }
+
+const std::vector<int> &GD_GetPilgrimageDoors(bool include_sunwarps) {
+  if (include_sunwarps) {
+    return GetState().pilgrimage_with_sunwarps_;
+  } else {
+    return GetState().pilgrimage_;
+  }
+}