diff --git a/.godot/editor/create_recent.Node b/.godot/editor/create_recent.Node
index 51450207c41ba6b19e93d3211be42b5ab2e5e3bf..db27ca42ae9d48cb995917843f81b7914b991193 100644
--- a/.godot/editor/create_recent.Node
+++ b/.godot/editor/create_recent.Node
@@ -1,5 +1,5 @@
-Camera2D
Button
+Camera2D
HBoxContainer
Timer
Label
@@ -12,4 +12,3 @@ CanvasLayer
VBoxContainer
TextureRect
Sprite2D
-Panel
diff --git a/.godot/editor/editor_layout.cfg b/.godot/editor/editor_layout.cfg
index c0828506bdb7f6b2d0124b324328c81592b72699..618df41d76aa47043c4c7351d3f164e45a7e6775 100644
--- a/.godot/editor/editor_layout.cfg
+++ b/.godot/editor/editor_layout.cfg
@@ -6,66 +6,42 @@ dock_5_selected_tab_idx=0
dock_floating={}
dock_bottom=[]
dock_closed=[]
-<<<<<<< HEAD
-dock_split_2=-1
+<<<<<<<HEADdock_split_2=-1
dock_split_3=0
dock_hsplit_1=0
<<<<<<<HEADdock_hsplit_2=498
-dock_hsplit_3=-483
-dock_hsplit_2=461
-=======
+dock_hsplit_3=-270
+dock_hsplit_2=270
dock_split_2=0
-dock_split_3=0
-dock_hsplit_1=0
-<<<<<<<HEADdock_hsplit_2=498
-dock_hsplit_3=-540
-dock_hsplit_2=540
->>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
dock_hsplit_4=0
-dock_filesystem_h_split_offset=480
+dock_filesystem_h_split_offset=240
dock_filesystem_v_split_offset=0
dock_filesystem_display_mode=0
dock_filesystem_file_sort=0
dock_filesystem_file_list_display_mode=1
-<<<<<<< HEAD
-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/ui/", "res://assets/ui/title_screen/")
-=======
-dock_filesystem_selected_paths=PackedStringArray("res://scenes/ui/menu_button.tscn")
-dock_filesystem_uncollapsed_paths=PackedStringArray("Favorites", "res://", "res://scenes/")
->>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
+dock_filesystem_selected_paths=PackedStringArray("res://scenes/screens/title_screen.tscn")
+dock_filesystem_uncollapsed_paths=PackedStringArray("Favorites", "res://", "res://scenes/", "res://scenes/screens/", "res://assets/", "res://assets/Character Assets/")
dock_3="Scene,Import"
dock_4="FileSystem"
dock_5="Inspector,Node,History"
[EditorNode]
-<<<<<<< HEAD
-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")
+open_scenes=PackedStringArray("res://main.tscn", "res://scenes/screens/select_piece_screen.tscn", "res://scenes/screens/title_screen.tscn")
current_scene="res://main.tscn"
-center_split_offset=-274
-=======
-open_scenes=PackedStringArray("res://scenes/game.tscn")
-current_scene="res://scenes/game.tscn"
-center_split_offset=0
->>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
+center_split_offset=-366
selected_default_debugger_tab_idx=0
selected_main_editor_idx=2
-selected_bottom_panel_item=1
+selected_bottom_panel_item=0
[ScriptEditor]
-<<<<<<< HEAD
-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"]
+open_scripts=["res://scripts/Assassin.gd", "res://scripts/Bishop.gd", "res://scripts/game.gd", "res://scripts/King.gd", "res://scripts/Knight.gd", "res://scripts/Mage.gd", "res://scripts/main/main.gd", "res://scripts/Pawn.gd", "res://scripts/Queen.gd", "res://scripts/scene_manager.gd", "res://scripts/screens/select_piece_screen.gd", "res://scripts/screens/title_screen.gd", "res://scripts/Wizard.gd"]
selected_script="res://scripts/main/main.gd"
-=======
-open_scripts=["res://scripts/game.gd"]
-selected_script="res://scripts/game.gd"
->>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
open_help=[]
-script_split_offset=140
+script_split_offset=70
list_split_offset=0
-zoom_factor=1.00475
+zoom_factor=1.0
[ShaderEditor]
diff --git a/.godot/editor/filesystem_cache8 b/.godot/editor/filesystem_cache8
index 5070a5d9250956d12d2c848ddeab79ff084f6ec6..70c6b2d9a052d0187a53e9352618df6aaae6c344 100644
--- a/.godot/editor/filesystem_cache8
+++ b/.godot/editor/filesystem_cache8
@@ -1,105 +1,108 @@
ea4bc82a6ad023ab7ee23ee620429895
-<<<<<<< HEAD
-::res://::1739059803
-icon.svg::CompressedTexture2D::6378281210119878262::1738795350::1738864896::1::::<><>::
-main.tscn::PackedScene::5692118487183161714::1738886824::0::1::::<><>::uid://cu7lkx15lmfww::::res://scenes/scene_manager.tscn<>res://scripts/main/main.gd
+::res://::1739070382
+icon.svg::CompressedTexture2D::6378281210119878262::1738795350::1739068818::1::::<><>::
+main.tscn::PackedScene::5692118487183161714::1739070382::0::1::::<><>::uid://cu7lkx15lmfww::::res://scenes/scene_manager.tscn<>res://scripts/main/main.gd
README.md::TextFile::-1::1738795350::0::1::::<><>::
-::res://assets/::1738799713
-::res://assets/fonts/::1738864896
-PIXY.otf::FontFile::3217833585339699811::1738800165::1738864896::1::::<><>::
-::res://assets/noise/::1738886824
-noise2.tres::NoiseTexture2D::5054739835828921764::1738886824::0::1::::<><>::
-noise3.tres::NoiseTexture2D::906885015046579772::1738886824::0::1::::<><>::
-noise.tres::NoiseTexture2D::1693764769519573005::1738886824::0::1::::<><>::
-::res://assets/Original size Chess pieces/::1738864896
-Black king piece 2.png::CompressedTexture2D::7820367427145083060::1738795350::1738864896::1::::<><>::
-Black knight piece.png::CompressedTexture2D::4196515762256027844::1738795350::1738864896::1::::<><>::
-Black Pawn Piece 2.png::CompressedTexture2D::2167440687080906934::1738795350::1738864896::1::::<><>::
-Black Queen Piece 2.png::CompressedTexture2D::6638986330393441989::1738795350::1738864896::1::::<><>::
-Black rook piece.png::CompressedTexture2D::1872655759582013005::1738795350::1738864896::1::::<><>::
-White king piece 2.png::CompressedTexture2D::7139286146806283259::1738795350::1738864896::1::::<><>::
-White knight piece.png::CompressedTexture2D::8293368904171920332::1738795350::1738864896::1::::<><>::
-White Pawn Piece 2.png::CompressedTexture2D::8915038826611091975::1738795350::1738864896::1::::<><>::
-White Queen Piece 2.png::CompressedTexture2D::339041922548181320::1738795350::1738864896::1::::<><>::
-White rook piece.png::CompressedTexture2D::6272641373813891014::1738795350::1738864896::1::::<><>::
-::res://assets/Resized Chess Piece Assets/::1738864896
-Black_Assassin.png::CompressedTexture2D::5410645216483506242::1738795350::1738864896::1::::<><>::
-Black_Bishop.png::CompressedTexture2D::5646954560332560266::1738795350::1738864896::1::::<><>::
-Black_king.png::CompressedTexture2D::3691390456247856410::1738795350::1738864896::1::::<><>::
-Black_knight.png::CompressedTexture2D::3569790831830215405::1738795350::1738864896::1::::<><>::
-Black_mage.png::CompressedTexture2D::3300084723678353650::1738795350::1738864896::1::::<><>::
-Black_Pawn.png::CompressedTexture2D::4947090234957464596::1738795350::1738864896::1::::<><>::
-Black_Queen.png::CompressedTexture2D::9042903626319350434::1738795350::1738864896::1::::<><>::
-Black_rook.png::CompressedTexture2D::5637903285567075872::1738795350::1738864896::1::::<><>::
-Black_wizard.png::CompressedTexture2D::1278573577066895682::1738795350::1738864896::1::::<><>::
-White_Assassin.png::CompressedTexture2D::700262813566466932::1738795350::1738864896::1::::<><>::
-White_Bishop.png::CompressedTexture2D::3819780629635422360::1738795350::1738864896::1::::<><>::
-White_king.png::CompressedTexture2D::5012688985517926395::1738795350::1738864896::1::::<><>::
-White_knight.png::CompressedTexture2D::854350289879594279::1738795350::1738864896::1::::<><>::
-White_mage.png::CompressedTexture2D::7265615115782563194::1738795350::1738864896::1::::<><>::
-White_Pawn.png::CompressedTexture2D::919180529085242722::1738795350::1738864896::1::::<><>::
-White_Queen.png::CompressedTexture2D::4902137832695542513::1738795350::1738864896::1::::<><>::
-White_rook.png::CompressedTexture2D::4194129281780453908::1738795350::1738864896::1::::<><>::
-White_wizard.png::CompressedTexture2D::8734158881343267537::1738795350::1738864896::1::::<><>::
-::res://assets/shaders/::1738886824
+::res://assets/::1739068749
+::res://assets/Character Assets/::1739069680
+Bishop Character.png::CompressedTexture2D::5940736122524784063::1739069678::1739069680::1::::<><>::
+Knight_Character.png::CompressedTexture2D::6219382475167814187::1739069581::1739069624::1::::<><>::
+Rook Character.png::CompressedTexture2D::4669491807804796081::1739069622::1739069624::1::::<><>::
+::res://assets/fonts/::1739068943
+PIXY.otf::FontFile::3217833585339699811::1738800165::1739068943::1::::<><>::
+::res://assets/noise/::1739068962
+noise2.tres::NoiseTexture2D::5054739835828921764::1739068962::0::1::::<><>::
+noise3.tres::NoiseTexture2D::906885015046579772::1739068962::0::1::::<><>::
+noise.tres::NoiseTexture2D::1693764769519573005::1739068962::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::::<><>::
+Black Pawn Piece 2.png::CompressedTexture2D::2167440687080906934::1739068732::1739068943::1::::<><>::
+Black Queen Piece 2.png::CompressedTexture2D::6638986330393441989::1739068732::1739068943::1::::<><>::
+Black rook piece.png::CompressedTexture2D::1872655759582013005::1739068732::1739068943::1::::<><>::
+White king piece 2.png::CompressedTexture2D::7139286146806283259::1739068732::1739068943::1::::<><>::
+White knight piece.png::CompressedTexture2D::8293368904171920332::1739068732::1739068943::1::::<><>::
+White Pawn Piece 2.png::CompressedTexture2D::8915038826611091975::1739068732::1739068943::1::::<><>::
+White Queen Piece 2.png::CompressedTexture2D::339041922548181320::1739068732::1739068943::1::::<><>::
+White rook piece.png::CompressedTexture2D::6272641373813891014::1739068732::1739068943::1::::<><>::
+::res://assets/Resized Chess Piece Assets/::1739068943
+Black_Assassin.png::CompressedTexture2D::7148125561752243520::1738795350::1739068943::1::::<><>::
+Black_Bishop.png::CompressedTexture2D::7771720689612735412::1738795350::1739068943::1::::<><>::
+Black_king.png::CompressedTexture2D::1327420732381747465::1738795350::1739068943::1::::<><>::
+Black_knight.png::CompressedTexture2D::2588821354831904895::1738795350::1739068943::1::::<><>::
+Black_mage.png::CompressedTexture2D::7065683534628881067::1738795350::1739068943::1::::<><>::
+Black_Pawn.png::CompressedTexture2D::4913326270515304116::1738795350::1739068943::1::::<><>::
+Black_Queen.png::CompressedTexture2D::361608533196630634::1738795350::1739068943::1::::<><>::
+Black_rook.png::CompressedTexture2D::3374790409242349748::1738795350::1739068943::1::::<><>::
+Black_wizard.png::CompressedTexture2D::479661266506100900::1738795350::1739068943::1::::<><>::
+White_Assassin.png::CompressedTexture2D::4341594065535814581::1738795350::1739068943::1::::<><>::
+White_Bishop.png::CompressedTexture2D::1234582922220309582::1738795350::1739068943::1::::<><>::
+White_king.png::CompressedTexture2D::2587774117277059808::1738795350::1739068943::1::::<><>::
+White_knight.png::CompressedTexture2D::7106405020086883644::1739068749::1739068943::1::::<><>::
+White_mage.png::CompressedTexture2D::8946229796200662089::1738795350::1739068943::1::::<><>::
+White_Pawn.png::CompressedTexture2D::640759973966713643::1739068749::1739068943::1::::<><>::
+White_Queen.png::CompressedTexture2D::5254004462237257542::1739068749::1739068943::1::::<><>::
+White_rook.png::CompressedTexture2D::5429205829255797077::1739068749::1739068943::1::::<><>::
+White_wizard.png::CompressedTexture2D::8967769150016376399::1738795350::1739068943::1::::<><>::
+::res://assets/shaders/::1739068962
3d_effect.gdshader::Shader::-1::1738795350::0::1::::<><>::
-bg.gdshader::Shader::-1::1738886824::0::1::::<><>::
+bg.gdshader::Shader::-1::1739068962::0::1::::<><>::
color.gdshader::Shader::-1::1738795350::0::1::::<><>::
shadow.gdshader::Shader::-1::1738795350::0::1::::<><>::
-::res://assets/sprites/::1738864896
-bishop.png::CompressedTexture2D::4631301773944929250::1738795350::1738864896::1::::<><>::
-knight.png::CompressedTexture2D::3545640967717948854::1738795350::1738864896::1::::<><>::
-pawn.png::CompressedTexture2D::1338760335342038528::1738795350::1738864896::1::::<><>::
-rook.png::CompressedTexture2D::6790909281007670776::1738795350::1738864896::1::::<><>::
-tile.png::CompressedTexture2D::8704336058451696509::1738795350::1738864896::1::::<><>::
-::res://assets/temp_assets/::1738864896
-assassin.png::CompressedTexture2D::2309680507621369322::1738795350::1738864896::1::::<><>::
-black_bishop.png::CompressedTexture2D::7509881182472568151::1738795350::1738864896::1::::<><>::
-black_king.png::CompressedTexture2D::3646032776351028361::1738795350::1738864896::1::::<><>::
-black_knight.png::CompressedTexture2D::4591257172048987833::1738795350::1738864896::1::::<><>::
-black_pawn.png::CompressedTexture2D::3912668014183198267::1738795350::1738864896::1::::<><>::
-black_queen.png::CompressedTexture2D::7989886812523566234::1738795350::1738864896::1::::<><>::
-black_rook.png::CompressedTexture2D::8767708966549765967::1738795350::1738864896::1::::<><>::
-mage.png::CompressedTexture2D::4650471376600460963::1738795350::1738864896::1::::<><>::
-Piece_move.png::CompressedTexture2D::260618725614842917::1738795350::1738864896::1::::<><>::
-temp_chess_board.png::CompressedTexture2D::4173558678901569366::1738795350::1738864896::1::::<><>::
-turn-black.png::CompressedTexture2D::7112033964315790810::1738795350::1738864896::1::::<><>::
-turn-white.png::CompressedTexture2D::7344907768700758025::1738795350::1738864896::1::::<><>::
-white_bishop.png::CompressedTexture2D::8093744356261485644::1738795350::1738864896::1::::<><>::
-white_king.png::CompressedTexture2D::5901183203660598461::1738795350::1738864896::1::::<><>::
-white_knight.png::CompressedTexture2D::7533630084821562912::1738795350::1738864896::1::::<><>::
-white_pawn.png::CompressedTexture2D::8196778834906249875::1738795350::1738864896::1::::<><>::
-white_queen.png::CompressedTexture2D::1957958042777204643::1738795350::1738864896::1::::<><>::
-white_rook.png::CompressedTexture2D::3317152307554436932::1738795350::1738864896::1::::<><>::
-wizard.png::CompressedTexture2D::2759604866355024615::1738795350::1738864896::1::::<><>::
-::res://assets/ui/::1738864897
-Go_Save_The_King_Menu.jpg::CompressedTexture2D::7252735845995868232::1738795350::1738864897::1::::<><>::
-Mockup Gameplay Design.jpg::CompressedTexture2D::4859609684236806088::1738795350::1738864896::1::::<><>::
-Mockup Shop Design.jpg::CompressedTexture2D::8043055154093708922::1738795350::1738864896::1::::<><>::
-::res://assets/ui/title_screen/::1738864896
-play_button.png::CompressedTexture2D::5896995890187459238::1738795350::1738864896::1::::<><>::
-quit_button.png::CompressedTexture2D::5172428563227279585::1738795350::1738864896::1::::<><>::
-rules_button.png::CompressedTexture2D::8060955005205795067::1738795350::1738864896::1::::<><>::
-::res://scenes/::1738886824
-Assassin.tscn::PackedScene::1241611789899982875::1738801710::0::1::::<><>::res://scripts/Assassin.gd<>uid://753dogr1moxe::::res://assets/temp_assets/assassin.png
-Bishop.tscn::PackedScene::2789588702038144760::1738798420::0::1::::<><>::res://scripts/Bishop.gd<>uid://b68o4mj7wcwvq::::res://assets/sprites/bishop.png
+::res://assets/sprites/::1739068943
+bishop.png::CompressedTexture2D::4631301773944929250::1738795350::1739068943::1::::<><>::
+knight.png::CompressedTexture2D::3545640967717948854::1738795350::1739068943::1::::<><>::
+pawn.png::CompressedTexture2D::1338760335342038528::1738795350::1739068943::1::::<><>::
+rook.png::CompressedTexture2D::6790909281007670776::1738795350::1739068943::1::::<><>::
+tile.png::CompressedTexture2D::8704336058451696509::1738795350::1739068943::1::::<><>::
+::res://assets/temp_assets/::1739068943
+assassin.png::CompressedTexture2D::2309680507621369322::1738795350::1739068943::1::::<><>::
+black_bishop.png::CompressedTexture2D::7509881182472568151::1738795350::1739068943::1::::<><>::
+black_king.png::CompressedTexture2D::3646032776351028361::1738795350::1739068943::1::::<><>::
+black_knight.png::CompressedTexture2D::4591257172048987833::1738795350::1739068943::1::::<><>::
+black_pawn.png::CompressedTexture2D::3912668014183198267::1738795350::1739068943::1::::<><>::
+black_queen.png::CompressedTexture2D::7989886812523566234::1738795350::1739068943::1::::<><>::
+black_rook.png::CompressedTexture2D::8767708966549765967::1738795350::1739068943::1::::<><>::
+mage.png::CompressedTexture2D::4650471376600460963::1738795350::1739068943::1::::<><>::
+Piece_move.png::CompressedTexture2D::260618725614842917::1738795350::1739068943::1::::<><>::
+temp_chess_board.png::CompressedTexture2D::4173558678901569366::1738795350::1739068943::1::::<><>::
+turn-black.png::CompressedTexture2D::7112033964315790810::1738795350::1739068943::1::::<><>::
+turn-white.png::CompressedTexture2D::7344907768700758025::1738795350::1739068943::1::::<><>::
+white_bishop.png::CompressedTexture2D::8093744356261485644::1738795350::1739068943::1::::<><>::
+white_king.png::CompressedTexture2D::5901183203660598461::1738795350::1739068943::1::::<><>::
+white_knight.png::CompressedTexture2D::7533630084821562912::1738795350::1739068943::1::::<><>::
+white_pawn.png::CompressedTexture2D::8196778834906249875::1738795350::1739068943::1::::<><>::
+white_queen.png::CompressedTexture2D::1957958042777204643::1738795350::1739068943::1::::<><>::
+white_rook.png::CompressedTexture2D::3317152307554436932::1738795350::1739068943::1::::<><>::
+wizard.png::CompressedTexture2D::2759604866355024615::1738795350::1739068943::1::::<><>::
+::res://assets/ui/::1739068944
+Go_Save_The_King_Menu.jpg::CompressedTexture2D::7252735845995868232::1738795350::1739068944::1::::<><>::
+Mockup Gameplay Design.jpg::CompressedTexture2D::4859609684236806088::1738795350::1739068943::1::::<><>::
+Mockup Shop Design.jpg::CompressedTexture2D::8043055154093708922::1738795350::1739068943::1::::<><>::
+::res://assets/ui/title_screen/::1739068943
+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/::1739070382
+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::1738886824::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::1739070382::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::1738798420::0::1::::<><>::res://scripts/Mage.gd<>uid://b7iyt4iwjbtd0::::res://assets/temp_assets/mage.png
-Pawn.tscn::PackedScene::3675784333675896641::1738817803::0::1::::<><>::res://scripts/Pawn.gd<>uid://ndi1e8thkonq::::res://assets/Resized Chess Piece Assets/White_Pawn.png
+Mage.tscn::PackedScene::10334063134713649::1739068749::0::1::::<><>::res://scripts/Mage.gd<>uid://m4c1qckexo7q::::res://Assets/Resized Chess Piece Assets/White_mage.png
+Pawn.tscn::PackedScene::3675784333675896641::1739068749::0::1::::<><>::res://scripts/Pawn.gd<>uid://w04xn5hy44qq::::res://Assets/Resized Chess Piece Assets/White_Pawn.png
Queen.tscn::PackedScene::7495869360053814603::1738809184::0::1::::<><>::res://scripts/Queen.gd<>uid://cb3vq168iyomb::::res://assets/Resized Chess Piece Assets/White_Queen.png
Rook.tscn::PackedScene::9162401199636684468::1738798420::0::1::::<><>::uid://b00wxxfjk04ke::::res://assets/Resized Chess Piece Assets/White_rook.png
-scene_manager.tscn::PackedScene::6243365322716451430::1738886824::0::1::::<><>::res://scripts/scene_manager.gd
+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::1738798420::0::1::::<><>::res://scripts/Wizard.gd<>uid://bfk1j3brcknkp::::res://assets/temp_assets/wizard.png
-::res://scenes/screens/::1738886824
-select_piece_screen.tscn::PackedScene::1770100387099198731::1738886824::0::1::::<><>::uid://bm8sv1itwm467::::res://scenes/ui/menu_button.tscn<>res://scripts/screens/select_piece_screen.gd
-title_screen.tscn::PackedScene::8154710134031658440::1738886824::0::1::::<><>::res://scripts/screens/title_screen.gd<>uid://bm8sv1itwm467::::res://scenes/ui/menu_button.tscn
-::res://scenes/ui/::1738886824
-menu_button.tscn::PackedScene::3297943059633979218::1738886824::0::1::::<><>::res://assets/shaders/3d_effect.gdshader<>res://scripts/screens/menu_button.gd
-pop_up_label.tscn::PackedScene::2361101355670897304::1738886824::0::1::::<><>::uid://bl30ip4pj1grj::::res://assets/fonts/PIXY.otf<>res://scripts/ui/pop_up_label.gd
+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/::1739070382
+select_piece_screen.tscn::PackedScene::1770100387099198731::1739070382::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://cuuyk5y51r8ux::::res://assets/Character Assets/Knight_Character.png<>uid://cqv0b5ypsi2tn::::res://assets/Character Assets/Bishop Character.png
+title_screen.tscn::PackedScene::8154710134031658440::1739067597::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
::res://scripts/::1739045810
Assassin.gd::GDScript::-1::1738801710::0::1::::Assassin<>Piece<>::
Bishop.gd::GDScript::-1::1738795350::0::1::::Bishop<>Piece<>::
@@ -115,128 +118,11 @@ scene_manager.gd::GDScript::-1::1738864872::0::1::::<>Node<>::
Wizard.gd::GDScript::-1::1738795350::0::1::::Wizard<>Piece<>::
::res://scripts/main/::1738809274
main.gd::GDScript::-1::1738809274::0::1::::<>Node2D<>::
-::res://scripts/run_data/::1739045810
-run_data.gd::GDScript::-1::1739045810::0::1::::<>Node<>::
-::res://scripts/screens/::1738864872
+::res://scripts/run_data/::1739067561
+run_data.gd::GDScript::-1::1739067561::0::1::::<>Node<>::
+::res://scripts/screens/::1739070369
menu_button.gd::GDScript::-1::1738864872::0::1::::TitleButton<>Button<>::
-select_piece_screen.gd::GDScript::-1::1738864872::0::1::::SelectPieceScreen<>Control<>::
+select_piece_screen.gd::GDScript::-1::1739070369::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<>::
-=======
-::res://::1738784912
-icon.svg::CompressedTexture2D::6378281210119878262::1738697583::1738698231::1::::<><>::
-main.tscn::PackedScene::5692118487183161714::1738698010::0::1::::<><>::uid://cu7lkx15lmfww::::res://scenes/scene_manager.tscn
-README.md::TextFile::-1::1738697583::0::1::::<><>::
-::res://Assets/::1738973974
-::res://Assets/Character Assets/::1738973983
-Bishop Character.png::CompressedTexture2D::5940736122524784063::1738973983::1738974455::1::::<><>::
-Knight_Character.png::CompressedTexture2D::6219382475167814187::1738973983::1738974455::1::::<><>::
-Rook Character.png::CompressedTexture2D::4669491807804796081::1738973983::1738974455::1::::<><>::
-::res://Assets/noise/::1738785341
-noise2.tres::NoiseTexture2D::5054739835828921764::1738785341::0::1::::<><>::
-noise3.tres::NoiseTexture2D::906885015046579772::1738785341::0::1::::<><>::
-noise.tres::NoiseTexture2D::1693764769519573005::1738785341::0::1::::<><>::
-::res://Assets/Original size Chess pieces/::1738698231
-Black king piece 2.png::CompressedTexture2D::7820367427145083060::1738697583::1738698231::1::::<><>::
-Black knight piece.png::CompressedTexture2D::4196515762256027844::1738697583::1738698231::1::::<><>::
-Black Pawn Piece 2.png::CompressedTexture2D::2167440687080906934::1738697583::1738698231::1::::<><>::
-Black Queen Piece 2.png::CompressedTexture2D::6638986330393441989::1738697583::1738698231::1::::<><>::
-Black rook piece.png::CompressedTexture2D::1872655759582013005::1738697583::1738698231::1::::<><>::
-White king piece 2.png::CompressedTexture2D::7139286146806283259::1738697583::1738698231::1::::<><>::
-White knight piece.png::CompressedTexture2D::8293368904171920332::1738697583::1738698231::1::::<><>::
-White Pawn Piece 2.png::CompressedTexture2D::8915038826611091975::1738697583::1738698231::1::::<><>::
-White Queen Piece 2.png::CompressedTexture2D::339041922548181320::1738697583::1738698231::1::::<><>::
-White rook piece.png::CompressedTexture2D::6272641373813891014::1738697583::1738698231::1::::<><>::
-::res://Assets/Resized Chess Piece Assets/::1738785332
-Black_Assassin.png::CompressedTexture2D::8073890137727350160::1738785199::1738785332::1::::<><>::
-Black_Bishop.png::CompressedTexture2D::460446186536534245::1738785199::1738785332::1::::<><>::
-Black_king.png::CompressedTexture2D::4854362018128016652::1738785199::1738785332::1::::<><>::
-Black_knight.png::CompressedTexture2D::1617611918054521687::1738785199::1738785332::1::::<><>::
-Black_mage.png::CompressedTexture2D::2920003665923805930::1738785199::1738785332::1::::<><>::
-Black_Pawn.png::CompressedTexture2D::2619567017608544670::1738785199::1738785332::1::::<><>::
-Black_Queen.png::CompressedTexture2D::6947892130764941861::1738785199::1738785332::1::::<><>::
-Black_rook.png::CompressedTexture2D::8764665212117114244::1738785199::1738785332::1::::<><>::
-Black_wizard.png::CompressedTexture2D::5486342020773449925::1738785199::1738785332::1::::<><>::
-White_Assassin.png::CompressedTexture2D::3263768232109514548::1738785199::1738785332::1::::<><>::
-White_Bishop.png::CompressedTexture2D::2601047089659819063::1738785199::1738785332::1::::<><>::
-White_king.png::CompressedTexture2D::5585160899749004797::1738785199::1738785332::1::::<><>::
-White_knight.png::CompressedTexture2D::1766720508600943431::1738785199::1738785332::1::::<><>::
-White_mage.png::CompressedTexture2D::902301787075014336::1738785199::1738785332::1::::<><>::
-White_Pawn.png::CompressedTexture2D::1597566599437225196::1738785199::1738785332::1::::<><>::
-White_Queen.png::CompressedTexture2D::172918419201557125::1738785199::1738785332::1::::<><>::
-White_rook.png::CompressedTexture2D::5685989093237609766::1738785199::1738785332::1::::<><>::
-White_wizard.png::CompressedTexture2D::3041081003801605884::1738785199::1738785332::1::::<><>::
-::res://Assets/shaders/::1738785340
-3d_effect.gdshader::Shader::-1::1738698010::0::1::::<><>::
-bg.gdshader::Shader::-1::1738785340::0::1::::<><>::
-color.gdshader::Shader::-1::1738698010::0::1::::<><>::
-shadow.gdshader::Shader::-1::1738698010::0::1::::<><>::
-::res://Assets/sprites/::1738698231
-bishop.png::CompressedTexture2D::4631301773944929250::1738698010::1738698231::1::::<><>::
-knight.png::CompressedTexture2D::3545640967717948854::1738698010::1738698231::1::::<><>::
-pawn.png::CompressedTexture2D::1338760335342038528::1738698010::1738698228::1::::<><>::
-rook.png::CompressedTexture2D::6790909281007670776::1738698010::1738698228::1::::<><>::
-tile.png::CompressedTexture2D::8704336058451696509::1738698010::1738698228::1::::<><>::
-::res://Assets/temp_assets/::1738698229
-assassin.png::CompressedTexture2D::2309680507621369322::1738698010::1738698228::1::::<><>::
-black_bishop.png::CompressedTexture2D::7509881182472568151::1738698010::1738698228::1::::<><>::
-black_king.png::CompressedTexture2D::3646032776351028361::1738698010::1738698228::1::::<><>::
-black_knight.png::CompressedTexture2D::4591257172048987833::1738698010::1738698229::1::::<><>::
-black_pawn.png::CompressedTexture2D::3912668014183198267::1738698010::1738698229::1::::<><>::
-black_queen.png::CompressedTexture2D::7989886812523566234::1738698010::1738698229::1::::<><>::
-black_rook.png::CompressedTexture2D::8767708966549765967::1738698010::1738698229::1::::<><>::
-mage.png::CompressedTexture2D::4650471376600460963::1738698010::1738698229::1::::<><>::
-Piece_move.png::CompressedTexture2D::260618725614842917::1738698010::1738698229::1::::<><>::
-temp_chess_board.png::CompressedTexture2D::4173558678901569366::1738698010::1738698229::1::::<><>::
-turn-black.png::CompressedTexture2D::7112033964315790810::1738698010::1738698229::1::::<><>::
-turn-white.png::CompressedTexture2D::7344907768700758025::1738698010::1738698229::1::::<><>::
-white_bishop.png::CompressedTexture2D::8093744356261485644::1738698010::1738698229::1::::<><>::
-white_king.png::CompressedTexture2D::5901183203660598461::1738698010::1738698229::1::::<><>::
-white_knight.png::CompressedTexture2D::7533630084821562912::1738698010::1738698229::1::::<><>::
-white_pawn.png::CompressedTexture2D::8196778834906249875::1738698010::1738698229::1::::<><>::
-white_queen.png::CompressedTexture2D::1957958042777204643::1738698010::1738698229::1::::<><>::
-white_rook.png::CompressedTexture2D::3317152307554436932::1738698010::1738698229::1::::<><>::
-wizard.png::CompressedTexture2D::2759604866355024615::1738698010::1738698229::1::::<><>::
-::res://Assets/ui/::1738698232
-Go_Save_The_King_Menu.jpg::CompressedTexture2D::7252735845995868232::1738698010::1738698232::1::::<><>::
-Mockup Gameplay Design.jpg::CompressedTexture2D::4859609684236806088::1738698010::1738698231::1::::<><>::
-Mockup Shop Design.jpg::CompressedTexture2D::8043055154093708922::1738698010::1738698231::1::::<><>::
-::res://Assets/ui/title_screen/::1738698229
-play_button.png::CompressedTexture2D::5896995890187459238::1738698010::1738698229::1::::<><>::
-quit_button.png::CompressedTexture2D::5172428563227279585::1738698010::1738698229::1::::<><>::
-rules_button.png::CompressedTexture2D::8060955005205795067::1738698010::1738698229::1::::<><>::
-::res://scenes/::1738787758
-Assassin.tscn::PackedScene::1241611789899982875::1738786130::0::1::::<><>::res://scripts/Assassin.gd<>uid://753dogr1moxe::::res://assets/temp_assets/assassin.png
-Bishop.tscn::PackedScene::2789588702038144760::1738786614::0::1::::<><>::res://scripts/Bishop.gd<>uid://b68o4mj7wcwvq::::res://assets/sprites/bishop.png
-explosion.tscn::PackedScene::69466253159940830::1738698010::0::1::::<><>::
-game.tscn::PackedScene::8577524005707705072::1738787758::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::1738698010::0::1::::<><>::res://scripts/King.gd<>uid://cdogixbq8ay3t::::res://assets/Resized Chess Piece Assets/White_king.png
-Knight.tscn::PackedScene::5270730075267457303::1738698010::0::1::::<><>::res://scripts/Knight.gd<>uid://mf4a3jclbwih::::res://assets/Resized Chess Piece Assets/White_knight.png
-Mage.tscn::PackedScene::10334063134713649::1738786984::0::1::::<><>::res://scripts/Mage.gd<>uid://b7iyt4iwjbtd0::::res://assets/temp_assets/mage.png
-Pawn.tscn::PackedScene::3675784333675896641::1738787755::0::1::::<><>::res://scripts/Pawn.gd<>uid://ndi1e8thkonq::::res://assets/Resized Chess Piece Assets/White_Pawn.png
-Queen.tscn::PackedScene::7495869360053814603::1738698010::0::1::::<><>::res://scripts/Queen.gd<>uid://cb3vq168iyomb::::res://assets/Resized Chess Piece Assets/White_Queen.png
-Rook.tscn::PackedScene::9162401199636684468::1738698010::0::1::::<><>::uid://b00wxxfjk04ke::::res://assets/Resized Chess Piece Assets/White_rook.png
-scene_manager.tscn::PackedScene::6243365322716451430::1738698010::0::1::::<><>::res://scripts/scene_manager.gd
-texture_holder.tscn::PackedScene::594714386286134588::1738698010::0::1::::<><>::
-title_screen.tscn::PackedScene::8154710134031658440::1738698010::0::1::::<><>::res://scripts/title_screen/title_screen.gd<>uid://bm8sv1itwm467::::res://scenes/ui/menu_button.tscn
-Wizard.tscn::PackedScene::6352212773395470747::1738787495::0::1::::<><>::res://scripts/Wizard.gd<>uid://bfk1j3brcknkp::::res://assets/temp_assets/wizard.png
-::res://scenes/ui/::1738698010
-menu_button.tscn::PackedScene::3297943059633979218::1738698010::0::1::::<><>::res://assets/shaders/3d_effect.gdshader<>res://scripts/title_screen/menu_button.gd
-::res://scripts/::1738698010
-Assassin.gd::GDScript::-1::1738698010::0::1::::Assassin<>Piece<>::
-Bishop.gd::GDScript::-1::1738698010::0::1::::Bishop<>Piece<>::
-game.gd::GDScript::-1::1738698010::0::1::::game<>Node<>::
-King.gd::GDScript::-1::1738698010::0::1::::King<>Piece<>::
-Knight.gd::GDScript::-1::1738698010::0::1::::Knight<>Piece<>::
-Mage.gd::GDScript::-1::1738698010::0::1::::Mage<>Piece<>::
-Pawn.gd::GDScript::-1::1738698010::0::1::::Pawn<>Piece<>::
-Piece.gd::GDScript::-1::1738698010::0::1::::Piece<>Node2D<>::
-Queen.gd::GDScript::-1::1738698010::0::1::::Queen<>Piece<>::
-Rook.gd::GDScript::-1::1738698010::0::1::::Rook<>Piece<>::
-scene_manager.gd::GDScript::-1::1738698010::0::1::::<>Node<>::
-Wizard.gd::GDScript::-1::1738698010::0::1::::Wizard<>Piece<>::
-::res://scripts/title_screen/::1738698010
-menu_button.gd::GDScript::-1::1738698010::0::1::::TitleButton<>Button<>::
-title_screen.gd::GDScript::-1::1738698010::0::1::::TitleScreen<>Control<>::
->>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
diff --git a/.godot/editor/filesystem_update4 b/.godot/editor/filesystem_update4
index 2467d0a6c0ab90382ce9f724d58c0eb9bba82d34..249b19b71bfe9c0f5f710f596d87ef29398e6847 100644
--- a/.godot/editor/filesystem_update4
+++ b/.godot/editor/filesystem_update4
@@ -1,26 +1,11 @@
-<<<<<<< HEAD
-res://main.tscn
+res://scenes/game.tscn
res://assets/shaders/bg.gdshader
res://assets/noise/noise.tres
res://assets/noise/noise2.tres
res://assets/noise/noise3.tres
-res://scenes/scene_manager.tscn
-res://scenes/game.tscn
-res://scenes/ui/pop_up_label.tscn
-res://scenes/screens/title_screen.tscn
+res://main.tscn
+res://scenes/Bishop.tscn
+res://scenes/Assassin.tscn
res://scenes/screens/select_piece_screen.tscn
-res://scenes/ui/menu_button.tscn
res://scripts/screens/select_piece_screen.gd
-res://scripts/run_data/run_data.gd
-=======
-res://scripts/Assassin.gd
-res://scripts/game.gd
-res://scenes/game.tscn
-res://assets/shaders/bg.gdshader
-res://Assets/noise/noise.tres
-res://Assets/noise/noise2.tres
-res://Assets/noise/noise3.tres
-res://scripts/Mage.gd
-res://scripts/Wizard.gd
-res://scripts/Bishop.gd
->>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
+res://scenes/screens/title_screen.tscn
diff --git a/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg b/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg
index 5b0143dd32a83fd72b99b4bd26281778e863535b..17d58d5b59c20b6d688dbb9cf1e54058bec0b710 100644
--- a/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg
+++ b/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg
@@ -175,8 +175,4 @@ Anim={
"zfar": 4000.01,
"znear": 0.05
}
-<<<<<<< HEAD
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")])
-=======
-selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@16894/@Panel@13/@VBoxContainer@14/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@25/DockVSplitCenter/@VSplitContainer@52/@VBoxContainer@53/@PanelContainer@98/MainScreen/@CanvasItemEditor@9280/@VSplitContainer@9102/@HSplitContainer@9104/@HSplitContainer@9106/@Control@9107/@SubViewportContainer@9108/@SubViewport@9109/Game")])
->>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
diff --git a/.godot/editor/main.tscn-editstate-3070c538c03ee49b7677ff960a3f5195.cfg b/.godot/editor/main.tscn-editstate-3070c538c03ee49b7677ff960a3f5195.cfg
index 0f26fbfe20c057312f4bb570c1e87dc687b65f8f..a198fd591d31a5bddfe3dc94ffb9c448727a0060 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]([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")])
+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/SelectPieceScreen/HBoxContainer/Knight")])
diff --git a/.godot/editor/project_metadata.cfg b/.godot/editor/project_metadata.cfg
index be921fc2e8d40a68705f893c468924a49236a724..4108a93f2cb2debce2c5c05e969b0d0b2f523a77 100644
--- a/.godot/editor/project_metadata.cfg
+++ b/.godot/editor/project_metadata.cfg
@@ -6,29 +6,15 @@ use_advanced_connections=false
[dialog_bounds]
<<<<<<<HEADcreate_new_node=Rect2(2145, 197, 900, 700)
-<<<<<<< HEAD
-project_settings=Rect2(1290, 76, 1590, 867)
-create_new_node=Rect2(510, 264, 1613, 885)
+<<<<<<<HEADproject_settings=Rect2(1290, 76, 1590, 867)
+create_new_node=Rect2(2379, 158, 1118, 721)
+project_settings=Rect2(2280, 190, 1200, 700)
[recent_files]
-scenes=["res://scenes/ui/menu_button.tscn", "res://scenes/screens/select_piece_screen.tscn", "res://scenes/screens/title_screen.tscn", "res://scenes/ui/pop_up_label.tscn", "res://scenes/game.tscn", "res://scenes/scene_manager.tscn", "res://main.tscn", "res://scenes/title_screen.tscn", "res://scenes/Pawn.tscn", "res://scenes/Assassin.tscn"]
-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"]
+scenes=["res://scenes/screens/title_screen.tscn", "res://scenes/screens/select_piece_screen.tscn", "res://scenes/Wizard.tscn", "res://scenes/Rook.tscn", "res://scenes/Queen.tscn", "res://scenes/Pawn.tscn", "res://scenes/Mage.tscn", "res://scenes/Knight.tscn", "res://scenes/King.tscn", "res://scenes/Assassin.tscn"]
+scripts=["res://scripts/screens/title_screen.gd", "res://scripts/screens/select_piece_screen.gd", "res://scripts/Wizard.gd", "res://scripts/Queen.gd", "res://scripts/Pawn.gd", "res://scripts/Mage.gd", "res://scripts/Knight.gd", "res://scripts/King.gd", "res://scripts/Assassin.gd", "res://scripts/Bishop.gd"]
[script_setup]
last_selected_language="GDScript"
-=======
-project_settings=Rect2(2022, 76, 1590, 867)
-editor_settings=Rect2(706, 197, 900, 700)
-
-[recent_files]
-
-scenes=["res://scenes/game.tscn"]
-scripts=["res://scripts/game.gd"]
-
-[color_picker]
-
-picker_shape=3
-recent_presets=PackedColorArray(0, 0.84937, 0.111819, 1, 0, 0.417456, 0.0325145, 1, 0.104888, 0.123405, 0.154273, 1)
->>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
diff --git a/.godot/editor/recent_dirs b/.godot/editor/recent_dirs
index 8494b33e682ce8b344a124aa3e3a3f1211e6870c..88ff89ed7906d94f3ca0d1cef43c1859ee842e61 100644
--- a/.godot/editor/recent_dirs
+++ b/.godot/editor/recent_dirs
@@ -1,3 +1,5 @@
+res://assets/Character Assets
+res://assets/Resized Chess Piece Assets
res://scripts/screens
res://scenes/screens
res://scripts/main
diff --git a/.godot/editor/script_editor_cache.cfg b/.godot/editor/script_editor_cache.cfg
index ddcb691cd9708139c64cbf7043a259686cdffb23..b872ebd20594c858d800e6bb03ee29eb9fb1ee25 100644
--- a/.godot/editor/script_editor_cache.cfg
+++ b/.godot/editor/script_editor_cache.cfg
@@ -3,45 +3,44 @@
state={
"bookmarks": PackedInt32Array(),
"breakpoints": PackedInt32Array(),
-<<<<<<< HEAD
-"column": 36,
+"column": 24,
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
-"row": 365,
-"scroll_position": 366.0,
+"row": 309,
+"scroll_position": 300.0,
"selection": false,
"syntax_highlighter": "GDScript"
}
-[res://scripts/scene_manager.gd]
+[res://scripts/main/main.gd]
state={
"bookmarks": PackedInt32Array(),
"breakpoints": PackedInt32Array(),
-"column": 44,
+"column": 0,
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
-"row": 10,
-"scroll_position": 13.0,
+"row": 0,
+"scroll_position": 0.0,
"selection": false,
"syntax_highlighter": "GDScript"
}
-[res://scripts/Assassin.gd]
+[res://scripts/scene_manager.gd]
state={
"bookmarks": PackedInt32Array(),
"breakpoints": PackedInt32Array(),
-"column": 61,
+"column": 0,
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
-"row": 54,
-"scroll_position": 0.0,
+"row": 23,
+"scroll_position": 12.0,
"selection": false,
"syntax_highlighter": "GDScript"
}
-[res://scripts/ui/pop_up_label.gd]
+[res://scripts/Bishop.gd]
state={
"bookmarks": PackedInt32Array(),
@@ -49,13 +48,13 @@ state={
"column": 0,
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
-"row": 8,
+"row": 0,
"scroll_position": 0.0,
"selection": false,
"syntax_highlighter": "GDScript"
}
-[res://scripts/Queen.gd]
+[res://scripts/Assassin.gd]
state={
"bookmarks": PackedInt32Array(),
@@ -64,12 +63,12 @@ state={
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
"row": 0,
-"scroll_position": 86.0,
+"scroll_position": 0.0,
"selection": false,
"syntax_highlighter": "GDScript"
}
-[res://scripts/Pawn.gd]
+[res://scripts/King.gd]
state={
"bookmarks": PackedInt32Array(),
@@ -77,27 +76,27 @@ state={
"column": 0,
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
-"row": 71,
-"scroll_position": 46.0,
+"row": 0,
+"scroll_position": 0.0,
"selection": false,
"syntax_highlighter": "GDScript"
}
-[res://scripts/run_data/run_data.gd]
+[res://scripts/Knight.gd]
state={
"bookmarks": PackedInt32Array(),
"breakpoints": PackedInt32Array(),
-"column": 28,
+"column": 0,
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
-"row": 18,
-"scroll_position": 6.0,
+"row": 0,
+"scroll_position": 0.0,
"selection": false,
"syntax_highlighter": "GDScript"
}
-[res://scripts/main/main.gd]
+[res://scripts/Mage.gd]
state={
"bookmarks": PackedInt32Array(),
@@ -105,13 +104,13 @@ state={
"column": 0,
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
-"row": 8,
+"row": 0,
"scroll_position": 0.0,
"selection": false,
"syntax_highlighter": "GDScript"
}
-[res://scripts/Piece.gd]
+[res://scripts/Pawn.gd]
state={
"bookmarks": PackedInt32Array(),
@@ -119,13 +118,13 @@ state={
"column": 0,
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
-"row": 21,
-"scroll_position": 7.0,
+"row": 0,
+"scroll_position": 0.0,
"selection": false,
"syntax_highlighter": "GDScript"
}
-[res://scripts/Rook.gd]
+[res://scripts/Queen.gd]
state={
"bookmarks": PackedInt32Array(),
@@ -139,15 +138,15 @@ state={
"syntax_highlighter": "GDScript"
}
-[res://scripts/screens/title_screen.gd]
+[res://scripts/Wizard.gd]
state={
"bookmarks": PackedInt32Array(),
"breakpoints": PackedInt32Array(),
-"column": 74,
+"column": 0,
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
-"row": 17,
+"row": 0,
"scroll_position": 0.0,
"selection": false,
"syntax_highlighter": "GDScript"
@@ -158,32 +157,25 @@ state={
state={
"bookmarks": PackedInt32Array(),
"breakpoints": PackedInt32Array(),
-"column": 0,
+"column": 1,
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
-"row": 40,
-"scroll_position": 27.0,
+"row": 39,
+"scroll_position": 26.0,
"selection": false,
"syntax_highlighter": "GDScript"
}
-[res://scripts/screens/menu_button.gd]
+[res://scripts/screens/title_screen.gd]
state={
"bookmarks": PackedInt32Array(),
"breakpoints": PackedInt32Array(),
-"column": 18,
-"folded_lines": Array[int]([]),
-"h_scroll_position": 0,
-"row": 54,
-"scroll_position": 41.0,
-=======
"column": 0,
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
-"row": 147,
-"scroll_position": 147.0,
->>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
+"row": 0,
+"scroll_position": 0.0,
"selection": false,
"syntax_highlighter": "GDScript"
}
diff --git a/.godot/global_script_class_cache.cfg b/.godot/global_script_class_cache.cfg
index 563482b5ba10ee8cb06d69f3793cb4729401b916..0baf76cfef5ad0015e277b24efb239104fb0d7a1 100644
--- a/.godot/global_script_class_cache.cfg
+++ b/.godot/global_script_class_cache.cfg
@@ -53,15 +53,12 @@ list=Array[Dictionary]([{
"language": &"GDScript",
"path": "res://scripts/Rook.gd"
}, {
-<<<<<<< HEAD
"base": &"Control",
"class": &"SelectPieceScreen",
"icon": "",
"language": &"GDScript",
"path": "res://scripts/screens/select_piece_screen.gd"
}, {
-=======
->>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
"base": &"Button",
"class": &"TitleButton",
"icon": "",
@@ -72,11 +69,7 @@ list=Array[Dictionary]([{
"class": &"TitleScreen",
"icon": "",
"language": &"GDScript",
-<<<<<<< HEAD
"path": "res://scripts/screens/title_screen.gd"
-=======
-"path": "res://scripts/title_screen/title_screen.gd"
->>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
}, {
"base": &"Piece",
"class": &"Wizard",
diff --git a/.godot/uid_cache.bin b/.godot/uid_cache.bin
index 2e758366f4464ecbfe93da6689cb6e48f3bba8c4..7a3e6d1a7085f9e95c7880e92eec901712543abb 100644
Binary files a/.godot/uid_cache.bin and b/.godot/uid_cache.bin differ
diff --git a/Assets/Character Assets/Bishop Character.png b/Assets/Character Assets/Bishop Character.png
index 86162dc0113a33ff13920670589788c544e1b5ee..3aa7571926f5e5a1fadc5fc8ab296151bb5a205c 100644
Binary files a/Assets/Character Assets/Bishop Character.png and b/Assets/Character Assets/Bishop Character.png differ
diff --git a/Assets/Character Assets/Bishop Character.png.import b/Assets/Character Assets/Bishop Character.png.import
index 121b5f4ef4e45b11a54794319898a5c8bf2b6667..603f62fe2ddd80f9057dc56ee5b1b74a4e2683b2 100644
--- a/Assets/Character Assets/Bishop Character.png.import
+++ b/Assets/Character Assets/Bishop Character.png.import
@@ -3,15 +3,15 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://cqv0b5ypsi2tn"
-path="res://.godot/imported/Bishop Character.png-42cee4b1125c4685f859ba1f68685818.ctex"
+path="res://.godot/imported/Bishop Character.png-3352379d0ccade7fe1f71b3c48df6f8b.ctex"
metadata={
"vram_texture": false
}
[deps]
-source_file="res://Assets/Character Assets/Bishop Character.png"
-dest_files=["res://.godot/imported/Bishop Character.png-42cee4b1125c4685f859ba1f68685818.ctex"]
+source_file="res://assets/Character Assets/Bishop Character.png"
+dest_files=["res://.godot/imported/Bishop Character.png-3352379d0ccade7fe1f71b3c48df6f8b.ctex"]
[params]
diff --git a/Assets/Character Assets/Knight_Character.png b/Assets/Character Assets/Knight_Character.png
index 2402eaf31962c761a15670bae1469884266264f1..7e4ed3db4fb4cc07240e16eda488dc6fc2c4e8d2 100644
Binary files a/Assets/Character Assets/Knight_Character.png and b/Assets/Character Assets/Knight_Character.png differ
diff --git a/Assets/Character Assets/Knight_Character.png.import b/Assets/Character Assets/Knight_Character.png.import
index 8ef215adc0dd6fd08df579fa720a03626a042bf4..14416618910bbc4dcba8fa3fc331a04e03abf29c 100644
--- a/Assets/Character Assets/Knight_Character.png.import
+++ b/Assets/Character Assets/Knight_Character.png.import
@@ -3,15 +3,15 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://cuuyk5y51r8ux"
-path="res://.godot/imported/Knight_Character.png-65960834d50183e8cebba30ff64106d1.ctex"
+path="res://.godot/imported/Knight_Character.png-a0948d8d2263f031f88373c11bc2c68d.ctex"
metadata={
"vram_texture": false
}
[deps]
-source_file="res://Assets/Character Assets/Knight_Character.png"
-dest_files=["res://.godot/imported/Knight_Character.png-65960834d50183e8cebba30ff64106d1.ctex"]
+source_file="res://assets/Character Assets/Knight_Character.png"
+dest_files=["res://.godot/imported/Knight_Character.png-a0948d8d2263f031f88373c11bc2c68d.ctex"]
[params]
diff --git a/Assets/Character Assets/Rook Character.png b/Assets/Character Assets/Rook Character.png
index de6a48768ad6e1daa3e46cf9192166d735edea46..8184fc0956ae6909c0bdc0481a53db8bc9d8bc14 100644
Binary files a/Assets/Character Assets/Rook Character.png and b/Assets/Character Assets/Rook Character.png differ
diff --git a/Assets/Character Assets/Rook Character.png.import b/Assets/Character Assets/Rook Character.png.import
index c9c0aa0fd4ef343cdf6a184ae5af6b5b037acb81..e98338a808851ad2c68b7f879e3834e58313985c 100644
--- a/Assets/Character Assets/Rook Character.png.import
+++ b/Assets/Character Assets/Rook Character.png.import
@@ -3,15 +3,15 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://b7r633ea3cxw0"
-path="res://.godot/imported/Rook Character.png-01b2495e1a84ebf3773cc2d11a895088.ctex"
+path="res://.godot/imported/Rook Character.png-3d001d0e4c07f2a51e0075c7ddf8ba20.ctex"
metadata={
"vram_texture": false
}
[deps]
-source_file="res://Assets/Character Assets/Rook Character.png"
-dest_files=["res://.godot/imported/Rook Character.png-01b2495e1a84ebf3773cc2d11a895088.ctex"]
+source_file="res://assets/Character Assets/Rook Character.png"
+dest_files=["res://.godot/imported/Rook Character.png-3d001d0e4c07f2a51e0075c7ddf8ba20.ctex"]
[params]
diff --git a/Assets/Resized Chess Piece Assets/Black_Assassin.png.import b/Assets/Resized Chess Piece Assets/Black_Assassin.png.import
index 2cd2a72bd2b7026e05e7679cd0b1114f23355a2e..a7f9c0c540e4d928fc8fff70a31bd37a8f7e4c71 100644
--- a/Assets/Resized Chess Piece Assets/Black_Assassin.png.import
+++ b/Assets/Resized Chess Piece Assets/Black_Assassin.png.import
@@ -2,13 +2,8 @@
importer="texture"
type="CompressedTexture2D"
-<<<<<<< HEAD
-uid="uid://cjc7sh4hfoqt3"
+uid="uid://c83ut3xxvkahs"
path="res://.godot/imported/Black_Assassin.png-9779f11d14d3617e840d68f6a9ebb5d0.ctex"
-=======
-uid="uid://dnbb15l282cpc"
-path="res://.godot/imported/Black_Assassin.png-92f0801c336ab61369a2b93fc5e3abcd.ctex"
->>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
metadata={
"vram_texture": false
}
diff --git a/Assets/Resized Chess Piece Assets/Black_Bishop.png.import b/Assets/Resized Chess Piece Assets/Black_Bishop.png.import
index c5a54f09762fbd312574770a39259b6ee7c1544d..4001dad56362fc1d090c117a4fbf3bfc04665cc3 100644
--- a/Assets/Resized Chess Piece Assets/Black_Bishop.png.import
+++ b/Assets/Resized Chess Piece Assets/Black_Bishop.png.import
@@ -2,13 +2,8 @@
importer="texture"
type="CompressedTexture2D"
-<<<<<<< HEAD
-uid="uid://cmportfufw0sc"
+uid="uid://diyxdsthua4oe"
path="res://.godot/imported/Black_Bishop.png-31156db37595e69ca512c38698f9a239.ctex"
-=======
-uid="uid://gtbqmr0ges3f"
-path="res://.godot/imported/Black_Bishop.png-dfabfc0c81260272c753c7f344c2996a.ctex"
->>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
metadata={
"vram_texture": false
}
diff --git a/Assets/Resized Chess Piece Assets/Black_Pawn.png.import b/Assets/Resized Chess Piece Assets/Black_Pawn.png.import
index 034b24e50e998508d7c45db822695aa6421a9f81..13fc645f6090afbe517ee2b581ebeea136b225da 100644
--- a/Assets/Resized Chess Piece Assets/Black_Pawn.png.import
+++ b/Assets/Resized Chess Piece Assets/Black_Pawn.png.import
@@ -2,13 +2,8 @@
importer="texture"
type="CompressedTexture2D"
-<<<<<<< HEAD
-uid="uid://ccqn4arw41esa"
+uid="uid://ccab1bkfpdh4w"
path="res://.godot/imported/Black_Pawn.png-c1035123434d941739e8a31659fe845d.ctex"
-=======
-uid="uid://bdk65ejtf6ygk"
-path="res://.godot/imported/Black_Pawn.png-73ec9504aa6a8628b0708bd600099243.ctex"
->>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
metadata={
"vram_texture": false
}
diff --git a/Assets/Resized Chess Piece Assets/Black_Queen.png.import b/Assets/Resized Chess Piece Assets/Black_Queen.png.import
index 67c29e25ac49ccd702fe84ec16d078908b1b5aa2..28d0222381db70d090fb8d50dcbfc3e13844200f 100644
--- a/Assets/Resized Chess Piece Assets/Black_Queen.png.import
+++ b/Assets/Resized Chess Piece Assets/Black_Queen.png.import
@@ -2,13 +2,8 @@
importer="texture"
type="CompressedTexture2D"
-<<<<<<< HEAD
-uid="uid://d13pkit0yx8w1"
+uid="uid://fffv0rfu0q7c"
path="res://.godot/imported/Black_Queen.png-91c924908a298cebe9bc2bdd61cd1aab.ctex"
-=======
-uid="uid://c58u1efa4tny0"
-path="res://.godot/imported/Black_Queen.png-129070e6a0ddc5f7ae2bf0cc746c3d32.ctex"
->>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
metadata={
"vram_texture": false
}
diff --git a/Assets/Resized Chess Piece Assets/Black_king.png.import b/Assets/Resized Chess Piece Assets/Black_king.png.import
index f96fbf62906fbfd2df8a8016b3dfd92fc6c7f80e..5ef541aded4eeec6af1fb12bd41a916ea282368c 100644
--- a/Assets/Resized Chess Piece Assets/Black_king.png.import
+++ b/Assets/Resized Chess Piece Assets/Black_king.png.import
@@ -2,13 +2,8 @@
importer="texture"
type="CompressedTexture2D"
-<<<<<<< HEAD
-uid="uid://bsuewqxoi3kxe"
+uid="uid://s6aop51xfemj"
path="res://.godot/imported/Black_king.png-64de782c258a02d199067831bbfebfe0.ctex"
-=======
-uid="uid://cbfqvr8t31fu7"
-path="res://.godot/imported/Black_king.png-dbd93650975809023d5051fb7e838887.ctex"
->>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
metadata={
"vram_texture": false
}
diff --git a/Assets/Resized Chess Piece Assets/Black_knight.png.import b/Assets/Resized Chess Piece Assets/Black_knight.png.import
index 4d32f74d63c82622720dcef705c63f08c600d14b..f3b3c96d936e444d3b997291cacc2c4979baa723 100644
--- a/Assets/Resized Chess Piece Assets/Black_knight.png.import
+++ b/Assets/Resized Chess Piece Assets/Black_knight.png.import
@@ -2,13 +2,8 @@
importer="texture"
type="CompressedTexture2D"
-<<<<<<< HEAD
-uid="uid://bq4h60chg048p"
+uid="uid://bc5brk7x4t760"
path="res://.godot/imported/Black_knight.png-846a36a9b55a92a0bd2e4692a89d9222.ctex"
-=======
-uid="uid://xbt3j0eqlab4"
-path="res://.godot/imported/Black_knight.png-929454b56153273c352ed40512756608.ctex"
->>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
metadata={
"vram_texture": false
}
diff --git a/Assets/Resized Chess Piece Assets/Black_mage.png.import b/Assets/Resized Chess Piece Assets/Black_mage.png.import
index deef8756fa55b77a0a8ba437dd6904b74195b49b..df7e9465a264bb3339558499747e80aab3be1290 100644
--- a/Assets/Resized Chess Piece Assets/Black_mage.png.import
+++ b/Assets/Resized Chess Piece Assets/Black_mage.png.import
@@ -2,13 +2,8 @@
importer="texture"
type="CompressedTexture2D"
-<<<<<<< HEAD
-uid="uid://bnat6bynu44je"
+uid="uid://c7ww1mqqwmyed"
path="res://.godot/imported/Black_mage.png-7a41e4577f14b778296718d2c9942c5c.ctex"
-=======
-uid="uid://bhuqbfa5s6yuk"
-path="res://.godot/imported/Black_mage.png-f47f7e890ef040a98dd73453a681ffe1.ctex"
->>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
metadata={
"vram_texture": false
}
diff --git a/Assets/Resized Chess Piece Assets/Black_rook.png.import b/Assets/Resized Chess Piece Assets/Black_rook.png.import
index ec6aaf4d4c9147545873899dd79c810a77e297b0..17fac04a2c20a5e1a7f4d6ade3828c131952d6c2 100644
--- a/Assets/Resized Chess Piece Assets/Black_rook.png.import
+++ b/Assets/Resized Chess Piece Assets/Black_rook.png.import
@@ -2,13 +2,8 @@
importer="texture"
type="CompressedTexture2D"
-<<<<<<< HEAD
-uid="uid://cmlbpctuqkr3u"
+uid="uid://boc1kms28eeem"
path="res://.godot/imported/Black_rook.png-70e1d5eb566b78612ae78261e7f5d5a6.ctex"
-=======
-uid="uid://dw4w0xmtfft4g"
-path="res://.godot/imported/Black_rook.png-b128d49fd31d80383e68d3d654f74445.ctex"
->>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
metadata={
"vram_texture": false
}
diff --git a/Assets/Resized Chess Piece Assets/Black_wizard.png.import b/Assets/Resized Chess Piece Assets/Black_wizard.png.import
index 1f5bc72e2a0ea5a42b30c4702169a807a67ca177..e3e7d9b0680ee17da5edafa6fda7387ba3aa4653 100644
--- a/Assets/Resized Chess Piece Assets/Black_wizard.png.import
+++ b/Assets/Resized Chess Piece Assets/Black_wizard.png.import
@@ -2,13 +2,8 @@
importer="texture"
type="CompressedTexture2D"
-<<<<<<< HEAD
-uid="uid://shl6jsfvn0ta"
+uid="uid://g3l7llk1bf0w"
path="res://.godot/imported/Black_wizard.png-cb555143bb3a98fb848f99dcfe765549.ctex"
-=======
-uid="uid://ckfvis0v68irl"
-path="res://.godot/imported/Black_wizard.png-0afea0808b6267d98cbfc8507751a05e.ctex"
->>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
metadata={
"vram_texture": false
}
diff --git a/Assets/Resized Chess Piece Assets/White_Assassin.png.import b/Assets/Resized Chess Piece Assets/White_Assassin.png.import
index 7608ed0390a1ace7a3b86d824408b7166394f5a1..3d51f275397113a7649faec4e01502c33de0ea23 100644
--- a/Assets/Resized Chess Piece Assets/White_Assassin.png.import
+++ b/Assets/Resized Chess Piece Assets/White_Assassin.png.import
@@ -2,13 +2,8 @@
importer="texture"
type="CompressedTexture2D"
-<<<<<<< HEAD
-uid="uid://j8hhxry8f0ii"
+uid="uid://b24dojprangcr"
path="res://.godot/imported/White_Assassin.png-07ca33a1945b47ebea515fea105e20ee.ctex"
-=======
-uid="uid://bmq81ysump1xg"
-path="res://.godot/imported/White_Assassin.png-b91d29cfa010c3f963e5fe98fea3f7ce.ctex"
->>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
metadata={
"vram_texture": false
}
diff --git a/Assets/Resized Chess Piece Assets/White_Bishop.png.import b/Assets/Resized Chess Piece Assets/White_Bishop.png.import
index 17c310611410ec7ab8558e87b38125ffbea971e7..4c46694fe069fe175bae2b9a86d65d800d36c4c5 100644
--- a/Assets/Resized Chess Piece Assets/White_Bishop.png.import
+++ b/Assets/Resized Chess Piece Assets/White_Bishop.png.import
@@ -2,13 +2,8 @@
importer="texture"
type="CompressedTexture2D"
-<<<<<<< HEAD
-uid="uid://buolh1uof3bbc"
+uid="uid://rubnu2rwm76q"
path="res://.godot/imported/White_Bishop.png-955d7c5de349d5f940adee703d5f794f.ctex"
-=======
-uid="uid://bdb74otsib8ql"
-path="res://.godot/imported/White_Bishop.png-7213de7b15a92e5747f2331d55eafa2b.ctex"
->>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
metadata={
"vram_texture": false
}
diff --git a/Assets/Resized Chess Piece Assets/White_Pawn.png.import b/Assets/Resized Chess Piece Assets/White_Pawn.png.import
index 1e611e0e538f8a4ce0b0061a00543de7eef81ebe..0df1d08c8c55525c1e2a43b945fc6f74a3c67b10 100644
--- a/Assets/Resized Chess Piece Assets/White_Pawn.png.import
+++ b/Assets/Resized Chess Piece Assets/White_Pawn.png.import
@@ -2,13 +2,8 @@
importer="texture"
type="CompressedTexture2D"
-<<<<<<< HEAD
-uid="uid://ndi1e8thkonq"
+uid="uid://jenht75dkwpv"
path="res://.godot/imported/White_Pawn.png-a927ba07461adabe83c8ff13a8982486.ctex"
-=======
-uid="uid://w04xn5hy44qq"
-path="res://.godot/imported/White_Pawn.png-4fbaffc4602d71e6cac15276c9938262.ctex"
->>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
metadata={
"vram_texture": false
}
diff --git a/Assets/Resized Chess Piece Assets/White_Queen.png.import b/Assets/Resized Chess Piece Assets/White_Queen.png.import
index 04de6d55faff0025875a0f28ccbf9fe18fb833d1..a2fc06473e959ad41c21deb796c2a56e9aa1d8b9 100644
--- a/Assets/Resized Chess Piece Assets/White_Queen.png.import
+++ b/Assets/Resized Chess Piece Assets/White_Queen.png.import
@@ -2,13 +2,8 @@
importer="texture"
type="CompressedTexture2D"
-<<<<<<< HEAD
-uid="uid://cb3vq168iyomb"
+uid="uid://cg4cxk4tkibra"
path="res://.godot/imported/White_Queen.png-a669898b0c5a31bf072c0c8c1df1616f.ctex"
-=======
-uid="uid://cp0686asvj0h"
-path="res://.godot/imported/White_Queen.png-a9036b7b39d84991818902d33b82e9f7.ctex"
->>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
metadata={
"vram_texture": false
}
diff --git a/Assets/Resized Chess Piece Assets/White_king.png.import b/Assets/Resized Chess Piece Assets/White_king.png.import
index dfabcb455cf6cfef9f8e744896588f6946f45aad..d960d0912ca38f2175f158220d45d12cf701f767 100644
--- a/Assets/Resized Chess Piece Assets/White_king.png.import
+++ b/Assets/Resized Chess Piece Assets/White_king.png.import
@@ -2,13 +2,8 @@
importer="texture"
type="CompressedTexture2D"
-<<<<<<< HEAD
-uid="uid://cdogixbq8ay3t"
+uid="uid://bc4si5phvljsq"
path="res://.godot/imported/White_king.png-0d53fbc8f540b7f9892862e16f4557f5.ctex"
-=======
-uid="uid://cltq1wk8w0s02"
-path="res://.godot/imported/White_king.png-c9b2bce7af3c06b61d26520db25cf997.ctex"
->>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
metadata={
"vram_texture": false
}
diff --git a/Assets/Resized Chess Piece Assets/White_knight.png.import b/Assets/Resized Chess Piece Assets/White_knight.png.import
index e948a8d36c6a072c5333f04a80ce1355dd11fffc..ecd7254a03ced218f60210c523b44751969627bb 100644
--- a/Assets/Resized Chess Piece Assets/White_knight.png.import
+++ b/Assets/Resized Chess Piece Assets/White_knight.png.import
@@ -2,13 +2,8 @@
importer="texture"
type="CompressedTexture2D"
-<<<<<<< HEAD
-uid="uid://mf4a3jclbwih"
+uid="uid://c8inpm885j661"
path="res://.godot/imported/White_knight.png-af5b60f24c1f66b5bac879aef8e75467.ctex"
-=======
-uid="uid://0f2vmyxb7sh8"
-path="res://.godot/imported/White_knight.png-c190fd776f0ab6d33f3119fa59d71766.ctex"
->>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
metadata={
"vram_texture": false
}
diff --git a/Assets/Resized Chess Piece Assets/White_mage.png.import b/Assets/Resized Chess Piece Assets/White_mage.png.import
index a23d7a1fd7d0c040d72329d918aaeb3e1f3b21ad..bf72a6d42c5a84fa5ab43b56a002137e7cb17e4e 100644
--- a/Assets/Resized Chess Piece Assets/White_mage.png.import
+++ b/Assets/Resized Chess Piece Assets/White_mage.png.import
@@ -2,13 +2,8 @@
importer="texture"
type="CompressedTexture2D"
-<<<<<<< HEAD
-uid="uid://dbrrvccmlyblq"
+uid="uid://d0pvdk6lfxyyr"
path="res://.godot/imported/White_mage.png-13bf07fba853ef5731085aacccb3bab2.ctex"
-=======
-uid="uid://m4c1qckexo7q"
-path="res://.godot/imported/White_mage.png-fdbd721bd126c3ac8c64372cf709b530.ctex"
->>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
metadata={
"vram_texture": false
}
diff --git a/Assets/Resized Chess Piece Assets/White_rook.png.import b/Assets/Resized Chess Piece Assets/White_rook.png.import
index 38a91e6e5bd4bf27936f458a4209e0abd16ff240..9929420a63fdb03875e0773ba82d1779699eba70 100644
--- a/Assets/Resized Chess Piece Assets/White_rook.png.import
+++ b/Assets/Resized Chess Piece Assets/White_rook.png.import
@@ -2,13 +2,8 @@
importer="texture"
type="CompressedTexture2D"
-<<<<<<< HEAD
-uid="uid://b00wxxfjk04ke"
+uid="uid://cjl7hyf15yeiv"
path="res://.godot/imported/White_rook.png-e5e1a20ca93a0594be5d3fb1267367d2.ctex"
-=======
-uid="uid://cnaln6sgju27k"
-path="res://.godot/imported/White_rook.png-c9db72425068861f66815521164a4236.ctex"
->>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
metadata={
"vram_texture": false
}
diff --git a/Assets/Resized Chess Piece Assets/White_wizard.png.import b/Assets/Resized Chess Piece Assets/White_wizard.png.import
index 2a95c791974c1fc9e9845d3c6d0ce8db2f89ae3f..80aee8689fe41dbde186483a8dcd7219a5fca949 100644
--- a/Assets/Resized Chess Piece Assets/White_wizard.png.import
+++ b/Assets/Resized Chess Piece Assets/White_wizard.png.import
@@ -2,13 +2,8 @@
importer="texture"
type="CompressedTexture2D"
-<<<<<<< HEAD
-uid="uid://dwo5k5y02pe46"
+uid="uid://d01b3260cqyhb"
path="res://.godot/imported/White_wizard.png-c84194d9805542fd48d5428ec5a721ef.ctex"
-=======
-uid="uid://bjlefo01b774s"
-path="res://.godot/imported/White_wizard.png-17abee749f8f28c0cac280088ae22bc1.ctex"
->>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
metadata={
"vram_texture": false
}
diff --git a/Assets/temp_assets/assassin.png.import b/Assets/temp_assets/assassin.png.import
index 3042aa7e79f555a99f65d5d17b284a7f05c08ac9..2153ed5946f1bedf35cf3560acae179535950d6a 100644
--- a/Assets/temp_assets/assassin.png.import
+++ b/Assets/temp_assets/assassin.png.import
@@ -3,15 +3,15 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://753dogr1moxe"
-path="res://.godot/imported/assassin.png-fe7baccd52a3283ab0d985b3ba17ec0b.ctex"
+path="res://.godot/imported/assassin.png-7bbbc406e2629bde9613c01b865eff89.ctex"
metadata={
"vram_texture": false
}
[deps]
-source_file="res://Assets/temp_assets/assassin.png"
-dest_files=["res://.godot/imported/assassin.png-fe7baccd52a3283ab0d985b3ba17ec0b.ctex"]
+source_file="res://assets/temp_assets/assassin.png"
+dest_files=["res://.godot/imported/assassin.png-7bbbc406e2629bde9613c01b865eff89.ctex"]
[params]
diff --git a/Assets/temp_assets/mage.png.import b/Assets/temp_assets/mage.png.import
index 34e60cbc3f3983f214bb3c2c902ae3eb7a2ec0e6..d6399e4563c83f11bbae237009044b1a65c6e415 100644
--- a/Assets/temp_assets/mage.png.import
+++ b/Assets/temp_assets/mage.png.import
@@ -3,15 +3,15 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://b7iyt4iwjbtd0"
-path="res://.godot/imported/mage.png-6df0fbad7964373e0d15494885490c2b.ctex"
+path="res://.godot/imported/mage.png-aa266229e8d4b8a7cd1dbb6644da4861.ctex"
metadata={
"vram_texture": false
}
[deps]
-source_file="res://Assets/temp_assets/mage.png"
-dest_files=["res://.godot/imported/mage.png-6df0fbad7964373e0d15494885490c2b.ctex"]
+source_file="res://assets/temp_assets/mage.png"
+dest_files=["res://.godot/imported/mage.png-aa266229e8d4b8a7cd1dbb6644da4861.ctex"]
[params]
diff --git a/Assets/temp_assets/wizard.png.import b/Assets/temp_assets/wizard.png.import
index 82ad5da81561c98928de7826db71bbf3c5ecdf15..f70066237689a0f96f1c2f453d09800ed59e95ac 100644
--- a/Assets/temp_assets/wizard.png.import
+++ b/Assets/temp_assets/wizard.png.import
@@ -3,15 +3,15 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://bfk1j3brcknkp"
-path="res://.godot/imported/wizard.png-6750ab334d9c25c7a82a402217206b12.ctex"
+path="res://.godot/imported/wizard.png-dde8c8f6619c79c88090542142689c4d.ctex"
metadata={
"vram_texture": false
}
[deps]
-source_file="res://Assets/temp_assets/wizard.png"
-dest_files=["res://.godot/imported/wizard.png-6750ab334d9c25c7a82a402217206b12.ctex"]
+source_file="res://assets/temp_assets/wizard.png"
+dest_files=["res://.godot/imported/wizard.png-dde8c8f6619c79c88090542142689c4d.ctex"]
[params]
diff --git a/Assets/ui/title_screen/play_button.png b/Assets/ui/title_screen/play_button.png
index 39db5e0d90f931d9e7251c5f3ce7bdedf6eb81a9..a989e66278192da40dce6b4e68c8f358da54a01e 100644
Binary files a/Assets/ui/title_screen/play_button.png and b/Assets/ui/title_screen/play_button.png differ
diff --git a/Assets/ui/title_screen/quit_button.png b/Assets/ui/title_screen/quit_button.png
index ed733e74f4dc9c677cd80156020e47ede174dbf6..c1da7870568e4e63a1564efe71c5f8e75b6e494f 100644
Binary files a/Assets/ui/title_screen/quit_button.png and b/Assets/ui/title_screen/quit_button.png differ
diff --git a/Assets/ui/title_screen/rules_button.aseprite b/Assets/ui/title_screen/rules_button.aseprite
index 07b021db1df49913b4271c664ca527d7b0549b6a..d85efd631150b8121e324da8b1a8c68c84ec8e76 100644
Binary files a/Assets/ui/title_screen/rules_button.aseprite and b/Assets/ui/title_screen/rules_button.aseprite differ
diff --git a/Assets/ui/title_screen/rules_button.png b/Assets/ui/title_screen/rules_button.png
index 98bd972477f4b84a53d0f1a3baac6edfed90702e..28a0c4d54ebbf00c129f493b9a73e17d9d545880 100644
Binary files a/Assets/ui/title_screen/rules_button.png and b/Assets/ui/title_screen/rules_button.png differ
diff --git a/scenes/Assassin.tscn b/scenes/Assassin.tscn
index a163f1f4db0e591fb6d26e15e37e58848ba60291..5fd349bf32c73adb4f699607c105e07a024e4ae1 100644
--- a/scenes/Assassin.tscn
+++ b/scenes/Assassin.tscn
@@ -1,10 +1,10 @@
[gd_scene load_steps=3 format=3 uid="uid://rxpfuqov0sdv"]
[ext_resource type="Script" path="res://scripts/Assassin.gd" id="1_g33mq"]
-[ext_resource type="Texture2D" uid="uid://bmq81ysump1xg" path="res://.godot/imported/White_Assassin.png-b91d29cfa010c3f963e5fe98fea3f7ce.ctex" id="2_wrp2r"]
+[ext_resource type="Texture2D" uid="uid://b24dojprangcr" path="res://assets/Resized Chess Piece Assets/White_Assassin.png" id="2_oadg7"]
[node name="Node2D" type="Node2D"]
script = ExtResource("1_g33mq")
[node name="Sprite2D" type="Sprite2D" parent="."]
-texture = ExtResource("2_wrp2r")
+texture = ExtResource("2_oadg7")
diff --git a/scenes/Bishop.tscn b/scenes/Bishop.tscn
index b03172ec6f261258d32d077fac8c9f3da2fe83df..1d029984c32d4daa0aedf8c4abf8e374fe71d5ae 100644
--- a/scenes/Bishop.tscn
+++ b/scenes/Bishop.tscn
@@ -1,10 +1,10 @@
[gd_scene load_steps=3 format=3 uid="uid://bf0kea272jnpo"]
[ext_resource type="Script" path="res://scripts/Bishop.gd" id="1_l7uw0"]
-[ext_resource type="Texture2D" uid="uid://bdb74otsib8ql" path="res://.godot/imported/White_Bishop.png-7213de7b15a92e5747f2331d55eafa2b.ctex" id="2_wrp2r"]
+[ext_resource type="Texture2D" uid="uid://rubnu2rwm76q" path="res://assets/Resized Chess Piece Assets/White_Bishop.png" id="2_oidrx"]
[node name="Node2D" type="Node2D"]
script = ExtResource("1_l7uw0")
[node name="Sprite2D" type="Sprite2D" parent="."]
-texture = ExtResource("2_wrp2r")
+texture = ExtResource("2_oidrx")
diff --git a/scenes/game.tscn b/scenes/game.tscn
index d62a39bfb82b15e3e6103f40aa8af43849604870..5f027e294f8c6e5918dfdcfe49bfded4bf491463 100644
--- a/scenes/game.tscn
+++ b/scenes/game.tscn
@@ -2,9 +2,9 @@
[ext_resource type="Script" path="res://scripts/game.gd" id="1_cbchi"]
[ext_resource type="Shader" path="res://assets/shaders/bg.gdshader" id="2_rp0o8"]
-[ext_resource type="Texture2D" uid="uid://yeqb8ndri7xp" path="res://Assets/noise/noise.tres" id="3_oudqo"]
-[ext_resource type="Texture2D" uid="uid://ceas3dsjeq4ge" path="res://Assets/noise/noise2.tres" id="4_n8ady"]
-[ext_resource type="Texture2D" uid="uid://m6ki73qfbp2s" path="res://Assets/noise/noise3.tres" id="5_hkjcj"]
+[ext_resource type="Texture2D" uid="uid://yeqb8ndri7xp" path="res://assets/noise/noise.tres" id="3_oudqo"]
+[ext_resource type="Texture2D" uid="uid://ceas3dsjeq4ge" path="res://assets/noise/noise2.tres" id="4_n8ady"]
+[ext_resource type="Texture2D" uid="uid://m6ki73qfbp2s" path="res://assets/noise/noise3.tres" id="5_hkjcj"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_gdbwp"]
shader = ExtResource("2_rp0o8")
diff --git a/scenes/screens/select_piece_screen.tscn b/scenes/screens/select_piece_screen.tscn
index bacddada62bb363a3ff3c07733fe91ca90bf6eaa..7ef477b15363510733e7a5b383b8ddad7ea9db24 100644
--- a/scenes/screens/select_piece_screen.tscn
+++ b/scenes/screens/select_piece_screen.tscn
@@ -1,7 +1,10 @@
-[gd_scene load_steps=3 format=3 uid="uid://0hpka0jh1qx4"]
+[gd_scene load_steps=6 format=3 uid="uid://0hpka0jh1qx4"]
[ext_resource type="PackedScene" uid="uid://bm8sv1itwm467" path="res://scenes/ui/menu_button.tscn" id="1_6pfss"]
[ext_resource type="Script" path="res://scripts/screens/select_piece_screen.gd" id="1_x5vw4"]
+[ext_resource type="Texture2D" uid="uid://b7r633ea3cxw0" path="res://assets/Character Assets/Rook Character.png" id="2_an52x"]
+[ext_resource type="Texture2D" uid="uid://cuuyk5y51r8ux" path="res://assets/Character Assets/Knight_Character.png" id="3_ityy2"]
+[ext_resource type="Texture2D" uid="uid://cqv0b5ypsi2tn" path="res://assets/Character Assets/Bishop Character.png" id="3_l5cht"]
[node name="SelectPieceScreen" type="Control"]
layout_mode = 3
@@ -13,42 +16,34 @@ grow_vertical = 2
script = ExtResource("1_x5vw4")
[node name="HBoxContainer" type="HBoxContainer" parent="."]
-layout_mode = 1
-anchors_preset = 5
-anchor_left = 0.5
-anchor_right = 0.5
-offset_left = 510.0
-offset_top = 187.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 = 0
+offset_left = 220.0
+offset_top = 200.0
+offset_right = 1019.0
+offset_bottom = 333.0
+theme_override_constants/separation = 200
+
+[node name="Rook" type="Button" parent="HBoxContainer"]
layout_mode = 2
toggle_mode = true
+icon = ExtResource("2_an52x")
-[node name="Knight" parent="HBoxContainer" instance=ExtResource("1_6pfss")]
+[node name="Knight" type="Button" parent="HBoxContainer"]
layout_mode = 2
toggle_mode = true
+icon = ExtResource("3_ityy2")
-[node name="Bishop" parent="HBoxContainer" instance=ExtResource("1_6pfss")]
+[node name="Bishop" type="Button" parent="HBoxContainer"]
layout_mode = 2
toggle_mode = true
+icon = ExtResource("3_l5cht")
[node name="StartButton" parent="." instance=ExtResource("1_6pfss")]
-layout_mode = 1
-anchors_preset = 8
-anchor_left = 0.5
-anchor_top = 0.5
-anchor_right = 0.5
-anchor_bottom = 0.5
-offset_left = 509.0
-offset_top = 462.5
-offset_right = 509.0
-offset_bottom = 462.5
-grow_horizontal = 2
-grow_vertical = 2
+layout_mode = 0
+offset_left = 490.0
+offset_top = 450.0
+offset_right = 490.0
+offset_bottom = 450.0
[connection signal="toggled" from="HBoxContainer/Rook" to="." method="_on_rook_toggled"]
[connection signal="toggled" from="HBoxContainer/Knight" to="." method="_on_knight_toggled"]
diff --git a/scenes/screens/title_screen.tscn b/scenes/screens/title_screen.tscn
index c3c988e42b1209e06fcc9b5ac9009657389ba8f3..742926913817d4c4d08e4480cfe11f4e5c2d3616 100644
--- a/scenes/screens/title_screen.tscn
+++ b/scenes/screens/title_screen.tscn
@@ -23,15 +23,11 @@ theme_override_font_sizes/normal_font_size = 75
text = "Go Save The King"
[node name="MenuContainers" type="VBoxContainer" parent="."]
-layout_mode = 1
-anchors_preset = 2
-anchor_top = 1.0
-anchor_bottom = 1.0
+layout_mode = 0
offset_left = 50.0
-offset_top = 275.0
+offset_top = 250.0
offset_right = 300.0
-offset_bottom = 603.0
-grow_vertical = 0
+offset_bottom = 578.0
theme_override_constants/separation = 50
[node name="PlayButton" parent="MenuContainers" instance=ExtResource("2_dljgh")]
diff --git a/scripts/screens/select_piece_screen.gd b/scripts/screens/select_piece_screen.gd
index dd551aeb7bd86fca15f327a2a25eb2e44a43bfa6..d8f0dbf9a85a1c0ba990771f4c1f702a796d823b 100644
--- a/scripts/screens/select_piece_screen.gd
+++ b/scripts/screens/select_piece_screen.gd
@@ -4,18 +4,15 @@ class_name SelectPieceScreen
@onready var scene_manager: Node = $"../SceneManager"
@onready var start_button: TitleButton = $StartButton
-@onready var rook_button: TitleButton = $HBoxContainer/Rook
-@onready var knight_button: TitleButton = $HBoxContainer/Knight
-@onready var bishop_button: TitleButton = $HBoxContainer/Bishop
+@onready var rook_button: Button = $HBoxContainer/Rook
+@onready var knight_button: Button = $HBoxContainer/Knight
+@onready var bishop_button: Button = $HBoxContainer/Bishop
var selected_piece = null
func _ready() -> void:
# Temp images
start_button.set_image("res://assets/ui/title_screen/play_button.png")
- rook_button.set_image("res://assets/Resized Chess Piece Assets/White_rook.png")
- knight_button.set_image("res://assets/Resized Chess Piece Assets/White_knight.png")
- bishop_button.set_image("res://assets/Resized Chess Piece Assets/White_Bishop.png")
# prevent player from starting the game without a chosen piece
start_button.disabled = true