Redesign character menu background

5 files changed, 49 insertions, 20 deletions

diff --git a/client/gui/menus/character.tscn b/client/gui/menus/character.tscn
index 92a29690..0fc53f46 100644
--- a/client/gui/menus/character.tscn
+++ b/client/gui/menus/character.tscn
@@ -31,6 +31,44 @@ fov = 40.0
 
 [node name="KitchenBackground" parent="Node3D" instance=ExtResource("4_oanna")]
 
+[node name="SpotLight3D" type="SpotLight3D" parent="Node3D"]
+transform = Transform3D(0.8825786, -0.13509111, 0.4503392, 0, 0.9578325, 0.2873271, -0.47016487, -0.25358877, 0.8453625, 1.1277027, 1.109924, 2.02365)
+light_color = Color(0.87094337, 0.86437446, 0.85403997, 1)
+light_energy = 1.5
+shadow_enabled = true
+shadow_blur = 3.0
+
+[node name="SpotLight3D2" type="SpotLight3D" parent="Node3D"]
+transform = Transform3D(0.9149456, 0.11595869, -0.3865594, 0, 0.9578325, 0.28732717, 0.40357724, -0.2628887, 0.87636465, -1.2921853, 1.109924, 2.02365)
+light_color = Color(0.87094337, 0.86437446, 0.85403997, 1)
+light_energy = 0.8
+shadow_enabled = true
+shadow_blur = 3.0
+
+[node name="SpotLight3D5" type="SpotLight3D" parent="Node3D"]
+transform = Transform3D(0.99089444, -0.009957474, -0.13427223, 0.029642614, -0.95665854, 0.2896995, -0.13133734, -0.29104182, -0.94765246, -0.27793396, 1.5702409, -1.0504578)
+light_color = Color(0.6709639, 0.8500128, 1, 1)
+light_energy = 5.0
+spot_range = 1.9395764
+spot_angle = 25.84634
+
+[node name="SpotLight3D4" type="SpotLight3D" parent="Node3D"]
+transform = Transform3D(0.9139213, -0.3175812, 0.2527643, -0.093218885, -0.77032155, -0.63080496, 0.39504167, 0.5529437, -0.73361796, 1.0089738, 0.124474704, -1.4214872)
+light_color = Color(0.7758381, 0.7974717, 1, 1)
+light_energy = 5.0
+
+[node name="OmniLight3D3" type="OmniLight3D" parent="Node3D"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.6456945, 0.76124895, 0.72990704)
+light_color = Color(0.84705883, 0.5019608, 0.43529412, 1)
+light_energy = 0.75
+omni_range = 6.4840736
+
+[node name="OmniLight3D4" type="OmniLight3D" parent="Node3D"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.5320137, 0.48659694, 0.6924461)
+light_color = Color(0.5875623, 0.58040434, 0.8120325, 1)
+light_energy = 0.75
+omni_range = 6.071165
+
 [node name="VBoxContainer" type="VBoxContainer" parent="."]
 layout_mode = 1
 anchors_preset = 15
diff --git a/client/gui/menus/setup/setup.tscn b/client/gui/menus/setup/setup.tscn
index 0c2ba0d9..004cea41 100644
--- a/client/gui/menus/setup/setup.tscn
+++ b/client/gui/menus/setup/setup.tscn
@@ -391,5 +391,10 @@ volume_db = -16.0
 transform = Transform3D(1, 0, 0, 0, 0.9781476, 0.2079117, 0, -0.2079117, 0.9781476, 0, 1.125, 2.75)
 fov = 40.0
 
+[node name="OmniLight3D" type="OmniLight3D" parent="KitchenBackground"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.9320438, 1.5322332, 4.4919252)
+light_color = Color(0.91730624, 0.87936515, 0.8454916, 1)
+omni_range = 16.873302
+
 [connection signal="pressed" from="ScrollContainer/Control/TextureRect/PaperMargin/Contents/Signatures/EmployeeMargin/Sign/Signature" to="." method="_on_sign_pressed"]
 [connection signal="pressed" from="Back" to="." method="_on_back_pressed"]
diff --git a/client/map/kitchen_background.gd b/client/map/kitchen_background.gd
index 4b728a94..ff237b85 100644
--- a/client/map/kitchen_background.gd
+++ b/client/map/kitchen_background.gd
@@ -13,6 +13,7 @@
 # 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 = $Map
diff --git a/client/map/kitchen_background.tscn b/client/map/kitchen_background.tscn
index af046095..6263ebbb 100644
--- a/client/map/kitchen_background.tscn
+++ b/client/map/kitchen_background.tscn
@@ -13,23 +13,5 @@ script = ExtResource("1_ppf8f")
 [node name="Map" parent="." instance=ExtResource("1_heqla")]
 transform = Transform3D(0.866025, 0, 0.5, 0, 1, 0, -0.5, 0, 0.866025, 0, 0, 0)
 
-[node name="SpotLight3D" type="SpotLight3D" parent="."]
-transform = Transform3D(0.63153476, -0.57124585, 0.52425385, 0.042865384, 0.700843, 0.71202654, -0.7741617, -0.42719722, 0.46709338, 1.79161, 3.07541, 1.58055)
-light_energy = 2.689
-spot_range = 20.159
-spot_angle = 17.9256
-
-[node name="SpotLight3D2" type="SpotLight3D" parent="."]
-transform = Transform3D(0.32456997, 0.109091125, -0.93954957, 0.060483694, 0.9888999, 0.13571544, 0.94392586, -0.100876585, 0.314369, -5.22608, 2.10824, 2.35824)
-light_energy = 2.689
-spot_range = 20.159
-spot_angle = 17.9256
-
-[node name="SpotLight3D3" type="SpotLight3D" parent="."]
-transform = Transform3D(0.11408793, -0.017399698, 0.99331826, 0.061045162, 0.9980801, 0.010471746, -0.9915934, 0.059442576, 0.114931054, 8.10732, 0.437069, 2.35824)
-light_energy = 2.689
-spot_range = 20.159
-spot_angle = 17.9256
-
 [node name="WorldEnvironment" type="WorldEnvironment" parent="."]
 environment = SubResource("Environment_ex25y")
diff --git a/client/map/map.gd b/client/map/map.gd
index 235425a0..7f854c25 100644
--- a/client/map/map.gd
+++ b/client/map/map.gd
@@ -13,6 +13,7 @@
 # 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
 
@@ -54,7 +55,8 @@ func clear_tile(pos: Vector2i):
 @onready var voxelgi: VoxelGI = $VoxelGI
 
 func _ready():
-	Settings.hook_changed("graphics.gi", false, apply_gi_setting)
+	if not Engine.is_editor_hint():
+		Settings.hook_changed("graphics.gi", false, apply_gi_setting)
 	floor_node.material_override = preload("res://map/tiles/floor_material.tres")
 	for fm in tile_factory.floor_meshers.values():
 		add_child(fm.mesh_instance)
@@ -73,7 +75,8 @@ func apply_gi_setting(state):
 		voxelgi.data = null
 
 func gi_bake():
-	if Settings.read("graphics.gi") != "voxelgi": return
+	if not Engine.is_editor_hint():
+		if Settings.read("graphics.gi") != "voxelgi": return
 	print("Map: Rebaking VoxelGI")
 	currently_baked = true
 	gi_bake_blocking()