fix most dependencies

13 files changed, 48 insertions, 77 deletions

diff --git a/client/game.tscn b/client/game.tscn
index f5c3c0c4..1f37d170 100644
--- a/client/game.tscn
+++ b/client/game.tscn
@@ -1,40 +1,25 @@
-[gd_scene load_steps=6 format=3 uid="uid://clsylbmw7jc0s"]
-[gd_scene load_steps=7 format=3 uid="uid://clsylbmw7jc0s"]
+[gd_scene load_steps=6 format=3 uid="uid://c6krh36hoqfg8"]
 
-[ext_resource type="Script" path="res://scripts/game.gd" id="1_qnslj"]
-[ext_resource type="PackedScene" uid="uid://bnqujofthaa4h" path="res://scenes/map.tscn" id="1_qt88a"]
-[ext_resource type="PackedScene" uid="uid://b31mlnao6ybt8" path="res://scenes/follow_camera.tscn" id="3_6ot70"]
-[ext_resource type="PackedScene" uid="uid://c0euiv7duqfp4" path="res://scenes/marker.tscn" id="5_idjm3"]
+[ext_resource type="PackedScene" uid="uid://cs8gxa22c6joh" path="res://map/map.tscn" id="1_ex12v"]
+[ext_resource type="PackedScene" uid="uid://b31mlnao6ybt8" path="res://player/follow_camera.tscn" id="2_s8y6o"]
 
-[sub_resource type="PhysicalSkyMaterial" id="PhysicalSkyMaterial_ko0bu"]
+[sub_resource type="PhysicalSkyMaterial" id="PhysicalSkyMaterial_mvn2w"]
 
-[sub_resource type="Sky" id="Sky_bqb2d"]
-sky_material = SubResource("PhysicalSkyMaterial_ko0bu")
+[sub_resource type="Sky" id="Sky_ultpf"]
+sky_material = SubResource("PhysicalSkyMaterial_mvn2w")
 
-[sub_resource type="Environment" id="Environment_h880f"]
+[sub_resource type="Environment" id="Environment_m4dli"]
 background_mode = 2
-background_energy_multiplier = 2.0
-sky = SubResource("Sky_bqb2d")
-tonemap_mode = 2
-ssao_enabled = true
-sdfgi_enabled = true
-glow_enabled = true
+sky = SubResource("Sky_ultpf")
 
 [node name="Game" type="Node3D"]
-script = ExtResource("1_qnslj")
 
-[node name="Map" parent="." instance=ExtResource("1_qt88a")]
+[node name="Map" parent="." instance=ExtResource("1_ex12v")]
 
-[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
-transform = Transform3D(0.951635, -0.266538, 0.152804, -0.154443, 0.0149305, 0.987889, -0.265591, -0.963709, -0.0269565, 0, 0, 0)
-shadow_enabled = true
+[node name="FollowCamera" parent="." instance=ExtResource("2_s8y6o")]
 
 [node name="WorldEnvironment" type="WorldEnvironment" parent="."]
-environment = SubResource("Environment_h880f")
-
-[node name="FollowCamera" parent="." node_paths=PackedStringArray("target") instance=ExtResource("3_6ot70")]
-transform = Transform3D(0.894934, 0.084374, -0.438148, 0, 0.981959, 0.189095, 0.446198, -0.169228, 0.878789, 0, 3.65756, 11.0189)
-target = NodePath("../Map")
+environment = SubResource("Environment_m4dli")
 
-[node name="Marker" parent="." instance=ExtResource("5_idjm3")]
-visible = false
+[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 0.258819, 0.965926, 0, -0.965926, 0.258819, 0, 0, 0)
diff --git a/client/map/item.gd b/client/map/item.gd
index 74e08c48..757019c9 100644
--- a/client/map/item.gd
+++ b/client/map/item.gd
@@ -18,7 +18,7 @@ extends Node3D
 
 var owned_by: Node3D
 
-var progress_instance: ProgressBar3D = preload("res://scenes/progress.tscn").instantiate()
+var progress_instance: ProgressBar3D = preload("res://map/progress.tscn").instantiate()
 
 func _init(idx: int, owned_by_: Node3D):
 	progress_instance.position.y = 2.
diff --git a/client/map/map.gd b/client/map/map.gd
index b5e519a6..1155a70c 100644
--- a/client/map/map.gd
+++ b/client/map/map.gd
@@ -15,7 +15,6 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 # 
-@tool
 class_name Map
 extends Node3D
 
diff --git a/client/map/map.tscn b/client/map/map.tscn
new file mode 100644
index 00000000..66e2c63a
--- /dev/null
+++ b/client/map/map.tscn
@@ -0,0 +1,6 @@
+[gd_scene load_steps=2 format=3 uid="uid://cs8gxa22c6joh"]
+
+[ext_resource type="Script" path="res://map/map.gd" id="1_stp8c"]
+
+[node name="Map" type="Node3D"]
+script = ExtResource("1_stp8c")
diff --git a/client/map/progress.tscn b/client/map/progress.tscn
index 273beb74..19b72af3 100644
--- a/client/map/progress.tscn
+++ b/client/map/progress.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=5 format=3 uid="uid://4ewufm6tqhpb"]
 
