feat: adds has_some

OctoD · Jan 12, 2024 · d4de440 · d4de440
1 parent 58c7f46
commit d4de440
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/src/system/tag/tag_dictionary.cpp b/src/system/tag/tag_dictionary.cpp
@@ -14,6 +14,7 @@ void TagDictionary::_bind_methods()
 	ClassDB::bind_method(D_METHOD("clear_tags"), &TagDictionary::clear_tags);
 	ClassDB::bind_method(D_METHOD("get_tags"), &TagDictionary::get_tags);
 	ClassDB::bind_method(D_METHOD("has_all", "tags"), &TagDictionary::has_all);
+	ClassDB::bind_method(D_METHOD("has_some", "tags"), &TagDictionary::has_some);
 	ClassDB::bind_method(D_METHOD("has_tag_path", "tag_path"), &TagDictionary::has_tag_path);
 	ClassDB::bind_method(D_METHOD("has_tag", "tag"), &TagDictionary::has_tag);
 	ClassDB::bind_method(D_METHOD("remove_tag_path", "tag_path"), &TagDictionary::remove_tag_path);
@@ -176,7 +177,7 @@ PackedStringArray TagDictionary::get_tags_from_path(const StringName &p_tag_path
 
 bool TagDictionary::has_all(const PackedStringArray p_tags) const
 {
-    for (StringName tag : p_tags)
+	for (StringName tag : p_tags)
 	{
 		if (!tags.has(tag))
 		{
@@ -187,6 +188,19 @@ bool TagDictionary::has_all(const PackedStringArray p_tags) const
 	return true;
 }
 
+bool TagDictionary::has_some(const PackedStringArray p_tags) const
+{
+	for (StringName tag : p_tags)
+	{
+		if (tags.has(tag))
+		{
+			return true;
+		}
+	}
+
+	return false;
+}
+
 bool TagDictionary::has_tag(const StringName &tag) const
 {
 	return tags.has(tag);
@@ -244,7 +258,7 @@ void TagDictionary::remove_tags(const PackedStringArray &p_tags)
 {
 	PackedStringArray removed_tags = PackedStringArray();
 	PackedStringArray copy = PackedStringArray(tags);
-	
+
 	for (StringName tag : p_tags)
 	{
 		int index = tags.find(tag);

diff --git a/src/system/tag/tag_dictionary.h b/src/system/tag/tag_dictionary.h
@@ -65,6 +65,10 @@ namespace ggs
 		/// @param tags The tags to check.
 		/// @return True if the tag dictionary has all the tags, false otherwise.
 		bool has_all(const PackedStringArray p_tags) const;
+		/// @brief Checks if the tag dictionary has any of the tags.
+		/// @param p_tags The tags to check.
+		/// @return True if the tag dictionary has any of the tags, false otherwise.
+		bool has_some(const PackedStringArray p_tags) const;
 		/// @brief Returns `true` if the tag dictionary has the tag.
 		/// @param tag The tag to check.
 		/// @return `true` if the tag dictionary has the tag.