3 files changed, 91 insertions, 0 deletions

@@ -246,6 +246,46 @@ uint64_t Container::FindOrAddMastery(std::optional<std::string> map_name,
   }
 }
 
+uint64_t Container::FindOrAddKeyholder(
+    std::optional<std::string> map_name, std::optional<std::string> room_name,
+    std::string keyholder_name, std::optional<std::string> map_fallback,
+    std::optional<std::string> room_fallback) {
+  if (!map_name) {
+    if (!map_fallback) {
+      std::cout << "No map name provided for " << keyholder_name << std::endl;
+      map_name = "global";
+    } else {
+      map_name = map_fallback;
+    }
+  }
+
+  if (!room_name) {
+    if (!room_fallback) {
+      std::cout << "No room name provided for " << keyholder_name << std::endl;
+      room_name = "global";
+    } else {
+      room_name = room_fallback;
+    }
+  }
+
+  auto& room_container =
+      keyholder_id_by_map_room_keyholder_names_[*map_name][*room_name];
+  auto it = room_container.find(keyholder_name);
+  if (it == room_container.end()) {
+    uint64_t new_id = all_objects_.keyholders_size();
+    Keyholder* keyholder = all_objects_.add_keyholders();
+    keyholder->set_id(new_id);
+    keyholder->set_room_id(FindOrAddRoom(map_name, *room_name, std::nullopt));
+    keyholder->set_name(keyholder_name);
+
+    room_container[keyholder_name] = new_id;
+
+    return new_id;
+  } else {
+    return it->second;
+  }
+}
+
 uint64_t Container::FindOrAddDoor(std::optional<std::string> map_name,
                                   std::string door_name,
                                   std::optional<std::string> map_fallback) {
@@ -46,6 +46,12 @@ class Container {
                             std::optional<std::string> map_fallback,
                             std::optional<std::string> room_fallback);
 
+  uint64_t FindOrAddKeyholder(std::optional<std::string> map_name,
+                              std::optional<std::string> room_name,
+                              std::string keyholder_name,
+                              std::optional<std::string> map_fallback,
+                              std::optional<std::string> room_fallback);
+
   uint64_t FindOrAddDoor(std::optional<std::string> map_name,
                          std::string door_name,
                          std::optional<std::string> map_fallback);
@@ -69,6 +75,8 @@ class Container {
   std::map<std::string, uint64_t> letter_id_by_name_;
   std::map<std::string, std::map<std::string, std::map<std::string, uint64_t>>>
       mastery_id_by_map_room_mastery_names_;
+  std::map<std::string, std::map<std::string, std::map<std::string, uint64_t>>>
+      keyholder_id_by_map_room_keyholder_names_;
   std::map<std::string, std::map<std::string, uint64_t>>
       door_id_by_map_door_names_;
 };
@@ -109,6 +109,11 @@ class DataPacker {
       room.add_masteries(
           ProcessMastery(h_mastery, current_map_name, room.name()));
     }
+
+    for (const HumanKeyholder& h_keyholder : h_room.keyholders()) {
+      room.add_keyholders(
+          ProcessKeyholder(h_keyholder, current_map_name, room.name()));
+    }
   }
 
   uint64_t ProcessPanel(const HumanPanel& h_panel,
@@ -176,6 +181,10 @@ class DataPacker {
       painting.set_enter_only(h_painting.enter_only());
     }
 
+    if (h_painting.has_exit_only()) {
+      painting.set_exit_only(h_painting.exit_only());
+    }
+
     if (h_painting.has_required_door()) {
       std::optional<std::string> map_name =
           h_painting.required_door().has_map()
@@ -238,6 +247,20 @@ class DataPacker {
     return mastery_id;
   }
 
+  uint64_t ProcessKeyholder(const HumanKeyholder& h_keyholder,
+                            const std::string& current_map_name,
+                            const std::string& current_room_name) {
+    uint64_t keyholder_id = container_.FindOrAddKeyholder(
+        current_map_name, current_room_name, h_keyholder.name(), std::nullopt,
+        std::nullopt);
+    Keyholder& keyholder =
+        *container_.all_objects().mutable_keyholders(keyholder_id);
+
+    keyholder.set_path(h_keyholder.path());
+
+    return keyholder_id;
+  }
+
   void ProcessDoorsFile(std::filesystem::path path,
                         const std::string& current_map_name) {
     if (!std::filesystem::exists(path)) {
@@ -292,6 +315,26 @@ class DataPacker {
       }
     }
 
+    for (const KeyholderIdentifier& ki : h_door.keyholders()) {
+      KeyholderAnswer* answer = door.add_keyholders();
+
+      std::optional<std::string> map_name =
+          ki.has_map() ? std::optional<std::string>(ki.map()) : std::nullopt;
+      answer->set_keyholder(container_.FindOrAddKeyholder(
+          map_name, ki.room(), ki.name(), current_map_name, std::nullopt));
+
+      if (ki.has_key()) {
+        answer->set_key(ki.key());
+      }
+    }
+
+    for (const RoomIdentifier& ri : h_door.rooms()) {
+      std::optional<std::string> map_name =
+          ri.has_map() ? std::optional<std::string>(ri.map()) : std::nullopt;
+      door.add_rooms(
+          container_.FindOrAddRoom(map_name, ri.name(), current_map_name));
+    }
+
     if (h_door.has_control_center_color()) {
       door.set_control_center_color(h_door.control_center_color());
     }