From d79984b099c3f762b95d3b4257bef113d3a8d6ee Mon Sep 17 00:00:00 2001 From: Star Rauchenberger Date: Sun, 7 Sep 2025 15:42:00 -0400 Subject: Added door groups --- tools/datapacker/container.cpp | 17 +++++++++++++++++ tools/datapacker/container.h | 3 +++ tools/datapacker/main.cpp | 31 +++++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+) (limited to 'tools/datapacker') diff --git a/tools/datapacker/container.cpp b/tools/datapacker/container.cpp index 624caf8..4a656b3 100644 --- a/tools/datapacker/container.cpp +++ b/tools/datapacker/container.cpp @@ -348,6 +348,23 @@ uint64_t Container::FindOrAddProgressive(std::string prog_name) { } } +uint64_t Container::FindOrAddDoorGroup(std::string group_name) { + auto it = door_group_id_by_name_.find(group_name); + + if (it == door_group_id_by_name_.end()) { + uint64_t new_id = all_objects_.door_groups_size(); + DoorGroup* door_group = all_objects_.add_door_groups(); + door_group->set_id(new_id); + door_group->set_name(group_name); + + door_group_id_by_name_[group_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 8cec560..bc02ba4 100644 --- a/tools/datapacker/container.h +++ b/tools/datapacker/container.h @@ -62,6 +62,8 @@ class Container { uint64_t FindOrAddProgressive(std::string prog_name); + uint64_t FindOrAddDoorGroup(std::string group_name); + AllObjects& all_objects() { return all_objects_; } private: @@ -85,6 +87,7 @@ class Container { door_id_by_map_door_names_; std::map ending_id_by_name_; std::map progressive_id_by_name_; + std::map door_group_id_by_name_; }; } // namespace com::fourisland::lingo2_archipelago diff --git a/tools/datapacker/main.cpp b/tools/datapacker/main.cpp index 595647d..c72462d 100644 --- a/tools/datapacker/main.cpp +++ b/tools/datapacker/main.cpp @@ -44,6 +44,7 @@ class DataPacker { ProcessConnectionsFile(datadir_path / "connections.txtpb", std::nullopt); ProcessMaps(datadir_path); ProcessProgressivesFile(datadir_path / "progressives.txtpb"); + ProcessDoorGroupsFile(datadir_path / "door_groups.txtpb"); ProcessIdsFile(datadir_path / "ids.yaml"); { @@ -577,6 +578,31 @@ class DataPacker { } } + void ProcessDoorGroupsFile(std::filesystem::path path) { + if (!std::filesystem::exists(path)) { + return; + } + + auto h_groups = ReadMessageFromFile(path.string()); + + for (const HumanDoorGroup& h_group : h_groups.door_groups()) { + ProcessDoorGroup(h_group); + } + } + + void ProcessDoorGroup(const HumanDoorGroup& h_group) { + uint64_t group_id = container_.FindOrAddDoorGroup(h_group.name()); + DoorGroup& group = *container_.all_objects().mutable_door_groups(group_id); + + group.set_type(h_group.type()); + + for (const DoorIdentifier& di : h_group.doors()) { + uint64_t door_id = + container_.FindOrAddDoor(di.map(), di.name(), std::nullopt); + group.add_doors(door_id); + } + } + void ProcessIdsFile(std::filesystem::path path) { auto ids = ReadIdsFromYaml(path.string()); @@ -631,6 +657,11 @@ class DataPacker { uint64_t prog_id = container_.FindOrAddProgressive(prog_name); container_.all_objects().mutable_progressives(prog_id)->set_ap_id(ap_id); } + + for (const auto& [group_name, ap_id] : ids.door_groups()) { + uint64_t group_id = container_.FindOrAddDoorGroup(group_name); + container_.all_objects().mutable_door_groups(group_id)->set_ap_id(ap_id); + } } std::string mapdir_; -- cgit 1.4.1