diff --git a/common/audio_manager/assets/morceaux/niveau/forest_phase_1.ogg b/common/audio_manager/assets/morceaux/niveau/forest_phase_1.ogg new file mode 100644 index 0000000..707fad9 Binary files /dev/null and b/common/audio_manager/assets/morceaux/niveau/forest_phase_1.ogg differ diff --git a/common/audio_manager/assets/morceaux/niveau/forest_phase_1.ogg.import b/common/audio_manager/assets/morceaux/niveau/forest_phase_1.ogg.import new file mode 100644 index 0000000..ec748b4 --- /dev/null +++ b/common/audio_manager/assets/morceaux/niveau/forest_phase_1.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://dsphn6dbbd55a" +path="res://.godot/imported/forest_phase_1.ogg-6fd2e255642e47e98a5560b5a2d1ea56.oggvorbisstr" + +[deps] + +source_file="res://common/audio_manager/assets/morceaux/niveau/forest_phase_1.ogg" +dest_files=["res://.godot/imported/forest_phase_1.ogg-6fd2e255642e47e98a5560b5a2d1ea56.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/common/audio_manager/assets/morceaux/niveau/forest_phase_2.ogg b/common/audio_manager/assets/morceaux/niveau/forest_phase_2.ogg new file mode 100644 index 0000000..848536e Binary files /dev/null and b/common/audio_manager/assets/morceaux/niveau/forest_phase_2.ogg differ diff --git a/common/audio_manager/assets/morceaux/niveau/forest_phase_2.ogg.import b/common/audio_manager/assets/morceaux/niveau/forest_phase_2.ogg.import new file mode 100644 index 0000000..6a0a21d --- /dev/null +++ b/common/audio_manager/assets/morceaux/niveau/forest_phase_2.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://ccimypx71o4g6" +path="res://.godot/imported/forest_phase_2.ogg-1497e4a80f7f2adb0670888710e5438a.oggvorbisstr" + +[deps] + +source_file="res://common/audio_manager/assets/morceaux/niveau/forest_phase_2.ogg" +dest_files=["res://.godot/imported/forest_phase_2.ogg-1497e4a80f7f2adb0670888710e5438a.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/common/audio_manager/assets/morceaux/niveau/truck_music.ogg.import b/common/audio_manager/assets/morceaux/niveau/truck_music.ogg.import deleted file mode 100644 index a951a24..0000000 --- a/common/audio_manager/assets/morceaux/niveau/truck_music.ogg.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="oggvorbisstr" -type="AudioStreamOggVorbis" -uid="uid://dadg6o6dl2k6t" -path="res://.godot/imported/truck_music.ogg-71e4f19f9a59a19e62e72df06380f7df.oggvorbisstr" - -[deps] - -source_file="res://common/audio_manager/assets/morceaux/autres/truck_music.ogg" -dest_files=["res://.godot/imported/truck_music.ogg-71e4f19f9a59a19e62e72df06380f7df.oggvorbisstr"] - -[params] - -loop=false -loop_offset=0 -bpm=0 -beat_count=0 -bar_beats=4 diff --git a/common/audio_manager/audio_manager.tscn b/common/audio_manager/audio_manager.tscn index 5d51504..d2eb19c 100644 --- a/common/audio_manager/audio_manager.tscn +++ b/common/audio_manager/audio_manager.tscn @@ -10,8 +10,10 @@ [ext_resource type="AudioStream" uid="uid://cwu71o0sl2vto" path="res://common/audio_manager/assets/ambiance/dialogues/ambiance_Demeter.ogg" id="6_8204s"] [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://dsphn6dbbd55a" path="res://common/audio_manager/assets/morceaux/niveau/forest_phase_1.ogg" id="9_am7i4"] [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://ccimypx71o4g6" path="res://common/audio_manager/assets/morceaux/niveau/forest_phase_2.ogg" id="10_tq535"] [ext_resource type="AudioStream" uid="uid://llxrlwfccywb" path="res://common/audio_manager/assets/sfx/dig/dig_3.wav" id="11_wtvls"] [ext_resource type="AudioStream" uid="uid://b8inedx4yjslw" path="res://common/audio_manager/assets/sfx/drop/drop_1.wav" id="12_4hp8f"] [ext_resource type="AudioStream" uid="uid://8nmr5vifkt1f" path="res://common/audio_manager/assets/sfx/harvest/harvest_1.wav" id="13_xoaox"] @@ -35,6 +37,8 @@ stream_2 = ExtResource("4_tuvql") stream_count = 4 stream_0 = ExtResource("5_ajci6") stream_1 = ExtResource("4_2fduo") +stream_2 = ExtResource("9_am7i4") +stream_3 = ExtResource("10_tq535") [sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_kfbah"] streams_count = 3 diff --git a/common/audio_manager/scripts/audio_manager.gd b/common/audio_manager/scripts/audio_manager.gd index a5debfb..dcb8eb6 100644 --- a/common/audio_manager/scripts/audio_manager.gd +++ b/common/audio_manager/scripts/audio_manager.gd @@ -35,7 +35,7 @@ func _on_change_scene(scene : Scene): play_ambiance("Exterior") "COCKPIT": play_music("Ship") - "ASTRA_BASE": + "ASTRA": play_ambiance("Astra") func _on_timeline_started():