diff --git a/src/logic-scenes/board/card-board.gd b/src/logic-scenes/board/card-board.gd index 010d774..d55b3af 100644 --- a/src/logic-scenes/board/card-board.gd +++ b/src/logic-scenes/board/card-board.gd @@ -105,6 +105,7 @@ func _process(delta: float): else: # do adjustment with FIR filter note.position = _smooth(note.position, note.home, delta) + note.z_index = 0 diff --git a/src/logic-scenes/board/card.gd b/src/logic-scenes/board/card.gd index 2820c56..9564891 100644 --- a/src/logic-scenes/board/card.gd +++ b/src/logic-scenes/board/card.gd @@ -1,7 +1,7 @@ extends Draggable class_name Card -var card_id +var card_id : StringName enum burned { NOT, diff --git a/src/logic-scenes/board/draggable.gd b/src/logic-scenes/board/draggable.gd index 8ae8a04..1c44a94 100644 --- a/src/logic-scenes/board/draggable.gd +++ b/src/logic-scenes/board/draggable.gd @@ -70,6 +70,7 @@ var tween : Tween = null func animate_home() -> void: + z_index = 50 if tween: tween.kill() tween = create_tween().set_ease(Tween.EASE_IN_OUT).set_trans(Tween.TRANS_QUART) tween.tween_property(self, "position", home, 0.5) @@ -114,6 +115,7 @@ func start_drag(mouse_offset: Vector2) -> void: _drag_start_position = global_position _mouse_drag_offset = mouse_offset _drag_source = get_parent() + z_index = 60 is_dragged = true ## Updates position during drag (call from _process or manual update) @@ -130,6 +132,7 @@ func find_drop_target() -> Node: ## End drag operation and return the node we want to be accepted by (if any) func end_drag() -> Node: + z_index = 0 is_dragged = false _drag_source = null return null diff --git a/src/logic-scenes/board/physics-board.tscn b/src/logic-scenes/board/physics-board.tscn index d19e72b..cb0adb9 100644 --- a/src/logic-scenes/board/physics-board.tscn +++ b/src/logic-scenes/board/physics-board.tscn @@ -177,6 +177,7 @@ layout_mode = 2 mouse_filter = 1 [node name="instructions_panel" type="PanelContainer" parent="."] +z_index = 100 layout_mode = 2 size_flags_horizontal = 4 size_flags_vertical = 0 diff --git a/src/logic-scenes/board/sticky-note.gd b/src/logic-scenes/board/sticky-note.gd index d24f8d3..25c7f77 100644 --- a/src/logic-scenes/board/sticky-note.gd +++ b/src/logic-scenes/board/sticky-note.gd @@ -2,7 +2,7 @@ extends Draggable class_name StickyNote var sticky_id -var parent_id +var parent_id : StringName var sibling: StickyNote var shift_tween: Tween