3 files changed, 32 insertions, 7 deletions

@@ -570,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()) {
@@ -586,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;
         }
 
@@ -606,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;
+        }
       }
     }
 
@@ -56,6 +56,7 @@ struct DoorInfo {
 
 struct PortInfo {
   std::vector<HumanPort> definitions;
+  bool has_id = false;
 
   std::vector<HumanConnection> connections_referenced_by;
   std::vector<HumanConnection> target_connections_referenced_by;
@@ -227,7 +227,7 @@ class Validator {
 
       if (h_door.type() == DoorType::STANDARD ||
           h_door.type() == DoorType::LOCATION_ONLY ||
-          h_door.type() == DoorType::GRAVESTONE) {
+          h_door.type() == DoorType::GRAVESTONE || h_door.legacy_location()) {
         if (h_door.double_letters()) {
           std::cout << "Door " << door_identifier.ShortDebugString()
                     << " is a location that depends on double_letters."
@@ -240,7 +240,8 @@ class Validator {
         }
       }
 
-      bool needs_id = (h_door.type() != DoorType::EVENT || h_door.latch());
+      bool needs_id = (h_door.type() != DoorType::EVENT || h_door.latch() ||
+                       h_door.legacy_location());
       if (door_info.has_id != needs_id) {
         if (needs_id) {
           std::cout << "Door " << door_identifier.ShortDebugString()
@@ -268,6 +269,10 @@ class Validator {
       for (const std::string& map_name : port_info.map_worldport_entrances) {
         std::cout << "    MAP (worldport_entrance) " << map_name << std::endl;
       }
+
+      if (port_info.has_id) {
+        std::cout << "    An AP ID is present." << std::endl;
+      }
     } else if (port_info.definitions.size() > 1) {
       std::cout << "Port " << port_identifier.ShortDebugString()
                 << " was defined multiple times." << std::endl;
@@ -300,6 +305,15 @@ class Validator {
           std::cout << "Port " << port_identifier.ShortDebugString()
                     << " is shuffleable and missing a rotation." << std::endl;
         }
+        if (!port_info.has_id) {
+          std::cout << "Port " << port_identifier.ShortDebugString()
+                    << " is missing an AP ID." << std::endl;
+        }
+      } else {
+        if (port_info.has_id) {
+          std::cout << "Port " << port_identifier.ShortDebugString()
+                    << " should not have an AP ID." << std::endl;
+        }
       }
     }
   }