diff --git a/.godot/editor/filesystem_cache8 b/.godot/editor/filesystem_cache8 index 9d67f346af2e9efb5e50a155d432832269958a9b..d1c6b3068e6ed530bead6339ad7bc0ece0c1cc51 100644 --- a/.godot/editor/filesystem_cache8 +++ b/.godot/editor/filesystem_cache8 @@ -1,20 +1,20 @@ ea4bc82a6ad023ab7ee23ee620429895 -::res://::1739086272 +::res://::1739131418 icon.svg::CompressedTexture2D::6378281210119878262::1738795350::1739075821::1::::<><>:: -main.tscn::PackedScene::5692118487183161714::1739086272::0::1::::<><>::uid://cu7lkx15lmfww::::res://scenes/scene_manager.tscn<>res://scripts/main/main.gd +main.tscn::PackedScene::5692118487183161714::1739131418::0::1::::<><>::uid://cu7lkx15lmfww::::res://scenes/scene_manager.tscn<>res://scripts/main/main.gd README.md::TextFile::-1::1738795350::0::1::::<><>:: ::res://assets/::1739068749 -::res://assets/Character Assets/::1739086271 +::res://assets/Character Assets/::1739131416 Bishop Character.png::CompressedTexture2D::5940736122524784063::1739069678::1739069680::1::::<><>:: Knight_Character.png::CompressedTexture2D::6219382475167814187::1739069581::1739069624::1::::<><>:: Rook Character.png::CompressedTexture2D::4669491807804796081::1739069622::1739069624::1::::<><>:: -selected_piece_bg.png::CompressedTexture2D::8475236881450314831::1739086293::1739086296::1::::<><>:: +selected_piece_bg.png::CompressedTexture2D::8475236881450314831::1739131567::1739131571::1::::<><>:: ::res://assets/fonts/::1739068943 PIXY.otf::FontFile::3217833585339699811::1738800165::1739068943::1::::<><>:: -::res://assets/noise/::1739075826 -noise2.tres::NoiseTexture2D::5054739835828921764::1739075826::0::1::::<><>:: -noise3.tres::NoiseTexture2D::906885015046579772::1739075826::0::1::::<><>:: -noise.tres::NoiseTexture2D::1693764769519573005::1739075826::0::1::::<><>:: +::res://assets/noise/::1739131352 +noise2.tres::NoiseTexture2D::5054739835828921764::1739131352::0::1::::<><>:: +noise3.tres::NoiseTexture2D::906885015046579772::1739131352::0::1::::<><>:: +noise.tres::NoiseTexture2D::1693764769519573005::1739131352::0::1::::<><>:: ::res://assets/Original size Chess pieces/::1739068943 Black king piece 2.png::CompressedTexture2D::7820367427145083060::1739068732::1739068943::1::::<><>:: Black knight piece.png::CompressedTexture2D::4196515762256027844::1739068732::1739068943::1::::<><>:: @@ -45,9 +45,9 @@ White_Pawn.png::CompressedTexture2D::2603821895790301265::1739068749::1739075821 White_Queen.png::CompressedTexture2D::3202700718576986601::1739068749::1739075821::1::::<><>:: White_rook.png::CompressedTexture2D::5642160515834838717::1739068749::1739075821::1::::<><>:: White_wizard.png::CompressedTexture2D::5759130360726746601::1738795350::1739075821::1::::<><>:: -::res://assets/shaders/::1739075826 +::res://assets/shaders/::1739131352 3d_effect.gdshader::Shader::-1::1738795350::0::1::::<><>:: -bg.gdshader::Shader::-1::1739075826::0::1::::<><>:: +bg.gdshader::Shader::-1::1739131352::0::1::::<><>:: color.gdshader::Shader::-1::1738795350::0::1::::<><>:: shadow.gdshader::Shader::-1::1738795350::0::1::::<><>:: ::res://assets/sprites/::1739068943 @@ -84,11 +84,11 @@ Mockup Shop Design.jpg::CompressedTexture2D::8043055154093708922::1738795350::17 play_button.png::CompressedTexture2D::5896995890187459238::1739074145::1739074146::1::::<><>:: quit_button.png::CompressedTexture2D::5172428563227279585::1739074124::1739074146::1::::<><>:: rules_button.png::CompressedTexture2D::8060955005205795067::1739074135::1739074146::1::::<><>:: -::res://scenes/::1739086272 +::res://scenes/::1739131418 Assassin.tscn::PackedScene::1241611789899982875::1739069099::0::1::::<><>::res://scripts/Assassin.gd<>uid://b24dojprangcr::::res://assets/Resized Chess Piece Assets/White_Assassin.png Bishop.tscn::PackedScene::2789588702038144760::1739069098::0::1::::<><>::res://scripts/Bishop.gd<>uid://rubnu2rwm76q::::res://assets/Resized Chess Piece Assets/White_Bishop.png explosion.tscn::PackedScene::69466253159940830::1738795350::0::1::::<><>:: -game.tscn::PackedScene::8577524005707705072::1739086272::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 +game.tscn::PackedScene::8577524005707705072::1739131418::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 King.tscn::PackedScene::8277830396459966414::1738798420::0::1::::<><>::res://scripts/King.gd<>uid://cdogixbq8ay3t::::res://assets/Resized Chess Piece Assets/White_king.png Knight.tscn::PackedScene::5270730075267457303::1738798420::0::1::::<><>::res://scripts/Knight.gd<>uid://mf4a3jclbwih::::res://assets/Resized Chess Piece Assets/White_knight.png Mage.tscn::PackedScene::10334063134713649::1739068749::0::1::::<><>::res://scripts/Mage.gd<>uid://m4c1qckexo7q::::res://Assets/Resized Chess Piece Assets/White_mage.png @@ -98,9 +98,9 @@ Rook.tscn::PackedScene::9162401199636684468::1738798420::0::1::::<><>::uid://b00 scene_manager.tscn::PackedScene::6243365322716451430::1739067597::0::1::::<><>::res://scripts/scene_manager.gd texture_holder.tscn::PackedScene::594714386286134588::1738795350::0::1::::<><>:: Wizard.tscn::PackedScene::6352212773395470747::1739068749::0::1::::<><>::res://scripts/Wizard.gd<>uid://bjlefo01b774s::::res://Assets/Resized Chess Piece Assets/White_wizard.png -::res://scenes/screens/::1739086272 -select_piece_screen.tscn::PackedScene::1770100387099198731::1739086272::0::1::::<><>::uid://bm8sv1itwm467::::res://scenes/ui/menu_button.tscn<>res://scripts/screens/select_piece_screen.gd<>uid://b7r633ea3cxw0::::res://assets/Character Assets/Rook Character.png<>uid://ds0p6bwarp14f::::res://assets/Character Assets/selected_piece_bg.png<>uid://cuuyk5y51r8ux::::res://assets/Character Assets/Knight_Character.png<>uid://cqv0b5ypsi2tn::::res://assets/Character Assets/Bishop Character.png -title_screen.tscn::PackedScene::8154710134031658440::1739086272::0::1::::<><>::res://scripts/screens/title_screen.gd<>uid://bm8sv1itwm467::::res://scenes/ui/menu_button.tscn +::res://scenes/screens/::1739131418 +select_piece_screen.tscn::PackedScene::1770100387099198731::1739131418::0::1::::<><>::uid://bm8sv1itwm467::::res://scenes/ui/menu_button.tscn<>res://scripts/screens/select_piece_screen.gd<>uid://b7r633ea3cxw0::::res://assets/Character Assets/Rook Character.png<>uid://ds0p6bwarp14f::::res://assets/Character Assets/selected_piece_bg.png<>uid://cuuyk5y51r8ux::::res://assets/Character Assets/Knight_Character.png<>uid://cqv0b5ypsi2tn::::res://assets/Character Assets/Bishop Character.png +title_screen.tscn::PackedScene::8154710134031658440::1739131418::0::1::::<><>::res://scripts/screens/title_screen.gd<>uid://bm8sv1itwm467::::res://scenes/ui/menu_button.tscn ::res://scenes/ui/::1739068083 menu_button.tscn::PackedScene::3297943059633979218::1739068083::0::1::::<><>::res://assets/shaders/3d_effect.gdshader<>res://scripts/screens/menu_button.gd pop_up_label.tscn::PackedScene::2361101355670897304::1739068083::0::1::::<><>::uid://bl30ip4pj1grj::::res://assets/fonts/PIXY.otf<>res://scripts/ui/pop_up_label.gd @@ -121,9 +121,9 @@ Wizard.gd::GDScript::-1::1738795350::0::1::::Wizard<>Piece<>:: main.gd::GDScript::-1::1738809274::0::1::::<>Node2D<>:: ::res://scripts/run_data/::1739067561 run_data.gd::GDScript::-1::1739067561::0::1::::<>Node<>:: -::res://scripts/screens/::1739075094 +::res://scripts/screens/::1739131352 menu_button.gd::GDScript::-1::1738864872::0::1::::TitleButton<>Button<>:: -select_piece_screen.gd::GDScript::-1::1739075094::0::1::::SelectPieceScreen<>Control<>:: +select_piece_screen.gd::GDScript::-1::1739131352::0::1::::SelectPieceScreen<>Control<>:: title_screen.gd::GDScript::-1::1738864872::0::1::::TitleScreen<>Control<>:: ::res://scripts/ui/::1738804415 pop_up_label.gd::GDScript::-1::1738804415::0::1::::<>Label<>:: diff --git a/.godot/editor/filesystem_update4 b/.godot/editor/filesystem_update4 index 5f76b70c9d60b9dc87120380ab03abfaa8754c8d..5d459476d739d18a2001e5ea7f40946e688e67a8 100644 --- a/.godot/editor/filesystem_update4 +++ b/.godot/editor/filesystem_update4 @@ -3,6 +3,7 @@ res://assets/shaders/bg.gdshader res://assets/noise/noise.tres res://assets/noise/noise2.tres res://assets/noise/noise3.tres +res://scripts/screens/select_piece_screen.gd res://main.tscn -res://scenes/screens/select_piece_screen.tscn res://scenes/screens/title_screen.tscn +res://scenes/screens/select_piece_screen.tscn diff --git a/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg b/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg index d1bd771da7e9188c97f81d861f68d90c66427970..17d58d5b59c20b6d688dbb9cf1e54058bec0b710 100644 --- a/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg +++ b/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg @@ -175,4 +175,4 @@ Anim={ "zfar": 4000.01, "znear": 0.05 } -selected_nodes=Array[NodePath]([]) +selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@16886/@Panel@13/@VBoxContainer@14/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@25/DockVSplitCenter/@VSplitContainer@52/@VBoxContainer@53/@PanelContainer@98/MainScreen/@CanvasItemEditor@9272/@VSplitContainer@9094/@HSplitContainer@9096/@HSplitContainer@9098/@Control@9099/@SubViewportContainer@9100/@SubViewport@9101/Main")]) diff --git a/.godot/editor/main.tscn-editstate-3070c538c03ee49b7677ff960a3f5195.cfg b/.godot/editor/main.tscn-editstate-3070c538c03ee49b7677ff960a3f5195.cfg index 4c84bec2b08e1ca2bc424b72f38a87ea1034199e..2afe81466a47b13d5f8bbf89b7ad6036505f7474 100644 --- a/.godot/editor/main.tscn-editstate-3070c538c03ee49b7677ff960a3f5195.cfg +++ b/.godot/editor/main.tscn-editstate-3070c538c03ee49b7677ff960a3f5195.cfg @@ -175,4 +175,4 @@ Anim={ "zfar": 4000.01, "znear": 0.05 } -selected_nodes=Array[NodePath]([]) +selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@16886/@Panel@13/@VBoxContainer@14/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@25/DockVSplitCenter/@VSplitContainer@52/@VBoxContainer@53/@PanelContainer@98/MainScreen/@CanvasItemEditor@9272/@VSplitContainer@9094/@HSplitContainer@9096/@HSplitContainer@9098/@Control@9099/@SubViewportContainer@9100/@SubViewport@9101/Main")]) diff --git a/.godot/editor/script_editor_cache.cfg b/.godot/editor/script_editor_cache.cfg index cb41b2e1da8e7574acd0cd78d7f2ec0532fbc438..0c10956f198ca13dd6a16e64e602b0b2e3796ee5 100644 --- a/.godot/editor/script_editor_cache.cfg +++ b/.godot/editor/script_editor_cache.cfg @@ -45,11 +45,11 @@ state={ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 0, +"column": 1, "folded_lines": Array[int]([]), "h_scroll_position": 0, -"row": 0, -"scroll_position": 0.0, +"row": 27, +"scroll_position": 9.0, "selection": false, "syntax_highlighter": "GDScript" } diff --git a/.godot/uid_cache.bin b/.godot/uid_cache.bin index 1a4f4e016a2b5d79545c3c82949f97886e8d45fa..60b51076de3e01e8ba12578f028771cdd6e5a36a 100644 Binary files a/.godot/uid_cache.bin and b/.godot/uid_cache.bin differ diff --git a/Assets/Character Assets/selected_piece_bg.png b/Assets/Character Assets/selected_piece_bg.png index d754cb66cc56ae040689c368af00a00b00483e7b..15a917ce47a6aafe1557d8d58573126c6a2714ba 100644 Binary files a/Assets/Character Assets/selected_piece_bg.png and b/Assets/Character Assets/selected_piece_bg.png differ diff --git a/scenes/screens/select_piece_screen.tscn b/scenes/screens/select_piece_screen.tscn index c43e87bab48f6f8c244ce672f9d776c9064f7fce..552ed4f4e6e6994d5bd83d4b0e0a6af06df2a9f6 100644 --- a/scenes/screens/select_piece_screen.tscn +++ b/scenes/screens/select_piece_screen.tscn @@ -47,9 +47,9 @@ script = ExtResource("1_x5vw4") [node name="HBoxContainer" type="HBoxContainer" parent="."] layout_mode = 0 -offset_left = 220.0 +offset_left = 230.0 offset_top = 200.0 -offset_right = 1019.0 +offset_right = 1029.0 offset_bottom = 333.0 theme_override_constants/separation = 200 diff --git a/scripts/screens/select_piece_screen.gd b/scripts/screens/select_piece_screen.gd index d8f0dbf9a85a1c0ba990771f4c1f702a796d823b..18a737a1ac7c2cdf88a3e99aea90da07e8b51a7d 100644 --- a/scripts/screens/select_piece_screen.gd +++ b/scripts/screens/select_piece_screen.gd @@ -22,6 +22,10 @@ func _ready() -> void: knight_button.button_group = button_group bishop_button.button_group = button_group + rook_button.modulate = Color(0.5, 0.5, 0.5, 1) + knight_button.modulate = Color(0.5, 0.5, 0.5, 1) + bishop_button.modulate = Color(0.5, 0.5, 0.5, 1) + func _on_piece_selected(piece: String) -> void: selected_piece = piece start_button.disabled = false @@ -34,13 +38,28 @@ func _on_start_pressed() -> void: func _on_rook_toggled(toggled_on: bool) -> void: if toggled_on: _on_piece_selected("rook") - + modulate_tween(rook_button, toggled_on) func _on_knight_toggled(toggled_on: bool) -> void: if toggled_on: _on_piece_selected("knight") - + modulate_tween(knight_button, toggled_on) + func _on_bishop_toggled(toggled_on: bool) -> void: if toggled_on: _on_piece_selected("bishop") + modulate_tween(bishop_button, toggled_on) + +func modulate_tween(button: Button, toggled_on: bool): + var target_color + var tween = create_tween() + + if toggled_on: + target_color = Color(1, 1, 1, 1) + else: + target_color = Color(0.5, 0.5, 0.5, 1) + + tween.tween_property(button, "modulate", target_color, 0.5).set_trans(Tween.TRANS_SINE).set_ease(Tween.EASE_OUT) + +