Dev Demo 2

* Ajout des achievement Steam * Ajout d'une annonce à la récupération d'un artefact et ajout de textes axplicatifs sur les annonces d'artefacts et de mutation * Fix du léger glitch des tooltips * Ajout de clarté sur la machine de respawn dans le vaisseau
2026-05-28 15:40:09 +02:00
parent 7b09f2ba7c
commit 1d6ff78535
30 changed files with 417 additions and 264 deletions
--- a/stages/3d_scenes/astra_base/scripts/astra_base.gd
+++ b/stages/3d_scenes/astra_base/scripts/astra_base.gd
@@ -15,14 +15,14 @@ const LIFT_TIME := 2
 var chosen_incubator_id := -1

 # Cheat Code
-func _input(_e):
-    if (
-        Input.is_action_pressed("drop")
-        and Input.is_action_pressed("move_right")
-        and Input.is_action_pressed("move_left")
-        and Input.is_action_just_pressed("action")
-    ):
-        finish_scene()
+# func _input(_e):
+#     if (
+#         Input.is_action_pressed("drop")
+#         and Input.is_action_pressed("move_right")
+#         and Input.is_action_pressed("move_left")
+#         and Input.is_action_just_pressed("action")
+#     ):
+#         finish_scene()

 # Called when the node enters the scene tree for the first time.
 func _ready():
--- a/stages/3d_scenes/borea_base/scripts/borea_base.gd
+++ b/stages/3d_scenes/borea_base/scripts/borea_base.gd
@@ -9,6 +9,5 @@ func _ready():
 func _on_ai_receptacle_clicked():
    %Player3D.controlling_player = false
    Input.mouse_mode = Input.MOUSE_MODE_VISIBLE
-    %Credits.appear()
-
-
+    SteamConnection.unlock_achievement(SteamConnection.ACH_MEET_DEMETER)
+    %Credits.appear()
--- a/stages/3d_scenes/cockpit_scene/cockpit.tscn
+++ b/stages/3d_scenes/cockpit_scene/cockpit.tscn
@@ -15,7 +15,7 @@
 [ext_resource type="PackedScene" uid="uid://ci4x1q326lvyy" path="res://stages/3d_scenes/cockpit_scene/cockpit_elements/mutation_discovered_screen/mutation_discovery_screen.tscn" id="15_q4ojn"]
 [ext_resource type="PackedScene" uid="uid://cn2hob1i72a25" path="res://stages/3d_scenes/cockpit_scene/fail_tutorial.tscn" id="15_wrlf0"]
 [ext_resource type="PackedScene" uid="uid://u3o5g8lmck74" path="res://entities/interactable_3d/orchid_saver/orchid_saver.tscn" id="16_nfjul"]
-[ext_resource type="Texture2D" uid="uid://d3k7rl7nbp7yx" path="res://common/icons/device-floppy.svg" id="17_ggekp"]
+[ext_resource type="Texture2D" uid="uid://dwq22io1cc27y" path="res://common/icons/restore.svg" id="17_ggekp"]
 [ext_resource type="PackedScene" uid="uid://blvetnnib2ks0" path="res://stages/3d_scenes/cockpit_scene/assets/3d/cockpit2.blend" id="17_omtjc"]

 [sub_resource type="Animation" id="Animation_pxmsf"]
@@ -230,7 +230,7 @@ autoplay = &"trailer"
 unique_name_in_owner = true
 transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 0.024999544, -1.3700237, -3.9526832)
 screen_icon = ExtResource("17_ggekp")
-screen_text = "SAVE_ORCHID_MEMORY_AND_RESPAWN"
+screen_text = "RESPAWN_TO_LAST_BASE"

 [connection signal="clicked" from="Phone" to="." method="_on_phone_clicked"]
 [connection signal="clicked" from="OrchidSaver" to="." method="_on_orchid_saver_clicked"]
--- a/stages/3d_scenes/ship_garage/scripts/ship_garage.gd
+++ b/stages/3d_scenes/ship_garage/scripts/ship_garage.gd
@@ -5,15 +5,15 @@ const DIALOG_PATH = "res://dialogs/timelines/1_waking_up/3_demeter_ship_presenta
 var jingle_played := false

 # Cheat Code
-func _input(_e):
-    if (
-        Input.is_action_pressed("drop")
-        and Input.is_action_pressed("move_right")
-        and Input.is_action_pressed("move_left")
-        and Input.is_action_just_pressed("action")
-    ):
-        GameInfo.game_data.dialogs_done.append(DIALOG_PATH)
-        finish_scene()
+# func _input(_e):
+#     if (
+#         Input.is_action_pressed("drop")
+#         and Input.is_action_pressed("move_right")
+#         and Input.is_action_pressed("move_left")
+#         and Input.is_action_just_pressed("action")
+#     ):
+#         GameInfo.game_data.dialogs_done.append(DIALOG_PATH)
+#         finish_scene()

 # Called when the node enters the scene tree for the first time.
 func _ready():
--- a/stages/3d_scenes/vending_machine_room/scripts/vending_machine_3d.gd
+++ b/stages/3d_scenes/vending_machine_room/scripts/vending_machine_3d.gd
@@ -204,6 +204,10 @@ func _on_fetch_interactable_clicked():

    used.emit()

