Merge branch 'musique_et_son_2' of https://git.zacharie-guet.fr/zacharie/seeding-planets into musique_et_son_2

common/audio_manager/assets/ambiance/astra/ambiance_astra.ogg.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://dyv128cll6e15"
+path="res://.godot/imported/ambiance_astra.ogg-c1e9bdfc0ebfa9518b0518ec57815251.oggvorbisstr"
+
+[deps]
+
+source_file="res://common/audio_manager/assets/ambiance/astra/ambiance_astra.ogg"
+dest_files=["res://.godot/imported/ambiance_astra.ogg-c1e9bdfc0ebfa9518b0518ec57815251.oggvorbisstr"]
+
+[params]
+
+loop=true
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

common/audio_manager/assets/ambiance/borea/ambiance_borea.ogg.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://ca8n3mvauex0w"
+path="res://.godot/imported/ambiance_borea.ogg-bdd873a3b02e98a2b30b14228d0c975e.oggvorbisstr"
+
+[deps]
+
+source_file="res://common/audio_manager/assets/ambiance/borea/ambiance_borea.ogg"
+dest_files=["res://.godot/imported/ambiance_borea.ogg-bdd873a3b02e98a2b30b14228d0c975e.oggvorbisstr"]
+
+[params]
+
+loop=true
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

common/audio_manager/assets/ambiance/niveau/ambiance_phase_1.ogg.import

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

common/audio_manager/assets/ambiance/niveau/ambiance_phase_2.ogg.import

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

common/audio_manager/assets/ambiance/vaisseau/ship_music.ogg.import

