Merge pull request #70 from hwh008/fix/remove_relationship_by_pointer

Remove specific one relationship when its reference pointers are the identical

Author: csprance

addons/gecs/ecs/entity.gd

@@ -276,14 +276,20 @@ func remove_relationship(relationship: Relationship, limit: int = -1) -> void:
 
 	var to_remove = []
 	var removed_count = 0
-
-	for rel in relationships:
-		if rel.matches(relationship):
-			to_remove.append(rel)
-			removed_count += 1
-			# If limit is positive and we've reached it, stop collecting
-			if limit > 0 and removed_count >= limit:
-				break
+	
+	var pattern_remove = true
+	if relationships.has(relationship):
+		to_remove.append(relationship)
+		pattern_remove = false
+
+	if pattern_remove:
+		for rel in relationships:
+			if rel.matches(relationship):
+				to_remove.append(rel)
+				removed_count += 1
+				# If limit is positive and we've reached it, stop collecting
+				if limit > 0 and removed_count >= limit:
+					break
 
 	for rel in to_remove:
 		relationships.erase(rel)

addons/gecs/tests/core/test_relationships.gd

@@ -977,6 +977,27 @@ func test_component_target_relationship_by_component_query():
 	var rel_love_attack = e_bob.get_relationship(Relationship.new({C_TestA: {}}, C_TestC.new()))
 	assert_int(rel_love_attack.relation.value).is_equal(10)
 
+
+func test_remove_specific_relationship():
+	e_bob = Person.new()
+	world.add_entity(e_bob)
+	
+	e_bob.add_relationship(Relationship.new(C_Likes.new(1), e_alice))
+	e_bob.add_relationship(Relationship.new(C_Likes.new(2), e_alice))
+	e_bob.add_relationship(Relationship.new(C_Likes.new(1), e_alice))
+	
+	var all_rels = e_bob.get_relationships(Relationship.new({C_Likes:{}}, null))
+	assert_array(all_rels).has_size(3)
+	
+	assert_int(all_rels[1].relation.value).is_equal(2)
+	e_bob.remove_relationship(all_rels[1])
+	
+	var like1_rels = e_bob.get_relationships(Relationship.new({C_Likes:{}}, null))
+	assert_array(like1_rels).has_size(2)
+	assert_int(like1_rels[0].relation.value).is_equal(1)
+	assert_int(like1_rels[1].relation.value).is_equal(1)
+	
+	
 # # FIXME: This is not working
 # func test_reverse_relationships_a():