merged with alan branch

.godot/editor/create_recent.Node

+<<<<<<< HEAD
 Button
 Camera2D
 HBoxContainer
 Timer
 Label
 Node
+=======
+Rook
+Button
+Label
+ColorRect
+TextureRect
+HBoxContainer
+MarginContainer
+VBoxContainer
+PanelContainer
+>>>>>>> 18f4858a48174eab79d786f74b3431490630d117
 Node2D
+Node
 Control
 AnimationPlayer
-ColorRect
 CanvasLayer
-VBoxContainer
-TextureRect
 Sprite2D

.godot/editor/editor_layout.cfg

@@ -6,6 +6,7 @@ dock_5_selected_tab_idx=0
 dock_floating={}
 dock_bottom=[]
 dock_closed=[]
+<<<<<<< HEAD
 <<<<<<<HEAD<<<<<<<HEADdock_split_2=-1
 dock_split_3=0
 dock_hsplit_1=0
@@ -13,31 +14,55 @@ dock_hsplit_1=0
 dock_hsplit_3=-270
 dock_hsplit_2=270
 dock_split_2=0
+=======
+dock_split_2=0
+dock_split_3=0
+dock_hsplit_1=0
+<<<<<<<HEADdock_hsplit_2=498
+dock_hsplit_3=-406
+dock_hsplit_2=306
+>>>>>>> 18f4858a48174eab79d786f74b3431490630d117
 dock_hsplit_4=0
 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://scenes/screens/select_piece_screen.tscn")
 dock_filesystem_uncollapsed_paths=PackedStringArray("Favorites", "res://", "res://scenes/", "res://scenes/screens/")
+=======
+dock_filesystem_selected_paths=PackedStringArray("res://scripts/scene_manager.gd")
+dock_filesystem_uncollapsed_paths=PackedStringArray("Favorites", "res://", "res://scripts/", "res://scenes/ui/")
+>>>>>>> 18f4858a48174eab79d786f74b3431490630d117
 dock_3="Scene,Import"
 dock_4="FileSystem"
 dock_5="Inspector,Node,History"
 
 [EditorNode]
 
+<<<<<<< HEAD
 open_scenes=PackedStringArray("res://scenes/game.tscn", "res://main.tscn", "res://scenes/screens/title_screen.tscn", "res://scenes/screens/select_piece_screen.tscn")
 current_scene="res://main.tscn"
 center_split_offset=0
+=======
+open_scenes=PackedStringArray("res://scenes/game.tscn", "res://main.tscn", "res://scenes/Shop.tscn", "res://scenes/ShopItem.tscn", "res://scenes/Pawn.tscn", "res://scenes/Rook.tscn")
+current_scene="res://scenes/Rook.tscn"
+center_split_offset=-398
+>>>>>>> 18f4858a48174eab79d786f74b3431490630d117
 selected_default_debugger_tab_idx=0
 selected_main_editor_idx=2
 selected_bottom_panel_item=0
 
 [ScriptEditor]
 
+<<<<<<< HEAD
 open_scripts=["res://scripts/game.gd", "res://scripts/main/main.gd", "res://scripts/run_data/run_data.gd", "res://scripts/screens/select_piece_screen.gd", "res://scripts/screens/title_screen.gd"]
 selected_script="res://scripts/main/main.gd"
+=======
+open_scripts=["res://scripts/game.gd", "res://scripts/Pawn.gd", "res://scripts/Queen.gd", "res://README.md", "res://scripts/Rook.gd", "res://scripts/scene_manager.gd", "res://scripts/Shop.gd", "res://scenes/shop_item.gd"]
+selected_script="res://scripts/Pawn.gd"
+>>>>>>> 18f4858a48174eab79d786f74b3431490630d117
 open_help=[]
 script_split_offset=70
 list_split_offset=0

.godot/editor/filesystem_cache8

 ea4bc82a6ad023ab7ee23ee620429895
+<<<<<<< HEAD
 ::res://::1739131418
 icon.svg::CompressedTexture2D::6378281210119878262::1738795350::1739075821::1::::<><>::
 main.tscn::PackedScene::5692118487183161714::1739131418::0::1::::<><>::uid://cu7lkx15lmfww::::res://scenes/scene_manager.tscn<>res://scripts/main/main.gd
@@ -127,3 +128,121 @@ select_piece_screen.gd::GDScript::-1::1739131352::0::1::::SelectPieceScreen<>Con
 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://::1739123350
