diff --git a/asset_dev/sfx/548384__nox_sound__footsteps_mountain_boots_mud_mono.wav b/asset_dev/sfx/548384__nox_sound__footsteps_mountain_boots_mud_mono.wav new file mode 100644 index 0000000..ef09c46 Binary files /dev/null and b/asset_dev/sfx/548384__nox_sound__footsteps_mountain_boots_mud_mono.wav differ diff --git a/asset_dev/sfx/mechanical_door.aup3 b/asset_dev/sfx/mechanical_door.aup3 index 594da7f..d509101 100644 Binary files a/asset_dev/sfx/mechanical_door.aup3 and b/asset_dev/sfx/mechanical_door.aup3 differ diff --git a/asset_dev/sfx/mechanical_door.aup3-shm b/asset_dev/sfx/mechanical_door.aup3-shm deleted file mode 100644 index 249145d..0000000 Binary files a/asset_dev/sfx/mechanical_door.aup3-shm and /dev/null differ diff --git a/asset_dev/sfx/mechanical_door.aup3-wal b/asset_dev/sfx/mechanical_door.aup3-wal deleted file mode 100644 index 9e117ae..0000000 Binary files a/asset_dev/sfx/mechanical_door.aup3-wal and /dev/null differ diff --git a/assets/sfx/footsteps/grunk/grunk1.wav b/assets/sfx/footsteps/grunk/grunk1.wav new file mode 100644 index 0000000..67c8696 Binary files /dev/null and b/assets/sfx/footsteps/grunk/grunk1.wav differ diff --git a/assets/sfx/footsteps/grunk/grunk1.wav.import b/assets/sfx/footsteps/grunk/grunk1.wav.import new file mode 100644 index 0000000..3b95ab2 --- /dev/null +++ b/assets/sfx/footsteps/grunk/grunk1.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://tlmmikytpp6r" +path="res://.godot/imported/grunk1.wav-bd52b5c2c311b3ac2d168133a66e115d.sample" + +[deps] + +source_file="res://assets/sfx/footsteps/grunk/grunk1.wav" +dest_files=["res://.godot/imported/grunk1.wav-bd52b5c2c311b3ac2d168133a66e115d.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/footsteps/grunk/grunk2.wav b/assets/sfx/footsteps/grunk/grunk2.wav new file mode 100644 index 0000000..2f88a9c Binary files /dev/null and b/assets/sfx/footsteps/grunk/grunk2.wav differ diff --git a/assets/sfx/footsteps/grunk/grunk2.wav.import b/assets/sfx/footsteps/grunk/grunk2.wav.import new file mode 100644 index 0000000..24be383 --- /dev/null +++ b/assets/sfx/footsteps/grunk/grunk2.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://dmscjvx66fxlf" +path="res://.godot/imported/grunk2.wav-a45a2bc9fb219818c07548021cc2541a.sample" + +[deps] + +source_file="res://assets/sfx/footsteps/grunk/grunk2.wav" +dest_files=["res://.godot/imported/grunk2.wav-a45a2bc9fb219818c07548021cc2541a.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/footsteps/grunk/grunk3.wav b/assets/sfx/footsteps/grunk/grunk3.wav new file mode 100644 index 0000000..60a87e7 Binary files /dev/null and b/assets/sfx/footsteps/grunk/grunk3.wav differ diff --git a/assets/sfx/footsteps/grunk/grunk3.wav.import b/assets/sfx/footsteps/grunk/grunk3.wav.import new file mode 100644 index 0000000..2ebe46e --- /dev/null +++ b/assets/sfx/footsteps/grunk/grunk3.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://dmqyajdgxld0o" +path="res://.godot/imported/grunk3.wav-252122fced628008dbb7cd192545111b.sample" + +[deps] + +source_file="res://assets/sfx/footsteps/grunk/grunk3.wav" +dest_files=["res://.godot/imported/grunk3.wav-252122fced628008dbb7cd192545111b.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/footsteps/grunk/grunk4.wav b/assets/sfx/footsteps/grunk/grunk4.wav new file mode 100644 index 0000000..e42d5bf Binary files /dev/null and b/assets/sfx/footsteps/grunk/grunk4.wav differ diff --git a/assets/sfx/footsteps/grunk/grunk4.wav.import b/assets/sfx/footsteps/grunk/grunk4.wav.import new file mode 100644 index 0000000..d2f4205 --- /dev/null +++ b/assets/sfx/footsteps/grunk/grunk4.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://djdixjel10yn1" +path="res://.godot/imported/grunk4.wav-6bed7493bcbb4f9c0e5465ab36b7a847.sample" + +[deps] + +source_file="res://assets/sfx/footsteps/grunk/grunk4.wav" +dest_files=["res://.godot/imported/grunk4.wav-6bed7493bcbb4f9c0e5465ab36b7a847.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/footsteps/grunk/grunk5.wav b/assets/sfx/footsteps/grunk/grunk5.wav new file mode 100644 index 0000000..2cab3ed Binary files /dev/null and b/assets/sfx/footsteps/grunk/grunk5.wav differ diff --git a/assets/sfx/footsteps/grunk/grunk5.wav.import b/assets/sfx/footsteps/grunk/grunk5.wav.import new file mode 100644 index 0000000..090a3c2 --- /dev/null +++ b/assets/sfx/footsteps/grunk/grunk5.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://4mbqcr8vmd5c" +path="res://.godot/imported/grunk5.wav-1cc1d241834c620d0bd372b7bad0d0a5.sample" + +[deps] + +source_file="res://assets/sfx/footsteps/grunk/grunk5.wav" +dest_files=["res://.godot/imported/grunk5.wav-1cc1d241834c620d0bd372b7bad0d0a5.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/player/footsteps/foot_controller.gd b/src/player/footsteps/foot_controller.gd index 6c54bce..b8b40ff 100644 --- a/src/player/footsteps/foot_controller.gd +++ b/src/player/footsteps/foot_controller.gd @@ -1,12 +1,13 @@ class_name FootController extends Node3D @onready var metal: AudioStreamPlayer3D = $Metal +@onready var grunk: AudioStreamPlayer3D = $Grunk func get_player_for_material(surface_material: SurfaceMaterial.Type) -> AudioStreamPlayer3D: match surface_material: SurfaceMaterial.Type.GRUNK: - pass # TODO + return grunk SurfaceMaterial.Type.PLASTIC: pass # TODO SurfaceMaterial.Type.METAL: diff --git a/src/player/player.tscn b/src/player/player.tscn index dec2e76..2fb9a79 100644 --- a/src/player/player.tscn +++ b/src/player/player.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=36 format=3 uid="uid://bwe2jdmvinhqd"] +[gd_scene load_steps=43 format=3 uid="uid://bwe2jdmvinhqd"] [ext_resource type="Script" uid="uid://buwh0g1ga2aka" path="res://src/player/player.gd" id="1_npueo"] [ext_resource type="Script" uid="uid://cx1yt0drthpw3" path="res://src/player/camera_controller.gd" id="2_veeqv"] @@ -17,10 +17,15 @@ [ext_resource type="AudioStream" uid="uid://bpdnw4qgbp6kj" path="res://assets/sfx/footsteps/metal/metal9.wav" id="14_4uy46"] [ext_resource type="AudioStream" uid="uid://eagr344y4coh" path="res://assets/sfx/footsteps/metal/metal11.wav" id="15_k60ra"] [ext_resource type="AudioStream" uid="uid://bguwbr0nlhgkl" path="res://assets/sfx/footsteps/metal/metal2.wav" id="16_a4vah"] +[ext_resource type="AudioStream" uid="uid://tlmmikytpp6r" path="res://assets/sfx/footsteps/grunk/grunk1.wav" id="17_a4vah"] [ext_resource type="AudioStream" uid="uid://co83ygaa4d65u" path="res://assets/sfx/footsteps/metal/metal4.wav" id="17_vwi60"] [ext_resource type="AudioStream" uid="uid://dkx88wqwfvfst" path="res://assets/sfx/footsteps/metal/metal6.wav" id="18_o04tx"] +[ext_resource type="AudioStream" uid="uid://dmqyajdgxld0o" path="res://assets/sfx/footsteps/grunk/grunk3.wav" id="18_vwi60"] [ext_resource type="AudioStream" uid="uid://bo3klycfvvq2q" path="res://assets/sfx/footsteps/metal/metal8.wav" id="19_j2873"] +[ext_resource type="AudioStream" uid="uid://4mbqcr8vmd5c" path="res://assets/sfx/footsteps/grunk/grunk5.wav" id="19_o04tx"] [ext_resource type="AudioStream" uid="uid://btiyoi1ipofd" path="res://assets/sfx/footsteps/metal/metal10.wav" id="20_dpt0q"] +[ext_resource type="AudioStream" uid="uid://dmscjvx66fxlf" path="res://assets/sfx/footsteps/grunk/grunk2.wav" id="25_j2873"] +[ext_resource type="AudioStream" uid="uid://djdixjel10yn1" path="res://assets/sfx/footsteps/grunk/grunk4.wav" id="26_dpt0q"] [sub_resource type="Animation" id="Animation_x42xx"] length = 0.001 @@ -172,6 +177,14 @@ stream_3/stream = ExtResource("13_5efpn") stream_4/stream = ExtResource("14_4uy46") stream_5/stream = ExtResource("15_k60ra") +[sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_wcxbk"] +playback_mode = 1 +random_pitch = 1.1 +streams_count = 3 +stream_0/stream = ExtResource("17_a4vah") +stream_1/stream = ExtResource("18_vwi60") +stream_2/stream = ExtResource("19_o04tx") + [sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_ylhto"] random_pitch = 1.1 streams_count = 5 @@ -181,6 +194,14 @@ stream_2/stream = ExtResource("18_o04tx") stream_3/stream = ExtResource("19_j2873") stream_4/stream = ExtResource("20_dpt0q") +[sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_p6grl"] +playback_mode = 1 +random_pitch = 1.1 +streams_count = 3 +stream_0/stream = ExtResource("25_j2873") +stream_1/stream = ExtResource("26_dpt0q") +stream_2/stream = ExtResource("17_a4vah") + [node name="Player" type="CharacterBody3D"] script = ExtResource("1_npueo") @@ -267,6 +288,11 @@ stream = SubResource("AudioStreamRandomizer_8ydov") volume_db = -42.0 bus = &"SFX" +[node name="Grunk" type="AudioStreamPlayer3D" parent="FootstepController/LeftFoot"] +stream = SubResource("AudioStreamRandomizer_wcxbk") +volume_db = -20.0 +bus = &"SFX" + [node name="RightFoot" type="Node3D" parent="FootstepController"] unique_name_in_owner = true transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.4, 0, 0) @@ -277,6 +303,12 @@ stream = SubResource("AudioStreamRandomizer_ylhto") volume_db = -42.0 bus = &"SFX" +[node name="Grunk" type="AudioStreamPlayer3D" parent="FootstepController/RightFoot"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.8, 0, 0) +stream = SubResource("AudioStreamRandomizer_p6grl") +volume_db = -20.0 +bus = &"SFX" + [node name="FootCast" type="RayCast3D" parent="FootstepController"] unique_name_in_owner = true transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.0518835, 0) diff --git a/vault/TODO.md b/vault/TODO.md index 2235e8f..8f1c3f6 100644 --- a/vault/TODO.md +++ b/vault/TODO.md @@ -50,7 +50,7 @@ - [ ] prop clear glitter - [x] metal footsteps - [ ] plastic footsteps - - [ ] grunk footsteps + - [x] grunk footsteps - [x] beam noises - [x] spray noises - [ ] switch klaxon diff --git a/vault/assets/asset credits.md b/vault/assets/asset credits.md index 6e6822a..bcb4898 100644 --- a/vault/assets/asset credits.md +++ b/vault/assets/asset credits.md @@ -1,18 +1,27 @@ - SFX - "Walking on Metal" - author: Sanderboah + - CC0 - retrieved from https://freesound.org/people/Sanderboah/sounds/696374/ - assets/sfx/footsteps/metal/metal*.wav - "Click_Electronic_04.wav" - author: LittleRobotSoundFactory + - CC BY 4.0 - retrieved from https://freesound.org/people/LittleRobotSoundFactory/sounds/288956/ - assets/sfx/click_electronic_04.wav - "Air Hiss" - author: Jofae + - CC0 - retrieved from https://freesound.org/people/Jofae/sounds/367125/ - assets/sfx/air_hiss.wav - modified - "Heavy Mechanical Door Open" - author: lowpolygon + - CC0 - retrieved from https://freesound.org/people/lowpolygon/sounds/421722/ - - assets/sfx/mechanical_door.wav \ No newline at end of file + - assets/sfx/mechanical_door.wav + - "Footsteps_Mountain_Boots_Mud_Mono.wav" + - author: Nox_Sound + - CC0 + - retrieved from https://freesound.org/people/Nox_Sound/sounds/548384/ + - assets/sfx/footsteps/grunk/grunk*.wav \ No newline at end of file