diff --git a/scenes/room.tscn b/scenes/room.tscn index 7ad1a3b..eef0dba 100644 --- a/scenes/room.tscn +++ b/scenes/room.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=89 format=4 uid="uid://157h04x0krfu"] +[gd_scene load_steps=91 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://c5hhygnuya8m4" path="res://models/ceiling.res" id="1_jn645"] @@ -199,12 +199,12 @@ shadow_mesh = SubResource("ArrayMesh_mwhaa") animation = &"ArmatureAction" [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_g8dr5"] -animation = &"Weird Pos" +animation = &"ArmatureAction" [sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_xtec0"] [sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_xcuph"] -graph_offset = Vector2(-753.6569, 63.098648) +graph_offset = Vector2(-492, 145) nodes/Animation/node = SubResource("AnimationNodeAnimation_g8dr5") nodes/Animation/position = Vector2(-200, 120) nodes/Blend2/node = SubResource("AnimationNodeBlend2_xtec0") @@ -527,6 +527,13 @@ _surfaces = [{ blend_shape_mode = 0 shadow_mesh = SubResource("ArrayMesh_182te") +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_11at7"] +albedo_color = Color(0, 0, 0, 1) + +[sub_resource type="BoxMesh" id="BoxMesh_gmm1g"] +material = SubResource("StandardMaterial3D_11at7") +size = Vector3(1, 1, 1.79) + [node name="BlockoutRoom" type="Node3D"] [node name="UndertakerAssets" parent="." instance=ExtResource("1_7dqbv")] @@ -728,7 +735,7 @@ visible = false [node name="AnimationTree" type="AnimationTree" parent="CoffinSwitcher/CoffinOpenable/AnimatedBody"] tree_root = SubResource("AnimationNodeBlendTree_xcuph") anim_player = NodePath("../AnimationPlayer") -parameters/Blend2/blend_amount = 1.0 +parameters/Blend2/blend_amount = 0.0 script = ExtResource("2_wkj6l") [node name="StaticBody3D" type="StaticBody3D" parent="CoffinSwitcher/CoffinOpenable"] @@ -1217,6 +1224,10 @@ transform = Transform3D(0.007920849, 0, 0.018364644, -0.0004188899, -0.019994793 [node name="RubberDuck6" parent="Ducks" instance=ExtResource("50_11at7")] transform = Transform3D(-0.007914604, -0.00079391425, -0.018350165, -0.0007332326, 0.019979035, -0.00054813805, 0.018352695, 0.00045583246, -0.007935416, -2.7111254, 0.44037727, -0.07791658) +[node name="MeshInstance3D" type="MeshInstance3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.1297956, 1.00343, 2.6191468) +mesh = SubResource("BoxMesh_gmm1g") + [connection signal="changed" from="Lever" to="CoffinSwitcher/CoffinOpenable" method="_on_lever_changed"] [connection signal="on_hit" from="Button/Interactable" to="CoffinSwitcher/CoffinSlideFire" method="_on_interactable_on_hit"] [connection signal="on_hit" from="Button2/Interactable" to="CoffinSwitcher/CoffinSlideFire" method="_on_interactable_on_hit"]