diff --git a/.godot/editor/editor_layout.cfg b/.godot/editor/editor_layout.cfg
index 814fcdbf1f2620f7d610a9fbce83ea81d22445c6..c0828506bdb7f6b2d0124b324328c81592b72699 100644
--- a/.godot/editor/editor_layout.cfg
+++ b/.godot/editor/editor_layout.cfg
@@ -6,39 +6,64 @@ dock_5_selected_tab_idx=0
 dock_floating={}
 dock_bottom=[]
 dock_closed=[]
+<<<<<<< HEAD
 dock_split_2=-1
 dock_split_3=0
 dock_hsplit_1=0
 <<<<<<<HEADdock_hsplit_2=498
 dock_hsplit_3=-483
 dock_hsplit_2=461
+=======
+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=240
+dock_filesystem_h_split_offset=480
 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_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")
 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
 selected_default_debugger_tab_idx=0
 selected_main_editor_idx=2
-selected_bottom_panel_item=0
+selected_bottom_panel_item=1
 
 [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"]
 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=70
+script_split_offset=140
 list_split_offset=0
 zoom_factor=1.00475
 
diff --git a/.godot/editor/filesystem_cache8 b/.godot/editor/filesystem_cache8
index fff2b35e456a1d33ca021ef3e2f2c1b1768b791d..5070a5d9250956d12d2c848ddeab79ff084f6ec6 100644
--- a/.godot/editor/filesystem_cache8
+++ b/.godot/editor/filesystem_cache8
@@ -1,4 +1,5 @@
 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
@@ -122,3 +123,120 @@ select_piece_screen.gd::GDScript::-1::1738864872::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://::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 dd4d30c5369017200353bc688d08840bcd2ca94e..2467d0a6c0ab90382ce9f724d58c0eb9bba82d34 100644
--- a/.godot/editor/filesystem_update4
+++ b/.godot/editor/filesystem_update4
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 res://main.tscn
 res://assets/shaders/bg.gdshader
 res://assets/noise/noise.tres
@@ -11,3 +12,15 @@ 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
diff --git a/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg b/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg
index 99b0747d7f2117678cc3ff21f3e6c8b5b09274c8..5b0143dd32a83fd72b99b4bd26281778e863535b 100644
--- a/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg
+++ b/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg
@@ -8,7 +8,7 @@ Anim={
 "grid_snap_active": false,
 "grid_step": Vector2(8, 8),
 "grid_visibility": 1,
-"ofs": Vector2(-1092.7, -448.319),
+"ofs": Vector2(-154.44, -536.043),
 "primary_grid_step": Vector2i(8, 8),
 "show_group_gizmos": true,
 "show_guides": true,
@@ -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]([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/project_metadata.cfg b/.godot/editor/project_metadata.cfg
index 451748e6b47056ecad13593f9608871a28678444..be921fc2e8d40a68705f893c468924a49236a724 100644
--- a/.godot/editor/project_metadata.cfg
+++ b/.godot/editor/project_metadata.cfg
@@ -6,6 +6,7 @@ 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)
 
@@ -17,3 +18,17 @@ scripts=["Array", "res://scripts/screens/menu_button.gd", "res://scripts/screens
 [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/script_editor_cache.cfg b/.godot/editor/script_editor_cache.cfg
index c67e4a0d5eb14e299fc226ca4e7486611fd2245e..ddcb691cd9708139c64cbf7043a259686cdffb23 100644
--- a/.godot/editor/script_editor_cache.cfg
+++ b/.godot/editor/script_editor_cache.cfg
@@ -3,6 +3,7 @@
 state={
 "bookmarks": PackedInt32Array(),
 "breakpoints": PackedInt32Array(),
+<<<<<<< HEAD
 "column": 36,
 "folded_lines": Array[int]([]),
 "h_scroll_position": 0,
@@ -176,6 +177,13 @@ state={
 "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
 "selection": false,
 "syntax_highlighter": "GDScript"
 }
diff --git a/.godot/global_script_class_cache.cfg b/.godot/global_script_class_cache.cfg
index 0baf76cfef5ad0015e277b24efb239104fb0d7a1..563482b5ba10ee8cb06d69f3793cb4729401b916 100644
--- a/.godot/global_script_class_cache.cfg
+++ b/.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"
 }, {
+=======
+>>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
 "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"
+>>>>>>> 9772f9da85b7864a2f35671b337cd1993de34e07
 }, {
 "base": &"Piece",
 "class": &"Wizard",
diff --git a/.godot/imported/Go_Save_The_King_Menu.jpg-83f89575077e7b7b57440725419997a5.ctex b/.godot/imported/Go_Save_The_King_Menu.jpg-83f89575077e7b7b57440725419997a5.ctex
index 1fed2753c10d9744913066a561f5246c26d7426e..669ea750eebf43eabc08b68bd51a70097c8ef79e 100644
Binary files a/.godot/imported/Go_Save_The_King_Menu.jpg-83f89575077e7b7b57440725419997a5.ctex and b/.godot/imported/Go_Save_The_King_Menu.jpg-83f89575077e7b7b57440725419997a5.ctex differ
diff --git a/.godot/imported/Go_Save_The_King_Menu.jpg-83f89575077e7b7b57440725419997a5.md5 b/.godot/imported/Go_Save_The_King_Menu.jpg-83f89575077e7b7b57440725419997a5.md5
index 8e888508bfba7d120aed93530ebe92faa712eecb..5ae939cd2bd98607f429c0f0bdb24a3b15c33142 100644
--- a/.godot/imported/Go_Save_The_King_Menu.jpg-83f89575077e7b7b57440725419997a5.md5
+++ b/.godot/imported/Go_Save_The_King_Menu.jpg-83f89575077e7b7b57440725419997a5.md5
@@ -1,3 +1,3 @@
 source_md5="1f8596704a4313c38e12d613f3fbe423"
-dest_md5="63e062f92b548311db291c264535621e"
+dest_md5="7386ff6bb470f294f0724aa6b4a3c399"
 
diff --git a/.godot/imported/Mockup Gameplay Design.jpg-fc7a299e2b9d8a1e5a6be4e297652c59.ctex b/.godot/imported/Mockup Gameplay Design.jpg-fc7a299e2b9d8a1e5a6be4e297652c59.ctex
index ab9d86c3a7b773c80f230046df1e87a11a10f0ca..8684b2929d7a2c8f2a0c3392cd643ef1d589d1c9 100644
Binary files a/.godot/imported/Mockup Gameplay Design.jpg-fc7a299e2b9d8a1e5a6be4e297652c59.ctex and b/.godot/imported/Mockup Gameplay Design.jpg-fc7a299e2b9d8a1e5a6be4e297652c59.ctex differ
diff --git a/.godot/imported/Mockup Gameplay Design.jpg-fc7a299e2b9d8a1e5a6be4e297652c59.md5 b/.godot/imported/Mockup Gameplay Design.jpg-fc7a299e2b9d8a1e5a6be4e297652c59.md5
index 0f673a8637d7e83633d942ac98cf38c531524739..e2b78f1f5965f8ca8d86ff908363f0a589741910 100644
--- a/.godot/imported/Mockup Gameplay Design.jpg-fc7a299e2b9d8a1e5a6be4e297652c59.md5	
+++ b/.godot/imported/Mockup Gameplay Design.jpg-fc7a299e2b9d8a1e5a6be4e297652c59.md5	
@@ -1,3 +1,3 @@
 source_md5="1ee24bf68d43a784b8af3720f929830c"
-dest_md5="2260e63ce3cef51f2b4586482514e425"
+dest_md5="214f2a3afee18823f3ef358920265f56"
 
diff --git a/.godot/imported/Mockup Shop Design.jpg-e4f6b20c2703825c77bccf58041364b1.ctex b/.godot/imported/Mockup Shop Design.jpg-e4f6b20c2703825c77bccf58041364b1.ctex
index 709c65334bd7c2143ec75f3a6a886e2eeafc0ef3..b0b2a9e73a6292a3de5ce4d12c38c5205c453da3 100644
Binary files a/.godot/imported/Mockup Shop Design.jpg-e4f6b20c2703825c77bccf58041364b1.ctex and b/.godot/imported/Mockup Shop Design.jpg-e4f6b20c2703825c77bccf58041364b1.ctex differ
diff --git a/.godot/imported/Mockup Shop Design.jpg-e4f6b20c2703825c77bccf58041364b1.md5 b/.godot/imported/Mockup Shop Design.jpg-e4f6b20c2703825c77bccf58041364b1.md5
index 7a9261493322e4dc57bfefe74a30b1351efddd21..352be733c3642ef5d667f27a3245bdc805705092 100644
--- a/.godot/imported/Mockup Shop Design.jpg-e4f6b20c2703825c77bccf58041364b1.md5	
+++ b/.godot/imported/Mockup Shop Design.jpg-e4f6b20c2703825c77bccf58041364b1.md5	
@@ -1,3 +1,3 @@
 source_md5="98129eb716061176fa515ad0a02440fd"
-dest_md5="6c8c45f254c9f0041e827b93b1ed6b23"
+dest_md5="f9f8d3eb9d297585ac2924a32ff164d3"
 
diff --git a/.godot/imported/White_Pawn.png-4fbaffc4602d71e6cac15276c9938262.ctex b/.godot/imported/White_Pawn.png-4fbaffc4602d71e6cac15276c9938262.ctex
index be5e1bd60709d6a7a98b8c60ed83fd719dc9493c..05cc471b5802f5f5bd14fb24859f4893be75c850 100644
Binary files a/.godot/imported/White_Pawn.png-4fbaffc4602d71e6cac15276c9938262.ctex and b/.godot/imported/White_Pawn.png-4fbaffc4602d71e6cac15276c9938262.ctex differ
diff --git a/.godot/imported/White_Pawn.png-4fbaffc4602d71e6cac15276c9938262.md5 b/.godot/imported/White_Pawn.png-4fbaffc4602d71e6cac15276c9938262.md5
index a0a10eec3dd0b6b0545b3ab04f247b840ad0c0df..c0375edb0378edc00c5e4418915465fb0cf57b5f 100644
--- a/.godot/imported/White_Pawn.png-4fbaffc4602d71e6cac15276c9938262.md5
+++ b/.godot/imported/White_Pawn.png-4fbaffc4602d71e6cac15276c9938262.md5
@@ -1,3 +1,3 @@
-source_md5="c56048eb1dc7be6736cd82ef34d36ece"
-dest_md5="4b5b68a772fd44d82f8e4d479580ae70"
+source_md5="0c87baba96a1a06cf40525d9bf23b847"
+dest_md5="aad2bcdda1268c1597e87b0cae7bfcd3"
 
diff --git a/.godot/imported/White_Queen.png-a9036b7b39d84991818902d33b82e9f7.ctex b/.godot/imported/White_Queen.png-a9036b7b39d84991818902d33b82e9f7.ctex
index 889bdba09d75b9049a34ccefabdd3f18a4947041..e57e08b1c4954cbc6b7b952b9b85bc4212a15e40 100644
Binary files a/.godot/imported/White_Queen.png-a9036b7b39d84991818902d33b82e9f7.ctex and b/.godot/imported/White_Queen.png-a9036b7b39d84991818902d33b82e9f7.ctex differ
diff --git a/.godot/imported/White_Queen.png-a9036b7b39d84991818902d33b82e9f7.md5 b/.godot/imported/White_Queen.png-a9036b7b39d84991818902d33b82e9f7.md5
index be96c57cee0a3118478d277c7aba14bea816aacb..91877f78efe45266ccb9ea6ddd61486a9f553f06 100644
--- a/.godot/imported/White_Queen.png-a9036b7b39d84991818902d33b82e9f7.md5
+++ b/.godot/imported/White_Queen.png-a9036b7b39d84991818902d33b82e9f7.md5
@@ -1,3 +1,3 @@
-source_md5="f2e1d6f97bfa9fbe0ca1e2897d3f9b81"
-dest_md5="52621a4f50d4b91df03fcdc255a09175"
+source_md5="787dcb945f96a878fbcee676452e28c3"
+dest_md5="f1ffce95e09f2e6b918fd6defb4ce2c8"
 
diff --git a/.godot/imported/White_knight.png-c190fd776f0ab6d33f3119fa59d71766.ctex b/.godot/imported/White_knight.png-c190fd776f0ab6d33f3119fa59d71766.ctex
index 26d5bbe6a48827ce1a6aeb0028236065be376b14..735f5c8793d0963dba50ece8e9ebda43b316d912 100644
Binary files a/.godot/imported/White_knight.png-c190fd776f0ab6d33f3119fa59d71766.ctex and b/.godot/imported/White_knight.png-c190fd776f0ab6d33f3119fa59d71766.ctex differ
diff --git a/.godot/imported/White_knight.png-c190fd776f0ab6d33f3119fa59d71766.md5 b/.godot/imported/White_knight.png-c190fd776f0ab6d33f3119fa59d71766.md5
index 2ab4ca6b2e74e2da8d816921a7894a9a45cc4bff..ab8aa6e715435bc2ab50d22351b125c1636e2b8b 100644
--- a/.godot/imported/White_knight.png-c190fd776f0ab6d33f3119fa59d71766.md5
+++ b/.godot/imported/White_knight.png-c190fd776f0ab6d33f3119fa59d71766.md5
@@ -1,3 +1,3 @@
-source_md5="0aeae9d0c31b59e0cdecb4b22467d08e"
-dest_md5="69bcc0fb89685324c8dda57d074e2c51"
+source_md5="fb88c43e9f6aac1934292bb49230d779"
+dest_md5="17647cf1e569d741335eec48f175010d"
 
diff --git a/.godot/imported/White_rook.png-c9db72425068861f66815521164a4236.ctex b/.godot/imported/White_rook.png-c9db72425068861f66815521164a4236.ctex
index f9a27693d8d7461ef9a5b29a6ef3c131de02b352..3f00700d8041a0def8d3c9a813c538f0da681cd4 100644
Binary files a/.godot/imported/White_rook.png-c9db72425068861f66815521164a4236.ctex and b/.godot/imported/White_rook.png-c9db72425068861f66815521164a4236.ctex differ
diff --git a/.godot/imported/White_rook.png-c9db72425068861f66815521164a4236.md5 b/.godot/imported/White_rook.png-c9db72425068861f66815521164a4236.md5
index de25afe770bf38cba7094c6799689c564e0f92ad..0cd91574968abcc1942cbe37b602497d06524363 100644
--- a/.godot/imported/White_rook.png-c9db72425068861f66815521164a4236.md5
+++ b/.godot/imported/White_rook.png-c9db72425068861f66815521164a4236.md5
@@ -1,3 +1,3 @@
-source_md5="8a68b5eb86da6c4d7f1e726dafe6f47a"
-dest_md5="83f6135b226d26d07a58f8796fc21d75"
+source_md5="5ad9895138b6443b65e9dfe37d0c3b2f"
+dest_md5="3bda5c5889649af8379441b490a66a54"
 
diff --git a/Assets/Character Assets/Bishop Character.png b/Assets/Character Assets/Bishop Character.png
new file mode 100644
index 0000000000000000000000000000000000000000..86162dc0113a33ff13920670589788c544e1b5ee
Binary files /dev/null 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
new file mode 100644
index 0000000000000000000000000000000000000000..121b5f4ef4e45b11a54794319898a5c8bf2b6667
--- /dev/null
+++ b/Assets/Character Assets/Bishop Character.png.import	
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://cqv0b5ypsi2tn"
+path="res://.godot/imported/Bishop Character.png-42cee4b1125c4685f859ba1f68685818.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"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
diff --git a/Assets/Character Assets/Knight_Character.png b/Assets/Character Assets/Knight_Character.png
new file mode 100644
index 0000000000000000000000000000000000000000..2402eaf31962c761a15670bae1469884266264f1
Binary files /dev/null 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
new file mode 100644
index 0000000000000000000000000000000000000000..8ef215adc0dd6fd08df579fa720a03626a042bf4
--- /dev/null
+++ b/Assets/Character Assets/Knight_Character.png.import	
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://cuuyk5y51r8ux"
+path="res://.godot/imported/Knight_Character.png-65960834d50183e8cebba30ff64106d1.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"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
diff --git a/Assets/Character Assets/Rook Character.png b/Assets/Character Assets/Rook Character.png
new file mode 100644
index 0000000000000000000000000000000000000000..de6a48768ad6e1daa3e46cf9192166d735edea46
Binary files /dev/null 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
new file mode 100644
index 0000000000000000000000000000000000000000..c9c0aa0fd4ef343cdf6a184ae5af6b5b037acb81
--- /dev/null
+++ b/Assets/Character Assets/Rook Character.png.import	
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://b7r633ea3cxw0"
+path="res://.godot/imported/Rook Character.png-01b2495e1a84ebf3773cc2d11a895088.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"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
diff --git a/Assets/Resized Chess Piece Assets/.DS_Store b/Assets/Resized Chess Piece Assets/.DS_Store
index b9bc102212853ba4969fa30078059b34e2d18251..866ea1f2c7d9e3360a538e6a6bb223032954b906 100644
Binary files a/Assets/Resized Chess Piece Assets/.DS_Store and b/Assets/Resized Chess Piece Assets/.DS_Store differ
diff --git a/Assets/Resized Chess Piece Assets/Black_Assassin.png.import b/Assets/Resized Chess Piece Assets/Black_Assassin.png.import
index 12c1175caf4c6a4b376c9d5aab85b7993694f1b5..2cd2a72bd2b7026e05e7679cd0b1114f23355a2e 100644
--- a/Assets/Resized Chess Piece Assets/Black_Assassin.png.import	
+++ b/Assets/Resized Chess Piece Assets/Black_Assassin.png.import	
@@ -2,8 +2,13 @@
 
 importer="texture"
 type="CompressedTexture2D"
+<<<<<<< HEAD
 uid="uid://cjc7sh4hfoqt3"
 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 3b06cd51e0a1b94b035ca5c684ee7ff065179e6c..c5a54f09762fbd312574770a39259b6ee7c1544d 100644
--- a/Assets/Resized Chess Piece Assets/Black_Bishop.png.import	
+++ b/Assets/Resized Chess Piece Assets/Black_Bishop.png.import	
@@ -2,8 +2,13 @@
 
 importer="texture"
 type="CompressedTexture2D"
+<<<<<<< HEAD
 uid="uid://cmportfufw0sc"
 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 234ff4ce292fc360b62da9817144b8822688df52..034b24e50e998508d7c45db822695aa6421a9f81 100644
--- a/Assets/Resized Chess Piece Assets/Black_Pawn.png.import	
+++ b/Assets/Resized Chess Piece Assets/Black_Pawn.png.import	
@@ -2,8 +2,13 @@
 
 importer="texture"
 type="CompressedTexture2D"
+<<<<<<< HEAD
 uid="uid://ccqn4arw41esa"
 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 22c61e942d98b63129160cc22ff3766d19373a1d..67c29e25ac49ccd702fe84ec16d078908b1b5aa2 100644
--- a/Assets/Resized Chess Piece Assets/Black_Queen.png.import	
+++ b/Assets/Resized Chess Piece Assets/Black_Queen.png.import	
@@ -2,8 +2,13 @@
 
 importer="texture"
 type="CompressedTexture2D"
+<<<<<<< HEAD
 uid="uid://d13pkit0yx8w1"
 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 0f01431edc5166c10cc9a78fd66be19973737a3b..f96fbf62906fbfd2df8a8016b3dfd92fc6c7f80e 100644
--- a/Assets/Resized Chess Piece Assets/Black_king.png.import	
+++ b/Assets/Resized Chess Piece Assets/Black_king.png.import	
@@ -2,8 +2,13 @@
 
 importer="texture"
 type="CompressedTexture2D"
+<<<<<<< HEAD
 uid="uid://bsuewqxoi3kxe"
 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 cacf711ed49920dd4ad3abeced9edd259c78902e..4d32f74d63c82622720dcef705c63f08c600d14b 100644
--- a/Assets/Resized Chess Piece Assets/Black_knight.png.import	
+++ b/Assets/Resized Chess Piece Assets/Black_knight.png.import	
@@ -2,8 +2,13 @@
 
 importer="texture"
 type="CompressedTexture2D"
+<<<<<<< HEAD
 uid="uid://bq4h60chg048p"
 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 1b534c56dffbb35ec77b1bfc180c81a9aedff1da..deef8756fa55b77a0a8ba437dd6904b74195b49b 100644
--- a/Assets/Resized Chess Piece Assets/Black_mage.png.import	
+++ b/Assets/Resized Chess Piece Assets/Black_mage.png.import	
@@ -2,8 +2,13 @@
 
 importer="texture"
 type="CompressedTexture2D"
+<<<<<<< HEAD
 uid="uid://bnat6bynu44je"
 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 8b7d9f01e1d630c70538174f6bc1071e76007ba1..ec6aaf4d4c9147545873899dd79c810a77e297b0 100644
--- a/Assets/Resized Chess Piece Assets/Black_rook.png.import	
+++ b/Assets/Resized Chess Piece Assets/Black_rook.png.import	
@@ -2,8 +2,13 @@
 
 importer="texture"
 type="CompressedTexture2D"
+<<<<<<< HEAD
 uid="uid://cmlbpctuqkr3u"
 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 4e14a88740abb2d96869d3f24cf094de7e97c7ae..1f5bc72e2a0ea5a42b30c4702169a807a67ca177 100644
--- a/Assets/Resized Chess Piece Assets/Black_wizard.png.import	
+++ b/Assets/Resized Chess Piece Assets/Black_wizard.png.import	
@@ -2,8 +2,13 @@
 
 importer="texture"
 type="CompressedTexture2D"
+<<<<<<< HEAD
 uid="uid://shl6jsfvn0ta"
 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 237c904a184b0ffbdea5116daa8132e77766f497..7608ed0390a1ace7a3b86d824408b7166394f5a1 100644
--- a/Assets/Resized Chess Piece Assets/White_Assassin.png.import	
+++ b/Assets/Resized Chess Piece Assets/White_Assassin.png.import	
@@ -2,8 +2,13 @@
 
 importer="texture"
 type="CompressedTexture2D"
+<<<<<<< HEAD
 uid="uid://j8hhxry8f0ii"
 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 0820dc8987e5d7f83ab9f4dd8f36395e5f3d6eaa..17c310611410ec7ab8558e87b38125ffbea971e7 100644
--- a/Assets/Resized Chess Piece Assets/White_Bishop.png.import	
+++ b/Assets/Resized Chess Piece Assets/White_Bishop.png.import	
@@ -2,8 +2,13 @@
 
 importer="texture"
 type="CompressedTexture2D"
+<<<<<<< HEAD
 uid="uid://buolh1uof3bbc"
 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 b/Assets/Resized Chess Piece Assets/White_Pawn.png
index 9474927e7e7727f9d1c254f83121e9fe23994448..5791729a7e3ce630927445c55636e9d028dc8353 100644
Binary files a/Assets/Resized Chess Piece Assets/White_Pawn.png and b/Assets/Resized Chess Piece Assets/White_Pawn.png differ
diff --git a/Assets/Resized Chess Piece Assets/White_Pawn.png.import b/Assets/Resized Chess Piece Assets/White_Pawn.png.import
index 94e7960caaad0e13373730642d09c29a011481e0..1e611e0e538f8a4ce0b0061a00543de7eef81ebe 100644
--- a/Assets/Resized Chess Piece Assets/White_Pawn.png.import	
+++ b/Assets/Resized Chess Piece Assets/White_Pawn.png.import	
@@ -2,8 +2,13 @@
 
 importer="texture"
 type="CompressedTexture2D"
+<<<<<<< HEAD
 uid="uid://ndi1e8thkonq"
 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 b/Assets/Resized Chess Piece Assets/White_Queen.png
index 2bbdf476e2ec3239b880d3b2b23fd989616faf9c..fce87fcbc07a9917d23bf6003ceedfae6ae7424d 100644
Binary files a/Assets/Resized Chess Piece Assets/White_Queen.png and b/Assets/Resized Chess Piece Assets/White_Queen.png differ
diff --git a/Assets/Resized Chess Piece Assets/White_Queen.png.import b/Assets/Resized Chess Piece Assets/White_Queen.png.import
index f7a46b82da5a303f3e68b307e91613e02f3f0a7f..04de6d55faff0025875a0f28ccbf9fe18fb833d1 100644
--- a/Assets/Resized Chess Piece Assets/White_Queen.png.import	
+++ b/Assets/Resized Chess Piece Assets/White_Queen.png.import	
@@ -2,8 +2,13 @@
 
 importer="texture"
 type="CompressedTexture2D"
+<<<<<<< HEAD
 uid="uid://cb3vq168iyomb"
 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 494bd67d30a13fc5d61e6b4098c74dce691da406..dfabcb455cf6cfef9f8e744896588f6946f45aad 100644
--- a/Assets/Resized Chess Piece Assets/White_king.png.import	
+++ b/Assets/Resized Chess Piece Assets/White_king.png.import	
@@ -2,8 +2,13 @@
 
 importer="texture"
 type="CompressedTexture2D"
+<<<<<<< HEAD
 uid="uid://cdogixbq8ay3t"
 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 b/Assets/Resized Chess Piece Assets/White_knight.png
index e5f2f6cdf2960996b51494c8df21b1b5bdb01086..7c6cd96a965a331b06879b131c63eb54ed307162 100644
Binary files a/Assets/Resized Chess Piece Assets/White_knight.png and b/Assets/Resized Chess Piece Assets/White_knight.png differ
diff --git a/Assets/Resized Chess Piece Assets/White_knight.png.import b/Assets/Resized Chess Piece Assets/White_knight.png.import
index e6a1e4b626a8a3670457ca2dad89ebdfdd618fc8..e948a8d36c6a072c5333f04a80ce1355dd11fffc 100644
--- a/Assets/Resized Chess Piece Assets/White_knight.png.import	
+++ b/Assets/Resized Chess Piece Assets/White_knight.png.import	
@@ -2,8 +2,13 @@
 
 importer="texture"
 type="CompressedTexture2D"
+<<<<<<< HEAD
 uid="uid://mf4a3jclbwih"
 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 0f7c6ed10dad400baa3e0f44a32f0969828bdb77..a23d7a1fd7d0c040d72329d918aaeb3e1f3b21ad 100644
--- a/Assets/Resized Chess Piece Assets/White_mage.png.import	
+++ b/Assets/Resized Chess Piece Assets/White_mage.png.import	
@@ -2,8 +2,13 @@
 
 importer="texture"
 type="CompressedTexture2D"
+<<<<<<< HEAD
 uid="uid://dbrrvccmlyblq"
 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 b/Assets/Resized Chess Piece Assets/White_rook.png
index 6210a66598430213d326cf83bc80333f8c3ebc09..8d6eb2a9446abdd35b54352fd214efa89b77b077 100644
Binary files a/Assets/Resized Chess Piece Assets/White_rook.png and b/Assets/Resized Chess Piece Assets/White_rook.png differ
diff --git a/Assets/Resized Chess Piece Assets/White_rook.png.import b/Assets/Resized Chess Piece Assets/White_rook.png.import
index 9ff12d6eef6042c90f1255f68c0feef852767545..38a91e6e5bd4bf27936f458a4209e0abd16ff240 100644
--- a/Assets/Resized Chess Piece Assets/White_rook.png.import	
+++ b/Assets/Resized Chess Piece Assets/White_rook.png.import	
@@ -2,8 +2,13 @@
 
 importer="texture"
 type="CompressedTexture2D"
+<<<<<<< HEAD
 uid="uid://b00wxxfjk04ke"
 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 9e74efc81667085dec2d8a94e25f6bef5a49f98c..2a95c791974c1fc9e9845d3c6d0ce8db2f89ae3f 100644
--- a/Assets/Resized Chess Piece Assets/White_wizard.png.import	
+++ b/Assets/Resized Chess Piece Assets/White_wizard.png.import	
@@ -2,8 +2,13 @@
 
 importer="texture"
 type="CompressedTexture2D"
+<<<<<<< HEAD
 uid="uid://dwo5k5y02pe46"
 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 2153ed5946f1bedf35cf3560acae179535950d6a..3042aa7e79f555a99f65d5d17b284a7f05c08ac9 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-7bbbc406e2629bde9613c01b865eff89.ctex"
+path="res://.godot/imported/assassin.png-fe7baccd52a3283ab0d985b3ba17ec0b.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://assets/temp_assets/assassin.png"
-dest_files=["res://.godot/imported/assassin.png-7bbbc406e2629bde9613c01b865eff89.ctex"]
+source_file="res://Assets/temp_assets/assassin.png"
+dest_files=["res://.godot/imported/assassin.png-fe7baccd52a3283ab0d985b3ba17ec0b.ctex"]
 
 [params]
 
diff --git a/Assets/temp_assets/mage.png.import b/Assets/temp_assets/mage.png.import
index d6399e4563c83f11bbae237009044b1a65c6e415..34e60cbc3f3983f214bb3c2c902ae3eb7a2ec0e6 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-aa266229e8d4b8a7cd1dbb6644da4861.ctex"
+path="res://.godot/imported/mage.png-6df0fbad7964373e0d15494885490c2b.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://assets/temp_assets/mage.png"
-dest_files=["res://.godot/imported/mage.png-aa266229e8d4b8a7cd1dbb6644da4861.ctex"]
+source_file="res://Assets/temp_assets/mage.png"
+dest_files=["res://.godot/imported/mage.png-6df0fbad7964373e0d15494885490c2b.ctex"]
 
 [params]
 
diff --git a/Assets/temp_assets/wizard.png.import b/Assets/temp_assets/wizard.png.import
index f70066237689a0f96f1c2f453d09800ed59e95ac..82ad5da81561c98928de7826db71bbf3c5ecdf15 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-dde8c8f6619c79c88090542142689c4d.ctex"
+path="res://.godot/imported/wizard.png-6750ab334d9c25c7a82a402217206b12.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://assets/temp_assets/wizard.png"
-dest_files=["res://.godot/imported/wizard.png-dde8c8f6619c79c88090542142689c4d.ctex"]
+source_file="res://Assets/temp_assets/wizard.png"
+dest_files=["res://.godot/imported/wizard.png-6750ab334d9c25c7a82a402217206b12.ctex"]
 
 [params]
 
diff --git a/scenes/Assassin.tscn b/scenes/Assassin.tscn
index 078f6c50f42683e536c7962efc5eb5d57b7be660..a163f1f4db0e591fb6d26e15e37e58848ba60291 100644
--- a/scenes/Assassin.tscn
+++ b/scenes/Assassin.tscn
@@ -1,7 +1,7 @@
 [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://753dogr1moxe" path="res://assets/temp_assets/assassin.png" id="2_wrp2r"]
+[ext_resource type="Texture2D" uid="uid://bmq81ysump1xg" path="res://.godot/imported/White_Assassin.png-b91d29cfa010c3f963e5fe98fea3f7ce.ctex" id="2_wrp2r"]
 
 [node name="Node2D" type="Node2D"]
 script = ExtResource("1_g33mq")
diff --git a/scenes/Bishop.tscn b/scenes/Bishop.tscn
index eb713ca5904226f47d5e225afd1e94f904f6eaa9..b03172ec6f261258d32d077fac8c9f3da2fe83df 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://b68o4mj7wcwvq" path="res://assets/sprites/bishop.png" id="2_m57j0"]
+[ext_resource type="Texture2D" uid="uid://bdb74otsib8ql" path="res://.godot/imported/White_Bishop.png-7213de7b15a92e5747f2331d55eafa2b.ctex" id="2_wrp2r"]
 
 [node name="Node2D" type="Node2D"]
 script = ExtResource("1_l7uw0")
 
 [node name="Sprite2D" type="Sprite2D" parent="."]
-texture = ExtResource("2_m57j0")
+texture = ExtResource("2_wrp2r")
diff --git a/scenes/Mage.tscn b/scenes/Mage.tscn
index cfeb30c30882d4f152bf000c25e7d7740bd71ced..a376b39c26ec3e843e451e00aad256489b76af99 100644
--- a/scenes/Mage.tscn
+++ b/scenes/Mage.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=3 format=3 uid="uid://fag2130aog4"]
 
 [ext_resource type="Script" path="res://scripts/Mage.gd" id="1_o7lxu"]
-[ext_resource type="Texture2D" uid="uid://b7iyt4iwjbtd0" path="res://assets/temp_assets/mage.png" id="2_i5ela"]
+[ext_resource type="Texture2D" uid="uid://m4c1qckexo7q" path="res://Assets/Resized Chess Piece Assets/White_mage.png" id="2_i5ela"]
 
 [node name="Node2D" type="Node2D"]
 script = ExtResource("1_o7lxu")
diff --git a/scenes/Pawn.tscn b/scenes/Pawn.tscn
index 7243fbb639850bdc8427a17e0785c3dc32cc58ac..daad364979720b220eacc25c05f471a44237d5e8 100644
--- a/scenes/Pawn.tscn
+++ b/scenes/Pawn.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=3 format=3 uid="uid://bsmtvpmlum6u4"]
 
 [ext_resource type="Script" path="res://scripts/Pawn.gd" id="1_7blqs"]
-[ext_resource type="Texture2D" uid="uid://ndi1e8thkonq" path="res://assets/Resized Chess Piece Assets/White_Pawn.png" id="2_sw0f1"]
+[ext_resource type="Texture2D" uid="uid://w04xn5hy44qq" path="res://Assets/Resized Chess Piece Assets/White_Pawn.png" id="2_sw0f1"]
 
 [node name="Node2D" type="Node2D"]
 script = ExtResource("1_7blqs")
diff --git a/scenes/Wizard.tscn b/scenes/Wizard.tscn
index 904cd0fe316c9a308d0940109411f5b0c21b49e4..1933a21d13cf5835eb57d6320391db13edee1d49 100644
--- a/scenes/Wizard.tscn
+++ b/scenes/Wizard.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=3 format=3 uid="uid://cwrcas374ms6f"]
 
 [ext_resource type="Script" path="res://scripts/Wizard.gd" id="1_l2hsv"]
-[ext_resource type="Texture2D" uid="uid://bfk1j3brcknkp" path="res://assets/temp_assets/wizard.png" id="2_vybdv"]
+[ext_resource type="Texture2D" uid="uid://bjlefo01b774s" path="res://Assets/Resized Chess Piece Assets/White_wizard.png" id="2_vybdv"]
 
 [node name="Node2D" type="Node2D"]
 script = ExtResource("1_l2hsv")
diff --git a/scenes/game.tscn b/scenes/game.tscn
index 5f027e294f8c6e5918dfdcfe49bfded4bf491463..d62a39bfb82b15e3e6103f40aa8af43849604870 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")