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

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

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

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

@@ -3,12 +3,12 @@
 importer="oggvorbisstr"
 type="AudioStreamOggVorbis"
 uid="uid://ch8wnrckanydg"
-path="res://.godot/imported/meeting_demeter.ogg-7dd58073d2ef5705a374bd8bb3634d37.oggvorbisstr"
+path="res://.godot/imported/borea.ogg-b575bef16c730ed2e0563c2eb6862766.oggvorbisstr"
 
 [deps]
 
-source_file="res://common/audio_manager/assets/morceaux/histoire/meeting_demeter.ogg"
-dest_files=["res://.godot/imported/meeting_demeter.ogg-7dd58073d2ef5705a374bd8bb3634d37.oggvorbisstr"]
+source_file="res://common/audio_manager/assets/morceaux/histoire/borea.ogg"
+dest_files=["res://.godot/imported/borea.ogg-b575bef16c730ed2e0563c2eb6862766.oggvorbisstr"]
 
 [params]
 

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

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

common/audio_manager/assets/sfx/fin_de_map/fin_de_map_cristal_1.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://bfhab51qe80j5"
+path="res://.godot/imported/fin_de_map_cristal_1.wav-fbc2aabbedcf9b9ea4de792270616879.sample"
+
+[deps]
+
+source_file="res://common/audio_manager/assets/sfx/fin_de_map/fin_de_map_cristal_1.wav"
+dest_files=["res://.godot/imported/fin_de_map_cristal_1.wav-fbc2aabbedcf9b9ea4de792270616879.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/fin_de_map/fin_de_map_cristal_2.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://cr6y4e0p3xrqv"
+path="res://.godot/imported/fin_de_map_cristal_2.wav-22f78a6101de5044c9eb27302000d841.sample"
+
+[deps]
+
+source_file="res://common/audio_manager/assets/sfx/fin_de_map/fin_de_map_cristal_2.wav"
+dest_files=["res://.godot/imported/fin_de_map_cristal_2.wav-22f78a6101de5044c9eb27302000d841.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/fin_de_map/fin_de_map_cristal_3.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://ccppo3l1vyd08"
+path="res://.godot/imported/fin_de_map_cristal_3.wav-08ca119096dca7f1ce13ef8a0fc9b262.sample"
+
+[deps]
+
+source_file="res://common/audio_manager/assets/sfx/fin_de_map/fin_de_map_cristal_3.wav"
+dest_files=["res://.godot/imported/fin_de_map_cristal_3.wav-08ca119096dca7f1ce13ef8a0fc9b262.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/fin_de_map/fin_de_map_cristal_4.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://wphcqemoy810"
+path="res://.godot/imported/fin_de_map_cristal_4.wav-b746d9213d33d907760d7149452e1cfd.sample"
+
+[deps]
+
+source_file="res://common/audio_manager/assets/sfx/fin_de_map/fin_de_map_cristal_4.wav"
+dest_files=["res://.godot/imported/fin_de_map_cristal_4.wav-b746d9213d33d907760d7149452e1cfd.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/fin_de_map/fin_de_map_cristal_5.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://v2snsj54xlkw"
+path="res://.godot/imported/fin_de_map_cristal_5.wav-03f398571aece8e59a223be04924d6a1.sample"
+
+[deps]
+
+source_file="res://common/audio_manager/assets/sfx/fin_de_map/fin_de_map_cristal_5.wav"
+dest_files=["res://.godot/imported/fin_de_map_cristal_5.wav-03f398571aece8e59a223be04924d6a1.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/fin_de_map/fin_de_map_cristal_6.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://bvhnpk7pbh75t"
+path="res://.godot/imported/fin_de_map_cristal_6.wav-55680ff3c48778e28de53ad22c902751.sample"
+
+[deps]
+
+source_file="res://common/audio_manager/assets/sfx/fin_de_map/fin_de_map_cristal_6.wav"
+dest_files=["res://.godot/imported/fin_de_map_cristal_6.wav-55680ff3c48778e28de53ad22c902751.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/fin_de_map/tremblement.mp3.import

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

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

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://c18orgaa5yect"
+path="res://.godot/imported/pickaxe_cave_1.wav-c2db6fad48f4457a7e47ef7fabdce2ca.sample"
+
+[deps]
+
+source_file="res://common/audio_manager/assets/sfx/phone/pickaxe_cave_1.wav"
+dest_files=["res://.godot/imported/pickaxe_cave_1.wav-c2db6fad48f4457a7e47ef7fabdce2ca.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/phone/pickaxe_cave_2.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://cbkg6v76a1d1q"
+path="res://.godot/imported/pickaxe_cave_2.wav-72432422e9b9eac863b31c5dda4262c9.sample"
+
+[deps]
+
+source_file="res://common/audio_manager/assets/sfx/phone/pickaxe_cave_2.wav"
+dest_files=["res://.godot/imported/pickaxe_cave_2.wav-72432422e9b9eac863b31c5dda4262c9.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/pickaxe/pickaxe_2_reverb.wav.import

@@ -1,24 +0,0 @@
-[remap]
-
-importer="wav"
-type="AudioStreamWAV"
-uid="uid://bs5ldhabymm5p"
-path="res://.godot/imported/pickaxe_2_reverb.wav-c953afb7e49205a0f4377738e1135a5b.sample"
-
-[deps]
-
-source_file="res://common/audio_manager/assets/sfx/pickaxe/pickaxe_2_reverb.wav"
-dest_files=["res://.godot/imported/pickaxe_2_reverb.wav-c953afb7e49205a0f4377738e1135a5b.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/pickaxe/pickaxe_3_reverb.wav.import

@@ -1,24 +0,0 @@
-[remap]
-
-importer="wav"
-type="AudioStreamWAV"
-uid="uid://bu278eqn8krnb"
-path="res://.godot/imported/pickaxe_3_reverb.wav-d3e3d8b6b50a16c6757536f43c8c6ccd.sample"
-
-[deps]
-
-source_file="res://common/audio_manager/assets/sfx/pickaxe/pickaxe_3_reverb.wav"
-dest_files=["res://.godot/imported/pickaxe_3_reverb.wav-d3e3d8b6b50a16c6757536f43c8c6ccd.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/pickaxe/pickaxe_cave_1.wav.import

@@ -2,13 +2,13 @@
 
 importer="wav"
 type="AudioStreamWAV"
-uid="uid://3c4nxjasebyk"
-path="res://.godot/imported/pickaxe_1_reverb.wav-8d6172bc1e5c2f43ec5b5cf869d5b6e3.sample"
+uid="uid://x36rvb4eso8q"
+path="res://.godot/imported/pickaxe_cave_1.wav-5365b9250c03fe13766ad32a821704fa.sample"
 
 [deps]
 
-source_file="res://common/audio_manager/assets/sfx/pickaxe/pickaxe_1_reverb.wav"
-dest_files=["res://.godot/imported/pickaxe_1_reverb.wav-8d6172bc1e5c2f43ec5b5cf869d5b6e3.sample"]
+source_file="res://common/audio_manager/assets/sfx/pickaxe/pickaxe_cave_1.wav"
+dest_files=["res://.godot/imported/pickaxe_cave_1.wav-5365b9250c03fe13766ad32a821704fa.sample"]
 
 [params]
 

common/audio_manager/assets/sfx/pickaxe/pickaxe_cave_2.wav.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+<<<<<<<< HEAD:common/audio_manager/assets/sfx/pickaxe/pickaxe_cave_2.wav.import
+uid="uid://dh3oho0pis6jv"
+path="res://.godot/imported/pickaxe_cave_2.wav-bb5e1c82ba8ffd44758505ce286a04a9.sample"
+
+[deps]
+
+source_file="res://common/audio_manager/assets/sfx/pickaxe/pickaxe_cave_2.wav"
+dest_files=["res://.godot/imported/pickaxe_cave_2.wav-bb5e1c82ba8ffd44758505ce286a04a9.sample"]
+========
+uid="uid://c6jdmdjncamcu"
+path="res://.godot/imported/pickaxe_cave_finalblow.wav-ce8ca7f063b31d6564d593b5a84e7560.sample"
+
+[deps]
+
+source_file="res://common/audio_manager/assets/sfx/pickaxe/pickaxe_cave_finalblow.wav"
+dest_files=["res://.godot/imported/pickaxe_cave_finalblow.wav-ce8ca7f063b31d6564d593b5a84e7560.sample"]
+>>>>>>>> f7f1d2be2c5b797138414266ce6324e8a3ff748f:common/audio_manager/assets/sfx/pickaxe/pickaxe_cave_finalblow.wav.import
+
+[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/pickaxe/pickaxe_cave_finalblow.wav.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+<<<<<<<< HEAD:common/audio_manager/assets/sfx/pickaxe/pickaxe_cave_finalblow.wav.import
+uid="uid://c6jdmdjncamcu"
+path="res://.godot/imported/pickaxe_cave_finalblow.wav-ce8ca7f063b31d6564d593b5a84e7560.sample"
+
+[deps]
+
+source_file="res://common/audio_manager/assets/sfx/pickaxe/pickaxe_cave_finalblow.wav"
+dest_files=["res://.godot/imported/pickaxe_cave_finalblow.wav-ce8ca7f063b31d6564d593b5a84e7560.sample"]
+========
+uid="uid://dh3oho0pis6jv"
+path="res://.godot/imported/pickaxe_cave_2.wav-bb5e1c82ba8ffd44758505ce286a04a9.sample"
+
+[deps]
+
+source_file="res://common/audio_manager/assets/sfx/pickaxe/pickaxe_cave_2.wav"
+dest_files=["res://.godot/imported/pickaxe_cave_2.wav-bb5e1c82ba8ffd44758505ce286a04a9.sample"]
+>>>>>>>> f7f1d2be2c5b797138414266ce6324e8a3ff748f:common/audio_manager/assets/sfx/pickaxe/pickaxe_cave_2.wav.import
+
+[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

@@ -12,14 +12,15 @@
 [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"]
 [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://of68i2k1g6y2" path="res://common/audio_manager/assets/morceaux/niveau/desert_phase_1.ogg" id="11_yjs51"]
 [ext_resource type="AudioStream" uid="uid://b8inedx4yjslw" path="res://common/audio_manager/assets/sfx/drop/drop_1.wav" id="12_4hp8f"]
+[ext_resource type="AudioStream" uid="uid://bdsghxlbtduuy" path="res://common/audio_manager/assets/morceaux/histoire/subterra.ogg" id="12_mrdk3"]
 [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://cnkwobaxy22xx" path="res://common/audio_manager/assets/morceaux/histoire/aqua.ogg" id="13_mrdk3"]
 [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://dsfqhcrard8o4" path="res://common/audio_manager/assets/morceaux/niveau/desert_phase_2.ogg" id="14_lwdce"]
@@ -40,7 +41,7 @@
 [ext_resource type="AudioStream" uid="uid://cbm4r5bf7py11" path="res://common/audio_manager/assets/sfx/recharge/recharge_capsule_4.wav" id="21_ehr7m"]
 [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://ch8wnrckanydg" path="res://common/audio_manager/assets/morceaux/histoire/borea.ogg" id="22_mrdk3"]
 [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://bp3wsncvda5gl" path="res://common/audio_manager/assets/sfx/recharge/recharge_capsule_7.wav" id="24_yr73o"]
 [ext_resource type="AudioStream" uid="uid://8juy5ev3rdfh" path="res://common/audio_manager/assets/sfx/plant_points/plant_point_1.wav" id="29_ngi21"]
@@ -178,14 +179,21 @@ volume_db = -5.0
 
 [node name="Borea" type="AudioStreamPlayer" parent="Ambiances" unique_id=1857904648]
 unique_name_in_owner = true
-stream = ExtResource("7_spekb")
-volume_db = -5.0
+stream = ExtResource("22_mrdk3")
 
 [node name="Ship" type="AudioStreamPlayer" parent="Ambiances" unique_id=1564186965]
 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="Aqua" type="AudioStreamPlayer" parent="Ambiances" unique_id=2066946789]
+unique_name_in_owner = true
+stream = ExtResource("13_mrdk3")
+
 [node name="Musics" type="Node" parent="." unique_id=1450527710]
 unique_name_in_owner = true
 
@@ -242,10 +250,6 @@ stream = ExtResource("7_tuvql")
 volume_db = -5.0
 bus = &"Music"
 
-[node name="Meeting_demeter" type="AudioStreamPlayer" parent="Musics" unique_id=1066359159]
-unique_name_in_owner = true
-stream = ExtResource("22_mrdk3")
-
 [node name="Sfx" type="Node" parent="." unique_id=2023641207]
 unique_name_in_owner = true
 

dialogs/timelines/1_waking_up/4_cave.dtl

@@ -1,5 +1,5 @@
 audio "res://common/audio_manager/assets/sfx/dialogs/sfx/incoming_transmission.wav"
-join demeter center [animation="Bounce In" length="1.0"]
+join demeter center [animation="Fade In" length="1.0"]
 demeter: I hope everything is going well for you so far. I'm calling because the next regions you're heading to contain unique rock formations\: the [b]Caverns of [color=#FFA617]Talion[/color][/b]. #id:e5
 demeter: The crystals in these caverns are special; they don't produce life, but they release a powerful mutagenic energy into the air. This will surely help you grow more powerfull plants for the rest of your journey. #id:eb
 - Ok I'll take a look on it. #id:100

dialogs/timelines/1_waking_up/5_mercury_arrival.dtl

@@ -1,5 +1,5 @@
 audio "res://common/audio_manager/assets/sfx/dialogs/sfx/incoming_transmission.wav"
-join demeter center [animation="Bounce In" length="1.0"]
+join demeter center [animation="Fade In" length="1.0"]
 demeter: I'm detecting the [color=#FFA617]Mercury base[/color] from your ship's sensors. I hope the Internode is okay... #id:b0
 - It's fine for now. #id:b1
 - Are you kidding? The battery is draining faster and faster, it's unbearable. #id:b2

dialogs/timelines/1_waking_up/6_mercury_departure.dtl

@@ -1,5 +1,5 @@
 audio "res://common/audio_manager/assets/sfx/dialogs/sfx/incoming_transmission.wav"
-join demeter center [animation="Bounce In" length="1.0"]
+join demeter center [animation="Fade In" length="1.0"]
 demeter: Great, [color=#FFA617]Orchid[/color]! I now have access to the base from the ship! #id:ca
 demeter: I've programmed a new destination for you in the onboard computer. #id:cb
 - OK! What's next? #id:104

dialogs/timelines/1_waking_up/6_vending_machine_presentation.dtl

@@ -1,5 +1,5 @@
 audio "res://common/audio_manager/assets/sfx/dialogs/sfx/incoming_transmission.wav"
-join demeter center [animation="Bounce In" length="1.0"]
+join demeter center [animation="Fade In" length="1.0"]
 demeter: I've found something that might help you. I've cataloged ancient human ruins all over the planet, and some of them contain "vending machines," machines for exchanging items for money. #id:117
 - Thanks ! #id:101
 - Vending machines? #id:cf

dialogs/timelines/1_waking_up/7_venus_arrival.dtl

@@ -1,5 +1,5 @@
 audio "res://common/audio_manager/assets/sfx/dialogs/sfx/incoming_transmission.wav"
-join demeter center [animation="Bounce In" length="1.0"]
+join demeter center [animation="Fade In" length="1.0"]
 demeter: Wow, you arrived quickly! How's your journey going so far? #id:d8
 - Boring #id:d9
     demeter: Sorry, but things get even more complicated from here on out! But believe me, I need you. I wouldn't have asked you if it was not important. #id:da

dialogs/timelines/1_waking_up/8_venus_departure.dtl

@@ -1,5 +1,5 @@
 audio "res://common/audio_manager/assets/sfx/dialogs/sfx/incoming_transmission.wav"
-join demeter center [animation="Bounce In" length="1.0"]
+join demeter center [animation="Fade In" length="1.0"]
 demeter: Well, you've done the easiest part so far, but all the remaining relay bases along the way have been destroyed by the weather... So, you're going to have a long road ahead of you to reach me. #id:ed
 demeter: However, I'm glad you made it this far! I understand that waking up in that dark room must have been quite a shock. #id:ee
 demeter: This is the first time you've come this far, or rather, the first time an iteration has reached this base. #id:ef

dialogs/timelines/X_gameplay_related/demeter_ship_failed.dtl

@@ -1,6 +1,6 @@
 audio "res://common/audio_manager/assets/sfx/dialogs/sfx/incoming_transmission.wav"
 [wait time="1.5"]
-join demeter center [animation="Bounce In" length="1.0"]
+join demeter center [animation="Fade In" length="1.0"]
 demeter: Hello again ! #id:11
 demeter: It seems that you ran out of energy.[pause=0.5].[pause=0.5]. #id:12
 - I'm sorry... #id:13

entities/interactable_3d/cristal/cristal.tscn

@@ -1,19 +1,18 @@
 [gd_scene format=3 uid="uid://8rorj31s3irn"]
 
 [ext_resource type="Script" uid="uid://dwn3g8c5sa0a2" path="res://entities/interactable_3d/cristal/scripts/cristal.gd" id="1_ci2hw"]
-[ext_resource type="AudioStream" uid="uid://3c4nxjasebyk" path="res://common/audio_manager/assets/sfx/pickaxe/pickaxe_1_reverb.wav" id="2_3rrt0"]
+[ext_resource type="AudioStream" uid="uid://x36rvb4eso8q" path="res://common/audio_manager/assets/sfx/pickaxe/pickaxe_cave_1.wav" id="2_3rrt0"]
 [ext_resource type="PackedScene" uid="uid://mwk845fx5ye2" path="res://entities/interactable_3d/cristal/assets/cristal.blend" id="2_ci2hw"]
 [ext_resource type="PackedScene" uid="uid://c7p114rvk26xw" path="res://entities/interactable_3d/cristal/assets/cristal_crack.blend" id="2_vejte"]
-[ext_resource type="AudioStream" uid="uid://bs5ldhabymm5p" path="res://common/audio_manager/assets/sfx/pickaxe/pickaxe_2_reverb.wav" id="3_247i2"]
-[ext_resource type="AudioStream" uid="uid://bu278eqn8krnb" path="res://common/audio_manager/assets/sfx/pickaxe/pickaxe_3_reverb.wav" id="4_k7wsc"]
+[ext_resource type="AudioStream" uid="uid://c6jdmdjncamcu" path="res://common/audio_manager/assets/sfx/pickaxe/pickaxe_cave_finalblow.wav" id="4_k7wsc"]
 [ext_resource type="PackedScene" uid="uid://bhbc1monbgumh" path="res://entities/interactable_3d/cristal/artefact_announce.tscn" id="8_3rrt0"]
 [ext_resource type="PackedScene" uid="uid://brp1fpvasaims" path="res://entities/interactable_3d/cristal/mutation_announce.tscn" id="9_247i2"]
 
-[sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_ojmpp"]
-streams_count = 3
+[sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_amehi"]
+playback_mode = 2
+streams_count = 2
 stream_0/stream = ExtResource("2_3rrt0")
-stream_1/stream = ExtResource("3_247i2")
-stream_2/stream = ExtResource("4_k7wsc")
+stream_1/stream = ExtResource("4_k7wsc")
 
 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ci2hw"]
 transparency = 1
@@ -39,7 +38,7 @@ metadata/_custom_type_script = "uid://bj4d1x8n8ina"
 [node name="BreackAudioPlayer" type="AudioStreamPlayer3D" parent="." unique_id=1190729820]
 unique_name_in_owner = true
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.0430325, 0)
-stream = SubResource("AudioStreamRandomizer_ojmpp")
+stream = SubResource("AudioStreamRandomizer_amehi")
 
 [node name="BreakParticles" type="CPUParticles3D" parent="." unique_id=1968257379]
 unique_name_in_owner = true

stages/3d_scenes/cockpit_scene/scripts/ship_tutorial.gd

@@ -23,7 +23,7 @@ func _ready():
     ok_button.button_down.connect(_on_ok_button_button_down)
 
 func appear():
-    AudioManager.play_sfx("Reveal")
+    AudioManager.play_sfx("Unlock_tool")
     animation_player.play("appear")
     Input.mouse_mode = Input.MOUSE_MODE_VISIBLE
     player.controlling_player=false

stages/terrain/region/scripts/modifiers/storm_modifier.gd

@@ -10,5 +10,8 @@ func get_description() -> String:
 func get_icon() -> Texture:
     return preload("res://common/icons/tornado.svg")
 
+func get_card_section_color() -> Color:
+    return Color("#FF006E")
+
 func modify_objective(objective : int) -> int:
     return roundi(objective * 2)

stages/terrain/region/scripts/plant_grid.gd

@@ -5,6 +5,8 @@ const GRID_SHIFT : int = roundi(Region.TILE_SIZE / 2.)
 const GRID_SIZE : int = Region.TILE_SIZE
 const POINT_RADIUS : int = 5
 const POINT_COLOR : Color = Color.WHITE
+const POINT_VISIBILITY_RADIUS : int = 200
+const POINT_FULL_OPACITY_RADIUS : int = 100
 const POINT_RANDOM_SHIFT = roundi(Region.TILE_SIZE / 2.)
 
 const REFRESH_TIME  : float = 2.
@@ -14,6 +16,8 @@ var refresh_timer  : float = 0.
 var region : Region
 var noise : Noise
 
+var points : Array[Vector2]
+
 func _init(
     _region : Region
 ):
@@ -22,12 +26,14 @@ func _init(
     noise.seed = region.data.region_seed
     noise.noise_type = noise.TYPE_VALUE
 
+    points = get_grid_point()
 
 func _process(delta):
+    queue_redraw()
     refresh_timer += delta
     if refresh_timer > REFRESH_TIME:
         refresh_timer = 0
-        queue_redraw()
+        points = get_grid_point()
     var current_item = GameInfo.game_data.player_data.inventory.get_item()
     var target_opacity = (1.) if current_item and current_item.snap_usage_to_grid() else 0.
 
@@ -37,7 +43,7 @@ func _process(delta):
         0.1)
 
 func _draw():
-    for p in get_grid_point():
+    for p in points:
         draw_point(p)
 
 
@@ -66,8 +72,13 @@ func get_random_shift(pos: Vector2):
 
 
 func draw_point(pos: Vector2):
+    var mouse_distance = get_global_mouse_position().distance_to(pos)
+
+    if mouse_distance < POINT_VISIBILITY_RADIUS:
+        var color := POINT_COLOR
+        color.a = min(1.,1 - (mouse_distance - POINT_FULL_OPACITY_RADIUS)/POINT_VISIBILITY_RADIUS)
         draw_circle(
             pos,
             POINT_RADIUS,
-        POINT_COLOR
+            color
         )