From a3972a65b9b443a6085a6ac40b153442e190f382 Mon Sep 17 00:00:00 2001
From: Star Rauchenberger <fefferburbia@gmail.com>
Date: Mon, 1 Sep 2025 12:54:46 -0400
Subject: Added progressive doors

---
 tools/datapacker/container.cpp | 17 +++++++++++++++++
 tools/datapacker/container.h   |  3 +++
 tools/datapacker/main.cpp      | 33 +++++++++++++++++++++++++++++++--
 3 files changed, 51 insertions(+), 2 deletions(-)

(limited to 'tools/datapacker')

diff --git a/tools/datapacker/container.cpp b/tools/datapacker/container.cpp
index 2c68552..624caf8 100644
--- a/tools/datapacker/container.cpp
+++ b/tools/datapacker/container.cpp
@@ -331,6 +331,23 @@ uint64_t Container::FindOrAddDoor(std::optional<std::string> map_name,
   }
 }
 
+uint64_t Container::FindOrAddProgressive(std::string prog_name) {
+  auto it = progressive_id_by_name_.find(prog_name);
+
+  if (it == progressive_id_by_name_.end()) {
+    uint64_t new_id = all_objects_.progressives_size();
+    Progressive* progressive = all_objects_.add_progressives();
+    progressive->set_id(new_id);
+    progressive->set_name(prog_name);
+
+    progressive_id_by_name_[prog_name] = new_id;
+
+    return new_id;
+  } else {
+    return it->second;
+  }
+}
+
 void Container::AddConnection(const Connection& connection) {
   *all_objects_.add_connections() = connection;
 }
diff --git a/tools/datapacker/container.h b/tools/datapacker/container.h
index 68f5875..8cec560 100644
--- a/tools/datapacker/container.h
+++ b/tools/datapacker/container.h
@@ -60,6 +60,8 @@ class Container {
 
   void AddConnection(const Connection& connection);
 
+  uint64_t FindOrAddProgressive(std::string prog_name);
+
   AllObjects& all_objects() { return all_objects_; }
 
  private:
@@ -82,6 +84,7 @@ class Container {
   std::map<std::string, std::map<std::string, uint64_t>>
       door_id_by_map_door_names_;
   std::map<std::string, uint64_t> ending_id_by_name_;
+  std::map<std::string, uint64_t> progressive_id_by_name_;
 };
 
 }  // namespace com::fourisland::lingo2_archipelago
diff --git a/tools/datapacker/main.cpp b/tools/datapacker/main.cpp
index 4923fce..5ed82cc 100644
--- a/tools/datapacker/main.cpp
+++ b/tools/datapacker/main.cpp
@@ -43,6 +43,7 @@ class DataPacker {
 
     ProcessConnectionsFile(datadir_path / "connections.txtpb", std::nullopt);
     ProcessMaps(datadir_path);
+    ProcessProgressivesFile(datadir_path / "progressives.txtpb");
     ProcessIdsFile(datadir_path / "ids.yaml");
 
     {
@@ -104,7 +105,7 @@ class DataPacker {
         container_.FindOrAddRoom(current_map_name, h_room.name(), std::nullopt);
     Room& room = *container_.all_objects().mutable_rooms(room_id);
 
-    //room.set_display_name(h_room.display_name());
+    // room.set_display_name(h_room.display_name());
 
     if (h_room.has_panel_display_name()) {
       room.set_panel_display_name(h_room.panel_display_name());
@@ -388,7 +389,7 @@ class DataPacker {
       door.add_doors(
           container_.FindOrAddDoor(map_name, di.name(), current_map_name));
     }
-    
+
     for (const std::string& ending_name : h_door.endings()) {
       door.add_endings(container_.FindOrAddEnding(ending_name));
     }
@@ -544,6 +545,29 @@ class DataPacker {
     }
   }
 
+  void ProcessProgressivesFile(std::filesystem::path path) {
+    if (!std::filesystem::exists(path)) {
+      return;
+    }
+
+    auto h_progs = ReadMessageFromFile<HumanProgressives>(path.string());
+
+    for (const HumanProgressive& h_prog : h_progs.progressives()) {
+      ProcessProgressive(h_prog);
+    }
+  }
+
+  void ProcessProgressive(const HumanProgressive& h_prog) {
+    uint64_t prog_id = container_.FindOrAddProgressive(h_prog.name());
+    Progressive& prog = *container_.all_objects().mutable_progressives(prog_id);
+
+    for (const DoorIdentifier& di : h_prog.doors()) {
+      uint64_t door_id =
+          container_.FindOrAddDoor(di.map(), di.name(), std::nullopt);
+      prog.add_doors(door_id);
+    }
+  }
+
   void ProcessIdsFile(std::filesystem::path path) {
     auto ids = ReadIdsFromYaml(path.string());
 
@@ -585,6 +609,11 @@ class DataPacker {
       uint64_t ending_id = container_.FindOrAddEnding(ending_name);
       container_.all_objects().mutable_endings(ending_id)->set_ap_id(ap_id);
     }
+
+    for (const auto& [prog_name, ap_id] : ids.progressives()) {
+      uint64_t prog_id = container_.FindOrAddProgressive(prog_name);
+      container_.all_objects().mutable_progressives(prog_id)->set_ap_id(ap_id);
+    }
   }
 
   std::string mapdir_;
-- 
cgit 1.4.1