aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--client/map/auto_setup/light_setup.gd6
-rw-r--r--client/map/items/food_processor.resbin23956 -> 23958 bytes
-rw-r--r--client/map/tiles/freezer.tscn6
-rw-r--r--client/map/tiles/oven.tscn5
4 files changed, 14 insertions, 3 deletions
diff --git a/client/map/auto_setup/light_setup.gd b/client/map/auto_setup/light_setup.gd
index f583b6a5..1e256dae 100644
--- a/client/map/auto_setup/light_setup.gd
+++ b/client/map/auto_setup/light_setup.gd
@@ -13,14 +13,18 @@
# 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/>.
#
-extends DirectionalLight3D
+extends Light3D
class_name LightSetup
+@export var completely_disable_light_if_shadows_disabled := false
+
func _ready():
apply_settings()
Global.settings_changed.connect(apply_settings)
func apply_settings():
+ if completely_disable_light_if_shadows_disabled:
+ visible = Global.get_setting("shadows")
shadow_enabled = Global.get_setting("shadows")
func set_sky(sky_name: String):
diff --git a/client/map/items/food_processor.res b/client/map/items/food_processor.res
index cd56088a..726a7868 100644
--- a/client/map/items/food_processor.res
+++ b/client/map/items/food_processor.res
Binary files differ
diff --git a/client/map/tiles/freezer.tscn b/client/map/tiles/freezer.tscn
index 1da75fad..bacef6f8 100644
--- a/client/map/tiles/freezer.tscn
+++ b/client/map/tiles/freezer.tscn
@@ -1,8 +1,9 @@
-[gd_scene load_steps=7 format=3 uid="uid://ch753p32b3jl8"]
+[gd_scene load_steps=8 format=3 uid="uid://ch753p32b3jl8"]
[ext_resource type="Script" path="res://map/tiles/freezer_model.gd" id="1_kso20"]
[ext_resource type="ArrayMesh" uid="uid://cbdalq2gofyu8" path="res://map/tiles/freezer_base.res" id="2_akcb5"]
[ext_resource type="ArrayMesh" uid="uid://yknstw5duuot" path="res://map/tiles/freezer_door.res" id="3_0pgw0"]
+[ext_resource type="Script" path="res://map/auto_setup/light_setup.gd" id="4_1eu4t"]
[sub_resource type="Animation" id="Animation_33bww"]
length = 0.001
@@ -58,16 +59,19 @@ skeleton = NodePath("")
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.25, 0)
light_color = Color(0.566816, 0.801037, 0.838352, 1)
shadow_enabled = true
+script = ExtResource("4_1eu4t")
[node name="OmniLight3D2" type="OmniLight3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.6, 0)
light_color = Color(0.566816, 0.801037, 0.838352, 1)
shadow_enabled = true
+script = ExtResource("4_1eu4t")
[node name="OmniLight3D3" type="OmniLight3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.9, 0)
light_color = Color(0.566816, 0.801037, 0.838352, 1)
shadow_enabled = true
+script = ExtResource("4_1eu4t")
[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
libraries = {
diff --git a/client/map/tiles/oven.tscn b/client/map/tiles/oven.tscn
index b512d261..053d02de 100644
--- a/client/map/tiles/oven.tscn
+++ b/client/map/tiles/oven.tscn
@@ -1,9 +1,10 @@
-[gd_scene load_steps=9 format=3 uid="uid://bil6eip7uwqvs"]
+[gd_scene load_steps=10 format=3 uid="uid://bil6eip7uwqvs"]
[ext_resource type="Script" path="res://map/tiles/oven_model.gd" id="1_3v43w"]
[ext_resource type="ArrayMesh" uid="uid://blc1q50d5ky86" path="res://map/tiles/oven_base.res" id="1_d1hwl"]
[ext_resource type="ArrayMesh" uid="uid://blb5oew3sh7ek" path="res://map/tiles/oven_door.res" id="2_i5vso"]
[ext_resource type="Script" path="res://audio/play_random.gd" id="4_3hvts"]
+[ext_resource type="Script" path="res://map/auto_setup/light_setup.gd" id="4_hjc80"]
[ext_resource type="AudioStream" uid="uid://dkwpv708ihh4c" path="res://map/tiles/sounds/ding.ogg" id="5_d43p4"]
[sub_resource type="Animation" id="Animation_yo2v1"]
@@ -63,6 +64,8 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.7, 0)
light_color = Color(0.944743, 0.70243, 0.38641, 1)
light_energy = 2.0
shadow_enabled = true
+script = ExtResource("4_hjc80")
+completely_disable_light_if_shadows_disabled = true
[node name="Ding" type="Node3D" parent="."]
script = ExtResource("4_3hvts")