From acde73921c32dfa00be4ee6482512d056f4ecfdd Mon Sep 17 00:00:00 2001 From: Rob Kelly Date: Thu, 28 Aug 2025 10:42:36 -0600 Subject: [PATCH] New grunk collection SFX --- asset_dev/sfx/collection_pops_v0.wav | 3 ++ asset_dev/sfx/grunk_collection_pops_v2.wav | 3 ++ .../grunk/grunk_collection_squelch_1_v2.wav | 3 ++ .../grunk_collection_squelch_1_v2.wav.import | 24 +++++++++++++ .../grunk/grunk_collection_squelch_2_v2.wav | 3 ++ .../grunk_collection_squelch_2_v2.wav.import | 24 +++++++++++++ .../grunk/grunk_collection_squelch_3_v2.wav | 3 ++ .../grunk_collection_squelch_3_v2.wav.import | 24 +++++++++++++ .../sfx/grunk/grunk_collection_squelch_v1.wav | 3 ++ .../grunk_collection_squelch_v1.wav.import | 24 +++++++++++++ .../sfx/grunk/grunk_collection_squelch_v2.wav | 3 ++ .../grunk_collection_squelch_v2.wav.import | 24 +++++++++++++ .../old_collect2.wav} | 0 .../old_collect2.wav.import} | 6 ++-- .../old_collect5.wav} | 0 .../old_collect5.wav.import} | 6 ++-- assets/sfx/tools/{ => collect_v0}/pop.wav | 0 .../sfx/tools/{ => collect_v0}/pop.wav.import | 6 ++-- assets/sfx/tools/collect_v1/collect1.wav | 3 ++ .../sfx/tools/collect_v1/collect1.wav.import | 24 +++++++++++++ assets/sfx/tools/collect_v1/collect2.wav | 3 ++ .../sfx/tools/collect_v1/collect2.wav.import | 24 +++++++++++++ assets/sfx/tools/collect_v1/collect3.wav | 3 ++ .../sfx/tools/collect_v1/collect3.wav.import | 24 +++++++++++++ assets/sfx/tools/collect_v1/collect4.wav | 3 ++ .../sfx/tools/collect_v1/collect4.wav.import | 24 +++++++++++++ assets/sfx/tools/collect_v1/collect5.wav | 3 ++ .../sfx/tools/collect_v1/collect5.wav.import | 24 +++++++++++++ assets/sfx/tools/collect_v2/collect1.wav | 3 ++ .../sfx/tools/collect_v2/collect1.wav.import | 24 +++++++++++++ assets/sfx/tools/collect_v2/collect2.wav | 3 ++ .../sfx/tools/collect_v2/collect2.wav.import | 24 +++++++++++++ assets/sfx/tools/collect_v2/collect3.wav | 3 ++ .../sfx/tools/collect_v2/collect3.wav.import | 24 +++++++++++++ assets/sfx/tools/collect_v2/collect4.wav | 3 ++ .../sfx/tools/collect_v2/collect4.wav.import | 24 +++++++++++++ assets/sfx/tools/collect_v2/collect5.wav | 3 ++ .../sfx/tools/collect_v2/collect5.wav.import | 24 +++++++++++++ assets/sfx/tools/collect_v2/collect6.wav | 3 ++ .../sfx/tools/collect_v2/collect6.wav.import | 24 +++++++++++++ assets/sfx/tools/collect_v2/collect7.wav | 3 ++ .../sfx/tools/collect_v2/collect7.wav.import | 24 +++++++++++++ .../grunk_splatter/grunk_splatter.tscn | 10 +++--- .../grunk_collection_sfx.tscn | 34 +++++++++++++++---- 44 files changed, 505 insertions(+), 22 deletions(-) create mode 100644 asset_dev/sfx/collection_pops_v0.wav create mode 100644 asset_dev/sfx/grunk_collection_pops_v2.wav create mode 100644 assets/sfx/grunk/grunk_collection_squelch_1_v2.wav create mode 100644 assets/sfx/grunk/grunk_collection_squelch_1_v2.wav.import create mode 100644 assets/sfx/grunk/grunk_collection_squelch_2_v2.wav create mode 100644 assets/sfx/grunk/grunk_collection_squelch_2_v2.wav.import create mode 100644 assets/sfx/grunk/grunk_collection_squelch_3_v2.wav create mode 100644 assets/sfx/grunk/grunk_collection_squelch_3_v2.wav.import create mode 100644 assets/sfx/grunk/grunk_collection_squelch_v1.wav create mode 100644 assets/sfx/grunk/grunk_collection_squelch_v1.wav.import create mode 100644 assets/sfx/grunk/grunk_collection_squelch_v2.wav create mode 100644 assets/sfx/grunk/grunk_collection_squelch_v2.wav.import rename assets/sfx/tools/{collect2.wav => collect_v0/old_collect2.wav} (100%) rename assets/sfx/tools/{collect2.wav.import => collect_v0/old_collect2.wav.import} (53%) rename assets/sfx/tools/{collect5.wav => collect_v0/old_collect5.wav} (100%) rename assets/sfx/tools/{collect5.wav.import => collect_v0/old_collect5.wav.import} (53%) rename assets/sfx/tools/{ => collect_v0}/pop.wav (100%) rename assets/sfx/tools/{ => collect_v0}/pop.wav.import (55%) create mode 100644 assets/sfx/tools/collect_v1/collect1.wav create mode 100644 assets/sfx/tools/collect_v1/collect1.wav.import create mode 100644 assets/sfx/tools/collect_v1/collect2.wav create mode 100644 assets/sfx/tools/collect_v1/collect2.wav.import create mode 100644 assets/sfx/tools/collect_v1/collect3.wav create mode 100644 assets/sfx/tools/collect_v1/collect3.wav.import create mode 100644 assets/sfx/tools/collect_v1/collect4.wav create mode 100644 assets/sfx/tools/collect_v1/collect4.wav.import create mode 100644 assets/sfx/tools/collect_v1/collect5.wav create mode 100644 assets/sfx/tools/collect_v1/collect5.wav.import create mode 100644 assets/sfx/tools/collect_v2/collect1.wav create mode 100644 assets/sfx/tools/collect_v2/collect1.wav.import create mode 100644 assets/sfx/tools/collect_v2/collect2.wav create mode 100644 assets/sfx/tools/collect_v2/collect2.wav.import create mode 100644 assets/sfx/tools/collect_v2/collect3.wav create mode 100644 assets/sfx/tools/collect_v2/collect3.wav.import create mode 100644 assets/sfx/tools/collect_v2/collect4.wav create mode 100644 assets/sfx/tools/collect_v2/collect4.wav.import create mode 100644 assets/sfx/tools/collect_v2/collect5.wav create mode 100644 assets/sfx/tools/collect_v2/collect5.wav.import create mode 100644 assets/sfx/tools/collect_v2/collect6.wav create mode 100644 assets/sfx/tools/collect_v2/collect6.wav.import create mode 100644 assets/sfx/tools/collect_v2/collect7.wav create mode 100644 assets/sfx/tools/collect_v2/collect7.wav.import diff --git a/asset_dev/sfx/collection_pops_v0.wav b/asset_dev/sfx/collection_pops_v0.wav new file mode 100644 index 0000000..477c738 --- /dev/null +++ b/asset_dev/sfx/collection_pops_v0.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1b055a673586240f38377c971fab681f85d9a687f42d68d957ec3df776767ce3 +size 4216776 diff --git a/asset_dev/sfx/grunk_collection_pops_v2.wav b/asset_dev/sfx/grunk_collection_pops_v2.wav new file mode 100644 index 0000000..9274b3f --- /dev/null +++ b/asset_dev/sfx/grunk_collection_pops_v2.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:86f5aeb4f76cd26b5314c3806772d8faa56c0d0a1a2d51b27f194d05eadad561 +size 4289868 diff --git a/assets/sfx/grunk/grunk_collection_squelch_1_v2.wav b/assets/sfx/grunk/grunk_collection_squelch_1_v2.wav new file mode 100644 index 0000000..5ae5db4 --- /dev/null +++ b/assets/sfx/grunk/grunk_collection_squelch_1_v2.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4f9cef255114ce1e6eaf3814b68168b381e3c9fc075c0def4d19d273e56b6878 +size 75258 diff --git a/assets/sfx/grunk/grunk_collection_squelch_1_v2.wav.import b/assets/sfx/grunk/grunk_collection_squelch_1_v2.wav.import new file mode 100644 index 0000000..7650941 --- /dev/null +++ b/assets/sfx/grunk/grunk_collection_squelch_1_v2.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://dcjt0re7onrvk" +path="res://.godot/imported/grunk_collection_squelch_1_v2.wav-2949cdd645c17a8cd5dce0c2f4aedec9.sample" + +[deps] + +source_file="res://assets/sfx/grunk/grunk_collection_squelch_1_v2.wav" +dest_files=["res://.godot/imported/grunk_collection_squelch_1_v2.wav-2949cdd645c17a8cd5dce0c2f4aedec9.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/grunk/grunk_collection_squelch_2_v2.wav b/assets/sfx/grunk/grunk_collection_squelch_2_v2.wav new file mode 100644 index 0000000..1e6b27c --- /dev/null +++ b/assets/sfx/grunk/grunk_collection_squelch_2_v2.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:caea66e445567041d96fa2bfedb8132b91128f2a850bbd10659834f1f01156a8 +size 106398 diff --git a/assets/sfx/grunk/grunk_collection_squelch_2_v2.wav.import b/assets/sfx/grunk/grunk_collection_squelch_2_v2.wav.import new file mode 100644 index 0000000..075361e --- /dev/null +++ b/assets/sfx/grunk/grunk_collection_squelch_2_v2.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://dkdgnt6ow2d45" +path="res://.godot/imported/grunk_collection_squelch_2_v2.wav-9079bb2f07e036a7976c68ea23859462.sample" + +[deps] + +source_file="res://assets/sfx/grunk/grunk_collection_squelch_2_v2.wav" +dest_files=["res://.godot/imported/grunk_collection_squelch_2_v2.wav-9079bb2f07e036a7976c68ea23859462.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/grunk/grunk_collection_squelch_3_v2.wav b/assets/sfx/grunk/grunk_collection_squelch_3_v2.wav new file mode 100644 index 0000000..b9527bf --- /dev/null +++ b/assets/sfx/grunk/grunk_collection_squelch_3_v2.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ad3b96d9c608c98af8dac73164cc1d1d649f1ee39e68326766e359fd36c4fe12 +size 105282 diff --git a/assets/sfx/grunk/grunk_collection_squelch_3_v2.wav.import b/assets/sfx/grunk/grunk_collection_squelch_3_v2.wav.import new file mode 100644 index 0000000..a603da8 --- /dev/null +++ b/assets/sfx/grunk/grunk_collection_squelch_3_v2.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://dyokb48axh7tw" +path="res://.godot/imported/grunk_collection_squelch_3_v2.wav-0278ce8105cf87e4e55550c4191e3284.sample" + +[deps] + +source_file="res://assets/sfx/grunk/grunk_collection_squelch_3_v2.wav" +dest_files=["res://.godot/imported/grunk_collection_squelch_3_v2.wav-0278ce8105cf87e4e55550c4191e3284.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/grunk/grunk_collection_squelch_v1.wav b/assets/sfx/grunk/grunk_collection_squelch_v1.wav new file mode 100644 index 0000000..c78b39f --- /dev/null +++ b/assets/sfx/grunk/grunk_collection_squelch_v1.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:60af042b62bddb73925722e864330fa59da7a7229a81cdca0236ee8c27529fa0 +size 114384 diff --git a/assets/sfx/grunk/grunk_collection_squelch_v1.wav.import b/assets/sfx/grunk/grunk_collection_squelch_v1.wav.import new file mode 100644 index 0000000..4e8c3db --- /dev/null +++ b/assets/sfx/grunk/grunk_collection_squelch_v1.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://34b1ljbojwps" +path="res://.godot/imported/grunk_collection_squelch_v1.wav-0adeabb9ed25feb872e0c90d11bd272d.sample" + +[deps] + +source_file="res://assets/sfx/grunk/grunk_collection_squelch_v1.wav" +dest_files=["res://.godot/imported/grunk_collection_squelch_v1.wav-0adeabb9ed25feb872e0c90d11bd272d.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/grunk/grunk_collection_squelch_v2.wav b/assets/sfx/grunk/grunk_collection_squelch_v2.wav new file mode 100644 index 0000000..fcbe604 --- /dev/null +++ b/assets/sfx/grunk/grunk_collection_squelch_v2.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d30709269b921256389dab870843c4bfd0d70e73cb9ab8acd6e70b70f7666829 +size 73314 diff --git a/assets/sfx/grunk/grunk_collection_squelch_v2.wav.import b/assets/sfx/grunk/grunk_collection_squelch_v2.wav.import new file mode 100644 index 0000000..3f4ac12 --- /dev/null +++ b/assets/sfx/grunk/grunk_collection_squelch_v2.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://2dow2fwx2pka" +path="res://.godot/imported/grunk_collection_squelch_v2.wav-ab2ea89bb19ecd28593021b2e1deae3f.sample" + +[deps] + +source_file="res://assets/sfx/grunk/grunk_collection_squelch_v2.wav" +dest_files=["res://.godot/imported/grunk_collection_squelch_v2.wav-ab2ea89bb19ecd28593021b2e1deae3f.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/collect_v0/old_collect2.wav similarity index 100% rename from assets/sfx/tools/collect2.wav rename to assets/sfx/tools/collect_v0/old_collect2.wav diff --git a/assets/sfx/tools/collect2.wav.import b/assets/sfx/tools/collect_v0/old_collect2.wav.import similarity index 53% rename from assets/sfx/tools/collect2.wav.import rename to assets/sfx/tools/collect_v0/old_collect2.wav.import index 3a4d857..b6471d9 100644 --- a/assets/sfx/tools/collect2.wav.import +++ b/assets/sfx/tools/collect_v0/old_collect2.wav.import @@ -3,12 +3,12 @@ importer="wav" type="AudioStreamWAV" uid="uid://cj6rj8ujl60e3" -path="res://.godot/imported/collect2.wav-cf3cbf3e79a99d102ddf430dfdd5dce7.sample" +path="res://.godot/imported/old_collect2.wav-de018cd9ffe1f93da753a11c274844f6.sample" [deps] -source_file="res://assets/sfx/tools/collect2.wav" -dest_files=["res://.godot/imported/collect2.wav-cf3cbf3e79a99d102ddf430dfdd5dce7.sample"] +source_file="res://assets/sfx/tools/collect_v0/old_collect2.wav" +dest_files=["res://.godot/imported/old_collect2.wav-de018cd9ffe1f93da753a11c274844f6.sample"] [params] diff --git a/assets/sfx/tools/collect5.wav b/assets/sfx/tools/collect_v0/old_collect5.wav similarity index 100% rename from assets/sfx/tools/collect5.wav rename to assets/sfx/tools/collect_v0/old_collect5.wav diff --git a/assets/sfx/tools/collect5.wav.import b/assets/sfx/tools/collect_v0/old_collect5.wav.import similarity index 53% rename from assets/sfx/tools/collect5.wav.import rename to assets/sfx/tools/collect_v0/old_collect5.wav.import index 0f2d5f8..cfb30ff 100644 --- a/assets/sfx/tools/collect5.wav.import +++ b/assets/sfx/tools/collect_v0/old_collect5.wav.import @@ -3,12 +3,12 @@ importer="wav" type="AudioStreamWAV" uid="uid://cof6pg6yadsac" -path="res://.godot/imported/collect5.wav-9560532de8bcb52b4f7fb8f0325d4125.sample" +path="res://.godot/imported/old_collect5.wav-7b786be0789247cf4cb23e05606cab6b.sample" [deps] -source_file="res://assets/sfx/tools/collect5.wav" -dest_files=["res://.godot/imported/collect5.wav-9560532de8bcb52b4f7fb8f0325d4125.sample"] +source_file="res://assets/sfx/tools/collect_v0/old_collect5.wav" +dest_files=["res://.godot/imported/old_collect5.wav-7b786be0789247cf4cb23e05606cab6b.sample"] [params] diff --git a/assets/sfx/tools/pop.wav b/assets/sfx/tools/collect_v0/pop.wav similarity index 100% rename from assets/sfx/tools/pop.wav rename to assets/sfx/tools/collect_v0/pop.wav diff --git a/assets/sfx/tools/pop.wav.import b/assets/sfx/tools/collect_v0/pop.wav.import similarity index 55% rename from assets/sfx/tools/pop.wav.import rename to assets/sfx/tools/collect_v0/pop.wav.import index 157ff46..eabec25 100644 --- a/assets/sfx/tools/pop.wav.import +++ b/assets/sfx/tools/collect_v0/pop.wav.import @@ -3,12 +3,12 @@ importer="wav" type="AudioStreamWAV" uid="uid://bmoel4uoncjgj" -path="res://.godot/imported/pop.wav-a125111ccb70bb530d8a9a1e740af87f.sample" +path="res://.godot/imported/pop.wav-81386f04b1599b43fee06e2ba4594d44.sample" [deps] -source_file="res://assets/sfx/tools/pop.wav" -dest_files=["res://.godot/imported/pop.wav-a125111ccb70bb530d8a9a1e740af87f.sample"] +source_file="res://assets/sfx/tools/collect_v0/pop.wav" +dest_files=["res://.godot/imported/pop.wav-81386f04b1599b43fee06e2ba4594d44.sample"] [params] diff --git a/assets/sfx/tools/collect_v1/collect1.wav b/assets/sfx/tools/collect_v1/collect1.wav new file mode 100644 index 0000000..e271615 --- /dev/null +++ b/assets/sfx/tools/collect_v1/collect1.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c5ac3222761cbe01e952dff61f95207d563e7e7ba89515e848ef6543580cbc4e +size 103052 diff --git a/assets/sfx/tools/collect_v1/collect1.wav.import b/assets/sfx/tools/collect_v1/collect1.wav.import new file mode 100644 index 0000000..8b6fcb3 --- /dev/null +++ b/assets/sfx/tools/collect_v1/collect1.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://nyq402onyv1x" +path="res://.godot/imported/collect1.wav-4f94139411aa2e022fa512feac945418.sample" + +[deps] + +source_file="res://assets/sfx/tools/collect_v1/collect1.wav" +dest_files=["res://.godot/imported/collect1.wav-4f94139411aa2e022fa512feac945418.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/collect_v1/collect2.wav b/assets/sfx/tools/collect_v1/collect2.wav new file mode 100644 index 0000000..0b7022d --- /dev/null +++ b/assets/sfx/tools/collect_v1/collect2.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:11951253831263e86b3c650e3b4f0c00ee52009762878ce8582344854771e201 +size 196610 diff --git a/assets/sfx/tools/collect_v1/collect2.wav.import b/assets/sfx/tools/collect_v1/collect2.wav.import new file mode 100644 index 0000000..f2af43f --- /dev/null +++ b/assets/sfx/tools/collect_v1/collect2.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://ugwfrswtgat5" +path="res://.godot/imported/collect2.wav-f386ae9351d542ec0b99417a1f1e0874.sample" + +[deps] + +source_file="res://assets/sfx/tools/collect_v1/collect2.wav" +dest_files=["res://.godot/imported/collect2.wav-f386ae9351d542ec0b99417a1f1e0874.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/collect_v1/collect3.wav b/assets/sfx/tools/collect_v1/collect3.wav new file mode 100644 index 0000000..4715b90 --- /dev/null +++ b/assets/sfx/tools/collect_v1/collect3.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7b5c5afa699a72460a96820539817aff8f9c7fb61b02253c6d10de9019bf18cf +size 195950 diff --git a/assets/sfx/tools/collect_v1/collect3.wav.import b/assets/sfx/tools/collect_v1/collect3.wav.import new file mode 100644 index 0000000..68197de --- /dev/null +++ b/assets/sfx/tools/collect_v1/collect3.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://buj0k1uj6b7f3" +path="res://.godot/imported/collect3.wav-c0683ddd575fd657d1ecab8dc454800c.sample" + +[deps] + +source_file="res://assets/sfx/tools/collect_v1/collect3.wav" +dest_files=["res://.godot/imported/collect3.wav-c0683ddd575fd657d1ecab8dc454800c.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/collect_v1/collect4.wav b/assets/sfx/tools/collect_v1/collect4.wav new file mode 100644 index 0000000..162be89 --- /dev/null +++ b/assets/sfx/tools/collect_v1/collect4.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bbf2b3d334ac6bb85595a9bdf9d59998dc22f6f5cc37b052d678e9d03a3954f7 +size 104030 diff --git a/assets/sfx/tools/collect_v1/collect4.wav.import b/assets/sfx/tools/collect_v1/collect4.wav.import new file mode 100644 index 0000000..c268572 --- /dev/null +++ b/assets/sfx/tools/collect_v1/collect4.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://c5mcojd3jbexf" +path="res://.godot/imported/collect4.wav-03bceb37d81375575851120b4ca0d6c1.sample" + +[deps] + +source_file="res://assets/sfx/tools/collect_v1/collect4.wav" +dest_files=["res://.godot/imported/collect4.wav-03bceb37d81375575851120b4ca0d6c1.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/collect_v1/collect5.wav b/assets/sfx/tools/collect_v1/collect5.wav new file mode 100644 index 0000000..5519090 --- /dev/null +++ b/assets/sfx/tools/collect_v1/collect5.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:42a547c157918e84d263471a3495dec13e591478faf71d17e4c8a0612178ebf1 +size 103346 diff --git a/assets/sfx/tools/collect_v1/collect5.wav.import b/assets/sfx/tools/collect_v1/collect5.wav.import new file mode 100644 index 0000000..07d11a7 --- /dev/null +++ b/assets/sfx/tools/collect_v1/collect5.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://c33rmsqdhn14b" +path="res://.godot/imported/collect5.wav-c295da752a08849bbdf711af715cd2d9.sample" + +[deps] + +source_file="res://assets/sfx/tools/collect_v1/collect5.wav" +dest_files=["res://.godot/imported/collect5.wav-c295da752a08849bbdf711af715cd2d9.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/collect_v2/collect1.wav b/assets/sfx/tools/collect_v2/collect1.wav new file mode 100644 index 0000000..b1f9d59 --- /dev/null +++ b/assets/sfx/tools/collect_v2/collect1.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ede215fec6f17383d0573c4e2eda215ee03a4345e3585c234a7b4b864ec87eb0 +size 103394 diff --git a/assets/sfx/tools/collect_v2/collect1.wav.import b/assets/sfx/tools/collect_v2/collect1.wav.import new file mode 100644 index 0000000..17631db --- /dev/null +++ b/assets/sfx/tools/collect_v2/collect1.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://bxwds22nlcjie" +path="res://.godot/imported/collect1.wav-cb8eabdf40e61a30c366af21e35be9f4.sample" + +[deps] + +source_file="res://assets/sfx/tools/collect_v2/collect1.wav" +dest_files=["res://.godot/imported/collect1.wav-cb8eabdf40e61a30c366af21e35be9f4.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/collect_v2/collect2.wav b/assets/sfx/tools/collect_v2/collect2.wav new file mode 100644 index 0000000..f347f33 --- /dev/null +++ b/assets/sfx/tools/collect_v2/collect2.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:edce02aa8838ebc389a648c89731b5b9bf5e45207e8f15a2ada6b591f7a32c13 +size 134876 diff --git a/assets/sfx/tools/collect_v2/collect2.wav.import b/assets/sfx/tools/collect_v2/collect2.wav.import new file mode 100644 index 0000000..fedfa0a --- /dev/null +++ b/assets/sfx/tools/collect_v2/collect2.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://dah5wy8rl1s81" +path="res://.godot/imported/collect2.wav-f9c240bb248cdc049e2a144310eee0f1.sample" + +[deps] + +source_file="res://assets/sfx/tools/collect_v2/collect2.wav" +dest_files=["res://.godot/imported/collect2.wav-f9c240bb248cdc049e2a144310eee0f1.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/collect_v2/collect3.wav b/assets/sfx/tools/collect_v2/collect3.wav new file mode 100644 index 0000000..31deff5 --- /dev/null +++ b/assets/sfx/tools/collect_v2/collect3.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d4ac3c65bb66b9bc780955973bf6075d4873da486aab4ad0155f022947aed3c0 +size 136148 diff --git a/assets/sfx/tools/collect_v2/collect3.wav.import b/assets/sfx/tools/collect_v2/collect3.wav.import new file mode 100644 index 0000000..64b8927 --- /dev/null +++ b/assets/sfx/tools/collect_v2/collect3.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://btb80wl6ydd1s" +path="res://.godot/imported/collect3.wav-fc8bea0fe9fb6b591c800be27924987f.sample" + +[deps] + +source_file="res://assets/sfx/tools/collect_v2/collect3.wav" +dest_files=["res://.godot/imported/collect3.wav-fc8bea0fe9fb6b591c800be27924987f.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/collect_v2/collect4.wav b/assets/sfx/tools/collect_v2/collect4.wav new file mode 100644 index 0000000..e306688 --- /dev/null +++ b/assets/sfx/tools/collect_v2/collect4.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6a1f463f05bd264655ffdb67a11f0785f1d0c8cd0997360852d6f943fefa80d7 +size 107582 diff --git a/assets/sfx/tools/collect_v2/collect4.wav.import b/assets/sfx/tools/collect_v2/collect4.wav.import new file mode 100644 index 0000000..2fb6926 --- /dev/null +++ b/assets/sfx/tools/collect_v2/collect4.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://cenvpkawd2dcv" +path="res://.godot/imported/collect4.wav-10737777fea54622fa97078f77445de1.sample" + +[deps] + +source_file="res://assets/sfx/tools/collect_v2/collect4.wav" +dest_files=["res://.godot/imported/collect4.wav-10737777fea54622fa97078f77445de1.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/collect_v2/collect5.wav b/assets/sfx/tools/collect_v2/collect5.wav new file mode 100644 index 0000000..906551d --- /dev/null +++ b/assets/sfx/tools/collect_v2/collect5.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a3f669c9fb8a7b3764cd5385167170acddfa03487fc7590113bdb04471001ad7 +size 103304 diff --git a/assets/sfx/tools/collect_v2/collect5.wav.import b/assets/sfx/tools/collect_v2/collect5.wav.import new file mode 100644 index 0000000..c51b74e --- /dev/null +++ b/assets/sfx/tools/collect_v2/collect5.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://bsnodw5vse22q" +path="res://.godot/imported/collect5.wav-97a3f3b5538f03de5cff29aa1fb25ab5.sample" + +[deps] + +source_file="res://assets/sfx/tools/collect_v2/collect5.wav" +dest_files=["res://.godot/imported/collect5.wav-97a3f3b5538f03de5cff29aa1fb25ab5.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/collect_v2/collect6.wav b/assets/sfx/tools/collect_v2/collect6.wav new file mode 100644 index 0000000..23e028a --- /dev/null +++ b/assets/sfx/tools/collect_v2/collect6.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:96815796c409136fac226819a5976451931b81a37eea36c7a92f5a89ea80398b +size 103934 diff --git a/assets/sfx/tools/collect_v2/collect6.wav.import b/assets/sfx/tools/collect_v2/collect6.wav.import new file mode 100644 index 0000000..3101fdd --- /dev/null +++ b/assets/sfx/tools/collect_v2/collect6.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://ehjjm123p877" +path="res://.godot/imported/collect6.wav-0a3f3af73ee7d4afb07a73b7868ca8b4.sample" + +[deps] + +source_file="res://assets/sfx/tools/collect_v2/collect6.wav" +dest_files=["res://.godot/imported/collect6.wav-0a3f3af73ee7d4afb07a73b7868ca8b4.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/collect_v2/collect7.wav b/assets/sfx/tools/collect_v2/collect7.wav new file mode 100644 index 0000000..c6ea216 --- /dev/null +++ b/assets/sfx/tools/collect_v2/collect7.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fb5b944967d4bd03f205fd2a3fed8bd9a3ebcac5af7dc1dad28b08f020d436e9 +size 115664 diff --git a/assets/sfx/tools/collect_v2/collect7.wav.import b/assets/sfx/tools/collect_v2/collect7.wav.import new file mode 100644 index 0000000..8907633 --- /dev/null +++ b/assets/sfx/tools/collect_v2/collect7.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://bmj0kkgqw2dhn" +path="res://.godot/imported/collect7.wav-06b124a21541c9f74c9e02d3d676595e.sample" + +[deps] + +source_file="res://assets/sfx/tools/collect_v2/collect7.wav" +dest_files=["res://.godot/imported/collect7.wav-06b124a21541c9f74c9e02d3d676595e.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/effects/grunk_splatter/grunk_splatter.tscn b/src/effects/grunk_splatter/grunk_splatter.tscn index b24b6d1..fbbe5a1 100644 --- a/src/effects/grunk_splatter/grunk_splatter.tscn +++ b/src/effects/grunk_splatter/grunk_splatter.tscn @@ -3,9 +3,9 @@ [ext_resource type="Texture2D" uid="uid://cgwgmxwjgwbwr" path="res://assets/particles/splatter_2.png" id="1_5xu2x"] [ext_resource type="Texture2D" uid="uid://bhoai6xv53tqm" path="res://assets/particles/splatter_1.png" id="2_bt63p"] [ext_resource type="Script" uid="uid://di5b65ehsfatj" path="res://src/effects/grunk_splatter/grunk_splatter.gd" id="2_grvat"] -[ext_resource type="AudioStream" uid="uid://di0j2xhgfc78s" path="res://assets/sfx/grunk/splat1.wav" id="3_t00bd"] -[ext_resource type="AudioStream" uid="uid://d1w5gfmjj7tjk" path="res://assets/sfx/grunk/splat2.wav" id="4_2iem1"] +[ext_resource type="AudioStream" uid="uid://dcjt0re7onrvk" path="res://assets/sfx/grunk/grunk_collection_squelch_1_v2.wav" id="4_opa8j"] [ext_resource type="Script" uid="uid://c5o1d2shq2qig" path="res://src/world/game_sound/game_sound_emitter.gd" id="5_2iem1"] +[ext_resource type="AudioStream" uid="uid://dyokb48axh7tw" path="res://assets/sfx/grunk/grunk_collection_squelch_3_v2.wav" id="5_m7td0"] [ext_resource type="PackedScene" uid="uid://c3iv00vmdqxp0" path="res://src/effects/grunk_dust/grunk_dust.tscn" id="7_opa8j"] [sub_resource type="Gradient" id="Gradient_5xu2x"] @@ -103,8 +103,8 @@ size = Vector2(2, 2) playback_mode = 1 random_pitch = 1.2 streams_count = 2 -stream_0/stream = ExtResource("3_t00bd") -stream_1/stream = ExtResource("4_2iem1") +stream_0/stream = ExtResource("4_opa8j") +stream_1/stream = ExtResource("5_m7td0") [sub_resource type="SphereShape3D" id="SphereShape3D_6adkd"] radius = 2.0 @@ -192,8 +192,6 @@ autostart = true [node name="SplatterSFX" type="AudioStreamPlayer3D" parent="."] unique_name_in_owner = true stream = SubResource("AudioStreamRandomizer_6adkd") -volume_db = -3.0 -unit_size = 6.0 autoplay = true bus = &"SFX" diff --git a/src/player/grunk_collection_sfx/grunk_collection_sfx.tscn b/src/player/grunk_collection_sfx/grunk_collection_sfx.tscn index bf0caef..a1110e2 100644 --- a/src/player/grunk_collection_sfx/grunk_collection_sfx.tscn +++ b/src/player/grunk_collection_sfx/grunk_collection_sfx.tscn @@ -1,22 +1,42 @@ -[gd_scene load_steps=5 format=3 uid="uid://cbtmhu787diev"] +[gd_scene load_steps=12 format=3 uid="uid://cbtmhu787diev"] -[ext_resource type="AudioStream" uid="uid://bmoel4uoncjgj" path="res://assets/sfx/tools/pop.wav" id="1_y7it3"] +[ext_resource type="AudioStream" uid="uid://bxwds22nlcjie" path="res://assets/sfx/tools/collect_v2/collect1.wav" id="1_uq3q4"] +[ext_resource type="AudioStream" uid="uid://dah5wy8rl1s81" path="res://assets/sfx/tools/collect_v2/collect2.wav" id="2_h5hmg"] +[ext_resource type="AudioStream" uid="uid://btb80wl6ydd1s" path="res://assets/sfx/tools/collect_v2/collect3.wav" id="3_8ycea"] +[ext_resource type="AudioStream" uid="uid://cenvpkawd2dcv" path="res://assets/sfx/tools/collect_v2/collect4.wav" id="4_ihwko"] +[ext_resource type="AudioStream" uid="uid://bsnodw5vse22q" path="res://assets/sfx/tools/collect_v2/collect5.wav" id="5_edpo6"] [ext_resource type="Script" uid="uid://dwt66u7ua1to4" path="res://src/player/grunk_collection_sfx/grunk_collection_sfx.gd" id="5_ihwko"] +[ext_resource type="AudioStream" uid="uid://cj6rj8ujl60e3" path="res://assets/sfx/tools/collect_v0/old_collect2.wav" id="6_h5hmg"] + +[sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_ckb8r"] +streams_count = 5 +stream_0/stream = ExtResource("1_uq3q4") +stream_1/stream = ExtResource("2_h5hmg") +stream_2/stream = ExtResource("3_8ycea") +stream_3/stream = ExtResource("4_ihwko") +stream_4/stream = ExtResource("5_edpo6") + +[sub_resource type="AudioStreamSynchronized" id="AudioStreamSynchronized_8ycea"] +stream_count = 2 +stream_0/stream = SubResource("AudioStreamRandomizer_ckb8r") +stream_0/volume = 0.0 +stream_1/stream = ExtResource("6_h5hmg") +stream_1/volume = -18.0 [sub_resource type="Curve" id="Curve_y7it3"] -_limits = [0.0, 2.4, 0.0, 1.0] -_data = [Vector2(0, 0.3), 0.0, 4.59122, 0, 0, Vector2(0.125, 0.5), 0.0, 0.0, 0, 0, Vector2(0.5, 0.5), 0.0, 0.0, 0, 0, Vector2(1, 1.23259), 5.30372, 0.0, 0, 0] +_limits = [0.0, 1.2, 0.0, 1.0] +_data = [Vector2(0, 0.5), 0.0, 4.59122, 0, 0, Vector2(0.125, 0.7), 0.342099, 0.342099, 0, 0, Vector2(0.826852, 0.824157), 0.481824, 0.481824, 0, 0, Vector2(1, 1.2), 3.17522, 0.0, 0, 0] point_count = 4 [sub_resource type="FastNoiseLite" id="FastNoiseLite_y7it3"] +frequency = 0.024 +domain_warp_enabled = true [node name="GrunkCollectionSFX" type="AudioStreamPlayer"] -stream = ExtResource("1_y7it3") -volume_db = -4.0 +stream = SubResource("AudioStreamSynchronized_8ycea") max_polyphony = 3 bus = &"SFX" script = ExtResource("5_ihwko") -delay_mean = 0.4 delay_st_dev = 0.2 base_pitch_curve = SubResource("Curve_y7it3") noise = SubResource("FastNoiseLite_y7it3")