Added drag source filtering to DropArea.

BraindeadBZH · Jan 8, 2021 · 85390e4 · 85390e4
1 parent 204e97f
commit 85390e4
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/addons/cardengine/card/abstract_card.gd b/addons/cardengine/card/abstract_card.gd
@@ -693,7 +693,7 @@ func _on_Transitions_tween_all_completed() -> void:
 
 
 func _on_MouseArea_drag_started() -> void:
-	CardEngine.general().start_drag(_inst)
+	CardEngine.general().start_drag(_inst, _container)
 	_is_dragged = true
 
 	if _follow_mouse:

diff --git a/addons/cardengine/core/drop_area.gd b/addons/cardengine/core/drop_area.gd
@@ -3,6 +3,8 @@ extends Control
 
 signal dropped(card)
 
+export(Array) var source_filter: Array = []
+
 var _filter: Query = null
 
 
@@ -12,6 +14,10 @@ func set_filter(filter: Query) -> void:
 
 func can_drop_data(_position: Vector2, data) -> bool:
 	if data == "card_engine:drag":
+		var source = CardEngine.general().get_drag_source()
+		if not source_filter.empty() and not source_filter.has(source):
+			return false
+
 		if _filter != null:
 			var card := CardEngine.general().get_dragged_card()
 			return _filter.match_card(card.data())

diff --git a/addons/cardengine/core/general_manager.gd b/addons/cardengine/core/general_manager.gd
@@ -7,6 +7,7 @@ signal drag_stopped()
 
 var _drag_started: bool = false
 var _dragged_card: CardInstance = null
+var _drag_source: String = ""
 
 
 func validate_form(form_name: String, form: Dictionary) -> Array:
@@ -19,9 +20,10 @@ func validate_form(form_name: String, form: Dictionary) -> Array:
 	return errors
 
 
-func start_drag(card: CardInstance) -> void:
+func start_drag(card: CardInstance, source: String) -> void:
 	_drag_started = true
 	_dragged_card = card
+	_drag_source = source
 	emit_signal("drag_started")
 
 
@@ -33,7 +35,12 @@ func get_dragged_card() -> CardInstance:
 	return _dragged_card
 
 
+func get_drag_source() -> String:
+	return _drag_source
+
+
 func stop_drag() -> void:
 	_drag_started = false
 	_dragged_card = null
+	_drag_source = ""
 	emit_signal("drag_stopped")
diff --git a/screens/game/game_screen.tscn b/screens/game/game_screen.tscn
@@ -150,6 +150,7 @@ script = ExtResource( 4 )
 __meta__ = {
 "_edit_use_anchors_": false
 }
+source_filter = [ "hand" ]
 
 [node name="ManaBar" type="HBoxContainer" parent="."]
 anchor_left = 0.5