diff --git a/Kamer.tscn b/Kamer.tscn index 7f2b844..798f6a6 100644 --- a/Kamer.tscn +++ b/Kamer.tscn @@ -6,7 +6,6 @@ [ext_resource type="PackedScene" uid="uid://4o2ljtcup5bo" path="res://Player.tscn" id="3_l7pp6"] [ext_resource type="PackedScene" uid="uid://bmuy4jimpch1i" path="res://Objects/ladekast.tscn" id="4_23v8p"] [ext_resource type="PackedScene" uid="uid://cpjo05ataob66" path="res://Objects/Painting.tscn" id="5_jk1xx"] -[ext_resource type="PackedScene" uid="uid://2wem3a0y4agb" path="res://Objects/Safe.tscn" id="6_3qx7f"] [ext_resource type="PackedScene" uid="uid://b5rve73suh7fc" path="res://Objects/lichtkastje.tscn" id="7_ahvul"] [ext_resource type="Shader" path="res://Shaders/Blacklight.gdshader" id="8_oclf0"] [ext_resource type="PackedScene" uid="uid://bm3d233ul4asx" path="res://Objects/Slot.tscn" id="9_pjl12"] @@ -19,6 +18,7 @@ [ext_resource type="AudioStream" uid="uid://csa4bd0pvp5as" path="res://Audio/pianomuziek.mp3" id="17_1cw2k"] [ext_resource type="FontFile" uid="uid://ba6teo1asddxo" path="res://Fonts/Galimer-ExtraLight.ttf" id="17_7yj1s"] [ext_resource type="PackedScene" uid="uid://d2run4kti7u53" path="res://GUI.tscn" id="19_3ubs2"] +[ext_resource type="PackedScene" uid="uid://bf6uq6xpt0xnc" path="res://Objects/ornate_safe.tscn" id="20_vp2w2"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_4hp81"] transparency = 1 @@ -59,13 +59,6 @@ tonemap_mode = 3 ssao_enabled = true volumetric_fog_density = 0.1529 -[sub_resource type="CapsuleMesh" id="CapsuleMesh_0such"] -height = 3.703 - -[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_tup4d"] -radius = 0.8 -height = 4.5 - [sub_resource type="ShaderMaterial" id="ShaderMaterial_fipcs"] render_priority = 0 shader = ExtResource("8_oclf0") @@ -77,6 +70,13 @@ depth = 0.01 [sub_resource type="BoxShape3D" id="BoxShape3D_r22qf"] +[sub_resource type="CapsuleMesh" id="CapsuleMesh_0such"] +height = 3.703 + +[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_tup4d"] +radius = 0.8 +height = 4.5 + [node name="kamer" instance=ExtResource("1_50aco")] script = ExtResource("2_m2v8w") @@ -169,36 +169,20 @@ transform = Transform3D(-0.4, 0, -3.49691e-08, 0, 0.4, 0, 3.49691e-08, 0, -0.4, [node name="Painting" parent="." index="8" instance=ExtResource("5_jk1xx")] transform = Transform3D(1.19249e-08, 0, -1, 0, 1, 0, 1, 0, 1.19249e-08, 1.969, 0.214, 0.67903) -[node name="FlashLight" type="MeshInstance3D" parent="." index="9"] -transform = Transform3D(0.0965925, -0.0258819, -1.13134e-09, 0, -4.37114e-09, 0.1, -0.0258819, -0.0965925, -4.2222e-09, -1.21576, -0.391011, -1.00824) -mesh = SubResource("CapsuleMesh_0such") -skeleton = NodePath("../safe") - -[node name="FlashLight" type="StaticBody3D" parent="FlashLight" index="0"] -transform = Transform3D(1, 0, 8.88178e-16, 0, 1, 7.10543e-15, 0, 0, 1, 0, 0, 0) -collision_layer = 2 - -[node name="CollisionShape3D" type="CollisionShape3D" parent="FlashLight/FlashLight" index="0"] -transform = Transform3D(1, 0, 8.88178e-16, 0, 1, -7.10543e-15, 0, 0, 1, 0, 0, 0) -shape = SubResource("CapsuleShape3D_tup4d") - -[node name="safe" parent="." index="10" instance=ExtResource("6_3qx7f")] -transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, -1.50079, -0.0682462, -1.05664) - -[node name="lichtkastje" parent="." index="11" instance=ExtResource("7_ahvul")] +[node name="lichtkastje" parent="." index="9" instance=ExtResource("7_ahvul")] transform = Transform3D(-8.74228e-09, 0, 0.2, 0, 0.2, 0, -0.2, 0, -8.74228e-09, -1.01622, 0.0241756, 1.94583) -[node name="CombiCode" type="MeshInstance3D" parent="." index="12"] +[node name="CombiCode" type="MeshInstance3D" parent="." index="10"] transform = Transform3D(0.709362, 0.443678, -0.547682, -5.96046e-08, 0.777026, 0.62947, 0.704845, -0.446522, 0.551192, 1.84123, -0.566121, -1.81842) mesh = SubResource("TextMesh_pq3bq") -[node name="Slot" parent="." index="13" instance=ExtResource("9_pjl12")] +[node name="Slot" parent="." index="11" instance=ExtResource("9_pjl12")] transform = Transform3D(-4.37114e-09, 0, 0.1, 0, 0.1, 0, -0.1, 0, -4.37114e-09, -1.95266, 0.0372345, 0.0309203) -[node name="redherring" parent="." index="14" instance=ExtResource("10_4kyam")] +[node name="redherring" parent="." index="12" instance=ExtResource("10_4kyam")] transform = Transform3D(0.1, 0, 0, 0, 0.1, 0, 0, 0, 0.1, 1.9478, 0.1703, -1.05829) -[node name="desk_lamp_arm_01_1k" parent="." index="15" instance=ExtResource("11_dlgxa")] +[node name="desk_lamp_arm_01_1k" parent="." index="13" instance=ExtResource("11_dlgxa")] transform = Transform3D(0.745232, 0, 0.666806, 0, 1, 0, -0.666806, 0, 0.745232, 1.63545, -0.479, 1.47139) [node name="SpotLight3D" type="SpotLight3D" parent="desk_lamp_arm_01_1k" index="1"] @@ -210,7 +194,7 @@ spot_range = 1.883 spot_attenuation = 0.0796601 spot_angle = 31.15 -[node name="Einde" type="StaticBody3D" parent="." index="16"] +[node name="Einde" type="StaticBody3D" parent="." index="14"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0045743, -0.475192, 2.52917) script = ExtResource("13_srhqr") @@ -283,11 +267,27 @@ anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 -[node name="Muziek" type="AudioStreamPlayer" parent="." index="17"] +[node name="Muziek" type="AudioStreamPlayer" parent="." index="15"] stream = ExtResource("17_1cw2k") volume_db = -6.191 autoplay = true -[node name="Gui" parent="." index="18" instance=ExtResource("19_3ubs2")] +[node name="Gui" parent="." index="16" instance=ExtResource("19_3ubs2")] -[connection signal="input_event" from="FlashLight/FlashLight" to="Player" method="_on_flash_light_input_event"] +[node name="ornate-safe" parent="." index="17" instance=ExtResource("20_vp2w2")] +transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -1.83233, 0.0452993, -1.22294) + +[node name="FlashLight" type="MeshInstance3D" parent="ornate-safe" index="3"] +transform = Transform3D(0.0258819, 0.0965925, 4.2222e-09, 0, -4.37114e-09, 0.1, 0.0965925, -0.0258819, -1.13134e-09, 0.0133637, -0.12631, 0.0357572) +mesh = SubResource("CapsuleMesh_0such") +skeleton = NodePath("") + +[node name="FlashLight" type="StaticBody3D" parent="ornate-safe/FlashLight" index="0"] +transform = Transform3D(1, 0, 8.88178e-16, 0, 1, 7.10543e-15, 0, 0, 1, 0, 0, 0) +collision_layer = 2 + +[node name="CollisionShape3D" type="CollisionShape3D" parent="ornate-safe/FlashLight/FlashLight" index="0"] +transform = Transform3D(1, 0, 8.88178e-16, 0, 1, -7.10543e-15, 0, 0, 1, 0, 0, 0) +shape = SubResource("CapsuleShape3D_tup4d") + +[connection signal="input_event" from="ornate-safe/FlashLight/FlashLight" to="Player" method="_on_flash_light_input_event"] diff --git a/Objects/Meshes/safe.glb b/Objects/Meshes/safe.glb deleted file mode 100644 index 87a990e..0000000 Binary files a/Objects/Meshes/safe.glb and /dev/null differ diff --git a/Objects/Meshes/safe.glb.import b/Objects/Meshes/safe.glb.import deleted file mode 100644 index def04e1..0000000 --- a/Objects/Meshes/safe.glb.import +++ /dev/null @@ -1,30 +0,0 @@ -[remap] - -importer="scene" -importer_version=1 -type="PackedScene" -uid="uid://c37oos73shmdm" -path="res://.godot/imported/safe.glb-3bdd72b210b12d39e6232525a0589a4e.scn" - -[deps] - -source_file="res://Objects/Meshes/safe.glb" -dest_files=["res://.godot/imported/safe.glb-3bdd72b210b12d39e6232525a0589a4e.scn"] - -[params] - -nodes/root_type="Node3D" -nodes/root_name="Scene Root" -nodes/apply_root_scale=true -nodes/root_scale=1.0 -meshes/ensure_tangents=true -meshes/generate_lods=true -meshes/create_shadow_meshes=true -meshes/light_baking=1 -meshes/lightmap_texel_size=0.2 -skins/use_named_skins=true -animation/import=true -animation/fps=30 -animation/trimming=false -import_script/path="" -_subresources={} diff --git a/Objects/Safe.tscn b/Objects/Safe.tscn deleted file mode 100644 index b54d222..0000000 --- a/Objects/Safe.tscn +++ /dev/null @@ -1,71 +0,0 @@ -[gd_scene load_steps=11 format=3 uid="uid://2wem3a0y4agb"] - -[ext_resource type="PackedScene" uid="uid://c37oos73shmdm" path="res://Objects/Meshes/safe.glb" id="1_1djbc"] -[ext_resource type="Script" path="res://Scripts/Safe.gd" id="2_mnk2b"] -[ext_resource type="AudioStream" uid="uid://mi8fox007pdr" path="res://Audio/button.wav" id="3_hu2uh"] -[ext_resource type="AudioStream" uid="uid://c403ltk7lrae0" path="res://Audio/reset.wav" id="4_npf4a"] -[ext_resource type="AudioStream" uid="uid://d0bincgxhycg" path="res://Audio/doosje.wav" id="4_qd12a"] - -[sub_resource type="BoxShape3D" id="BoxShape3D_aljli"] -size = Vector3(2, 2, 2) - -[sub_resource type="SphereShape3D" id="SphereShape3D_md1id"] -radius = 1.75 - -[sub_resource type="SphereShape3D" id="SphereShape3D_1tx7e"] -radius = 1.75 - -[sub_resource type="SphereShape3D" id="SphereShape3D_f7rki"] -radius = 1.75 - -[sub_resource type="SphereShape3D" id="SphereShape3D_h6ph4"] -radius = 1.75 - -[node name="safe" instance=ExtResource("1_1djbc")] -script = ExtResource("2_mnk2b") - -[node name="Button" type="AudioStreamPlayer" parent="." index="0"] -stream = ExtResource("3_hu2uh") -volume_db = -6.19 - -[node name="Open" type="AudioStreamPlayer" parent="." index="1"] -stream = ExtResource("4_qd12a") - -[node name="Reset" type="AudioStreamPlayer" parent="." index="2"] -stream = ExtResource("4_npf4a") -volume_db = -6.19 - -[node name="StaticBody3D" type="StaticBody3D" parent="Box" index="0"] -input_ray_pickable = false - -[node name="CollisionShape3D" type="CollisionShape3D" parent="Box/StaticBody3D" index="0"] -shape = SubResource("BoxShape3D_aljli") - -[node name="Down" type="StaticBody3D" parent="Door/ButtonDown" index="0"] -collision_layer = 2 - -[node name="CollisionShape3D" type="CollisionShape3D" parent="Door/ButtonDown/Down" index="0"] -shape = SubResource("SphereShape3D_md1id") - -[node name="Left" type="StaticBody3D" parent="Door/ButtonLeft" index="0"] -collision_layer = 2 - -[node name="CollisionShape3D" type="CollisionShape3D" parent="Door/ButtonLeft/Left" index="0"] -shape = SubResource("SphereShape3D_1tx7e") - -[node name="Right" type="StaticBody3D" parent="Door/ButtonRight" index="0"] -collision_layer = 2 - -[node name="CollisionShape3D" type="CollisionShape3D" parent="Door/ButtonRight/Right" index="0"] -shape = SubResource("SphereShape3D_f7rki") - -[node name="Up" type="StaticBody3D" parent="Door/ButtonUp" index="0"] -collision_layer = 2 - -[node name="CollisionShape3D" type="CollisionShape3D" parent="Door/ButtonUp/Up" index="0"] -shape = SubResource("SphereShape3D_h6ph4") - -[connection signal="input_event" from="Door/ButtonDown/Down" to="." method="_on_down_input_event"] -[connection signal="input_event" from="Door/ButtonLeft/Left" to="." method="_on_left_input_event"] -[connection signal="input_event" from="Door/ButtonRight/Right" to="." method="_on_right_input_event"] -[connection signal="input_event" from="Door/ButtonUp/Up" to="." method="_on_up_input_event"] diff --git a/Scripts/Safe.gd b/Scripts/Safe.gd index 7f5c05d..5b5d2b4 100644 --- a/Scripts/Safe.gd +++ b/Scripts/Safe.gd @@ -7,13 +7,12 @@ var i = 0 func _ready(): sequence = $".."/Painting.sequence - func add_sequence_guess(dir): if sequence[i] == dir: $Button.playing = true i += 1 if (i == sequence.size()): - $Door.visible = false + $AnimationPlayer.play("Open002") $Open.playing = true i = 0 else: