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

common/assets/materials/cristal.tres

@@ -0,0 +1,14 @@
+[gd_resource type="StandardMaterial3D" format=3 uid="uid://di0m3uqgi3l08"]
+
+[ext_resource type="Texture2D" uid="uid://dfd72vla6crn4" path="res://common/assets/textures/cristal.png" id="1_m4qy0"]
+
+[resource]
+diffuse_mode = 3
+specular_mode = 1
+disable_fog = true
+albedo_texture = ExtResource("1_m4qy0")
+metallic_specular = 1.0
+rim_tint = 0.48
+stencil_flags = 2
+stencil_reference = 5
+stencil_outline_thickness = 0.626

common/assets/textures/cristal.png.import

@@ -0,0 +1,41 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dfd72vla6crn4"
+path.s3tc="res://.godot/imported/cristal.png-542ce388785d47ebc69b0d8cd0728915.s3tc.ctex"
+metadata={
+"imported_formats": ["s3tc_bptc"],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://common/assets/textures/cristal.png"
+dest_files=["res://.godot/imported/cristal.png-542ce388785d47ebc69b0d8cd0728915.s3tc.ctex"]
+
+[params]
+
+compress/mode=2
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/uastc_level=0
+compress/rdo_quality_loss=0.0
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=true
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/channel_remap/red=0
+process/channel_remap/green=1
+process/channel_remap/blue=2
+process/channel_remap/alpha=3
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=0

common/audio_manager/assets/ambiance/cave/solarmusic-dripping-water-in-cave-114694.ogg.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://dq2nodhwnp73f"
+path="res://.godot/imported/solarmusic-dripping-water-in-cave-114694.ogg-81f5d41775da1d0914399edcb9214d3c.oggvorbisstr"
+
+[deps]
+
+source_file="res://common/audio_manager/assets/ambiance/cave/solarmusic-dripping-water-in-cave-114694.ogg"
+dest_files=["res://.godot/imported/solarmusic-dripping-water-in-cave-114694.ogg-81f5d41775da1d0914399edcb9214d3c.oggvorbisstr"]
+
+[params]
+
+loop=true
+loop_offset=0.0
+bpm=0.0
+beat_count=0
+bar_beats=4

common/audio_manager/assets/sfx/cristal/freesound_community-wine-glass-clink-36036.mp3.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+uid="uid://dnqq2sy3dxrb2"
+path="res://.godot/imported/freesound_community-wine-glass-clink-36036.mp3-bc462b7f4a73f6e9bc3696ca5c63bc97.mp3str"
+
+[deps]
+
+source_file="res://common/audio_manager/assets/sfx/cristal/freesound_community-wine-glass-clink-36036.mp3"
+dest_files=["res://.godot/imported/freesound_community-wine-glass-clink-36036.mp3-bc462b7f4a73f6e9bc3696ca5c63bc97.mp3str"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

common/audio_manager/assets/sfx/earth_rumble/sslc2022-earth-rumble-128880.mp3.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+uid="uid://di6id2kyfy2e1"
+path="res://.godot/imported/sslc2022-earth-rumble-128880.mp3-cbdb82e7630ba8aed62692404d0e45e0.mp3str"
+
+[deps]
+
+source_file="res://common/audio_manager/assets/sfx/earth_rumble/sslc2022-earth-rumble-128880.mp3"
+dest_files=["res://.godot/imported/sslc2022-earth-rumble-128880.mp3-cbdb82e7630ba8aed62692404d0e45e0.mp3str"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

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

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://3c4nxjasebyk"
+path="res://.godot/imported/pickaxe_1_reverb.wav-8d6172bc1e5c2f43ec5b5cf869d5b6e3.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"]
+
+[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

@@ -0,0 +1,24 @@
+[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

@@ -0,0 +1,24 @@
+[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/signal/universfield-bubble-pop-07-487896.mp3.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+uid="uid://rf7hachl3042"
+path="res://.godot/imported/universfield-bubble-pop-07-487896.mp3-9674fcc5b43af938e0c8845e16ca6bfd.mp3str"
+
+[deps]
+
+source_file="res://common/audio_manager/assets/sfx/signal/universfield-bubble-pop-07-487896.mp3"
+dest_files=["res://.godot/imported/universfield-bubble-pop-07-487896.mp3-9674fcc5b43af938e0c8845e16ca6bfd.mp3str"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

common/audio_manager/audio_manager.tscn

@@ -1,6 +1,8 @@
 [gd_scene format=3 uid="uid://b6hscxcrj065q"]
 
 [ext_resource type="Script" uid="uid://2p5d6vogtn82" path="res://common/audio_manager/scripts/audio_manager.gd" id="1_0tvca"]
+[ext_resource type="AudioStream" uid="uid://dq2nodhwnp73f" path="res://common/audio_manager/assets/ambiance/cave/solarmusic-dripping-water-in-cave-114694.ogg" id="2_ge2sc"]
+[ext_resource type="AudioStream" uid="uid://dipnmlprwfo12" path="res://common/audio_manager/assets/ambiance/niveau/ambiance_phase_1.ogg" id="2_tuvql"]
 [ext_resource type="AudioStream" uid="uid://dipnmlprwfo12" path="res://common/audio_manager/assets/ambiance/niveau/ambiance.ogg" id="3_qvjf5"]
 [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://cdohaice7nc8d" path="res://common/audio_manager/assets/ambiance/niveau/ambiance_foggy.ogg" id="4_ipd1r"]
@@ -129,6 +131,11 @@ script = ExtResource("1_0tvca")
 [node name="Ambiances" type="Node" parent="." unique_id=1989991562]
 unique_name_in_owner = true
 
+[node name="Cave" type="AudioStreamPlayer" parent="Ambiances" unique_id=71769481]
+stream = ExtResource("2_ge2sc")
+volume_db = -7.195
+pitch_scale = 0.5
+
 [node name="BaseRelais" type="AudioStreamPlayer" parent="Ambiances" unique_id=1895636918]
 unique_name_in_owner = true
 stream = ExtResource("7_ge2sc")

common/audio_manager/scripts/audio_manager.gd

@@ -67,6 +67,9 @@ func _on_change_scene(scene : Scene):
     elif scene is RelayBaseScene:
         stop_all_musics()
         play_ambiance_alone("BaseRelais", false)
+    elif scene is CaveScene:
+        stop_all_musics()
+        play_ambiance_alone("Cave", false)
 
 # Fonction s'exécutant à chaque début de timeline
 func _on_timeline_started():

common/game_data/scripts/artefacts/talion_overloader/talion_overloader.blend.import

@@ -39,6 +39,11 @@ materials/extract_format=0
 materials/extract_path=""
 _subresources={
 "materials": {
+"Cristal": {
+"use_external/enabled": true,
+"use_external/fallback_path": "res://common/assets/materials/cristal.tres",
+"use_external/path": "uid://di0m3uqgi3l08"
+},
 "Material": {
 "use_external/enabled": true,
 "use_external/fallback_path": "res://common/assets/materials/default_3d.tres",

common/game_data/scripts/artefacts/talion_relay/talion_relay.blend.import

@@ -39,6 +39,11 @@ materials/extract_format=0
 materials/extract_path=""
 _subresources={
 "materials": {
+"Cristal": {
+"use_external/enabled": true,
+"use_external/fallback_path": "res://common/assets/materials/cristal.tres",
+"use_external/path": "uid://di0m3uqgi3l08"
+},
 "Material": {
 "use_external/enabled": true,
 "use_external/fallback_path": "res://common/assets/materials/default_3d.tres",

common/game_data/scripts/game_data.gd

@@ -33,6 +33,7 @@ signal current_region_data_updated(p : RegionData)
 @export var game_mode : GameMode = GameMode.STORY
 
 @export var dialogs_done : Array[String] = [] #Chemin des dialogues terminés
+@export var tutorials_done : Array[String] = []
 
 func start_run() -> RunData:
     player_data.clear_inventory()

common/game_data/scripts/progression_data.gd

@@ -1,13 +1,12 @@
 extends Resource
 class_name ProgressionData
 
-
 @export var planted_mutation_ids: Array[String] = []
 @export var story_step_i := 0
-@export var ship_tutorial_done = false
+@export var mutations_unlocked = 8
 
 var all_mutations: Array[PlantMutation] : get = get_all_mutations
-var available_mutations: Array[PlantMutation] : get = get_all_mutations
+var available_mutations: Array[PlantMutation] : get = get_available_mutations
 var available_artefacts: Array[Artefact] : get = get_all_artifacts
 var story_step : StoryStep : get = get_story_step
 
@@ -19,23 +18,26 @@ func next_story_step() -> void:
     if story_step_i + 1 < len(get_all_story_steps()):
         story_step_i += 1
 
+func get_available_mutations() -> Array[PlantMutation]:
+    return get_all_mutations().slice(0, mutations_unlocked)
+
 func get_all_mutations() -> Array[PlantMutation]: 
     return [
-        AncientMutation.new(),
-        FertileMutation.new(),
-        GenerousMutation.new(),
-        HurriedMutation.new(),
-        PrecociousMutation.new(),
-        ProlificMutation.new(),
-        ProtectiveMutation.new(),
-        PureMutation.new(),
-        PurificationMutation.new(),
         QualityMutation.new(),
+        AncientMutation.new(),
+        ProlificMutation.new(),
+        PrecociousMutation.new(),
+        PurificationMutation.new(),
+        VivaciousMutation.new(),
         QuickMutation.new(),
         RobustMutation.new(),
         SocialMutation.new(),
+        FertileMutation.new(),
+        HurriedMutation.new(),
+        GenerousMutation.new(),
+        ProtectiveMutation.new(),
+        PureMutation.new(),
         ToughMutation.new(),
-        VivaciousMutation.new(),
     ]
 
 func get_all_artifacts() -> Array[Artefact]:

common/game_data/scripts/run/run_data.gd

@@ -32,42 +32,56 @@ func generate_next_run_points() -> Array[RunPoint]:
     next_run_points = []
 
     for i in range(story_step.get_run_point_number(level+1)):
+        var last_modifiers : Array[String] = []
+        if len(next_run_points):
+            for m in next_run_points[0].region_parameter.modifiers:
+                last_modifiers.append(m.modifier_name)
         next_run_points.append(
-            generate_next_run_point()
+            generate_next_run_point(last_modifiers)
         )
     
     return next_run_points
 
-func generate_next_run_point() -> RunPoint:
+func generate_next_run_point(last_modifiers : Array[String] = []) -> RunPoint:
     var region_parameter = RegionParameter.new()
     
     var next_level = level+1
 
+    var challenge_modifiers = generate_challenge_modifiers().filter(
+        func(m : RegionModifier): return not m.modifier_name in last_modifiers
+    )
+    var benefic_modifiers = generate_benefic_modifiers().filter(
+        func(m : RegionModifier): return not m.modifier_name in last_modifiers
+    )
+    var normal_modifiers = generate_normal_modifiers().filter(
+        func(m : RegionModifier): return not m.modifier_name in last_modifiers
+    )
+
     if story_step.need_gameplay_modifier(next_level):
         var is_challenge = randf() < story_step.get_challenge_chance(next_level)
         if is_challenge:
             region_parameter.modifiers = [
-                generate_challenge_modifiers().pick_random(),
-                generate_benefic_modifiers().pick_random()
+                challenge_modifiers.pick_random(),
+                benefic_modifiers.pick_random()
             ] as Array[RegionModifier]
         else:
             region_parameter.modifiers = [
-                generate_normal_modifiers().pick_random()
+                normal_modifiers.pick_random()
             ] as Array[RegionModifier]
 
 
-        var first_vending = story_step.get_first_vending_machine_occurence(next_level)
-        var vending_occurence = story_step.get_vending_machine_occurence(next_level)
-        if vending_occurence > 0:
-            if (level - first_vending)%vending_occurence == 0:
-                region_parameter.modifiers.append(VendingMachineModifier.new())
-    
+        region_parameter.modifiers.append_array(
+            story_step.get_gameplay_modifiers_for_region(next_level)
+        )
+
     region_parameter.modifiers.append_array(
         story_step.get_story_modifiers_for_region(next_level)
     )
     
     region_parameter.objective = story_step.get_objective_for_region(next_level)
-    
+    region_parameter.charge = story_step.get_charge_number(next_level)
+
+
     return RunPoint.new(
         region_parameter
     )
@@ -94,7 +108,7 @@ func generate_normal_modifiers() -> Array[RegionModifier]:
         HarshModifier.new(),
         ToxicModifier.new(),
         SandyModifier.new(),
-
+        MagneticModifier.new(),
     ]
 
 func generate_benefic_modifiers() -> Array[RegionModifier]:
@@ -102,6 +116,7 @@ func generate_benefic_modifiers() -> Array[RegionModifier]:
         VendingMachineModifier.new(),
         ResonnanceModifier.new(),
         InstableModifier.new(),
+        CaveModifier.new(),
     ]
 
 

common/game_data/scripts/settings_data.gd

@@ -57,8 +57,8 @@ const AVAILABLE_LANGUAGES_LABEL = [
 
 #region ------------------ Game ------------------
 
-const MAX_ZOOM = 1.8
-const MIN_ZOOM = 0.8
+const MAX_ZOOM = 2.
+const MIN_ZOOM = 0.5
 
 # Not in settings pannel
 @export var zoom : float = 1. :

common/game_data/scripts/story/astra_story_step.gd

@@ -2,6 +2,7 @@ extends StoryStep
 class_name AstraStoryStep
 
 const MERCURY_ARRIVAL_DIALOG_PATH="res://dialogs/timelines/astra/mercury_arrival.dtl"
+const CAVE_DIALOG_PATH="res://dialogs/timelines/astra/cave.dtl"
 
 func get_respawn_scene() -> Scene:
     return AstraScene.new()
@@ -15,9 +16,21 @@ func get_destination_scene() -> Scene:
         "001"
     )
 
+func get_cave_occurence(_level : int) -> int:
+    return 2
+
 func get_region_sequence_length() -> int:
     return 4
 
+func get_objective_for_region(level : int) -> int:
+    match level:
+        1: return 6
+        2: return 10
+        3: return 16
+        4: return 24
+        5: return 34
+        _: return get_objective_for_region(level-1) + (level-2) * 5
+
 func get_first_vending_machine_occurence(_level : int) -> int:
     return 0
 
@@ -28,6 +41,8 @@ func get_challenge_chance(_level : int) -> float:
     return 0.
 
 func get_ship_dialog_path(level : int, ship_in_space := true) -> String:
-    if ship_in_space and level == get_region_sequence_length() - 1:
+    if ship_in_space and level == get_cave_occurence(level) - 1:
+        return CAVE_DIALOG_PATH
+    if ship_in_space and is_run_finished(level + 1):
         return MERCURY_ARRIVAL_DIALOG_PATH
     return ""

common/game_data/scripts/story/mercury_story_step.gd

@@ -22,11 +22,11 @@ func get_destination_scene() -> Scene:
     )
 
 func get_first_vending_machine_occurence(_level : int) -> int:
-    return 0
+    return 1
 
 func get_ship_dialog_path(level : int, ship_in_space := true) -> String:
     if level == 0:
         return MERCURY_DEPARTURE_DIALOG_PATH
-    if ship_in_space and level == get_region_sequence_length() - 1:
+    if ship_in_space and is_run_finished(level + 1):
         return VENUS_ARRIVAL_DIALOG_PATH
     return ""

common/game_data/scripts/story/story_step.gd

@@ -19,7 +19,7 @@ func get_ship_dialog_path(_level : int, _ship_in_space := true) -> String:
 #region ------------------ Run  ------------------
 
 func is_run_finished(level : int) -> bool:
-    return level == get_region_sequence_length()
+    return level == get_region_sequence_length() - 1
 
 func get_region_sequence_length() -> int:
     return 6
@@ -28,7 +28,13 @@ func get_first_vending_machine_occurence(_level : int) -> int:
     return 2
 
 func get_vending_machine_occurence(_level : int) -> int:
-    return 4
+    return 3
+
+func get_first_cave_occurence(level : int) -> int:
+    return get_cave_occurence(level)
+
+func get_cave_occurence(_level : int) -> int:
+    return 3
 
 func get_challenge_chance(_level : int) -> float:
     return 0.3
@@ -38,15 +44,17 @@ func get_run_point_number(level : int) -> int:
         return 1
     return 2
 
+func get_charge_number(_level : int) -> int:
+    return 10
+
 func get_objective_for_region(level : int) -> int:
     match level:
-        0: return 1
-        1: return 8
-        2: return 10
-        3: return 15
-        4: return 20
-        5: return 30
-        _: return get_objective_for_region(level-1) + (level-3) * 5
+        1: return 10
+        2: return 15
+        3: return 20
+        4: return 30
+        5: return 45
+        _: return get_objective_for_region(level-1) + (level-2) * 5
 
 func get_story_modifiers_for_region(level : int) -> Array[RegionModifier]:
     var modifiers : Array[RegionModifier] = []
@@ -54,6 +62,25 @@ func get_story_modifiers_for_region(level : int) -> Array[RegionModifier]:
         var dest_mod = DestinationModifier.new()
         dest_mod.destination_scene = get_destination_scene()
         modifiers.append(dest_mod)
+
+    var first_cave = get_first_cave_occurence(level)
+    var cave_occurence = get_cave_occurence(level)
+    if cave_occurence > 0 and level >= first_cave:
+        if (level - first_cave)%cave_occurence == 0:
+            modifiers.append(CaveModifier.new())
+    
+    return modifiers
+
+func get_gameplay_modifiers_for_region(level : int) -> Array[RegionModifier]:
+    var modifiers : Array[RegionModifier] = []
+
+    if need_gameplay_modifier(level):
+        var first_vending = get_first_vending_machine_occurence(level)
+        var vending_occurence = get_vending_machine_occurence(level)
+        if vending_occurence > 0 and level >= first_vending:
+            if (level - first_vending)%vending_occurence == 0:
+                modifiers.append(VendingMachineModifier.new())
+    
     return modifiers
 
 func need_gameplay_modifier(level : int):

common/icons/cristal.svg

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   fill="#ffffff"
+   class="icon icon-tabler icons-tabler-filled icon-tabler-globe"
+   version="1.1"
+   id="svg5"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs5" />
+  <path
+     id="path5"
+     style="fill:#ffffff;stroke-width:21.0943;stroke-linecap:round;paint-order:stroke fill markers"
+     d="m 17.023734,4.3635641 a 0.381287,0.381287 0 0 0 -0.170042,0.058862 L 11.821685,7.6971107 A 0.63341096,0.63341096 0 0 0 11.534237,8.2108309 L 11.240336,19.008011 a 0.54999444,0.54999444 0 0 0 0.281243,0.495301 l 2.913668,1.633839 a 0.85528839,0.85528839 0 0 0 0.615008,0.08674 l 3.251881,-0.764304 a 0.54999441,0.54999441 0 0 0 0.407255,-0.3982 L 21.41304,9.6040507 A 0.633411,0.633411 0 0 0 21.276945,9.0305978 L 17.348792,4.4922505 A 0.381287,0.381287 0 0 0 17.023734,4.3635641 Z M 16.855445,5.710685 a 0.29045002,0.29045002 0 0 1 0.24822,0.1000976 l 2.992058,3.4556065 a 0.18188889,0.18188889 0 0 1 -0.06799,0.2862794 L 16.39349,11.042166 a 0.43339164,0.43339164 0 0 1 -0.433214,-0.0611 L 12.879721,8.5445752 a 0.18188888,0.18188888 0 0 1 0.01384,-0.2939165 l 3.831045,-2.4933356 a 0.29045002,0.29045002 0 0 1 0.130842,-0.046638 z" />
+  <path
+     id="path11"
+     style="fill:#ffffff;stroke-width:30;stroke-linecap:round;paint-order:stroke fill markers"
+     d="M 11.299657,2.8712653 4.865863,8.4803941 A 0.83240115,0.83240115 109.32328 0 0 4.5938103,9.2562442 l 1.6673523,9.2015148 a 0.84433519,0.84433519 50.484116 0 0 0.5249373,0.63644 l 4.4292571,1.721467 a 1.216379,1.216379 3.6429642e-7 0 0 0.88129,0 l 4.429257,-1.721467 a 0.84433513,0.84433513 129.51588 0 0 0.524938,-0.63644 L 18.718193,9.2562442 A 0.83240121,0.83240121 70.676724 0 0 18.446141,8.4803941 L 12.012347,2.8712653 a 0.54226096,0.54226096 5.9568751e-7 0 0 -0.71269,0 z"
+     transform="matrix(0.43145929,-0.11560917,0.11560917,0.43145929,0.83225312,12.978764)" />
+</svg>

common/icons/cristal.svg.import

@@ -0,0 +1,44 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://cqdyykjx6hdrr"
+path.s3tc="res://.godot/imported/cristal.svg-7e9a919e9dbc36092f14a8401b5f4888.s3tc.ctex"
+metadata={
+"imported_formats": ["s3tc_bptc"],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://common/icons/cristal.svg"
+dest_files=["res://.godot/imported/cristal.svg-7e9a919e9dbc36092f14a8401b5f4888.s3tc.ctex"]
+
+[params]
+
+compress/mode=2
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/uastc_level=0
+compress/rdo_quality_loss=0.0
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=true
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/channel_remap/red=0
+process/channel_remap/green=1
+process/channel_remap/blue=2
+process/channel_remap/alpha=3
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=0
+svg/scale=2.0
+editor/scale_with_editor_scale=false
+editor/convert_colors_with_editor_theme=false

common/icons/flag-2.svg

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   fill="currentColor"
+   class="icon icon-tabler icons-tabler-filled icon-tabler-flag-2"
+   version="1.1"
+   id="svg2"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2" />
+  <path
+     stroke="none"
+     d="M 0,0 H 24 V 24 H 0 Z"
+     fill="none"
+     id="path1" />
+  <path
+     d="m 19,4 a 1,1 0 0 1 0.993,0.883 L 20,5 v 9 a 1,1 0 0 1 -0.883,0.993 L 19,15 H 6 v 6 A 1,1 0 0 1 5.117,21.993 L 5,22 A 1,1 0 0 1 4.007,21.117 L 4,21 V 5 A 1,1 0 0 1 4.883,4.007 L 5,4 Z"
+     id="path2"
+     style="fill:#fefefe;fill-opacity:1" />
+</svg>

common/icons/flag-2.svg.import

@@ -0,0 +1,43 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://uckrw5fan88k"
+path="res://.godot/imported/flag-2.svg-b4658bfe95b153ec543e0e6f4d1176cb.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://common/icons/flag-2.svg"
+dest_files=["res://.godot/imported/flag-2.svg-b4658bfe95b153ec543e0e6f4d1176cb.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/uastc_level=0
+compress/rdo_quality_loss=0.0
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/channel_remap/red=0
+process/channel_remap/green=1
+process/channel_remap/blue=2
+process/channel_remap/alpha=3
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
+svg/scale=2.0
+editor/scale_with_editor_scale=false
+editor/convert_colors_with_editor_theme=false

common/icons/hand-finger

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="18.474695"
+   height="20.999998"
+   viewBox="0 0 18.474695 20.999998"
+   fill="none"
+   stroke="currentColor"
+   stroke-width="2"
+   stroke-linecap="round"
+   stroke-linejoin="round"
+   class="icon icon-tabler icons-tabler-outline icon-tabler-hand-finger"
+   version="1.1"
+   id="svg5"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs5" />
+  <path
+     stroke="none"
+     d="m -2.525305,-2.0000007 h 24 V 21.999999 h -24 z"
+     fill="none"
+     id="path1" />
+  <path
+     d="M 5.474695,10.999999 V 2.4999993 a 1.5,1.5 0 0 1 3,0 v 7.5"
+     id="path2"
+     style="stroke:#ffffff;stroke-opacity:1" />
+  <path
+     d="m 8.474695,9.4999993 v -2 a 1.5,1.5 0 1 1 3,0 v 2.5"
+     id="path3"
+     style="stroke:#ffffff;stroke-opacity:1" />
+  <path
+     d="m 11.474695,8.4999993 a 1.5,1.5 0 0 1 3,0 v 1.5"
+     id="path4"
+     style="stroke:#ffffff;stroke-opacity:1" />
+  <path
+     d="m 14.474695,9.4999993 a 1.5,1.5 0 0 1 3,0 v 4.4999997 a 6,6 0 0 1 -6,6 h -2 0.208 a 6,6 0 0 1 -5.012,-2.7 69.74,69.74 0 0 1 -0.196,-0.3 c -0.312,-0.479 -1.407,-2.388 -3.286,-5.728 a 1.5,1.5 0 0 1 0.536,-2.0219997 1.867,1.867 0 0 1 2.28,0.28 l 1.47,1.4699997"
+     id="path5"
+     style="stroke:#ffffff;stroke-opacity:1" />
+</svg>

common/icons/hand-finger.svg

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="18.474695"
+   height="20.999998"
+   viewBox="0 0 18.474695 20.999998"
+   fill="none"
+   stroke="currentColor"
+   stroke-width="2"
+   stroke-linecap="round"
+   stroke-linejoin="round"
+   class="icon icon-tabler icons-tabler-outline icon-tabler-hand-finger"
+   version="1.1"
+   id="svg5"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs5" />
+  <path
+     stroke="none"
+     d="m -2.525305,-2.0000007 h 24 V 21.999999 h -24 z"
+     fill="none"
+     id="path1" />
+  <path
+     d="M 5.474695,10.999999 V 2.4999993 a 1.5,1.5 0 0 1 3,0 v 7.5"
+     id="path2"
+     style="stroke:#ffffff;stroke-opacity:1" />
+  <path
+     d="m 8.474695,9.4999993 v -2 a 1.5,1.5 0 1 1 3,0 v 2.5"
+     id="path3"
+     style="stroke:#ffffff;stroke-opacity:1" />
+  <path
+     d="m 11.474695,8.4999993 a 1.5,1.5 0 0 1 3,0 v 1.5"
+     id="path4"
+     style="stroke:#ffffff;stroke-opacity:1" />
+  <path
+     d="m 14.474695,9.4999993 a 1.5,1.5 0 0 1 3,0 v 4.4999997 a 6,6 0 0 1 -6,6 h -2 0.208 a 6,6 0 0 1 -5.012,-2.7 69.74,69.74 0 0 1 -0.196,-0.3 c -0.312,-0.479 -1.407,-2.388 -3.286,-5.728 a 1.5,1.5 0 0 1 0.536,-2.0219997 1.867,1.867 0 0 1 2.28,0.28 l 1.47,1.4699997"
+     id="path5"
+     style="stroke:#ffffff;stroke-opacity:1" />
+</svg>

common/icons/hand-finger.svg.import

@@ -0,0 +1,43 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://b3vg3tipd4boh"
+path="res://.godot/imported/hand-finger.svg-4b9fa57a07066292554e8fd7f7ad9dac.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://common/icons/hand-finger.svg"
+dest_files=["res://.godot/imported/hand-finger.svg-4b9fa57a07066292554e8fd7f7ad9dac.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/uastc_level=0
+compress/rdo_quality_loss=0.0
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/channel_remap/red=0
+process/channel_remap/green=1
+process/channel_remap/blue=2
+process/channel_remap/alpha=3
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
+svg/scale=2.0
+editor/scale_with_editor_scale=false
+editor/convert_colors_with_editor_theme=false

common/icons/magnet.svg

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   fill="currentColor"
+   class="icon icon-tabler icons-tabler-filled icon-tabler-magnet"
+   version="1.1"
+   id="svg2"
+   sodipodi:docname="magnet.svg"
+   inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="namedview2"
+     pagecolor="#505050"
+     bordercolor="#ffffff"
+     borderopacity="1"
+     inkscape:showpageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="1"
+     inkscape:deskcolor="#505050"
+     inkscape:zoom="18.5"
+     inkscape:cx="18.621622"
+     inkscape:cy="14.324324"
+     inkscape:window-width="1920"
+     inkscape:window-height="1009"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <path
+     stroke="none"
+     d="M0 0h24v24H0z"
+     fill="none"
+     id="path1" />
+  <path
+     d="M21 9v4a9 9 0 0 1 -18 0v-4h7v4a2 2 0 1 0 4 0v-4zm-3 -7a3 3 0 0 1 3 3v2h-7v-2a3 3 0 0 1 3 -3zm-11 0a3 3 0 0 1 3 3v2h-7v-2a3 3 0 0 1 3 -3z"
+     id="path2"
+     style="fill:#ffffff;fill-opacity:1" />
+</svg>

common/icons/magnet.svg.import

@@ -0,0 +1,43 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://mv0emix7dwio"
+path="res://.godot/imported/magnet.svg-210fc8631abfaf11eefb9e027a72fb42.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://common/icons/magnet.svg"
+dest_files=["res://.godot/imported/magnet.svg-210fc8631abfaf11eefb9e027a72fb42.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/uastc_level=0
+compress/rdo_quality_loss=0.0
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/channel_remap/red=0
+process/channel_remap/green=1
+process/channel_remap/blue=2
+process/channel_remap/alpha=3
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
+svg/scale=2.0
+editor/scale_with_editor_scale=false
+editor/convert_colors_with_editor_theme=false

common/scene_manager/scripts/scenes/cave_scene.gd

@@ -0,0 +1,31 @@
+extends Scene
+class_name CaveScene
+
+@export var cave_room_seed = 0
+
+func _init(
+    _crs : int = 0
+):
+    cave_room_seed = _crs
+ 
+func get_scene_id() -> String:
+    return "CRISTAL_CAVE"
+
+func get_scene_path() -> String:
+    return "res://stages/3d_scenes/cave/cave.tscn"
+
+func is_mouse_captured() -> bool:
+    return true
+
+func is_needed_to_be_announced() -> bool:
+    return true
+
+func get_scene_title() -> String:
+    return tr("CRISTAL_CAVE")
+
+func get_scene_icon() -> Texture:
+    return preload("res://common/icons/cristal.svg")
+
+func _on_generated(generated_scene : Node):
+    var cave : Cave = generated_scene as Cave
+    cave.setup_room(cave_room_seed)

common/scene_manager/scripts/scenes/cave_scene.gd.uid

@@ -0,0 +1 @@
+uid://f143q00p8ph1

common/tools/scripts/math.gd

@@ -12,16 +12,18 @@ static func get_tile_from_pos(coord) -> Vector2i:
         floori(coord.y / (Region.TILE_SIZE)),
     )
 
-static func get_tiles_in_circle(center: Vector2, radius : float) -> Array[Vector2i]:
+static func get_tiles_in_circle(center: Vector2,radius : float) -> Array[Vector2i]:
     var tiles : Array[Vector2i] = []
 
+    var margin = ceili(radius * 0.5)
+
     for x in range(
-        floori((center.x - radius/2.) / Region.TILE_SIZE),
-        ceili((center.x + radius/2.) / Region.TILE_SIZE),
+        floori((center.x - radius/2.) / Region.TILE_SIZE) - margin,
+        ceili((center.x + radius/2.) / Region.TILE_SIZE) + margin,
     ):
         for y in range(
-            floori((center.y - radius/2.) / Region.TILE_SIZE),
-            ceili((center.y + radius/2.) / Region.TILE_SIZE),
+            floori((center.y - radius/2.) / Region.TILE_SIZE) - margin,
+            ceili((center.y + radius/2.) / Region.TILE_SIZE) + margin,
         ):
             if is_tile_on_circle(Vector2i(x,y), center, radius):
                 tiles.append(Vector2i(x,y))
@@ -30,24 +32,29 @@ static func get_tiles_in_circle(center: Vector2, radius : float) -> Array[Vector
 static func is_tile_on_circle(tile_coord : Vector2i, circle_center: Vector2, circle_radius : float) -> bool:
     var absolute_tile_pos : Vector2 = tile_coord * Region.TILE_SIZE
 
-    # Loop over tile corners to know if the area collide
-    var corners : Array[Vector2] = []
-    for x in [0,1]:
-        for y in [0,1]:
-            corners.append(
-                absolute_tile_pos
-                + Vector2.RIGHT * x * Region.TILE_SIZE
-                + Vector2.DOWN * y * Region.TILE_SIZE
-            )
-    
-    # Check if segment touch area
-    for i in range(4):
-        var a = corners[i%4]
-        var b = corners[(i+1)%4]
-        if segment_intersect_circle(a,b,circle_center,circle_radius):
-            return true
+    var tile_center = absolute_tile_pos + Vector2.ONE * Region.TILE_SIZE / 2
+    var tile_radius = roundf(Region.TILE_SIZE/2.)
 
-    return false
+    return pow(tile_center.x - circle_center.x, 2) + pow(tile_center.y - circle_center.y, 2) <= pow(tile_radius + circle_radius, 2)
+
+    # Loop over tile corners to know if the area collide
+    # var corners : Array[Vector2] = []
+    # for x in [0,1]:
+    #     for y in [0,1]:
+    #         corners.append(
+    #             absolute_tile_pos
+    #             + Vector2.RIGHT * x * Region.TILE_SIZE
+    #             + Vector2.DOWN * y * Region.TILE_SIZE
+    #         )
+    
+    # # Check if segment touch area
+    # for i in range(4):
+    #     var a = corners[i%4]
+    #     var b = corners[(i+1)%4]
+    #     if segment_intersect_circle(a,b,circle_center,circle_radius):
+    #         return true
+
+    # return false
 
 
 # Stolen here https://stackoverflow.com/questions/1073336/circle-line-segment-collision-detection-algorithm

common/tools/scripts/test_tiles.gd

@@ -0,0 +1,3 @@
+
+
+

common/tools/scripts/test_tiles.gd.uid

@@ -0,0 +1 @@
+uid://bebwor5r5nnov

common/tools/test_tiles.tscn

@@ -0,0 +1,9 @@
+[gd_scene format=3 uid="uid://6or2rnjt5ixv"]
+
+[ext_resource type="Script" uid="uid://bebwor5r5nnov" path="res://common/tools/scripts/test_tiles.gd" id="1_44t07"]
+
+[node name="TestTiles" type="Node2D" unique_id=949540000]
+script = ExtResource("1_44t07")
+
+[node name="Grid" type="Node2D" parent="." unique_id=2109744474]
+unique_name_in_owner = true

common/vfx/materials/shaders/topology_map.gdshader

@@ -0,0 +1,40 @@
+shader_type canvas_item;
+
+uniform float line_number = 6;
+uniform vec4 line_color : source_color = vec4(1.);
+uniform float line_thickness : hint_range(0.0, 0.01) = 0.001;
+
+const mat3 sobel_x = mat3(
+    vec3( 1.0,  2.0,  1.0),
+    vec3( 0.0,  0.0,  0.0),
+    vec3(-1.0, -2.0, -1.0)
+);
+
+const mat3 sobel_y = mat3(
+    vec3(1.0, 0.0, -1.0),
+    vec3(2.0, 0.0, -2.0),
+    vec3(1.0, 0.0, -1.0)
+);
+
+float sample_quantized(sampler2D text, vec2 uv) {
+    return ceil(texture(text, uv).r * line_number) / line_number;
+}
+
+void fragment() {
+    float gx = 0.0;
+    float gy = 0.0;
+
+    for (int x = 0; x < 3; x++) {
+        for (int y = 0; y < 3; y++) {
+            vec2 offset = vec2(float(x) - 1.0, float(y) - 1.0) * line_thickness;
+            float s = sample_quantized(TEXTURE, UV + offset);
+            gx += s * sobel_x[x][y];
+            gy += s * sobel_y[x][y];
+        }
+    }
+
+    float edge = length(vec2(gx, gy));
+    float line = step(0.0001, edge);
+
+    COLOR = vec4(line_color.rgb, line * line_color.a * COLOR.r);
+}

common/vfx/materials/shaders/topology_map.gdshader.uid

@@ -0,0 +1 @@
+uid://bklafn6ulmkij