Amélioration QOL et fix divers pour l'alpha-1.1

* Ajout des icônes dans les descriptions des mutations * QOL sur la fonctionnalité de drop d'item * Ajout des contrôles dans le tutoriel * Réécriture des dialogues d'intro et d'échec * Changements mineurs sur des dialogues et traduction * Les graines apparaissent avec déjà une mutation * Limitation du Talion autour de la station de recharge * Fix de l'ascenseur dans la base Astra * Ajout d'un effet visuel quand il n'y a plus d'énergie * Le nombre de graine apparrait désormais dans l'inspécteur de plantes * Ajout d'un petit icône de progrès de durée de vie de la plante au survol * Ajout d'une description de la signification des icônes dans le menu pause * La mutation éphémère réduit désormais la durée de vie de 1
2026-03-13 11:40:31 +01:00
parent 2cd16acd6a
commit 76707171fa
45 changed files with 430 additions and 177 deletions
--- a/gui/game/game_gui.tscn
+++ b/gui/game/game_gui.tscn
@@ -12,6 +12,16 @@
 [ext_resource type="Texture2D" uid="uid://b43thuq8piv18" path="res://common/icons/skull.svg" id="7_dr1y2"]
 [ext_resource type="PackedScene" uid="uid://clicjf8ts51h8" path="res://gui/game/inventory_gui/inventory_gui.tscn" id="9_id0t5"]

+[sub_resource type="Gradient" id="Gradient_ykapk"]
+offsets = PackedFloat32Array(0.47639486, 1)
+colors = PackedColorArray(1, 1, 1, 0, 1, 1, 1, 1)
+
+[sub_resource type="GradientTexture2D" id="GradientTexture2D_p6blc"]
+gradient = SubResource("Gradient_ykapk")
+fill = 1
+fill_from = Vector2(0.5, 0.5)
+fill_to = Vector2(1.5, 0.5)
+
 [sub_resource type="LabelSettings" id="LabelSettings_id0t5"]
 font = ExtResource("6_2wykm")
 font_size = 40
@@ -19,6 +29,17 @@ font_size = 40
 [node name="GameGui" type="CanvasLayer" unique_id=274698556]
 script = ExtResource("1_udau0")

+[node name="NoEnergyVignette" type="TextureRect" parent="." unique_id=1917087264]
+unique_name_in_owner = true
+self_modulate = Color(1, 0, 0.43137255, 1)
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+mouse_filter = 2
+texture = SubResource("GradientTexture2D_p6blc")
+
 [node name="Alert" parent="." unique_id=496897031 instance=ExtResource("2_ykapk")]
 unique_name_in_owner = true
 modulate = Color(1, 0, 0.43137252, 1)
--- a/gui/game/inventory_gui/inventory_item/scripts/inventory_item_3d.gd
+++ b/gui/game/inventory_gui/inventory_item/scripts/inventory_item_3d.gd
@@ -30,7 +30,6 @@ func set_item(i : Item = item):
            %ItemIconSprite.pixel_size = SPRITE_SIZE / i.icon.get_width()

            for j in range(len(i.get_particles())):
-                print(i.get_particles()[j])
                if j == 0:
                    %ParticleSprite1.visible = true
                    %ParticleSprite1.texture = i.get_particles()[j].texture
--- a/gui/game/scripts/game_gui.gd
+++ b/gui/game/scripts/game_gui.gd
@@ -38,6 +38,17 @@ func player_update(player_data : PlayerData, with_animation = true):
        player_data.max_energy,
        with_animation
    )
+    if with_animation:
+        get_tree().create_tween().tween_property(
+            %NoEnergyVignette,
+            "modulate:a",
+            1. if player_data.energy == 0 else 0.,
+            0.3
+        )
+    else:
+       %NoEnergyVignette.modulate.a = 1. if player_data.energy == 0 else 0.
+
+

 func _on_region_updated(region_data : RegionData):
    await get_tree().create_timer(0.1).timeout
