diff --git a/.godot/editor/editor_layout.cfg b/.godot/editor/editor_layout.cfg index 41e93356262ee992e2cb8037877ce18b76f3629c..6fb2ee64961af732fdd181b542a98cb21d1f1622 100644 --- a/.godot/editor/editor_layout.cfg +++ b/.godot/editor/editor_layout.cfg @@ -17,7 +17,7 @@ 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/scene_manager.tscn") +dock_filesystem_selected_paths=PackedStringArray("res://scenes/title_screen.tscn") dock_filesystem_uncollapsed_paths=PackedStringArray("Favorites", "res://", "res://scripts/", "res://scenes/", "res://scenes/ui/", "res://assets/", "res://assets/ui/", "res://assets/ui/title_screen/") dock_3="Scene,Import" dock_4="FileSystem" @@ -25,16 +25,16 @@ dock_5="Inspector,Node,History" [EditorNode] -open_scenes=PackedStringArray("res://main.tscn", "res://scenes/title_screen.tscn", "res://scenes/ui/menu_button.tscn", "res://scenes/scene_manager.tscn") +open_scenes=PackedStringArray("res://main.tscn", "res://scenes/title_screen.tscn", "res://scenes/scene_manager.tscn") current_scene="res://main.tscn" center_split_offset=-239 selected_default_debugger_tab_idx=1 -selected_main_editor_idx=0 +selected_main_editor_idx=2 selected_bottom_panel_item=0 [ScriptEditor] -open_scripts=["res://scripts/Bishop.gd", "res://scripts/game.gd", "res://scripts/King.gd", "res://scripts/Knight.gd", "res://scripts/title_screen/menu_button.gd", "res://scripts/Pawn.gd", "res://scripts/Piece.gd", "res://scripts/Queen.gd", "res://scripts/Rook.gd", "res://scripts/scene_manager.gd", "res://scripts/title_screen/title_screen.gd"] +open_scripts=["res://scripts/title_screen/menu_button.gd", "res://scripts/scene_manager.gd", "res://scripts/title_screen/title_screen.gd"] selected_script="res://scripts/scene_manager.gd" open_help=[] script_split_offset=70 diff --git a/.godot/editor/filesystem_cache8 b/.godot/editor/filesystem_cache8 index cdb3e26bad0047d500452561702a4d9be00aa85e..d12508b11cd8cea2d8d3d9947493f679e2e64382 100644 --- a/.godot/editor/filesystem_cache8 +++ b/.godot/editor/filesystem_cache8 @@ -1,13 +1,13 @@ ea4bc82a6ad023ab7ee23ee620429895 -::res://::1738458342 +::res://::1738462019 icon.svg::CompressedTexture2D::6378281210119878262::1738189402::1738378143::1::::<><>:: -main.tscn::PackedScene::5692118487183161714::1738457132::0::1::::<><>::uid://cu7lkx15lmfww::::res://scenes/scene_manager.tscn +main.tscn::PackedScene::5692118487183161714::1738462019::0::1::::<><>::uid://cu7lkx15lmfww::::res://scenes/scene_manager.tscn README.md::TextFile::-1::1738189402::0::1::::<><>:: ::res://assets/::1738378134 -::res://assets/noise/::1738455554 -noise2.tres::NoiseTexture2D::5054739835828921764::1738455554::0::1::::<><>:: -noise3.tres::NoiseTexture2D::906885015046579772::1738455554::0::1::::<><>:: -noise.tres::NoiseTexture2D::1693764769519573005::1738455554::0::1::::<><>:: +::res://assets/noise/::1738460335 +noise2.tres::NoiseTexture2D::5054739835828921764::1738460335::0::1::::<><>:: +noise3.tres::NoiseTexture2D::906885015046579772::1738460335::0::1::::<><>:: +noise.tres::NoiseTexture2D::1693764769519573005::1738460335::0::1::::<><>:: ::res://assets/Original size Chess pieces/::1738378176 Black king piece 2.png::CompressedTexture2D::7820367427145083060::1738378134::1738378176::1::::<><>:: Black knight piece.png::CompressedTexture2D::4196515762256027844::1738378134::1738378176::1::::<><>:: @@ -30,11 +30,11 @@ White_knight.png::CompressedTexture2D::854350289879594279::1738378134::173837817 White_Pawn.png::CompressedTexture2D::919180529085242722::1738378134::1738378176::1::::<><>:: White_Queen.png::CompressedTexture2D::4902137832695542513::1738378134::1738378176::1::::<><>:: White_rook.png::CompressedTexture2D::4194129281780453908::1738378134::1738378176::1::::<><>:: -::res://assets/shaders/::1738457134 -3d_effect.gdshader::Shader::-1::1738457134::0::1::::<><>:: -bg.gdshader::Shader::-1::1738457134::0::1::::<><>:: -color.gdshader::Shader::-1::1738457134::0::1::::<><>:: -shadow.gdshader::Shader::-1::1738457134::0::1::::<><>:: +::res://assets/shaders/::1738462019 +3d_effect.gdshader::Shader::-1::1738462019::0::1::::<><>:: +bg.gdshader::Shader::-1::1738462019::0::1::::<><>:: +color.gdshader::Shader::-1::1738462019::0::1::::<><>:: +shadow.gdshader::Shader::-1::1738462019::0::1::::<><>:: ::res://assets/sprites/::1738378176 bishop.png::CompressedTexture2D::4631301773944929250::1738378134::1738378176::1::::<><>:: knight.png::CompressedTexture2D::3545640967717948854::1738378134::1738378176::1::::<><>:: @@ -62,11 +62,11 @@ white_rook.png::CompressedTexture2D::3317152307554436932::1738378134::1738378176 Go_Save_The_King_Menu.jpg::CompressedTexture2D::7252735845995868232::1738378134::1738378176::1::::<><>:: Mockup Gameplay Design.jpg::CompressedTexture2D::4859609684236806088::1738378134::1738378176::1::::<><>:: Mockup Shop Design.jpg::CompressedTexture2D::8043055154093708922::1738378134::1738378176::1::::<><>:: -::res://assets/ui/title_screen/::1738432186 +::res://assets/ui/title_screen/::1738462017 play_button.png::CompressedTexture2D::5896995890187459238::1738396598::1738396750::1::::<><>:: -quit_button.png::CompressedTexture2D::5172428563227279585::1738432170::1738432186::1::::<><>:: +quit_button.png::CompressedTexture2D::5172428563227279585::1738462037::1738462045::1::::<><>:: rules_button.png::CompressedTexture2D::8060955005205795067::1738432116::1738432186::1::::<><>:: -::res://scenes/::1738456790 +::res://scenes/::1738462019 Bishop.tscn::PackedScene::2789588702038144760::1738378134::0::1::::<><>::res://scripts/Bishop.gd<>uid://b68o4mj7wcwvq::::res://assets/sprites/bishop.png explosion.tscn::PackedScene::69466253159940830::1738378134::0::1::::<><>:: game.tscn::PackedScene::8577524005707705072::1738456239::0::1::::<><>::res://scripts/game.gd<>res://assets/shaders/bg.gdshader<>uid://yeqb8ndri7xp::::res://assets/noise/noise.tres<>uid://ceas3dsjeq4ge::::res://assets/noise/noise2.tres<>uid://m6ki73qfbp2s::::res://assets/noise/noise3.tres @@ -75,12 +75,12 @@ Knight.tscn::PackedScene::5270730075267457303::1738378134::0::1::::<><>::res://s Pawn.tscn::PackedScene::3675784333675896641::1738378134::0::1::::<><>::res://scripts/Pawn.gd<>uid://ndi1e8thkonq::::res://assets/Resized Chess Piece Assets/White_Pawn.png Queen.tscn::PackedScene::7495869360053814603::1738378134::0::1::::<><>::res://scripts/Queen.gd<>uid://cb3vq168iyomb::::res://assets/Resized Chess Piece Assets/White_Queen.png Rook.tscn::PackedScene::9162401199636684468::1738378134::0::1::::<><>::uid://b00wxxfjk04ke::::res://assets/Resized Chess Piece Assets/White_rook.png -scene_manager.tscn::PackedScene::6243365322716451430::1738456790::0::1::::<><>::res://scripts/scene_manager.gd +scene_manager.tscn::PackedScene::6243365322716451430::1738462019::0::1::::<><>::res://scripts/scene_manager.gd texture_holder.tscn::PackedScene::594714386286134588::1738378134::0::1::::<><>:: -title_screen.tscn::PackedScene::8154710134031658440::1738456790::0::1::::<><>::res://scripts/title_screen/title_screen.gd<>uid://bm8sv1itwm467::::res://scenes/ui/menu_button.tscn -::res://scenes/ui/::1738456790 -menu_button.tscn::PackedScene::3297943059633979218::1738456790::0::1::::<><>::res://assets/shaders/3d_effect.gdshader<>res://scripts/title_screen/menu_button.gd -::res://scripts/::1738456288 +title_screen.tscn::PackedScene::8154710134031658440::1738462019::0::1::::<><>::res://scripts/title_screen/title_screen.gd<>uid://bm8sv1itwm467::::res://scenes/ui/menu_button.tscn +::res://scenes/ui/::1738462019 +menu_button.tscn::PackedScene::3297943059633979218::1738462019::0::1::::<><>::res://assets/shaders/3d_effect.gdshader<>res://scripts/title_screen/menu_button.gd +::res://scripts/::1738460684 Bishop.gd::GDScript::-1::1738378134::0::1::::Bishop<>Piece<>:: game.gd::GDScript::-1::1738378134::0::1::::game<>Node<>:: King.gd::GDScript::-1::1738378134::0::1::::King<>Piece<>:: @@ -89,7 +89,7 @@ Pawn.gd::GDScript::-1::1738378134::0::1::::Pawn<>Piece<>:: Piece.gd::GDScript::-1::1738378134::0::1::::Piece<>Node2D<>:: Queen.gd::GDScript::-1::1738378134::0::1::::Queen<>Piece<>:: Rook.gd::GDScript::-1::1738378134::0::1::::Rook<>Piece<>:: -scene_manager.gd::GDScript::-1::1738456288::0::1::::<>Node<>:: -::res://scripts/title_screen/::1738456443 +scene_manager.gd::GDScript::-1::1738460684::0::1::::<>Node<>:: +::res://scripts/title_screen/::1738460499 menu_button.gd::GDScript::-1::1738432516::0::1::::TitleButton<>Button<>:: -title_screen.gd::GDScript::-1::1738456443::0::1::::TitleScreen<>Control<>:: +title_screen.gd::GDScript::-1::1738460499::0::1::::TitleScreen<>Control<>:: diff --git a/.godot/editor/project_metadata.cfg b/.godot/editor/project_metadata.cfg index 6aaf26ea2a7768637376aa1bf2d723b37d0f3aca..40720c68b4fd6892b4df660b7e4304718e024dea 100644 --- a/.godot/editor/project_metadata.cfg +++ b/.godot/editor/project_metadata.cfg @@ -15,7 +15,7 @@ last_selected_language="GDScript" [recent_files] scripts=["res://scripts/board.gd", "res://scripts/scene_manager.gd", "res://scripts/title_screen/menu_button.gd", "res://scripts/title_screen/title_screen.gd", "res://scripts/Knight.gd", "res://scripts/King.gd", "res://scripts/Queen.gd", "res://scripts/Bishop.gd", "res://scripts/Rook.gd", "res://scripts/Pawn.gd"] -scenes=["res://scenes/scene_manager.tscn", "res://scenes/ui/menu_button.tscn", "res://scenes/title_screen.tscn", "res://main.tscn", "res://scenes/game.tscn", "res://scenes/board.tscn", "res://scenes/ui/title_screen.tscn", "res://scenes/title_screen/menu_button.tscn", "res://scenes/title_screen/title_screen.tscn", "res://scenes/Knight.tscn"] +scenes=["res://scenes/scene_manager.tscn", "res://scenes/title_screen.tscn", "res://scenes/ui/menu_button.tscn", "res://main.tscn", "res://scenes/game.tscn", "res://scenes/board.tscn", "res://scenes/ui/title_screen.tscn", "res://scenes/title_screen/menu_button.tscn", "res://scenes/title_screen/title_screen.tscn", "res://scenes/Knight.tscn"] [color_picker] diff --git a/.godot/editor/script_editor_cache.cfg b/.godot/editor/script_editor_cache.cfg index a2d902a3a45c9900c3208d32dbb95c5a4523e158..2facf238c246df3ce38c5a92c249f125bd061e18 100644 --- a/.godot/editor/script_editor_cache.cfg +++ b/.godot/editor/script_editor_cache.cfg @@ -7,7 +7,7 @@ state={ "folded_lines": Array[int]([]), "h_scroll_position": 0, "row": 121, -"scroll_position": 245.0, +"scroll_position": 98.0, "selection": false, "syntax_highlighter": "GDScript" } @@ -61,9 +61,9 @@ state={ "breakpoints": PackedInt32Array(), "column": 3, "folded_lines": Array[int]([]), -"h_scroll_position": 12, +"h_scroll_position": 0, "row": 80, -"scroll_position": 0.0, +"scroll_position": 59.0, "selection": false, "syntax_highlighter": "GDScript" } @@ -115,10 +115,10 @@ state={ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 15, +"column": 1, "folded_lines": Array[int]([]), "h_scroll_position": 0, -"row": 0, +"row": 17, "scroll_position": 0.0, "selection": false, "syntax_highlighter": "GDScript" @@ -143,10 +143,10 @@ state={ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 12, +"column": 46, "folded_lines": Array[int]([]), "h_scroll_position": 0, -"row": 0, +"row": 9, "scroll_position": 0.0, "selection": false, "syntax_highlighter": "GDScript" diff --git a/scenes/title_screen.tscn b/scenes/title_screen.tscn index 80ccbf8302f3a81b278d34272417310c33941628..c7f2c8d90ff857ec6de7a473c0a7799b93e07d29 100644 --- a/scenes/title_screen.tscn +++ b/scenes/title_screen.tscn @@ -42,4 +42,5 @@ size_flags_vertical = 3 layout_mode = 2 size_flags_vertical = 3 +[connection signal="pressed" from="MenuContainers/PlayButton" to="." method="_on_play_pressed"] [connection signal="pressed" from="MenuContainers/QuitButton" to="." method="_on_quit_pressed"] diff --git a/scripts/scene_manager.gd b/scripts/scene_manager.gd index 42773814ba5e83da6c3a88a0e047172aa94df792..9b21b1ec66baa0b754ff55be9f3b8bee2f03ad77 100644 --- a/scripts/scene_manager.gd +++ b/scripts/scene_manager.gd @@ -15,7 +15,6 @@ func change_scene(scene_path: String) -> void: current_scene.queue_free() var new_scene = load(scene_path).instantiate() - get_parent().add_child(new_scene) current_scene = new_scene diff --git a/scripts/title_screen/title_screen.gd b/scripts/title_screen/title_screen.gd index fdf9fc4c31f15aa6c2be3bf38658fa14f3887498..9d53ab0c4b9bcd76d2e6bf075a7aae226a67d8f4 100644 --- a/scripts/title_screen/title_screen.gd +++ b/scripts/title_screen/title_screen.gd @@ -1,6 +1,7 @@ extends Control class_name TitleScreen +@onready var scene_manager: Node = $"../SceneManager" @onready var play_button: TitleButton = $MenuContainers/PlayButton @onready var rules_button: TitleButton = $MenuContainers/RulesButton @onready var quit_button: TitleButton = $MenuContainers/QuitButton @@ -12,6 +13,9 @@ func _ready() -> void: func _process(delta: float) -> void: pass + +func _on_play_pressed() -> void: + scene_manager.change_scene("res://scenes/game.tscn") func _on_quit_pressed() -> void: get_tree().quit()