diff --git a/.godot/editor/editor_layout.cfg b/.godot/editor/editor_layout.cfg
index 461ed2d2ec2dadbe45409af94837d54ee77ec834..fc5b619422f271691b496e6fc5a7701a2c6cd7fc 100644
--- a/.godot/editor/editor_layout.cfg
+++ b/.godot/editor/editor_layout.cfg
@@ -28,16 +28,16 @@ dock_5="Inspector,Node,History"
[EditorNode]
open_scenes=PackedStringArray("res://main.tscn", "res://scenes/Shop.tscn", "res://scenes/game.tscn", "res://scenes/ui/ui.tscn", "res://scenes/managers/state_manager.tscn", "res://scenes/screens/title_screen.tscn", "res://scenes/screens/select_piece_screen.tscn")
-current_scene="res://scenes/ui/ui.tscn"
+current_scene="res://scenes/managers/state_manager.tscn"
center_split_offset=-241
-selected_default_debugger_tab_idx=0
+selected_default_debugger_tab_idx=1
selected_main_editor_idx=2
selected_bottom_panel_item=0
[ScriptEditor]
open_scripts=["res://scripts/ui/display_piece_manager.gd", "res://scripts/game.gd", "res://scripts/ui/game_ui.gd", "res://scripts/King.gd", "res://scripts/Mage.gd", "res://scripts/main/main.gd", "res://scripts/Pawn.gd", "res://scripts/run_data/run_data.gd", "res://scripts/managers/scene_manager.gd", "res://scripts/screens/select_piece_screen.gd", "res://scripts/Shop.gd", "res://scripts/shop_item.gd", "res://scripts/managers/state_manager.gd", "res://scripts/screens/title_screen.gd"]
-selected_script="res://scripts/ui/game_ui.gd"
+selected_script="res://scripts/managers/state_manager.gd"
open_help=["String"]
script_split_offset=70
list_split_offset=0
diff --git a/.godot/editor/filesystem_update4 b/.godot/editor/filesystem_update4
index e8bd63fd384bd95b6c05b87ebad06a727df06490..1354e61002a64ee5ad7f9f48013310796f4cf93a 100644
--- a/.godot/editor/filesystem_update4
+++ b/.godot/editor/filesystem_update4
@@ -16,3 +16,4 @@ res://scenes/managers/state_manager.tscn
res://scripts/ui/game_ui.gd
res://scripts/run_data/run_data.gd
res://scripts/managers/state_manager.gd
+res://scripts/Pawn.gd
diff --git a/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg b/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg
index 2c7b1e74f37c48c4b7cc60bdb9cc486676953e1e..46224ff6f28d343d4bbd4f2535241569211f3929 100644
--- a/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg
+++ b/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg
@@ -175,4 +175,4 @@ Anim={
"zfar": 4000.01,
"znear": 0.05
}
-selected_nodes=Array[NodePath]([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/UI/GoldDisplay")])
+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/StateManager")])
diff --git a/.godot/editor/main.tscn-editstate-3070c538c03ee49b7677ff960a3f5195.cfg b/.godot/editor/main.tscn-editstate-3070c538c03ee49b7677ff960a3f5195.cfg
index d0ed9a5b85fba2c5720404459a196acbdbf38337..23bc9ec6bfe9c25a8aaf41904a57fcd3c44387b2 100644
--- a/.godot/editor/main.tscn-editstate-3070c538c03ee49b7677ff960a3f5195.cfg
+++ b/.godot/editor/main.tscn-editstate-3070c538c03ee49b7677ff960a3f5195.cfg
@@ -175,4 +175,4 @@ Anim={
"zfar": 4000.01,
"znear": 0.05
}
-selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@16886/@Panel@13/@VBoxContainer@14/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@25/DockVSplitCenter/@VSplitContainer@52/@VBoxContainer@53/@PanelContainer@98/MainScreen/@CanvasItemEditor@9272/@VSplitContainer@9094/@HSplitContainer@9096/@HSplitContainer@9098/@Control@9099/@SubViewportContainer@9100/@SubViewport@9101/UI/GoldDisplay")])
+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/StateManager")])
diff --git a/.godot/editor/script_editor_cache.cfg b/.godot/editor/script_editor_cache.cfg
index 2664e837b2220f66259b83a01a4c8f567ded939e..50cdd1d2298c12ffe75f94ea126e075e0cfe6f97 100644
--- a/.godot/editor/script_editor_cache.cfg
+++ b/.godot/editor/script_editor_cache.cfg
@@ -31,11 +31,11 @@ state={
state={
"bookmarks": PackedInt32Array(),
"breakpoints": PackedInt32Array(),
-"column": 35,
+"column": 1,
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
-"row": 360,
-"scroll_position": 12.0,
+"row": 111,
+"scroll_position": 98.0,
"selection": false,
"syntax_highlighter": "GDScript"
}
@@ -101,10 +101,10 @@ state={
state={
"bookmarks": PackedInt32Array(),
"breakpoints": PackedInt32Array(),
-"column": 43,
+"column": 38,
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
-"row": 9,
+"row": 17,
"scroll_position": 0.0,
"selection": false,
"syntax_highlighter": "GDScript"
@@ -137,7 +137,7 @@ state={
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
"row": 26,
-"scroll_position": 3.0,
+"scroll_position": 4.0,
"selection": false,
"syntax_highlighter": "GDScript"
}
@@ -147,10 +147,10 @@ state={
state={
"bookmarks": PackedInt32Array(),
"breakpoints": PackedInt32Array(),
-"column": 38,
+"column": 31,
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
-"row": 21,
+"row": 2,
"scroll_position": 0.0,
"selection": false,
"syntax_highlighter": "GDScript"
@@ -165,7 +165,7 @@ state={
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
"row": 23,
-"scroll_position": 0.0,
+"scroll_position": 3.0,
"selection": false,
"syntax_highlighter": "GDScript"
}
@@ -178,8 +178,8 @@ state={
"column": 29,
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
-"row": 64,
-"scroll_position": 43.0,
+"row": 21,
+"scroll_position": 10.0,
"selection": false,
"syntax_highlighter": "GDScript"
}
diff --git a/scripts/Pawn.gd b/scripts/Pawn.gd
index 91c6b7115544dcd37805618a195fada8c5edd2b9..561e4d8350361faf16aee3c55cbb78e68eb9d06f 100644
--- a/scripts/Pawn.gd
+++ b/scripts/Pawn.gd
@@ -7,7 +7,6 @@ var Game = preload("res://scripts/game.gd")
var Upgrade = preload("res://scripts/Upgrade.gd").Upgrade
var tile_size = 64 # Make this global?...
-@onready var opponent_shader = load("res://shaders/BlackShader.shader")
func _ready():
diff --git a/scripts/game.gd b/scripts/game.gd
index fea54188ebf7b4f5355e3579e70aa6a3342ee451..2756dbd47aebc0c28d2fccb26c137f9c5068c381 100644
--- a/scripts/game.gd
+++ b/scripts/game.gd
@@ -28,7 +28,6 @@ var purchased_upgrades: Array = []
@onready var player_piece_count = 0
@onready var opponent_pieces = $OpponentPieces
@onready var opponent_piece_count = 0
-@onready var gold_display: Label = $GoldDisplay
var selected_piece
var selected_piece_value
@@ -95,21 +94,21 @@ func _ready() -> void:
#board[7][6]._my_init(true, Vector2(7, 6))
#board[7][7] = preload("res://scenes/Rook.tscn").instantiate()
#board[7][7]._my_init(true, Vector2(7, 7))
-#
- #board[0][4] = preload("res://scenes/Rook.tscn").instantiate()
- #board[0][4]._my_init(false, Vector2(0, 4))
- #board[1][5] = preload("res://scenes/Bishop.tscn").instantiate()
- #board[1][5]._my_init(false, Vector2(1, 5))
- #board[3][2] = preload("res://scenes/Queen.tscn").instantiate()
- #board[3][2]._my_init(false, Vector2(3, 2))
- #board[4][4] = preload("res://scenes/Assassin.tscn").instantiate()
- #board[4][4]._my_init(false, Vector2(4, 4))
- #board[3][4] = preload("res://scenes/Pawn.tscn").instantiate()
- #board[3][4]._my_init(false, Vector2(3, 4))
- #board[4][3] = preload("res://scenes/Mage.tscn").instantiate()
- #board[4][3]._my_init(false, Vector2(4, 3))
- #board[7][5] = preload("res://scenes/Rook.tscn").instantiate()
- #board[7][5]._my_init(false, Vector2(7, 5))
+
+ board[0][4] = preload("res://scenes/Rook.tscn").instantiate()
+ board[0][4]._my_init(false, Vector2(0, 4))
+ board[1][5] = preload("res://scenes/Bishop.tscn").instantiate()
+ board[1][5]._my_init(false, Vector2(1, 5))
+ board[3][2] = preload("res://scenes/Queen.tscn").instantiate()
+ board[3][2]._my_init(false, Vector2(3, 2))
+ board[4][4] = preload("res://scenes/Assassin.tscn").instantiate()
+ board[4][4]._my_init(false, Vector2(4, 4))
+ board[3][4] = preload("res://scenes/Pawn.tscn").instantiate()
+ board[3][4]._my_init(false, Vector2(3, 4))
+ board[4][3] = preload("res://scenes/Mage.tscn").instantiate()
+ board[4][3]._my_init(false, Vector2(4, 3))
+ board[7][5] = preload("res://scenes/Rook.tscn").instantiate()
+ board[7][5]._my_init(false, Vector2(7, 5))
#potential 'holes', not quite working yet
#board[3][3] = '/'