+export_presets.cfg::TextFile::-1::1738780181::0::1::::<><>::
+icon.svg::CompressedTexture2D::6378281210119878262::1737912187::1738338716::1::::<><>::
+main.tscn::PackedScene::5692118487183161714::1739063296::0::1::::<><>::uid://cu7lkx15lmfww::::res://scenes/scene_manager.tscn
+README.md::TextFile::-1::1737912187::0::1::::<><>::
+::res://assets/::1738358720
+::res://assets/noise/::1739053832
+noise2.tres::NoiseTexture2D::5054739835828921764::1739053832::0::1::::<><>::
+noise3.tres::NoiseTexture2D::906885015046579772::1739053832::0::1::::<><>::
+noise.tres::NoiseTexture2D::1693764769519573005::1739053832::0::1::::<><>::
+::res://assets/Original size Chess pieces/::1738707284
+Black king piece 2.png::CompressedTexture2D::7820367427145083060::1738358720::1738707284::1::::<><>::
+Black knight piece.png::CompressedTexture2D::4196515762256027844::1738358720::1738707284::1::::<><>::
+Black Pawn Piece 2.png::CompressedTexture2D::2167440687080906934::1738358720::1738707284::1::::<><>::
+Black Queen Piece 2.png::CompressedTexture2D::6638986330393441989::1738358720::1738707284::1::::<><>::
+Black rook piece.png::CompressedTexture2D::1872655759582013005::1738358720::1738707284::1::::<><>::
+White king piece 2.png::CompressedTexture2D::7139286146806283259::1738358720::1738707284::1::::<><>::
+White knight piece.png::CompressedTexture2D::8293368904171920332::1738358720::1738707284::1::::<><>::
+White Pawn Piece 2.png::CompressedTexture2D::8915038826611091975::1738358720::1738707284::1::::<><>::
+White Queen Piece 2.png::CompressedTexture2D::339041922548181320::1738358720::1738707284::1::::<><>::
+White rook piece.png::CompressedTexture2D::6272641373813891014::1738358720::1738707284::1::::<><>::
+::res://assets/Resized Chess Piece Assets/::1738707285
+Black_Assassin.png::CompressedTexture2D::5410645216483506242::1738707261::1738707284::1::::<><>::
+Black_Bishop.png::CompressedTexture2D::5646954560332560266::1738707261::1738707284::1::::<><>::
+Black_king.png::CompressedTexture2D::3691390456247856410::1738358720::1738707284::1::::<><>::
+Black_knight.png::CompressedTexture2D::3569790831830215405::1738358720::1738707284::1::::<><>::
+Black_mage.png::CompressedTexture2D::3300084723678353650::1738707261::1738707284::1::::<><>::
+Black_Pawn.png::CompressedTexture2D::4947090234957464596::1738358720::1738707284::1::::<><>::
+Black_Queen.png::CompressedTexture2D::9042903626319350434::1738358720::1738707284::1::::<><>::
+Black_rook.png::CompressedTexture2D::5637903285567075872::1738358720::1738707284::1::::<><>::
+Black_wizard.png::CompressedTexture2D::1278573577066895682::1738707261::1738707284::1::::<><>::
+White_Assassin.png::CompressedTexture2D::700262813566466932::1738707261::1738707284::1::::<><>::
+White_Bishop.png::CompressedTexture2D::3819780629635422360::1738707261::1738707284::1::::<><>::
+White_king.png::CompressedTexture2D::5012688985517926395::1738358720::1738707284::1::::<><>::
+White_knight.png::CompressedTexture2D::854350289879594279::1738358720::1738707284::1::::<><>::
+White_mage.png::CompressedTexture2D::7265615115782563194::1738707261::1738707284::1::::<><>::
+White_Pawn.png::CompressedTexture2D::919180529085242722::1738358720::1738707285::1::::<><>::
+White_Queen.png::CompressedTexture2D::4902137832695542513::1738358720::1738707285::1::::<><>::
+White_rook.png::CompressedTexture2D::4194129281780453908::1738358720::1738707285::1::::<><>::
+White_wizard.png::CompressedTexture2D::8734158881343267537::1738707261::1738707285::1::::<><>::
+::res://assets/shaders/::1739053832
+3d_effect.gdshader::Shader::-1::1738707261::0::1::::<><>::
+bg.gdshader::Shader::-1::1739053832::0::1::::<><>::
+color.gdshader::Shader::-1::1738378229::0::1::::<><>::
+shadow.gdshader::Shader::-1::1738378229::0::1::::<><>::
+::res://assets/sprites/::1738707284
+bishop.png::CompressedTexture2D::4631301773944929250::1738358798::1738707284::1::::<><>::
+knight.png::CompressedTexture2D::3545640967717948854::1738358798::1738707284::1::::<><>::
+pawn.png::CompressedTexture2D::1338760335342038528::1738358798::1738707284::1::::<><>::
+rook.png::CompressedTexture2D::6790909281007670776::1738358798::1738707284::1::::<><>::
+tile.png::CompressedTexture2D::8704336058451696509::1738358570::1738707284::1::::<><>::
+::res://assets/temp_assets/::1738707284
+assassin.png::CompressedTexture2D::2309680507621369322::1738360966::1738361001::1::::<><>::
+black_bishop.png::CompressedTexture2D::7509881182472568151::1738358720::1738707284::1::::<><>::
+black_king.png::CompressedTexture2D::3646032776351028361::1738358720::1738707284::1::::<><>::
+black_knight.png::CompressedTexture2D::4591257172048987833::1738358720::1738707284::1::::<><>::
+black_pawn.png::CompressedTexture2D::3912668014183198267::1738358720::1738707284::1::::<><>::
+black_queen.png::CompressedTexture2D::7989886812523566234::1738358720::1738707284::1::::<><>::
+black_rook.png::CompressedTexture2D::8767708966549765967::1738358720::1738707284::1::::<><>::
+mage.png::CompressedTexture2D::4650471376600460963::1738367395::1738367411::1::::<><>::
+Piece_move.png::CompressedTexture2D::260618725614842917::1738358720::1738707284::1::::<><>::
+temp_chess_board.png::CompressedTexture2D::4173558678901569366::1738358720::1738707284::1::::<><>::
+turn-black.png::CompressedTexture2D::7112033964315790810::1738358720::1738707284::1::::<><>::
+turn-white.png::CompressedTexture2D::7344907768700758025::1738358720::1738707284::1::::<><>::
+white_bishop.png::CompressedTexture2D::8093744356261485644::1738358720::1738707284::1::::<><>::
+white_king.png::CompressedTexture2D::5901183203660598461::1738358720::1738707284::1::::<><>::
+white_knight.png::CompressedTexture2D::7533630084821562912::1738358720::1738707284::1::::<><>::
+white_pawn.png::CompressedTexture2D::8196778834906249875::1738358720::1738707284::1::::<><>::
+white_queen.png::CompressedTexture2D::1957958042777204643::1738358720::1738707284::1::::<><>::
+white_rook.png::CompressedTexture2D::3317152307554436932::1738358720::1738707284::1::::<><>::
+wizard.png::CompressedTexture2D::2759604866355024615::1738373264::1738373374::1::::<><>::
+::res://assets/ui/::1738707285
+Go_Save_The_King_Menu.jpg::CompressedTexture2D::7252735845995868232::1738358720::1738707285::1::::<><>::
+Mockup Gameplay Design.jpg::CompressedTexture2D::4859609684236806088::1738358720::1738707285::1::::<><>::
+Mockup Shop Design.jpg::CompressedTexture2D::8043055154093708922::1738358720::1738707285::1::::<><>::
+::res://assets/ui/title_screen/::1738707284
+play_button.png::CompressedTexture2D::5896995890187459238::1738707261::1738707284::1::::<><>::
+quit_button.png::CompressedTexture2D::5172428563227279585::1738707261::1738707284::1::::<><>::
+rules_button.png::CompressedTexture2D::8060955005205795067::1738707261::1738707284::1::::<><>::
+::res://scenes/::1739063296
+Assassin.tscn::PackedScene::1241611789899982875::1738377694::0::1::::<><>::res://scripts/Assassin.gd<>uid://753dogr1moxe::::res://assets/temp_assets/assassin.png
+Bishop.tscn::PackedScene::2789588702038144760::1738377693::0::1::::<><>::res://scripts/Bishop.gd<>uid://b68o4mj7wcwvq::::res://assets/sprites/bishop.png
+explosion.tscn::PackedScene::69466253159940830::1738377693::0::1::::<><>::
+game.tscn::PackedScene::8577524005707705072::1739063296::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::1738377693::0::1::::<><>::res://scripts/King.gd<>uid://cdogixbq8ay3t::::res://assets/Resized Chess Piece Assets/White_king.png
+Knight.tscn::PackedScene::5270730075267457303::1738377694::0::1::::<><>::res://scripts/Knight.gd<>uid://mf4a3jclbwih::::res://assets/Resized Chess Piece Assets/White_knight.png
+Mage.tscn::PackedScene::10334063134713649::1738377694::0::1::::<><>::res://scripts/Mage.gd<>uid://b7iyt4iwjbtd0::::res://assets/temp_assets/mage.png
+Pawn.tscn::PackedScene::3675784333675896641::1739063296::0::1::::<><>::res://scripts/Pawn.gd<>uid://ndi1e8thkonq::::res://assets/Resized Chess Piece Assets/White_Pawn.png
+Queen.tscn::PackedScene::7495869360053814603::1738377693::0::1::::<><>::res://scripts/Queen.gd<>uid://cb3vq168iyomb::::res://assets/Resized Chess Piece Assets/White_Queen.png
+Rook.tscn::PackedScene::9162401199636684468::1739063296::0::1::::<><>::res://scripts/Rook.gd<>uid://b00wxxfjk04ke::::res://assets/Resized Chess Piece Assets/White_rook.png
+scene_manager.tscn::PackedScene::6243365322716451430::1738707261::0::1::::<><>::res://scripts/scene_manager.gd
+Shop.tscn::PackedScene::6176556733226555776::1739063296::0::1::::<><>::res://scripts/Shop.gd
+ShopItem.tscn::PackedScene::5426615772503019706::1739063296::0::1::::<><>::res://scenes/shop_item.gd
+shop_item.gd::GDScript::-1::1739035004::0::1::::<>PanelContainer<>::
+texture_holder.tscn::PackedScene::594714386286134588::1738358720::0::1::::<><>::
+title_screen.tscn::PackedScene::8154710134031658440::1738707261::0::1::::<><>::res://scripts/title_screen/title_screen.gd<>uid://bm8sv1itwm467::::res://scenes/ui/menu_button.tscn
+Wizard.tscn::PackedScene::6352212773395470747::1738377694::0::1::::<><>::res://scripts/Wizard.gd<>uid://bfk1j3brcknkp::::res://assets/temp_assets/wizard.png
+::res://scenes/ui/::1738707261
+menu_button.tscn::PackedScene::3297943059633979218::1738707261::0::1::::<><>::res://assets/shaders/3d_effect.gdshader<>res://scripts/title_screen/menu_button.gd
+::res://scripts/::1739061871
+Assassin.gd::GDScript::-1::1739051721::0::1::::Assassin<>Piece<>::
+Bishop.gd::GDScript::-1::1739051721::0::1::::Bishop<>Piece<>::
+game.gd::GDScript::-1::1739063315::0::1::::game<>Node<>::
+King.gd::GDScript::-1::1739051721::0::1::::King<>Piece<>::
+Knight.gd::GDScript::-1::1739051721::0::1::::Knight<>Piece<>::
+Mage.gd::GDScript::-1::1739051721::0::1::::Mage<>Piece<>::
+Pawn.gd::GDScript::-1::1739057192::0::1::::Pawn<>Piece<>::
+Piece.gd::GDScript::-1::1739051735::0::1::::Piece<>Node2D<>::
+Queen.gd::GDScript::-1::1739051721::0::1::::Queen<>Piece<>::
+Rook.gd::GDScript::-1::1739051721::0::1::::Rook<>Piece<>::
+scene_manager.gd::GDScript::-1::1738707261::0::1::::<>Node<>::
+Shop.gd::GDScript::-1::1739063460::0::1::::<>Node2D<>::
+Wizard.gd::GDScript::-1::1739051721::0::1::::Wizard<>Piece<>::
+::res://scripts/title_screen/::1738707261
+menu_button.gd::GDScript::-1::1738707261::0::1::::TitleButton<>Button<>::
+title_screen.gd::GDScript::-1::1738707261::0::1::::TitleScreen<>Control<>::
+>>>>>>> 18f4858a48174eab79d786f74b3431490630d117

