diff --git a/common/audio_manager/assets/sfx/movement/movement.wav b/common/audio_manager/assets/sfx/movement/movement.wav new file mode 100644 index 0000000..69851ab Binary files /dev/null and b/common/audio_manager/assets/sfx/movement/movement.wav differ diff --git a/common/audio_manager/assets/sfx/movement/movement.wav.import b/common/audio_manager/assets/sfx/movement/movement.wav.import new file mode 100644 index 0000000..5be0420 --- /dev/null +++ b/common/audio_manager/assets/sfx/movement/movement.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://cv5avkd3qekt7" +path="res://.godot/imported/movement.wav-5172908d78e3619625b5599572afbbff.sample" + +[deps] + +source_file="res://common/audio_manager/assets/sfx/movement/movement.wav" +dest_files=["res://.godot/imported/movement.wav-5172908d78e3619625b5599572afbbff.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=2 diff --git a/common/audio_manager/audio_manager.tscn b/common/audio_manager/audio_manager.tscn index 200693a..7926e2a 100644 --- a/common/audio_manager/audio_manager.tscn +++ b/common/audio_manager/audio_manager.tscn @@ -155,6 +155,11 @@ stream = ExtResource("6_8204s") unique_name_in_owner = true stream = ExtResource("7_spekb") +[node name="Ship" type="AudioStreamPlayer" parent="Ambiances" unique_id=1564186965] +unique_name_in_owner = true +stream = ExtResource("8_tuvql") +volume_db = -3.0 + [node name="Musics" type="Node" parent="." unique_id=1450527710] unique_name_in_owner = true @@ -189,11 +194,6 @@ unique_name_in_owner = true stream = ExtResource("7_tuvql") bus = &"Music" -[node name="Ship" type="AudioStreamPlayer" parent="Musics" unique_id=1165150318] -unique_name_in_owner = true -stream = ExtResource("8_tuvql") -volume_db = -3.0 - [node name="Sfx" type="Node" parent="." unique_id=2023641207] unique_name_in_owner = true diff --git a/common/audio_manager/scripts/audio_manager.gd b/common/audio_manager/scripts/audio_manager.gd index cfaef2c..f800f6c 100644 --- a/common/audio_manager/scripts/audio_manager.gd +++ b/common/audio_manager/scripts/audio_manager.gd @@ -48,16 +48,16 @@ func _on_change_scene(scene : Scene): play_music_alone(first_phase) queue_music(loop_phase, first_phase) "COCKPIT": - play_music_alone("Ship", true) + play_ambiance_alone("Ship", true, 5.0) "ASTRA": stop_all_musics() - play_ambiance_alone("Astra", false, 5.0) + play_ambiance_alone("Astra", false) "GARAGE": stop_all_musics() - play_ambiance_alone("Astra", false, 5.0) + play_ambiance_alone("Astra", false) "BOREA": stop_all_musics() - play_ambiance_alone("Borea", false, 5.0) + play_ambiance_alone("Borea", false) # Fonction s'exécutant à chaque début de timeline func _on_timeline_started(): @@ -80,6 +80,7 @@ func _on_timeline_started(): func _on_timeline_ended(): if SceneManager.actual_scene: change_ambiances_volume() + stop_ambiance("Demeter") # Joue la musique définie par player_name, arrête toute les autres musiques immédiatement # - player_name : Nom de la Node dans la scène Godot sous la node Musics à jouer