diff --git a/common/audio_manager/assets/ambiance/vaisseau/ship_ambiance.ogg b/common/audio_manager/assets/ambiance/vaisseau/ship_ambiance.ogg deleted file mode 100644 index a0a47d0..0000000 Binary files a/common/audio_manager/assets/ambiance/vaisseau/ship_ambiance.ogg and /dev/null differ diff --git a/common/audio_manager/assets/ambiance/vaisseau/ship_ambiance.ogg.import b/common/audio_manager/assets/ambiance/vaisseau/ship_ambiance.ogg.import deleted file mode 100644 index d5f4316..0000000 --- a/common/audio_manager/assets/ambiance/vaisseau/ship_ambiance.ogg.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="oggvorbisstr" -type="AudioStreamOggVorbis" -uid="uid://d3jou8c7c536c" -path="res://.godot/imported/ship_ambiance.ogg-7519c0f8acd35957bf6fd6e8d5af25fa.oggvorbisstr" - -[deps] - -source_file="res://common/audio_manager/assets/ambiance/vaisseau/ship_ambiance.ogg" -dest_files=["res://.godot/imported/ship_ambiance.ogg-7519c0f8acd35957bf6fd6e8d5af25fa.oggvorbisstr"] - -[params] - -loop=false -loop_offset=0 -bpm=0 -beat_count=0 -bar_beats=4 diff --git a/common/audio_manager/assets/ambiance/vaisseau/ship_music.ogg b/common/audio_manager/assets/ambiance/vaisseau/ship_music.ogg index 8b8cee2..9071c10 100644 Binary files a/common/audio_manager/assets/ambiance/vaisseau/ship_music.ogg and b/common/audio_manager/assets/ambiance/vaisseau/ship_music.ogg differ diff --git a/common/audio_manager/assets/morceaux/menu/main_menu.ogg b/common/audio_manager/assets/morceaux/menu/main_menu.ogg index a5d56cb..bd34e8f 100644 Binary files a/common/audio_manager/assets/morceaux/menu/main_menu.ogg and b/common/audio_manager/assets/morceaux/menu/main_menu.ogg differ diff --git a/common/audio_manager/audio_manager.tscn b/common/audio_manager/audio_manager.tscn index c7ca5b6..ce5c822 100644 --- a/common/audio_manager/audio_manager.tscn +++ b/common/audio_manager/audio_manager.tscn @@ -2,12 +2,12 @@ [ext_resource type="Script" uid="uid://2p5d6vogtn82" path="res://common/audio_manager/scripts/audio_manager.gd" id="1_0tvca"] [ext_resource type="AudioStream" uid="uid://dipnmlprwfo12" path="res://common/audio_manager/assets/ambiance/niveau/ambiance_phase_1.ogg" id="2_tuvql"] -[ext_resource type="AudioStream" uid="uid://dcbuhtc085q2x" path="res://common/audio_manager/assets/morceaux/niveau_v2/mines_phase_1.ogg" id="5_ajci6"] -[ext_resource type="AudioStream" uid="uid://bqwiaek5b5q00" path="res://common/audio_manager/assets/morceaux/niveau/forest_phase_2.ogg" id="6_ldyhq"] -[ext_resource type="AudioStream" uid="uid://d4lqhgf0lhgge" path="res://common/audio_manager/assets/morceaux/niveau/forest_phase_3.ogg" id="7_ol34x"] -[ext_resource type="AudioStream" uid="uid://bpf6witukorka" path="res://common/audio_manager/assets/morceaux/autres/main_menu.ogg" id="7_tuvql"] -[ext_resource type="AudioStream" uid="uid://dadg6o6dl2k6t" path="res://common/audio_manager/assets/morceaux/autres/truck_music.ogg" id="8_0e5ja"] -[ext_resource type="AudioStream" uid="uid://bnxsnege8qq6e" path="res://common/audio_manager/assets/morceaux/niveau/forest_phase_4.ogg" id="8_ajci6"] +[ext_resource type="AudioStream" uid="uid://bm0tdi6bd2e65" path="res://common/audio_manager/assets/ambiance/niveau/ambiance_phase_2.ogg" id="3_7uv4r"] +[ext_resource type="AudioStream" uid="uid://b1hut6lc1jevh" path="res://common/audio_manager/assets/morceaux/niveau/mines_phase_2.ogg" id="4_2fduo"] +[ext_resource type="AudioStream" uid="uid://dftxjfdqgsbd3" path="res://common/audio_manager/assets/ambiance/niveau/ambiance_phase_3.ogg" id="4_tuvql"] +[ext_resource type="AudioStream" uid="uid://dcbuhtc085q2x" path="res://common/audio_manager/assets/morceaux/niveau/mines_phase_1.ogg" id="5_ajci6"] +[ext_resource type="AudioStream" uid="uid://bpf6witukorka" path="res://common/audio_manager/assets/morceaux/menu/main_menu.ogg" id="7_tuvql"] +[ext_resource type="AudioStream" uid="uid://dadg6o6dl2k6t" path="res://common/audio_manager/assets/ambiance/vaisseau/ship_music.ogg" id="8_tuvql"] [ext_resource type="AudioStream" uid="uid://dfrp66a4isnt6" path="res://common/audio_manager/assets/sfx/dig/dig_1.wav" id="9_gv65y"] [ext_resource type="AudioStream" uid="uid://bdxkvaciw4mb3" path="res://common/audio_manager/assets/sfx/dig/dig_2.wav" id="10_n7o7n"] [ext_resource type="AudioStream" uid="uid://llxrlwfccywb" path="res://common/audio_manager/assets/sfx/dig/dig_3.wav" id="11_wtvls"] @@ -28,12 +28,16 @@ [ext_resource type="AudioStream" uid="uid://dd1uu6dd6sloe" path="res://common/audio_manager/assets/sfx/pickaxe/pickaxe_3.wav" id="26_xhon7"] [ext_resource type="AudioStream" uid="uid://eq7wufwnolto" path="res://common/audio_manager/assets/sfx/pickaxe/pickaxe_4.wav" id="27_3jg6d"] +[sub_resource type="AudioStreamPlaylist" id="AudioStreamPlaylist_8204s"] +stream_count = 3 +stream_0 = ExtResource("2_tuvql") +stream_1 = ExtResource("3_7uv4r") +stream_2 = ExtResource("4_tuvql") + [sub_resource type="AudioStreamPlaylist" id="AudioStreamPlaylist_ajci6"] stream_count = 4 stream_0 = ExtResource("5_ajci6") -stream_1 = ExtResource("6_ldyhq") -stream_2 = ExtResource("7_ol34x") -stream_3 = ExtResource("8_ajci6") +stream_1 = ExtResource("4_2fduo") [sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_kfbah"] streams_count = 3 @@ -83,7 +87,7 @@ unique_name_in_owner = true [node name="Exterior" type="AudioStreamPlayer" parent="Ambiance" unique_id=1405716780] unique_name_in_owner = true -stream = ExtResource("2_tuvql") +stream = SubResource("AudioStreamPlaylist_8204s") [node name="Musics" type="Node" parent="." unique_id=1450527710] unique_name_in_owner = true @@ -97,9 +101,10 @@ unique_name_in_owner = true stream = ExtResource("7_tuvql") bus = &"Music" -[node name="Truck" type="AudioStreamPlayer" parent="Musics" unique_id=1165150318] +[node name="Ship" type="AudioStreamPlayer" parent="Musics" unique_id=1165150318] unique_name_in_owner = true -stream = ExtResource("8_0e5ja") +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 a9fd174..4b7573d 100644 --- a/common/audio_manager/scripts/audio_manager.gd +++ b/common/audio_manager/scripts/audio_manager.gd @@ -84,7 +84,7 @@ func _on_change_scene(scene : Scene): play_music("Region", true) play_ambiance("Exterior", true) "COCKPIT": - play_music("Truck", true) + play_music("Ship") func _on_timeline_started(): var timeline_name = Dialogic.current_timeline.resource_path.split("/")[-1].trim_suffix(".dtl")