diff --git a/scenes/room.tscn b/scenes/room.tscn index 448d9a0..14e43d1 100644 --- a/scenes/room.tscn +++ b/scenes/room.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=58 format=4 uid="uid://157h04x0krfu"] +[gd_scene load_steps=60 format=4 uid="uid://157h04x0krfu"] [ext_resource type="PackedScene" uid="uid://bjufextny1icg" path="res://models/UndertakerAssets.glb" id="1_7dqbv"] [ext_resource type="ArrayMesh" uid="uid://iitrxdpdaq0i" path="res://models/ceiling.res" id="1_jn645"] @@ -40,6 +40,17 @@ [ext_resource type="Texture2D" uid="uid://cin2sxy6ypjji" path="res://screens/NO-contract.png" id="35_wkj6l"] [ext_resource type="Texture2D" uid="uid://cn7yi35kntfwt" path="res://screens/LAST-contract.png" id="36_ns543"] +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_frp7b"] +albedo_color = Color(0, 0, 0, 1) +emission_enabled = true +emission = Color(1, 1, 1, 1) + +[sub_resource type="CylinderMesh" id="CylinderMesh_yo4w0"] +material = SubResource("StandardMaterial3D_frp7b") +top_radius = 0.3 +bottom_radius = 0.3 +height = 0.01 + [sub_resource type="BoxShape3D" id="BoxShape3D_vfrn5"] size = Vector3(50, 1, 50) @@ -435,13 +446,17 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.5416596, 1.839902, 3.169823 mesh = ExtResource("17_vfrn5") skeleton = NodePath("") +[node name="MeshInstance3D" type="MeshInstance3D" parent="StaticLights/Lamp_Wall"] +transform = Transform3D(-0.3496993, 0.6291916, 0.69413865, -0.0051635574, 0.73961306, -0.6730125, -0.93684775, -0.2389362, -0.2553933, -0.896682, 0.60800326, -1.1865652) +mesh = SubResource("CylinderMesh_yo4w0") + [node name="SpotLight3D" type="SpotLight3D" parent="StaticLights/Lamp_Wall"] transform = Transform3D(-0.34056017, -0.696838, 0.6312177, -0.0052199676, 0.6727399, 0.7398605, -0.9402082, 0.2486721, -0.23274593, -0.9047221, 0.5877496, -1.1865652) -light_energy = 5.024 +light_energy = 3.101 shadow_enabled = true spot_range = 14.624 -spot_attenuation = 2.83 -spot_angle = 83.22 +spot_attenuation = 0.1 +spot_angle = 71.56 [node name="Collider" type="Node3D" parent="."] @@ -553,6 +568,16 @@ skeleton = NodePath("") [node name="CollisionShape3D" type="CollisionShape3D" parent="Button/Interactable"] shape = SubResource("SphereShape3D_ny2il") +[node name="Button2" type="MeshInstance3D" parent="."] +transform = Transform3D(1.0000001, 0, 0, 0, 0, -1, 0, 1.0000001, 0, 2.0780592, 1.1191651, 3.0866683) +mesh = ExtResource("25_2ftkj") +skeleton = NodePath("") + +[node name="Interactable" parent="Button2" instance=ExtResource("3_w68ji")] + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Button2/Interactable"] +shape = SubResource("SphereShape3D_ny2il") + [node name="Main_Screen" type="MeshInstance3D" parent="."] transform = Transform3D(1.292, 0, 0, 0, 1.292, 0, 0, 0, 0.809, 0, 2.5756757, 3.1311016) mesh = ExtResource("28_gjarb") @@ -719,6 +744,7 @@ skin = SubResource("Skin_cbukb") [connection signal="changed" from="Lever" to="CoffinOpenable" method="_on_lever_changed"] [connection signal="on_hit" from="Button/Interactable" to="CoffinSlideFire" method="_on_interactable_on_hit"] +[connection signal="on_hit" from="Button2/Interactable" to="CoffinSlideFire" method="_on_interactable_on_hit"] [editable path="UndertakerAssets"] [editable path="Character"]