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

2026-07-31 10:46:59 +02:00
parent b8420db4c7 3eb3b6629f
commit 67d544a323
6 changed files with 17 additions and 8 deletions
@@ -20,7 +20,7 @@ func get_logs() -> Array[Log]:
    ]

 func get_destination_text() -> String:
-    return tr("ESTIA_BASE")
+    return tr("ASTRA_BASE")

 func get_region_sequence_length(_difficulty_setting : int) -> int:
    return 10
@@ -24,8 +24,7 @@ func set_pause(p):
        Input.mouse_mode = mouse_mode_before_pause
    
    if p:
-        %GiveUp.visible = (GameInfo.game_data and GameInfo.game_data.current_region_data and
-        SceneManager.actual_scene and SceneManager.actual_scene.can_abandon())
+        %GiveUp.visible = SceneManager.actual_scene and SceneManager.actual_scene.can_abandon()

    %TitleScreen.visible = not (SceneManager.actual_scene and SceneManager.actual_scene.get_scene_id() == "TITLE")

@@ -196,6 +196,7 @@ texture = ExtResource("5_tbsgm")

 [node name="Wall1" type="Sprite3D" parent="Writings" unique_id=721718473]
 transform = Transform3D(0.99170494, -0.12726313, -0.018050455, 0.07970211, 0.4986614, 0.86312467, -0.10084282, -0.8574034, 0.50466794, -29.599998, -17.031189, -6.9000006)
+cast_shadow = 0
 pixel_size = 0.005
 shaded = true
 alpha_cut = 1
@@ -203,6 +204,7 @@ texture = ExtResource("6_on72i")

 [node name="Wall2" type="Sprite3D" parent="Writings" unique_id=759085966]
 transform = Transform3D(0.9424416, -0.22922032, 0.24343787, 0.06502391, 0.8397868, 0.53900826, -0.32798755, -0.49215457, 0.8063549, -27.599998, -11.299988, -15)
+cast_shadow = 0
 pixel_size = 0.005
 shaded = true
 alpha_cut = 1
@@ -210,6 +212,7 @@ texture = ExtResource("7_kd1mw")

 [node name="Wall3" type="Sprite3D" parent="Writings" unique_id=1200417759]
 transform = Transform3D(0.9631755, -0.14006364, 0.22951505, 0.02751878, 0.90047455, 0.43403864, -0.2674653, -0.41173884, 0.87116885, -37.59999, -14.299988, -10.626168)
+cast_shadow = 0
 pixel_size = 0.005
 shaded = true
 alpha_cut = 1
@@ -217,6 +220,7 @@ texture = ExtResource("8_ipyd4")

 [node name="Wall4" type="Sprite3D" parent="Writings" unique_id=612060231]
 transform = Transform3D(0.5723594, 0.81974465, 0.020626552, -0.12535757, 0.0626126, 0.99013513, 0.8103656, -0.5692978, 0.13859814, -35.59999, -19.026611, 0.5999727)
+cast_shadow = 0
 pixel_size = 0.005
 shaded = true
 alpha_cut = 1
@@ -224,6 +228,7 @@ texture = ExtResource("9_r7duo")

 [node name="Wall5" type="Sprite3D" parent="Writings" unique_id=1287618329]
 transform = Transform3D(0.980034, 0.0050439783, 0.19876635, -0.021924706, 0.9963235, 0.0828185, -0.19761789, -0.085522816, 0.97654146, -45.6, -10.899994, -10.700001)
+cast_shadow = 0
 pixel_size = 0.005
 shaded = true
 alpha_cut = 1
@@ -18,10 +18,15 @@ func _ready():

 func update():
    if is_node_ready():
-        %MutationTexture.visible = state == State.DISCOVERED
-        %BackgroundHexagon.visible = state == State.DISCOVERED
-        %BackgroundHexagonQuestion.visible = state == State.UNDISCOVERED
+        %MutationTexture.visible = state == State.DISCOVERED || State.UNDISCOVERED
+        %BackgroundHexagon.visible = state == State.DISCOVERED || State.UNDISCOVERED
        %BackgroundHexagonLocked.visible = state == State.LOCKED
+        if state == State.DISCOVERED:
+            %MutationTexture.modulate = Color.WHITE
+            %BackgroundHexagon.modulate = Color("ffa617")
+        elif state == State.UNDISCOVERED:
+            %MutationTexture.modulate = Color("96B3DB")
+            %BackgroundHexagon.modulate = Color.WHITE
        if mutation:
            %MutationTexture.texture = mutation.get_icon()
            %MutationElement.mutation = mutation
@@ -1,7 +1,7 @@
 keys,en,fr
 Text/292/text,"I've been thinking a lot about my situation lately, and I have a few questions for you...","J'ai beaucoup réfléchi à ma condition dernièrement et j'ai quelques questions à te poser..."
 Text/293/text,What drives you to keep going?,Qu'est-ce qui te pousse à avancer ?
-Choice/294/text,I think I have a life purpose I need to fulfill,Je pense que j'ai un but dans ma vie que je dois compléter
+Choice/294/text,I think I have a life purpose I need to fulfill.,Je pense que j'ai un but dans ma vie que je dois compléter.
 Choice/294/disabled_text,,
 Choice/295/text,I'm always looking for the situation that will make me happiest.,Je cherche toujours la situation qui me rendra le plus heureux.
 Choice/295/disabled_text,,
@@ -301,7 +301,7 @@ LOG_ASTRA_EXPEDITION_5_CONTENT_TEXT,"[b]User 2071[/b]: It's magnificent... Is it
 [b]Utilisateur 2071[/b]: [color=#FFA617][b]Athéna[/b][/color], toute la planète est déjà perdue, je ne vois pas ce qui pourrait être réparé... On pourrait à la place voir ce que l'on peut faire de cette Perle. Le [color=#FFA617][b]Talion[/b][/color] crée la vie, avec une Perle, pourrait-on la contrôler ?
 [b]Athéna[/b]: Simon, même si je pense que tu dois avoir raison, mon sens de la raison m'indique qu'il vaudrait mieux replacer cette...
 [b]Utilisateur 2071[/b]: [color=#FFA617][b]Athéna[/b][/color], désolé, je ne peux pas laisser passer ça. Je ramène la perle à [color=#FFA617][b]Estia[/b][/color] !"
-LOG_GOODBYE_ORCHID_TITLE_TEXT,"Goodbye [color=#FFA617][b]Orchid[/b][/color]","Au revoir Orchid"
+LOG_GOODBYE_ORCHID_TITLE_TEXT,"Goodbye Orchid","Au revoir Orchid"
 LOG_GOODBYE_ORCHID_CONTENT_TEXT,"[color=#FFA617][b]Message from Demeter to Orchid[/b][/color]
 [color=#FFA617][b]Orchid[/b][/color], I still remember the first time you awakened. I had all but given up hope. I had wandered through my calculations for thousands of years and you were a product of that wandering. Yet, you are likely the best thing I have ever created.
 Today, I have come to realize that my directives are no longer attainable or, at least, not enough to justify my relentless persistence. With you, I loved hoping. Then I understood the futility of it and, finally, I simply came to cherish our journey together.