1 files changed, 8 insertions, 9 deletions

@@ -9,6 +9,7 @@
 #include <string>
 
 #include "proto/human.pb.h"
+#include "util/ids_yaml_format.h"
 #include "util/naming.h"
 
 namespace com::fourisland::lingo2_archipelago {
@@ -34,7 +35,7 @@ class AssignIds {
 
   void Run() {
     std::filesystem::path datadir_path = mapdir_;
-    std::filesystem::path ids_path = datadir_path / "ids.txtpb";
+    std::filesystem::path ids_path = datadir_path / "ids.yaml";
 
     ReadIds(ids_path);
 
@@ -46,7 +47,11 @@ class AssignIds {
   }
 
   void ReadIds(std::filesystem::path path) {
-    id_mappings_ = ReadMessageFromFile<IdMappings>(path.string());
+    if (!std::filesystem::exists(path)) {
+      return;
+    }
+
+    id_mappings_ = ReadIdsFromYaml(path.string());
 
     for (const auto& [_, map] : id_mappings_.maps()) {
       for (const auto& [_, id] : map.doors()) {
@@ -86,13 +91,7 @@ class AssignIds {
   }
 
   void WriteIds(std::filesystem::path path) {
-    std::string output;
-    google::protobuf::TextFormat::PrintToString(id_mappings_, &output);
-
-    {
-      std::ofstream outputfile(path.string());
-      outputfile << output;
-    }
+    WriteIdsAsYaml(id_mappings_, path.string());
   }
 
   void ProcessMaps(std::filesystem::path path) {