From 39c1969677ab9a1624d6702292dd7e7838c8ccfc Mon Sep 17 00:00:00 2001 From: Adrian Schmid Date: Sat, 12 Aug 2023 12:20:05 +0200 Subject: [PATCH] fixed checks for if post it is attached or if card has post it attached --- src/logic-scenes/board/card.gd | 9 +++------ src/logic-scenes/board/post-it.gd | 5 ++--- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/logic-scenes/board/card.gd b/src/logic-scenes/board/card.gd index 2ecbc438..2d1e3f23 100644 --- a/src/logic-scenes/board/card.gd +++ b/src/logic-scenes/board/card.gd @@ -52,6 +52,7 @@ var scale_tween @export var voice_line: AudioStream = null @export var is_dragable: bool = false @onready var diameter = $CollisionShape2D.shape.height +@onready var postit_anchor = get_child(3) var is_dragged: bool = false: set(dragged): @@ -124,7 +125,7 @@ func _on_mouse_entered(): is_mouse_entered = true if not Input.is_action_pressed("mouse_left"): if has_postit_attached(): - if get_child(-1).highlighted: + if postit_anchor.get_child(-1).highlighted: return highlighted = true if "handle_hover" in owner: @@ -151,11 +152,7 @@ func _move_card(): position += (get_viewport().get_mouse_position() - position) - mouse_offset func has_postit_attached() -> bool: - var all_children = get_children() - for child in all_children: - if child is PostIt: - return true - return false + return postit_anchor.get_child(-1) is PostIt func check_hover(): if is_mouse_entered: diff --git a/src/logic-scenes/board/post-it.gd b/src/logic-scenes/board/post-it.gd index 4df1b0f4..c170e2f2 100644 --- a/src/logic-scenes/board/post-it.gd +++ b/src/logic-scenes/board/post-it.gd @@ -116,9 +116,8 @@ func _move_post_it(): position += (get_viewport().get_mouse_position() - position) - mouse_offset func is_postit_attached() -> bool: - if self.get_parent() is Card: - return true - return false + # there is probably a nicer way to do this + return self.get_parent().get_parent() is Card func tween_transform_to(target: Vector2): var transform_tween = create_tween()