1 files changed, 24 insertions, 1 deletions

@@ -62,6 +62,9 @@ struct GameData {
 
   std::vector<int> sunwarp_doors_;
 
+  std::map<std::string, int> subway_item_by_painting_;
+  std::map<SubwaySunwarp, int> subway_item_by_sunwarp_;
+
   bool loaded_area_data_ = false;
   std::set<std::string> malconfigured_areas_;
 
@@ -624,7 +627,10 @@ struct GameData {
 
       if (subway_it["paintings"]) {
         for (const auto &painting_it : subway_it["paintings"]) {
-          subway_item.paintings.push_back(painting_it.as<std::string>());
+          std::string painting_id = painting_it.as<std::string>();
+
+          subway_item.paintings.push_back(painting_id);
+          subway_item_by_painting_[painting_id] = subway_item.id;
         }
       }
 
@@ -649,6 +655,11 @@ struct GameData {
         }
 
         subway_item.sunwarp = sunwarp;
+
+        subway_item_by_sunwarp_[sunwarp] = subway_item.id;
+
+        subway_item.door =
+            AddOrGetDoor("Sunwarps", std::to_string(sunwarp.dots) + " Sunwarp");
       }
 
       if (subway_it["special"]) {
@@ -715,6 +726,10 @@ GameData &GetState() {
 
 }  // namespace
 
+bool SubwaySunwarp::operator<(const SubwaySunwarp& rhs) const {
+  return std::tie(dots, type) < std::tie(rhs.dots, rhs.type);
+}
+
 const std::vector<MapArea> &GD_GetMapAreas() { return GetState().map_areas_; }
 
 const MapArea &GD_GetMapArea(int id) { return GetState().map_areas_.at(id); }
@@ -764,3 +779,11 @@ const std::vector<SubwayItem> &GD_GetSubwayItems() {
 const SubwayItem &GD_GetSubwayItem(int id) {
   return GetState().subway_items_.at(id);
 }
+
+int GD_GetSubwayItemForPainting(const std::string& painting_id) {
+  return GetState().subway_item_by_painting_.at(painting_id);
+}
+
+int GD_GetSubwayItemForSunwarp(const SubwaySunwarp &sunwarp) {
+  return GetState().subway_item_by_sunwarp_.at(sunwarp);
+}