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/validator/human_processor.cpp | 33 +++++++++++++++++++++++++++++++++ tools/validator/structs.h | 9 +++++++++ tools/validator/validator.cpp | 28 ++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+) (limited to 'tools/validator') 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