.godot/editor/filesystem_update4

+<<<<<<< HEAD
+=======
+res://scripts/Shop.gd
+res://scripts/Pawn.gd
+res://scripts/Rook.gd
+res://scripts/Assassin.gd
+res://scripts/Bishop.gd
+res://scripts/King.gd
+res://scripts/Knight.gd
+res://scripts/Mage.gd
+res://scripts/Queen.gd
+res://scripts/Wizard.gd
+res://scripts/game.gd
+res://scripts/Piece.gd
+>>>>>>> 18f4858a48174eab79d786f74b3431490630d117
 res://scenes/game.tscn
 res://assets/shaders/bg.gdshader
 res://assets/noise/noise.tres
 res://assets/noise/noise2.tres
 res://assets/noise/noise3.tres
+<<<<<<< HEAD
 res://scripts/screens/select_piece_screen.gd
 res://main.tscn
 res://scenes/screens/title_screen.tscn
 res://scenes/screens/select_piece_screen.tscn
+=======
+res://main.tscn
+res://scenes/Shop.tscn
+res://scenes/ShopItem.tscn
+res://scenes/Pawn.tscn
+res://scenes/Rook.tscn
+res://scripts/Upgrade.gd
+>>>>>>> 18f4858a48174eab79d786f74b3431490630d117

