diff --git a/asset_dev/sfx/367125__jofae__air-hiss.mp3 b/asset_dev/sfx/367125__jofae__air-hiss.mp3 new file mode 100644 index 0000000..69375ae Binary files /dev/null and b/asset_dev/sfx/367125__jofae__air-hiss.mp3 differ diff --git a/asset_dev/sfx/beam_loop.aup3 b/asset_dev/sfx/beam_loop.aup3 index f729681..259cd01 100644 Binary files a/asset_dev/sfx/beam_loop.aup3 and b/asset_dev/sfx/beam_loop.aup3 differ diff --git a/asset_dev/sfx/beam_loop.aup3-shm b/asset_dev/sfx/beam_loop.aup3-shm deleted file mode 100644 index dcba4b6..0000000 Binary files a/asset_dev/sfx/beam_loop.aup3-shm and /dev/null differ diff --git a/asset_dev/sfx/beam_loop.aup3-wal b/asset_dev/sfx/beam_loop.aup3-wal deleted file mode 100644 index c566a25..0000000 Binary files a/asset_dev/sfx/beam_loop.aup3-wal and /dev/null differ diff --git a/asset_dev/sfx/mechanical_door.aup3 b/asset_dev/sfx/mechanical_door.aup3 new file mode 100644 index 0000000..594da7f Binary files /dev/null and b/asset_dev/sfx/mechanical_door.aup3 differ diff --git a/asset_dev/sfx/spray.aup3-shm b/asset_dev/sfx/mechanical_door.aup3-shm similarity index 99% rename from asset_dev/sfx/spray.aup3-shm rename to asset_dev/sfx/mechanical_door.aup3-shm index 03f39c3..249145d 100644 Binary files a/asset_dev/sfx/spray.aup3-shm and b/asset_dev/sfx/mechanical_door.aup3-shm differ diff --git a/asset_dev/sfx/spray.aup3-wal b/asset_dev/sfx/mechanical_door.aup3-wal similarity index 97% rename from asset_dev/sfx/spray.aup3-wal rename to asset_dev/sfx/mechanical_door.aup3-wal index d72d03c..9e117ae 100644 Binary files a/asset_dev/sfx/spray.aup3-wal and b/asset_dev/sfx/mechanical_door.aup3-wal differ diff --git a/asset_dev/sfx/spray.aup3 b/asset_dev/sfx/spray.aup3 index 4e551a4..5041868 100644 Binary files a/asset_dev/sfx/spray.aup3 and b/asset_dev/sfx/spray.aup3 differ diff --git a/assets/sfx/air_hiss.wav b/assets/sfx/air_hiss.wav new file mode 100644 index 0000000..512c7fd Binary files /dev/null and b/assets/sfx/air_hiss.wav differ diff --git a/assets/sfx/air_hiss.wav.import b/assets/sfx/air_hiss.wav.import new file mode 100644 index 0000000..aaaf714 --- /dev/null +++ b/assets/sfx/air_hiss.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://dkdw7viq1nqte" +path="res://.godot/imported/air_hiss.wav-6d6f9a218e231e48bcec06290ac3f919.sample" + +[deps] + +source_file="res://assets/sfx/air_hiss.wav" +dest_files=["res://.godot/imported/air_hiss.wav-6d6f9a218e231e48bcec06290ac3f919.sample"] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=2 diff --git a/assets/sfx/click_electronic_04.wav b/assets/sfx/click_electronic_04.wav new file mode 100644 index 0000000..4911f39 Binary files /dev/null and b/assets/sfx/click_electronic_04.wav differ diff --git a/assets/sfx/click_electronic_04.wav.import b/assets/sfx/click_electronic_04.wav.import new file mode 100644 index 0000000..1987175 --- /dev/null +++ b/assets/sfx/click_electronic_04.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://bgayfws34lg7q" +path="res://.godot/imported/click_electronic_04.wav-405bfc3a592e267c269b8db1b4b7de41.sample" + +[deps] + +source_file="res://assets/sfx/click_electronic_04.wav" +dest_files=["res://.godot/imported/click_electronic_04.wav-405bfc3a592e267c269b8db1b4b7de41.sample"] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=2 diff --git a/assets/sfx/mechanical_door.wav b/assets/sfx/mechanical_door.wav new file mode 100644 index 0000000..375c252 Binary files /dev/null and b/assets/sfx/mechanical_door.wav differ diff --git a/assets/sfx/mechanical_door.wav.import b/assets/sfx/mechanical_door.wav.import new file mode 100644 index 0000000..71d44e3 --- /dev/null +++ b/assets/sfx/mechanical_door.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://6mm0npep4ul1" +path="res://.godot/imported/mechanical_door.wav-50e0182a55479a777ff92ad2f47afc1f.sample" + +[deps] + +source_file="res://assets/sfx/mechanical_door.wav" +dest_files=["res://.godot/imported/mechanical_door.wav-50e0182a55479a777ff92ad2f47afc1f.sample"] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=2 diff --git a/assets/sfx/mechanical_door_2.wav b/assets/sfx/mechanical_door_2.wav new file mode 100644 index 0000000..3b9789b Binary files /dev/null and b/assets/sfx/mechanical_door_2.wav differ diff --git a/assets/sfx/mechanical_door_2.wav.import b/assets/sfx/mechanical_door_2.wav.import new file mode 100644 index 0000000..034b2e1 --- /dev/null +++ b/assets/sfx/mechanical_door_2.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://bqpugpqalequx" +path="res://.godot/imported/mechanical_door_2.wav-e0653e987bbbfc2411d5837d3195861e.sample" + +[deps] + +source_file="res://assets/sfx/mechanical_door_2.wav" +dest_files=["res://.godot/imported/mechanical_door_2.wav-e0653e987bbbfc2411d5837d3195861e.sample"] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=2 diff --git a/src/props/bulkhead/bulkhead.gd b/src/props/bulkhead/bulkhead.gd index 8150b72..262bb97 100644 --- a/src/props/bulkhead/bulkhead.gd +++ b/src/props/bulkhead/bulkhead.gd @@ -2,11 +2,13 @@ extends Node3D @onready var animation: AnimationPlayer = $AnimationPlayer @onready var dust_animation: AnimationPlayer = %DustAnimation +@onready var open_sfx: AudioStreamPlayer3D = %OpenSFX func open() -> void: animation.play("open") dust_animation.play("spray") + open_sfx.play() func close() -> void: diff --git a/src/props/bulkhead/bulkhead.tscn b/src/props/bulkhead/bulkhead.tscn index 43a9282..e528d30 100644 --- a/src/props/bulkhead/bulkhead.tscn +++ b/src/props/bulkhead/bulkhead.tscn @@ -1,10 +1,12 @@ -[gd_scene load_steps=17 format=4 uid="uid://cubwniraol1qn"] +[gd_scene load_steps=19 format=4 uid="uid://cubwniraol1qn"] [ext_resource type="PackedScene" uid="uid://bopvgd18a1dl0" path="res://assets/props/bulkhead/bulkhead.gltf" id="1_77udb"] [ext_resource type="Material" uid="uid://dim1g2sr3axr5" path="res://assets/props/bulkhead/bulkhead_frame.material" id="2_88qrs"] [ext_resource type="Script" uid="uid://rjygr6ybnl30" path="res://src/props/bulkhead/bulkhead.gd" id="2_hknvo"] [ext_resource type="PackedScene" uid="uid://64kcxg3x6631" path="res://src/effects/dust_spray.tscn" id="3_88qrs"] [ext_resource type="Material" uid="uid://ba5iycnw36138" path="res://assets/props/bulkhead/bulkhead_door.material" id="3_w7oba"] +[ext_resource type="AudioStream" uid="uid://6mm0npep4ul1" path="res://assets/sfx/mechanical_door.wav" id="5_4jho1"] +[ext_resource type="AudioStream" uid="uid://dkdw7viq1nqte" path="res://assets/sfx/air_hiss.wav" id="7_4jho1"] [sub_resource type="ArrayMesh" id="ArrayMesh_hx0vd"] _surfaces = [{ @@ -179,6 +181,18 @@ tracks/7/keys = { "update": 1, "values": [false] } +tracks/8/type = "value" +tracks/8/imported = false +tracks/8/enabled = true +tracks/8/path = NodePath("DustSFX:playing") +tracks/8/interp = 1 +tracks/8/loop_wrap = true +tracks/8/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [false] +} [sub_resource type="Animation" id="Animation_88qrs"] resource_name = "spray" @@ -280,6 +294,18 @@ tracks/7/keys = { "update": 1, "values": [true, false] } +tracks/8/type = "value" +tracks/8/imported = false +tracks/8/enabled = true +tracks/8/path = NodePath("DustSFX:playing") +tracks/8/interp = 1 +tracks/8/loop_wrap = true +tracks/8/keys = { +"times": PackedFloat32Array(0.275), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [true] +} [sub_resource type="AnimationLibrary" id="AnimationLibrary_hx0vd"] _data = { @@ -308,7 +334,13 @@ collision_layer = 5 [node name="CollisionShape3D" type="CollisionShape3D" parent="Door/StaticBody3D" index="0"] shape = SubResource("ConcavePolygonShape3D_w7oba") -[node name="Ramp" type="StaticBody3D" parent="." index="3"] +[node name="OpenSFX" type="AudioStreamPlayer3D" parent="." index="3"] +unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.9, 0) +stream = ExtResource("5_4jho1") +volume_db = -10.0 + +[node name="Ramp" type="StaticBody3D" parent="." index="4"] [node name="MeshInstance3D" type="MeshInstance3D" parent="Ramp" index="0"] transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 0.1, 0.325) @@ -323,7 +355,7 @@ shape = SubResource("ConcavePolygonShape3D_hx0vd") transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0, 0.1, -0.325) shape = SubResource("ConcavePolygonShape3D_hx0vd") -[node name="Dust" type="Node3D" parent="." index="4"] +[node name="Dust" type="Node3D" parent="." index="5"] [node name="DustSpray" parent="Dust" index="0" instance=ExtResource("3_88qrs")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0.25, 0.0897675) @@ -350,3 +382,7 @@ unique_name_in_owner = true libraries = { &"": SubResource("AnimationLibrary_hx0vd") } + +[node name="DustSFX" type="AudioStreamPlayer3D" parent="Dust" index="5"] +stream = ExtResource("7_4jho1") +volume_db = -24.0 diff --git a/src/props/wall_switch/wall_switch.tscn b/src/props/wall_switch/wall_switch.tscn index 156563d..e29d546 100644 --- a/src/props/wall_switch/wall_switch.tscn +++ b/src/props/wall_switch/wall_switch.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=28 format=4 uid="uid://b6eg8t04rkh0c"] +[gd_scene load_steps=29 format=4 uid="uid://b6eg8t04rkh0c"] [ext_resource type="Script" uid="uid://bkmn5m47mt1gh" path="res://src/props/wall_switch/wall_switch.gd" id="2_kfvqd"] [ext_resource type="Texture2D" uid="uid://1wjcyqynwlb6" path="res://assets/props/wall_switch/wall_switch_C.png" id="2_vufqs"] @@ -10,6 +10,7 @@ [ext_resource type="Shader" uid="uid://ckxc0ngd37rtk" path="res://src/shaders/gunk.gdshader" id="8_6aabu"] [ext_resource type="FastNoiseLite" uid="uid://cnlvdtx68giv6" path="res://assets/materials/gunk_noise.tres" id="9_7shuc"] [ext_resource type="Script" uid="uid://deg5xd87cy8rg" path="res://src/props/interactive.gd" id="10_qw6jt"] +[ext_resource type="AudioStream" uid="uid://bgayfws34lg7q" path="res://assets/sfx/click_electronic_04.wav" id="11_7shuc"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_jtkkw"] resource_local_to_scene = true @@ -135,6 +136,18 @@ tracks/1/keys = { "update": 0, "values": [0.0] } +tracks/2/type = "value" +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/path = NodePath("Lights/SuccessLight/SuccessSFX:playing") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [false] +} [sub_resource type="Animation" id="Animation_6aabu"] resource_name = "disable" @@ -210,6 +223,18 @@ tracks/1/keys = { "update": 0, "values": [0.0] } +tracks/2/type = "value" +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/path = NodePath("Lights/SuccessLight/SuccessSFX:playing") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [true] +} [sub_resource type="AnimationLibrary" id="AnimationLibrary_6ueib"] _data = { @@ -251,6 +276,13 @@ mesh = SubResource("BoxMesh_g24yf") transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.06, 0) mesh = SubResource("BoxMesh_a6hjm") +[node name="SuccessSFX" type="AudioStreamPlayer3D" parent="Lights/SuccessLight" index="0"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.17, -0.18, -0.1) +stream = ExtResource("11_7shuc") +volume_db = -16.0 +unit_size = 4.0 +bus = &"SFX" + [node name="LightAnimation" type="AnimationPlayer" parent="Lights" index="2"] unique_name_in_owner = true root_node = NodePath("../..") diff --git a/vault/assets/asset credits.md b/vault/assets/asset credits.md index 9a78146..6e6822a 100644 --- a/vault/assets/asset credits.md +++ b/vault/assets/asset credits.md @@ -2,4 +2,17 @@ - "Walking on Metal" - author: Sanderboah - retrieved from https://freesound.org/people/Sanderboah/sounds/696374/ - - assets/sfx/footsteps/metal/metal*.wav \ No newline at end of file + - assets/sfx/footsteps/metal/metal*.wav + - "Click_Electronic_04.wav" + - author: LittleRobotSoundFactory + - retrieved from https://freesound.org/people/LittleRobotSoundFactory/sounds/288956/ + - assets/sfx/click_electronic_04.wav + - "Air Hiss" + - author: Jofae + - retrieved from https://freesound.org/people/Jofae/sounds/367125/ + - assets/sfx/air_hiss.wav + - modified + - "Heavy Mechanical Door Open" + - author: lowpolygon + - retrieved from https://freesound.org/people/lowpolygon/sounds/421722/ + - assets/sfx/mechanical_door.wav \ No newline at end of file