1 files changed, 16 insertions, 2 deletions

@@ -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;
+        }
       }
     }
   }