diff --git a/.godot/editor/editor_layout.cfg b/.godot/editor/editor_layout.cfg
index 31e24fbf0050d044f1b9186ebcce2d7f15cf5457..cd379186c48dd9b5bdbd836b63a9ac709a7ebf33 100644
--- a/.godot/editor/editor_layout.cfg
+++ b/.godot/editor/editor_layout.cfg
@@ -6,63 +6,38 @@ dock_5_selected_tab_idx=0
dock_floating={}
dock_bottom=[]
dock_closed=[]
-<<<<<<< HEAD
-<<<<<<<HEAD<<<<<<<HEADdock_split_2=-1
+<<<<<<<HEAD<<<<<<<HEAD<<<<<<<HEADdock_split_2=-1
dock_split_3=0
dock_hsplit_1=0
<<<<<<<HEADdock_hsplit_2=498
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_filesystem_selected_paths=PackedStringArray("res://scenes/Shop.tscn")
+dock_filesystem_uncollapsed_paths=PackedStringArray("Favorites", "res://", "res://scripts/", "res://scripts/run_data/", "res://scenes/")
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"
+open_scenes=PackedStringArray("res://main.tscn", "res://scenes/game.tscn", "res://scenes/Shop.tscn")
+current_scene="res://scenes/game.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_default_debugger_tab_idx=1
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_scripts=["res://scripts/game.gd", "res://scripts/King.gd", "res://scripts/main/main.gd", "res://scripts/run_data/run_data.gd", "res://scripts/Shop.gd", "res://scenes/shop_item.gd"]
+selected_script="res://scripts/run_data/run_data.gd"
open_help=[]
script_split_offset=70
list_split_offset=0
diff --git a/.godot/editor/filesystem_cache8 b/.godot/editor/filesystem_cache8
index 8572821653ad590961ddd6346f903a585b927125..06fae626b56967d15d4a514f388c27fd4fbdc3c2 100644
--- a/.godot/editor/filesystem_cache8
+++ b/.godot/editor/filesystem_cache8
@@ -1,11 +1,10 @@
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
+::res://::1739131764
+icon.svg::CompressedTexture2D::6378281210119878262::1738795350::1739131765::1::::<><>::
+main.tscn::PackedScene::5692118487183161714::1739131675::0::1::::<><>::uid://cu7lkx15lmfww::::res://scenes/scene_manager.tscn<>res://scripts/main/main.gd
README.md::TextFile::-1::1738795350::0::1::::<><>::
::res://assets/::1739068749
-::res://assets/Character Assets/::1739131416
+::res://assets/Character Assets/::1739131571
Bishop Character.png::CompressedTexture2D::5940736122524784063::1739069678::1739069680::1::::<><>::
Knight_Character.png::CompressedTexture2D::6219382475167814187::1739069581::1739069624::1::::<><>::
Rook Character.png::CompressedTexture2D::4669491807804796081::1739069622::1739069624::1::::<><>::
@@ -17,232 +16,119 @@ noise2.tres::NoiseTexture2D::5054739835828921764::1739131352::0::1::::<><>::
noise3.tres::NoiseTexture2D::906885015046579772::1739131352::0::1::::<><>::
noise.tres::NoiseTexture2D::1693764769519573005::1739131352::0::1::::<><>::
::res://assets/Original size Chess pieces/::1739068943
-Black king piece 2.png::CompressedTexture2D::7820367427145083060::1739068732::1739068943::1::::<><>::
-Black knight piece.png::CompressedTexture2D::4196515762256027844::1739068732::1739068943::1::::<><>::
-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/::1739075821
-Black_Assassin.png::CompressedTexture2D::4500587832361015736::1738795350::1739075821::1::::<><>::
-Black_Bishop.png::CompressedTexture2D::1166768907848589111::1738795350::1739075821::1::::<><>::
-Black_king.png::CompressedTexture2D::2589426655405970400::1738795350::1739075821::1::::<><>::
-Black_knight.png::CompressedTexture2D::3646058773243192865::1738795350::1739075821::1::::<><>::
-Black_mage.png::CompressedTexture2D::2777827324707311049::1738795350::1739075821::1::::<><>::
-Black_Pawn.png::CompressedTexture2D::8621839116256101594::1738795350::1739075821::1::::<><>::
-Black_Queen.png::CompressedTexture2D::8059806917159827146::1738795350::1739075821::1::::<><>::
-Black_rook.png::CompressedTexture2D::2227076821368882158::1738795350::1739075821::1::::<><>::
-Black_wizard.png::CompressedTexture2D::5808754990491806288::1738795350::1739075821::1::::<><>::
-White_Assassin.png::CompressedTexture2D::332289366760738743::1738795350::1739075821::1::::<><>::
-White_Bishop.png::CompressedTexture2D::6534237863688049223::1738795350::1739075821::1::::<><>::
-White_king.png::CompressedTexture2D::4918818077278514251::1738795350::1739075821::1::::<><>::
-White_knight.png::CompressedTexture2D::8279426026248728130::1739068749::1739075821::1::::<><>::
-White_mage.png::CompressedTexture2D::1463747821347764847::1738795350::1739075821::1::::<><>::
-White_Pawn.png::CompressedTexture2D::2603821895790301265::1739068749::1739075821::1::::<><>::
-White_Queen.png::CompressedTexture2D::3202700718576986601::1739068749::1739075821::1::::<><>::
-White_rook.png::CompressedTexture2D::5642160515834838717::1739068749::1739075821::1::::<><>::
-White_wizard.png::CompressedTexture2D::5759130360726746601::1738795350::1739075821::1::::<><>::
+Black king piece 2.png::CompressedTexture2D::7820367427145083060::1739068732::1739131765::1::::<><>::
+Black knight piece.png::CompressedTexture2D::4196515762256027844::1739068732::1739131765::1::::<><>::
+Black Pawn Piece 2.png::CompressedTexture2D::2167440687080906934::1739068732::1739131765::1::::<><>::
+Black Queen Piece 2.png::CompressedTexture2D::6638986330393441989::1739068732::1739131765::1::::<><>::
+Black rook piece.png::CompressedTexture2D::1872655759582013005::1739068732::1739131765::1::::<><>::
+White king piece 2.png::CompressedTexture2D::7139286146806283259::1739068732::1739131765::1::::<><>::
+White knight piece.png::CompressedTexture2D::8293368904171920332::1739068732::1739131765::1::::<><>::
+White Pawn Piece 2.png::CompressedTexture2D::8915038826611091975::1739068732::1739131765::1::::<><>::
+White Queen Piece 2.png::CompressedTexture2D::339041922548181320::1739068732::1739131765::1::::<><>::
+White rook piece.png::CompressedTexture2D::6272641373813891014::1739068732::1739131765::1::::<><>::
+::res://assets/Resized Chess Piece Assets/::1739131731
+Black_Assassin.png::CompressedTexture2D::8696442520229981979::1738795350::1739131765::1::::<><>::
+Black_Bishop.png::CompressedTexture2D::4327514806697328020::1738795350::1739131765::1::::<><>::
+Black_king.png::CompressedTexture2D::5625663465487672966::1738795350::1739131765::1::::<><>::
+Black_knight.png::CompressedTexture2D::2791840439296267488::1738795350::1739131765::1::::<><>::
+Black_mage.png::CompressedTexture2D::3280483788959284489::1738795350::1739131765::1::::<><>::
+Black_Pawn.png::CompressedTexture2D::5280339583059345550::1738795350::1739131765::1::::<><>::
+Black_Queen.png::CompressedTexture2D::3743838940878226210::1738795350::1739131765::1::::<><>::
+Black_rook.png::CompressedTexture2D::107685736283117809::1738795350::1739131765::1::::<><>::
+Black_wizard.png::CompressedTexture2D::1822843161141014677::1738795350::1739131765::1::::<><>::
+White_Assassin.png::CompressedTexture2D::790925587582430974::1738795350::1739131765::1::::<><>::
+White_Bishop.png::CompressedTexture2D::8951830101271747587::1738795350::1739131765::1::::<><>::
+White_king.png::CompressedTexture2D::2841002002076754980::1738795350::1739131765::1::::<><>::
+White_knight.png::CompressedTexture2D::8063770803569804488::1739068749::1739131765::1::::<><>::
+White_mage.png::CompressedTexture2D::3762161012636391590::1738795350::1739131765::1::::<><>::
+White_Pawn.png::CompressedTexture2D::6701304976908647077::1739068749::1739131765::1::::<><>::
+White_Queen.png::CompressedTexture2D::8250868235265892738::1739068749::1739131765::1::::<><>::
+White_rook.png::CompressedTexture2D::7754072765019541847::1739068749::1739131765::1::::<><>::
+White_wizard.png::CompressedTexture2D::8225068657611667935::1738795350::1739131765::1::::<><>::
::res://assets/shaders/::1739131352
3d_effect.gdshader::Shader::-1::1738795350::0::1::::<><>::
bg.gdshader::Shader::-1::1739131352::0::1::::<><>::
color.gdshader::Shader::-1::1738795350::0::1::::<><>::
shadow.gdshader::Shader::-1::1738795350::0::1::::<><>::
::res://assets/sprites/::1739068943
-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::::<><>::
+bishop.png::CompressedTexture2D::4631301773944929250::1738795350::1739131765::1::::<><>::
+knight.png::CompressedTexture2D::3545640967717948854::1738795350::1739131765::1::::<><>::
+pawn.png::CompressedTexture2D::1338760335342038528::1738795350::1739131765::1::::<><>::
+rook.png::CompressedTexture2D::6790909281007670776::1738795350::1739131765::1::::<><>::
+tile.png::CompressedTexture2D::8704336058451696509::1738795350::1739131765::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::::<><>::
+assassin.png::CompressedTexture2D::2309680507621369322::1738795350::1739131765::1::::<><>::
+black_bishop.png::CompressedTexture2D::7509881182472568151::1738795350::1739131765::1::::<><>::
+black_king.png::CompressedTexture2D::3646032776351028361::1738795350::1739131765::1::::<><>::
+black_knight.png::CompressedTexture2D::4591257172048987833::1738795350::1739131765::1::::<><>::
+black_pawn.png::CompressedTexture2D::3912668014183198267::1738795350::1739131765::1::::<><>::
+black_queen.png::CompressedTexture2D::7989886812523566234::1738795350::1739131765::1::::<><>::
+black_rook.png::CompressedTexture2D::8767708966549765967::1738795350::1739131765::1::::<><>::
+mage.png::CompressedTexture2D::4650471376600460963::1738795350::1739131765::1::::<><>::
+Piece_move.png::CompressedTexture2D::260618725614842917::1738795350::1739131765::1::::<><>::
+temp_chess_board.png::CompressedTexture2D::4173558678901569366::1738795350::1739131765::1::::<><>::
+turn-black.png::CompressedTexture2D::7112033964315790810::1738795350::1739131765::1::::<><>::
+turn-white.png::CompressedTexture2D::7344907768700758025::1738795350::1739131765::1::::<><>::
+white_bishop.png::CompressedTexture2D::8093744356261485644::1738795350::1739131765::1::::<><>::
+white_king.png::CompressedTexture2D::5901183203660598461::1738795350::1739131765::1::::<><>::
+white_knight.png::CompressedTexture2D::7533630084821562912::1738795350::1739131765::1::::<><>::
+white_pawn.png::CompressedTexture2D::8196778834906249875::1738795350::1739131765::1::::<><>::
+white_queen.png::CompressedTexture2D::1957958042777204643::1738795350::1739131765::1::::<><>::
+white_rook.png::CompressedTexture2D::3317152307554436932::1738795350::1739131765::1::::<><>::
+wizard.png::CompressedTexture2D::2759604866355024615::1738795350::1739131765::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::::<><>::
+Go_Save_The_King_Menu.jpg::CompressedTexture2D::7252735845995868232::1738795350::1739131766::1::::<><>::
+Mockup Gameplay Design.jpg::CompressedTexture2D::4859609684236806088::1738795350::1739131766::1::::<><>::
+Mockup Shop Design.jpg::CompressedTexture2D::8043055154093708922::1738795350::1739131766::1::::<><>::
::res://assets/ui/title_screen/::1739074146
-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/::1739131418
+play_button.png::CompressedTexture2D::5896995890187459238::1739074145::1739131765::1::::<><>::
+quit_button.png::CompressedTexture2D::5172428563227279585::1739074124::1739131765::1::::<><>::
+rules_button.png::CompressedTexture2D::8060955005205795067::1739074135::1739131765::1::::<><>::
+::res://scenes/::1739131731
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::1739131418::0::1::::<><>::res://scripts/game.gd<>res://assets/shaders/bg.gdshader<>uid://yeqb8ndri7xp::::res://assets/noise/noise.tres<>uid://ceas3dsjeq4ge::::res://assets/noise/noise2.tres<>uid://m6ki73qfbp2s::::res://assets/noise/noise3.tres
+game.tscn::PackedScene::8577524005707705072::1739131731::0::1::::<><>::res://scripts/game.gd<>res://assets/shaders/bg.gdshader<>uid://yeqb8ndri7xp::::res://assets/noise/noise.tres<>uid://ceas3dsjeq4ge::::res://assets/noise/noise2.tres<>uid://m6ki73qfbp2s::::res://assets/noise/noise3.tres
King.tscn::PackedScene::8277830396459966414::1738798420::0::1::::<><>::res://scripts/King.gd<>uid://cdogixbq8ay3t::::res://assets/Resized Chess Piece Assets/White_king.png
Knight.tscn::PackedScene::5270730075267457303::1738798420::0::1::::<><>::res://scripts/Knight.gd<>uid://mf4a3jclbwih::::res://assets/Resized Chess Piece Assets/White_knight.png
Mage.tscn::PackedScene::10334063134713649::1739068749::0::1::::<><>::res://scripts/Mage.gd<>uid://m4c1qckexo7q::::res://Assets/Resized Chess Piece Assets/White_mage.png
-Pawn.tscn::PackedScene::3675784333675896641::1739068749::0::1::::<><>::res://scripts/Pawn.gd<>uid://w04xn5hy44qq::::res://Assets/Resized Chess Piece Assets/White_Pawn.png
+Pawn.tscn::PackedScene::3675784333675896641::1739131731::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
+Rook.tscn::PackedScene::9162401199636684468::1739131731::0::1::::<><>::res://scripts/Rook.gd<>uid://b00wxxfjk04ke::::res://assets/Resized Chess Piece Assets/White_rook.png
scene_manager.tscn::PackedScene::6243365322716451430::1739067597::0::1::::<><>::res://scripts/scene_manager.gd
+Shop.tscn::PackedScene::6176556733226555776::1739131731::0::1::::<><>::res://scripts/Shop.gd
+ShopItem.tscn::PackedScene::5426615772503019706::1739131731::0::1::::<><>::res://scenes/shop_item.gd
+shop_item.gd::GDScript::-1::1739131731::0::1::::<>PanelContainer<>::
texture_holder.tscn::PackedScene::594714386286134588::1738795350::0::1::::<><>::
Wizard.tscn::PackedScene::6352212773395470747::1739068749::0::1::::<><>::res://scripts/Wizard.gd<>uid://bjlefo01b774s::::res://Assets/Resized Chess Piece Assets/White_wizard.png
-::res://scenes/screens/::1739131418
-select_piece_screen.tscn::PackedScene::1770100387099198731::1739131418::0::1::::<><>::uid://bm8sv1itwm467::::res://scenes/ui/menu_button.tscn<>res://scripts/screens/select_piece_screen.gd<>uid://b7r633ea3cxw0::::res://assets/Character Assets/Rook Character.png<>uid://ds0p6bwarp14f::::res://assets/Character Assets/selected_piece_bg.png<>uid://cuuyk5y51r8ux::::res://assets/Character Assets/Knight_Character.png<>uid://cqv0b5ypsi2tn::::res://assets/Character Assets/Bishop Character.png
-title_screen.tscn::PackedScene::8154710134031658440::1739131418::0::1::::<><>::res://scripts/screens/title_screen.gd<>uid://bm8sv1itwm467::::res://scenes/ui/menu_button.tscn
+::res://scenes/screens/::1739131675
+select_piece_screen.tscn::PackedScene::1770100387099198731::1739131675::0::1::::<><>::uid://bm8sv1itwm467::::res://scenes/ui/menu_button.tscn<>res://scripts/screens/select_piece_screen.gd<>uid://b7r633ea3cxw0::::res://assets/Character Assets/Rook Character.png<>uid://ds0p6bwarp14f::::res://assets/Character Assets/selected_piece_bg.png<>uid://cuuyk5y51r8ux::::res://assets/Character Assets/Knight_Character.png<>uid://cqv0b5ypsi2tn::::res://assets/Character Assets/Bishop Character.png
+title_screen.tscn::PackedScene::8154710134031658440::1739131675::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<>::
-game.gd::GDScript::-1::1739045810::0::1::::game<>Node<>::
-King.gd::GDScript::-1::1738795350::0::1::::King<>Piece<>::
-Knight.gd::GDScript::-1::1738795350::0::1::::Knight<>Piece<>::
-Mage.gd::GDScript::-1::1738795350::0::1::::Mage<>Piece<>::
-Pawn.gd::GDScript::-1::1738795350::0::1::::Pawn<>Piece<>::
-Piece.gd::GDScript::-1::1738795350::0::1::::Piece<>Node2D<>::
-Queen.gd::GDScript::-1::1738795350::0::1::::Queen<>Piece<>::
-Rook.gd::GDScript::-1::1738795350::0::1::::Rook<>Piece<>::
+::res://scripts/::1739131731
+Assassin.gd::GDScript::-1::1739131731::0::1::::Assassin<>Piece<>::
+Bishop.gd::GDScript::-1::1739131731::0::1::::Bishop<>Piece<>::
+game.gd::GDScript::-1::1739131731::0::1::::game<>Node<>::
+King.gd::GDScript::-1::1739131731::0::1::::King<>Piece<>::
+Knight.gd::GDScript::-1::1739131731::0::1::::Knight<>Piece<>::
+Mage.gd::GDScript::-1::1739131731::0::1::::Mage<>Piece<>::
+Pawn.gd::GDScript::-1::1739131731::0::1::::Pawn<>Piece<>::
+Piece.gd::GDScript::-1::1739131731::0::1::::Piece<>Node2D<>::
+Queen.gd::GDScript::-1::1739131731::0::1::::Queen<>Piece<>::
+Rook.gd::GDScript::-1::1739131731::0::1::::Rook<>Piece<>::
scene_manager.gd::GDScript::-1::1738864872::0::1::::<>Node<>::
-Wizard.gd::GDScript::-1::1738795350::0::1::::Wizard<>Piece<>::
+Shop.gd::GDScript::-1::1739131731::0::1::::<>Node2D<>::
+Upgrade.gd::GDScript::-1::1739131731::0::1::::<>Node<>::
+Wizard.gd::GDScript::-1::1739131731::0::1::::Wizard<>Piece<>::
::res://scripts/main/::1738809274
main.gd::GDScript::-1::1738809274::0::1::::<>Node2D<>::
::res://scripts/run_data/::1739067561
run_data.gd::GDScript::-1::1739067561::0::1::::<>Node<>::
-::res://scripts/screens/::1739131352
+::res://scripts/screens/::1739131650
menu_button.gd::GDScript::-1::1738864872::0::1::::TitleButton<>Button<>::
-select_piece_screen.gd::GDScript::-1::1739131352::0::1::::SelectPieceScreen<>Control<>::
+select_piece_screen.gd::GDScript::-1::1739131650::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://::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
diff --git a/.godot/editor/filesystem_update4 b/.godot/editor/filesystem_update4
index b147ad721715c6832253802169cb639c235e9bc9..2879b0c175d8c9cfe4d86c44c94030fdb39e0f60 100644
--- a/.godot/editor/filesystem_update4
+++ b/.godot/editor/filesystem_update4
@@ -1,33 +1,9 @@
-<<<<<<< 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://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
-<<<<<<< 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://scripts/game.gd
+res://scripts/run_data/run_data.gd
res://scenes/Shop.tscn
-res://scenes/ShopItem.tscn
-res://scenes/Pawn.tscn
-res://scenes/Rook.tscn
-res://scripts/Upgrade.gd
->>>>>>> 18f4858a48174eab79d786f74b3431490630d117
diff --git a/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg b/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg
index 801403a45fec410c14edce6cb84864524a5d912a..1bbd83b2e8700ed2b8bfe4c43e76beb7ee83a428 100644
--- a/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg
+++ b/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg
@@ -8,11 +8,7 @@ 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
+"ofs": Vector2(-379.813, -116.439),
"primary_grid_step": Vector2i(8, 8),
"show_group_gizmos": true,
"show_guides": true,
@@ -179,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]([])
->>>>>>> 18f4858a48174eab79d786f74b3431490630d117
diff --git a/.godot/editor/main.tscn-editstate-3070c538c03ee49b7677ff960a3f5195.cfg b/.godot/editor/main.tscn-editstate-3070c538c03ee49b7677ff960a3f5195.cfg
index fc5eec61ffc881fb32bff37def19bdaf093fb1b3..4c84bec2b08e1ca2bc424b72f38a87ea1034199e 100644
--- a/.godot/editor/main.tscn-editstate-3070c538c03ee49b7677ff960a3f5195.cfg
+++ b/.godot/editor/main.tscn-editstate-3070c538c03ee49b7677ff960a3f5195.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]([])
->>>>>>> 18f4858a48174eab79d786f74b3431490630d117
diff --git a/.godot/editor/project_metadata.cfg b/.godot/editor/project_metadata.cfg
index f594b9b40c6215feb070286ccb951fae87372d8f..c03fccfd0964f5743a11922b81f0e7aeaf98059d 100644
--- a/.godot/editor/project_metadata.cfg
+++ b/.godot/editor/project_metadata.cfg
@@ -1,44 +1,9 @@
[editor_metadata]
-<<<<<<< HEAD
+<<<<<<<HEADexecutable_path="D:/SteamLibrary/steamapps/common/Godot Engine/godot.windows.opt.tools.64.exe"
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)
-
-[recent_files]
-
-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]
-
-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
+scenes=["res://scenes/Shop.tscn", "res://scenes/King.tscn", "res://scenes/game.tscn", "res://main.tscn"]
+scripts=["res://scripts/Shop.gd", "res://scripts/run_data/run_data.gd", "res://scripts/King.gd", "res://scripts/game.gd", "res://scenes/shop_item.gd", "res://scripts/main/main.gd"]
diff --git a/.godot/editor/script_editor_cache.cfg b/.godot/editor/script_editor_cache.cfg
index 1c7a50da103c9020fa9cc7532cc024ae8ac3f8d8..d5cea64940f18a11d42b88b025b8ad3216ef7621 100644
--- a/.godot/editor/script_editor_cache.cfg
+++ b/.godot/editor/script_editor_cache.cfg
@@ -12,33 +12,7 @@ state={
"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(),
@@ -46,21 +20,13 @@ 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]
+[res://scenes/shop_item.gd]
state={
"bookmarks": PackedInt32Array(),
@@ -68,28 +34,27 @@ state={
"column": 0,
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
-"row": 24,
-"scroll_position": 2.0,
+"row": 0,
+"scroll_position": 3.0,
"selection": false,
"syntax_highlighter": "GDScript"
}
-[res://scenes/shop_item.gd]
+[res://scripts/game.gd]
state={
"bookmarks": PackedInt32Array(),
"breakpoints": PackedInt32Array(),
-"column": 31,
+"column": 41,
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
-"row": 3,
-"scroll_position": 3.0,
+"row": 519,
+"scroll_position": 532.0,
"selection": false,
"syntax_highlighter": "GDScript"
}
-[res://scripts/Queen.gd]
->>>>>>> 18f4858a48174eab79d786f74b3431490630d117
+[res://scripts/King.gd]
state={
"bookmarks": PackedInt32Array(),
@@ -97,60 +62,36 @@ state={
"column": 0,
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
-"row": 13,
-"scroll_position": 0.0,
+"row": 0,
+"scroll_position": 8.0,
"selection": false,
"syntax_highlighter": "GDScript"
}
-<<<<<<< HEAD
-[res://scripts/screens/select_piece_screen.gd]
-=======
-[res://scripts/Pawn.gd]
->>>>>>> 18f4858a48174eab79d786f74b3431490630d117
+[res://scripts/run_data/run_data.gd]
state={
"bookmarks": PackedInt32Array(),
"breakpoints": PackedInt32Array(),
-<<<<<<< HEAD
-"column": 1,
-"folded_lines": Array[int]([]),
-"h_scroll_position": 0,
-"row": 27,
-"scroll_position": 9.0,
-=======
-"column": 23,
+"column": 14,
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
-"row": 50,
-"scroll_position": 38.0,
->>>>>>> 18f4858a48174eab79d786f74b3431490630d117
+"row": 24,
+"scroll_position": 6.0,
"selection": false,
"syntax_highlighter": "GDScript"
}
-<<<<<<< HEAD
-[res://scripts/run_data/run_data.gd]
-=======
-[res://scripts/Rook.gd]
->>>>>>> 18f4858a48174eab79d786f74b3431490630d117
+[res://scripts/Shop.gd]
state={
"bookmarks": PackedInt32Array(),
"breakpoints": PackedInt32Array(),
-<<<<<<< HEAD
-"column": 1,
-"folded_lines": Array[int]([]),
-"h_scroll_position": 0,
-"row": 28,
-"scroll_position": 10.0,
-=======
-"column": 3,
+"column": 18,
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
-"row": 66,
-"scroll_position": 56.0,
->>>>>>> 18f4858a48174eab79d786f74b3431490630d117
+"row": 14,
+"scroll_position": 6.0,
"selection": false,
"syntax_highlighter": "GDScript"
}
diff --git a/.godot/global_script_class_cache.cfg b/.godot/global_script_class_cache.cfg
index 0bbe3f173b32134694e7a1486ff7d628306d4446..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"
}, {
-=======
->>>>>>> 18f4858a48174eab79d786f74b3431490630d117
"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"
->>>>>>> 18f4858a48174eab79d786f74b3431490630d117
}, {
"base": &"Piece",
"class": &"Wizard",
diff --git a/.godot/uid_cache.bin b/.godot/uid_cache.bin
index 60b51076de3e01e8ba12578f028771cdd6e5a36a..4f8707a824e2df64fc7f1504d644f7306eb26547 100644
Binary files a/.godot/uid_cache.bin and b/.godot/uid_cache.bin differ
diff --git a/Assets/Resized Chess Piece Assets/Black_Assassin.png.import b/Assets/Resized Chess Piece Assets/Black_Assassin.png.import
index 48e61efc471d45edb9fce7cdb7aeb3aba5f377a5..eb61c67c5fbc1e35a08b436221db7b0ecdb27cba 100644
--- a/Assets/Resized Chess Piece Assets/Black_Assassin.png.import
+++ b/Assets/Resized Chess Piece Assets/Black_Assassin.png.import
@@ -2,11 +2,7 @@
importer="texture"
type="CompressedTexture2D"
-<<<<<<< HEAD
-uid="uid://b5eea22pnojum"
-=======
-uid="uid://cjc7sh4hfoqt3"
->>>>>>> 18f4858a48174eab79d786f74b3431490630d117
+uid="uid://dv5vexh2v0dkd"
path="res://.godot/imported/Black_Assassin.png-9779f11d14d3617e840d68f6a9ebb5d0.ctex"
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 682aecfc5b90b1e6bb60c3eb71a1e58ee41afd8c..59e1e4769680e71e5105da69909973e5c3d62657 100644
--- a/Assets/Resized Chess Piece Assets/Black_Bishop.png.import
+++ b/Assets/Resized Chess Piece Assets/Black_Bishop.png.import
@@ -2,11 +2,7 @@
importer="texture"
type="CompressedTexture2D"
-<<<<<<< HEAD
-uid="uid://qvgrpspkfjkx"
-=======
-uid="uid://cmportfufw0sc"
->>>>>>> 18f4858a48174eab79d786f74b3431490630d117
+uid="uid://b2wjsik4h1cbk"
path="res://.godot/imported/Black_Bishop.png-31156db37595e69ca512c38698f9a239.ctex"
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 12a5e18183958ffa21b47de54728f4423ccc2305..b429f90bf0208c5d45074e6236ab601544662eec 100644
--- a/Assets/Resized Chess Piece Assets/Black_Pawn.png.import
+++ b/Assets/Resized Chess Piece Assets/Black_Pawn.png.import
@@ -2,11 +2,7 @@
importer="texture"
type="CompressedTexture2D"
-<<<<<<< HEAD
-uid="uid://du3qov0piv4ty"
-=======
-uid="uid://ccqn4arw41esa"
->>>>>>> 18f4858a48174eab79d786f74b3431490630d117
+uid="uid://chh3olhj2ws1s"
path="res://.godot/imported/Black_Pawn.png-c1035123434d941739e8a31659fe845d.ctex"
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 c66f4702a2af820b5bc7d7cc0d54949241ac2849..ffbb3127fcc4f5f13f78625315e1ac88a21de8f1 100644
--- a/Assets/Resized Chess Piece Assets/Black_Queen.png.import
+++ b/Assets/Resized Chess Piece Assets/Black_Queen.png.import
@@ -2,11 +2,7 @@
importer="texture"
type="CompressedTexture2D"
-<<<<<<< HEAD
-uid="uid://dm3h3v1vqyt2i"
-=======
-uid="uid://d13pkit0yx8w1"
->>>>>>> 18f4858a48174eab79d786f74b3431490630d117
+uid="uid://btlsqlkv2lviw"
path="res://.godot/imported/Black_Queen.png-91c924908a298cebe9bc2bdd61cd1aab.ctex"
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 2db03b144d4f7544c0cd21a93deb3d90dd443b48..77718eab1a3034ee33e1a5c3f8230f7cc009f1c7 100644
--- a/Assets/Resized Chess Piece Assets/Black_king.png.import
+++ b/Assets/Resized Chess Piece Assets/Black_king.png.import
@@ -2,11 +2,7 @@
importer="texture"
type="CompressedTexture2D"
-<<<<<<< HEAD
-uid="uid://bc5lqjmu1vqn5"
-=======
-uid="uid://bsuewqxoi3kxe"
->>>>>>> 18f4858a48174eab79d786f74b3431490630d117
+uid="uid://cmfd4c17f00ec"
path="res://.godot/imported/Black_king.png-64de782c258a02d199067831bbfebfe0.ctex"
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 2351e3091fde393508527fcf1d60c83427e26b9f..3fa1a57c253ab353c862558d595ebcf5ebbfa2ee 100644
--- a/Assets/Resized Chess Piece Assets/Black_knight.png.import
+++ b/Assets/Resized Chess Piece Assets/Black_knight.png.import
@@ -2,11 +2,7 @@
importer="texture"
type="CompressedTexture2D"
-<<<<<<< HEAD
-uid="uid://br7gb46qwq8o8"
-=======
-uid="uid://bq4h60chg048p"
->>>>>>> 18f4858a48174eab79d786f74b3431490630d117
+uid="uid://bf1ng68uufvv1"
path="res://.godot/imported/Black_knight.png-846a36a9b55a92a0bd2e4692a89d9222.ctex"
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 040410b8002a9204a97ccecfec8c3a61409c305f..c1672b260311894d4b90a212d968375dcdb2f9b1 100644
--- a/Assets/Resized Chess Piece Assets/Black_mage.png.import
+++ b/Assets/Resized Chess Piece Assets/Black_mage.png.import
@@ -2,11 +2,7 @@
importer="texture"
type="CompressedTexture2D"
-<<<<<<< HEAD
-uid="uid://bftun7ggycvxx"
-=======
-uid="uid://bnat6bynu44je"
->>>>>>> 18f4858a48174eab79d786f74b3431490630d117
+uid="uid://bm0ddatbbf4s0"
path="res://.godot/imported/Black_mage.png-7a41e4577f14b778296718d2c9942c5c.ctex"
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 525e758bec3fff59c36b94c35639eb2f2fa09c30..f7520516a9603147a95c3d30d5b0343a2aa4bbc6 100644
--- a/Assets/Resized Chess Piece Assets/Black_rook.png.import
+++ b/Assets/Resized Chess Piece Assets/Black_rook.png.import
@@ -2,11 +2,7 @@
importer="texture"
type="CompressedTexture2D"
-<<<<<<< HEAD
-uid="uid://6y2voelhmjp3"
-=======
-uid="uid://cmlbpctuqkr3u"
->>>>>>> 18f4858a48174eab79d786f74b3431490630d117
+uid="uid://bsftlaf45trd"
path="res://.godot/imported/Black_rook.png-70e1d5eb566b78612ae78261e7f5d5a6.ctex"
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 c2cc68d85b07736298a5c0a55c1cd3e74ad0b8e1..66a463d6dbfebf6707390087a1fdd6b53d0e8a1a 100644
--- a/Assets/Resized Chess Piece Assets/Black_wizard.png.import
+++ b/Assets/Resized Chess Piece Assets/Black_wizard.png.import
@@ -2,11 +2,7 @@
importer="texture"
type="CompressedTexture2D"
-<<<<<<< HEAD
-uid="uid://co02l1ad5m6m3"
-=======
-uid="uid://shl6jsfvn0ta"
->>>>>>> 18f4858a48174eab79d786f74b3431490630d117
+uid="uid://0787wngs56eb"
path="res://.godot/imported/Black_wizard.png-cb555143bb3a98fb848f99dcfe765549.ctex"
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 1a7be15370c8f940bcc433a2d4bd8454d46c9036..76d35b7ad0e550c9147886cad5c672eded401373 100644
--- a/Assets/Resized Chess Piece Assets/White_Assassin.png.import
+++ b/Assets/Resized Chess Piece Assets/White_Assassin.png.import
@@ -2,11 +2,7 @@
importer="texture"
type="CompressedTexture2D"
-<<<<<<< HEAD
-uid="uid://ey700p2jk0cp"
-=======
-uid="uid://j8hhxry8f0ii"
->>>>>>> 18f4858a48174eab79d786f74b3431490630d117
+uid="uid://ljeot1m3pcne"
path="res://.godot/imported/White_Assassin.png-07ca33a1945b47ebea515fea105e20ee.ctex"
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 01634250e5a54d893513d69a97e7f160530e3bac..e47cf0783d5355806395d8ef815d0b1ac24b1fe9 100644
--- a/Assets/Resized Chess Piece Assets/White_Bishop.png.import
+++ b/Assets/Resized Chess Piece Assets/White_Bishop.png.import
@@ -2,11 +2,7 @@
importer="texture"
type="CompressedTexture2D"
-<<<<<<< HEAD
-uid="uid://c0dh7cb0fl2vj"
-=======
-uid="uid://buolh1uof3bbc"
->>>>>>> 18f4858a48174eab79d786f74b3431490630d117
+uid="uid://d0slll8gfmji6"
path="res://.godot/imported/White_Bishop.png-955d7c5de349d5f940adee703d5f794f.ctex"
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 a27db3dc9a8b18dbcde3877c6cedf07a2730dc54..1e680127e8d365cb74d509a542b7cf34c51a9550 100644
--- a/Assets/Resized Chess Piece Assets/White_Pawn.png.import
+++ b/Assets/Resized Chess Piece Assets/White_Pawn.png.import
@@ -2,11 +2,7 @@
importer="texture"
type="CompressedTexture2D"
-<<<<<<< HEAD
-uid="uid://bddktir7e8ma0"
-=======
-uid="uid://ndi1e8thkonq"
->>>>>>> 18f4858a48174eab79d786f74b3431490630d117
+uid="uid://c2qfrqcg04xej"
path="res://.godot/imported/White_Pawn.png-a927ba07461adabe83c8ff13a8982486.ctex"
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 513c8caa79202a846ef75bdfeed9f972d2034ac7..65a9a933550f320cd8cc5dcd19b3393e2dbd3ad8 100644
--- a/Assets/Resized Chess Piece Assets/White_Queen.png.import
+++ b/Assets/Resized Chess Piece Assets/White_Queen.png.import
@@ -2,11 +2,7 @@
importer="texture"
type="CompressedTexture2D"
-<<<<<<< HEAD
-uid="uid://blvoao6ufiaa0"
-=======
-uid="uid://cb3vq168iyomb"
->>>>>>> 18f4858a48174eab79d786f74b3431490630d117
+uid="uid://dps1uhdbhi35g"
path="res://.godot/imported/White_Queen.png-a669898b0c5a31bf072c0c8c1df1616f.ctex"
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 c9ea3bf4ca3a889fdd6068d564d57bfcde8e5a14..837879f2abda9147e0a0718d3be997121865001b 100644
--- a/Assets/Resized Chess Piece Assets/White_king.png.import
+++ b/Assets/Resized Chess Piece Assets/White_king.png.import
@@ -2,11 +2,7 @@
importer="texture"
type="CompressedTexture2D"
-<<<<<<< HEAD
-uid="uid://cccyhkvxdy7fr"
-=======
-uid="uid://cdogixbq8ay3t"
->>>>>>> 18f4858a48174eab79d786f74b3431490630d117
+uid="uid://bgqg5gn75ep6k"
path="res://.godot/imported/White_king.png-0d53fbc8f540b7f9892862e16f4557f5.ctex"
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 03de5b6ef1933c03d6774692dc0a9b815829f295..73f4c461cf1f1fde3f3739e6df0d07b09a49c316 100644
--- a/Assets/Resized Chess Piece Assets/White_knight.png.import
+++ b/Assets/Resized Chess Piece Assets/White_knight.png.import
@@ -2,11 +2,7 @@
importer="texture"
type="CompressedTexture2D"
-<<<<<<< HEAD
-uid="uid://dp7u64gmitb2q"
-=======
-uid="uid://mf4a3jclbwih"
->>>>>>> 18f4858a48174eab79d786f74b3431490630d117
+uid="uid://dm5fek2y4ljfs"
path="res://.godot/imported/White_knight.png-af5b60f24c1f66b5bac879aef8e75467.ctex"
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 00f6044f421356e82d98231bea5fe628a3ffa2f3..8e26c5e8e6277a3573e368acf384fae061afb64a 100644
--- a/Assets/Resized Chess Piece Assets/White_mage.png.import
+++ b/Assets/Resized Chess Piece Assets/White_mage.png.import
@@ -2,11 +2,7 @@
importer="texture"
type="CompressedTexture2D"
-<<<<<<< HEAD
-uid="uid://u4byh7mw2s04"
-=======
-uid="uid://dbrrvccmlyblq"
->>>>>>> 18f4858a48174eab79d786f74b3431490630d117
+uid="uid://btuoiiagwry6a"
path="res://.godot/imported/White_mage.png-13bf07fba853ef5731085aacccb3bab2.ctex"
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 dc1d3cb89ab7402072323f6db9097ea84200924b..af3f8808b0fdc60581b0819ff98cf5f46b1f1414 100644
--- a/Assets/Resized Chess Piece Assets/White_rook.png.import
+++ b/Assets/Resized Chess Piece Assets/White_rook.png.import
@@ -2,11 +2,7 @@
importer="texture"
type="CompressedTexture2D"
-<<<<<<< HEAD
-uid="uid://cmndtavkx0ln6"
-=======
-uid="uid://b00wxxfjk04ke"
->>>>>>> 18f4858a48174eab79d786f74b3431490630d117
+uid="uid://diqepfcecprwp"
path="res://.godot/imported/White_rook.png-e5e1a20ca93a0594be5d3fb1267367d2.ctex"
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 5b4916b67fe5c3adefc881f144a421d5a572931c..ca8ba5e056ffc4c4c88909fd2b0fd1116781e614 100644
--- a/Assets/Resized Chess Piece Assets/White_wizard.png.import
+++ b/Assets/Resized Chess Piece Assets/White_wizard.png.import
@@ -2,11 +2,7 @@
importer="texture"
type="CompressedTexture2D"
-<<<<<<< HEAD
-uid="uid://cob1bhgcs0ltp"
-=======
-uid="uid://dwo5k5y02pe46"
->>>>>>> 18f4858a48174eab79d786f74b3431490630d117
+uid="uid://dpgjxdbc20rqd"
path="res://.godot/imported/White_wizard.png-c84194d9805542fd48d5428ec5a721ef.ctex"
metadata={
"vram_texture": false
diff --git a/scripts/game.gd b/scripts/game.gd
index 3b49e69178ce6c609a947efe53b69f817c6a13d7..b1138ea4c5b92c8ee0a3d446c3e51a3612eafd3b 100644
--- a/scripts/game.gd
+++ b/scripts/game.gd
@@ -1,7 +1,6 @@
extends Node
class_name game
-var player_gold: int = 10
var shop_scene = preload("res://scenes/Shop.tscn")
var shop: Node2D
var purchased_pieces: Array = []
@@ -369,7 +368,7 @@ func remove_piece(x,y):
var piece = child.duplicate()
if is_opponent(x, y):
- player_gold += child.capture_gold_value
+ RunData.add_currency(child.capture_gold_value)
update_gold_display()
opponent_piece_count += 1
@@ -518,10 +517,11 @@ func _on_shop_button_pressed():
tile_container.visible = !tile_container.visible
func _on_purchase_attempted(item_data: Dictionary, shop_item: Node):
+ var player_gold = RunData.get_currency()
# Check gold here where we have access to the real value
if player_gold >= item_data["price"]:
# Deduct gold and mark the item as purchased
- player_gold -= item_data["price"]
+ RunData.set_currency(player_gold - item_data["price"])
item_data["purchased"] = true
@@ -537,7 +537,7 @@ func _on_purchase_attempted(item_data: Dictionary, shop_item: Node):
# checks if the purchased item’s name exists in the list of pieces or upgrades.
if item_data["name"] in piece_names:
# print("Purchased piece: ", item_data["name"])
- purchased_pieces.append(item_data)
+ RunData.add_piece(item_data["name"])
elif item_data["name"] in upgrade_names:
# print("Purchased upgrade: ", item_data["name"])
purchased_upgrades.append(item_data)
@@ -579,7 +579,7 @@ func apply_upgrade_to_pieces(upgrade_data: Dictionary):
piece.upgrades.append(upgrade_data["upgrade_enum"])
func update_gold_display():
- gold_display.text = "Gold: %d" % player_gold
+ gold_display.text = "Gold: %d" % RunData.get_currency()
func _on_next_round_requested():
shop.visible = false # Hide the shop
diff --git a/scripts/run_data/run_data.gd b/scripts/run_data/run_data.gd
index f6f4cb1151d08566b1a642b7a10879cf5ca474c1..35eb814bb8041ee2c2539089c1f3e8ac37ef74b0 100644
--- a/scripts/run_data/run_data.gd
+++ b/scripts/run_data/run_data.gd
@@ -2,7 +2,7 @@ extends Node
var scene_manager: Node = null
-var currency: int = 0
+var currency: int = 10
var enchantments: Array = []
var pieces: Array = []
@@ -10,7 +10,7 @@ func _ready() -> void:
pass # Replace with function body.
func reset_run() -> void:
- currency = 0
+ currency = 10
enchantments.clear()
if pieces.is_empty():
@@ -25,10 +25,18 @@ func start_run():
print(pieces)
scene_manager.change_scene("res://scenes/game.tscn")
-func add_currency(piece: Node2D) -> void:
+func add_currency(new_currency: int) -> void:
+ currency += new_currency
- print(piece.get_script())
print("Total currency: ", currency)
+func get_currency() -> int:
+ return currency
+
+func set_currency(new_currency) -> void:
+ currency = new_currency
+
func add_piece(piece: String) -> void:
- pieces.append(piece)
+ pieces.append(piece.to_lower())
+ print(piece)
+ print(pieces)