+    get_tree().create_timer(1.).timeout.connect(
+        func (): %ArtefactAnnounce.announce_artefact = get_choosen_artefact()
+    );
+
    get_tree().create_timer(3.).timeout.connect(
        func ():
            state = State.OFF
--- a/stages/3d_scenes/vending_machine_room/vending_machine_3d.tscn
+++ b/stages/3d_scenes/vending_machine_room/vending_machine_3d.tscn
@@ -12,6 +12,7 @@
 [ext_resource type="Texture2D" uid="uid://dcgnamu7sb3ov" path="res://common/icons/bolt.svg" id="9_p1py0"]
 [ext_resource type="Script" uid="uid://cpdtt25r2ne23" path="res://stages/3d_scenes/vending_machine_room/scripts/vending_machine_select_interactable.gd" id="10_js246"]
 [ext_resource type="AudioStream" uid="uid://bynxc84w03so4" path="res://stages/3d_scenes/vending_machine_room/assets/sounds/alex_jauk-vending-machines-ambient-noise-236027.mp3" id="12_js246"]
+[ext_resource type="PackedScene" uid="uid://bhbc1monbgumh" path="res://entities/interactable_3d/cristal/artefact_announce.tscn" id="13_tvcj6"]

 [sub_resource type="Resource" id="Resource_vrdoi"]
 script = ExtResource("4_tvcj6")
@@ -325,6 +326,11 @@ volume_db = -25.143
 autoplay = true
 bus = &"Sfx"

+[node name="ArtefactAnnounce" parent="." unique_id=1447182082 instance=ExtResource("13_tvcj6")]
+unique_name_in_owner = true
+visible = false
+announce_artefact = null
+
 [connection signal="clicked" from="Select1Interactable" to="." method="_on_select_1_interactable_clicked"]
 [connection signal="clicked" from="Select2Interactable" to="." method="_on_select_2_interactable_clicked"]
 [connection signal="clicked" from="PayInteractable" to="." method="_on_pay_interactable_clicked"]
--- a/stages/intro/scripts/intro.gd
+++ b/stages/intro/scripts/intro.gd
@@ -11,15 +11,15 @@ var pass_asked := false
 var tutorial_started := false

 # Cheat Code
-func _input(_e):
-    if (
-        Input.is_action_pressed("drop")
-        and Input.is_action_pressed("move_right")
-		and Input.is_action_pressed("move_left")
-        and Input.is_action_just_pressed("action")
-    ):
-        pass_intro()
-        %SparkParticles.emitting = false
+# func _input(_e):
+#     if (
+#         Input.is_action_pressed("drop")
+#         and Input.is_action_pressed("move_right")
+# 		and Input.is_action_pressed("move_left")
+#         and Input.is_action_just_pressed("action")
+#     ):
+#         pass_intro()
+#         %SparkParticles.emitting = false

 func _process(delta):
    %TopologyMap.texture.noise.offset += Vector3(delta * SPEED, delta * SPEED, 0.)
--- a/stages/terrain/region/scripts/region.gd
+++ b/stages/terrain/region/scripts/region.gd
@@ -46,25 +46,26 @@ var data_last_updated = 0.
@onready var camera : RegionCamera = %Camera

 # Cheat Code
-func _input(_e):
-    if (
-        Input.is_action_pressed("drop")
-        and Input.is_action_pressed("move_right")
-        and Input.is_action_pressed("move_left")
-        and Input.is_action_just_pressed("action")
-    ):
-        data.succeded.emit()
-        data.state = RegionData.State.SUCCEEDED
-        # data.update()
+# func _input(_e):
+#     if (
+#         Input.is_action_pressed("drop")
+#         and Input.is_action_pressed("move_right")
+#         and Input.is_action_pressed("move_left")
+#         and Input.is_action_just_pressed("action")
+#     ):
+#         if data.state != RegionData.State.SUCCEEDED:
+#             data.succeded.emit()
+#             data.state = RegionData.State.SUCCEEDED
+#             # data.update()
    
-    if (
-        Input.is_action_pressed("drop")
-        and Input.is_action_pressed("move_right")
-        and Input.is_action_pressed("move_left")
-        and Input.is_action_just_pressed("move_pointer")
-    ):
-        data.charges = 0
-        data.state = RegionData.State.FAILED
+#     if (
+#         Input.is_action_pressed("drop")
+#         and Input.is_action_pressed("move_right")
+#         and Input.is_action_pressed("move_left")
+#         and Input.is_action_just_pressed("move_pointer")
+#     ):
+#         data.charges = 0
+#         data.state = RegionData.State.FAILED

 func _init():
    data = GameInfo.game_data.current_region_data
--- a/stages/title_screen/scripts/title_screen.gd
+++ b/stages/title_screen/scripts/title_screen.gd
@@ -10,6 +10,8 @@ var rotating := false
 var prev_mouse_pos : Vector2
 var next_mouse_pos : Vector2

+var planet_spin_ach_sended = false
+
 func _ready():
    %Version.text = ProjectSettings.get_setting("application/config/version")
    %Start.text = tr("CONTINUE") if GameInfo.game_data else tr("START")
@@ -60,6 +62,10 @@ func _process(delta):
    %Planet3d.rotate(Vector3.UP, planet_rotation.x * delta)
    %Planet3d.rotate(Vector3.RIGHT, planet_rotation.y * delta)

+    if not planet_spin_ach_sended and planet_rotation.length() > 40:
+        planet_spin_ach_sended = true
+        SteamConnection.unlock_achievement(SteamConnection.ACH_SPIN_PLANET)
+

 func _on_restart_button_down():
    GameInfo.start_game_data()
--- a/stages/title_screen/title_screen.tscn
+++ b/stages/title_screen/title_screen.tscn
@@ -83,7 +83,7 @@ tracks/3/keys = {
 tracks/4/type = "value"
 tracks/4/imported = false
 tracks/4/enabled = true
-tracks/4/path = NodePath("%Restart:modulate:a")
+tracks/4/path = NodePath("../MarginContainer/GridContainer/VBoxContainer/VBoxContainer/Restart:modulate:a")
 tracks/4/interp = 1
 tracks/4/loop_wrap = true
 tracks/4/keys = {
@@ -182,11 +182,11 @@ tracks/3/keys = {
 tracks/4/type = "value"
 tracks/4/imported = false
 tracks/4/enabled = true
-tracks/4/path = NodePath("%Restart:modulate:a")
+tracks/4/path = NodePath("../MarginContainer/GridContainer/VBoxContainer/VBoxContainer/Restart:modulate:a")
 tracks/4/interp = 2
 tracks/4/loop_wrap = true
 tracks/4/keys = {
-"times": PackedFloat32Array(0.39999998, 0.6),
+"times": PackedFloat32Array(0.8, 1),
 "transitions": PackedFloat32Array(1, 1),
 "update": 0,
 "values": [0.0, 1.0]
@@ -198,7 +198,7 @@ tracks/5/path = NodePath("../MarginContainer/GridContainer/VBoxContainer/VBoxCon
 tracks/5/interp = 2
 tracks/5/loop_wrap = true
 tracks/5/keys = {
-"times": PackedFloat32Array(0.6, 0.8),
+"times": PackedFloat32Array(0.4, 0.6),
 "transitions": PackedFloat32Array(1, 1),
 "update": 0,
 "values": [0.0, 1.0]
@@ -210,7 +210,7 @@ tracks/6/path = NodePath("../MarginContainer/GridContainer/VBoxContainer/VBoxCon
 tracks/6/interp = 2
 tracks/6/loop_wrap = true
 tracks/6/keys = {
-"times": PackedFloat32Array(0.8, 1),
+"times": PackedFloat32Array(0.6, 0.79999995),
 "transitions": PackedFloat32Array(1, 1),
 "update": 0,
 "values": [0.0, 1.0]
@@ -299,17 +299,6 @@ theme_override_font_sizes/font_size = 33
 text = "START"
 icon = ExtResource("3_6yuhi")

-[node name="Restart" type="Button" parent="MarginContainer/GridContainer/VBoxContainer/VBoxContainer" unique_id=1324703681]
-unique_name_in_owner = true
-z_index = 1
-layout_mode = 2
-size_flags_horizontal = 4
-size_flags_vertical = 4
-theme = ExtResource("1_4ph5l")
-text = "RESTART"
-icon = ExtResource("5_6yuhi")
-flat = true
-
 [node name="Settings" type="Button" parent="MarginContainer/GridContainer/VBoxContainer/VBoxContainer" unique_id=381312431]
 layout_mode = 2
 size_flags_horizontal = 4
@@ -324,6 +313,17 @@ text = "CONTROLS"
 icon = ExtResource("7_igvpv")
 flat = true

+[node name="Restart" type="Button" parent="MarginContainer/GridContainer/VBoxContainer/VBoxContainer" unique_id=1324703681]
+unique_name_in_owner = true
+z_index = 1
+layout_mode = 2
+size_flags_horizontal = 4
+size_flags_vertical = 4
+theme = ExtResource("1_4ph5l")
+text = "RESTART_DEMO"
+icon = ExtResource("5_6yuhi")
+flat = true
+
 [node name="Quit" type="Button" parent="MarginContainer/GridContainer/VBoxContainer/VBoxContainer" unique_id=103430335]
 layout_mode = 2
 size_flags_horizontal = 4
@@ -444,9 +444,9 @@ z_index = 100
 mouse_filter = 2

 [connection signal="pressed" from="MarginContainer/GridContainer/VBoxContainer/VBoxContainer/Start" to="." method="_on_start_pressed"]
-[connection signal="button_down" from="MarginContainer/GridContainer/VBoxContainer/VBoxContainer/Restart" to="." method="_on_restart_button_down"]
 [connection signal="button_down" from="MarginContainer/GridContainer/VBoxContainer/VBoxContainer/Settings" to="." method="_on_settings_button_down"]
 [connection signal="button_down" from="MarginContainer/GridContainer/VBoxContainer/VBoxContainer/Controls" to="." method="_on_controls_button_down"]
+[connection signal="button_down" from="MarginContainer/GridContainer/VBoxContainer/VBoxContainer/Restart" to="." method="_on_restart_button_down"]
 [connection signal="button_down" from="MarginContainer/GridContainer/VBoxContainer/VBoxContainer/Quit" to="." method="_on_quit_button_down"]
 [connection signal="button_down" from="ModeChoose/VBoxContainer/StoryModeStart" to="." method="_on_story_mode_start_button_down"]
 [connection signal="button_down" from="ModeChoose/VBoxContainer/InfiniteModeStart" to="." method="_on_infinite_mode_start_button_down"]