aboutsummaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
Diffstat (limited to 'client')
-rw-r--r--client/audio/sound.gd9
1 files changed, 5 insertions, 4 deletions
diff --git a/client/audio/sound.gd b/client/audio/sound.gd
index d9c20600..7928f4a5 100644
--- a/client/audio/sound.gd
+++ b/client/audio/sound.gd
@@ -29,7 +29,8 @@ var dampen_target = 0.
var dampen_value = 0.
const VOLUME_MIN = -30.
-const FADE_SPEED = 20.
+const FADE_IN_SPEED = 200.
+const FADE_OUT_SPEED = 20.
const EFFECT_FADE_SPEED = 0.5
func set_music(filename, volume = 0., dampen = false):
@@ -55,10 +56,10 @@ func _process(dt: float):
for c in $Music.get_children():
if c is AudioStreamPlayer:
if c == current_music_player:
- if c.volume_db > volume_target: c.volume_db = max(volume_target, c.volume_db - dt * FADE_SPEED)
- else: c.volume_db = min(volume_target, c.volume_db + dt * FADE_SPEED)
+ if c.volume_db > volume_target: c.volume_db = max(volume_target, c.volume_db - dt * FADE_OUT_SPEED)
+ else: c.volume_db = min(volume_target, c.volume_db + dt * FADE_IN_SPEED)
else:
- c.volume_db -= dt * FADE_SPEED
+ c.volume_db -= dt * FADE_OUT_SPEED
if c.volume_db <= VOLUME_MIN: c.queue_free()
var prev_dampen = dampen_value