3 files changed, 147 insertions, 4 deletions

@@ -13,6 +13,7 @@
 #include <string>
 
 #include "structs.h"
+#include "util/ids_yaml_format.h"
 
 namespace com::fourisland::lingo2_archipelago {
 namespace {
@@ -42,7 +43,7 @@ class HumanProcessor {
     ProcessConnectionsFile(datadir_path / "connections.txtpb", std::nullopt);
     ProcessMaps(datadir_path);
     ProcessProgressivesFile(datadir_path / "progressives.txtpb");
-    ProcessIdsFile(datadir_path / "ids.txtpb");
+    ProcessIdsFile(datadir_path / "ids.yaml");
   }
 
  private:
@@ -510,7 +511,68 @@ class HumanProcessor {
   }
 
   void ProcessIdsFile(std::filesystem::path path) {
-    // Ignore this for now.
+    auto ids = ReadIdsFromYaml(path.string());
+
+    DoorIdentifier di;
+    PanelIdentifier pi;
+    KeyholderIdentifier ki;
+
+    for (const auto& [map_name, map] : ids.maps()) {
+      di.set_map(map_name);
+      pi.set_map(map_name);
+      ki.set_map(map_name);
+
+      for (const auto& [door_name, ap_id] : map.doors()) {
+        di.set_name(door_name);
+
+        DoorInfo& door_info = info_.doors[di];
+        door_info.has_id = true;
+      }
+
+      for (const auto& [room_name, room] : map.rooms()) {
+        pi.set_room(room_name);
+        ki.set_room(room_name);
+
+        for (const auto& [panel_name, ap_id] : room.panels()) {
+          pi.set_name(panel_name);
+
+          PanelInfo& panel_info = info_.panels[pi];
+          panel_info.has_id = true;
+        }
+
+        for (const auto& [mastery_name, ap_id] : room.masteries()) {
+          // TODO: Mastery
+        }
+
+        for (const auto& [keyholder_name, ap_id] : room.keyholders()) {
+          ki.set_name(keyholder_name);
+
+          KeyholderInfo& keyholder_info = info_.keyholders[ki];
+          keyholder_info.has_id = true;
+        }
+      }
+    }
+
+    for (const auto& [tag, id] : ids.special()) {
+      // TODO: Specials
+    }
+
+    for (const auto& [letter_name, ap_id] : ids.letters()) {
+      LetterIdentifier li =
+          std::make_tuple(letter_name[0], letter_name[1] == '2');
+      LetterInfo& letter_info = info_.letters[li];
+      letter_info.has_id = true;
+    }
+
+    for (const auto& [ending_name, ap_id] : ids.endings()) {
+      EndingInfo& ending_info = info_.endings[ending_name];
+      ending_info.has_id = true;
+    }
+
+    for (const auto& [prog_name, ap_id] : ids.progressives()) {
+      ProgressiveInfo& prog_info = info_.progressives[prog_name];
+      prog_info.has_id = true;
+    }
   }
 
   std::string mapdir_;
@@ -39,6 +39,7 @@ struct RoomInfo {
 
 struct DoorInfo {
   std::vector<HumanDoor> definitions;
+  bool has_id = false;
 
   std::vector<HumanConnection> connections_referenced_by;
   std::vector<DoorIdentifier> doors_referenced_by;
@@ -72,6 +73,7 @@ struct ProxyInfo {
 
 struct PanelInfo {
   std::vector<HumanPanel> definitions;
+  bool has_id = false;
 
   std::string map_area_name;
 
@@ -83,6 +85,7 @@ struct PanelInfo {
 
 struct KeyholderInfo {
   std::vector<HumanKeyholder> definitions;
+  bool has_id = false;
 
   std::vector<DoorIdentifier> doors_referenced_by;
 };
@@ -91,10 +94,12 @@ using LetterIdentifier = std::tuple<char, bool>;
 
 struct LetterInfo {
   std::vector<RoomIdentifier> defined_in;
+  bool has_id = false;
 };
 
 struct EndingInfo {
   std::vector<RoomIdentifier> defined_in;
+  bool has_id = false;
 
   std::vector<DoorIdentifier> doors_referenced_by;
 };
@@ -105,6 +110,7 @@ struct PanelNameInfo {
 
 struct ProgressiveInfo {
   std::vector<HumanProgressive> definitions;
+  bool has_id = false;
 
   std::vector<DoorIdentifier> malformed_doors;
 };
@@ -172,6 +172,10 @@ class Validator {
            door_info.progressives_referenced_by) {
         std::cout << "    PROGRESSIVE " << prog_name << std::endl;
       }
+
+      if (door_info.has_id) {
+        std::cout << "    An AP ID is present." << std::endl;
+      }
     } else if (door_info.definitions.size() > 1) {
       std::cout << "Door " << door_identifier.ShortDebugString()
                 << " was defined multiple times." << std::endl;
@@ -215,6 +219,17 @@ class Validator {
                   << " is a location that depends on double_letters."
                   << std::endl;
       }
+
+      bool needs_id = (h_door.type() != DoorType::EVENT);
+      if (door_info.has_id != needs_id) {
+        if (needs_id) {
+          std::cout << "Door " << door_identifier.ShortDebugString()
+                    << " is missing an AP ID." << std::endl;
+        } else {
+          std::cout << "Door " << door_identifier.ShortDebugString()
+                    << " should not have an AP ID." << std::endl;
+        }
+      }
     }
   }
 
@@ -280,6 +295,10 @@ class Validator {
         std::cout << "    CONNECTION " << connection.ShortDebugString()
                   << std::endl;
       }
+
+      if (panel_info.has_id) {
+        std::cout << "    An AP ID is present." << std::endl;
+      }
     } else if (panel_info.definitions.size() > 1) {
       std::cout << "Panel " << panel_identifier.ShortDebugString()
                 << " was defined multiple times." << std::endl;
@@ -308,6 +327,11 @@ class Validator {
                   << "\" was defined multiple times." << std::endl;
       }
     }
+
+    if (!panel_info.has_id) {
+      std::cout << "Panel " << panel_identifier.ShortDebugString()
+                << " is missing an AP ID." << std::endl;
+    }
   }
 
   void ValidateKeyholder(const KeyholderIdentifier& keyholder_identifier,
@@ -321,10 +345,28 @@ class Validator {
         std::cout << "    DOOR " << door_identifier.ShortDebugString()
                   << std::endl;
       }
+
+      if (keyholder_info.has_id) {
+        std::cout << "    An AP ID is present." << std::endl;
+      }
     } else if (keyholder_info.definitions.size() > 1) {
       std::cout << "Keyholder " << keyholder_identifier.ShortDebugString()
                 << " was defined multiple times." << std::endl;
     }
+
+    for (const HumanKeyholder& h_keyholder : keyholder_info.definitions) {
+      bool needs_id = (h_keyholder.has_key());
+
+      if (needs_id != keyholder_info.has_id) {
+        if (needs_id) {
+          std::cout << "Keyholder " << keyholder_identifier.ShortDebugString()
+                    << " is missing an AP ID." << std::endl;
+        } else {
+          std::cout << "Keyholder " << keyholder_identifier.ShortDebugString()
+                    << " should not have an AP ID." << std::endl;
+        }
+      }
+    }
   }
 
   void ValidateLetter(const LetterIdentifier& letter_identifier,
@@ -332,7 +374,14 @@ class Validator {
     std::string letter_name = std::string(1, std::get<0>(letter_identifier)) +
                               (std::get<1>(letter_identifier) ? "2" : "1");
 
-    if (letter_info.defined_in.size() > 1) {
+    if (letter_info.defined_in.empty()) {
+      std::cout << "Letter " << letter_name
+                << " has no definition, but was referenced:" << std::endl;
+
+      if (letter_info.has_id) {
+        std::cout << "    An AP ID is present." << std::endl;
+      }
+    } else if (letter_info.defined_in.size() > 1) {
       std::cout << "Letter " << letter_name
                 << " was defined in multiple places:" << std::endl;
 
@@ -340,6 +389,11 @@ class Validator {
         std::cout << "    " << room_identifier.ShortDebugString() << std::endl;
       }
     }
+
+    if (!letter_info.has_id) {
+      std::cout << "Letter " << letter_name << " is missing an AP ID."
+                << std::endl;
+    }
   }
 
   void ValidateEnding(const std::string& ending_name,
@@ -353,6 +407,10 @@ class Validator {
         std::cout << "    DOOR " << door_identifier.ShortDebugString()
                   << std::endl;
       }
+
+      if (ending_info.has_id) {
+        std::cout << "    An AP ID is present." << std::endl;
+      }
     } else if (ending_info.defined_in.size() > 1) {
       std::cout << "Ending " << ending_name
                 << " was defined in multiple places:" << std::endl;
@@ -361,6 +419,11 @@ class Validator {
         std::cout << "    " << room_identifier.ShortDebugString() << std::endl;
       }
     }
+
+    if (!ending_info.has_id) {
+      std::cout << "Ending " << ending_name << " is missing an AP ID."
+                << std::endl;
+    }
   }
 
   void ValidatePanelName(const std::string& panel_name,
@@ -379,10 +442,22 @@ class Validator {
 
   void ValidateProgressive(const std::string& prog_name,
                            const ProgressiveInfo& prog_info) const {
-    if (prog_info.definitions.size() > 1) {
+    if (prog_info.definitions.empty()) {
+      std::cout << "Progressive \"" << prog_name
+                << "\" has no definition, but was referenced:" << std::endl;
+
+      if (prog_info.has_id) {
+        std::cout << "    An AP ID is present." << std::endl;
+      }
+    } else if (prog_info.definitions.size() > 1) {
       std::cout << "Progressive \"" << prog_name
                 << "\" has multiple definitions." << std::endl;
     }
+
+    if (!prog_info.has_id) {
+      std::cout << "Progressive \"" << prog_name << "\" is missing an AP ID."
+                << std::endl;
+    }
   }
 
   const CollectedInfo& info_;