diff --git a/common/music/assets/niveau_forestier_phase_1.ogg b/common/music/assets/forest_phase_1.ogg similarity index 56% rename from common/music/assets/niveau_forestier_phase_1.ogg rename to common/music/assets/forest_phase_1.ogg index 04904d9..da8fa19 100644 Binary files a/common/music/assets/niveau_forestier_phase_1.ogg and b/common/music/assets/forest_phase_1.ogg differ diff --git a/common/music/assets/forest_phase_1.ogg.import b/common/music/assets/forest_phase_1.ogg.import new file mode 100644 index 0000000..864366b --- /dev/null +++ b/common/music/assets/forest_phase_1.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://diyefcv8tqa3r" +path="res://.godot/imported/forest_phase_1.ogg-08213a81a42ba2cf4c67c1bfac510e6b.oggvorbisstr" + +[deps] + +source_file="res://common/music/assets/forest_phase_1.ogg" +dest_files=["res://.godot/imported/forest_phase_1.ogg-08213a81a42ba2cf4c67c1bfac510e6b.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/common/music/assets/niveau_forestier_phase_1.ogg.import b/common/music/assets/niveau_forestier_phase_1.ogg.import deleted file mode 100644 index 3c93cf1..0000000 --- a/common/music/assets/niveau_forestier_phase_1.ogg.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="oggvorbisstr" -type="AudioStreamOggVorbis" -uid="uid://dnskjv3wty2ms" -path="res://.godot/imported/niveau_forestier_phase_1.ogg-7491c9a17746b2904cbf2752648c650d.oggvorbisstr" - -[deps] - -source_file="res://common/music/assets/niveau_forestier_phase_1.ogg" -dest_files=["res://.godot/imported/niveau_forestier_phase_1.ogg-7491c9a17746b2904cbf2752648c650d.oggvorbisstr"] - -[params] - -loop=true -loop_offset=0 -bpm=0 -beat_count=0 -bar_beats=4 diff --git a/common/music/music.tscn b/common/music/music.tscn index dec2a80..c19c963 100644 --- a/common/music/music.tscn +++ b/common/music/music.tscn @@ -1,9 +1,17 @@ -[gd_scene load_steps=2 format=3 uid="uid://b6hscxcrj065q"] +[gd_scene load_steps=3 format=3 uid="uid://b6hscxcrj065q"] -[ext_resource type="AudioStream" uid="uid://dnskjv3wty2ms" path="res://common/music/assets/niveau_forestier_phase_1.ogg" id="1_hmej1"] +[ext_resource type="AudioStream" uid="uid://diyefcv8tqa3r" path="res://common/music/assets/forest_phase_1.ogg" id="1_stre8"] +[ext_resource type="AudioStream" uid="uid://d1fyd5o331360" path="res://common/music/assets/vent.ogg" id="2_n52pk"] [node name="Music" type="Node"] -[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] -stream = ExtResource("1_hmej1") +[node name="AudioStreamPlayer_music" type="AudioStreamPlayer" parent="."] +stream = ExtResource("1_stre8") autoplay = true +stream_paused = true +parameters/looping = false + +[node name="AudioStreamPlayer2_ambient" type="AudioStreamPlayer" parent="."] +stream = ExtResource("2_n52pk") +autoplay = true +parameters/looping = false diff --git a/forest_phase_1.ogg b/forest_phase_1.ogg new file mode 100644 index 0000000..da8fa19 Binary files /dev/null and b/forest_phase_1.ogg differ diff --git a/forest_phase_1.ogg.import b/forest_phase_1.ogg.import new file mode 100644 index 0000000..75f632b --- /dev/null +++ b/forest_phase_1.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://c8s11jtg8q0jb" +path="res://.godot/imported/forest_phase_1.ogg-f46344e5c0426c0baaba2143d1f9c958.oggvorbisstr" + +[deps] + +source_file="res://forest_phase_1.ogg" +dest_files=["res://.godot/imported/forest_phase_1.ogg-f46344e5c0426c0baaba2143d1f9c958.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4