From bb24efe46be380991982f8920f8798497b1957fd Mon Sep 17 00:00:00 2001 From: Zacharie Guet Date: Fri, 26 Sep 2025 17:17:23 +0200 Subject: [PATCH] =?UTF-8?q?=C3=A9quilibrage=20g=C3=A9n=C3=A9ral=20du=20jeu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../machines/solar_pannel/scripts/solar_pannel.gd | 3 ++- .../interactables/machines/solar_pannel/solar_pannel.tres | 2 +- entities/plants/resources/plant_types/champ.tres | 5 +++-- gui/game/reward_choice/scripts/reward_choice.gd | 2 ++ .../tutorial/in_game_indicator/in_game_indicator.tscn | 8 +++++++- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/entities/interactables/machines/solar_pannel/scripts/solar_pannel.gd b/entities/interactables/machines/solar_pannel/scripts/solar_pannel.gd index 2f05eec..f6dfe75 100644 --- a/entities/interactables/machines/solar_pannel/scripts/solar_pannel.gd +++ b/entities/interactables/machines/solar_pannel/scripts/solar_pannel.gd @@ -35,7 +35,8 @@ func set_charged(_charged = true): %AnimationPlayer.play_backwards("charged") func setup_machine_sprite(): - %Base.self_modulate = Machine.get_level_color(level) + # %Base.self_modulate = Machine.get_level_color(level) + pass func interact_text(): return "Recharge " + str(get_energy_production()) + " energy" diff --git a/entities/interactables/machines/solar_pannel/solar_pannel.tres b/entities/interactables/machines/solar_pannel/solar_pannel.tres index 1e7d0cf..5a1998f 100644 --- a/entities/interactables/machines/solar_pannel/solar_pannel.tres +++ b/entities/interactables/machines/solar_pannel/solar_pannel.tres @@ -7,5 +7,5 @@ script = ExtResource("1_ctita") name = "Solar Pannel" scene = ExtResource("1_naexs") -description = "Produce energy evry 2 days. When charged, can be used to recharge energy." +description = "Produce energy every 2 days. When charged, can be used to recharge energy." metadata/_custom_type_script = "uid://bhncww816fjsb" diff --git a/entities/plants/resources/plant_types/champ.tres b/entities/plants/resources/plant_types/champ.tres index 35c7fde..86c0849 100644 --- a/entities/plants/resources/plant_types/champ.tres +++ b/entities/plants/resources/plant_types/champ.tres @@ -8,7 +8,8 @@ [sub_resource type="Resource" id="Resource_5hyy8"] script = ExtResource("1_cf34j") -produce_types_path = Array[String](["uid://cxrc5wchpqm18", "uid://b04vho33bl52b", "uid://dsctivn1vrem2", "uid://b04vho33bl52b"]) +produce_types_path = Array[String](["uid://cxrc5wchpqm18", "uid://b04vho33bl52b", "uid://dsctivn1vrem2", "uid://c5oxxif3h5yxo"]) +produce_number = Array[int]([1, 0]) metadata/_custom_type_script = "uid://ceqx5va1ormau" [sub_resource type="AtlasTexture" id="AtlasTexture_my6by"] @@ -18,7 +19,7 @@ region = Rect2(610, 315, 124, 180) [resource] script = ExtResource("1_ipcpv") name = "Champ" -description = "When mature, produce one seed every day." +description = "When mature, can produce one seed every day." growing_time = 1 seed_texture = SubResource("AtlasTexture_my6by") growing_texture = ExtResource("2_l2hi3") diff --git a/gui/game/reward_choice/scripts/reward_choice.gd b/gui/game/reward_choice/scripts/reward_choice.gd index 60b973d..fd21437 100644 --- a/gui/game/reward_choice/scripts/reward_choice.gd +++ b/gui/game/reward_choice/scripts/reward_choice.gd @@ -7,10 +7,12 @@ var item2: Item func show_rewards(): get_tree().paused = true %AnimationPlayer.play("show") + get_tree().paused = true func hide_rewards(): get_tree().paused = false %AnimationPlayer.play_backwards("show") + get_tree().paused = false func _on_planet_quota_reward_asked(_planet:Planet, _item1:Item, _item2:Item): planet = _planet diff --git a/gui/game/tutorial/in_game_indicator/in_game_indicator.tscn b/gui/game/tutorial/in_game_indicator/in_game_indicator.tscn index bcbc064..c1f0330 100644 --- a/gui/game/tutorial/in_game_indicator/in_game_indicator.tscn +++ b/gui/game/tutorial/in_game_indicator/in_game_indicator.tscn @@ -1,9 +1,14 @@ -[gd_scene load_steps=4 format=3 uid="uid://fh3dsuvn5h78"] +[gd_scene load_steps=5 format=3 uid="uid://fh3dsuvn5h78"] [ext_resource type="Theme" uid="uid://bgcmd213j6gk1" path="res://gui/ressources/default_theme.tres" id="1_ga3ae"] [ext_resource type="Texture2D" uid="uid://bsgmxvuphn73c" path="res://common/icons/arrow-narrow-down.svg" id="2_kc1j1"] [ext_resource type="Script" uid="uid://r6hgefyycute" path="res://gui/game/tutorial/in_game_indicator/scripts/in_game_indicator.gd" id="2_kij5i"] +[sub_resource type="LabelSettings" id="LabelSettings_kc1j1"] +shadow_size = 3 +shadow_color = Color(0, 0, 0, 0.75686276) +shadow_offset = Vector2(0, 0) + [node name="InGameIndicator" type="CenterContainer"] modulate = Color(0.91, 0.6521667, 0, 1) offset_right = 150.0 @@ -24,6 +29,7 @@ unique_name_in_owner = true custom_minimum_size = Vector2(150, 0) layout_mode = 2 text = "Text and a very very very long text" +label_settings = SubResource("LabelSettings_kc1j1") horizontal_alignment = 1 autowrap_mode = 3