5 files changed, 21 insertions, 36 deletions
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 = {