Réparation du bug de cellule hors région

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

@@ -1,19 +0,0 @@
-[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/meeting_demeter.ogg.import

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

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

@@ -2,7 +2,6 @@
 
 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"
 
@@ -10,15 +9,6 @@ path="res://.godot/imported/pickaxe_cave_2.wav-bb5e1c82ba8ffd44758505ce286a04a9.
 
 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]
 

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

@@ -2,7 +2,6 @@
 
 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"
 
@@ -10,15 +9,6 @@ path="res://.godot/imported/pickaxe_cave_finalblow.wav-ce8ca7f063b31d6564d593b5a
 
 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]
 

common/audio_manager/audio_manager.tscn

@@ -12,6 +12,7 @@
 [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"]
@@ -20,7 +21,6 @@
 [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"]
@@ -41,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/borea.ogg" id="22_mrdk3"]
+[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://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"]
@@ -179,7 +179,8 @@ volume_db = -5.0
 
 [node name="Borea" type="AudioStreamPlayer" parent="Ambiances" unique_id=1857904648]
 unique_name_in_owner = true
-stream = ExtResource("22_mrdk3")
+stream = ExtResource("7_spekb")
+volume_db = -5.0
 
 [node name="Ship" type="AudioStreamPlayer" parent="Ambiances" unique_id=1564186965]
 unique_name_in_owner = true
@@ -190,10 +191,6 @@ volume_db = -5.0
 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
 
@@ -250,6 +247,10 @@ 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
 

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 ""

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]

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"]

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]

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]

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]

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]

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]

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]

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:

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"

stages/terrain/region/scripts/region.gd

@@ -12,7 +12,7 @@ const TILE_SCALE = 1
 const TILE_SIZE : int = roundi(TILE_SET.tile_size.x * TILE_SCALE)
 const SPAWN_OBJECT_RANDOM_MOVEMENT = 200
 const DOORS_RANDOM_MOVEMENT = 3000
-const CELLS_RANDOM_MOVEMENT = 4000
+const CELLS_RANDOM_MOVEMENT = 3500
 
 const REGION_LIMIT = 4000
 const CHUNK_TILE_SIZE : int = 10

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)

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 ?