.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg

@@ -8,7 +8,11 @@ Anim={
 "grid_snap_active": false,
 "grid_step": Vector2(8, 8),
 "grid_visibility": 1,
+<<<<<<< HEAD
 "ofs": Vector2(-154.44, -536.043),
+=======
+"ofs": Vector2(-390.56, -393.586),
+>>>>>>> 18f4858a48174eab79d786f74b3431490630d117
 "primary_grid_step": Vector2i(8, 8),
 "show_group_gizmos": true,
 "show_guides": true,
@@ -34,7 +38,7 @@ Anim={
 "snap_rotation_step": 0.261799,
 "snap_scale": false,
 "snap_scale_step": 0.1,
-"zoom": 0.471937
+"zoom": 0.629961
 }
 3D={
 "fov": 70.01,
@@ -175,4 +179,8 @@ 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]([])
+>>>>>>> 18f4858a48174eab79d786f74b3431490630d117

.godot/editor/game.tscn-folding-c2a7af834e91ff64325daddf58e45dc0.cfg

 [folding]
 
-node_unfolds=[NodePath("."), PackedStringArray("opponent_shader", "Editor Description"), NodePath("ShadowContainer"), PackedStringArray("Ordering"), NodePath("TileContainer"), PackedStringArray("Transform", "Ordering"), NodePath("PieceContainer"), PackedStringArray("Ordering", "Process", "Texture"), NodePath("Background"), PackedStringArray("Layout", "material", "Ordering", "Layout/Transform", "Layout/Grow Direction", "Layout/Container Sizing", "Layout/Anchor Points", "Layout/Anchor Offsets", "Texture"), NodePath("Explosion"), PackedStringArray("Ordering", "Transform", "Scale", "Time"), NodePath("PlayerPieces"), PackedStringArray("Transform"), NodePath("OpponentPieces"), PackedStringArray("Visibility", "Transform")]
+node_unfolds=[NodePath("."), PackedStringArray("opponent_shader", "Editor Description"), NodePath("ShadowContainer"), PackedStringArray("Ordering"), NodePath("TileContainer"), PackedStringArray("Transform", "Ordering"), NodePath("PieceContainer"), PackedStringArray("Ordering", "Process", "Texture"), NodePath("Background"), PackedStringArray("Layout", "material", "Ordering", "Layout/Transform", "Layout/Grow Direction", "Layout/Container Sizing", "Layout/Anchor Points", "Layout/Anchor Offsets", "Texture"), NodePath("Explosion"), PackedStringArray("Ordering", "Transform", "Scale", "Time"), NodePath("PlayerPieces"), PackedStringArray("Transform"), NodePath("OpponentPieces"), PackedStringArray("Visibility", "Transform"), NodePath("GoldDisplay"), PackedStringArray("Theme Overrides", "Theme Overrides/fonts", "Theme Overrides/font_sizes")]
 resource_unfolds=["res://scenes/game.tscn::ShaderMaterial_gdbwp", PackedStringArray("Shader Parameters", "Resource")]
 nodes_folded=[]

.godot/editor/main.tscn-editstate-3070c538c03ee49b7677ff960a3f5195.cfg

@@ -175,4 +175,8 @@ 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]([])
+>>>>>>> 18f4858a48174eab79d786f74b3431490630d117

