Dev 0.1

* Structure de l'histoire principale
* Line sur le perso principal
* Agrandissement de la zone de détection des cellules
* Ajout du spray de Talion (+1 points de plante de base)
* Ajout de feedback sur l'usage des cellules d'énergie

common/audio_manager/assets/morceaux/histoire/aqua.mp3.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+uid="uid://bu87qluncx6pd"
+path="res://.godot/imported/aqua.mp3-0d6e6fca8525376ee9d208a606348ba9.mp3str"
+
+[deps]
+
+source_file="res://common/audio_manager/assets/morceaux/histoire/aqua.mp3"
+dest_files=["res://.godot/imported/aqua.mp3-0d6e6fca8525376ee9d208a606348ba9.mp3str"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

common/audio_manager/assets/morceaux/histoire/astra.ogg.import

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

common/audio_manager/assets/morceaux/histoire/estia.ogg.import

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

common/audio_manager/assets/sfx/borea_lever/borea_lever.mp3.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+uid="uid://dsqdt1ddvlyal"
+path="res://.godot/imported/borea_lever.mp3-6c76a0e5e78025311230b59292d6bc98.mp3str"
+
+[deps]
+
+source_file="res://common/audio_manager/assets/sfx/borea_lever/borea_lever.mp3"
+dest_files=["res://.godot/imported/borea_lever.mp3-6c76a0e5e78025311230b59292d6bc98.mp3str"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

common/audio_manager/audio_manager.tscn

@@ -12,7 +12,6 @@
 [ext_resource type="AudioStream" uid="uid://dsphn6dbbd55a" path="res://common/audio_manager/assets/morceaux/niveau/forest_phase_1.ogg" id="6_6o1yh"]
 [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://klb32q3kjtkt" path="res://common/audio_manager/assets/ambiance/vending_room_base_relais/ambiance_vending_room_base_relais.ogg" id="7_ge2sc"]
-[ext_resource type="AudioStream" uid="uid://c8gbtdul2x8ws" 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://bmwaw1yb8hucf" path="res://common/audio_manager/assets/ambiance/vaisseau/ship_music.ogg" id="8_tuvql"]
 [ext_resource type="AudioStream" uid="uid://ccimypx71o4g6" path="res://common/audio_manager/assets/morceaux/niveau/forest_phase_2.ogg" id="10_tq535"]
@@ -42,8 +41,11 @@
 [ext_resource type="AudioStream" uid="uid://dq5qwydrca3vy" path="res://common/audio_manager/assets/sfx/recharge/recharge_capsule_5.wav" id="22_aedoe"]
 [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://ch8wnrckanydg" path="res://common/audio_manager/assets/morceaux/histoire/meeting_demeter.ogg" id="22_mrdk3"]
+[ext_resource type="AudioStream" uid="uid://bu87qluncx6pd" path="res://common/audio_manager/assets/morceaux/histoire/aqua.mp3" id="22_uaco0"]
 [ext_resource type="AudioStream" uid="uid://bnwtgp8t46xwc" path="res://common/audio_manager/assets/sfx/recharge/recharge_capsule_6.wav" id="23_ge2sc"]
+[ext_resource type="AudioStream" uid="uid://bkf62homs848n" path="res://common/audio_manager/assets/morceaux/histoire/estia.ogg" id="24_eeq8n"]
 [ext_resource type="AudioStream" uid="uid://bp3wsncvda5gl" path="res://common/audio_manager/assets/sfx/recharge/recharge_capsule_7.wav" id="24_yr73o"]
+[ext_resource type="AudioStream" uid="uid://urh63a8tgsd0" path="res://common/audio_manager/assets/morceaux/histoire/astra.ogg" id="25_1r4ky"]
 [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"]
@@ -167,19 +169,14 @@ unique_name_in_owner = true
 stream = ExtResource("5_ipd1r")
 volume_db = -15.0
 
-[node name="Astra" type="AudioStreamPlayer" parent="Ambiances" unique_id=1244577212]
-unique_name_in_owner = true
-stream = ExtResource("5_8204s")
-volume_db = -5.0
-
 [node name="Demeter" type="AudioStreamPlayer" parent="Ambiances" unique_id=351918026]
 unique_name_in_owner = true
 stream = ExtResource("6_8204s")
 volume_db = -5.0
 
-[node name="Borea" type="AudioStreamPlayer" parent="Ambiances" unique_id=1857904648]
+[node name="Astra" type="AudioStreamPlayer" parent="Ambiances" unique_id=1244577212]
 unique_name_in_owner = true
-stream = ExtResource("7_spekb")
+stream = ExtResource("5_8204s")
 volume_db = -5.0
 
 [node name="Ship" type="AudioStreamPlayer" parent="Ambiances" unique_id=1564186965]
@@ -187,10 +184,6 @@ unique_name_in_owner = true
 stream = ExtResource("8_tuvql")
 volume_db = -5.0
 
-[node name="Subterra" type="AudioStreamPlayer" parent="Ambiances" unique_id=2019011683]
-unique_name_in_owner = true
-stream = ExtResource("12_mrdk3")
-
 [node name="Musics" type="Node" parent="." unique_id=1450527710]
 unique_name_in_owner = true
 
@@ -247,10 +240,29 @@ stream = ExtResource("7_tuvql")
 volume_db = -5.0
 bus = &"Music"
 
-[node name="Meeting_demeter" type="AudioStreamPlayer" parent="Musics" unique_id=1066359159]
+[node name="MeetingDemeter" type="AudioStreamPlayer" parent="Musics" unique_id=1066359159]
 unique_name_in_owner = true
 stream = ExtResource("22_mrdk3")
 
+[node name="Aqua" type="AudioStreamPlayer" parent="Musics" unique_id=1941388305]
+unique_name_in_owner = true
+stream = ExtResource("22_uaco0")
+volume_db = -5.0
+
+[node name="Subterra" type="AudioStreamPlayer" parent="Musics" unique_id=2019011683]
+unique_name_in_owner = true
+stream = ExtResource("12_mrdk3")
+
+[node name="Estia" type="AudioStreamPlayer" parent="Musics" unique_id=531815272]
+unique_name_in_owner = true
+stream = ExtResource("24_eeq8n")
+volume_db = -5.0
+
+[node name="AstraEnd" type="AudioStreamPlayer" parent="Musics" unique_id=818527318]
+unique_name_in_owner = true
+stream = ExtResource("25_1r4ky")
+volume_db = -5.0
+
 [node name="Sfx" type="Node" parent="." unique_id=2023641207]
 unique_name_in_owner = true
 

common/audio_manager/scripts/audio_manager.gd

@@ -58,9 +58,6 @@ func _on_change_scene(scene : Scene):
     elif scene is GarageScene:
         stop_all_musics()
         play_ambiance_alone("Astra", false)
-    elif scene is BoreaScene:
-        play_music_alone("Meeting_demeter")
-        stop_all_ambiances()
     elif scene is VendingMachineScene:
         stop_all_musics()
         play_ambiance_alone("VendingRoom", false)
@@ -70,6 +67,21 @@ func _on_change_scene(scene : Scene):
     elif scene is CaveScene:
         stop_all_musics()
         play_ambiance_alone("Cave", false)
+    elif scene is BoreaScene:
+        play_music_alone("MeetingDemeter", false, 0.)
+        stop_all_ambiances()
+    elif scene is AquaScene:
+        play_music_alone("Aqua")
+        stop_all_ambiances()
+    elif scene is SubterraScene:
+        play_music_alone("Subterra")
+        stop_all_ambiances()
+    elif scene is EstiaScene:
+        play_music_alone("Estia")
+        stop_all_ambiances()
+    elif scene is AstraEndScene:
+        play_music_alone("AstraEnd")
+        stop_all_ambiances()
 
 # Fonction s'exécutant à chaque début de timeline
 func _on_timeline_started():