From 84ea00aae3d31912e3375d89aee950dc9e4335b1 Mon Sep 17 00:00:00 2001 From: Zacharie Guet Date: Sun, 14 Jun 2026 17:27:06 +0200 Subject: [PATCH] =?UTF-8?q?Correction=20du=20son=20des=20cristaux,=20ajout?= =?UTF-8?q?=20d'un=20fade=20out=20=C3=A0=20tous=20les=20dialogues=20et=20c?= =?UTF-8?q?orrection=20de=20traduction?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../story_steps/1_2_mercury_story_step.gd | 4 +-- .../timelines/1_waking_up/2_demeter_intro.dtl | 1 + .../3_demeter_ship_presentation.dtl | 1 + dialogs/timelines/1_waking_up/4_cave.dtl | 1 + .../1_waking_up/5_mercury_arrival.dtl | 1 + .../1_waking_up/6_mercury_departure.dtl | 1 + .../6_vending_machine_presentation.dtl | 1 + .../timelines/1_waking_up/7_venus_arrival.dtl | 1 + .../1_waking_up/8_venus_departure.dtl | 1 + .../win_cristal/scripts/win_cristal.gd | 17 +++++++++- .../win_cristal/win_cristal.tscn | 34 +++++++++++++++++-- stages/terrain/region/scripts/win_wave.gd | 8 +++-- ...nding_machine_presentation_translation.csv | 2 +- 13 files changed, 65 insertions(+), 8 deletions(-) diff --git a/common/game_data/scripts/story/story_steps/1_2_mercury_story_step.gd b/common/game_data/scripts/story/story_steps/1_2_mercury_story_step.gd index 04fabae..2e96af0 100644 --- a/common/game_data/scripts/story/story_steps/1_2_mercury_story_step.gd +++ b/common/game_data/scripts/story/story_steps/1_2_mercury_story_step.gd @@ -25,8 +25,8 @@ func get_destination_scene() -> Scene: func get_ship_dialog_path(level : int, ship_in_space := true) -> String: if level == 0: return MERCURY_DEPARTURE_DIALOG_PATH - elif level == 1: - return MERCURY_DEPARTURE_DIALOG_PATH + if level == 1: + return VENDING_MACHINE_DIALOG_PATH if ship_in_space and is_run_finished(level + 1): return VENUS_ARRIVAL_DIALOG_PATH return "" \ No newline at end of file diff --git a/dialogs/timelines/1_waking_up/2_demeter_intro.dtl b/dialogs/timelines/1_waking_up/2_demeter_intro.dtl index 67a230c..fc55506 100644 --- a/dialogs/timelines/1_waking_up/2_demeter_intro.dtl +++ b/dialogs/timelines/1_waking_up/2_demeter_intro.dtl @@ -23,5 +23,6 @@ mysterious_demeter: But first things first,[pause=0.3] you have to learn how eve mysterious_demeter: I sent you a checklist with the things that you have to learn, and I'll provide the tools you need along the way. #id:fd mysterious_demeter: [b]I send you an elevator[/b],[pause=0.2] good luck [color=#FFA617]Orchid[/color] ! #id:fe audio "res://common/audio_manager/assets/sfx/dialogs/sfx/closing_transmission.wav" +leave mysterious_demeter [animation="Fade Out" length="1.0"] [wait time="2.0"] [end_timeline] \ No newline at end of file diff --git a/dialogs/timelines/1_waking_up/3_demeter_ship_presentation.dtl b/dialogs/timelines/1_waking_up/3_demeter_ship_presentation.dtl index b005d4a..cd23551 100644 --- a/dialogs/timelines/1_waking_up/3_demeter_ship_presentation.dtl +++ b/dialogs/timelines/1_waking_up/3_demeter_ship_presentation.dtl @@ -32,4 +32,5 @@ demeter: You'll need to travel north to join me, but you won't do that in one go demeter: Remember, to continue, you'll need to keep your best seeds and continue to [b]evolve your plants[/b]. #id:e3 demeter: Good luck [color=#FFA617]Orchid[/color],[pause=0.3] I am counting on you. #id:73 audio "res://common/audio_manager/assets/sfx/dialogs/sfx/closing_transmission.wav" +leave demeter [animation="Fade Out" length="1.0"] [wait time="2.0"] \ No newline at end of file diff --git a/dialogs/timelines/1_waking_up/4_cave.dtl b/dialogs/timelines/1_waking_up/4_cave.dtl index b7f79d5..8058a11 100644 --- a/dialogs/timelines/1_waking_up/4_cave.dtl +++ b/dialogs/timelines/1_waking_up/4_cave.dtl @@ -9,5 +9,6 @@ demeter: The crystals in these caverns are special; they don't produce life, but demeter: These caverns were well known to humans. Some went there to study [color=#FFA617]Talion[/color], others to explore the cave. These explorations were very risky, but apparently some humans enjoyed risking their lives... #id:e9 demeter: Use your detector to find the entrance to the cave; humans had installed an elevator there. #id:ec audio "res://common/audio_manager/assets/sfx/dialogs/sfx/closing_transmission.wav" +leave demeter [animation="Fade Out" length="1.0"] [wait time="2.0"] [end_timeline] \ No newline at end of file diff --git a/dialogs/timelines/1_waking_up/5_mercury_arrival.dtl b/dialogs/timelines/1_waking_up/5_mercury_arrival.dtl index 8c99b43..6229ff7 100644 --- a/dialogs/timelines/1_waking_up/5_mercury_arrival.dtl +++ b/dialogs/timelines/1_waking_up/5_mercury_arrival.dtl @@ -16,5 +16,6 @@ demeter: Anyway, there's enough in the base to repair the Internode, and I even demeter: I'd like you to find the base and synchronize your data with it. That will allow you to come back here if you run out of energy. #id:bd demeter: See you [color=#FFA617]Orchid[/color] ! #id:bf audio "res://common/audio_manager/assets/sfx/dialogs/sfx/closing_transmission.wav" +leave demeter [animation="Fade Out" length="1.0"] [wait time="2.0"] [end_timeline] \ No newline at end of file diff --git a/dialogs/timelines/1_waking_up/6_mercury_departure.dtl b/dialogs/timelines/1_waking_up/6_mercury_departure.dtl index 23cab27..9f8a2ec 100644 --- a/dialogs/timelines/1_waking_up/6_mercury_departure.dtl +++ b/dialogs/timelines/1_waking_up/6_mercury_departure.dtl @@ -23,5 +23,6 @@ demeter: I've updated you in the meantime, and you'll discover a new tool I just demeter: If you were in trouble for sorting your seeds, it might help you. #id:116 demeter: Good luck with the [color=#FFA617]Venus Relay Base[/color]; it's a little further than the last one. #id:d7 audio "res://common/audio_manager/assets/sfx/dialogs/sfx/closing_transmission.wav" +leave demeter [animation="Fade Out" length="1.0"] [wait time="2.0"] [end_timeline] \ No newline at end of file diff --git a/dialogs/timelines/1_waking_up/6_vending_machine_presentation.dtl b/dialogs/timelines/1_waking_up/6_vending_machine_presentation.dtl index 2f782d4..6622428 100644 --- a/dialogs/timelines/1_waking_up/6_vending_machine_presentation.dtl +++ b/dialogs/timelines/1_waking_up/6_vending_machine_presentation.dtl @@ -12,5 +12,6 @@ demeter: As usual, you can use your detector to find the entrance to these ruins demeter: [b]These artifacts will be placed on a shelf in your ship[/b], but remember that if you ran out of energy and I have to teleport the ship, you'll lose them. #id:d6 demeter: It could really help you, so go fetch them. #id:118 audio "res://common/audio_manager/assets/sfx/dialogs/sfx/closing_transmission.wav" +leave demeter [animation="Fade Out" length="1.0"] [wait time="2.0"] [end_timeline] \ No newline at end of file diff --git a/dialogs/timelines/1_waking_up/7_venus_arrival.dtl b/dialogs/timelines/1_waking_up/7_venus_arrival.dtl index d60671d..7c01669 100644 --- a/dialogs/timelines/1_waking_up/7_venus_arrival.dtl +++ b/dialogs/timelines/1_waking_up/7_venus_arrival.dtl @@ -11,5 +11,6 @@ demeter: Wow, you arrived quickly! How's your journey going so far? #id:d8 demeter: Good! I hope you're enjoying your new existence, and that you're not suffering too much from being born into something you didn't choose... #id:e0 demeter: Like in [color=#FFA617]Mercury Base[/color], I'd like you to save yourself. In the meantime, I'll check the ship's condition. I hope it hasn't suffered too much damage from the jumps! #id:e1 audio "res://common/audio_manager/assets/sfx/dialogs/sfx/closing_transmission.wav" +leave demeter [animation="Fade Out" length="1.0"] [wait time="2.0"] [end_timeline] \ No newline at end of file diff --git a/dialogs/timelines/1_waking_up/8_venus_departure.dtl b/dialogs/timelines/1_waking_up/8_venus_departure.dtl index f80eb2a..f745e3d 100644 --- a/dialogs/timelines/1_waking_up/8_venus_departure.dtl +++ b/dialogs/timelines/1_waking_up/8_venus_departure.dtl @@ -17,5 +17,6 @@ demeter: I won't bother you any longer, you still have a long journey ahead, and demeter: ... #id:fb demeter: I... am waiting for you... #id:fc audio "res://common/audio_manager/assets/sfx/dialogs/sfx/closing_transmission.wav" +leave demeter [animation="Fade Out" length="1.0"] [wait time="2.0"] [end_timeline] \ No newline at end of file diff --git a/entities/interactables/win_cristal/scripts/win_cristal.gd b/entities/interactables/win_cristal/scripts/win_cristal.gd index db42711..a7808ae 100644 --- a/entities/interactables/win_cristal/scripts/win_cristal.gd +++ b/entities/interactables/win_cristal/scripts/win_cristal.gd @@ -2,6 +2,7 @@ extends InspectableEntity class_name WinCristal +var order = 0 @export_tool_button("Update", "Callable") var update_action = update @export_tool_button("Spawn Anim", "Callable") var spawn_action = spawn_animation @export var data : WinCristalData = WinCristalData.random() : @@ -20,7 +21,21 @@ func update(): func spawn_animation(): scale = Vector2.ZERO - %CristalPlayer.play() + + match order: + 0: + %CristalPlayer.play() + 1: + %CristalPlayer2.play() + 2: + %CristalPlayer3.play() + 3: + %CristalPlayer4.play() + 4: + %CristalPlayer5.play() + _: + %CristalPlayer6.play() + get_tree().create_tween().tween_property(self, "scale", Vector2.ONE, 0.3).set_trans(Tween.TRANS_BOUNCE) func get_card_up_padding() -> float: diff --git a/entities/interactables/win_cristal/win_cristal.tscn b/entities/interactables/win_cristal/win_cristal.tscn index 85923a1..d93ceb2 100644 --- a/entities/interactables/win_cristal/win_cristal.tscn +++ b/entities/interactables/win_cristal/win_cristal.tscn @@ -3,7 +3,12 @@ [ext_resource type="Script" uid="uid://cismap3cn5e36" path="res://entities/interactables/win_cristal/scripts/win_cristal.gd" id="1_yb2ta"] [ext_resource type="Script" uid="uid://cos0ennmyfvc2" path="res://entities/interactables/win_cristal/scripts/win_cristal_data.gd" id="2_vkbio"] [ext_resource type="Texture2D" uid="uid://dslagvhodlepi" path="res://entities/interactables/win_cristal/assets/sprites/asset_cristals.png" id="2_yb2ta"] -[ext_resource type="AudioStream" uid="uid://du3hfjbaoyc8" path="res://common/audio_manager/assets/sfx/fin_de_map/fin_de_map.ogg" id="4_vkbio"] +[ext_resource type="AudioStream" uid="uid://bfhab51qe80j5" path="res://common/audio_manager/assets/sfx/fin_de_map/fin_de_map_cristal_1.wav" id="4_tfnwb"] +[ext_resource type="AudioStream" uid="uid://cr6y4e0p3xrqv" path="res://common/audio_manager/assets/sfx/fin_de_map/fin_de_map_cristal_2.wav" id="5_c8pdf"] +[ext_resource type="AudioStream" uid="uid://ccppo3l1vyd08" path="res://common/audio_manager/assets/sfx/fin_de_map/fin_de_map_cristal_3.wav" id="6_744fd"] +[ext_resource type="AudioStream" uid="uid://wphcqemoy810" path="res://common/audio_manager/assets/sfx/fin_de_map/fin_de_map_cristal_4.wav" id="7_am05r"] +[ext_resource type="AudioStream" uid="uid://v2snsj54xlkw" path="res://common/audio_manager/assets/sfx/fin_de_map/fin_de_map_cristal_5.wav" id="8_d7y1i"] +[ext_resource type="AudioStream" uid="uid://bvhnpk7pbh75t" path="res://common/audio_manager/assets/sfx/fin_de_map/fin_de_map_cristal_6.wav" id="9_laxd1"] [sub_resource type="Resource" id="Resource_5lni1"] script = ExtResource("2_vkbio") @@ -73,5 +78,30 @@ flip_h = true [node name="CristalPlayer" type="AudioStreamPlayer2D" parent="." unique_id=1879646229] unique_name_in_owner = true -stream = ExtResource("4_vkbio") +stream = ExtResource("4_tfnwb") +bus = &"Sfx" + +[node name="CristalPlayer2" type="AudioStreamPlayer2D" parent="." unique_id=786596923] +unique_name_in_owner = true +stream = ExtResource("5_c8pdf") +bus = &"Sfx" + +[node name="CristalPlayer3" type="AudioStreamPlayer2D" parent="." unique_id=1324425771] +unique_name_in_owner = true +stream = ExtResource("6_744fd") +bus = &"Sfx" + +[node name="CristalPlayer4" type="AudioStreamPlayer2D" parent="." unique_id=481950996] +unique_name_in_owner = true +stream = ExtResource("7_am05r") +bus = &"Sfx" + +[node name="CristalPlayer5" type="AudioStreamPlayer2D" parent="." unique_id=155314990] +unique_name_in_owner = true +stream = ExtResource("8_d7y1i") +bus = &"Sfx" + +[node name="CristalPlayer6" type="AudioStreamPlayer2D" parent="." unique_id=1866214122] +unique_name_in_owner = true +stream = ExtResource("9_laxd1") bus = &"Sfx" diff --git a/stages/terrain/region/scripts/win_wave.gd b/stages/terrain/region/scripts/win_wave.gd index 34bcc7c..0523677 100644 --- a/stages/terrain/region/scripts/win_wave.gd +++ b/stages/terrain/region/scripts/win_wave.gd @@ -16,6 +16,8 @@ const UPDATE_INTERVAL := 1.5 const WIN_CRISTAL_SCENE = preload("res://entities/interactables/win_cristal/win_cristal.tscn") var plant_looted : Array[Plant] = [] +var update_number = 0 + func _process(delta): %CPUParticles2D.emitting = started_time < WAVE_DURATION @@ -58,11 +60,13 @@ func update(): p.produce_seed() plant_looted.append(p) - spawn_cristal() + spawn_cristal(update_number) + update_number += 1 -func spawn_cristal(): +func spawn_cristal(order := 0): var new_cristal := WIN_CRISTAL_SCENE.instantiate() as WinCristal + new_cristal.order = order new_cristal.data = WinCristalData.random() var random_angle = randf_range(-PI,PI) diff --git a/translation/dialogs/dialogic_6_vending_machine_presentation_translation.csv b/translation/dialogs/dialogic_6_vending_machine_presentation_translation.csv index 38e7a1e..80b0868 100644 --- a/translation/dialogs/dialogic_6_vending_machine_presentation_translation.csv +++ b/translation/dialogs/dialogic_6_vending_machine_presentation_translation.csv @@ -1,5 +1,5 @@ keys,en,fr -Text/117/text,"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.",,"J'ai déniché quelque chose qui pourrait t'aider. J'ai répertorié des anciennes ruines humaines un peu partout sur la planète, et dans certaines, on trouve des ""distributeurs"", des machines d'échange d'objet contre de l'argent." +Text/117/text,"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.","J'ai déniché quelque chose qui pourrait t'aider. J'ai répertorié des anciennes ruines humaines un peu partout sur la planète, et dans certaines, on trouve des ""distributeurs"", des machines d'échange d'objet contre de l'argent." Choice/101/text,Thanks !,Merci ! Choice/101/disabled_text,, Choice/cf/text,Vending machines?,Des distributeurs ?