diff --git a/assets/sfx/tools/collect2.wav b/assets/sfx/tools/collect2.wav new file mode 100644 index 0000000..a528eb1 --- /dev/null +++ b/assets/sfx/tools/collect2.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3444728590f03634e53eb1ec5a2bd2660fac1ab0202f3d852cf6c954d4364c06 +size 639020 diff --git a/assets/sfx/tools/collect2.wav.import b/assets/sfx/tools/collect2.wav.import new file mode 100644 index 0000000..3a4d857 --- /dev/null +++ b/assets/sfx/tools/collect2.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://cj6rj8ujl60e3" +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=0 diff --git a/assets/sfx/tools/collect5.wav b/assets/sfx/tools/collect5.wav index 2403d6e..b996c44 100644 --- a/assets/sfx/tools/collect5.wav +++ b/assets/sfx/tools/collect5.wav @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6e56b3f53897d4fad4b8ffd1e6d392538a35d996ee3397d8d47cc4a7564d0f42 -size 325142 +oid sha256:4070b778f94df5c4f74310c1e36878a270ca20124315dcb257509e3ca2da260f +size 325130 diff --git a/src/player/grunk_collection_sfx/grunk_collection_sfx.gd b/src/player/grunk_collection_sfx/grunk_collection_sfx.gd index 5e5e8f3..6014d79 100644 --- a/src/player/grunk_collection_sfx/grunk_collection_sfx.gd +++ b/src/player/grunk_collection_sfx/grunk_collection_sfx.gd @@ -1,15 +1,16 @@ extends AudioStreamPlayer -@export var interval := 200.0 +@export var interval := 160 -@export var max_delta := 2000.0 +@export var max_delta := 2800.0 -@export var delay_mean := 0.7 +@export var delay_mean := 0.6 @export var delay_st_dev := 0.1 -@export var counter_decay := 40.0 +@export var counter_decay := 140.0 -@export var pitch_variance := 0.15 +@export var base_pitch := 1.5 +@export var pitch_variance := 0.2 @export var noise_rate := 1.0 @export var noise: Noise @@ -41,5 +42,5 @@ func play_random() -> void: var noise_sample := clampf( 2 * noise.get_noise_1d(Engine.get_process_frames() * noise_rate), -1, 1 ) - pitch_scale = 1.0 + (pitch_variance * noise_sample) + pitch_scale = base_pitch + (pitch_variance * noise_sample) play() diff --git a/src/player/grunk_collection_sfx/grunk_collection_sfx.tscn b/src/player/grunk_collection_sfx/grunk_collection_sfx.tscn index 4418fcc..f5f38a7 100644 --- a/src/player/grunk_collection_sfx/grunk_collection_sfx.tscn +++ b/src/player/grunk_collection_sfx/grunk_collection_sfx.tscn @@ -1,13 +1,15 @@ [gd_scene load_steps=4 format=3 uid="uid://cbtmhu787diev"] -[ext_resource type="AudioStream" uid="uid://cof6pg6yadsac" path="res://assets/sfx/tools/collect5.wav" id="1_y7it3"] +[ext_resource type="AudioStream" uid="uid://cj6rj8ujl60e3" path="res://assets/sfx/tools/collect2.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="FastNoiseLite" id="FastNoiseLite_y7it3"] [node name="GrunkCollectionSFX" type="AudioStreamPlayer"] stream = ExtResource("1_y7it3") -volume_db = -6.0 +volume_db = -4.0 +max_polyphony = 3 +bus = &"SFX" script = ExtResource("5_ihwko") noise = SubResource("FastNoiseLite_y7it3")