diff --git a/assets/sfx/tools/collect1.wav b/assets/sfx/tools/collect1.wav deleted file mode 100644 index dafeb56..0000000 --- a/assets/sfx/tools/collect1.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:775629b34c7458a9a81eb25e1572b668a94d0d2fc141e44aa1746150d87a472a -size 192542 diff --git a/assets/sfx/tools/collect1.wav.import b/assets/sfx/tools/collect1.wav.import deleted file mode 100644 index 92b1a7e..0000000 --- a/assets/sfx/tools/collect1.wav.import +++ /dev/null @@ -1,24 +0,0 @@ -[remap] - -importer="wav" -type="AudioStreamWAV" -uid="uid://dxstv7gr5n2yg" -path="res://.godot/imported/collect1.wav-11646d00ef9f7f39c8a9fae841f61c4f.sample" - -[deps] - -source_file="res://assets/sfx/tools/collect1.wav" -dest_files=["res://.godot/imported/collect1.wav-11646d00ef9f7f39c8a9fae841f61c4f.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/tools/collect2.wav b/assets/sfx/tools/collect2.wav deleted file mode 100644 index 17d0370..0000000 --- a/assets/sfx/tools/collect2.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f6dde25a3b7bd2c4131efb6a6fd0c6e4e177234365f9e903b40d0f763fb9887d -size 188732 diff --git a/assets/sfx/tools/collect2.wav.import b/assets/sfx/tools/collect2.wav.import deleted file mode 100644 index 28edadc..0000000 --- a/assets/sfx/tools/collect2.wav.import +++ /dev/null @@ -1,24 +0,0 @@ -[remap] - -importer="wav" -type="AudioStreamWAV" -uid="uid://b4prjqpwjpv7p" -path="res://.godot/imported/collect2.wav-cf3cbf3e79a99d102ddf430dfdd5dce7.sample" - -[deps] - -source_file="res://assets/sfx/tools/collect2.wav" -dest_files=["res://.godot/imported/collect2.wav-cf3cbf3e79a99d102ddf430dfdd5dce7.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/tools/collect3.wav b/assets/sfx/tools/collect3.wav deleted file mode 100644 index 7ea1fac..0000000 --- a/assets/sfx/tools/collect3.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b7f890a3c09ecfabe479d9ca6e4a90cdfe07a205733265077882fb3e739ea10b -size 175034 diff --git a/assets/sfx/tools/collect4.wav b/assets/sfx/tools/collect4.wav deleted file mode 100644 index 9d04bee..0000000 --- a/assets/sfx/tools/collect4.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:40e11f305191868936ffece394b9644cc31a74185066336cfd0a5c9db1900fe3 -size 207548 diff --git a/assets/sfx/tools/collect4.wav.import b/assets/sfx/tools/collect4.wav.import deleted file mode 100644 index 0bbb0a5..0000000 --- a/assets/sfx/tools/collect4.wav.import +++ /dev/null @@ -1,24 +0,0 @@ -[remap] - -importer="wav" -type="AudioStreamWAV" -uid="uid://bpx8hu288l8pe" -path="res://.godot/imported/collect4.wav-a71eb8ba5bdd639c52d02fa1a3726783.sample" - -[deps] - -source_file="res://assets/sfx/tools/collect4.wav" -dest_files=["res://.godot/imported/collect4.wav-a71eb8ba5bdd639c52d02fa1a3726783.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/tools/collect5.wav b/assets/sfx/tools/collect5.wav new file mode 100644 index 0000000..2403d6e --- /dev/null +++ b/assets/sfx/tools/collect5.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6e56b3f53897d4fad4b8ffd1e6d392538a35d996ee3397d8d47cc4a7564d0f42 +size 325142 diff --git a/assets/sfx/tools/collect3.wav.import b/assets/sfx/tools/collect5.wav.import similarity index 50% rename from assets/sfx/tools/collect3.wav.import rename to assets/sfx/tools/collect5.wav.import index ede7273..0f2d5f8 100644 --- a/assets/sfx/tools/collect3.wav.import +++ b/assets/sfx/tools/collect5.wav.import @@ -2,13 +2,13 @@ importer="wav" type="AudioStreamWAV" -uid="uid://cpkatef4t1pwx" -path="res://.godot/imported/collect3.wav-7676f4d20a076c2b18b80ecc0b3ca293.sample" +uid="uid://cof6pg6yadsac" +path="res://.godot/imported/collect5.wav-9560532de8bcb52b4f7fb8f0325d4125.sample" [deps] -source_file="res://assets/sfx/tools/collect3.wav" -dest_files=["res://.godot/imported/collect3.wav-7676f4d20a076c2b18b80ecc0b3ca293.sample"] +source_file="res://assets/sfx/tools/collect5.wav" +dest_files=["res://.godot/imported/collect5.wav-9560532de8bcb52b4f7fb8f0325d4125.sample"] [params] diff --git a/src/player/grunk_collection_sfx/grunk_collection_sfx.gd b/src/player/grunk_collection_sfx/grunk_collection_sfx.gd index 332dbdc..f76fad3 100644 --- a/src/player/grunk_collection_sfx/grunk_collection_sfx.gd +++ b/src/player/grunk_collection_sfx/grunk_collection_sfx.gd @@ -27,7 +27,6 @@ func on_grunk_collected(delta: float) -> void: _counter = interval var delay := randfn(delay_mean, delay_st_dev) get_tree().create_timer(delay).timeout.connect(play) - print_debug("Playing collect sfx in: ", delay) _counter -= delta diff --git a/src/player/grunk_collection_sfx/grunk_collection_sfx.tscn b/src/player/grunk_collection_sfx/grunk_collection_sfx.tscn index b7ce6c0..26e9fd6 100644 --- a/src/player/grunk_collection_sfx/grunk_collection_sfx.tscn +++ b/src/player/grunk_collection_sfx/grunk_collection_sfx.tscn @@ -1,22 +1,16 @@ -[gd_scene load_steps=7 format=3 uid="uid://cbtmhu787diev"] +[gd_scene load_steps=4 format=3 uid="uid://cbtmhu787diev"] -[ext_resource type="AudioStream" uid="uid://dxstv7gr5n2yg" path="res://assets/sfx/tools/collect1.wav" id="1_h705l"] -[ext_resource type="AudioStream" uid="uid://b4prjqpwjpv7p" path="res://assets/sfx/tools/collect2.wav" id="2_uq3q4"] -[ext_resource type="AudioStream" uid="uid://cpkatef4t1pwx" path="res://assets/sfx/tools/collect3.wav" id="3_h5hmg"] -[ext_resource type="AudioStream" uid="uid://bpx8hu288l8pe" path="res://assets/sfx/tools/collect4.wav" id="4_8ycea"] +[ext_resource type="AudioStream" uid="uid://cof6pg6yadsac" path="res://assets/sfx/tools/collect5.wav" id="1_y7it3"] [ext_resource type="Script" uid="uid://dwt66u7ua1to4" path="res://src/player/grunk_collection_sfx/grunk_collection_sfx.gd" id="5_ihwko"] -[sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_bgxyk"] -random_pitch = 1.1 -streams_count = 4 -stream_0/stream = ExtResource("1_h705l") -stream_1/stream = ExtResource("2_uq3q4") -stream_2/stream = ExtResource("3_h5hmg") -stream_3/stream = ExtResource("4_8ycea") +[sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_y7it3"] +random_pitch = 1.2 +streams_count = 1 +stream_0/stream = ExtResource("1_y7it3") [node name="GrunkCollectionSFX" type="AudioStreamPlayer"] -stream = SubResource("AudioStreamRandomizer_bgxyk") -max_polyphony = 4 +stream = SubResource("AudioStreamRandomizer_y7it3") +volume_db = -6.0 script = ExtResource("5_ihwko") [node name="Cooldown" type="Timer" parent="."] diff --git a/vault/assets/asset credits.md b/vault/assets/asset credits.md index 723bf4a..3780469 100644 --- a/vault/assets/asset credits.md +++ b/vault/assets/asset credits.md @@ -122,12 +122,6 @@ - retrieved from https://freesound.org/people/geodylabs/sounds/122810/ - assets/sfx/tools/spray.wav - modified - - "thumping_on_a_plastic_bottle.wav" - - author: joedeshon - - CC BY 4.0 - - retrieved from https://freesound.org/people/joedeshon/sounds/635106/ - - assets/sfx/tools/collect*.wav - - modified - Fonts - Silkscreen - author: Jason Kottke