From 956f2ea3bd7207ff3014055a533c9de2c9b755d5 Mon Sep 17 00:00:00 2001 From: Adrian Schmid Date: Tue, 22 Aug 2023 19:16:20 +0200 Subject: [PATCH 1/3] moved version back up to 4.1 (sorry Lars) --- src/project.godot | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/project.godot b/src/project.godot index 9bd18f6..fa6866c 100644 --- a/src/project.godot +++ b/src/project.godot @@ -12,7 +12,7 @@ config_version=5 config/name="Frame of Mind" run/main_scene="res://main.tscn" -config/features=PackedStringArray("4.0", "Forward Plus") +config/features=PackedStringArray("4.1", "Forward Plus") run/max_fps=60 boot_splash/bg_color=Color(0.0313726, 0.0117647, 0.129412, 1) boot_splash/image="res://splash.png" @@ -80,12 +80,12 @@ player_backwards={ } mouse_left={ "deadzone": 0.5, -"events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":1,"pressed":false,"double_click":false,"script":null) +"events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":1,"canceled":false,"pressed":false,"double_click":false,"script":null) ] } mouse_right={ "deadzone": 0.5, -"events": [null, Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":2,"pressed":false,"double_click":false,"script":null) +"events": [null, Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":2,"canceled":false,"pressed":false,"double_click":false,"script":null) ] } look_right={ From 72efb61d28e776d15813b376e93a4c6a8cb51181 Mon Sep 17 00:00:00 2001 From: Adrian Schmid Date: Tue, 22 Aug 2023 20:00:33 +0200 Subject: [PATCH 2/3] postits are now returned to the panel if the group doesn't match --- src/logic-scenes/board/card-board.gd | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/logic-scenes/board/card-board.gd b/src/logic-scenes/board/card-board.gd index 52c1fca..3c02e0f 100644 --- a/src/logic-scenes/board/card-board.gd +++ b/src/logic-scenes/board/card-board.gd @@ -209,6 +209,9 @@ func attach_postit_to_card(postit: Area2D, card: Area2D, update_dict = false): if not fluff.has_postit_attached(): return emit_signal("board_completed") + + elif active_context == ui_context.ASSIGN_POST_IT: + _return_postit_to_panels(postit) # Mark area that was hovered over as currently selected func handle_hover(to_handle: Area2D): From 12c51f842b9582ca2ab8a727798df903e1054216 Mon Sep 17 00:00:00 2001 From: Adrian Schmid Date: Tue, 22 Aug 2023 20:06:55 +0200 Subject: [PATCH 3/3] left/right clicking in assignment context returns postits to the panel --- src/logic-scenes/board/card-board.gd | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/logic-scenes/board/card-board.gd b/src/logic-scenes/board/card-board.gd index 3c02e0f..1eaee18 100644 --- a/src/logic-scenes/board/card-board.gd +++ b/src/logic-scenes/board/card-board.gd @@ -272,11 +272,19 @@ func _input(event): selected_card_for_assignment += 1 elif event.is_action_pressed("ui_left"): # left to switch context to the left + if active_context == ui_context.ASSIGN_POST_IT: + _return_postit_to_panels(currently_selected_node) + _leave_assignment_context() + active_context -= 1 if active_context <= -1: active_context = ui_context.POST_IT_LIST elif event.is_action_pressed("ui_right"): # right to switch context to the right + if active_context == ui_context.ASSIGN_POST_IT: + _return_postit_to_panels(currently_selected_node) + _leave_assignment_context() + active_context += 1 if active_context > 1: active_context = ui_context.DROPZONE