From f0ad263e571c0aa261bf6eae13ec8d1acd709b94 Mon Sep 17 00:00:00 2001 From: Tiger Jove Date: Wed, 21 Jan 2026 18:01:56 +0100 Subject: [PATCH] fix: godot chopped up music streams, and I found a lot of pcm compressed stuff --- .../youth_room/audio/Moving Loop.wav.import | 2 +- .../youth_room/audio/Voice Loop.wav.import | 2 +- .../youth_room/audio/Youth Loop.wav.import | 2 +- .../youth_room/audio/draven-de.wav.import | 2 +- .../youth_room/youth_room.tscn | 4 ---- .../youth_room/youth_room_scene_player.gd | 20 ++++++++++++++++--- 6 files changed, 21 insertions(+), 11 deletions(-) diff --git a/src/base-environments/youth_room/audio/Moving Loop.wav.import b/src/base-environments/youth_room/audio/Moving Loop.wav.import index 35254c7..38dc4da 100644 --- a/src/base-environments/youth_room/audio/Moving Loop.wav.import +++ b/src/base-environments/youth_room/audio/Moving Loop.wav.import @@ -21,4 +21,4 @@ edit/normalize=false edit/loop_mode=2 edit/loop_begin=0 edit/loop_end=-1 -compress/mode=0 +compress/mode=2 diff --git a/src/base-environments/youth_room/audio/Voice Loop.wav.import b/src/base-environments/youth_room/audio/Voice Loop.wav.import index ea67368..2b7ba16 100644 --- a/src/base-environments/youth_room/audio/Voice Loop.wav.import +++ b/src/base-environments/youth_room/audio/Voice Loop.wav.import @@ -21,4 +21,4 @@ edit/normalize=false edit/loop_mode=2 edit/loop_begin=0 edit/loop_end=-1 -compress/mode=0 +compress/mode=2 diff --git a/src/base-environments/youth_room/audio/Youth Loop.wav.import b/src/base-environments/youth_room/audio/Youth Loop.wav.import index 70589a0..a47cca0 100644 --- a/src/base-environments/youth_room/audio/Youth Loop.wav.import +++ b/src/base-environments/youth_room/audio/Youth Loop.wav.import @@ -21,4 +21,4 @@ edit/normalize=false edit/loop_mode=2 edit/loop_begin=0 edit/loop_end=-1 -compress/mode=0 +compress/mode=2 diff --git a/src/base-environments/youth_room/audio/draven-de.wav.import b/src/base-environments/youth_room/audio/draven-de.wav.import index a06687f..2d7ca15 100644 --- a/src/base-environments/youth_room/audio/draven-de.wav.import +++ b/src/base-environments/youth_room/audio/draven-de.wav.import @@ -21,4 +21,4 @@ edit/normalize=false edit/loop_mode=0 edit/loop_begin=0 edit/loop_end=-1 -compress/mode=0 +compress/mode=2 diff --git a/src/base-environments/youth_room/youth_room.tscn b/src/base-environments/youth_room/youth_room.tscn index e35aa54..52fabf2 100644 --- a/src/base-environments/youth_room/youth_room.tscn +++ b/src/base-environments/youth_room/youth_room.tscn @@ -685,23 +685,19 @@ bus = &"text" [node name="Moving" type="AudioStreamPlayer" parent="logic/SceneAnimationPlayer"] stream = ExtResource("8_egnow") bus = &"music" -playback_type = 1 [node name="Childhood" type="AudioStreamPlayer" parent="logic/SceneAnimationPlayer"] stream = ExtResource("9_i8mqk") volume_db = -80.0 bus = &"music" -playback_type = 1 [node name="VoiceTraining" type="AudioStreamPlayer" parent="logic/SceneAnimationPlayer"] stream = ExtResource("10_wwwdq") volume_db = -80.0 bus = &"music" -playback_type = 1 [node name="Jui_Jutsu" type="AudioStreamPlayer" parent="logic/SceneAnimationPlayer"] bus = &"music" -playback_type = 1 [node name="starlight_mesh" type="MeshInstance3D" parent="logic/SceneAnimationPlayer"] transform = Transform3D(0.999, 0, 0, 0, 0.999, 0, 0, 0, 0.999, 0, 0, 0) diff --git a/src/base-environments/youth_room/youth_room_scene_player.gd b/src/base-environments/youth_room/youth_room_scene_player.gd index f5e0c91..ca5f7d9 100644 --- a/src/base-environments/youth_room/youth_room_scene_player.gd +++ b/src/base-environments/youth_room/youth_room_scene_player.gd @@ -8,11 +8,21 @@ func _ready() -> void: Scenes.scene_finished.connect(_on_scene_finished) func start_soundtrack(): - $Moving.play(70) - $Childhood.play(70) - $VoiceTraining.play(70) + _fade_in($Moving) + _fade_in($Childhood,) + _fade_in($VoiceTraining) + + var tween := create_tween() + tween.tween_property($Moving, "volume_db", 0, 3.0) + + +func _fade_in(audio_stream : AudioStreamPlayer) -> void: + if not audio_stream.playing: + audio_stream.volume_db = -80 + audio_stream.play(70) func _on_scene_starting(scene_id: Scenes.id, _repeat: bool) -> void: + print_debug("YouthRoomScenePlayer._on_scene_starting(%s)" % Scenes.id.keys()[scene_id]) # Handle scene-specific music # Note: Chest animation is now handled by YouthRoom.prepare_scene_start() @@ -25,6 +35,7 @@ func _on_scene_starting(scene_id: Scenes.id, _repeat: bool) -> void: play("jui_jutsu_music") Scenes.id.YOUTH_DRAVEN: play("draeven") + _: pass func _on_scene_finished(scene_id: Scenes.id, _repeat: bool) -> void: print_debug("YouthRoomScenePlayer._on_scene_finished(%s)" % Scenes.id.keys()[scene_id]) @@ -34,9 +45,12 @@ func _on_scene_finished(scene_id: Scenes.id, _repeat: bool) -> void: play_backwards("childhood_music") Scenes.id.YOUTH_VOICE_TRAINING: play_backwards("voice_music") + Scenes.id.YOUTH_JUI_JUTSU: + play_backwards("jui_jutsu_music") queue("RESET") + func play(anim_name: StringName = "", a: float = -1, b: float = 1, c: bool = false) -> void: print_debug("YouthRoomScenePlayer.play(%s)" % anim_name) super.play(anim_name, a, b, c)