From 181f6a7e26de7aa77253e36f43d23380f16c7d06 Mon Sep 17 00:00:00 2001 From: Adrian Schmid Date: Fri, 14 Jul 2023 19:15:00 +0200 Subject: [PATCH] Revert "adding stage handling to card" This reverts commit 1060f7815ff4fb7096ce69b360b30ac58272aa07. --- src/logic-scenes/board/card.gd | 37 +++++++++++++++------------------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/src/logic-scenes/board/card.gd b/src/logic-scenes/board/card.gd index 480d91f..cd7bd61 100644 --- a/src/logic-scenes/board/card.gd +++ b/src/logic-scenes/board/card.gd @@ -10,8 +10,6 @@ var noise: Noise = FastNoiseLite.new() var wiggle_tween var scale_tween -var on_stage = false - @export var text: String = "" : set(value): text = value @@ -90,10 +88,9 @@ func _ready(): _handle_wiggle(0) func _process(delta: float) -> void: - if self.on_stage: - if highlighted: - _handle_wiggle(delta) - + if highlighted: + _handle_wiggle(delta) + if get_overlapping_areas().size() > 0: if not is_printed: print_debug(self.name,": ",get_overlapping_areas()) @@ -123,25 +120,23 @@ func _on_focus_exited(): print(self, "is not focused") func _on_mouse_entered(): - if self.on_stage: - if not Input.is_action_pressed("mouse_left"): - highlighted = true - if "handle_hover" in owner: - owner.handle_hover(self) + if not Input.is_action_pressed("mouse_left"): + highlighted = true + if "handle_hover" in owner: + owner.handle_hover(self) func _on_mouse_exited(): - if self.on_stage: - highlighted = false + highlighted = false func _on_input_event(viewport, event, shape_idx): - if self.on_stage: - if event is InputEventMouseMotion: - _move_card() - - if event is InputEventMouseButton: - if event.button_index == MOUSE_BUTTON_LEFT: - if is_dragable and "handle_mouse_button" in owner: - owner.handle_mouse_button(self, event) + + if event is InputEventMouseMotion: + _move_card() + + if event is InputEventMouseButton: + if event.button_index == MOUSE_BUTTON_LEFT: + if is_dragable and "handle_mouse_button" in owner: + owner.handle_mouse_button(self, event) func _move_card(): if is_dragged: