diff --git a/common/music/assets/morceaux/forest_phase_3.ogg b/common/music/assets/morceaux/forest_phase_3.ogg new file mode 100644 index 0000000..79a8f74 Binary files /dev/null and b/common/music/assets/morceaux/forest_phase_3.ogg differ diff --git a/common/music/assets/morceaux/forest_phase_3.ogg.import b/common/music/assets/morceaux/forest_phase_3.ogg.import new file mode 100644 index 0000000..5e900ed --- /dev/null +++ b/common/music/assets/morceaux/forest_phase_3.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://d4lqhgf0lhgge" +path="res://.godot/imported/forest_phase_3.ogg-55f42a1f5a8a4849a773f18490a0844b.oggvorbisstr" + +[deps] + +source_file="res://common/music/assets/morceaux/forest_phase_3.ogg" +dest_files=["res://.godot/imported/forest_phase_3.ogg-55f42a1f5a8a4849a773f18490a0844b.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/common/music/music.tscn b/common/music/music.tscn index 55d53bd..b7c73dc 100644 --- a/common/music/music.tscn +++ b/common/music/music.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=11 format=3 uid="uid://b6hscxcrj065q"] +[gd_scene load_steps=12 format=3 uid="uid://b6hscxcrj065q"] [ext_resource type="Script" uid="uid://2p5d6vogtn82" path="res://common/music/scripts/music.gd" id="1_ji160"] [ext_resource type="AudioStream" uid="uid://diyefcv8tqa3r" path="res://common/music/assets/morceaux/forest_phase_1.ogg" id="1_stre8"] @@ -7,6 +7,7 @@ [ext_resource type="AudioStream" uid="uid://bm0tdi6bd2e65" path="res://common/music/assets/ambiance/ambiance_phase_2.ogg" id="5_a71a3"] [ext_resource type="AudioStream" uid="uid://dftxjfdqgsbd3" path="res://common/music/assets/ambiance/ambiance_phase_3.ogg" id="6_i5lxw"] [ext_resource type="AudioStream" uid="uid://brtjlgjqnrvcb" path="res://common/music/assets/morceaux/truck_music.ogg" id="7_a71a3"] +[ext_resource type="AudioStream" uid="uid://d4lqhgf0lhgge" path="res://common/music/assets/morceaux/forest_phase_3.ogg" id="7_i5lxw"] [sub_resource type="AudioStreamSynchronized" id="AudioStreamSynchronized_i5lxw"] stream_count = 3 @@ -18,11 +19,13 @@ stream_2/stream = ExtResource("6_i5lxw") stream_2/volume = -60.0 [sub_resource type="AudioStreamSynchronized" id="AudioStreamSynchronized_i0tje"] -stream_count = 2 +stream_count = 3 stream_0/stream = ExtResource("1_stre8") stream_0/volume = -60.0 stream_1/stream = ExtResource("2_ji160") stream_1/volume = -60.0 +stream_2/stream = ExtResource("7_i5lxw") +stream_2/volume = -60.0 [sub_resource type="AudioStreamSynchronized" id="AudioStreamSynchronized_w0e2r"] stream_count = 1