-[ext_resource type="Shader" path="res://textures/progress.gdshader" id="1_6f2a0"]
-[ext_resource type="Script" path="res://scripts/progress.gd" id="2_bb3u3"]
+[ext_resource type="Shader" path="res://map/progress.gdshader" id="1_6f2a0"]
+[ext_resource type="Script" path="res://map/progress.gd" id="2_bb3u3"]
 
 [sub_resource type="QuadMesh" id="QuadMesh_m0itj"]
 size = Vector2(0.75, 0.1)
diff --git a/client/menu/credits_menu.tscn b/client/menu/credits_menu.tscn
index 65035329..e3cfa5b4 100644
--- a/client/menu/credits_menu.tscn
+++ b/client/menu/credits_menu.tscn
@@ -1,9 +1,8 @@
-[gd_scene load_steps=6 format=3 uid="uid://7mqbxa054bjv"]
+[gd_scene load_steps=5 format=3 uid="uid://7mqbxa054bjv"]
 
-[ext_resource type="PackedScene" uid="uid://bgt88u55bndd3" path="res://scenes/menu_background.tscn" id="1_5ay7o"]
-[ext_resource type="Script" path="res://scripts/credits_menu.gd" id="1_igs63"]
-[ext_resource type="PackedScene" uid="uid://ds1njrptrpdco" path="res://scenes/menu_background_scene.tscn" id="2_k0853"]
-[ext_resource type="PackedScene" uid="uid://bg2d78ycorcqk" path="res://scenes/scene_transition.tscn" id="4_fbbdb"]
+[ext_resource type="Script" path="res://menu/credits_menu.gd" id="1_igs63"]
+[ext_resource type="PackedScene" uid="uid://l4vm07dtda4j" path="res://menu/menu_background.tscn" id="2_k0853"]
+[ext_resource type="PackedScene" uid="uid://bg2d78ycorcqk" path="res://menu/scene_transition.tscn" id="4_fbbdb"]
 
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_p2qmw"]
 bg_color = Color(0, 0, 0, 0.576471)
@@ -17,17 +16,9 @@ grow_horizontal = 2
 grow_vertical = 2
 script = ExtResource("1_igs63")
 
-[node name="MenuBackground" parent="." instance=ExtResource("1_5ay7o")]
-layout_mode = 1
+[node name="MenuBackground" parent="." instance=ExtResource("2_k0853")]
 script = null
 
-[node name="background_view2" type="SubViewport" parent="MenuBackground"]
-handle_input_locally = false
-size = Vector2i(1152, 648)
-render_target_update_mode = 4
-
-[node name="scene" parent="MenuBackground/background_view2" instance=ExtResource("2_k0853")]
-
 [node name="Panel" type="Panel" parent="."]
 layout_mode = 1
 anchors_preset = 15
@@ -78,6 +69,5 @@ text = "Back"
 
 [node name="SceneTransition" parent="." instance=ExtResource("4_fbbdb")]
 layout_mode = 1
-color = Color(0, 0, 0, 1)
 
 [connection signal="pressed" from="Panel/back" to="." method="_on_back_pressed"]
diff --git a/client/menu/main_menu.tscn b/client/menu/main_menu.tscn
index ea9b31fb..7b0f9c20 100644
--- a/client/menu/main_menu.tscn
+++ b/client/menu/main_menu.tscn
@@ -1,10 +1,8 @@
-[gd_scene load_steps=7 format=3 uid="uid://dbj8508whxgwv"]
+[gd_scene load_steps=5 format=3 uid="uid://dbj8508whxgwv"]
 
-[ext_resource type="Theme" uid="uid://cnhhreuc4shxv" path="res://scenes/theme.tres" id="1_rmwly"]
-[ext_resource type="Script" path="res://scripts/main_menu.gd" id="2_qot2j"]
-[ext_resource type="PackedScene" uid="uid://bgt88u55bndd3" path="res://scenes/menu_background.tscn" id="3_f3j3x"]
-[ext_resource type="PackedScene" uid="uid://ds1njrptrpdco" path="res://scenes/menu_background_scene.tscn" id="4_ydj5p"]
-[ext_resource type="PackedScene" uid="uid://bg2d78ycorcqk" path="res://scenes/scene_transition.tscn" id="5_651nk"]
+[ext_resource type="Script" path="res://menu/main_menu.gd" id="2_qot2j"]
+[ext_resource type="PackedScene" uid="uid://l4vm07dtda4j" path="res://menu/menu_background.tscn" id="4_ydj5p"]
+[ext_resource type="PackedScene" uid="uid://bg2d78ycorcqk" path="res://menu/scene_transition.tscn" id="5_651nk"]
 
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_d8o0f"]
 bg_color = Color(0, 0, 0, 0.329412)
@@ -16,20 +14,11 @@ anchor_right = 1.0
 anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
-theme = ExtResource("1_rmwly")
 script = ExtResource("2_qot2j")
 
