2 files changed, 25 insertions, 6 deletions

@@ -254,6 +254,11 @@ struct GameData {
             achievement_panels_.push_back(panel_id);
           }
 
+          if (panel_it.second["location_name"]) {
+            panels_[panel_id].location_name =
+                panel_it.second["location_name"].as<std::string>();
+          }
+
           if (panel_it.second["hunt"]) {
             panels_[panel_id].hunt = panel_it.second["hunt"].as<bool>();
           }
@@ -521,8 +526,21 @@ struct GameData {
       std::string room_name = rooms_[room_id].name;
 
       std::string area_name = room_name;
-      if (fold_areas.count(room_name)) {
-        int fold_area_id = fold_areas[room_name];
+      std::string section_name = panel.name;
+      std::string location_name = room_name + " - " + panel.name;
+
+      if (!panel.location_name.empty()) {
+        location_name = panel.location_name;
+
+        size_t divider_pos = location_name.find(" - ");
+        if (divider_pos != std::string::npos) {
+          area_name = location_name.substr(0, divider_pos);
+          section_name = location_name.substr(divider_pos + 3);
+        }
+      }
+
+      if (fold_areas.count(area_name)) {
+        int fold_area_id = fold_areas[area_name];
         area_name = map_areas_[fold_area_id].name;
       }
 
@@ -538,15 +556,15 @@ struct GameData {
       MapArea &map_area = map_areas_[area_id];
       // room field should be the original room ID
       map_area.locations.push_back(
-          {.name = panel.name,
-           .ap_location_name = room_name + " - " + panel.name,
+          {.name = section_name,
+           .ap_location_name = location_name,
            .ap_location_id = panel.ap_location_id,
            .room = panel.room,
            .panels = {panel.id},
            .classification = classification,
            .hunt = panel.hunt});
-      locations_by_name[map_area.locations.back().ap_location_name] = {
-          area_id, map_area.locations.size() - 1};
+      locations_by_name[location_name] = {area_id,
+                                          map_area.locations.size() - 1};
     }
 
     for (int door_id : door_definition_order_) {
@@ -50,6 +50,7 @@ struct Panel {
   bool exclude_reduce = false;
   bool achievement = false;
   std::string achievement_name;
+  std::string location_name;
   bool non_counting = false;
   int ap_location_id = -1;
   bool hunt = false;