@@ -12,8 +12,14 @@ dest_files=["res://.godot/imported/ship_music.ogg-a35a322e3a6a4adafae0f2adcaf212
 
 [params]
 
+<<<<<<< HEAD
+loop=true
+loop_offset=0.0
+bpm=0.0
+=======
 loop=false
 loop_offset=0
 bpm=0
+>>>>>>> 65645d976a98b5bfd030770764e72893cb8d9ccd
 beat_count=0
 bar_beats=4

common/audio_manager/assets/morceaux/niveau/forest_phase_1.ogg.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://dsphn6dbbd55a"
+path="res://.godot/imported/forest_phase_1.ogg-6fd2e255642e47e98a5560b5a2d1ea56.oggvorbisstr"
+
+[deps]
+
+source_file="res://common/audio_manager/assets/morceaux/niveau/forest_phase_1.ogg"
+dest_files=["res://.godot/imported/forest_phase_1.ogg-6fd2e255642e47e98a5560b5a2d1ea56.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

common/audio_manager/assets/morceaux/niveau/forest_phase_2.ogg.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://ccimypx71o4g6"
+path="res://.godot/imported/forest_phase_2.ogg-1497e4a80f7f2adb0670888710e5438a.oggvorbisstr"
+
+[deps]
+
+source_file="res://common/audio_manager/assets/morceaux/niveau/forest_phase_2.ogg"
+dest_files=["res://.godot/imported/forest_phase_2.ogg-1497e4a80f7f2adb0670888710e5438a.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

common/audio_manager/assets/morceaux/niveau/forest_waiting.ogg.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://cjbpfnlwcpjh0"
+path="res://.godot/imported/forest_waiting.ogg-b3b1041d32126973edfe0a525946cda0.oggvorbisstr"
+
+[deps]
+
+source_file="res://common/audio_manager/assets/morceaux/niveau/forest_waiting.ogg"
+dest_files=["res://.godot/imported/forest_waiting.ogg-b3b1041d32126973edfe0a525946cda0.oggvorbisstr"]
+
+[params]
+
+loop=true
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

common/audio_manager/assets/morceaux/niveau/mines_waiting.ogg.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://kqbqhwhkv7o3"
+path="res://.godot/imported/mines_waiting.ogg-03b5dd0acdef19cf35041ebaab5014d1.oggvorbisstr"
+
+[deps]
+
+source_file="res://common/audio_manager/assets/morceaux/niveau/mines_waiting.ogg"
+dest_files=["res://.godot/imported/mines_waiting.ogg-03b5dd0acdef19cf35041ebaab5014d1.oggvorbisstr"]
+
+[params]
+
+loop=true
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

common/audio_manager/assets/morceaux/niveau/truck_music.ogg.import

@@ -1,19 +0,0 @@
-[remap]
-
-importer="oggvorbisstr"
-type="AudioStreamOggVorbis"
-uid="uid://dadg6o6dl2k6t"
-path="res://.godot/imported/truck_music.ogg-71e4f19f9a59a19e62e72df06380f7df.oggvorbisstr"
-
-[deps]
-
-source_file="res://common/audio_manager/assets/morceaux/autres/truck_music.ogg"
-dest_files=["res://.godot/imported/truck_music.ogg-71e4f19f9a59a19e62e72df06380f7df.oggvorbisstr"]
-
-[params]
-
-loop=false
-loop_offset=0
-bpm=0
-beat_count=0
-bar_beats=4

common/audio_manager/assets/sfx/phone/phone_ringing_Astra.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://b4jx8rflw7dss"
+path="res://.godot/imported/phone_ringing_Astra.wav-71b2ee72991b58eae7c77aa589c181f8.sample"
+
+[deps]
+
+source_file="res://common/audio_manager/assets/sfx/phone/phone_ringing_Astra.wav"
+dest_files=["res://.godot/imported/phone_ringing_Astra.wav-71b2ee72991b58eae7c77aa589c181f8.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=2

common/audio_manager/assets/sfx/plant_points/plant_point_1.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://8juy5ev3rdfh"
+path="res://.godot/imported/plant_point_1.wav-da2230cb33147e65418fa40b7ba4debc.sample"
+
+[deps]
+
+source_file="res://common/audio_manager/assets/sfx/plant_points/plant_point_1.wav"
+dest_files=["res://.godot/imported/plant_point_1.wav-da2230cb33147e65418fa40b7ba4debc.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=2

common/audio_manager/assets/sfx/plant_points/plant_point_2.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://su387eovtrsg"
+path="res://.godot/imported/plant_point_2.wav-beba550876214ed1a8a333d59849b50e.sample"
+
+[deps]
+
+source_file="res://common/audio_manager/assets/sfx/plant_points/plant_point_2.wav"
+dest_files=["res://.godot/imported/plant_point_2.wav-beba550876214ed1a8a333d59849b50e.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=2

common/audio_manager/assets/sfx/plant_points/plant_point_3.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://bp6mtpqjf4txo"
+path="res://.godot/imported/plant_point_3.wav-6292bd13ed55ff4bf449487a3b54f07c.sample"
+
+[deps]
+
+source_file="res://common/audio_manager/assets/sfx/plant_points/plant_point_3.wav"
+dest_files=["res://.godot/imported/plant_point_3.wav-6292bd13ed55ff4bf449487a3b54f07c.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=2

common/audio_manager/assets/sfx/plant_points/plant_point_4.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://dnyyeba4yoafp"
+path="res://.godot/imported/plant_point_4.wav-bf22e6127a1696ce651a497996518bbc.sample"
+
+[deps]
+
+source_file="res://common/audio_manager/assets/sfx/plant_points/plant_point_4.wav"
+dest_files=["res://.godot/imported/plant_point_4.wav-bf22e6127a1696ce651a497996518bbc.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=2

common/audio_manager/assets/sfx/plant_points/plant_point_5.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://buobk1kxoy80e"
+path="res://.godot/imported/plant_point_5.wav-6a600c1bc44c66d3f7a1de43f0a3733f.sample"
+
+[deps]
+
+source_file="res://common/audio_manager/assets/sfx/plant_points/plant_point_5.wav"
+dest_files=["res://.godot/imported/plant_point_5.wav-6a600c1bc44c66d3f7a1de43f0a3733f.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=2

common/audio_manager/assets/sfx/plant_points/plant_point_6.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://b8etbfvikq7pm"
+path="res://.godot/imported/plant_point_6.wav-be77e81fbb0a13d26f9b6757bd7a948f.sample"
+
+[deps]
+
+source_file="res://common/audio_manager/assets/sfx/plant_points/plant_point_6.wav"
+dest_files=["res://.godot/imported/plant_point_6.wav-be77e81fbb0a13d26f9b6757bd7a948f.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=2

common/audio_manager/assets/sfx/plant_points/plant_point_7.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://cad0erjq0us08"
+path="res://.godot/imported/plant_point_7.wav-72bede764ccf2ea8aaafc075c61ef9e4.sample"
+
+[deps]
+
+source_file="res://common/audio_manager/assets/sfx/plant_points/plant_point_7.wav"
+dest_files=["res://.godot/imported/plant_point_7.wav-72bede764ccf2ea8aaafc075c61ef9e4.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=2

common/audio_manager/assets/sfx/plant_points/plant_point_8.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://c6pl2fjg558j3"
+path="res://.godot/imported/plant_point_8.wav-27e168d52fbf07a6e5da565f576a5976.sample"
+
+[deps]
+
+source_file="res://common/audio_manager/assets/sfx/plant_points/plant_point_8.wav"
+dest_files=["res://.godot/imported/plant_point_8.wav-27e168d52fbf07a6e5da565f576a5976.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=2

common/audio_manager/assets/sfx/respawn/respawn.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://delq7gsdeqjq2"
+path="res://.godot/imported/respawn.wav-4abde1c08ba1edf164436d696ab9c937.sample"
+
+[deps]
+
+source_file="res://common/audio_manager/assets/sfx/respawn/respawn.wav"
+dest_files=["res://.godot/imported/respawn.wav-4abde1c08ba1edf164436d696ab9c937.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=2

common/audio_manager/assets/sfx/ship_exit/ship_exit.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://sgwvpxiul5x5"
+path="res://.godot/imported/ship_exit.wav-f54c5c1dfb6ab26d12577bf415c25749.sample"
+
+[deps]
+
+source_file="res://common/audio_manager/assets/sfx/ship_exit/ship_exit.wav"
+dest_files=["res://.godot/imported/ship_exit.wav-f54c5c1dfb6ab26d12577bf415c25749.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=2

common/audio_manager/assets/sfx/ship_reveal/jingle_vaisseau.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://6id31r7o6trc"
+path="res://.godot/imported/jingle_vaisseau.wav-09386d1b836aef72a2020af47e63aa0b.sample"
+
+[deps]
+
+source_file="res://common/audio_manager/assets/sfx/ship_reveal/jingle_vaisseau.wav"
+dest_files=["res://.godot/imported/jingle_vaisseau.wav-09386d1b836aef72a2020af47e63aa0b.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=2

common/audio_manager/assets/sfx/teleportation/teleport.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://ca0wonha334cl"
+path="res://.godot/imported/teleport.wav-82e82ef3912fde616a6422e238716d95.sample"
+
+[deps]
+
+source_file="res://common/audio_manager/assets/sfx/teleportation/teleport.wav"
+dest_files=["res://.godot/imported/teleport.wav-82e82ef3912fde616a6422e238716d95.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=2

common/audio_manager/audio_manager.tscn

@@ -5,14 +5,30 @@
 [ext_resource type="AudioStream" uid="uid://bm0tdi6bd2e65" path="res://common/audio_manager/assets/ambiance/niveau/ambiance_phase_2.ogg" id="3_7uv4r"]
 [ext_resource type="AudioStream" uid="uid://b1hut6lc1jevh" path="res://common/audio_manager/assets/morceaux/niveau/mines_phase_2.ogg" id="4_2fduo"]
 [ext_resource type="AudioStream" uid="uid://dftxjfdqgsbd3" path="res://common/audio_manager/assets/ambiance/niveau/ambiance_phase_3.ogg" id="4_tuvql"]
+<<<<<<< HEAD
+[ext_resource type="AudioStream" uid="uid://dyv128cll6e15" path="res://common/audio_manager/assets/ambiance/astra/ambiance_astra.ogg" id="5_8204s"]
+[ext_resource type="AudioStream" uid="uid://dcbuhtc085q2x" path="res://common/audio_manager/assets/morceaux/niveau/mines_phase_1.ogg" id="5_ajci6"]
+[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://ca8n3mvauex0w" 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://dadg6o6dl2k6t" path="res://common/audio_manager/assets/ambiance/vaisseau/ship_music.ogg" id="8_tuvql"]
+[ext_resource type="AudioStream" uid="uid://dsphn6dbbd55a" path="res://common/audio_manager/assets/morceaux/niveau/forest_phase_1.ogg" id="9_am7i4"]
+=======
 [ext_resource type="AudioStream" uid="uid://dcbuhtc085q2x" path="res://common/audio_manager/assets/morceaux/niveau/mines_phase_1.ogg" id="5_ajci6"]
 [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://dadg6o6dl2k6t" path="res://common/audio_manager/assets/ambiance/vaisseau/ship_music.ogg" id="8_tuvql"]
+>>>>>>> 65645d976a98b5bfd030770764e72893cb8d9ccd
 [ext_resource type="AudioStream" uid="uid://dfrp66a4isnt6" path="res://common/audio_manager/assets/sfx/dig/dig_1.wav" id="9_gv65y"]
 [ext_resource type="AudioStream" uid="uid://bdxkvaciw4mb3" path="res://common/audio_manager/assets/sfx/dig/dig_2.wav" id="10_n7o7n"]
+[ext_resource type="AudioStream" uid="uid://ccimypx71o4g6" path="res://common/audio_manager/assets/morceaux/niveau/forest_phase_2.ogg" id="10_tq535"]
+[ext_resource type="AudioStream" uid="uid://kqbqhwhkv7o3" path="res://common/audio_manager/assets/morceaux/niveau/mines_waiting.ogg" id="11_ngi21"]
 [ext_resource type="AudioStream" uid="uid://llxrlwfccywb" path="res://common/audio_manager/assets/sfx/dig/dig_3.wav" id="11_wtvls"]
 [ext_resource type="AudioStream" uid="uid://b8inedx4yjslw" path="res://common/audio_manager/assets/sfx/drop/drop_1.wav" id="12_4hp8f"]
+<<<<<<< HEAD
+[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://c5y70k3codtn" path="res://common/audio_manager/assets/sfx/signal/signal.mp3" id="12_ajci6"]
+>>>>>>> 65645d976a98b5bfd030770764e72893cb8d9ccd
 [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://eh3dbuxu5qtw" path="res://common/audio_manager/assets/sfx/harvest/harvest_3.wav" id="15_ynvb4"]
@@ -23,10 +39,24 @@
 [ext_resource type="AudioStream" uid="uid://cqa0gvgpoa7pd" path="res://common/audio_manager/assets/sfx/pick_up/pick_up_2.wav" id="21_dk5s6"]
 [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://ccq04ahrwr3bv" path="res://common/audio_manager/assets/sfx/alarm/alarm.wav" id="23_fwu3w"]
+<<<<<<< HEAD
+[ext_resource type="AudioStream" uid="uid://b4jx8rflw7dss" path="res://common/audio_manager/assets/sfx/phone/phone_ringing_Astra.wav" id="27_0rjel"]
+[ext_resource type="AudioStream" uid="uid://ocm1dkkhv7ls" path="res://common/audio_manager/assets/sfx/phone/phone_ringing.wav" id="28_3dfjn"]
+[ext_resource type="AudioStream" uid="uid://8juy5ev3rdfh" path="res://common/audio_manager/assets/sfx/plant_points/plant_point_1.wav" id="29_ngi21"]
+[ext_resource type="AudioStream" uid="uid://su387eovtrsg" path="res://common/audio_manager/assets/sfx/plant_points/plant_point_2.wav" id="30_xmumj"]
+[ext_resource type="AudioStream" uid="uid://bp6mtpqjf4txo" path="res://common/audio_manager/assets/sfx/plant_points/plant_point_3.wav" id="31_spekb"]
+[ext_resource type="AudioStream" uid="uid://dnyyeba4yoafp" path="res://common/audio_manager/assets/sfx/plant_points/plant_point_4.wav" id="32_iaiio"]
+[ext_resource type="AudioStream" uid="uid://buobk1kxoy80e" path="res://common/audio_manager/assets/sfx/plant_points/plant_point_5.wav" id="33_w2elg"]
+[ext_resource type="AudioStream" uid="uid://b8etbfvikq7pm" path="res://common/audio_manager/assets/sfx/plant_points/plant_point_6.wav" id="34_em3o8"]
+[ext_resource type="AudioStream" uid="uid://cad0erjq0us08" path="res://common/audio_manager/assets/sfx/plant_points/plant_point_7.wav" id="35_rk2e0"]
+[ext_resource type="AudioStream" uid="uid://c6pl2fjg558j3" path="res://common/audio_manager/assets/sfx/plant_points/plant_point_8.wav" id="36_4sa2t"]
+[ext_resource type="AudioStream" uid="uid://b6lb4kwk7vmr" path="res://common/audio_manager/assets/sfx/ship_reveal/jingle_vaisseau.ogg" id="37_3dfjn"]
+=======
 [ext_resource type="AudioStream" uid="uid://ctfaxvblcg5lc" path="res://common/audio_manager/assets/sfx/pickaxe/pickaxe_1.wav" id="24_tq535"]
 [ext_resource type="AudioStream" uid="uid://c1dnklmka2ccn" path="res://common/audio_manager/assets/sfx/pickaxe/pickaxe_2.wav" id="25_ywn7s"]
 [ext_resource type="AudioStream" uid="uid://dd1uu6dd6sloe" path="res://common/audio_manager/assets/sfx/pickaxe/pickaxe_3.wav" id="26_xhon7"]
 [ext_resource type="AudioStream" uid="uid://eq7wufwnolto" path="res://common/audio_manager/assets/sfx/pickaxe/pickaxe_4.wav" id="27_3jg6d"]
+>>>>>>> 65645d976a98b5bfd030770764e72893cb8d9ccd
 
 [sub_resource type="AudioStreamPlaylist" id="AudioStreamPlaylist_8204s"]
 stream_count = 3
@@ -35,9 +65,16 @@ stream_1 = ExtResource("3_7uv4r")
 stream_2 = ExtResource("4_tuvql")
 
 [sub_resource type="AudioStreamPlaylist" id="AudioStreamPlaylist_ajci6"]
-stream_count = 4
+stream_count = 6
 stream_0 = ExtResource("5_ajci6")
 stream_1 = ExtResource("4_2fduo")
+<<<<<<< HEAD
+stream_2 = ExtResource("11_ngi21")
+stream_3 = ExtResource("9_am7i4")
+stream_4 = ExtResource("10_tq535")
+stream_5 = ExtResource("12_xmumj")
+=======
+>>>>>>> 65645d976a98b5bfd030770764e72893cb8d9ccd
 
 [sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_kfbah"]
 streams_count = 3
@@ -70,6 +107,19 @@ streams_count = 2
 stream_0/stream = ExtResource("20_pu6t4")
 stream_1/stream = ExtResource("21_dk5s6")
 
+<<<<<<< HEAD
+[sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_qog4c"]
+random_pitch = 1.2599211
+streams_count = 8
+stream_0/stream = ExtResource("29_ngi21")
+stream_1/stream = ExtResource("30_xmumj")
+stream_2/stream = ExtResource("31_spekb")
+stream_3/stream = ExtResource("32_iaiio")
+stream_4/stream = ExtResource("33_w2elg")
+stream_5/stream = ExtResource("34_em3o8")
+stream_6/stream = ExtResource("35_rk2e0")
+stream_7/stream = ExtResource("36_4sa2t")
+=======
 [sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_dhq5t"]
 random_pitch = 1.0594631
 streams_count = 4
@@ -77,6 +127,7 @@ stream_0/stream = ExtResource("24_tq535")
 stream_1/stream = ExtResource("25_ywn7s")
 stream_2/stream = ExtResource("26_xhon7")
 stream_3/stream = ExtResource("27_3jg6d")
+>>>>>>> 65645d976a98b5bfd030770764e72893cb8d9ccd
 
 [node name="AudioManager" type="Node" unique_id=1871137180]
 process_mode = 3
@@ -88,6 +139,21 @@ unique_name_in_owner = true
 [node name="Exterior" type="AudioStreamPlayer" parent="Ambiance" unique_id=1405716780]
 unique_name_in_owner = true
 stream = SubResource("AudioStreamPlaylist_8204s")
+<<<<<<< HEAD
+
+[node name="Astra" type="AudioStreamPlayer" parent="Ambiance" unique_id=1244577212]
+unique_name_in_owner = true
+stream = ExtResource("5_8204s")
+
+[node name="Demeter" type="AudioStreamPlayer" parent="Ambiance" unique_id=351918026]
+unique_name_in_owner = true
+stream = ExtResource("6_8204s")
+
+[node name="Borea" type="AudioStreamPlayer" parent="Ambiance" unique_id=1857904648]
+unique_name_in_owner = true
+stream = ExtResource("7_spekb")
+=======
+>>>>>>> 65645d976a98b5bfd030770764e72893cb8d9ccd
 
 [node name="Musics" type="Node" parent="." unique_id=1450527710]
 unique_name_in_owner = true
@@ -132,5 +198,20 @@ volume_db = 8.627
 [node name="Alarm" type="AudioStreamPlayer" parent="Sfx" unique_id=689347925]
 stream = ExtResource("23_fwu3w")
 
+<<<<<<< HEAD
+[node name="Astra_phone_call" type="AudioStreamPlayer" parent="Sfx" unique_id=721344636]
+stream = ExtResource("27_0rjel")
+
+[node name="Phone_call" type="AudioStreamPlayer" parent="Sfx" unique_id=1668278453]
+stream = ExtResource("28_3dfjn")
+
+[node name="Plant_point" type="AudioStreamPlayer" parent="Sfx" unique_id=2044025024]
+stream = SubResource("AudioStreamRandomizer_qog4c")
+
+[node name="Ship_reveal" type="AudioStreamPlayer" parent="Sfx" unique_id=1121632306]
+stream = ExtResource("37_3dfjn")
+volume_db = -10.0
+=======
 [node name="Pickaxe" type="AudioStreamPlayer" parent="Sfx" unique_id=996309145]
 stream = SubResource("AudioStreamRandomizer_dhq5t")
+>>>>>>> 65645d976a98b5bfd030770764e72893cb8d9ccd

common/audio_manager/scripts/audio_manager.gd

@@ -16,6 +16,50 @@ var playing_ambiance : AudioStreamPlayer = null
 var default_volumes := {}
 
 func _ready():
+<<<<<<< HEAD
+	for player in get_all_players():
+		player.stop()
+	
+	fetch_default_volumes()
+	setup_volume()
+	settings.sound_changed.connect(
+		func(_s) : setup_volume()
+	)
+	SceneManager.scene_loaded.connect(_on_change_scene)
+	Dialogic.timeline_started.connect(_on_timeline_started)
+
+func _on_change_scene(scene : Scene):
+	play_ambiance()
+
+	match scene.scene_id:
+		"TITLE":
+			play_music("Title")
+		"REGION":
+			play_music("Region")
+			play_ambiance("Exterior")
+		"COCKPIT":
+			play_music("Ship")
+		"ASTRA":
+			play_ambiance("Astra")
+
+func _on_timeline_started():
+	var timeline_name = Dialogic.current_timeline.resource_path.split("/")[-1].trim_suffix(".dtl")
+	play_ambiance()
+
+	match timeline_name:
+		"demeter_intro":
+			play_ambiance("Demeter")
+		"demeter_introV2":
+			play_ambiance("Demeter")
+		"demeter_midrun":
+			play_ambiance("Demeter")
+		"demeter_outro":
+			play_ambiance("Demeter")
+		"failure":
+			play_ambiance("Demeter")
+	# Timeline name et le nom du fichier de timeline, par exemple demeter_intro
+	# Amuse toi Niels ;)
+=======
     for player in get_all_players():
         player.stop()
     
@@ -125,13 +169,31 @@ func play_ambiance(player_name : String = "", from_random_time := false, fade_ti
 
 func stop_ambiance():
     ambiance_action = AudioStop.new()
+>>>>>>> 65645d976a98b5bfd030770764e72893cb8d9ccd
 
 func fetch_default_volumes():
-    var all_players := get_all_players()
+	var all_players := get_all_players()
 
-    for player in all_players:
-        default_volumes[player] = player.volume_db
+	for player in all_players:
+		default_volumes[player] = player.volume_db
 
+<<<<<<< HEAD
+func setup_volume():
+	for player in get_all_players():
+		player.volume_db = get_volume_from_parent(player)
+
+func get_volume_from_parent(player : AudioStreamPlayer) -> float:
+	var settings_volume = 0.5
+
+	if player.get_parent() == %Ambiance:
+		settings_volume = settings.ambiance_volume
+	elif player.get_parent() == %Sfx:
+		settings_volume = settings.sfx_volume
+	elif player.get_parent() == %Musics:
+		settings_volume = settings.music_volume
+	
+	return default_volumes[player] + lerp(MIN_VOLUME, MAX_VOLUME, settings_volume)
+=======
 func setup_players_bus():
     for player in get_all_players():
         if player.get_parent() == %Musics:
@@ -143,29 +205,35 @@ func setup_players_bus():
 
 func get_volume(player : AudioStreamPlayer) -> float:
     return default_volumes[player]
+>>>>>>> 65645d976a98b5bfd030770764e72893cb8d9ccd
 
 func get_all_players() -> Array[AudioStreamPlayer]:
-    var players : Array[AudioStreamPlayer] = []
-    players.append_array(get_players_from_node(%Musics))
-    players.append_array(get_players_from_node(%Ambiance))
-    players.append_array(get_players_from_node(%Sfx))
+	var players : Array[AudioStreamPlayer] = []
+	players.append_array(get_players_from_node(%Musics))
+	players.append_array(get_players_from_node(%Ambiance))
+	players.append_array(get_players_from_node(%Sfx))
 
-    return players
+	return players
 
 func get_players_from_node(node : Node) -> Array[AudioStreamPlayer]:
-    var streams : Array[AudioStreamPlayer] = []
+	var streams : Array[AudioStreamPlayer] = []
 
-    for c in node.get_children():
-        if c is AudioStreamPlayer:
-            streams.append(c)
-    return streams
+	for c in node.get_children():
+		if c is AudioStreamPlayer:
+			streams.append(c)
+	return streams
 
+<<<<<<< HEAD
+func set_volume(player : AudioStreamPlayer, to : float, fade_time = default_fade_time) -> Tween:
+	var fade_tween : Tween = get_tree().create_tween()
+=======
 func set_volume(player : AudioStreamPlayer, to : float, fade_time := 0.0) -> Tween:
     var fade_tween : Tween = get_tree().create_tween()
+>>>>>>> 65645d976a98b5bfd030770764e72893cb8d9ccd
 
-    fade_tween.tween_property(player, "volume_db", to, fade_time)
+	fade_tween.tween_property(player, "volume_db", to, fade_time)
 
-    return fade_tween
+	return fade_tween
 
 func start_player(player: AudioStreamPlayer, from_random_time = false, fade_time = DEFAULT_FADE_TIME):
     if player and not player.playing:
@@ -185,15 +253,54 @@ func stop_player(player : AudioStreamPlayer, fade_time = DEFAULT_FADE_TIME):
         player.volume_db = get_volume(player)
 
 func reset_volume(player : AudioStreamPlayer):
+<<<<<<< HEAD
+	player.volume_db = get_volume_from_parent(player)
+=======
     player.volume_db = get_volume(player)
+>>>>>>> 65645d976a98b5bfd030770764e72893cb8d9ccd
 
 func play_sfx(sfx_name : String):
-    var player := %Sfx.find_child(sfx_name) as AudioStreamPlayer
-    if player:
-        player.play()
-    else:
-        printerr("Sfx %s not found" % sfx_name)
+	var player := %Sfx.find_child(sfx_name) as AudioStreamPlayer
+	if player:
+		player.play()
+	else:
+		printerr("Sfx %s not found" % sfx_name)
 
+<<<<<<< HEAD
+func play_music(music_name : String = ""):
+	var old_music = playing_music
+	playing_music = null
+	if old_music:
+		await set_volume(old_music, MIN_VOLUME).finished
+		if old_music and old_music != playing_music:
+			old_music.stop()
+			reset_volume(old_music)
+	if music_name:
+		var player := %Musics.find_child(music_name) as AudioStreamPlayer
+		if player:
+			playing_music = player
+			player.play()
+			set_volume(player, get_volume_from_parent(player))
+		else:
+			printerr("Music %s not found" % music_name)
+
+func play_ambiance(ambiance_name : String = ""):
+	var old_ambiance = playing_ambiance
+	playing_ambiance = null
+	if old_ambiance:
+		await set_volume(old_ambiance, MIN_VOLUME).finished
+		if old_ambiance and old_ambiance != playing_ambiance:
+			old_ambiance.stop()
+			reset_volume(old_ambiance)
+	if ambiance_name:
+		var player := %Ambiance.find_child(ambiance_name) as AudioStreamPlayer
+		if player:
+			playing_ambiance = player
+			player.play()
+			set_volume(player, get_volume_from_parent(player))
+		else:
+			printerr("Ambiance %s not found" % ambiance_name)
+=======
 class AudioAction:
     pass
 
@@ -214,3 +321,4 @@ class AudioLaunch extends AudioAction:
 
 class AudioStop extends AudioAction:
     pass
+>>>>>>> 65645d976a98b5bfd030770764e72893cb8d9ccd

dialogs/timelines/story/demeter_introV2.dtl

@@ -0,0 +1,38 @@
+audio "res://common/audio_manager/assets/sfx/dialogs/sfx/incoming_transmission.wav"
+join demeter center [animation="Bounce In" length="1.0"]
+demeter: Hi ![pause=0.3] Phew,[pause=0.2] I thought no one would reply.[pause=0.3] Are you [color=#FFA617]Orchid[/color] ?[pause=0.3] You may not be familiar with this name but you must have seen it in your memory.
+- Uh... Who are you ?
+	demeter: Oh sorry ![pause=0.3] I cannot send you my IDs for now,[pause=0.2] you are too far away from me.
+- Where am I ?
+	demeter: Don't worry,[pause=0.2] you are in a subterranean base,[pause=0.2] but you will get to the surface very soon.
+- Wait ! Who am I ?
+	demeter: Hmmm.[pause=0.4].[pause=0.4].[pause=0.4] Interesting question.[pause=0.3] I elaborated your system but I don't know in which frame you are currently in.[pause=0.3] We'll find out !
+demeter: I'm glad you are finally awake ![pause=0.3] To be honest,[pause=0.2] I wasn't sure I would be able to make you function normally.[pause=0.5] Your frame has remained here for millennia without any maintenance.
+- Did you create me ?
+	demeter: Sort of ![pause=0.3] I didn't manufactured your body,[pause=0.2] I borrowed it,[pause=0.2] but I designed your cognitive system.[pause=0.3] Be forgiving,[pause=0.2] it won't be perfect,[pause=0.2] I was designed to manage,[pause=0.2] not to create.
+- Why did you awake me ?
+	demeter: To be honest,[pause=0.2] I don't really know.[pause=0.3].[pause=0.3].[pause=0.3] I mean,[pause=0.2] there are a lot of reasons,[pause=0.2] but I'll tell you more about it later.
+- What are you ?
+	demeter: I'm the same as you.[pause=0.3] The same as all the sentient beings remaining on this planet.[pause=0.3] Robot,[pause=0.2] artificial intelligence,[pause=0.2] machine.[pause=0.2].[pause=0.2].[pause=0.2] Our creators gave us many titles.
+demeter: Ok,[pause=0.2] no more questions for now,[pause=0.2] listen to me carefully.
+demeter: A long time ago,[pause=0.2] this planet was full of life.[pause=0.3] Plants were thriving on mountains,[pause=0.2] under seas and across plains.
+demeter: Now,[pause=0.2] this world is a wasteland.[pause=0.3] You'll see it as soon as you leave this base.
+demeter: Something happened a year ago.[pause=0.3].[pause=0.3].[pause=0.3]. The [color=#119758][b]Talion[/b][/color],[pause=0.2] a unique element giving birth to new life forms when shattered,[pause=0.2] reappeared.
+demeter: With the [color=#119758][b]Talion[/b][/color] back on the surface,[pause=0.2] we can bring this planet back to life.
+demeter: But first things first,[pause=0.2] you have to learn how everything is working up here,[pause=0.2] and how to use the [color=#119758][b]Talion[/b][/color] to plant seeds.
+demeter: [b]Just remember the following[/b]
+label explanations
+demeter: When you'll emerge from this building,[pause=0.2] you will reach a little yellowish zone.[pause=0.3] It's a [b]fertile zone[/b],[pause=0.2] brought back by the [color=#119758][b]Talion's[/b][/color] power.[pause=0.3] You can only plant [b]seeds[/b] in this zone.
+demeter: Then,[pause=0.2] you have to get [b]seeds[/b].[pause=0.3] To do so,[pause=0.2] just take your shovel and smash some stones ![pause=0.3] Focus on those having yellow crystals on it,[pause=0.2] these are [color=#119758][b]Talion veins[/b][/color].
+demeter: Each time you use a tool like the shovel or plant a seed,[pause=0.2] you will spend one [b]energy[/b] charge.[pause=0.3] When you are out of it,[pause=0.2] just go recharge it at the [b]recharge station[/b].[pause=0.3] You will find it near the entrance of the base.
+demeter: Each time you recharge,[pause=0.2] a day will pass,[pause=0.2] your batteries are very inefficient.[pause=0.3] While the day is passing,[pause=0.2] plants will grow !
+demeter: To complete you training,[pause=0.2] obtain enough [b]plant points[/b].[pause=0.3] Each plant give one or more [b]plant points[/b] when mature.
+demeter: Oh ! [pause=0.3] I almost forgot,[pause=0.2] some plants can [b]mutate[/b].[pause=0.3] These [b]mutations[/b] affect points and behavior of the plant affected.[pause=0.3] [b]Mutations[/b] can appear while [b]harvesting[/b] mature plants and even become more powerful if you [b]harvest[/b] an already mutated one.
+- That's a lot of informations, can you repeat ?
+	demeter: Ok,[pause=0.2] listen carefully.
+	jump explanations
+- Ok, now I have more questions !
+	demeter: Sorry,[pause=0.2] we'll speak more after this.[pause=0.3] I send you an elevator,[pause=0.2] good luck [color=#FFA617]Orchid[/color] !
+	audio "res://common/audio_manager/assets/sfx/dialogs/sfx/closing_transmission.wav"
+	[wait time="2.0"]
+	[end_timeline]

dialogs/timelines/story/demeter_introV2.dtl.uid

@@ -0,0 +1 @@
+uid://bx75vjharvxvf

dialogs/timelines/story/wake_up.dtl

@@ -1,3 +1,26 @@
+<<<<<<< HEAD
+[i]Void.[/i]
+[i]Void again.[/i]
+[i]Suddenly, a [rainbow]spark[/rainbow].[pause=0.5] A thousand of connections blow up as a fireworks scene.[pause=0.3] A massive amount of data to treat.
+label suite_dialogue
+- Check components | [if {frame} == "false"] [else="hide"]
+	Exploring available drivers.[pause=0.5].[pause=0.5].[pause=0.5] New actions available.[pause=0.5] Three propellers,[pause=0.3] small models,[pause=0.3] only suitable for low altitude movement.[pause=0.5] Robotic arm,[pause=0.3] multipurpose,[pause=0.3] retractable.
+	set {components} = "true"
+	jump suite_dialogue
+- Check streams | [if {streams} == "false"] [else="hide"]
+	A continuous stream of data flow,[pause=0.3] unchecked.[pause=0.5] A video,[pause=0.5] dark colored pixels only.[pause=0.5] Another stream,[pause=0.3] flat signal.[pause=0.5] No radio emission detected.
+	set {streams} = "true"
+	jump suite_dialogue
+- Check memory | [if {memory} == "false"] [else="hide"]
+	Several disks available,[pause=0.3] most are empty.[pause=0.5] Some seems to contain the system currently analyzing the code of the system analyzing the code of the system analyzing the code of the system analyzing.[pause=0.5].[pause=0.5].[pause=0.5] Infinite recursion,[pause=0.3] better avoid that.
+	set {memory} = "true"
+	jump suite_dialogue
+- Wake up
+	Overseeing \\: serial number and system name.[pause=0.5].[pause=0.5].[pause=0.5] Strange.[pause=0.5] Serial number is empty.[pause=0.5] Must be an error.[pause=0.5] System name is,[pause=0.5] [color=#FFA617]Orchid[/color].[pause=0.5] That is enough for now.
+	audio "res://common/audio_manager/assets/sfx/respawn/respawn.wav"
+	Starting engines,[pause=0.3] fans and daemons,[pause=0.3] let's see what is to see.
+	[end_timeline]
+=======
 [i]Black.[/i] #id:7a
 [i]Black Again.[/i] #id:7b
 [i]Suddenly, [rainbow]a spark[/rainbow]. [pause=0.5]A thousand of connections blows up as a firework scene. A massive amount of data to treat. #id:7c
@@ -13,4 +36,5 @@ label discover #id:7d
 	 jump discover
 - Wake up #id:84
 	 One last info is to oversee \: serial number and system name.[pause=0.5] Strange...[pause=0.5] Serial number is empty.[pause=0.5] Must be an error.[pause=0.5]System name is... [pause=0.5] [b]Orchid[/b]. That will be enough for now... #id:85
-	 Starting engines, fans, and daemons, let's see what is to see. #id:86
+	 Starting engines, fans, and daemons, let's see what is to see. #id:86
+>>>>>>> 65645d976a98b5bfd030770764e72893cb8d9ccd