From 59356c6b9db39f67c65de44a591eae53cb438668 Mon Sep 17 00:00:00 2001 From: Tiger Jove Date: Sat, 13 Dec 2025 11:14:10 +0100 Subject: [PATCH] fix: shadowing issues in card-board. --- src/dev-util/room_template.gd | 2 +- src/logic-scenes/board/card-board.gd | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/dev-util/room_template.gd b/src/dev-util/room_template.gd index df0335f..40cabec 100644 --- a/src/dev-util/room_template.gd +++ b/src/dev-util/room_template.gd @@ -34,7 +34,7 @@ func get_ready(): func start_room(): pass -func pull_save_state(save: SaveGame) -> void: +func pull_save_state(_save: SaveGame) -> void: pass func save_room(): diff --git a/src/logic-scenes/board/card-board.gd b/src/logic-scenes/board/card-board.gd index 6f029bd..b32c70e 100644 --- a/src/logic-scenes/board/card-board.gd +++ b/src/logic-scenes/board/card-board.gd @@ -181,23 +181,23 @@ func populate_board(card_names: Array[StringName]): #currently_active_node = area_dict["dropzone_content"][0] # set first Card as currently selected node by default currently_active_node = dropzone.get_child(0) -func add_card(card: Card, reparent:bool = true): - if reparent: +func add_card(card: Card, re_parent:bool = true): + if re_parent: card.reparent(self) else: add_child(card) - card.position = Vector2(randi_range(dropzone_padding, dropzone_size.x), randi_range(dropzone_padding, dropzone_size.y)) + card.position = Vector2(randi_range(dropzone_padding, int(dropzone_size.x)), randi_range(dropzone_padding, int(dropzone_size.y))) insert_area(dropzone, card) card.set_owner(self) card.is_dragable = true -func add_sticky_note(sticky: StickyNote, reparent:bool = true): - var new_panel = StickyNotePanel.new() +func add_sticky_note(sticky: StickyNote, re_parent:bool = true): + var new_panel := StickyNotePanel.new() sticky_note_container.add_child(new_panel, true, Node.INTERNAL_MODE_DISABLED) #WARNING this for some reason would break the tweens new_panel.set_owner(self) sticky.current_handle = self - new_panel.attatch_sticky_note(sticky, self, false, reparent) + new_panel.attatch_sticky_note(sticky, self, false, re_parent) # Checks if a Node is currently inside the dropzone func is_in_dropzone(to_check: Node) -> bool: @@ -663,10 +663,9 @@ func rebuild_from_savedict(board_state:Dictionary): sticky.picked_random = randoms.has( sticky.sticky_id ) func validate_board(): - return if current_context == NAVIGATE: - var needs_rebuild = false + var needs_rebuild := false for node in dropzone.get_children(): if node is Card: match validate_card(node):