.godot/editor/project_metadata.cfg

 [editor_metadata]
 
+<<<<<<< HEAD
 executable_path="D:/SteamLibrary/steamapps/common/Godot Engine/godot.windows.opt.tools.64.exe"
+=======
+executable_path="c:/Users/Alan/Downloads/Godot_v4.3-stable_win64.exe/Godot_v4.3-stable_win64.exe"
+>>>>>>> 18f4858a48174eab79d786f74b3431490630d117
 use_advanced_connections=false
 
 [dialog_bounds]
 
 <<<<<<<HEADcreate_new_node=Rect2(2145, 197, 900, 700)
+<<<<<<< HEAD
 <<<<<<<HEAD<<<<<<<HEADproject_settings=Rect2(1290, 76, 1590, 867)
 create_new_node=Rect2(2379, 158, 1118, 721)
 project_settings=Rect2(2280, 190, 1200, 700)
@@ -14,6 +19,15 @@ project_settings=Rect2(2280, 190, 1200, 700)
 
 scenes=["res://scenes/screens/select_piece_screen.tscn", "res://scenes/screens/title_screen.tscn", "res://main.tscn", "res://scenes/game.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"]
 scripts=["res://scripts/run_data/run_data.gd", "res://scripts/screens/select_piece_screen.gd", "res://scripts/screens/title_screen.gd", "res://scripts/main/main.gd", "res://scripts/game.gd", "res://scripts/Wizard.gd", "res://scripts/Queen.gd", "res://scripts/Pawn.gd", "res://scripts/Mage.gd", "res://scripts/Knight.gd"]
