From f698256b17ba0ee96182ca2b49fc41568c27e807 Mon Sep 17 00:00:00 2001
From: tpart <tpart120@proton.me>
Date: Mon, 1 Jul 2024 18:34:27 +0200
Subject: Fix item sound playback system giving errors

---
 client/audio/play_random.gd            | 10 +++++++---
 client/map/items/item.gd               |  1 +
 client/player/character/character.tscn |  2 --
 client/player/effect.tscn              |  1 -
 4 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'client')

diff --git a/client/audio/play_random.gd b/client/audio/play_random.gd
index 0fd10889..d702756d 100644
--- a/client/audio/play_random.gd
+++ b/client/audio/play_random.gd
@@ -17,18 +17,22 @@ extends Node
 class_name PlayRandom
 
 @export var volume_db := 0.0
-@export var enable_attenuations := true
+@export var enable_attenuations := false
 
 var autoplay := false
-
-@onready var sounds = get_children()
+var manual_setup_called := false
+var sounds = []
 
 func _ready():
+	if manual_setup_called:
+		return
+	sounds = get_children()
 	for s: AudioStreamPlayer3D in sounds:
 		configure_player(s)
 
 func setup(new_sounds: Array):
 	# new_sounds should be an array of AudioStream
+	manual_setup_called = true
 	for s in new_sounds:
 		var player = AudioStreamPlayer3D.new()
 		player.stream = s
diff --git a/client/map/items/item.gd b/client/map/items/item.gd
index d5d2e1dc..d3acf200 100644
--- a/client/map/items/item.gd
+++ b/client/map/items/item.gd
@@ -27,6 +27,7 @@ func _init(owned_by_: Node3D):
 	progress_instance.visible = false
 	add_child(progress_instance)
 	add_child(sound_instance)
+	sound_instance.volume_db = -16
 	base.position = base_position()
 	add_child(base)
 	owned_by = owned_by_
diff --git a/client/player/character/character.tscn b/client/player/character/character.tscn
index 33846758..19eb3ce2 100644
--- a/client/player/character/character.tscn
+++ b/client/player/character/character.tscn
@@ -664,7 +664,6 @@ scale_amount_curve = SubResource("Curve_7ml8g")
 [node name="Steps" type="Node3D" parent="."]
 script = ExtResource("14_3rb6x")
 volume_db = -30.0
-enable_attenuations = false
 
 [node name="Step1" type="AudioStreamPlayer3D" parent="Steps"]
 stream = ExtResource("10_qpd6x")
@@ -678,7 +677,6 @@ stream = ExtResource("12_bj5ue")
 [node name="Boosts" type="Node3D" parent="."]
 script = ExtResource("14_3rb6x")
 volume_db = -12.0
-enable_attenuations = false
 
 [node name="Woosh1" type="AudioStreamPlayer3D" parent="Boosts"]
 stream = ExtResource("14_ikcec")
diff --git a/client/player/effect.tscn b/client/player/effect.tscn
index 748aa20e..a360d1a8 100644
--- a/client/player/effect.tscn
+++ b/client/player/effect.tscn
@@ -28,7 +28,6 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0)
 [node name="AngryGrunt" type="Node3D" parent="."]
 script = ExtResource("5_t2upj")
 volume_db = -8.0
-enable_attenuations = false
 
 [node name="Angry1" type="AudioStreamPlayer3D" parent="AngryGrunt"]
 stream = ExtResource("6_ou7uy")
-- 
cgit v1.2.3-70-g09d2