diff --git a/common/audio_manager/scripts/audio_manager.gd b/common/audio_manager/scripts/audio_manager.gd index 6117e06..6b37e31 100644 --- a/common/audio_manager/scripts/audio_manager.gd +++ b/common/audio_manager/scripts/audio_manager.gd @@ -4,7 +4,7 @@ class_name AudioManagerInstance const MIN_VOLUME = -60. const MAX_VOLUME = 24. -const DEFAULT_FADE_TIME : float = 5 +const DEFAULT_FADE_TIME : float = 5.0 const REGION_FIRST_PHASE = [ "RegionForestPhase1", @@ -41,9 +41,9 @@ func _on_change_scene(scene : Scene): stop_all_musics() elif scene is RegionScene: play_ambiance("Exterior", false) - var level = GameInfo.game_data.current_run.level - var first_phase = REGION_FIRST_PHASE[level % len(REGION_FIRST_PHASE)] - var loop_phase = REGION_LOOP_PHASE[level % len(REGION_LOOP_PHASE)] + var region_level = GameInfo.game_data.current_region_data.region_level + var first_phase = REGION_FIRST_PHASE[region_level % len(REGION_FIRST_PHASE)] + var loop_phase = REGION_LOOP_PHASE[region_level % len(REGION_LOOP_PHASE)] play_music_alone(first_phase) queue_music(loop_phase, first_phase) elif scene is CockpitScene: @@ -51,13 +51,13 @@ func _on_change_scene(scene : Scene): play_ambiance_alone("Ship", true, 1.0) elif scene is AstraScene: stop_all_musics() - play_ambiance_alone("Astra", false) + play_ambiance_alone("Astra", false, 5.0) elif scene is GarageScene: stop_all_musics() play_ambiance_alone("Astra", false) elif scene is BoreaScene: stop_all_musics() - play_ambiance_alone("Borea", false) + play_ambiance_alone("Borea", false, 5.0) elif scene is VendingMachineScene: stop_all_musics() play_ambiance_alone("Borea", false)