+=======
+project_settings=Rect2(2022, 76, 1590, 867)
+create_new_node=Rect2(2430, 190, 900, 700)
+
+[recent_files]
+
+scenes=["res://scenes/Rook.tscn", "res://scenes/Pawn.tscn", "res://scenes/ShopItem.tscn", "res://scenes/Shop.tscn", "res://main.tscn", "res://scenes/game.tscn", "res://scenes/Queen.tscn", "res://Shop.tscn"]
+scripts=["res://scripts/Rook.gd", "res://scripts/Pawn.gd", "res://scripts/Queen.gd", "res://scenes/shop_item.gd", "res://scripts/scene_manager.gd", "res://scripts/game.gd", "res://Shop.gd", "res://README.md"]
+>>>>>>> 18f4858a48174eab79d786f74b3431490630d117
 
 [script_setup]
 
@@ -22,5 +36,9 @@ last_selected_language="GDScript"
 [color_picker]
 
 picker_shape=3
+<<<<<<< HEAD
 recent_presets=PackedColorArray(1, 1, 1, 1, 1.01, 1, 1, 1, 0.5, 1, 1, 1, 0.5, 0.5, 1, 1, 0.5, 0.5, 0.5, 1)
 color_mode=2
+=======
+recent_presets=PackedColorArray(0, 1, 0, 0.156863, 1, 1, 0, 0.156863, 1, 0, 1, 1, 1, 0, 0, 1, 0, 1, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0.027451, 0, 0, 0, 0.686275)
+>>>>>>> 18f4858a48174eab79d786f74b3431490630d117

.godot/editor/recent_dirs

@@ -9,7 +9,7 @@ res://scripts/ui
 res://scenes/ui
 res://scripts
 res://scenes
+res://
 res://assets/sprites
 res://assets/ui/title_screen
 res://assets/shaders
-res://

.godot/editor/script_editor_cache.cfg

