From e8aee6f63345c0e10ed6392ad6a3883b6da18fc5 Mon Sep 17 00:00:00 2001
From: htoo-aung <113065976+htoo-aung@users.noreply.github.com>
Date: Thu, 6 Feb 2025 11:33:41 -0600
Subject: [PATCH] WIP starting piece select screen - added piece buttons
---
.godot/editor/editor_layout.cfg | 10 +++++-----
.godot/editor/project_metadata.cfg | 2 +-
.godot/editor/script_editor_cache.cfg | 22 +++++++++++-----------
scenes/screens/select_piece_screen.tscn | 14 ++++++++++++--
scripts/run_data/run_data.gd | 3 +++
scripts/screens/select_piece_screen.gd | 10 +++++++++-
6 files changed, 41 insertions(+), 20 deletions(-)
diff --git a/.godot/editor/editor_layout.cfg b/.godot/editor/editor_layout.cfg
index aced0f8..28a1f4b 100644
--- a/.godot/editor/editor_layout.cfg
+++ b/.godot/editor/editor_layout.cfg
@@ -18,8 +18,8 @@ dock_filesystem_v_split_offset=0
dock_filesystem_display_mode=0
dock_filesystem_file_sort=0
dock_filesystem_file_list_display_mode=1
-dock_filesystem_selected_paths=PackedStringArray("res://scenes/ui/menu_button.tscn")
-dock_filesystem_uncollapsed_paths=PackedStringArray("Favorites", "res://", "res://scripts/", "res://scenes/", "res://scenes/ui/", "res://scenes/screens/", "res://assets/")
+dock_filesystem_selected_paths=PackedStringArray("res://assets/Resized Chess Piece Assets/White_rook.png")
+dock_filesystem_uncollapsed_paths=PackedStringArray("Favorites", "res://", "res://scripts/", "res://scenes/", "res://scenes/ui/", "res://scenes/screens/", "res://assets/", "res://assets/Resized Chess Piece Assets/")
dock_3="Scene,Import"
dock_4="FileSystem"
dock_5="Inspector,Node,History"
@@ -27,16 +27,16 @@ dock_5="Inspector,Node,History"
[EditorNode]
open_scenes=PackedStringArray("res://main.tscn", "res://scenes/scene_manager.tscn", "res://scenes/game.tscn", "res://scenes/ui/pop_up_label.tscn", "res://scenes/screens/title_screen.tscn", "res://scenes/screens/select_piece_screen.tscn", "res://scenes/ui/menu_button.tscn")
-current_scene="res://main.tscn"
+current_scene="res://scenes/screens/select_piece_screen.tscn"
center_split_offset=-570
selected_default_debugger_tab_idx=0
-selected_main_editor_idx=2
+selected_main_editor_idx=0
selected_bottom_panel_item=0
[ScriptEditor]
open_scripts=["res://scripts/Assassin.gd", "res://scripts/game.gd", "res://scripts/main/main.gd", "res://scripts/screens/menu_button.gd", "res://scripts/Pawn.gd", "res://scripts/Piece.gd", "res://scripts/ui/pop_up_label.gd", "res://scripts/Queen.gd", "res://scripts/Rook.gd", "res://scripts/run_data/run_data.gd", "res://scripts/scene_manager.gd", "res://scripts/screens/select_piece_screen.gd", "res://scripts/screens/title_screen.gd"]
-selected_script="res://scripts/screens/menu_button.gd"
+selected_script="res://scripts/screens/select_piece_screen.gd"
open_help=[]
script_split_offset=70
list_split_offset=0
diff --git a/.godot/editor/project_metadata.cfg b/.godot/editor/project_metadata.cfg
index b3ecf9e..68cc1b2 100644
--- a/.godot/editor/project_metadata.cfg
+++ b/.godot/editor/project_metadata.cfg
@@ -12,7 +12,7 @@ create_new_node=Rect2(510, 264, 1613, 885)
[recent_files]
scenes=["res://scenes/ui/menu_button.tscn", "res://scenes/screens/title_screen.tscn", "res://scenes/screens/select_piece_screen.tscn", "res://scenes/title_screen.tscn", "res://scenes/Pawn.tscn", "res://scenes/ui/pop_up_label.tscn", "res://scenes/game.tscn", "res://scenes/scene_manager.tscn", "res://main.tscn", "res://scenes/Assassin.tscn"]
-scripts=["res://scripts/screens/menu_button.gd", "res://scripts/screens/select_piece_screen.gd", "res://scripts/Rook.gd", "res://scripts/Piece.gd", "res://scripts/Assassin.gd", "res://scripts/main/main.gd", "res://scripts/run_data/run_data.gd", "res://scripts/title_screen/title_screen.gd", "res://scripts/Pawn.gd", "res://scripts/Queen.gd"]
+scripts=["Array", "res://scripts/screens/menu_button.gd", "res://scripts/screens/select_piece_screen.gd", "res://scripts/Rook.gd", "res://scripts/Piece.gd", "res://scripts/Assassin.gd", "res://scripts/main/main.gd", "res://scripts/run_data/run_data.gd", "res://scripts/title_screen/title_screen.gd", "res://scripts/Pawn.gd"]
[script_setup]
diff --git a/.godot/editor/script_editor_cache.cfg b/.godot/editor/script_editor_cache.cfg
index 938b186..504a9dd 100644
--- a/.godot/editor/script_editor_cache.cfg
+++ b/.godot/editor/script_editor_cache.cfg
@@ -87,11 +87,11 @@ state={
state={
"bookmarks": PackedInt32Array(),
"breakpoints": PackedInt32Array(),
-"column": 17,
+"column": 10,
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
-"row": 17,
-"scroll_position": 11.0,
+"row": 27,
+"scroll_position": 14.0,
"selection": false,
"syntax_highlighter": "GDScript"
}
@@ -147,7 +147,7 @@ state={
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
"row": 17,
-"scroll_position": 0.0,
+"scroll_position": 7.0,
"selection": false,
"syntax_highlighter": "GDScript"
}
@@ -157,11 +157,11 @@ state={
state={
"bookmarks": PackedInt32Array(),
"breakpoints": PackedInt32Array(),
-"column": 22,
+"column": 71,
"folded_lines": Array[int]([]),
-"h_scroll_position": 0,
-"row": 6,
-"scroll_position": 0.0,
+"h_scroll_position": 83,
+"row": 15,
+"scroll_position": 7.0,
"selection": false,
"syntax_highlighter": "GDScript"
}
@@ -171,11 +171,11 @@ state={
state={
"bookmarks": PackedInt32Array(),
"breakpoints": PackedInt32Array(),
-"column": 1,
+"column": 18,
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
-"row": 15,
-"scroll_position": 6.3,
+"row": 54,
+"scroll_position": 41.0,
"selection": false,
"syntax_highlighter": "GDScript"
}
diff --git a/scenes/screens/select_piece_screen.tscn b/scenes/screens/select_piece_screen.tscn
index b131275..f6415f7 100644
--- a/scenes/screens/select_piece_screen.tscn
+++ b/scenes/screens/select_piece_screen.tscn
@@ -17,11 +17,21 @@ layout_mode = 1
anchors_preset = 5
anchor_left = 0.5
anchor_right = 0.5
-offset_left = -20.0
+offset_left = 510.0
offset_top = 187.0
-offset_right = 20.0
+offset_right = 710.0
offset_bottom = 227.0
grow_horizontal = 2
+theme_override_constants/separation = 100
+
+[node name="Rook" parent="HBoxContainer" instance=ExtResource("1_6pfss")]
+layout_mode = 2
+
+[node name="Knight" parent="HBoxContainer" instance=ExtResource("1_6pfss")]
+layout_mode = 2
+
+[node name="Bishop" parent="HBoxContainer" instance=ExtResource("1_6pfss")]
+layout_mode = 2
[node name="StartButton" parent="." instance=ExtResource("1_6pfss")]
layout_mode = 1
diff --git a/scripts/run_data/run_data.gd b/scripts/run_data/run_data.gd
index 08eed8e..8c253e6 100644
--- a/scripts/run_data/run_data.gd
+++ b/scripts/run_data/run_data.gd
@@ -23,3 +23,6 @@ func add_currency(piece: Piece) -> void:
print()
print("Total currency: ", currency)
+
+func add_piece(piece: Piece) -> void:
+ pieces.append(piece)
diff --git a/scripts/screens/select_piece_screen.gd b/scripts/screens/select_piece_screen.gd
index e09c6b1..44a4ae1 100644
--- a/scripts/screens/select_piece_screen.gd
+++ b/scripts/screens/select_piece_screen.gd
@@ -3,11 +3,19 @@ class_name SelectPieceScreen
@onready var scene_manager: Node = $"../SceneManager"
@onready var start_button: TitleButton = $StartButton
+@onready var rook: TitleButton = $HBoxContainer/Rook
+@onready var knight: TitleButton = $HBoxContainer/Knight
+@onready var bishop: TitleButton = $HBoxContainer/Bishop
+
+var selected_piece: Piece = null
func _ready() -> void:
# Temp image
start_button.set_image("res://assets/ui/title_screen/play_button.png")
-
+ rook.set_image("res://assets/Resized Chess Piece Assets/White_rook.png")
+ knight.set_image("res://assets/Resized Chess Piece Assets/White_knight.png")
+ bishop.set_image("res://assets/Resized Chess Piece Assets/White_Bishop.png")
+
func _on_start_pressed() -> void:
RunData.start_run()
--
GitLab