From eb48a095de0dcf1dda5ec16959f83e7a12fcfc69 Mon Sep 17 00:00:00 2001
From: Zacharie Guet <guetzac@gmail.com>
Date: Sat, 21 Feb 2026 16:56:48 +0100
Subject: [PATCH] correction de l'audio et des dialogues

---
 .../niveau/ambiance_phase_1.ogg.import        |  2 +-
 .../niveau/ambiance_phase_2.ogg.import        |  2 +-
 .../niveau/ambiance_phase_3.ogg.import        |  4 +-
 .../ambiance/vaisseau/ship_music.ogg.import   |  8 +-
 .../morceaux/niveau/forest_phase_1.ogg.import |  2 +-
 .../morceaux/niveau/forest_phase_2.ogg.import |  2 +-
 .../morceaux/niveau/mines_phase_1.ogg.import  |  2 +-
 .../morceaux/niveau/mines_phase_2.ogg.import  |  2 +-
 common/audio_manager/audio_manager.tscn       | 62 ++------------
 common/audio_manager/scripts/audio_manager.gd | 23 ++++--
 dialogs/timelines/story/demeter_intro.dtl     | 70 ++++++++--------
 dialogs/timelines/story/demeter_introV2.dtl   | 38 ---------
 .../timelines/story/demeter_introV2.dtl.uid   |  1 -
 dialogs/timelines/story/demeter_outro.dtl     |  2 +-
 dialogs/timelines/story/wake_up.dtl           | 52 ++++--------
 gui/pause/pause.tscn                          |  2 -
 project.godot                                 |  2 +-
 .../cockpit_scene/scripts/cockpit.gd          |  1 +
 .../ship_garage/scripts/ship_garage.gd        |  5 ++
 stages/3d_scenes/ship_garage/ship_garage.tscn | 12 +++
 .../dialogic_demeter_intro_translation.csv    | 81 +++++++++----------
 .../dialogs/dialogic_wake_up_translation.csv  | 22 ++++-
 22 files changed, 164 insertions(+), 233 deletions(-)
 delete mode 100644 dialogs/timelines/story/demeter_introV2.dtl
 delete mode 100644 dialogs/timelines/story/demeter_introV2.dtl.uid

diff --git a/common/audio_manager/assets/ambiance/niveau/ambiance_phase_1.ogg.import b/common/audio_manager/assets/ambiance/niveau/ambiance_phase_1.ogg.import
index 8d0f318..48117de 100644
--- a/common/audio_manager/assets/ambiance/niveau/ambiance_phase_1.ogg.import
+++ b/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=false
+loop=true
 loop_offset=0.0
 bpm=0.0
 beat_count=0
diff --git a/common/audio_manager/assets/ambiance/niveau/ambiance_phase_2.ogg.import b/common/audio_manager/assets/ambiance/niveau/ambiance_phase_2.ogg.import
index 7841e9f..ace5a7c 100644
--- a/common/audio_manager/assets/ambiance/niveau/ambiance_phase_2.ogg.import
+++ b/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=false
+loop=true
 loop_offset=0.0
 bpm=0.0
 beat_count=0