+[res://README.md]
+
+state={
+"bookmarks": PackedInt32Array(),
+"breakpoints": PackedInt32Array(),
+"column": 74,
+"folded_lines": Array[int]([]),
+"h_scroll_position": 0,
+"row": 12,
+"scroll_position": 0.0,
+"selection": false,
+"syntax_highlighter": "Plain Text"
+}
+
 [res://scripts/game.gd]
 
 state={
 "bookmarks": PackedInt32Array(),
 "breakpoints": PackedInt32Array(),
+<<<<<<< HEAD
 "column": 0,
 "folded_lines": Array[int]([]),
 "h_scroll_position": 0,
 "row": 0,
 "scroll_position": 0.0,
+=======
+"column": 20,
+"folded_lines": Array[int]([]),
+"h_scroll_position": 0,
+"row": 428,
+"scroll_position": 421.0,
+>>>>>>> 18f4858a48174eab79d786f74b3431490630d117
 "selection": false,
 "syntax_highlighter": "GDScript"
 }
 
+<<<<<<< HEAD
 [res://scripts/main/main.gd]
+=======
+[res://scripts/Shop.gd]
+>>>>>>> 18f4858a48174eab79d786f74b3431490630d117
 
 state={
 "bookmarks": PackedInt32Array(),
@@ -20,13 +46,21 @@ state={
 "column": 0,
 "folded_lines": Array[int]([]),
 "h_scroll_position": 0,
+<<<<<<< HEAD
 "row": 8,
 "scroll_position": 0.0,
+=======
+"row": 108,
+"scroll_position": 105.0,
+>>>>>>> 18f4858a48174eab79d786f74b3431490630d117
 "selection": false,
 "syntax_highlighter": "GDScript"
 }
 
+<<<<<<< HEAD
 [res://scripts/screens/title_screen.gd]
+=======
+[res://scripts/scene_manager.gd]
 
 state={
 "bookmarks": PackedInt32Array(),
@@ -34,36 +68,89 @@ state={
 "column": 0,
 "folded_lines": Array[int]([]),
 "h_scroll_position": 0,
-"row": 0,
+"row": 24,
+"scroll_position": 2.0,
+"selection": false,
+"syntax_highlighter": "GDScript"
+}
+
+[res://scenes/shop_item.gd]
+
+state={
+"bookmarks": PackedInt32Array(),
+"breakpoints": PackedInt32Array(),
+"column": 31,
+"folded_lines": Array[int]([]),
+"h_scroll_position": 0,
+"row": 3,
+"scroll_position": 3.0,
+"selection": false,
+"syntax_highlighter": "GDScript"
+}
+
+[res://scripts/Queen.gd]
+>>>>>>> 18f4858a48174eab79d786f74b3431490630d117
+
+state={
+"bookmarks": PackedInt32Array(),
+"breakpoints": PackedInt32Array(),
+"column": 0,
+"folded_lines": Array[int]([]),
+"h_scroll_position": 0,
+"row": 13,
 "scroll_position": 0.0,
 "selection": false,
 "syntax_highlighter": "GDScript"
 }
 
+<<<<<<< HEAD
 [res://scripts/screens/select_piece_screen.gd]
+=======
+[res://scripts/Pawn.gd]
+>>>>>>> 18f4858a48174eab79d786f74b3431490630d117
 
 state={
 "bookmarks": PackedInt32Array(),
 "breakpoints": PackedInt32Array(),
+<<<<<<< HEAD
 "column": 1,
 "folded_lines": Array[int]([]),
 "h_scroll_position": 0,
 "row": 27,
 "scroll_position": 9.0,
+=======
+"column": 23,
+"folded_lines": Array[int]([]),
+"h_scroll_position": 0,
+"row": 50,
+"scroll_position": 38.0,
+>>>>>>> 18f4858a48174eab79d786f74b3431490630d117
 "selection": false,
 "syntax_highlighter": "GDScript"
 }
 
+<<<<<<< HEAD
 [res://scripts/run_data/run_data.gd]
+=======
+[res://scripts/Rook.gd]
+>>>>>>> 18f4858a48174eab79d786f74b3431490630d117
 
 state={
 "bookmarks": PackedInt32Array(),
 "breakpoints": PackedInt32Array(),
+<<<<<<< HEAD
 "column": 1,
 "folded_lines": Array[int]([]),
 "h_scroll_position": 0,
 "row": 28,
 "scroll_position": 10.0,
+=======
+"column": 3,
+"folded_lines": Array[int]([]),
+"h_scroll_position": 0,
+"row": 66,
+"scroll_position": 56.0,
+>>>>>>> 18f4858a48174eab79d786f74b3431490630d117
 "selection": false,
 "syntax_highlighter": "GDScript"
 }

.godot/global_script_class_cache.cfg

@@ -53,12 +53,15 @@ 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"
 }, {
+=======
+>>>>>>> 18f4858a48174eab79d786f74b3431490630d117
 "base": &"Button",
 "class": &"TitleButton",
 "icon": "",
@@ -69,7 +72,11 @@ list=Array[Dictionary]([{
 "class": &"TitleScreen",
 "icon": "",
 "language": &"GDScript",
+<<<<<<< HEAD
 "path": "res://scripts/screens/title_screen.gd"
+=======
+"path": "res://scripts/title_screen/title_screen.gd"
+>>>>>>> 18f4858a48174eab79d786f74b3431490630d117
 }, {
 "base": &"Piece",
 "class": &"Wizard",

Assets/Resized Chess Piece Assets/Black_Assassin.png.import

@@ -2,7 +2,11 @@
 
 importer="texture"
 type="CompressedTexture2D"
+<<<<<<< HEAD
 uid="uid://b5eea22pnojum"
+=======
+uid="uid://cjc7sh4hfoqt3"
+>>>>>>> 18f4858a48174eab79d786f74b3431490630d117
 path="res://.godot/imported/Black_Assassin.png-9779f11d14d3617e840d68f6a9ebb5d0.ctex"
 metadata={
 "vram_texture": false

Assets/Resized Chess Piece Assets/Black_Bishop.png.import

@@ -2,7 +2,11 @@
 
 importer="texture"
 type="CompressedTexture2D"
+<<<<<<< HEAD
 uid="uid://qvgrpspkfjkx"
+=======
+uid="uid://cmportfufw0sc"
+>>>>>>> 18f4858a48174eab79d786f74b3431490630d117
 path="res://.godot/imported/Black_Bishop.png-31156db37595e69ca512c38698f9a239.ctex"
 metadata={
 "vram_texture": false

Assets/Resized Chess Piece Assets/Black_Pawn.png.import

@@ -2,7 +2,11 @@
 
 importer="texture"
 type="CompressedTexture2D"
+<<<<<<< HEAD
 uid="uid://du3qov0piv4ty"
+=======
+uid="uid://ccqn4arw41esa"
+>>>>>>> 18f4858a48174eab79d786f74b3431490630d117
 path="res://.godot/imported/Black_Pawn.png-c1035123434d941739e8a31659fe845d.ctex"
 metadata={
 "vram_texture": false

Assets/Resized Chess Piece Assets/Black_Queen.png.import

@@ -2,7 +2,11 @@
 
 importer="texture"
 type="CompressedTexture2D"
+<<<<<<< HEAD
 uid="uid://dm3h3v1vqyt2i"
+=======
+uid="uid://d13pkit0yx8w1"
+>>>>>>> 18f4858a48174eab79d786f74b3431490630d117
 path="res://.godot/imported/Black_Queen.png-91c924908a298cebe9bc2bdd61cd1aab.ctex"
 metadata={
 "vram_texture": false

Assets/Resized Chess Piece Assets/Black_king.png.import

@@ -2,7 +2,11 @@
 
 importer="texture"
 type="CompressedTexture2D"
+<<<<<<< HEAD
 uid="uid://bc5lqjmu1vqn5"
+=======
+uid="uid://bsuewqxoi3kxe"
+>>>>>>> 18f4858a48174eab79d786f74b3431490630d117
 path="res://.godot/imported/Black_king.png-64de782c258a02d199067831bbfebfe0.ctex"
 metadata={
 "vram_texture": false

Assets/Resized Chess Piece Assets/Black_knight.png.import

@@ -2,7 +2,11 @@
 
 importer="texture"
 type="CompressedTexture2D"
+<<<<<<< HEAD
 uid="uid://br7gb46qwq8o8"
+=======
+uid="uid://bq4h60chg048p"
+>>>>>>> 18f4858a48174eab79d786f74b3431490630d117
 path="res://.godot/imported/Black_knight.png-846a36a9b55a92a0bd2e4692a89d9222.ctex"
 metadata={
 "vram_texture": false

Assets/Resized Chess Piece Assets/Black_mage.png.import

@@ -2,7 +2,11 @@
 
 importer="texture"
 type="CompressedTexture2D"
+<<<<<<< HEAD
 uid="uid://bftun7ggycvxx"
+=======
+uid="uid://bnat6bynu44je"
+>>>>>>> 18f4858a48174eab79d786f74b3431490630d117
 path="res://.godot/imported/Black_mage.png-7a41e4577f14b778296718d2c9942c5c.ctex"
 metadata={
 "vram_texture": false

Assets/Resized Chess Piece Assets/Black_rook.png.import

@@ -2,7 +2,11 @@
 
 importer="texture"
 type="CompressedTexture2D"
+<<<<<<< HEAD
 uid="uid://6y2voelhmjp3"
+=======
+uid="uid://cmlbpctuqkr3u"
+>>>>>>> 18f4858a48174eab79d786f74b3431490630d117
 path="res://.godot/imported/Black_rook.png-70e1d5eb566b78612ae78261e7f5d5a6.ctex"
 metadata={
 "vram_texture": false

Assets/Resized Chess Piece Assets/Black_wizard.png.import

@@ -2,7 +2,11 @@
 
 importer="texture"
 type="CompressedTexture2D"
+<<<<<<< HEAD
 uid="uid://co02l1ad5m6m3"
+=======
+uid="uid://shl6jsfvn0ta"
+>>>>>>> 18f4858a48174eab79d786f74b3431490630d117
 path="res://.godot/imported/Black_wizard.png-cb555143bb3a98fb848f99dcfe765549.ctex"
 metadata={
 "vram_texture": false