--- a/gui/game/tutorial/scripts/tutorial.gd
+++ b/gui/game/tutorial/scripts/tutorial.gd
@@ -10,6 +10,21 @@ var indicators : Array[InGameIndicator]
@export var region : Region

@onready var steps : Array[Step] = [
+    Step.new(
+        "MOVE_WITH_RIGHT_CLICK_OR_WASD",
+        (func ():
+            return player.global_position.distance_to(region.data.player_spawn) > 30)
+    ),
+    Step.new(
+        "SELECT_ITEM_WITH_SCROLL_CLICK_OR_NUMBER",
+        (func ():
+            return player.data.inventory.current_item_ind != player.data.inventory.n_tools)
+    ),
+    Step.new(
+        "LEFT_CLICK_TO_USE_ITEMS",
+        (func ():
+            return player.data.inventory.get_item() and Input.is_action_just_pressed("action"))
+    ),
    Step.new(
        "USE_YOUR_DETECTOR_TO_FIND_THE_BATTERY",
        (func ():
@@ -24,12 +39,19 @@ var indicators : Array[InGameIndicator]
            return false)
    ),
    Step.new(
-        "TAKE_A_SEED",
+        "TAKE_A_SEED_BY_CLICKING_ON_IT",
        (func ():
            return player.data.inventory.items.find_custom(
                func(i:Item): return i is Seed
            ) != -1)
    ),
+    Step.new(
+        "DROP_SEED_WITH_KEY",
+        (func ():
+            return (
+                Input.is_action_pressed("drop"))
+            )
+    ),
    Step.new(
        "PLANT_SEED_IN_FERTILE_ZONE",
        (func ():
@@ -49,26 +71,10 @@ var indicators : Array[InGameIndicator]
            return region.data.get_score() != 0)
    ),
    Step.new(
-        "DISCOVER_A_SEED_WITH_A_MUTATION",
+        "HARVEST_A_MATURE_PLANT",
        (func ():
            for e in region.entity_container.get_children():
-                if e is ItemObject and e.item is Seed and len(e.item.plant_mutations):
-                    return true
-            return false)
-    ),
-    Step.new(
-        "PLANT_A_SEED_WITH_A_MUTATION",
-        (func ():
-            for e in region.entity_container.get_children():
-                if e is Plant and len(e.data.mutations):
-                    return true
-            return false)
-    ),
-    Step.new(
-        "HARVEST_A_MATURE_PLANT_WITH_A_MUTATION",
-        (func ():
-            for e in region.entity_container.get_children():
-                if e is Plant and e.harvested and len(e.data.mutations):
+                if e is Plant and e.harvested:
                    return true
            return false)
    ),
@@ -98,10 +104,15 @@ func _process(_d):
        for i in len(steps):
            var step := steps[i]
            var step_gui := %Steps.get_children()[i] as TutorialStepGui
-            step.update_succeeded()
-            step_gui.suceeded = step.succeeded
-            if not step.succeeded:
-                success = false
+            step_gui.visible = i == 0 or steps[i-1].succeeded
+            if step_gui.visible:
+                var old_succeeded = step.succeeded
+                step.update_succeeded()
+                if old_succeeded != step.succeeded: # Put a delay so two state don't collide
+                    return
+                step_gui.suceeded = step.succeeded
+                if not step.succeeded:
+                    success = false
        if success:
            finish_tutorial()

--- a/gui/game/tutorial/tutorial.tscn
+++ b/gui/game/tutorial/tutorial.tscn
@@ -37,34 +37,34 @@ grow_vertical = 2
 mouse_filter = 2
 theme = ExtResource("2_1wikm")

-[node name="PanelContainer" type="PanelContainer" parent="MarginContainer" unique_id=913156548]
+[node name="TutorialStepsPanelContainer" type="PanelContainer" parent="MarginContainer" unique_id=913156548]
 layout_mode = 2
 size_flags_horizontal = 0
 size_flags_vertical = 8
 mouse_filter = 2
 theme_override_styles/panel = SubResource("StyleBoxFlat_x7cwm")

-[node name="MarginContainer" type="MarginContainer" parent="MarginContainer/PanelContainer" unique_id=332993244]
+[node name="MarginContainer" type="MarginContainer" parent="MarginContainer/TutorialStepsPanelContainer" unique_id=332993244]
 layout_mode = 2
 mouse_filter = 2

-[node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer/PanelContainer/MarginContainer" unique_id=1196958295]
+[node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer/TutorialStepsPanelContainer/MarginContainer" unique_id=1196958295]
 layout_mode = 2
 mouse_filter = 2

-[node name="HBoxContainer" type="HBoxContainer" parent="MarginContainer/PanelContainer/MarginContainer/VBoxContainer" unique_id=1140176018]
+[node name="HBoxContainer" type="HBoxContainer" parent="MarginContainer/TutorialStepsPanelContainer/MarginContainer/VBoxContainer" unique_id=1140176018]
 layout_mode = 2
 mouse_filter = 2

-[node name="TextureRect" type="TextureRect" parent="MarginContainer/PanelContainer/MarginContainer/VBoxContainer/HBoxContainer" unique_id=527978183]
+[node name="TextureRect" type="TextureRect" parent="MarginContainer/TutorialStepsPanelContainer/MarginContainer/VBoxContainer/HBoxContainer" unique_id=527978183]
 layout_mode = 2
 texture = ExtResource("3_8kuag")

-[node name="Label" type="Label" parent="MarginContainer/PanelContainer/MarginContainer/VBoxContainer/HBoxContainer" unique_id=592987672]
+[node name="Label" type="Label" parent="MarginContainer/TutorialStepsPanelContainer/MarginContainer/VBoxContainer/HBoxContainer" unique_id=592987672]
 layout_mode = 2
 text = "TUTORIAL"
 label_settings = SubResource("LabelSettings_8kuag")

-[node name="Steps" type="VBoxContainer" parent="MarginContainer/PanelContainer/MarginContainer/VBoxContainer" unique_id=125170550]
+[node name="Steps" type="VBoxContainer" parent="MarginContainer/TutorialStepsPanelContainer/MarginContainer/VBoxContainer" unique_id=125170550]
 unique_name_in_owner = true
 layout_mode = 2
--- a/gui/pause/assets/textures/card_tutorial_image.png
+++ b/gui/pause/assets/textures/card_tutorial_image.png
--- a/gui/pause/assets/textures/card_tutorial_image.png.import
+++ b/gui/pause/assets/textures/card_tutorial_image.png.import
@@ -1,40 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://bku47nx7clom4"
-path="res://.godot/imported/card_tutorial_image.png-a8f51388f4585abed9acb5f7a239ec3a.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://gui/pause/assets/textures/card_tutorial_image.png"
-dest_files=["res://.godot/imported/card_tutorial_image.png-a8f51388f4585abed9acb5f7a239ec3a.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
--- a/gui/pause/pause.tscn
+++ b/gui/pause/pause.tscn
@@ -11,15 +11,18 @@
 [ext_resource type="Texture2D" uid="uid://dex283rx00fjb" path="res://common/icons/logout.svg" id="7_yj6f1"]
 [ext_resource type="Texture2D" uid="uid://b43thuq8piv18" path="res://common/icons/skull.svg" id="8_mnkqy"]
 [ext_resource type="Theme" uid="uid://5au2k3vf2po3" path="res://gui/ressources/menu.tres" id="9_7c7ks"]
-[ext_resource type="Texture2D" uid="uid://bku47nx7clom4" path="res://gui/pause/assets/textures/card_tutorial_image.png" id="9_sepn1"]
+[ext_resource type="Texture2D" uid="uid://bt3g5bmar0icf" path="res://common/icons/growth.svg" id="10_q8jjs"]
 [ext_resource type="Texture2D" uid="uid://bgcymkgxk7mpp" path="res://gui/pause/assets/textures/moss_tutorial_image.png" id="11_mnkqy"]
 [ext_resource type="PackedScene" uid="uid://b4qe1dwwsk87t" path="res://gui/menu/controls/controls.tscn" id="11_urlqn"]
 [ext_resource type="Texture2D" uid="uid://bhogi5kkltx51" path="res://gui/pause/assets/textures/rock_tutorial_image.png" id="12_mvn7k"]
+[ext_resource type="Texture2D" uid="uid://d3ksdxepcjoot" path="res://common/icons/calendar-week.svg" id="12_s2e8t"]
 [ext_resource type="Texture2D" uid="uid://3fwhxkd0ycga" path="res://gui/pause/assets/textures/talion_tutorial_image.png" id="13_4n2vt"]
+[ext_resource type="Texture2D" uid="uid://cgmxjom200bej" path="res://common/icons/chevrons-up.svg" id="13_4r74r"]
+[ext_resource type="Texture2D" uid="uid://el06htgr2pda" path="res://common/icons/droplets.svg" id="14_osk7v"]

 [sub_resource type="ShaderMaterial" id="ShaderMaterial_58dya"]
 shader = ExtResource("2_apjlw")
-shader_parameter/strength = 3.3
+shader_parameter/strength = 5.00000023424012
 shader_parameter/mix_percentage = 0.3

 [sub_resource type="LabelSettings" id="LabelSettings_apjlw"]
@@ -177,33 +180,106 @@ layout_mode = 2
 size_flags_horizontal = 3
 alignment = 1

-[node name="TutorialPlants" type="Label" parent="Container/MarginContainer/GridContainer/Tutorial" unique_id=54599107]
+[node name="TutorialIcons" type="Label" parent="Container/MarginContainer/GridContainer/Tutorial" unique_id=54599107]
 layout_mode = 2
-text = "PLANT_INFO"
+text = "ICONS_MEANINGS"
 label_settings = SubResource("LabelSettings_apjlw")
 horizontal_alignment = 1

-[node name="Plants" type="HBoxContainer" parent="Container/MarginContainer/GridContainer/Tutorial" unique_id=1658568175]
+[node name="IconsGrid" type="HFlowContainer" parent="Container/MarginContainer/GridContainer/Tutorial" unique_id=827470743]
 layout_mode = 2
+theme_override_constants/h_separation = 8
+theme_override_constants/v_separation = 8
 alignment = 1

-[node name="TextureRect" type="TextureRect" parent="Container/MarginContainer/GridContainer/Tutorial/Plants" unique_id=1418592623]
+[node name="HBoxContainer" type="HBoxContainer" parent="Container/MarginContainer/GridContainer/Tutorial/IconsGrid" unique_id=1836711773]
 layout_mode = 2
-texture = ExtResource("9_sepn1")
-expand_mode = 3
+theme_override_constants/separation = 4
+
+[node name="TextureRect" type="TextureRect" parent="Container/MarginContainer/GridContainer/Tutorial/IconsGrid/HBoxContainer" unique_id=1287619966]
+custom_minimum_size = Vector2(40, 40)
+layout_mode = 2
+size_flags_horizontal = 4
+texture = ExtResource("10_q8jjs")
+expand_mode = 1
 stretch_mode = 5

-[node name="RichText" type="RichTextLabel" parent="Container/MarginContainer/GridContainer/Tutorial/Plants" unique_id=1176432130]
+[node name="RichTextLabel" type="Label" parent="Container/MarginContainer/GridContainer/Tutorial/IconsGrid/HBoxContainer" unique_id=1321907717]
 layout_mode = 2
-size_flags_horizontal = 3
 theme = ExtResource("9_7c7ks")
-theme_override_fonts/bold_font = ExtResource("4_apjlw")
-theme_override_font_sizes/normal_font_size = 15
-theme_override_font_sizes/bold_font_size = 18
-bbcode_enabled = true
-text = "PLANT_INFO_TEXT"
-fit_content = true
-autowrap_mode = 0
+text = "PLANT_POINTS"
+vertical_alignment = 1
+
+[node name="HBoxContainer2" type="HBoxContainer" parent="Container/MarginContainer/GridContainer/Tutorial/IconsGrid" unique_id=1972132878]
+layout_mode = 2
+theme_override_constants/separation = 4
+
+[node name="TextureRect" type="TextureRect" parent="Container/MarginContainer/GridContainer/Tutorial/IconsGrid/HBoxContainer2" unique_id=1672315867]
+custom_minimum_size = Vector2(40, 40)
+layout_mode = 2
+size_flags_horizontal = 4
+texture = ExtResource("12_s2e8t")
+expand_mode = 1
+stretch_mode = 5
+
+[node name="RichTextLabel" type="Label" parent="Container/MarginContainer/GridContainer/Tutorial/IconsGrid/HBoxContainer2" unique_id=680718204]
+layout_mode = 2
+theme = ExtResource("9_7c7ks")
+text = "DAYS"
+vertical_alignment = 1
+
+[node name="HBoxContainer3" type="HBoxContainer" parent="Container/MarginContainer/GridContainer/Tutorial/IconsGrid" unique_id=914958898]
+layout_mode = 2
+theme_override_constants/separation = 4
+
+[node name="TextureRect" type="TextureRect" parent="Container/MarginContainer/GridContainer/Tutorial/IconsGrid/HBoxContainer3" unique_id=2070296941]
+custom_minimum_size = Vector2(40, 40)
+layout_mode = 2
+size_flags_horizontal = 4
+texture = ExtResource("13_4r74r")
+expand_mode = 1
+stretch_mode = 5
+
+[node name="RichTextLabel" type="Label" parent="Container/MarginContainer/GridContainer/Tutorial/IconsGrid/HBoxContainer3" unique_id=1440353539]
+layout_mode = 2
+theme = ExtResource("9_7c7ks")
+text = "GROWING_TIME"
+vertical_alignment = 1
+
+[node name="HBoxContainer4" type="HBoxContainer" parent="Container/MarginContainer/GridContainer/Tutorial/IconsGrid" unique_id=28308100]
+layout_mode = 2
+theme_override_constants/separation = 4
+
+[node name="TextureRect" type="TextureRect" parent="Container/MarginContainer/GridContainer/Tutorial/IconsGrid/HBoxContainer4" unique_id=1894190539]
+custom_minimum_size = Vector2(40, 40)
+layout_mode = 2
+size_flags_horizontal = 4
+texture = ExtResource("8_mnkqy")
+expand_mode = 1
+stretch_mode = 5
+
+[node name="RichTextLabel" type="Label" parent="Container/MarginContainer/GridContainer/Tutorial/IconsGrid/HBoxContainer4" unique_id=1869234810]
+layout_mode = 2
+theme = ExtResource("9_7c7ks")
+text = "LIFETIME"
+vertical_alignment = 1
+
+[node name="HBoxContainer5" type="HBoxContainer" parent="Container/MarginContainer/GridContainer/Tutorial/IconsGrid" unique_id=960270231]
+layout_mode = 2
+theme_override_constants/separation = 4
+
+[node name="TextureRect" type="TextureRect" parent="Container/MarginContainer/GridContainer/Tutorial/IconsGrid/HBoxContainer5" unique_id=1275499455]
+custom_minimum_size = Vector2(40, 40)
+layout_mode = 2
+size_flags_horizontal = 4
+texture = ExtResource("14_osk7v")
+expand_mode = 1
+stretch_mode = 5
+
+[node name="RichTextLabel" type="Label" parent="Container/MarginContainer/GridContainer/Tutorial/IconsGrid/HBoxContainer5" unique_id=1267318669]
+layout_mode = 2
+theme = ExtResource("9_7c7ks")
+text = "SEEDS"
 vertical_alignment = 1

 [node name="TutorialTerrain" type="Label" parent="Container/MarginContainer/GridContainer/Tutorial" unique_id=749651974]
@@ -293,10 +369,12 @@ 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]