5 files changed, 200 insertions, 0 deletions

@@ -1,5 +1,10 @@
+find_package(Protobuf REQUIRED)
+
 add_library(util
+  identifiers.cpp
   naming.cpp
 )
 set_property(TARGET util PROPERTY CXX_STANDARD 20)
 set_property(TARGET util PROPERTY CXX_STANDARD_REQUIRED ON)
+target_include_directories(util PUBLIC ${CMAKE_BINARY_DIR})
+target_link_libraries(util PUBLIC protos protobuf::libprotobuf)
@@ -0,0 +1,102 @@
+#include "identifiers.h"
+
+#include <string>
+
+#include "proto/human.pb.h"
+
+namespace com::fourisland::lingo2_archipelago {
+
+std::optional<RoomIdentifier> GetCompleteRoomIdentifier(
+    RoomIdentifier identifier, std::optional<std::string> map_name) {
+  if (!identifier.has_map()) {
+    if (!map_name) {
+      return std::nullopt;
+    }
+    identifier.set_map(*map_name);
+  }
+  return identifier;
+}
+
+std::optional<DoorIdentifier> GetCompleteDoorIdentifier(
+    DoorIdentifier identifier, std::optional<std::string> map_name) {
+  if (!identifier.has_map()) {
+    if (!map_name) {
+      return std::nullopt;
+    }
+    identifier.set_map(*map_name);
+  }
+  return identifier;
+}
+
+std::optional<PortIdentifier> GetCompletePortIdentifier(
+    PortIdentifier identifier, std::optional<std::string> map_name,
+    std::optional<std::string> room_name) {
+  if (!identifier.has_map()) {
+    if (!map_name) {
+      return std::nullopt;
+    }
+    identifier.set_map(*map_name);
+  }
+  if (!identifier.has_room()) {
+    if (!room_name) {
+      return std::nullopt;
+    }
+    identifier.set_room(*room_name);
+  }
+  return identifier;
+}
+
+std::optional<PaintingIdentifier> GetCompletePaintingIdentifier(
+    PaintingIdentifier identifier, std::optional<std::string> map_name,
+    std::optional<std::string> room_name) {
+  if (!identifier.has_map()) {
+    if (!map_name) {
+      return std::nullopt;
+    }
+    identifier.set_map(*map_name);
+  }
+  if (!identifier.has_room()) {
+    if (!room_name) {
+      return std::nullopt;
+    }
+    identifier.set_room(*room_name);
+  }
+  return identifier;
+}
+
+std::optional<PanelIdentifier> GetCompletePanelIdentifierWithoutAnswer(
+    PanelIdentifier identifier, std::optional<std::string> map_name,
+    std::optional<std::string> room_name) {
+  if (!identifier.has_map()) {
+    if (!map_name) {
+      return std::nullopt;
+    }
+    identifier.set_map(*map_name);
+  }
+  if (!identifier.has_room()) {
+    if (!room_name) {
+      return std::nullopt;
+    }
+    identifier.set_room(*room_name);
+  }
+  identifier.clear_answer();
+  return identifier;
+}
+
+std::optional<KeyholderIdentifier> GetCompleteKeyholderIdentifierWithoutKey(
+    KeyholderIdentifier identifier, const std::string& map_name,
+    std::optional<std::string> room_name) {
+  if (!identifier.has_map()) {
+    identifier.set_map(map_name);
+  }
+  if (!identifier.has_room()) {
+    if (!room_name) {
+      return std::nullopt;
+    }
+    identifier.set_room(*room_name);
+  }
+  identifier.clear_key();
+  return identifier;
+}
+
+}  // namespace com::fourisland::lingo2_archipelago
@@ -0,0 +1,85 @@
+#ifndef TOOLS_UTIL_IDENTIFIERS_H_
+#define TOOLS_UTIL_IDENTIFIERS_H_
+
+#include <optional>
+#include <string>
+#include <utility>
+
+#include "proto/human.pb.h"
+
+namespace com::fourisland::lingo2_archipelago {
+
+class RoomIdentifierLess {
+ public:
+  bool operator()(const RoomIdentifier& lhs, const RoomIdentifier& rhs) const {
+    return std::tie(lhs.map(), lhs.name()) < std::tie(rhs.map(), rhs.name());
+  }
+};
+
+class DoorIdentifierLess {
+ public:
+  bool operator()(const DoorIdentifier& lhs, const DoorIdentifier& rhs) const {
+    return std::tie(lhs.map(), lhs.name()) < std::tie(rhs.map(), rhs.name());
+  }
+};
+
+class PortIdentifierLess {
+ public:
+  bool operator()(const PortIdentifier& lhs, const PortIdentifier& rhs) const {
+    return std::tie(lhs.map(), lhs.room(), lhs.name()) <
+           std::tie(rhs.map(), rhs.room(), rhs.name());
+  }
+};
+
+class PaintingIdentifierLess {
+ public:
+  bool operator()(const PaintingIdentifier& lhs,
+                  const PaintingIdentifier& rhs) const {
+    return std::tie(lhs.map(), lhs.room(), lhs.name()) <
+           std::tie(rhs.map(), rhs.room(), rhs.name());
+  }
+};
+
+class PanelIdentifierLess {
+ public:
+  bool operator()(const PanelIdentifier& lhs,
+                  const PanelIdentifier& rhs) const {
+    return std::tie(lhs.map(), lhs.room(), lhs.name(), lhs.answer()) <
+           std::tie(rhs.map(), rhs.room(), rhs.name(), rhs.answer());
+  }
+};
+
+class KeyholderIdentifierLess {
+ public:
+  bool operator()(const KeyholderIdentifier& lhs,
+                  const KeyholderIdentifier& rhs) const {
+    return std::tie(lhs.map(), lhs.room(), lhs.name(), lhs.key()) <
+           std::tie(rhs.map(), rhs.room(), rhs.name(), rhs.key());
+  }
+};
+
+std::optional<RoomIdentifier> GetCompleteRoomIdentifier(
+    RoomIdentifier identifier, std::optional<std::string> map_name);
+
+std::optional<DoorIdentifier> GetCompleteDoorIdentifier(
+    DoorIdentifier identifier, std::optional<std::string> map_name);
+
+std::optional<PortIdentifier> GetCompletePortIdentifier(
+    PortIdentifier identifier, std::optional<std::string> map_name,
+    std::optional<std::string> room_name);
+
+std::optional<PaintingIdentifier> GetCompletePaintingIdentifier(
+    PaintingIdentifier identifier, std::optional<std::string> map_name,
+    std::optional<std::string> room_name);
+
+std::optional<PanelIdentifier> GetCompletePanelIdentifierWithoutAnswer(
+    PanelIdentifier identifier, std::optional<std::string> map_name,
+    std::optional<std::string> room_name);
+
+std::optional<KeyholderIdentifier> GetCompleteKeyholderIdentifierWithoutKey(
+    KeyholderIdentifier identifier, const std::string& map_name,
+    std::optional<std::string> room_name);
+
+}  // namespace com::fourisland::lingo2_archipelago
+
+#endif /* TOOLS_UTIL_IDENTIFIERS_H_ */
@@ -2,6 +2,8 @@
 
 #include <sstream>
 
+namespace com::fourisland::lingo2_archipelago {
+
 std::string GetLetterName(std::string key, bool level2) {
   std::ostringstream lettername_s;
   lettername_s << key;
@@ -9,3 +11,5 @@ std::string GetLetterName(std::string key, bool level2) {
 
   return lettername_s.str();
 }
+
+}  // namespace com::fourisland::lingo2_archipelago
@@ -3,6 +3,10 @@
 
 #include <string>
 
+namespace com::fourisland::lingo2_archipelago {
+
 std::string GetLetterName(std::string key, bool level2);
 
+}  // namespace com::fourisland::lingo2_archipelago
+
 #endif /* TOOLS_UTIL_NAMING_H_ */