Encore du dev pour la béta 1

* Suppression de la mutation éphémère
* Ajout des modificateur de régions normaux Sableux et Toxique
* Ajout de modificateurs challenge (Rocheux, Radioactif et Contaminé)
* Ajout du modificateur de région bénéfique Résonnance
* Ajout d'un distributeur toutes les 3 régions
* Ajout des régions challenge
* Bouclage sur les couleurs des mutations après le niveau 4
* Ajout de deux nouveaux panneaux de tutoriel, un sur les informations de plantes et l'autre sur le vaisseau

common/game_data/scripts/game_data.gd

@@ -25,6 +25,7 @@ signal current_region_data_updated(p : RegionData)
 @export var ship_in_space = false
 
 @export var tutorial_done = false
+@export var ship_tutorial_done = false
 
 @export var incubator_used = []
 
@@ -34,11 +35,8 @@ signal current_region_data_updated(p : RegionData)
 
 func start_run() -> RunData:
     player_data.clear_inventory()
+    player_data.update_with_artefacts([])
     current_run = RunData.new()
-    current_run.artefacts_changed.connect(
-        func(artefacts : Array[Artefact]):
-            player_data._on_artefacts_updated(artefacts)
-    )
     current_run.current_run_point_changed.connect(
         func(rp : RunPoint):
             start_region(rp.region_parameter)

common/game_data/scripts/progression_data.gd

@@ -3,7 +3,6 @@ class_name ProgressionData
 
 @export var available_mutations: Array[PlantMutation] = [
     AncientMutation.new(),
-    EphemeralMutation.new(),
     FertileMutation.new(),
     GenerousMutation.new(),
     HurriedMutation.new(),

common/game_data/scripts/run/run_data.gd

@@ -5,6 +5,8 @@ enum State {STARTED, IN_PROGRESS, FINISHED}
 
 const RUN_POINTS_NEXT_NUMBER : int = 2
 const RUN_POINT_MAX_LEVEL = 5 # TODO
+const VENDING_MACHINE_OCCURENCE = 3
+const CHALLENGE_CHANCE = 0.25
 
 signal current_run_point_changed(rp : RunPoint)
 signal artefacts_changed(artefact : Array[Artefact])
@@ -51,10 +53,23 @@ func generate_next_run_points(level = 0) -> Array[RunPoint]:
 
 func generate_next_run_point(level = 0) -> RunPoint:
     var region_parameter = RegionParameter.new()
+    
+    var is_challenge = randf() < CHALLENGE_CHANCE
+    if is_challenge:
+        region_parameter.modifiers = [
+            generate_challenge_modifiers().pick_random(),
+            generate_benefic_modifiers().pick_random()
+        ] as Array[RegionModifier]
+    else:
+        region_parameter.modifiers = [
+            generate_normal_modifiers().pick_random()
+        ] as Array[RegionModifier]
+    
+    if level%VENDING_MACHINE_OCCURENCE == 0:
+        region_parameter.modifiers.append(VendingMachineModifier.new())
+    
     region_parameter.level = level
-    region_parameter.modifiers = get_bad_region_modifiers()
-    region_parameter.modifiers.append_array(get_good_region_modifiers())
-
+    
     return RunPoint.new(
         level,
         region_parameter
@@ -85,26 +100,34 @@ func choose_next_run_point(run_point : RunPoint) -> RunPoint:
         last_used_modifier_name = current_run_point.region_parameter.modifiers[0].get_modifier_name()
     return current_run_point
 
-func get_good_region_modifiers() -> Array[RegionModifier]:
-    return [VendingMachineModifier.new(),VendingMachineModifier.new()]
+#endregion
 
-func get_bad_region_modifiers() -> Array[RegionModifier]:
-    var possible_modifiers : Array[RegionModifier] = [
+#region ------------------ Modifiers ------------------
+
+func generate_normal_modifiers() -> Array[RegionModifier]:
+    return [
         AridModifier.new(),
         HumidModifier.new(),
         PoorModifier.new(),
-        HarshModifier.new()
+        HarshModifier.new(),
+        ToxicModifier.new(),
+        SandyModifier.new(),
+
     ]
 
-    possible_modifiers = possible_modifiers.filter(
-        func (m): return m.get_modifier_name() != last_used_modifier_name
-    )
+func generate_benefic_modifiers() -> Array[RegionModifier]:
+    return [
+        VendingMachineModifier.new(),
+        ResonnanceModifier.new()
+    ]
 
-    var choosen_modifier : RegionModifier = possible_modifiers.pick_random()
 
-    last_used_modifier_name = choosen_modifier.get_modifier_name()
-
-    return [choosen_modifier]
+func generate_challenge_modifiers() -> Array[RegionModifier]:
+    return [
+        RockyModifier.new(),
+        RadioactiveModifier.new(),
+        ContaminatedModifier.new(),
+    ]
 
 #endregion
 
@@ -112,6 +135,6 @@ func get_bad_region_modifiers() -> Array[RegionModifier]:
 
 func add_artefacts(a: Artefact):
     artefacts.append(a)
-    artefacts_changed.emit(artefacts)
+    GameInfo.game_data.player_data.update_with_artefacts(artefacts)
 
 #endregion

common/game_data/scripts/run/run_data_plant_info.gd

@@ -3,13 +3,12 @@ class_name RunDataPlantInfo
 
 signal updated
 
-const DEFAULT_PLANT_AREA_RADIUS = 20
-const DEFAULT_PLANT_INFLUENCE_RADIUS = 100
 const DEFAULT_GROWING_TIME = 2
 const DEFAULT_LIFETIME = 6
 const DEFAULT_BASE_SCORE = 1
 const DEFAULT_SEED_NUMBER = 2
 const DEFAULT_SEED_RANDOM_LOOSE = 1
+const DEFAULT_PLANT_INFLUENCE_RADIUS = 100
 
 var run_data : RunData
 
@@ -19,25 +18,57 @@ func _init(
     run_data = _run_data
 
 var region_modifiers : Array[RegionModifier]
-var artefacts : Array[Artefact] = []
-
-func get_plant_area_radius() -> int:
-    return DEFAULT_PLANT_AREA_RADIUS
-
-func get_plant_influence_radius() -> int:
-    return DEFAULT_PLANT_INFLUENCE_RADIUS
 
 func get_growing_time() -> int:
-    return DEFAULT_GROWING_TIME
+    var growing_time = DEFAULT_GROWING_TIME
+
+    for rm in get_region_modifiers():
+        growing_time = rm.modify_plant_growing_time(growing_time)
+
+    return max(0, growing_time)
 
 func get_lifetime() -> int:
-    return DEFAULT_LIFETIME
+    var lifetime = DEFAULT_LIFETIME
+
+    for rm in get_region_modifiers():
+        lifetime = rm.modify_plant_lifetime(lifetime)
+
+    return max(0, lifetime)
 
 func get_base_score() -> int:
-    return DEFAULT_BASE_SCORE
+    var base_score = DEFAULT_BASE_SCORE
+
+    for rm in get_region_modifiers():
+        base_score = rm.modify_plant_base_score(base_score)
+
+    return max(0, base_score)
 
 func get_seed_number() -> int:
-    return DEFAULT_SEED_NUMBER
+    var seed_number = DEFAULT_SEED_NUMBER
+
+    for rm in get_region_modifiers():
+        seed_number = rm.modify_plant_seed_number(seed_number)
+
+    return max(0, seed_number)
 
 func get_seed_random_loose() -> int:
-    return DEFAULT_SEED_RANDOM_LOOSE
+    var seed_random_loose = DEFAULT_SEED_RANDOM_LOOSE
+
+    for rm in get_region_modifiers():
+        seed_random_loose = rm.modify_plant_seed_random_loose(seed_random_loose)
+
+    return min(max(0, seed_random_loose),get_seed_number())
+
+func get_influence_radius() -> int:
+    var influence_radius = DEFAULT_PLANT_INFLUENCE_RADIUS
+
+    for rm in get_region_modifiers():
+        influence_radius = rm.modify_plant_influence_radius(influence_radius)
+
+    return max(0, influence_radius)
+
+
+func get_region_modifiers() -> Array[RegionModifier]:
+    if run_data.current_run_point and run_data.current_run_point.region_parameter:
+        return run_data.current_run_point.region_parameter.modifiers
+    return []