diff --git a/common/music/assets/morceaux/forest_phase_3.ogg.import b/common/music/assets/morceaux/forest_phase_3.ogg.import index 8a031e2..4b96568 100644 --- a/common/music/assets/morceaux/forest_phase_3.ogg.import +++ b/common/music/assets/morceaux/forest_phase_3.ogg.import @@ -12,8 +12,8 @@ dest_files=["res://.godot/imported/forest_phase_3.ogg-55f42a1f5a8a4849a773f18490 [params] -loop=true -loop_offset=0 -bpm=0 +loop=false +loop_offset=0.0 +bpm=0.0 beat_count=0 bar_beats=4 diff --git a/common/music/assets/morceaux/forest_phase_4.ogg b/common/music/assets/morceaux/forest_phase_4.ogg new file mode 100644 index 0000000..08490cc Binary files /dev/null and b/common/music/assets/morceaux/forest_phase_4.ogg differ diff --git a/common/music/assets/morceaux/forest_phase_4.ogg.import b/common/music/assets/morceaux/forest_phase_4.ogg.import new file mode 100644 index 0000000..02ffabf --- /dev/null +++ b/common/music/assets/morceaux/forest_phase_4.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://bujnhms77eyha" +path="res://.godot/imported/forest_phase_4.ogg-797ea0a17aecbe5b6044051bebd8e1dc.oggvorbisstr" + +[deps] + +source_file="res://common/music/assets/morceaux/forest_phase_4.ogg" +dest_files=["res://.godot/imported/forest_phase_4.ogg-797ea0a17aecbe5b6044051bebd8e1dc.oggvorbisstr"] + +[params] + +loop=true +loop_offset=0.0 +bpm=0.0 +beat_count=0 +bar_beats=4 diff --git a/common/music/music.tscn b/common/music/music.tscn index 7dd760d..fb477f0 100644 --- a/common/music/music.tscn +++ b/common/music/music.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=12 format=3 uid="uid://b6hscxcrj065q"] +[gd_scene load_steps=13 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"] @@ -8,6 +8,7 @@ [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"] +[ext_resource type="AudioStream" uid="uid://bujnhms77eyha" path="res://common/music/assets/morceaux/forest_phase_4.ogg" id="8_i0tje"] [sub_resource type="AudioStreamSynchronized" id="AudioStreamSynchronized_i5lxw"] stream_count = 3 @@ -20,10 +21,11 @@ stream_2/volume = -60.0 [sub_resource type="AudioStreamPlaylist" id="AudioStreamPlaylist_i5lxw"] loop = false -stream_count = 3 +stream_count = 4 stream_0 = ExtResource("1_stre8") stream_1 = ExtResource("2_ji160") stream_2 = ExtResource("7_i5lxw") +stream_3 = ExtResource("8_i0tje") [sub_resource type="AudioStreamSynchronized" id="AudioStreamSynchronized_w0e2r"] stream_count = 1