diff --git a/src/logic-scenes/board/card-board.gd b/src/logic-scenes/board/card-board.gd index 3e1a798..c898624 100644 --- a/src/logic-scenes/board/card-board.gd +++ b/src/logic-scenes/board/card-board.gd @@ -27,8 +27,21 @@ var has_stage = false: @onready var postit_container = $HBoxContainer/ScrollContainer/VBoxContainer @onready var board_of_devs = $"board of devs" @onready var base_postit_panel = $HBoxContainer/ScrollContainer/VBoxContainer/Panel -@onready var empty_text = $emptyText @onready var active_context = ui_context.DROPZONE # 0 = dropzone, 1 = post it list +@onready var instructions = $instructions_panel/HBoxContainer/cards_remaining + +var mementos_collected: int = 0: + set(mementos): + mementos_collected = mementos + match mementos: + 1: + instructions.text = "There are three Mementos left to find." + 2: + instructions.text = "You have collected half of the mementos." + 3: + instructions.text = "Find the last Memento to complete the Board." + 4: + instructions.text = "Combine cards to order your thoughts." var currently_selected_node: Area2D = null var currently_selected_card_for_assigning: Area2D = null @@ -62,12 +75,13 @@ func _process(delta): # we should maybe consider moving this to _input() for consistency if Input.is_action_just_pressed("ui_cancel"): - populate_board(["c_Joy","p_effort","c_backlash","c_body","c_hit","p_slut","p_worried_mother","p_cross_friend"]) + populate_board(["c_Joy","p_effort","c_backlash","c_body","c_hit","p_reward","p_worried_mother","p_cross_friend"]) # Will be used later to spawn Cards and Post-Its and remember them in the dictionary func populate_board(card_names: Array): - empty_text.visible = false + + mementos_collected += 1 var all_cards = Array() var all_postits = Array() diff --git a/src/logic-scenes/board/physics-board.tscn b/src/logic-scenes/board/physics-board.tscn index 35bb3e1..c98f8c1 100644 --- a/src/logic-scenes/board/physics-board.tscn +++ b/src/logic-scenes/board/physics-board.tscn @@ -12,12 +12,12 @@ shader = ExtResource("1_ggnth") shader_parameter/magic_scale_factor = 1500.0 shader_parameter/tex = ExtResource("1_8brxc") -[sub_resource type="RectangleShape2D" id="RectangleShape2D_ivo5o"] -size = Vector2(4249, 766.5) - [sub_resource type="RectangleShape2D" id="RectangleShape2D_5ri3m"] size = Vector2(4262, 766.5) +[sub_resource type="RectangleShape2D" id="RectangleShape2D_ivo5o"] +size = Vector2(4249, 766.5) + [node name="board" type="PanelContainer"] material = SubResource("ShaderMaterial_ttqei") clip_contents = true @@ -75,15 +75,6 @@ process_mode = 4 visible = false layout_mode = 2 -[node name="border_right" type="Area2D" parent="."] -position = Vector2(1872, 461) -script = ExtResource("6_wpxls") -direction = Vector2(-100, 0) - -[node name="CollisionShape2D" type="CollisionShape2D" parent="border_right"] -rotation = 1.5708 -shape = SubResource("RectangleShape2D_ivo5o") - [node name="up" type="Control" parent="."] layout_mode = 2 size_flags_horizontal = 4 @@ -94,7 +85,7 @@ script = ExtResource("6_wpxls") direction = Vector2(0, 100) [node name="CollisionShape2D" type="CollisionShape2D" parent="up/border_up"] -position = Vector2(-58, -423) +position = Vector2(-58, -369) shape = SubResource("RectangleShape2D_5ri3m") [node name="left" type="Control" parent="."] @@ -107,7 +98,7 @@ script = ExtResource("6_wpxls") direction = Vector2(100, 0) [node name="CollisionShape2D" type="CollisionShape2D" parent="left/border_left"] -position = Vector2(-476, -22.5) +position = Vector2(-371, -21.5) rotation = 1.5708 shape = SubResource("RectangleShape2D_ivo5o") @@ -121,7 +112,7 @@ script = ExtResource("6_wpxls") direction = Vector2(0, -100) [node name="CollisionShape2D" type="CollisionShape2D" parent="down/border_down"] -position = Vector2(2, 416) +position = Vector2(2, 377) shape = SubResource("RectangleShape2D_5ri3m") [node name="right" type="Control" parent="."] @@ -134,23 +125,29 @@ script = ExtResource("6_wpxls") direction = Vector2(-100, 0) [node name="CollisionShape2D" type="CollisionShape2D" parent="right/border_left"] -position = Vector2(12, 13) +position = Vector2(20, 13) rotation = 1.5708 shape = SubResource("RectangleShape2D_ivo5o") -[node name="emptyText" type="Label" parent="."] -modulate = Color(0, 0, 0, 1) +[node name="instructions_panel" type="PanelContainer" parent="."] layout_mode = 2 -theme_override_font_sizes/font_size = 50 -text = "Collect mementos to fill board with cards." +size_flags_horizontal = 4 +size_flags_vertical = 0 + +[node name="HBoxContainer" type="HBoxContainer" parent="instructions_panel"] +layout_mode = 2 + +[node name="VSeparator2" type="VSeparator" parent="instructions_panel/HBoxContainer"] +custom_minimum_size = Vector2(15, 0) +layout_mode = 2 + +[node name="cards_remaining" type="Label" parent="instructions_panel/HBoxContainer"] +layout_mode = 2 +size_flags_vertical = 0 +text = "Collect Mementos to fill the mind-board." horizontal_alignment = 1 vertical_alignment = 1 -[node name="disclaimer" type="Label" parent="."] -modulate = Color(0, 0, 0, 1) +[node name="VSeparator" type="VSeparator" parent="instructions_panel/HBoxContainer"] +custom_minimum_size = Vector2(15, 0) layout_mode = 2 -size_flags_vertical = 0 -theme_override_font_sizes/font_size = 40 -text = "alpha: Gamepad compatibility is limited. Using a mouse to move cards is advised." -horizontal_alignment = 1 -vertical_alignment = 1