1 files changed, 30 insertions, 10 deletions

@@ -77,6 +77,21 @@ class HumanProcessor {
     for (const std::string& path : metadata.excluded_nodes()) {
       map_info.game_nodes[path].uses++;
     }
+
+    for (const std::string& path : metadata.custom_nodes()) {
+      map_info.game_nodes[path].defined = true;
+    }
+
+    if (metadata.has_worldport_entrance()) {
+      auto port_identifier = GetCompletePortIdentifier(
+          metadata.worldport_entrance(), current_map_name, std::nullopt);
+      if (port_identifier) {
+        PortInfo& port_info = info_.ports[*port_identifier];
+        port_info.map_worldport_entrances.push_back(current_map_name);
+      } else {
+        map_info.malformed_worldport_entrance = metadata.worldport_entrance();
+      }
+    }
   }
 
   void ProcessRooms(std::filesystem::path path,
@@ -358,11 +373,6 @@ class HumanProcessor {
       DoorInfo& other_door_info = info_.doors[complete_door_identifier];
       other_door_info.doors_referenced_by.push_back(door_identifier);
     }
-
-    for (const std::string& ei : h_door.endings()) {
-      EndingInfo& ending_info = info_.endings[ei];
-      ending_info.doors_referenced_by.push_back(door_identifier);
-    }
   }
 
   void ProcessConnectionsFile(std::filesystem::path path,
@@ -560,12 +570,14 @@ class HumanProcessor {
     auto ids = ReadIdsFromYaml(path.string());
 
     DoorIdentifier di;
-    PanelIdentifier pi;
+    PanelIdentifier pai;
+    PortIdentifier poi;
     KeyholderIdentifier ki;
 
     for (const auto& [map_name, map] : ids.maps()) {
       di.set_map(map_name);
-      pi.set_map(map_name);
+      pai.set_map(map_name);
+      poi.set_map(map_name);
       ki.set_map(map_name);
 
       for (const auto& [door_name, ap_id] : map.doors()) {
@@ -576,13 +588,14 @@ class HumanProcessor {
       }
 
       for (const auto& [room_name, room] : map.rooms()) {
-        pi.set_room(room_name);
+        pai.set_room(room_name);
+        poi.set_room(room_name);
         ki.set_room(room_name);
 
         for (const auto& [panel_name, ap_id] : room.panels()) {
-          pi.set_name(panel_name);
+          pai.set_name(panel_name);
 
-          PanelInfo& panel_info = info_.panels[pi];
+          PanelInfo& panel_info = info_.panels[pai];
           panel_info.has_id = true;
         }
 
@@ -596,6 +609,13 @@ class HumanProcessor {
           KeyholderInfo& keyholder_info = info_.keyholders[ki];
           keyholder_info.has_id = true;
         }
+
+        for (const auto& [port_name, ap_id] : room.ports()) {
+          poi.set_name(port_name);
+
+          PortInfo& port_info = info_.ports[poi];
+          port_info.has_id = true;
+        }
       }
     }