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/assign_ids/main.cpp | 20 ++++++++++++++++++++ tools/datapacker/container.cpp | 17 +++++++++++++++++ tools/datapacker/container.h | 3 +++ tools/datapacker/main.cpp | 31 +++++++++++++++++++++++++++++++ tools/util/ids_yaml_format.cpp | 12 ++++++++++++ tools/validator/human_processor.cpp | 33 +++++++++++++++++++++++++++++++++ tools/validator/structs.h | 9 +++++++++ tools/validator/validator.cpp | 28 ++++++++++++++++++++++++++++ 8 files changed, 153 insertions(+) (limited to 'tools') diff --git a/tools/assign_ids/main.cpp b/tools/assign_ids/main.cpp index e3add66..d212767 100644 --- a/tools/assign_ids/main.cpp +++ b/tools/assign_ids/main.cpp @@ -42,6 +42,7 @@ class AssignIds { ProcessMaps(datadir_path); ProcessSpecialIds(); ProcessProgressivesFile(datadir_path / "progressives.txtpb"); + ProcessDoorGroupsFile(datadir_path / "door_groups.txtpb"); WriteIds(ids_path); @@ -61,6 +62,7 @@ class AssignIds { for (const auto& [_, room] : map.rooms()) { UpdateNextId(room.panels()); UpdateNextId(room.masteries()); + UpdateNextId(room.keyholders()); } } @@ -68,6 +70,7 @@ class AssignIds { UpdateNextId(id_mappings_.letters()); UpdateNextId(id_mappings_.endings()); UpdateNextId(id_mappings_.progressives()); + UpdateNextId(id_mappings_.door_groups()); next_id_++; } @@ -267,6 +270,23 @@ class AssignIds { } } + void ProcessDoorGroupsFile(std::filesystem::path path) { + if (!std::filesystem::exists(path)) { + return; + } + + auto h_groups = ReadMessageFromFile(path.string()); + auto& groups = *output_.mutable_door_groups(); + + for (const HumanDoorGroup& h_group : h_groups.door_groups()) { + if (!id_mappings_.door_groups().contains(h_group.name())) { + groups[h_group.name()] = next_id_++; + } else { + groups[h_group.name()] = id_mappings_.door_groups().at(h_group.name()); + } + } + } + private: void UpdateNextId(const google::protobuf::Map& ids) { for (const auto& [_, id] : ids) { 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_; diff --git a/tools/util/ids_yaml_format.cpp b/tools/util/ids_yaml_format.cpp index 67c21d6..71bfd63 100644 --- a/tools/util/ids_yaml_format.cpp +++ b/tools/util/ids_yaml_format.cpp @@ -104,6 +104,13 @@ IdMappings ReadIdsFromYaml(const std::string& filename) { } } + if (document["door_groups"]) { + for (const auto& group_it : document["door_groups"]) { + (*result.mutable_door_groups())[group_it.first.as()] = + group_it.second.as(); + } + } + return result; } @@ -171,6 +178,11 @@ void WriteIdsAsYaml(const IdMappings& ids, const std::string& filename) { result["progressives"][prog_name] = prog_id; }); + OperateOnSortedMap(ids.door_groups(), [&result](const std::string& group_name, + uint64_t group_id) { + result["door_groups"][group_name] = group_id; + }); + std::ofstream output_stream(filename); output_stream << result << std::endl; } diff --git a/tools/validator/human_processor.cpp b/tools/validator/human_processor.cpp index 5720ba9..561225e 100644 --- a/tools/validator/human_processor.cpp +++ b/tools/validator/human_processor.cpp @@ -43,6 +43,7 @@ class HumanProcessor { 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"); } @@ -510,6 +511,33 @@ class HumanProcessor { } } + 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) { + DoorGroupInfo& group_info = info_.door_groups[h_group.name()]; + group_info.definitions.push_back(h_group); + + for (const DoorIdentifier& di : h_group.doors()) { + if (!di.has_map()) { + group_info.malformed_doors.push_back(di); + continue; + } + + DoorInfo& door_info = info_.doors[di]; + door_info.door_groups_referenced_by.push_back(h_group.name()); + } + } + void ProcessIdsFile(std::filesystem::path path) { auto ids = ReadIdsFromYaml(path.string()); @@ -573,6 +601,11 @@ class HumanProcessor { ProgressiveInfo& prog_info = info_.progressives[prog_name]; prog_info.has_id = true; } + + for (const auto& [group_name, ap_id] : ids.door_groups()) { + DoorGroupInfo& group_info = info_.door_groups[group_name]; + group_info.has_id = true; + } } std::string mapdir_; diff --git a/tools/validator/structs.h b/tools/validator/structs.h index e24ed3d..17ed33a 100644 --- a/tools/validator/structs.h +++ b/tools/validator/structs.h @@ -47,6 +47,7 @@ struct DoorInfo { std::vector paintings_referenced_by; std::vector ports_referenced_by; std::vector progressives_referenced_by; + std::vector door_groups_referenced_by; MalformedIdentifiers malformed_identifiers; }; @@ -115,6 +116,13 @@ struct ProgressiveInfo { std::vector malformed_doors; }; +struct DoorGroupInfo { + std::vector definitions; + bool has_id = false; + + std::vector malformed_doors; +}; + struct CollectedInfo { std::map maps; std::map rooms; @@ -128,6 +136,7 @@ struct CollectedInfo { std::map endings; std::map panel_names; std::map progressives; + std::map door_groups; }; } // namespace com::fourisland::lingo2_archipelago diff --git a/tools/validator/validator.cpp b/tools/validator/validator.cpp index ab1612e..4149caa 100644 --- a/tools/validator/validator.cpp +++ b/tools/validator/validator.cpp @@ -48,6 +48,9 @@ class Validator { for (const auto& [prog_name, prog_info] : info_.progressives) { ValidateProgressive(prog_name, prog_info); } + for (const auto& [group_name, group_info] : info_.door_groups) { + ValidateDoorGroup(group_name, group_info); + } } private: @@ -173,6 +176,11 @@ class Validator { std::cout << " PROGRESSIVE " << prog_name << std::endl; } + for (const std::string& group_name : + door_info.door_groups_referenced_by) { + std::cout << " DOOR GROUP " << group_name << std::endl; + } + if (door_info.has_id) { std::cout << " An AP ID is present." << std::endl; } @@ -460,6 +468,26 @@ class Validator { } } + void ValidateDoorGroup(const std::string& group_name, + const DoorGroupInfo& group_info) const { + if (group_info.definitions.empty()) { + std::cout << "Door group \"" << group_name + << "\" has no definition, but was referenced:" << std::endl; + + if (group_info.has_id) { + std::cout << " An AP ID is present." << std::endl; + } + } else if (group_info.definitions.size() > 1) { + std::cout << "Door group \"" << group_name + << "\" has multiple definitions." << std::endl; + } + + if (!group_info.has_id) { + std::cout << "Door group \"" << group_name << "\" is missing an AP ID." + << std::endl; + } + } + const CollectedInfo& info_; }; -- cgit 1.4.1