diff --git a/Audio/bluegrass.mp3 b/Audio/bluegrass.mp3 new file mode 100644 index 0000000..3159191 Binary files /dev/null and b/Audio/bluegrass.mp3 differ diff --git a/Audio/bluegrass.mp3.import b/Audio/bluegrass.mp3.import new file mode 100644 index 0000000..a7f39a8 --- /dev/null +++ b/Audio/bluegrass.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://cef415jpowey" +path="res://.godot/imported/bluegrass.mp3-e656c2d043ae709d5190eeb354a96570.mp3str" + +[deps] + +source_file="res://Audio/bluegrass.mp3" +dest_files=["res://.godot/imported/bluegrass.mp3-e656c2d043ae709d5190eeb354a96570.mp3str"] + +[params] + +loop=true +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/Objects/Dixiebak.tscn b/Objects/Dixiebak.tscn new file mode 100644 index 0000000..45b582c --- /dev/null +++ b/Objects/Dixiebak.tscn @@ -0,0 +1,18 @@ +[gd_scene load_steps=3 format=3 uid="uid://cd3wfbyld8a5k"] + +[ext_resource type="PackedScene" uid="uid://7riury1tgdri" path="res://Objects/Meshes/dixiebak.glb" id="1_quaxi"] +[ext_resource type="PackedScene" uid="uid://dnwukbxgt6ktr" path="res://Objects/NIXIE.tscn" id="2_aph7a"] + +[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) + +[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) + +[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) + +[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) diff --git a/Objects/Meshes/NIXIE.glb b/Objects/Meshes/NIXIE.glb new file mode 100644 index 0000000..655ee45 Binary files /dev/null and b/Objects/Meshes/NIXIE.glb differ diff --git a/Objects/Meshes/NIXIE.glb.import b/Objects/Meshes/NIXIE.glb.import new file mode 100644 index 0000000..d3dad13 --- /dev/null +++ b/Objects/Meshes/NIXIE.glb.import @@ -0,0 +1,30 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://deylqh0m1j4fk" +path="res://.godot/imported/NIXIE.glb-22bc50a0db7c77e216bc5a8ca66c515a.scn" + +[deps] + +source_file="res://Objects/Meshes/NIXIE.glb" +dest_files=["res://.godot/imported/NIXIE.glb-22bc50a0db7c77e216bc5a8ca66c515a.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/Meshes/dixiebak.glb b/Objects/Meshes/dixiebak.glb new file mode 100644 index 0000000..00cb3ab Binary files /dev/null and b/Objects/Meshes/dixiebak.glb differ diff --git a/Objects/Meshes/dixiebak.glb.import b/Objects/Meshes/dixiebak.glb.import new file mode 100644 index 0000000..9c019c1 --- /dev/null +++ b/Objects/Meshes/dixiebak.glb.import @@ -0,0 +1,30 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://7riury1tgdri" +path="res://.godot/imported/dixiebak.glb-b70e73e5bee65f8cc95986250c440d1e.scn" + +[deps] + +source_file="res://Objects/Meshes/dixiebak.glb" +dest_files=["res://.godot/imported/dixiebak.glb-b70e73e5bee65f8cc95986250c440d1e.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/Meshes/ladekast.glb b/Objects/Meshes/ladekast.glb new file mode 100644 index 0000000..eaea877 Binary files /dev/null and b/Objects/Meshes/ladekast.glb differ diff --git a/Objects/Meshes/ladekast.glb.import b/Objects/Meshes/ladekast.glb.import new file mode 100644 index 0000000..84b2431 --- /dev/null +++ b/Objects/Meshes/ladekast.glb.import @@ -0,0 +1,30 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://bjbpkdxe3m235" +path="res://.godot/imported/ladekast.glb-ecf5863399dfaccfa98d5f549de10d52.scn" + +[deps] + +source_file="res://Objects/Meshes/ladekast.glb" +dest_files=["res://.godot/imported/ladekast.glb-ecf5863399dfaccfa98d5f549de10d52.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/Meshes/redherring.glb b/Objects/Meshes/redherring.glb new file mode 100644 index 0000000..defd600 Binary files /dev/null and b/Objects/Meshes/redherring.glb differ diff --git a/Objects/Meshes/redherring.glb.import b/Objects/Meshes/redherring.glb.import new file mode 100644 index 0000000..6f41112 --- /dev/null +++ b/Objects/Meshes/redherring.glb.import @@ -0,0 +1,30 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://cmrvr8egnfm3m" +path="res://.godot/imported/redherring.glb-eac41249364a5eb395778221ed88754b.scn" + +[deps] + +source_file="res://Objects/Meshes/redherring.glb" +dest_files=["res://.godot/imported/redherring.glb-eac41249364a5eb395778221ed88754b.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/NIXIE.tscn b/Objects/NIXIE.tscn new file mode 100644 index 0000000..12cb6ec --- /dev/null +++ b/Objects/NIXIE.tscn @@ -0,0 +1,48 @@ +[gd_scene load_steps=5 format=3 uid="uid://dnwukbxgt6ktr"] + +[ext_resource type="PackedScene" uid="uid://deylqh0m1j4fk" path="res://Objects/Meshes/NIXIE.glb" id="1_3u7qy"] +[ext_resource type="Material" uid="uid://dqtvvixrrla8r" path="res://Objects/Nixie-Off.tres" id="2_yoamx"] +[ext_resource type="Material" uid="uid://rjsm0jy14b6i" path="res://Objects/Nixie-Glow.tres" id="3_8bmgq"] + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_xddyk"] +transparency = 1 +albedo_color = Color(1, 1, 1, 0.231373) +metallic = 0.42 +roughness = 0.39 +refraction_scale = -0.24 + +[node name="NIXIE" instance=ExtResource("1_3u7qy")] + +[node name="Bulb" parent="." index="2"] +surface_material_override/0 = SubResource("StandardMaterial3D_xddyk") + +[node name="0" parent="." index="8"] +surface_material_override/0 = ExtResource("2_yoamx") + +[node name="1" parent="." index="9"] +surface_material_override/0 = ExtResource("2_yoamx") + +[node name="2" parent="." index="10"] +surface_material_override/0 = ExtResource("2_yoamx") + +[node name="3" parent="." index="11"] +surface_material_override/0 = ExtResource("2_yoamx") + +[node name="4" parent="." index="12"] +surface_material_override/0 = ExtResource("2_yoamx") + +[node name="5" parent="." index="13"] +surface_material_override/0 = ExtResource("2_yoamx") + +[node name="6" parent="." index="14"] +gi_mode = 2 +surface_material_override/0 = ExtResource("3_8bmgq") + +[node name="7" parent="." index="15"] +surface_material_override/0 = ExtResource("2_yoamx") + +[node name="8" parent="." index="16"] +surface_material_override/0 = ExtResource("2_yoamx") + +[node name="9" parent="." index="17"] +surface_material_override/0 = ExtResource("2_yoamx") diff --git a/Objects/Nixie-Glow.tres b/Objects/Nixie-Glow.tres new file mode 100644 index 0000000..0d8fde5 --- /dev/null +++ b/Objects/Nixie-Glow.tres @@ -0,0 +1,7 @@ +[gd_resource type="StandardMaterial3D" format=3 uid="uid://rjsm0jy14b6i"] + +[resource] +emission_enabled = true +emission = Color(0.823529, 0.411765, 0.223529, 1) +emission_energy_multiplier = 6.33 +backlight = Color(0.913725, 0.215686, 0.145098, 1) diff --git a/Objects/Nixie-Off.tres b/Objects/Nixie-Off.tres new file mode 100644 index 0000000..336fcde --- /dev/null +++ b/Objects/Nixie-Off.tres @@ -0,0 +1,5 @@ +[gd_resource type="StandardMaterial3D" format=3 uid="uid://dqtvvixrrla8r"] + +[resource] +transparency = 1 +albedo_color = Color(0.321569, 0.321569, 0.321569, 0.552941) diff --git a/Objects/ladekast.tscn b/Objects/ladekast.tscn new file mode 100644 index 0000000..5824a66 --- /dev/null +++ b/Objects/ladekast.tscn @@ -0,0 +1,13 @@ +[gd_scene load_steps=3 format=3 uid="uid://bmuy4jimpch1i"] + +[ext_resource type="PackedScene" uid="uid://bjbpkdxe3m235" path="res://Objects/Meshes/ladekast.glb" id="1_gw865"] + +[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_oani2"] +points = PackedVector3Array(0.881012, 1.2404, -0.991939, 0.971999, 2.0762, 0.989799, -0.976627, 2.0762, 0.989799, -0.88564, 1.2404, 0.991939, -0.976627, 2.0762, -0.989799, 0.971999, 2.0762, -0.989799, 0.881012, 1.2404, 0.991939, -0.88564, 1.2404, -0.991939, 0.977697, 1.89201, -0.995589, -0.981442, 1.92293, 0.994691, 0.913748, 1.36385, 0.993858, -0.981442, 1.92293, -0.994691, 0.977697, 1.89201, 0.995589, -0.917534, 1.39512, -0.992944, 0.913748, 1.36385, -0.993858, -0.917534, 1.39512, 0.992944) + +[node name="ladekast" instance=ExtResource("1_gw865")] + +[node name="StaticBody3D" type="StaticBody3D" parent="Kast" index="5"] + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Kast/StaticBody3D" index="0"] +shape = SubResource("ConvexPolygonShape3D_oani2") diff --git a/Objects/redherring.tscn b/Objects/redherring.tscn new file mode 100644 index 0000000..cb188da --- /dev/null +++ b/Objects/redherring.tscn @@ -0,0 +1,26 @@ +[gd_scene load_steps=5 format=3 uid="uid://5iw01h08cchr"] + +[ext_resource type="PackedScene" uid="uid://cmrvr8egnfm3m" path="res://Objects/Meshes/redherring.glb" id="1_fejfa"] +[ext_resource type="Script" path="res://Scripts/redherring.gd" id="2_cgqr1"] +[ext_resource type="AudioStream" uid="uid://cef415jpowey" path="res://Audio/bluegrass.mp3" id="3_qep0f"] + +[sub_resource type="BoxShape3D" id="BoxShape3D_hprjx"] +size = Vector3(0.3, 0.3, 0.3) + +[node name="redherring" instance=ExtResource("1_fejfa")] +script = ExtResource("2_cgqr1") + +[node name="Knop" type="StaticBody3D" parent="Knop" index="0"] + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Knop/Knop" index="0"] +shape = SubResource("BoxShape3D_hprjx") + +[node name="Red Herring Singing" parent="." index="4"] +visible = false + +[node name="Music" type="AudioStreamPlayer3D" parent="." index="5"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.39983, 0.16465, -2.32134) +stream = ExtResource("3_qep0f") + +[connection signal="input_event" from="Knop/Knop" to="." method="_on_knop_input_event"] +[connection signal="finished" from="Music" to="." method="_on_music_finished"] diff --git a/Player.tscn b/Player.tscn index c835c83..ddceece 100644 --- a/Player.tscn +++ b/Player.tscn @@ -11,7 +11,6 @@ radius = 0.3 height = 1.6 [sub_resource type="SphereShape3D" id="SphereShape3D_2j6of"] -radius = 0.8 [node name="Player" type="CharacterBody3D"] script = ExtResource("1_jx17t") diff --git a/Room.tscn b/Room.tscn index 982e7ac..632fc93 100644 --- a/Room.tscn +++ b/Room.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=20 format=3 uid="uid://dlj15vm6dahio"] +[gd_scene load_steps=22 format=3 uid="uid://dlj15vm6dahio"] [ext_resource type="PackedScene" uid="uid://4o2ljtcup5bo" path="res://Player.tscn" id="1_pmt73"] [ext_resource type="Script" path="res://Scripts/lichtknop.gd" id="2_gwtwo"] @@ -7,6 +7,9 @@ [ext_resource type="PackedScene" uid="uid://cpjo05ataob66" path="res://Objects/Painting.tscn" id="5_glq61"] [ext_resource type="Shader" path="res://Shaders/Blacklight.gdshader" id="7_agddp"] [ext_resource type="PackedScene" uid="uid://2wem3a0y4agb" path="res://Objects/Safe.tscn" id="7_kfu4q"] +[ext_resource type="PackedScene" uid="uid://cd3wfbyld8a5k" path="res://Objects/Dixiebak.tscn" id="8_fr0uk"] +[ext_resource type="PackedScene" uid="uid://bmuy4jimpch1i" path="res://Objects/ladekast.tscn" id="8_oqsh4"] +[ext_resource type="PackedScene" uid="uid://5iw01h08cchr" path="res://Objects/redherring.tscn" id="10_qul4r"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_rahav"] @@ -18,18 +21,16 @@ size = Vector3(4, 2, 4) [sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_5jeew"] data = PackedVector3Array(2, 1.25, 2, -2, 1.25, 2, -2, -1.25, 2, 2, -1.25, 2, 2, 1.25, 2, -2, -1.25, 2, -2, 1.25, -2, 2, 1.25, -2, 2, -1.25, -2, -2, -1.25, -2, -2, 1.25, -2, 2, -1.25, -2, 2, 1.25, -2, 2, 1.25, 2, 2, -1.25, 2, 2, -1.25, -2, 2, 1.25, -2, 2, -1.25, 2, -2, 1.25, 2, -2, 1.25, -2, -2, -1.25, -2, -2, -1.25, 2, -2, 1.25, 2, -2, -1.25, -2, -2, 1.25, 2, 2, 1.25, 2, 2, 1.25, -2, -2, 1.25, -2, -2, 1.25, 2, 2, 1.25, -2, 2, -1.25, 2, -2, -1.25, 2, -2, -1.25, -2, 2, -1.25, -2, 2, -1.25, 2, -2, -1.25, -2) -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_fu6bs"] -albedo_color = Color(1, 0, 0.0470588, 1) - -[sub_resource type="BoxMesh" id="BoxMesh_j4kk6"] -material = SubResource("StandardMaterial3D_fu6bs") -size = Vector3(0.5, 0.5, 0.2) - [sub_resource type="Environment" id="Environment_mkdd8"] ambient_light_source = 1 +ambient_light_color = Color(1, 0.709804, 0.717647, 1) +ambient_light_energy = 0.01 ssr_max_steps = 128 ssr_fade_out = 5.65685 -glow_enabled = true +sdfgi_read_sky_light = false +glow_levels/1 = 1.81 +glow_levels/2 = 1.03 +glow_levels/4 = 0.52 volumetric_fog_enabled = true volumetric_fog_density = 0.02 volumetric_fog_anisotropy = 0.9 @@ -41,7 +42,12 @@ volumetric_fog_temporal_reprojection_enabled = false [sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_rhkkr"] data = PackedVector3Array(-0.05, 0.05, 0.05, 0.05, 0.05, 0.05, -0.05, -0.05, 0.05, 0.05, 0.05, 0.05, 0.05, -0.05, 0.05, -0.05, -0.05, 0.05, 0.05, 0.05, -0.05, -0.05, 0.05, -0.05, 0.05, -0.05, -0.05, -0.05, 0.05, -0.05, -0.05, -0.05, -0.05, 0.05, -0.05, -0.05, 0.05, 0.05, 0.05, 0.05, 0.05, -0.05, 0.05, -0.05, 0.05, 0.05, 0.05, -0.05, 0.05, -0.05, -0.05, 0.05, -0.05, 0.05, -0.05, 0.05, -0.05, -0.05, 0.05, 0.05, -0.05, -0.05, -0.05, -0.05, 0.05, 0.05, -0.05, -0.05, 0.05, -0.05, -0.05, -0.05, 0.05, 0.05, 0.05, -0.05, 0.05, 0.05, 0.05, 0.05, -0.05, -0.05, 0.05, 0.05, -0.05, 0.05, -0.05, 0.05, 0.05, -0.05, -0.05, -0.05, 0.05, 0.05, -0.05, 0.05, -0.05, -0.05, -0.05, 0.05, -0.05, 0.05, 0.05, -0.05, -0.05, -0.05, -0.05, -0.05) +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_chkel"] +emission_enabled = true +emission = Color(0.376471, 0.435294, 0.72549, 1) + [sub_resource type="BoxMesh" id="BoxMesh_nilbs"] +material = SubResource("StandardMaterial3D_chkel") size = Vector3(0.1, 0.1, 0.1) [sub_resource type="CapsuleMesh" id="CapsuleMesh_3d1gr"] @@ -73,10 +79,6 @@ shape = SubResource("ConcavePolygonShape3D_5jeew") [node name="Player" parent="." instance=ExtResource("1_pmt73")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0106132, -2.38419e-07, 0.313933) -[node name="RedBox" type="MeshInstance3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.48039, 0.508301, -1.48253) -mesh = SubResource("BoxMesh_j4kk6") - [node name="WorldEnvironment" type="WorldEnvironment" parent="."] environment = SubResource("Environment_mkdd8") @@ -98,10 +100,7 @@ skeleton = NodePath("../..") [node name="Light" type="OmniLight3D" parent="Lichtknopje"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.929229, -0.07078, 1.96962) - -[node name="AmbiLight" type="OmniLight3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.25, 0) -light_energy = 0.01 +light_energy = 0.606 [node name="Slot" parent="." instance=ExtResource("4_kvwvq")] transform = Transform3D(-0.1, 0, -8.74228e-09, 0, 0.1, 0, 8.74228e-09, 0, -0.1, 0.708407, 1.26238, 2) @@ -125,6 +124,15 @@ shape = SubResource("ConcavePolygonShape3D_wr86f") transform = Transform3D(0.709362, -0.704845, -1.97442e-10, -4.37114e-08, -4.37114e-08, -1, 0.704845, 0.709362, -6.18169e-08, 1.36869, 2.24724, -1.40955) 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) + +[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) + +[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) + [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/redherring.gd b/Scripts/redherring.gd new file mode 100644 index 0000000..ccc39c3 --- /dev/null +++ b/Scripts/redherring.gd @@ -0,0 +1,16 @@ +extends Node3D + +func _ready(): + $Music.stream.loop = false + +func switch_fish(): + $"Red Herring".visible = $"Red Herring Singing".visible + $"Red Herring Singing".visible = !$"Red Herring Singing".visible + +func _on_knop_input_event(camera, event, position, normal, shape_idx): + if event is InputEventMouseButton and event.is_action_pressed("interact"): + $Music.playing = !$Music.playing + switch_fish() + +func _on_music_finished(): + switch_fish()