diff --git a/Objects/Dixiebak.tscn b/Objects/Dixiebak.tscn index 45b582c..516fd4a 100644 --- a/Objects/Dixiebak.tscn +++ b/Objects/Dixiebak.tscn @@ -6,13 +6,16 @@ [node name="dixiebak" instance=ExtResource("1_quaxi")] [node name="NIXIE" parent="." index="1" instance=ExtResource("2_aph7a")] -transform = Transform3D(-1.31134e-08, 0, 0.3, 0, 0.3, 0, -0.3, 0, -1.31134e-08, -0.586, 0.326, 1.25) +transform = Transform3D(-1.31134e-08, 0, 0.3, 0, 0.3, 0, -0.3, 0, -1.31134e-08, -0.586, 0.326, 1.40719) [node name="NIXIE2" parent="." index="2" instance=ExtResource("2_aph7a")] -transform = Transform3D(-1.31134e-08, 0, 0.3, 0, 0.3, 0, -0.3, 0, -1.31134e-08, -0.586, 0.326, 0.5) +transform = Transform3D(-1.31134e-08, 0, 0.3, 0, 0.3, 0, -0.3, 0, -1.31134e-08, -0.586, 0.326, 0.700473) [node name="NIXIE3" parent="." index="3" instance=ExtResource("2_aph7a")] -transform = Transform3D(-1.31134e-08, 0, 0.3, 0, 0.3, 0, -0.3, 0, -1.31134e-08, -0.586, 0.326, -0.5) +transform = Transform3D(-1.31134e-08, 0, 0.3, 0, 0.3, 0, -0.3, 0, -1.31134e-08, -0.586, 0.326, 0.000115931) [node name="NIXIE4" parent="." index="4" instance=ExtResource("2_aph7a")] -transform = Transform3D(-1.31134e-08, 0, 0.3, 0, 0.3, 0, -0.3, 0, -1.31134e-08, -0.586, 0.326, -1.25) +transform = Transform3D(-1.31134e-08, 0, 0.3, 0, 0.3, 0, -0.3, 0, -1.31134e-08, -0.586, 0.326, -0.7) + +[node name="NIXIE5" parent="." index="5" instance=ExtResource("2_aph7a")] +transform = Transform3D(-1.31134e-08, 0, 0.3, 0, 0.3, 0, -0.3, 0, -1.31134e-08, -0.586, 0.326, -1.4) diff --git a/Objects/Meshes/redherring.glb b/Objects/Meshes/redherring.glb index defd600..e4c28ac 100644 Binary files a/Objects/Meshes/redherring.glb and b/Objects/Meshes/redherring.glb differ diff --git a/Objects/NIXIE.tscn b/Objects/NIXIE.tscn index 12cb6ec..fe4e54c 100644 --- a/Objects/NIXIE.tscn +++ b/Objects/NIXIE.tscn @@ -17,7 +17,7 @@ refraction_scale = -0.24 surface_material_override/0 = SubResource("StandardMaterial3D_xddyk") [node name="0" parent="." index="8"] -surface_material_override/0 = ExtResource("2_yoamx") +surface_material_override/0 = ExtResource("3_8bmgq") [node name="1" parent="." index="9"] surface_material_override/0 = ExtResource("2_yoamx") @@ -36,7 +36,7 @@ surface_material_override/0 = ExtResource("2_yoamx") [node name="6" parent="." index="14"] gi_mode = 2 -surface_material_override/0 = ExtResource("3_8bmgq") +surface_material_override/0 = ExtResource("2_yoamx") [node name="7" parent="." index="15"] surface_material_override/0 = ExtResource("2_yoamx") diff --git a/Objects/ladekast.tscn b/Objects/ladekast.tscn index 8d07011..2fc9d0b 100644 --- a/Objects/ladekast.tscn +++ b/Objects/ladekast.tscn @@ -1,13 +1,25 @@ -[gd_scene load_steps=3 format=3 uid="uid://bmuy4jimpch1i"] +[gd_scene load_steps=5 format=3 uid="uid://bmuy4jimpch1i"] [ext_resource type="PackedScene" uid="uid://bjbpkdxe3m235" path="res://Objects/Meshes/ladekast.glb" id="1_gw865"] +[ext_resource type="Script" path="res://Scripts/ladekast.gd" id="2_y7ua8"] + +[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_iktb3"] +points = PackedVector3Array(-0.881086, 1.69898, -0.999744, 0.883817, 1.95567, 1.02158, 0.723325, 1.95567, 1.02158, 0.883817, 1.95567, -0.999945, 0.883817, 1.69898, 1.02158, -0.881086, 1.95567, 1.02138, 0.883817, 1.69898, -0.999945, -0.881086, 1.69898, 1.02138, -0.881086, 1.95567, -0.999744) [sub_resource type="BoxShape3D" id="BoxShape3D_qmmg3"] size = Vector3(2, 5, 2) [node name="ladekast" instance=ExtResource("1_gw865")] +script = ExtResource("2_y7ua8") + +[node name="StaticBody3D" type="StaticBody3D" parent="Kast/Drawer" index="0"] + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Kast/Drawer/StaticBody3D" index="0"] +shape = SubResource("ConvexPolygonShape3D_iktb3") [node name="StaticBody3D" type="StaticBody3D" parent="Kast" index="5"] [node name="CollisionShape3D" type="CollisionShape3D" parent="Kast/StaticBody3D" index="0"] shape = SubResource("BoxShape3D_qmmg3") + +[connection signal="input_event" from="Kast/Drawer/StaticBody3D" to="." method="_on_static_body_3d_input_event"] diff --git a/Objects/redherring.tscn b/Objects/redherring.tscn index 8ff8d47..ef79812 100644 --- a/Objects/redherring.tscn +++ b/Objects/redherring.tscn @@ -21,7 +21,7 @@ visible = false [node name="Music" type="AudioStreamPlayer3D" parent="." index="5"] transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -2.39983, 0.16465, -2.32134) stream = ExtResource("3_qep0f") -unit_size = 3.6 +unit_size = 1.5 attenuation_filter_db = -34.0 [connection signal="input_event" from="Knop/Knop" to="." method="_on_knop_input_event"] diff --git a/Player.tscn b/Player.tscn index 996ed58..1d595d5 100644 --- a/Player.tscn +++ b/Player.tscn @@ -24,7 +24,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.4, 0) fov = 60.0 [node name="FlashLight" type="MeshInstance3D" parent="Pivot/Camera"] -transform = Transform3D(-4.37114e-08, 0, 1, -1, -4.37114e-08, -4.37114e-08, 4.37114e-08, -1, 1.91069e-15, 0.329452, -0.242565, -0.429142) +transform = Transform3D(-4.37114e-08, 0, 1, -1, -4.37114e-08, -4.37114e-08, 4.37114e-08, -1, 1.91069e-15, 0.329452, -0.113105, -0.429142) visible = false mesh = SubResource("CapsuleMesh_x6nb0") diff --git a/Room.tscn b/Room.tscn index 632fc93..7368ca8 100644 --- a/Room.tscn +++ b/Room.tscn @@ -125,7 +125,7 @@ transform = Transform3D(0.709362, -0.704845, -1.97442e-10, -4.37114e-08, -4.3711 mesh = SubResource("TextMesh_jaaiy") [node name="ladekast" parent="." instance=ExtResource("8_oqsh4")] -transform = Transform3D(-1.31134e-08, 0, 0.3, 0, 0.3, 0, -0.3, 0, -1.31134e-08, -1.63433, 0.25395, 0.702559) +transform = Transform3D(-1.5299e-08, 0, 0.35, 0, 0.35, 0, -0.35, 0, -1.5299e-08, -1.63433, 0.25395, 0.702559) [node name="dixiebak" parent="ladekast" instance=ExtResource("8_fr0uk")] transform = Transform3D(-1.96701e-08, 0, -0.45, 0, 0.45, 0, 0.45, 0, -1.96701e-08, 0, 2.1397, 0.294674) @@ -133,6 +133,11 @@ transform = Transform3D(-1.96701e-08, 0, -0.45, 0, 0.45, 0, 0.45, 0, -1.96701e-0 [node name="redherring" parent="." instance=ExtResource("10_qul4r")] transform = Transform3D(-5.68248e-09, 0, 0.13, 0, 0.13, 0, -0.13, 0, -5.68248e-09, 1.06318, 1.16234, -1.94546) +[node name="SpotLight3D" type="SpotLight3D" parent="redherring"] +transform = Transform3D(2.26464, 5.42931, -4.95637, -1.43552, 5.41298, 5.27357, 7.20987, -0.627612, 2.6068, -6.00804, 7.68078, 4.2462) +light_energy = 0.1 +spot_angle = 25.0 + [connection signal="input_event" from="Lichtknopje" to="Lichtknopje" method="_on_input_event"] [connection signal="input_event" from="safe/FlashLight/FlashLight" to="Player" method="_on_flash_light_input_event"] [connection signal="input_event" from="safe/FlashLight/FlashLight" to="safe" method="_on_flash_light_input_event"] diff --git a/Scripts/ladekast.gd b/Scripts/ladekast.gd new file mode 100644 index 0000000..ff0962e --- /dev/null +++ b/Scripts/ladekast.gd @@ -0,0 +1,11 @@ +extends Node3D + +var secret + +func _ready(): + secret = randi() % 10000 + #$".."/CombiCode.mesh.text = "%04d" % combination #met leading 0'en + +func _on_static_body_3d_input_event(camera, event, position, normal, shape_idx): + if event is InputEventMouseButton and event.is_action_pressed("interact"): + $Kast/Drawer.position.z = abs($Kast/Drawer.position.z - 1.0)