Compare commits

..

No commits in common. "7e00f54378511ce69790bbbf6c4e0e494e7cde76" and "c381e915b9b1bace4770c669f0546c60304e5502" have entirely different histories.

6 changed files with 11 additions and 49 deletions

BIN
assets/sfx/tools/collect2.wav (Stored with Git LFS)

Binary file not shown.

View File

@ -1,24 +0,0 @@
[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

BIN
assets/sfx/tools/collect5.wav (Stored with Git LFS)

Binary file not shown.

View File

@ -1,16 +1,15 @@
extends AudioStreamPlayer extends AudioStreamPlayer
@export var interval := 160 @export var interval := 200.0
@export var max_delta := 2800.0 @export var max_delta := 2000.0
@export var delay_mean := 0.6 @export var delay_mean := 0.7
@export var delay_st_dev := 0.1 @export var delay_st_dev := 0.1
@export var counter_decay := 140.0 @export var counter_decay := 40.0
@export var base_pitch_curve: Curve @export var pitch_variance := 0.15
@export var pitch_variance := 0.1618
@export var noise_rate := 1.0 @export var noise_rate := 1.0
@export var noise: Noise @export var noise: Noise
@ -42,6 +41,5 @@ func play_random() -> void:
var noise_sample := clampf( var noise_sample := clampf(
2 * noise.get_noise_1d(Engine.get_process_frames() * noise_rate), -1, 1 2 * noise.get_noise_1d(Engine.get_process_frames() * noise_rate), -1, 1
) )
var base_pitch := base_pitch_curve.sample(World.instance.manager.get_tank_fill_pct()) pitch_scale = 1.0 + (pitch_variance * noise_sample)
pitch_scale = base_pitch + (pitch_variance * noise_sample)
play() play()

View File

@ -1,22 +1,14 @@
[gd_scene load_steps=5 format=3 uid="uid://cbtmhu787diev"] [gd_scene load_steps=4 format=3 uid="uid://cbtmhu787diev"]
[ext_resource type="AudioStream" uid="uid://cj6rj8ujl60e3" path="res://assets/sfx/tools/collect2.wav" id="1_y7it3"] [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"] [ext_resource type="Script" uid="uid://dwt66u7ua1to4" path="res://src/player/grunk_collection_sfx/grunk_collection_sfx.gd" id="5_ihwko"]
[sub_resource type="Curve" id="Curve_y7it3"]
_limits = [0.0, 2.4, 0.0, 1.0]
_data = [Vector2(0, 1), 0.0, 8.88538, 0, 0, Vector2(0.125, 1.4), 0.0, 0.0, 0, 0, Vector2(0.5, 1.4), 0.0, 0.0, 0, 0, Vector2(1, 2.4), 6.54458, 0.0, 0, 0]
point_count = 4
[sub_resource type="FastNoiseLite" id="FastNoiseLite_y7it3"] [sub_resource type="FastNoiseLite" id="FastNoiseLite_y7it3"]
[node name="GrunkCollectionSFX" type="AudioStreamPlayer"] [node name="GrunkCollectionSFX" type="AudioStreamPlayer"]
stream = ExtResource("1_y7it3") stream = ExtResource("1_y7it3")
volume_db = -4.0 volume_db = -6.0
max_polyphony = 3
bus = &"SFX"
script = ExtResource("5_ihwko") script = ExtResource("5_ihwko")
base_pitch_curve = SubResource("Curve_y7it3")
noise = SubResource("FastNoiseLite_y7it3") noise = SubResource("FastNoiseLite_y7it3")
[node name="Cooldown" type="Timer" parent="."] [node name="Cooldown" type="Timer" parent="."]

View File

@ -837,4 +837,3 @@ stream = ExtResource("39_gsylq")
pitch_scale = 1.8 pitch_scale = 1.8
[node name="GrunkCollectionSFX" parent="." instance=ExtResource("40_utg71")] [node name="GrunkCollectionSFX" parent="." instance=ExtResource("40_utg71")]
interval = 160