From 30c95990bef18bc2fa938b381439eae37005b832 Mon Sep 17 00:00:00 2001 From: "s0wlz (Matthias Puchstein)" Date: Thu, 16 Apr 2026 00:14:03 +0200 Subject: [PATCH] feat: add candle lights to taproom and room lights to upper floor (Schritt 7) --- ruf-der-pilze/scenes/taproom.tscn | 26 ++++++++++++++++++++++++-- ruf-der-pilze/scenes/tavern.tscn | 21 ++++++++++++++++++++- 2 files changed, 44 insertions(+), 3 deletions(-) diff --git a/ruf-der-pilze/scenes/taproom.tscn b/ruf-der-pilze/scenes/taproom.tscn index 3cf2816..816f94e 100644 --- a/ruf-der-pilze/scenes/taproom.tscn +++ b/ruf-der-pilze/scenes/taproom.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=22 format=3] +[gd_scene load_steps=25 format=3] [sub_resource type="StandardMaterial3D" id="Material_wood"] albedo_color = Color(0.169, 0.102, 0.051, 1) @@ -42,8 +42,9 @@ size = Vector3(4, 1.1, 0.3) [sub_resource type="Environment" id="Environment_1"] background_mode = 1 background_color = Color(0.102, 0.059, 0, 1) -ambient_light_color = Color(0.6, 0.35, 0.1, 1) +ambient_light_color = Color(0.15, 0.10, 0.06, 1) ambient_light_energy = 0.4 +ambient_light_sky_contribution = 0.0 fog_enabled = true fog_light_color = Color(0.102, 0.059, 0, 1) fog_density = 0.05 @@ -116,5 +117,26 @@ light_color = Color(0.91, 0.643, 0.29, 1) light_energy = 1.2 omni_range = 10.0 +[node name="CandleTable1" type="OmniLight3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2, 1.0, 1) +light_color = Color(1.0, 0.65, 0.2, 1) +light_energy = 0.8 +shadow_enabled = true +omni_range = 5.0 + +[node name="CandleTable2" type="OmniLight3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1.0, 2) +light_color = Color(1.0, 0.65, 0.2, 1) +light_energy = 0.8 +shadow_enabled = true +omni_range = 5.0 + +[node name="BarLight" type="OmniLight3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4, 1.5, -3) +light_color = Color(0.95, 0.60, 0.25, 1) +light_energy = 1.0 +shadow_enabled = true +omni_range = 6.0 + [node name="WorldEnvironment" type="WorldEnvironment" parent="."] environment = SubResource("Environment_1") diff --git a/ruf-der-pilze/scenes/tavern.tscn b/ruf-der-pilze/scenes/tavern.tscn index 7c438e3..b9a8ba0 100644 --- a/ruf-der-pilze/scenes/tavern.tscn +++ b/ruf-der-pilze/scenes/tavern.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=28 format=3] +[gd_scene load_steps=31 format=3] [ext_resource type="Script" path="res://scripts/tavern.gd" id="1"] [ext_resource type="PackedScene" path="res://scenes/taproom.tscn" id="2"] @@ -400,3 +400,22 @@ surface_material_override/0 = SubResource("Material_myzel") transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.06, 1.2) mesh = SubResource("BoxMesh_myzel_trail_anna") surface_material_override/0 = SubResource("Material_myzel") + +[node name="CorridorLight" type="OmniLight3D" parent="UpperFloor"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 4.5, 0) +light_color = Color(0.7, 0.55, 0.3, 1) +light_energy = 1.5 +shadow_enabled = true +omni_range = 12.0 + +[node name="RoomLightA" type="OmniLight3D" parent="UpperFloor"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3, 4.2, -2) +light_color = Color(0.8, 0.6, 0.3, 1) +light_energy = 0.6 +omni_range = 8.0 + +[node name="RoomLightB" type="OmniLight3D" parent="UpperFloor"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3, 4.2, -2) +light_color = Color(0.8, 0.6, 0.3, 1) +light_energy = 0.6 +omni_range = 8.0