-[node name="MenuBackground" parent="." instance=ExtResource("3_f3j3x")]
-layout_mode = 1
+[node name="MenuBackground" parent="." instance=ExtResource("4_ydj5p")]
 script = null
 
-[node name="background_view2" type="SubViewport" parent="MenuBackground"]
-handle_input_locally = false
-size = Vector2i(1152, 648)
-render_target_update_mode = 4
-
-[node name="scene" parent="MenuBackground/background_view2" instance=ExtResource("4_ydj5p")]
-
 [node name="side" type="PanelContainer" parent="."]
 layout_mode = 1
 anchors_preset = 9
diff --git a/client/menu/menu_background.gd b/client/menu/menu_background.gd
index e5b8ac31..49a1e628 100644
--- a/client/menu/menu_background.gd
+++ b/client/menu/menu_background.gd
@@ -14,11 +14,9 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 # 
-@tool
 extends Node3D
 
 @onready var map = $map
-@onready var voxel_gi: VoxelGI = $VoxelGI
 
 const NULLS = [null,null,null,null]
 const BUCKETS = [[], ["floor","floor","floor","floor","tomato-crate", "raw-steak-crate"], ["table", "chair", "counter"], ["sink", "stove"]]
@@ -32,4 +30,3 @@ func _ready():
 			if bucket.size() == 0: continue
 			var tile = bucket[randi() % bucket.size()]
 			map.update([x,y], tile, NULLS)
-	voxel_gi.bake()
diff --git a/client/menu/menu_background.tscn b/client/menu/menu_background.tscn
new file mode 100644
index 00000000..89f5c8b9
--- /dev/null
+++ b/client/menu/menu_background.tscn
@@ -0,0 +1,9 @@
+[gd_scene load_steps=3 format=3 uid="uid://l4vm07dtda4j"]
+
+[ext_resource type="Script" path="res://menu/menu_background.gd" id="1_ijsg0"]
+[ext_resource type="PackedScene" uid="uid://cs8gxa22c6joh" path="res://map/map.tscn" id="2_eg8f5"]
+
+[node name="MenuBackground" type="Node3D"]
+script = ExtResource("1_ijsg0")
+
+[node name="Map" parent="." instance=ExtResource("2_eg8f5")]
diff --git a/client/menu/scene_transition.tscn b/client/menu/scene_transition.tscn
index 0865dddf..df21d242 100644
--- a/client/menu/scene_transition.tscn
+++ b/client/menu/scene_transition.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=6 format=3 uid="uid://bg2d78ycorcqk"]
 
-[ext_resource type="Script" path="res://scripts/scene_transition.gd" id="1_c2vxm"]
+[ext_resource type="Script" path="res://menu/scene_transition.gd" id="1_fpbwj"]
 
 [sub_resource type="Animation" id="Animation_xgn2a"]
 length = 0.001
@@ -62,7 +62,7 @@ grow_horizontal = 2
 grow_vertical = 2
 mouse_filter = 2
 color = Color(0, 0, 0, 1)
-script = ExtResource("1_c2vxm")
+script = ExtResource("1_fpbwj")
 
 [node name="animation" type="AnimationPlayer" parent="."]
 libraries = {
diff --git a/client/player/follow_camera.tscn b/client/player/follow_camera.tscn
index 816563ba..015c2727 100644
--- a/client/player/follow_camera.tscn
+++ b/client/player/follow_camera.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=3 uid="uid://b31mlnao6ybt8"]
 
-[ext_resource type="Script" path="res://scripts/follow_camera.gd" id="1_qipju"]
+[ext_resource type="Script" path="res://player/follow_camera.gd" id="1_qipju"]
 
 [node name="FollowCamera" type="Camera3D"]
 fov = 45.0
diff --git a/client/player/marker.tscn b/client/player/marker.tscn
index 7f21e199..9a68e1c1 100644
--- a/client/player/marker.tscn
+++ b/client/player/marker.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=7 format=3 uid="uid://c0euiv7duqfp4"]
 
-[ext_resource type="Script" path="res://scripts/marker.gd" id="1_3njdu"]
-[ext_resource type="Shader" path="res://textures/interact_marker.gdshader" id="2_dejwy"]
+[ext_resource type="Script" path="res://player/marker.gd" id="1_3njdu"]
+[ext_resource type="Shader" path="res://player/interact_marker.gdshader" id="2_dejwy"]
 
 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_o4v68"]
 
diff --git a/client/project.godot b/client/project.godot
index 61b5fd34..6c0f62d3 100644
--- a/client/project.godot
+++ b/client/project.godot
@@ -11,17 +11,13 @@ config_version=5
 [application]
 
 config/name="undercooked"
-run/main_scene="res://scenes/socket_test.tscn"
+run/main_scene="res://game.tscn"
 config/features=PackedStringArray("4.2", "Forward Plus")
 config/icon="res://icon.svg"
 
 [autoload]
 
-Multiplayer="*res://scripts/multiplayer.gd"
-
-[gui]
-
-theme/custom="res://themes/menu.tres"
+Multiplayer="*res://multiplayer.gd"
 
 [input]