Fix pilgrimage detection for vanilla doors

Also add new pilgrimage options.

1 files changed, 19 insertions, 0 deletions

@@ -58,6 +58,8 @@ struct GameData {
 
   std::map<LingoColor, int> ap_id_by_color_;
 
+  std::vector<int> sunwarp_doors_;
+
   bool loaded_area_data_ = false;
   std::set<std::string> malconfigured_areas_;
 
@@ -125,6 +127,11 @@ struct GameData {
                 exit_obj.type = EntranceType::kWarp;
               }
 
+              if (rooms_[from_room_id].name == "Crossroads" &&
+                  rooms_[room_id].name == "Roof") {
+                exit_obj.type == EntranceType::kCrossroadsRoofAccess;
+              }
+
               rooms_[from_room_id].exits.push_back(exit_obj);
             };
 
@@ -401,6 +408,14 @@ struct GameData {
             doors_[door_id].exclude_reduce =
                 !door_it.second["include_reduce"].as<bool>();
           }
+
+          if (doors_[door_id].name.ends_with(" Sunwarp")) {
+            sunwarp_doors_.push_back(door_id);
+            doors_[door_id].type = DoorType::kSunwarp;
+          } else if (doors_[door_id].item_name ==
+                     "Pilgrim Room - Sun Painting") {
+            doors_[door_id].type = DoorType::kSunPainting;
+          }
         }
       }
 
@@ -667,3 +682,7 @@ const std::vector<int> &GD_GetAchievementPanels() {
 int GD_GetItemIdForColor(LingoColor color) {
   return GetState().ap_id_by_color_.at(color);
 }
+
+const std::vector<int> &GD_GetSunwarpDoors() {
+  return GetState().sunwarp_doors_;
+}