ajout des pistes d'ambiances, modif de la musique de phase 1, mixage de l'ensemble #48 #77 #7

common/music/assets/ambiance_phase_1.ogg.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://dipnmlprwfo12"
+path="res://.godot/imported/ambiance_phase_1.ogg-b03475171d05dd84c23cd0fb6cd07d67.oggvorbisstr"
+
+[deps]
+
+source_file="res://common/music/assets/ambiance_phase_1.ogg"
+dest_files=["res://.godot/imported/ambiance_phase_1.ogg-b03475171d05dd84c23cd0fb6cd07d67.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

common/music/assets/ambiance_phase_2.ogg.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://bm0tdi6bd2e65"
+path="res://.godot/imported/ambiance_phase_2.ogg-37c843d94d859a2d996dd87ef24cd36b.oggvorbisstr"
+
+[deps]
+
+source_file="res://common/music/assets/ambiance_phase_2.ogg"
+dest_files=["res://.godot/imported/ambiance_phase_2.ogg-37c843d94d859a2d996dd87ef24cd36b.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

common/music/assets/ambiance_phase_3.ogg.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://dftxjfdqgsbd3"
+path="res://.godot/imported/ambiance_phase_3.ogg-1e592009e2fec8503408064923f04fd8.oggvorbisstr"
+
+[deps]
+
+source_file="res://common/music/assets/ambiance_phase_3.ogg"
+dest_files=["res://.godot/imported/ambiance_phase_3.ogg-1e592009e2fec8503408064923f04fd8.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

common/music/assets/forest_phase_1.ogg.import

@@ -12,7 +12,7 @@ dest_files=["res://.godot/imported/forest_phase_1.ogg-08213a81a42ba2cf4c67c1bfac
 
 [params]
 
-loop=true
+loop=false
 loop_offset=0
 bpm=0
 beat_count=0

common/music/assets/forest_phase_2.ogg.import

@@ -12,7 +12,7 @@ dest_files=["res://.godot/imported/forest_phase_2.ogg-b312ca5fea9e7b3157a9ab7a4c
 
 [params]
 
-loop=true
+loop=false
 loop_offset=0
 bpm=0
 beat_count=0

common/music/assets/vent.ogg.import

@@ -1,19 +0,0 @@
-[remap]
-
-importer="oggvorbisstr"
-type="AudioStreamOggVorbis"
-uid="uid://d1fyd5o331360"
-path="res://.godot/imported/vent.ogg-ae488051619e48b592cdcb0ef4467441.oggvorbisstr"
-
-[deps]
-
-source_file="res://common/music/assets/vent.ogg"
-dest_files=["res://.godot/imported/vent.ogg-ae488051619e48b592cdcb0ef4467441.oggvorbisstr"]
-
-[params]
-
-loop=true
-loop_offset=0
-bpm=0
-beat_count=0
-bar_beats=4

common/music/music.tscn

@@ -1,25 +1,35 @@
-[gd_scene load_steps=5 format=3 uid="uid://b6hscxcrj065q"]
+[gd_scene load_steps=9 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/forest_phase_1.ogg" id="1_stre8"]
 [ext_resource type="AudioStream" uid="uid://bqwiaek5b5q00" path="res://common/music/assets/forest_phase_2.ogg" id="2_ji160"]
-[ext_resource type="AudioStream" uid="uid://d1fyd5o331360" path="res://common/music/assets/vent.ogg" id="2_n52pk"]
+[ext_resource type="AudioStream" uid="uid://dipnmlprwfo12" path="res://common/music/assets/ambiance_phase_1.ogg" id="4_71qp2"]
+[ext_resource type="AudioStream" uid="uid://bm0tdi6bd2e65" path="res://common/music/assets/ambiance_phase_2.ogg" id="5_a71a3"]
+[ext_resource type="AudioStream" uid="uid://dftxjfdqgsbd3" path="res://common/music/assets/ambiance_phase_3.ogg" id="6_i5lxw"]
 
-[node name="Music" type="Node" node_paths=PackedStringArray("decontamination_musics")]
+[sub_resource type="AudioStreamPlaylist" id="AudioStreamPlaylist_i0tje"]
+loop = false
+stream_count = 2
+stream_0 = ExtResource("1_stre8")
+stream_1 = ExtResource("2_ji160")
+
+[sub_resource type="AudioStreamPlaylist" id="AudioStreamPlaylist_w0e2r"]
+loop = false
+stream_count = 3
+stream_0 = ExtResource("4_71qp2")
+stream_1 = ExtResource("5_a71a3")
+stream_2 = ExtResource("6_i5lxw")
+
+[node name="Son" type="Node" node_paths=PackedStringArray("decontamination_musics")]
 process_mode = 3
 script = ExtResource("1_ji160")
-decontamination_musics = [NodePath("ForestPhase1"), NodePath("ForestPhase2")]
+decontamination_musics = [null, null]
 decontamination_musics_levels = Array[float]([0.0, 30.0])
 
-[node name="ForestPhase1" type="AudioStreamPlayer" parent="."]
+[node name="Musique" type="AudioStreamPlayer" parent="."]
-stream = ExtResource("1_stre8")
+stream = SubResource("AudioStreamPlaylist_i0tje")
-volume_db = -10.0
+autoplay = true
-
+
-[node name="ForestPhase2" type="AudioStreamPlayer" parent="."]
+[node name="Ambiance" type="AudioStreamPlayer" parent="."]
-stream = ExtResource("2_ji160")
+stream = SubResource("AudioStreamPlaylist_w0e2r")
-volume_db = -10.0
-
-[node name="Wind" type="AudioStreamPlayer" parent="."]
-stream = ExtResource("2_n52pk")
 autoplay = true
-parameters/looping = false