1 files changed, 53 insertions, 1 deletions

@@ -2,6 +2,7 @@
 #include <google/protobuf/text_format.h>
 
 #include <cstdint>
+#include <filesystem>
 #include <fstream>
 #include <iostream>
 #include <map>
@@ -43,6 +44,7 @@ class AssignIds {
     ProcessSpecialIds();
     ProcessProgressivesFile(datadir_path / "progressives.txtpb");
     ProcessDoorGroupsFile(datadir_path / "door_groups.txtpb");
+    ProcessGlobalMetadataFile(datadir_path / "metadata.txtpb");
 
     WriteIds(ids_path);
 
@@ -63,6 +65,7 @@ class AssignIds {
         UpdateNextId(room.panels());
         UpdateNextId(room.masteries());
         UpdateNextId(room.keyholders());
+        UpdateNextId(room.ports());
       }
     }
 
@@ -109,7 +112,8 @@ class AssignIds {
 
   void ProcessDoor(const HumanDoor& h_door,
                    const std::string& current_map_name) {
-    if (h_door.type() == DoorType::EVENT) {
+    if (h_door.type() == DoorType::EVENT && !h_door.latch() &&
+        !h_door.legacy_location()) {
       return;
     }
 
@@ -243,6 +247,37 @@ class AssignIds {
                                              .at(h_keyholder.name());
       }
     }
+
+    for (const HumanPort& h_port : h_room.ports()) {
+      if (h_port.no_shuffle()) {
+        continue;
+      }
+
+      auto& maps = *output_.mutable_maps();
+      auto& rooms = *maps[current_map_name].mutable_rooms();
+      auto& ports = *rooms[h_room.name()].mutable_ports();
+
+      if (!id_mappings_.maps().contains(current_map_name) ||
+          !id_mappings_.maps()
+               .at(current_map_name)
+               .rooms()
+               .contains(h_room.name()) ||
+          !id_mappings_.maps()
+               .at(current_map_name)
+               .rooms()
+               .at(h_room.name())
+               .ports()
+               .contains(h_port.name())) {
+        ports[h_port.name()] = next_id_++;
+      } else {
+        ports[h_port.name()] = id_mappings_.maps()
+                                   .at(current_map_name)
+                                   .rooms()
+                                   .at(h_room.name())
+                                   .ports()
+                                   .at(h_port.name());
+      }
+    }
   }
 
   void ProcessSpecialIds() {
@@ -287,6 +322,23 @@ class AssignIds {
     }
   }
 
+  void ProcessGlobalMetadataFile(std::filesystem::path path) {
+    if (!std::filesystem::exists(path)) {
+      return;
+    }
+
+    auto h_metadata = ReadMessageFromFile<HumanGlobalMetadata>(path.string());
+    auto& specials = *output_.mutable_special();
+
+    for (const std::string& h_special : h_metadata.special_names()) {
+      if (!id_mappings_.special().contains(h_special)) {
+        specials[h_special] = next_id_++;
+      } else {
+        specials[h_special] = id_mappings_.special().at(h_special);
+      }
+    }
+  }
+
  private:
   void UpdateNextId(const google::protobuf::Map<std::string, uint64_t>& ids) {
     for (const auto& [_, id] : ids) {