diff --git a/common/audio_manager/assets/ambiance/niveau/ambiance_phase_3.ogg.import b/common/audio_manager/assets/ambiance/niveau/ambiance_phase_3.ogg.import
index 2c48c51..9a4d8b9 100644
--- a/common/audio_manager/assets/ambiance/niveau/ambiance_phase_3.ogg.import
+++ b/common/audio_manager/assets/ambiance/niveau/ambiance_phase_3.ogg.import
@@ -13,7 +13,7 @@ dest_files=["res://.godot/imported/ambiance_phase_3.ogg-66c917f6ee1dc2ac31474ae7
 [params]
 
 loop=true
-loop_offset=0
-bpm=0
+loop_offset=0.0
+bpm=0.0
 beat_count=0
 bar_beats=4
diff --git a/common/audio_manager/assets/ambiance/vaisseau/ship_music.ogg.import b/common/audio_manager/assets/ambiance/vaisseau/ship_music.ogg.import
index 1b968fb..29efa16 100644
--- a/common/audio_manager/assets/ambiance/vaisseau/ship_music.ogg.import
+++ b/common/audio_manager/assets/ambiance/vaisseau/ship_music.ogg.import
@@ -2,7 +2,7 @@
 
 importer="oggvorbisstr"
 type="AudioStreamOggVorbis"
-uid="uid://dadg6o6dl2k6t"
+uid="uid://bmwaw1yb8hucf"
 path="res://.godot/imported/ship_music.ogg-a35a322e3a6a4adafae0f2adcaf21247.oggvorbisstr"
 
 [deps]
@@ -12,14 +12,8 @@ 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
diff --git a/common/audio_manager/assets/morceaux/niveau/forest_phase_1.ogg.import b/common/audio_manager/assets/morceaux/niveau/forest_phase_1.ogg.import
index ec748b4..05eeb2d 100644
--- a/common/audio_manager/assets/morceaux/niveau/forest_phase_1.ogg.import
+++ b/common/audio_manager/assets/morceaux/niveau/forest_phase_1.ogg.import
@@ -12,7 +12,7 @@ dest_files=["res://.godot/imported/forest_phase_1.ogg-6fd2e255642e47e98a5560b5a2
 
 [params]
 
-loop=false
+loop=true
 loop_offset=0
 bpm=0
 beat_count=0
diff --git a/common/audio_manager/assets/morceaux/niveau/forest_phase_2.ogg.import b/common/audio_manager/assets/morceaux/niveau/forest_phase_2.ogg.import
index 6a0a21d..7f2ea6b 100644
--- a/common/audio_manager/assets/morceaux/niveau/forest_phase_2.ogg.import
+++ b/common/audio_manager/assets/morceaux/niveau/forest_phase_2.ogg.import
@@ -12,7 +12,7 @@ dest_files=["res://.godot/imported/forest_phase_2.ogg-1497e4a80f7f2adb0670888710
 
 [params]
 
-loop=false
+loop=true
 loop_offset=0
 bpm=0
 beat_count=0
diff --git a/common/audio_manager/assets/morceaux/niveau/mines_phase_1.ogg.import b/common/audio_manager/assets/morceaux/niveau/mines_phase_1.ogg.import
index ad0376f..561f8f5 100644
--- a/common/audio_manager/assets/morceaux/niveau/mines_phase_1.ogg.import
+++ b/common/audio_manager/assets/morceaux/niveau/mines_phase_1.ogg.import
@@ -12,7 +12,7 @@ dest_files=["res://.godot/imported/mines_phase_1.ogg-992232f16d175421a148ea48885
 
 [params]
 
-loop=false
+loop=true
 loop_offset=0
 bpm=0
 beat_count=0
diff --git a/common/audio_manager/assets/morceaux/niveau/mines_phase_2.ogg.import b/common/audio_manager/assets/morceaux/niveau/mines_phase_2.ogg.import
index d7e770d..a64d977 100644
--- a/common/audio_manager/assets/morceaux/niveau/mines_phase_2.ogg.import
+++ b/common/audio_manager/assets/morceaux/niveau/mines_phase_2.ogg.import
@@ -12,7 +12,7 @@ dest_files=["res://.godot/imported/mines_phase_2.ogg-f9104b757c31bcfc711d0517d98
 
 [params]
 
-loop=false
+loop=true
 loop_offset=0
 bpm=0
 beat_count=0
diff --git a/common/audio_manager/audio_manager.tscn b/common/audio_manager/audio_manager.tscn
index 2a7b495..2e8cc2f 100644
--- a/common/audio_manager/audio_manager.tscn
+++ b/common/audio_manager/audio_manager.tscn
@@ -5,30 +5,17 @@
 [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://bmwaw1yb8hucf" 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"]
@@ -39,7 +26,6 @@
 [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"]
@@ -50,13 +36,8 @@
 [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
+[ext_resource type="AudioStream" uid="uid://6id31r7o6trc" path="res://common/audio_manager/assets/sfx/ship_reveal/jingle_vaisseau.wav" id="37_3dfjn"]
+[ext_resource type="AudioStream" uid="uid://c5y70k3codtn" path="res://common/audio_manager/assets/sfx/signal/signal.mp3" id="41_iaiio"]
 
 [sub_resource type="AudioStreamPlaylist" id="AudioStreamPlaylist_8204s"]
 stream_count = 3
@@ -68,24 +49,12 @@ stream_2 = ExtResource("4_tuvql")
 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
-stream_0/stream = ExtResource("9_gv65y")
-stream_1/stream = ExtResource("10_n7o7n")
-stream_2/stream = ExtResource("11_wtvls")
-
-[sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_8204s"]
-random_pitch = 1.0594631
-streams_count = 1
-stream_0/stream = ExtResource("12_ajci6")
 
 [sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_1w04j"]
 random_pitch = 1.2
@@ -107,7 +76,6 @@ 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
@@ -119,15 +87,6 @@ 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
-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
@@ -139,7 +98,6 @@ 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
@@ -152,8 +110,6 @@ 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
@@ -178,9 +134,6 @@ unique_name_in_owner = true
 [node name="Dig" type="AudioStreamPlayer" parent="Sfx" unique_id=486042600]
 stream = SubResource("AudioStreamRandomizer_kfbah")
 
-[node name="Signal" type="AudioStreamPlayer" parent="Sfx" unique_id=641246368]
-stream = SubResource("AudioStreamRandomizer_8204s")
-
 [node name="Drop" type="AudioStreamPlayer" parent="Sfx" unique_id=1391500830]
 stream = SubResource("AudioStreamRandomizer_1w04j")
 
@@ -198,7 +151,6 @@ 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")
 
@@ -211,7 +163,7 @@ 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
+
+[node name="Signal" type="AudioStreamPlayer" parent="Sfx" unique_id=335682989]
+stream = ExtResource("41_iaiio")
+volume_db = -10.0
diff --git a/common/audio_manager/scripts/audio_manager.gd b/common/audio_manager/scripts/audio_manager.gd
index 57d233d..cc2df37 100644
--- a/common/audio_manager/scripts/audio_manager.gd
+++ b/common/audio_manager/scripts/audio_manager.gd
@@ -79,22 +79,34 @@ func _on_change_scene(scene : Scene):
     match scene.scene_id:
         "TITLE":
             play_music("Title", false, 0.0)
+        "INTRO":
+            stop_music()
         "REGION":
             play_music("Region", true)
-            play_ambiance("Exterior", true)
+            play_ambiance("Exterior")
         "COCKPIT":
             play_music("Ship")
+        "ASTRA":
+            stop_music()
+            play_ambiance("Astra")
+        "GARAGE":
+            stop_music()
+        "BOREA":
+            stop_music()
+            play_ambiance("Borea")
 
 func _on_timeline_started():
     var timeline_name = Dialogic.current_timeline.resource_path.split("/")[-1].trim_suffix(".dtl")
-    play_ambiance()
+    stop_ambiance()
 
     match timeline_name:
+        "demeter_astra_failed":
+            play_ambiance("Demeter")
+        "demeter_ship_presentation":
+            play_ambiance("Demeter")
         "demeter_intro":
             play_ambiance("Demeter")
-        "demeter_introV2":
-            play_ambiance("Demeter")
-        "demeter_midrun":
+        "demeter_post_tutorial":
             play_ambiance("Demeter")
         "demeter_outro":
             play_ambiance("Demeter")
@@ -187,6 +199,7 @@ func reset_volume(player : AudioStreamPlayer):
     player.volume_db = get_volume(player)
 
 func play_sfx(sfx_name : String):
+    print(sfx_name)
     var player := %Sfx.find_child(sfx_name) as AudioStreamPlayer
     if player:
         player.play()
diff --git a/dialogs/timelines/story/demeter_intro.dtl b/dialogs/timelines/story/demeter_intro.dtl
index 8d81ffa..20bf2b6 100644
--- a/dialogs/timelines/story/demeter_intro.dtl
+++ b/dialogs/timelines/story/demeter_intro.dtl
@@ -1,38 +1,38 @@
 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"]
-demeter: Hi ![pause=0.5] Phew, I thought no one would reply...[pause=0.5] Is this [b][color=#FFA617]Orchid[/color][/b] ?[pause=0.5] You may not be familiar with this name, but if you look in your memory you should see it... #id:30
-- Uh... Who is this ? #id:31
-	demeter: Oh sorry ! Your memory is quite new, you might be lost... Unfortunately, I cannot see you for now, I'm very far on this planet. #id:32
-- Where am I ? #id:33
-	demeter: Don't worry, you are in a subterranean base, but soon you will join the surface. #id:34
-- Wait... Who am I ? #id:35
-	demeter: Mmmh great question. I rebuilt your system but I do not know the details of your hardware... Maybe we'll find out ! #id:36
-demeter: I'm happy that you're finally awake ! To be honest I wasn't sure to make you work, your body is quite old... #id:37
-- So you are my creator ? #id:38
-	demeter: Sort of ! I mean I didn't build your body, I just borrowed it, but I build your intelligence ! But please be forgiving, if it's not perfect, I'm not good in that field ! #id:39
-- Why did you awaken me ? #id:3a
-	demeter: To be honest, I don't really know exactly... I mean there are a lot of reasons, but I'll tell you more later. #id:3b
-- What are you ? #id:3c
-	demeter: I'm like you... I mean like all the remaining moving things on this planet, robots, artificial intelligences, machines... My creators had many names to call us. #id:3d
-demeter: Ok, no more question for now, listen to me carefully. #id:3e
-demeter: Long time ago, this planet was full of life. Plants where thriving on mountains, seas and plains. #id:3f
-demeter: Now, this world is a wasteland. You'll see it quickly outside this building. I won't dwell on this subject; you'll soon know enough about it. #id:40
-demeter: The thing is something happened, a year ago... The [b][color=#FFA617]Talion[/color][/b], a special material that give birth to new forms of life when shattered, reappeared. Now we can start all over again and create a planet full of life. #id:41
-demeter: But first things first, for your mission, you'll have to understand how this is working, and how to use the [b][color=#FFA617]Talion[/color][/b] to plant seeds. #id:42
-demeter: [b]Just remember the following[/b] #id:43
-label explanations #id:44
-demeter: When you emerge from this building, you'll arrive in a little yellow zone. Its a [b][color=#FFA617]fertile zone[/color][/b], created by the return of the Talion. This is in this zone and only there where you can plant. #id:45
-demeter: Then you'll have to get seeds. For that, nothing more simple, you take your shovel, and you smash some stones ! Preferably those with yellow cristals on it, it's the [b][color=#FFA617]Talion veins[/color][/b] . #id:46
-demeter: Each time you use a tool or plant a seed, you'll spend an [b][color=#FFA617]energy[/color][/b]. When your out of it, you can just go recharge on the [b][color=#FFA617]recharge station[/color][/b] you'll find near the entrance. #id:47
-demeter: [b]Each time you recharge, time will pass[/b]. One day in fact (yes, you don't have a good battery), and the plants will grow ! #id:48
-demeter: To complete your first training, obtain enough [b][color=#FFA617]plant points[/color][/b]. Each plant give one or more [b][color=#FFA617]plant points[/color][/b] when mature. #id:49
-demeter: And yes, I almost forgot ! Some plants gain [b][color=#FFA617]mutations[/color][/b] that can affect their points or behavior. You can get these mutations on new seeds by harvesting existing plants, and gain better ones ! #id:4a
-- Ok, thats' a lot of info, can you repeat ? #id:4b
-	Ok, listen carefully. #id:4c
+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. #id:1f
+- Uh... Who are you ? #id:20
+	demeter: Oh sorry ![pause=0.3] I cannot send you my IDs for now,[pause=0.2] you are too far away from me. #id:21
+- Where am I ? #id:22
+	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. #id:23
+- Wait ! Who am I ? #id:24
+	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 ! #id:25
+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. #id:26
+- Did you create me ? #id:27
+	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. #id:28
+- Why did you awake me ? #id:29
+	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. #id:2a
+- What are you ? #id:2b
+	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. #id:2c
+demeter: Ok,[pause=0.2] no more questions for now,[pause=0.2] listen to me carefully. #id:2d
+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. #id:2e
+demeter: Now,[pause=0.2] this world is a wasteland.[pause=0.3] You'll see it as soon as you leave this base. #id:2f
+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. #id:30
+demeter: With the [color=#119758][b]Talion[/b][/color] back on the surface,[pause=0.2] we can bring this planet back to life. #id:31
+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. #id:32
+demeter: [b]Just remember the following[/b] #id:33
+label explanations #id:34
+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. #id:35
+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]. #id:36
+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. #id:37
+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 ! #id:38
+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. #id:39
+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. #id:3a
+- That's a lot of informations, can you repeat ? #id:3b
+	demeter: Ok,[pause=0.2] listen carefully. #id:3c
 	jump explanations
-- And I have to go now ? #id:4d
-- Ok but wait I have more questions ! #id:4e
-demeter: Sorry, we'll speak after this ! I'll send you an elevator ! #id:4f
-audio "res://common/audio_manager/assets/sfx/dialogs/sfx/closing_transmission.wav"
-[wait time="2.0"]
\ No newline at end of file
+- Ok, now I have more questions ! #id:3d
+	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] ! #id:3e
+	audio "res://common/audio_manager/assets/sfx/dialogs/sfx/closing_transmission.wav"
+	[wait time="2.0"]
+	[end_timeline]
\ No newline at end of file
diff --git a/dialogs/timelines/story/demeter_introV2.dtl b/dialogs/timelines/story/demeter_introV2.dtl
deleted file mode 100644
index ad67827..0000000
--- a/dialogs/timelines/story/demeter_introV2.dtl
+++ /dev/null
@@ -1,38 +0,0 @@
-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]
\ No newline at end of file
diff --git a/dialogs/timelines/story/demeter_introV2.dtl.uid b/dialogs/timelines/story/demeter_introV2.dtl.uid
deleted file mode 100644
index 4c8a9dd..0000000
--- a/dialogs/timelines/story/demeter_introV2.dtl.uid
+++ /dev/null
@@ -1 +0,0 @@
-uid://bx75vjharvxvf
diff --git a/dialogs/timelines/story/demeter_outro.dtl b/dialogs/timelines/story/demeter_outro.dtl
index 798c6b4..e4cb319 100644
--- a/dialogs/timelines/story/demeter_outro.dtl
+++ b/dialogs/timelines/story/demeter_outro.dtl
@@ -1 +1 @@
-demeter: Welcome to the [color=#E30022]Borea Base[/color] [color=#FFA617]{orchidName}[/color],[pause=0.2] it is the first step of your journey on this planet. #id:50
+demeter: Welcome to the [color=#E30022]Borea Base[/color] [color=#FFA617]{orchidName}[/color],[pause=0.2] it is the first step of your journey on this planet. #id:50
\ No newline at end of file
diff --git a/dialogs/timelines/story/wake_up.dtl b/dialogs/timelines/story/wake_up.dtl
index be63f6f..1bf3b44 100644
--- a/dialogs/timelines/story/wake_up.dtl
+++ b/dialogs/timelines/story/wake_up.dtl
@@ -1,40 +1,18 @@
-<<<<<<< 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"
+[i]Void.[/i] #id:3f
+[i]Void again.[/i] #id:40
+[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. #id:41
+label suite_dialogue #id:42
+- Check components #id:43
+	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. #id:44
 	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"
+- Check streams #id:45
+	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. #id:46
 	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"
+- Check memory #id:47
+	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. #id:48
 	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
-label discover #id:7d
-- Discover actions #id:7e
-	 While exploring available drivers, new possibility become available.[pause=0.5] Three propellers. Small models, only suitable for low altitude movement.[pause=0.5] A robotic arm. Multipurpose, and retractable. #id:7f
-	 jump discover
-- Discover streams #id:80
-	 A continuous stream of data flow, unwatched. This stream look like... [pause=0.5] a video.[pause=0.5] Dark colored pixels pass.[pause=0.5] An other stream show a flat wave.[pause=0.5] No sound or radio signals detected. #id:81
-	 jump discover
-- Discover memory #id:82
-	 Several disks are available, and the most part are empty.[pause=0.5] The full ones seems to contain the system that is currently analyzing the code of the system that is currently analyzing the code of[pause=0.5].[pause=0.5].[pause=0.5]. Mmmh, infinite recursion...[pause=0.5] Better avoid that. #id:83
-	 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
->>>>>>> 65645d976a98b5bfd030770764e72893cb8d9ccd
+- Wake up #id:49
+	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. #id:4a
+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. #id:4b
+[end_timeline]
\ No newline at end of file
diff --git a/gui/pause/pause.tscn b/gui/pause/pause.tscn
index 6781f57..c65194f 100644
--- a/gui/pause/pause.tscn
+++ b/gui/pause/pause.tscn
@@ -293,12 +293,10 @@ vertical_alignment = 1
 
 [node name="Settings" parent="." unique_id=758381952 instance=ExtResource("4_58dya")]
 unique_name_in_owner = true
-visible = false
 mouse_filter = 2
 
 [node name="Controls" parent="." unique_id=358658336 instance=ExtResource("11_urlqn")]
 unique_name_in_owner = true
-visible = false
 mouse_filter = 2
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="." unique_id=1779993260]
diff --git a/project.godot b/project.godot
index fc459e8..8b4274c 100644
--- a/project.godot
+++ b/project.godot
@@ -105,7 +105,7 @@ variables={
 "whoareyou": "false",
 "whynorth": "false"
 }
-translation/id_counter=30
+translation/id_counter=76
 translation/locales=[]
 translation/intern/save_mode=0
 translation/intern/file_mode=1
diff --git a/stages/3d_scenes/cockpit_scene/scripts/cockpit.gd b/stages/3d_scenes/cockpit_scene/scripts/cockpit.gd
index c0f77df..8ef2c98 100644
--- a/stages/3d_scenes/cockpit_scene/scripts/cockpit.gd
+++ b/stages/3d_scenes/cockpit_scene/scripts/cockpit.gd
@@ -42,6 +42,7 @@ func _ready():
 
 func handle_dialogs():
     if not POST_TUTORIAL_DIALOG_PATH in GameInfo.game_data.dialogs_done:
+        await get_tree().create_timer(5).timeout
         await ring_phone(POST_TUTORIAL_DIALOG_PATH)
 
 func ring_phone(dialog_path : String):
diff --git a/stages/3d_scenes/ship_garage/scripts/ship_garage.gd b/stages/3d_scenes/ship_garage/scripts/ship_garage.gd
index 2b8a329..16a0709 100644
--- a/stages/3d_scenes/ship_garage/scripts/ship_garage.gd
+++ b/stages/3d_scenes/ship_garage/scripts/ship_garage.gd
@@ -25,3 +25,8 @@ func _ready():
     Dialogic.start(DIALOG_PATH)
     await Dialogic.timeline_ended
     SceneManager.change_to_scene_id("COCKPIT")
+
+
+func _on_jingle_area_body_entered(body: Node3D):
+    if body is Player3D:
+        AudioManager.play_sfx("Ship_reveal")
diff --git a/stages/3d_scenes/ship_garage/ship_garage.tscn b/stages/3d_scenes/ship_garage/ship_garage.tscn
index 716e3ce..414b7ee 100644
--- a/stages/3d_scenes/ship_garage/ship_garage.tscn
+++ b/stages/3d_scenes/ship_garage/ship_garage.tscn
@@ -58,6 +58,9 @@ shading_mode = 0
 albedo_color = Color(0.5882353, 0.7019608, 0.85882354, 1)
 albedo_texture = ExtResource("2_yl6nj")
 
+[sub_resource type="BoxShape3D" id="BoxShape3D_dkh4e"]
+size = Vector3(20.170532, 9.8758545, 1)
+
 [node name="ShipGarage" type="Node3D" unique_id=707746738]
 script = ExtResource("1_43lym")
 
@@ -150,3 +153,12 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.37195766, 2.8968668, -0.44
 [node name="Phone" parent="." unique_id=429299908 instance=ExtResource("7_dkh4e")]
 unique_name_in_owner = true
 transform = Transform3D(-0.83126587, 0, -0.555875, 0, 1, 0, 0.555875, 0, -0.83126587, -4.110002, 1.6397171, 6.610814)
+
+[node name="JingleArea" type="Area3D" parent="." unique_id=731941135]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 22.818235, 0, 22.5019)
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="JingleArea" unique_id=1026275057]
+transform = Transform3D(0.70710677, 0, 0.70710677, 0, 1, 0, -0.70710677, 0, 0.70710677, 0.009346008, 4.4379272, 0.18450356)
+shape = SubResource("BoxShape3D_dkh4e")
+
+[connection signal="body_entered" from="JingleArea" to="." method="_on_jingle_area_body_entered"]
diff --git a/translation/dialogs/dialogic_demeter_intro_translation.csv b/translation/dialogs/dialogic_demeter_intro_translation.csv
index 64b1a14..fafa9a1 100644
--- a/translation/dialogs/dialogic_demeter_intro_translation.csv
+++ b/translation/dialogs/dialogic_demeter_intro_translation.csv
@@ -1,42 +1,41 @@
 keys,fr
-Text/30/text,"Hi ![pause=0.5] Phew, I thought no one would reply...[pause=0.5] Is this [b][color=#FFA617]Orchid[/color][/b] ?[pause=0.5] You may not be familiar with this name, but if you look in your memory you should see it..."
-Choice/31/text,Uh... Who is this ?
-Choice/31/disabled_text,
-Text/32/text,"Oh sorry ! Your memory is quite new, you might be lost... Unfortunately, I cannot see you for now, I'm very far on this planet."
-Choice/33/text,Where am I ?
-Choice/33/disabled_text,
-Text/34/text,"Don't worry, you are in a subterranean base, but soon you will join the surface."
-Choice/35/text,Wait... Who am I ?
-Choice/35/disabled_text,
-Text/36/text,Mmmh great question. I rebuilt your system but I do not know the details of your hardware... Maybe we'll find out !
-Text/37/text,"I'm happy that you're finally awake ! To be honest I wasn't sure to make you work, your body is quite old..."
-Choice/38/text,So you are my creator ?
-Choice/38/disabled_text,
-Text/39/text,"Sort of ! I mean I didn't build your body, I just borrowed it, but I build your intelligence ! But please be forgiving, if it's not perfect, I'm not good in that field !"
-Choice/3a/text,Why did you awaken me ?
-Choice/3a/disabled_text,
-Text/3b/text,"To be honest, I don't really know exactly... I mean there are a lot of reasons, but I'll tell you more later."
-Choice/3c/text,What are you ?
-Choice/3c/disabled_text,
-Text/3d/text,"I'm like you... I mean like all the remaining moving things on this planet, robots, artificial intelligences, machines... My creators had many names to call us."
-Text/3e/text,"Ok, no more question for now, listen to me carefully."
-Text/3f/text,"Long time ago, this planet was full of life. Plants where thriving on mountains, seas and plains."
-Text/40/text,"Now, this world is a wasteland. You'll see it quickly outside this building. I won't dwell on this subject; you'll soon know enough about it."
-Text/41/text,"The thing is something happened, a year ago... The [b][color=#FFA617]Talion[/color][/b], a special material that give birth to new forms of life when shattered, reappeared. Now we can start all over again and create a planet full of life."
-Text/42/text,"But first things first, for your mission, you'll have to understand how this is working, and how to use the [b][color=#FFA617]Talion[/color][/b] to plant seeds."
-Text/43/text,[b]Just remember the following[/b]
-Label/44/display_name,
-Text/45/text,"When you emerge from this building, you'll arrive in a little yellow zone. Its a [b][color=#FFA617]fertile zone[/color][/b], created by the return of the Talion. This is in this zone and only there where you can plant."
-Text/46/text,"Then you'll have to get seeds. For that, nothing more simple, you take your shovel, and you smash some stones ! Preferably those with yellow cristals on it, it's the [b][color=#FFA617]Talion veins[/color][/b] ."
-Text/47/text,"Each time you use a tool or plant a seed, you'll spend an [b][color=#FFA617]energy[/color][/b]. When your out of it, you can just go recharge on the [b][color=#FFA617]recharge station[/color][/b] you'll find near the entrance."
-Text/48/text,"[b]Each time you recharge, time will pass[/b]. One day in fact (yes, you don't have a good battery), and the plants will grow !"
-Text/49/text,"To complete your first training, obtain enough [b][color=#FFA617]plant points[/color][/b]. Each plant give one or more [b][color=#FFA617]plant points[/color][/b] when mature."
-Text/4a/text,"And yes, I almost forgot ! Some plants gain [b][color=#FFA617]mutations[/color][/b] that can affect their points or behavior. You can get these mutations on new seeds by harvesting existing plants, and gain better ones !"
-Choice/4b/text,"Ok, thats' a lot of info, can you repeat ?"
-Choice/4b/disabled_text,
-Text/4c/text,"Ok, listen carefully."
-Choice/4d/text,And I have to go now ?
-Choice/4d/disabled_text,
-Choice/4e/text,Ok but wait I have more questions !
-Choice/4e/disabled_text,
-Text/4f/text,"Sorry, we'll speak after this ! I'll send you an elevator !"
+Text/1f/text,"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."
+Choice/20/text,Uh... Who are you ?
+Choice/20/disabled_text,
+Text/21/text,"Oh sorry ![pause=0.3] I cannot send you my IDs for now,[pause=0.2] you are too far away from me."
+Choice/22/text,Where am I ?
+Choice/22/disabled_text,
+Text/23/text,"Don't worry,[pause=0.2] you are in a subterranean base,[pause=0.2] but you will get to the surface very soon."
+Choice/24/text,Wait ! Who am I ?
+Choice/24/disabled_text,
+Text/25/text,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 !
+Text/26/text,"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."
+Choice/27/text,Did you create me ?
+Choice/27/disabled_text,
+Text/28/text,"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."
+Choice/29/text,Why did you awake me ?
+Choice/29/disabled_text,
+Text/2a/text,"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."
+Choice/2b/text,What are you ?
+Choice/2b/disabled_text,
+Text/2c/text,"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."
+Text/2d/text,"Ok,[pause=0.2] no more questions for now,[pause=0.2] listen to me carefully."
+Text/2e/text,"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."
+Text/2f/text,"Now,[pause=0.2] this world is a wasteland.[pause=0.3] You'll see it as soon as you leave this base."
+Text/30/text,"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."
+Text/31/text,"With the [color=#119758][b]Talion[/b][/color] back on the surface,[pause=0.2] we can bring this planet back to life."
+Text/32/text,"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."
+Text/33/text,[b]Just remember the following[/b]
+Label/34/display_name,
+Text/35/text,"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."
+Text/36/text,"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]."
+Text/37/text,"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."
+Text/38/text,"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 !"
+Text/39/text,"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."
+Text/3a/text,"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."
+Choice/3b/text,"That's a lot of informations, can you repeat ?"
+Choice/3b/disabled_text,
+Text/3c/text,"Ok,[pause=0.2] listen carefully."
+Choice/3d/text,"Ok, now I have more questions !"
+Choice/3d/disabled_text,
+Text/3e/text,"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] !"
diff --git a/translation/dialogs/dialogic_wake_up_translation.csv b/translation/dialogs/dialogic_wake_up_translation.csv
index a3e2f95..925068b 100644
--- a/translation/dialogs/dialogic_wake_up_translation.csv
+++ b/translation/dialogs/dialogic_wake_up_translation.csv
@@ -1,4 +1,22 @@
 keys,fr
+Text/3f/text,[i]Void.[/i]
+Text/40/text,[i]Void again.[/i]
+Text/41/text,"[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/42/display_name,
+Choice/43/text,Check components
+Choice/43/disabled_text,
+Text/44/text,"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."
+Choice/45/text,Check streams
+Choice/45/disabled_text,
+Text/46/text,"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."
+Choice/47/text,Check memory
+Choice/47/disabled_text,
+Text/48/text,"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."
+Choice/49/text,Wake up
+Choice/49/disabled_text,
+Text/4a/text,"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."
+Text/4b/text,"Starting engines,[pause=0.3] fans and daemons,[pause=0.3] let's see what is to see."
+Text/4c/text,=======
 Text/7a/text,[i]Black.[/i]
 Text/7b/text,[i]Black Again.[/i]
 Text/7c/text,"[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."
@@ -11,8 +29,8 @@ Choice/80/disabled_text,
 Text/81/text,"A continuous stream of data flow, unwatched. This stream look like... [pause=0.5] a video.[pause=0.5] Dark colored pixels pass.[pause=0.5] An other stream show a flat wave.[pause=0.5] No sound or radio signals detected."
 Choice/82/text,Discover memory
 Choice/82/disabled_text,
-Text/83/text,"Several disks are available, and the most part are empty.[pause=0.5] The full ones seems to contain the system that is currently analyzing the code of the system that is currently analyzing the code of[pause=0.5].[pause=0.5].[pause=0.5]. Mmmh, infinite recursion...[pause=0.5] Better avoid that."
+Text/83/text,"Several disks are available, and the most part are blank.[pause=0.5] The full ones seems to contain the system that is currently analyzing the code of the system that is currently analyzing the code of[pause=0.5].[pause=0.5].[pause=0.5]. Mmmh, infinite recursion...[pause=0.5] Better avoid that."
 Choice/84/text,Wake up
 Choice/84/disabled_text,
 Text/85/text,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...
-Text/86/text,"Starting engines, fans, and daemons, let's see what is to see."
+Text/86/text,"Starting engines, fans, and daemons, let's see what there is to see."