diff --git a/common/audio_manager/assets/morceaux/histoire/aqua.ogg b/common/audio_manager/assets/morceaux/histoire/aqua.ogg new file mode 100644 index 0000000..c621889 Binary files /dev/null and b/common/audio_manager/assets/morceaux/histoire/aqua.ogg differ diff --git a/common/audio_manager/assets/morceaux/histoire/aqua.ogg.import b/common/audio_manager/assets/morceaux/histoire/aqua.ogg.import new file mode 100644 index 0000000..e60ce1c --- /dev/null +++ b/common/audio_manager/assets/morceaux/histoire/aqua.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://cnkwobaxy22xx" +path="res://.godot/imported/aqua.ogg-fe17e4290e66a70a6ab8902b711f0305.oggvorbisstr" + +[deps] + +source_file="res://common/audio_manager/assets/morceaux/histoire/aqua.ogg" +dest_files=["res://.godot/imported/aqua.ogg-fe17e4290e66a70a6ab8902b711f0305.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/common/audio_manager/assets/morceaux/histoire/meeting_demeter.ogg b/common/audio_manager/assets/morceaux/histoire/borea.ogg similarity index 100% rename from common/audio_manager/assets/morceaux/histoire/meeting_demeter.ogg rename to common/audio_manager/assets/morceaux/histoire/borea.ogg diff --git a/common/audio_manager/assets/morceaux/histoire/meeting_demeter.ogg.import b/common/audio_manager/assets/morceaux/histoire/borea.ogg.import similarity index 50% rename from common/audio_manager/assets/morceaux/histoire/meeting_demeter.ogg.import rename to common/audio_manager/assets/morceaux/histoire/borea.ogg.import index 6a79d3f..7748ad5 100644 --- a/common/audio_manager/assets/morceaux/histoire/meeting_demeter.ogg.import +++ b/common/audio_manager/assets/morceaux/histoire/borea.ogg.import @@ -3,12 +3,12 @@ importer="oggvorbisstr" type="AudioStreamOggVorbis" uid="uid://ch8wnrckanydg" -path="res://.godot/imported/meeting_demeter.ogg-7dd58073d2ef5705a374bd8bb3634d37.oggvorbisstr" +path="res://.godot/imported/borea.ogg-b575bef16c730ed2e0563c2eb6862766.oggvorbisstr" [deps] -source_file="res://common/audio_manager/assets/morceaux/histoire/meeting_demeter.ogg" -dest_files=["res://.godot/imported/meeting_demeter.ogg-7dd58073d2ef5705a374bd8bb3634d37.oggvorbisstr"] +source_file="res://common/audio_manager/assets/morceaux/histoire/borea.ogg" +dest_files=["res://.godot/imported/borea.ogg-b575bef16c730ed2e0563c2eb6862766.oggvorbisstr"] [params] diff --git a/common/audio_manager/audio_manager.tscn b/common/audio_manager/audio_manager.tscn index 21f431c..b1cadff 100644 --- a/common/audio_manager/audio_manager.tscn +++ b/common/audio_manager/audio_manager.tscn @@ -12,7 +12,6 @@ [ext_resource type="AudioStream" uid="uid://dsphn6dbbd55a" path="res://common/audio_manager/assets/morceaux/niveau/forest_phase_1.ogg" id="6_6o1yh"] [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://klb32q3kjtkt" path="res://common/audio_manager/assets/ambiance/vending_room_base_relais/ambiance_vending_room_base_relais.ogg" id="7_ge2sc"] -[ext_resource type="AudioStream" uid="uid://c8gbtdul2x8ws" path="res://common/audio_manager/assets/ambiance/borea/ambiance_borea.ogg" id="7_spekb"] [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://bmwaw1yb8hucf" path="res://common/audio_manager/assets/ambiance/vaisseau/ship_music.ogg" id="8_tuvql"] [ext_resource type="AudioStream" uid="uid://ccimypx71o4g6" path="res://common/audio_manager/assets/morceaux/niveau/forest_phase_2.ogg" id="10_tq535"] @@ -21,6 +20,7 @@ [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://bdsghxlbtduuy" path="res://common/audio_manager/assets/morceaux/histoire/subterra.ogg" id="12_mrdk3"] [ext_resource type="AudioStream" uid="uid://cjbpfnlwcpjh0" path="res://common/audio_manager/assets/morceaux/niveau/forest_waiting.ogg" id="12_xmumj"] +[ext_resource type="AudioStream" uid="uid://cnkwobaxy22xx" path="res://common/audio_manager/assets/morceaux/histoire/aqua.ogg" id="13_mrdk3"] [ext_resource type="AudioStream" uid="uid://8nmr5vifkt1f" path="res://common/audio_manager/assets/sfx/harvest/harvest_1.wav" id="13_xoaox"] [ext_resource type="AudioStream" uid="uid://dgkdcq4j6fe3o" path="res://common/audio_manager/assets/sfx/harvest/harvest_2.wav" id="14_b5bgj"] [ext_resource type="AudioStream" uid="uid://dsfqhcrard8o4" path="res://common/audio_manager/assets/morceaux/niveau/desert_phase_2.ogg" id="14_lwdce"] @@ -41,7 +41,7 @@ [ext_resource type="AudioStream" uid="uid://cbm4r5bf7py11" path="res://common/audio_manager/assets/sfx/recharge/recharge_capsule_4.wav" id="21_ehr7m"] [ext_resource type="AudioStream" uid="uid://dq5qwydrca3vy" path="res://common/audio_manager/assets/sfx/recharge/recharge_capsule_5.wav" id="22_aedoe"] [ext_resource type="AudioStream" uid="uid://d1cpi438ep0ys" path="res://common/audio_manager/assets/sfx/announce/annnounce.wav" id="22_btfwx"] -[ext_resource type="AudioStream" uid="uid://ch8wnrckanydg" path="res://common/audio_manager/assets/morceaux/histoire/meeting_demeter.ogg" id="22_mrdk3"] +[ext_resource type="AudioStream" uid="uid://ch8wnrckanydg" path="res://common/audio_manager/assets/morceaux/histoire/borea.ogg" id="22_mrdk3"] [ext_resource type="AudioStream" uid="uid://bnwtgp8t46xwc" path="res://common/audio_manager/assets/sfx/recharge/recharge_capsule_6.wav" id="23_ge2sc"] [ext_resource type="AudioStream" uid="uid://bp3wsncvda5gl" path="res://common/audio_manager/assets/sfx/recharge/recharge_capsule_7.wav" id="24_yr73o"] [ext_resource type="AudioStream" uid="uid://8juy5ev3rdfh" path="res://common/audio_manager/assets/sfx/plant_points/plant_point_1.wav" id="29_ngi21"] @@ -177,8 +177,7 @@ volume_db = -5.0 [node name="Borea" type="AudioStreamPlayer" parent="Ambiances" unique_id=1857904648] unique_name_in_owner = true -stream = ExtResource("7_spekb") -volume_db = -5.0 +stream = ExtResource("22_mrdk3") [node name="Ship" type="AudioStreamPlayer" parent="Ambiances" unique_id=1564186965] unique_name_in_owner = true @@ -189,6 +188,10 @@ volume_db = -5.0 unique_name_in_owner = true stream = ExtResource("12_mrdk3") +[node name="Aqua" type="AudioStreamPlayer" parent="Ambiances" unique_id=2066946789] +unique_name_in_owner = true +stream = ExtResource("13_mrdk3") + [node name="Musics" type="Node" parent="." unique_id=1450527710] unique_name_in_owner = true @@ -245,10 +248,6 @@ stream = ExtResource("7_tuvql") volume_db = -5.0 bus = &"Music" -[node name="Meeting_demeter" type="AudioStreamPlayer" parent="Musics" unique_id=1066359159] -unique_name_in_owner = true -stream = ExtResource("22_mrdk3") - [node name="Sfx" type="Node" parent="." unique_id=2023641207] unique_name_in_owner = true