1 files changed, 66 insertions, 4 deletions

@@ -65,6 +65,11 @@ class AssignIds {
         UpdateNextId(room.panels());
         UpdateNextId(room.masteries());
         UpdateNextId(room.keyholders());
+        UpdateNextId(room.ports());
+      }
+
+      if (map.has_rte()) {
+        UpdateNextId(map.rte());
       }
     }
 
@@ -92,10 +97,31 @@ class AssignIds {
   void ProcessMap(std::filesystem::path path) {
     std::string map_name = path.filename().string();
 
+    ProcessMapMetadata(path / "metadata.txtpb", map_name);
     ProcessDoorsFile(path / "doors.txtpb", map_name);
     ProcessRooms(path / "rooms", map_name);
   }
 
+  void ProcessMapMetadata(std::filesystem::path path,
+                          const std::string& current_map_name) {
+    if (!std::filesystem::exists(path)) {
+      return;
+    }
+
+    auto metadata = ReadMessageFromFile<HumanMap>(path.string());
+    auto& maps = *output_.mutable_maps();
+
+    if (metadata.has_rte_room()) {
+      if (!id_mappings_.maps().contains(current_map_name) ||
+          !id_mappings_.maps().at(current_map_name).has_rte()) {
+        maps[current_map_name].set_rte(next_id_++);
+      } else {
+        maps[current_map_name].set_rte(
+            id_mappings_.maps().at(current_map_name).rte());
+      }
+    }
+  }
+
   void ProcessDoorsFile(std::filesystem::path path,
                         const std::string& current_map_name) {
     if (!std::filesystem::exists(path)) {
@@ -111,7 +137,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;
     }
 
@@ -245,6 +272,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() {
@@ -309,9 +367,13 @@ class AssignIds {
  private:
   void UpdateNextId(const google::protobuf::Map<std::string, uint64_t>& ids) {
     for (const auto& [_, id] : ids) {
-      if (id > next_id_) {
-        next_id_ = id;
-      }
+      UpdateNextId(id);
+    }
+  }
+
+  void UpdateNextId(uint64_t id) {
+    if (id > next_id_) {
+      next_id_ = id;
     }
   }