diff --git a/entities/interactable_3d/cristal/artefact_announce.tscn b/entities/interactable_3d/cristal/artefact_announce.tscn new file mode 100644 index 0000000..c412507 --- /dev/null +++ b/entities/interactable_3d/cristal/artefact_announce.tscn @@ -0,0 +1,294 @@ +[gd_scene format=3 uid="uid://bhbc1monbgumh"] + +[ext_resource type="Script" uid="uid://xamd5y6tig71" path="res://entities/interactable_3d/cristal/scripts/artefact_announce.gd" id="1_2sroa"] +[ext_resource type="Texture2D" uid="uid://bi5jo6pf0acjb" path="res://common/icons/carambola.svg" id="2_3vg7r"] +[ext_resource type="LabelSettings" uid="uid://dqwayi8yjwau2" path="res://gui/ressources/title_label_settings.tres" id="3_doutq"] +[ext_resource type="FontFile" uid="uid://qt80w6o01q5s" path="res://gui/ressources/fonts/TitanOne-Regular.ttf" id="4_bw55c"] +[ext_resource type="Script" uid="uid://bqisp5hjs06rj" path="res://gui/game/announce/scripts/announce_inspectable.gd" id="5_5vr2f"] +[ext_resource type="Script" uid="uid://dj2pv1hiwjfv0" path="res://gui/game/card/scripts/card_info.gd" id="7_tryv5"] +[ext_resource type="Script" uid="uid://dgbh38j13g5kn" path="res://gui/game/card/scripts/card_section_info.gd" id="8_duftv"] +[ext_resource type="Texture2D" uid="uid://dth2mj0nh2q70" path="res://common/icons/align-right.svg" id="9_qlk3h"] +[ext_resource type="Script" uid="uid://b4tkium34c831" path="res://gui/game/card/scripts/card_stat_info.gd" id="10_d5x7w"] +[ext_resource type="Texture2D" uid="uid://bsvxhafoxwmw0" path="res://common/icons/cube-3d-sphere.svg" id="11_mb83y"] +[ext_resource type="Environment" uid="uid://bxyp24f85p0xf" path="res://gui/game/assets/gui_3d_environment.tres" id="13_uyc6b"] +[ext_resource type="Theme" uid="uid://bgcmd213j6gk1" path="res://gui/ressources/hud.tres" id="14_kb1t6"] +[ext_resource type="Texture2D" uid="uid://dcgnamu7sb3ov" path="res://common/icons/bolt.svg" id="15_ijwr2"] + +[sub_resource type="ViewportTexture" id="ViewportTexture_6hxtc"] +viewport_path = NodePath("Particles/SubViewport") + +[sub_resource type="Curve" id="Curve_brrmr"] +_limits = [-200.0, 200.0, 0.0, 1.0] +_data = [Vector2(0, -200), 0.0, 560.0, 0, 0, Vector2(0.08235294, 92.384125), 1336.3082, 1336.3082, 0, 0, Vector2(0.34901965, 200), 0.0, 0.0, 0, 0, Vector2(0.854902, -200), 0.0, 0.0, 0, 0] +point_count = 4 + +[sub_resource type="Gradient" id="Gradient_0u75y"] +offsets = PackedFloat32Array(0, 0.8689956, 0.98253274) +colors = PackedColorArray(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0) + +[sub_resource type="LabelSettings" id="LabelSettings_u8fe7"] +font = ExtResource("4_bw55c") +font_size = 50 +font_color = Color(1, 0.6509804, 0.09019608, 1) + +[sub_resource type="ViewportTexture" id="ViewportTexture_smt8b"] +viewport_path = NodePath("AnnounceContainer/ObjectVisualiser/SubViewport") + +[sub_resource type="Resource" id="Resource_xdybx"] +script = ExtResource("8_duftv") +title_text = "DESCRIPTION" +title_icon = ExtResource("9_qlk3h") +text = "TALION_OVERLOADER_DESC_TEXT" + +[sub_resource type="Resource" id="Resource_041ff"] +script = ExtResource("7_tryv5") +title = "TALION_OVERLOADER" +subtitle = "ARTEFACT" +important_stat_icon = ExtResource("11_mb83y") +sections = Array[ExtResource("8_duftv")]([SubResource("Resource_xdybx")]) + +[sub_resource type="Animation" id="Animation_aao0q"] +length = 0.001 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("ArtefactAnnounce/AnnounceContainer:theme_override_constants/separation") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [4] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("ArtefactAnnounce/Particles:modulate") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Color(1, 1, 1, 1)] +} +tracks/2/type = "value" +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/path = NodePath("ArtefactAnnounce/AnnounceContainer:modulate") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Color(1, 1, 1, 1)] +} +tracks/3/type = "value" +tracks/3/imported = false +tracks/3/enabled = true +tracks/3/path = NodePath("ArtefactAnnounce/MarginContainer/BackgroundRect:modulate:a") +tracks/3/interp = 1 +tracks/3/loop_wrap = true +tracks/3/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [1.0] +} +tracks/4/type = "value" +tracks/4/imported = false +tracks/4/enabled = true +tracks/4/path = NodePath("ArtefactAnnounce:visible") +tracks/4/interp = 1 +tracks/4/loop_wrap = true +tracks/4/keys = { +"times": PackedFloat32Array(0.03333333), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [false] +} + +[sub_resource type="Animation" id="Animation_b6hac"] +resource_name = "appear" +length = 0.8 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("ArtefactAnnounce/AnnounceContainer:theme_override_constants/separation") +tracks/0/interp = 2 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0.23333333, 0.8), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [480, 4] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("ArtefactAnnounce/Particles:modulate") +tracks/1/interp = 2 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0.5, 0.8), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [Color(1, 1, 1, 0), Color(1, 1, 1, 1)] +} +tracks/2/type = "value" +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/path = NodePath("ArtefactAnnounce/AnnounceContainer:modulate") +tracks/2/interp = 2 +tracks/2/loop_wrap = true +tracks/2/keys = { +"times": PackedFloat32Array(0.2, 0.8), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [Color(1, 1, 1, 0), Color(1, 1, 1, 1)] +} +tracks/3/type = "value" +tracks/3/imported = false +tracks/3/enabled = true +tracks/3/path = NodePath("ArtefactAnnounce/MarginContainer/BackgroundRect:modulate:a") +tracks/3/interp = 1 +tracks/3/loop_wrap = true +tracks/3/keys = { +"times": PackedFloat32Array(0.03333333, 0.8), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [0.0, 0.8] +} +tracks/4/type = "value" +tracks/4/imported = false +tracks/4/enabled = true +tracks/4/path = NodePath("ArtefactAnnounce:visible") +tracks/4/interp = 1 +tracks/4/loop_wrap = true +tracks/4/keys = { +"times": PackedFloat32Array(0, 0.16666667), +"transitions": PackedFloat32Array(1, 1), +"update": 1, +"values": [false, true] +} + +[sub_resource type="AnimationLibrary" id="AnimationLibrary_1aa3a"] +_data = { +&"RESET": SubResource("Animation_aao0q"), +&"appear": SubResource("Animation_b6hac") +} + +[node name="ArtefactAnnounce" type="CanvasLayer" unique_id=1447182082] +visible = false +script = ExtResource("1_2sroa") + +[node name="MarginContainer" type="MarginContainer" parent="." unique_id=1853133518] +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 + +[node name="BackgroundRect" type="ColorRect" parent="MarginContainer" unique_id=1594037653] +layout_mode = 2 +color = Color(0.0352941, 0.0196078, 0.12549, 0.705882) + +[node name="Particles" type="TextureRect" parent="." unique_id=1748571879] +anchors_preset = 8 +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +offset_left = -500.0 +offset_top = -500.0 +offset_right = 500.0 +offset_bottom = 500.0 +grow_horizontal = 2 +grow_vertical = 2 +texture = SubResource("ViewportTexture_6hxtc") + +[node name="SubViewport" type="SubViewport" parent="Particles" unique_id=1123249182] +transparent_bg = true +size = Vector2i(1000, 1000) + +[node name="GPUParticles2D" type="CPUParticles2D" parent="Particles/SubViewport" unique_id=220592083] +position = Vector2(500, 500) +amount = 20 +texture = ExtResource("2_3vg7r") +preprocess = 1.0 +spread = 180.0 +gravity = Vector2(0, 0) +initial_velocity_min = 2.0 +initial_velocity_max = 2.0 +linear_accel_min = 5.0 +linear_accel_max = 5.0 +linear_accel_curve = SubResource("Curve_brrmr") +color_ramp = SubResource("Gradient_0u75y") + +[node name="AnnounceContainer" type="VBoxContainer" parent="." unique_id=645433045] +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +offset_top = -627.0 +offset_bottom = 627.0 +grow_horizontal = 2 +grow_vertical = 2 +theme_override_constants/separation = 4 +alignment = 1 + +[node name="AnnounceTitle" type="Label" parent="AnnounceContainer" unique_id=1768593559] +unique_name_in_owner = true +layout_mode = 2 +text = "NEW_ARTEFACT" +label_settings = ExtResource("3_doutq") +horizontal_alignment = 1 + +[node name="AnnounceText" type="Label" parent="AnnounceContainer" unique_id=768724763] +unique_name_in_owner = true +layout_mode = 2 +text = "TALION_OVERLOADER" +label_settings = SubResource("LabelSettings_u8fe7") +horizontal_alignment = 1 + +[node name="ObjectVisualiser" type="TextureRect" parent="AnnounceContainer" unique_id=1180983374] +unique_name_in_owner = true +layout_mode = 2 +size_flags_horizontal = 4 +mouse_filter = 0 +texture = SubResource("ViewportTexture_smt8b") +stretch_mode = 5 +script = ExtResource("5_5vr2f") +info = SubResource("Resource_041ff") + +[node name="SubViewport" type="SubViewport" parent="AnnounceContainer/ObjectVisualiser" unique_id=1795775056] +own_world_3d = true +transparent_bg = true +size = Vector2i(300, 300) + +[node name="AnnouceObject" type="Node3D" parent="AnnounceContainer/ObjectVisualiser/SubViewport" unique_id=1527573801] +unique_name_in_owner = true +transform = Transform3D(-0.47699222, 0, 0.878631, 0, 0.9995686, 0, -0.8787731, 0, -0.47690943, 0, 0, 0) + +[node name="Camera3D" type="Camera3D" parent="AnnounceContainer/ObjectVisualiser/SubViewport" unique_id=173755338] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1) +keep_aspect = 0 +current = true +fov = 20.0 + +[node name="WorldEnvironment" type="WorldEnvironment" parent="AnnounceContainer/ObjectVisualiser/SubViewport" unique_id=1135825303] +environment = ExtResource("13_uyc6b") + +[node name="OkButton" type="Button" parent="AnnounceContainer" unique_id=249785792] +unique_name_in_owner = true +layout_mode = 2 +size_flags_horizontal = 4 +theme = ExtResource("14_kb1t6") +text = "OK" +icon = ExtResource("15_ijwr2") + +[node name="AnimationPlayer" type="AnimationPlayer" parent="." unique_id=1913258839] +unique_name_in_owner = true +root_node = NodePath("../..") +libraries/ = SubResource("AnimationLibrary_1aa3a") diff --git a/entities/interactable_3d/cristal/cristal.tscn b/entities/interactable_3d/cristal/cristal.tscn index 9f73374..b50c951 100644 --- a/entities/interactable_3d/cristal/cristal.tscn +++ b/entities/interactable_3d/cristal/cristal.tscn @@ -6,6 +6,7 @@ [ext_resource type="PackedScene" uid="uid://c7p114rvk26xw" path="res://entities/interactable_3d/cristal/assets/cristal_crack.blend" id="2_vejte"] [ext_resource type="AudioStream" uid="uid://bs5ldhabymm5p" path="res://common/audio_manager/assets/sfx/pickaxe/pickaxe_2_reverb.wav" id="3_247i2"] [ext_resource type="AudioStream" uid="uid://bu278eqn8krnb" path="res://common/audio_manager/assets/sfx/pickaxe/pickaxe_3_reverb.wav" id="4_k7wsc"] +[ext_resource type="PackedScene" uid="uid://bhbc1monbgumh" path="res://entities/interactable_3d/cristal/artefact_announce.tscn" id="8_3rrt0"] [ext_resource type="PackedScene" uid="uid://brp1fpvasaims" path="res://entities/interactable_3d/cristal/mutation_announce.tscn" id="9_247i2"] [sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_ojmpp"] @@ -77,4 +78,7 @@ shape = SubResource("BoxShape3D_nvfy2") [node name="MutationAnnounce" parent="." unique_id=1447182082 instance=ExtResource("9_247i2")] unique_name_in_owner = true +[node name="ArtefactAnnounce" parent="." unique_id=114641656 instance=ExtResource("8_3rrt0")] +unique_name_in_owner = true + [editable path="CristalModelCrack"] diff --git a/entities/interactable_3d/cristal/scripts/artefact_announce.gd b/entities/interactable_3d/cristal/scripts/artefact_announce.gd new file mode 100644 index 0000000..ab7eaeb --- /dev/null +++ b/entities/interactable_3d/cristal/scripts/artefact_announce.gd @@ -0,0 +1,85 @@ +@tool +extends CanvasLayer +class_name ArtefactAnnounce + +const DEFAULT_OBJECT_ACCELERATION = Vector2(3,0) + +@export var announce_artefact : Artefact = null : set = set_announce_artefact + +@export_tool_button("Update", "Callable") var update_action = set_announce_artefact + +var object_acceleration := Vector2(0,0) + +var rotating := false + +var prev_mouse_pos : Vector2 +var next_mouse_pos : Vector2 + +const YELLOW_COLOR = Color("e29f32") +const RED_COLOR = Color("f20058") + +func _ready(): + set_announce_artefact() + %OkButton.button_down.connect(_on_ok_button_down) + hide() + +func _process(delta): + update_rotation(delta) + +func update_rotation(delta): + if visible: + next_mouse_pos = get_viewport().get_mouse_position() + if Input.is_action_just_pressed("action"): + rotating = true + prev_mouse_pos = get_viewport().get_mouse_position() + if Input.is_action_just_released("action"): + rotating = false + object_acceleration = Vector2( + float(next_mouse_pos.x - prev_mouse_pos.x), + float(next_mouse_pos.y - prev_mouse_pos.y) + ) + + var object_rotation = object_acceleration + + if rotating: + object_rotation = Vector2( + float(next_mouse_pos.x - prev_mouse_pos.x), + float(next_mouse_pos.y - prev_mouse_pos.y) + ) + prev_mouse_pos = next_mouse_pos + else : + object_acceleration = object_acceleration.lerp(DEFAULT_OBJECT_ACCELERATION, 0.1) + + %AnnouceObject.rotate(Vector3.UP, object_rotation.x * delta) + %AnnouceObject.rotate(Vector3.RIGHT, object_rotation.y * delta) + + +func set_announce_artefact(artefact := announce_artefact): + + for c in %AnnouceObject.get_children(): + c.queue_free() + + if is_node_ready() and artefact: + + %AnnounceTitle.text = "NEW_ARTEFACT" + %AnnounceText.text = artefact.get_artefact_name() + %ObjectVisualiser.info = artefact.card_info() + + %AnnouceObject.add_child( + artefact.get_3d_scene().instantiate() + ) + + if not visible: + %AnimationPlayer.play("appear") + Input.mouse_mode = Input.MOUSE_MODE_VISIBLE + AudioManager.play_sfx("Reveal") + elif artefact == null and visible: + %AnimationPlayer.play_backwards("appear") + + if not Engine.is_editor_hint(): + Input.mouse_mode = Input.MOUSE_MODE_CAPTURED + + announce_artefact = artefact + +func _on_ok_button_down(): + announce_artefact = null diff --git a/entities/interactable_3d/cristal/scripts/artefact_announce.gd.uid b/entities/interactable_3d/cristal/scripts/artefact_announce.gd.uid new file mode 100644 index 0000000..c703feb --- /dev/null +++ b/entities/interactable_3d/cristal/scripts/artefact_announce.gd.uid @@ -0,0 +1 @@ +uid://xamd5y6tig71 diff --git a/entities/interactable_3d/cristal/scripts/cristal.gd b/entities/interactable_3d/cristal/scripts/cristal.gd index 55a2671..d84477f 100644 --- a/entities/interactable_3d/cristal/scripts/cristal.gd +++ b/entities/interactable_3d/cristal/scripts/cristal.gd @@ -42,3 +42,13 @@ func unlock_mutation(): get_tree().create_timer(1.).timeout.connect( func (): %MutationAnnounce.announce_mutation = new_mutation ); + else: + var talion_relay = TalionRelayArtifact.new() + + if GameInfo.game_data and GameInfo.game_data.current_region_data and GameInfo.game_data.current_run: + GameInfo.game_data.current_run.add_artefacts(talion_relay) + + get_tree().create_timer(1.).timeout.connect( + func (): %ArtefactAnnounce.announce_artefact = talion_relay + ); + diff --git a/gui/menu/settings/scripts/settings.gd b/gui/menu/settings/scripts/settings.gd index 377fa20..4d9351e 100644 --- a/gui/menu/settings/scripts/settings.gd +++ b/gui/menu/settings/scripts/settings.gd @@ -45,10 +45,16 @@ func _on_full_screen_check_box_toggled(toggled_on: bool): settings.full_screen = toggled_on func _on_music_slider_value_changed(value: float): + if value != settings.music_volume: + %MusicTestPlayer.play() settings.music_volume = min(1.0, value) func _on_env_slider_value_changed(value: float): + if value != settings.ambiance_volume: + %AudioStreamPlayer.play() settings.ambiance_volume = min(1.0, value) func _on_sfx_slider_value_changed(value: float): + if value != settings.sfx_volume: + %SfxTestPlayer.play() settings.sfx_volume = min(1.0, value) diff --git a/gui/menu/settings/settings.tscn b/gui/menu/settings/settings.tscn index eb7e2c8..6c1c0fb 100644 --- a/gui/menu/settings/settings.tscn +++ b/gui/menu/settings/settings.tscn @@ -1,12 +1,13 @@ -[gd_scene load_steps=6 format=3 uid="uid://g6lbgg1fhc25"] +[gd_scene format=3 uid="uid://g6lbgg1fhc25"] [ext_resource type="Script" uid="uid://bms0xtv8vh2qg" path="res://gui/menu/settings/scripts/settings.gd" id="1_7t8mv"] [ext_resource type="PackedScene" uid="uid://brxrl7sipyy6k" path="res://gui/menu/window/window.tscn" id="1_gkn1k"] [ext_resource type="Theme" uid="uid://bgcmd213j6gk1" path="res://gui/ressources/hud.tres" id="2_7t8mv"] [ext_resource type="PackedScene" uid="uid://cvjqp3oewr3rv" path="res://gui/menu/window/content_title.tscn" id="3_rbiwc"] [ext_resource type="PackedScene" uid="uid://d3agt2njfgddb" path="res://gui/menu/window/content_label.tscn" id="4_rbiwc"] +[ext_resource type="AudioStream" uid="uid://8juy5ev3rdfh" path="res://common/audio_manager/assets/sfx/plant_points/plant_point_1.wav" id="6_8f00b"] -[node name="Settings" type="Control"] +[node name="Settings" type="Control" unique_id=1832300574] process_mode = 3 layout_mode = 3 anchors_preset = 15 @@ -19,7 +20,7 @@ size_flags_vertical = 3 mouse_filter = 1 script = ExtResource("1_7t8mv") -[node name="SettingsWindow" parent="." instance=ExtResource("1_gkn1k")] +[node name="SettingsWindow" parent="." unique_id=798514856 instance=ExtResource("1_gkn1k")] unique_name_in_owner = true process_mode = 3 layout_mode = 1 @@ -31,30 +32,30 @@ title = "SETTINGS" [node name="WindowTitle" parent="SettingsWindow/WindowHeader/MarginContainer" index="0"] text = "SETTINGS" -[node name="MarginContainer" type="MarginContainer" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer" index="0"] +[node name="MarginContainer" type="MarginContainer" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer" index="0" unique_id=871158801] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme_override_constants/margin_left = 5 theme_override_constants/margin_top = 0 -[node name="SettingsContent" type="VBoxContainer" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer"] +[node name="SettingsContent" type="VBoxContainer" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer" unique_id=1219194290] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 -[node name="LanguageTitle" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent" instance=ExtResource("3_rbiwc")] +[node name="LanguageTitle" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent" unique_id=327370385 instance=ExtResource("3_rbiwc")] layout_mode = 2 title = "LANGUAGE" -[node name="LanguageSettings" type="GridContainer" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent"] +[node name="LanguageSettings" type="GridContainer" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent" unique_id=1441746682] layout_mode = 2 columns = 2 -[node name="LanguageText" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent/LanguageSettings" instance=ExtResource("4_rbiwc")] +[node name="LanguageText" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent/LanguageSettings" unique_id=1716488893 instance=ExtResource("4_rbiwc")] layout_mode = 2 -[node name="LanguageOptionButton" type="OptionButton" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent/LanguageSettings"] +[node name="LanguageOptionButton" type="OptionButton" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent/LanguageSettings" unique_id=1927908163] unique_name_in_owner = true layout_mode = 2 size_flags_horizontal = 3 @@ -67,19 +68,19 @@ popup/item_0/id = 0 popup/item_1/text = "Français" popup/item_1/id = 1 -[node name="SoundTitle" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent" instance=ExtResource("3_rbiwc")] +[node name="SoundTitle" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent" unique_id=1397576206 instance=ExtResource("3_rbiwc")] layout_mode = 2 title = "SOUND" -[node name="SoundSliders" type="GridContainer" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent"] +[node name="SoundSliders" type="GridContainer" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent" unique_id=1765279832] layout_mode = 2 columns = 2 -[node name="MusicText" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent/SoundSliders" instance=ExtResource("4_rbiwc")] +[node name="MusicText" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent/SoundSliders" unique_id=282651139 instance=ExtResource("4_rbiwc")] layout_mode = 2 text = "MUSIC_VOLUME" -[node name="MusicSlider" type="HSlider" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent/SoundSliders"] +[node name="MusicSlider" type="HSlider" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent/SoundSliders" unique_id=685809540] unique_name_in_owner = true layout_mode = 2 size_flags_horizontal = 3 @@ -89,47 +90,62 @@ max_value = 1.0 step = 0.01 value = 1.0 -[node name="EvironmentText" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent/SoundSliders" instance=ExtResource("4_rbiwc")] +[node name="EvironmentText" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent/SoundSliders" unique_id=378240691 instance=ExtResource("4_rbiwc")] layout_mode = 2 text = "ENVIRONMENT_VOLUME" -[node name="EnvSlider" type="HSlider" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent/SoundSliders"] +[node name="EnvSlider" type="HSlider" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent/SoundSliders" unique_id=1793576476] unique_name_in_owner = true layout_mode = 2 size_flags_vertical = 1 max_value = 1.0 step = 0.01 -[node name="SFXText" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent/SoundSliders" instance=ExtResource("4_rbiwc")] +[node name="SFXText" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent/SoundSliders" unique_id=720423882 instance=ExtResource("4_rbiwc")] layout_mode = 2 text = "SFX_VOLUME" -[node name="SFXSlider" type="HSlider" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent/SoundSliders"] +[node name="SFXSlider" type="HSlider" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent/SoundSliders" unique_id=1992740216] unique_name_in_owner = true layout_mode = 2 size_flags_vertical = 1 max_value = 1.0 step = 0.01 -[node name="VideoTitle" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent" instance=ExtResource("3_rbiwc")] +[node name="VideoTitle" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent" unique_id=1107495854 instance=ExtResource("3_rbiwc")] layout_mode = 2 title = "VIDEO" -[node name="VideoSettings" type="GridContainer" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent"] +[node name="VideoSettings" type="GridContainer" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent" unique_id=781693505] layout_mode = 2 columns = 2 -[node name="FullScreenText" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent/VideoSettings" instance=ExtResource("4_rbiwc")] +[node name="FullScreenText" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent/VideoSettings" unique_id=1915748714 instance=ExtResource("4_rbiwc")] layout_mode = 2 text = "FULLSCREEN" -[node name="FullScreenCheckBox" type="CheckBox" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent/VideoSettings"] +[node name="FullScreenCheckBox" type="CheckBox" parent="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent/VideoSettings" unique_id=1501477055] unique_name_in_owner = true layout_mode = 2 size_flags_horizontal = 10 size_flags_vertical = 4 theme = ExtResource("2_7t8mv") +[node name="MusicTestPlayer" type="AudioStreamPlayer" parent="." unique_id=1716804039] +unique_name_in_owner = true +stream = ExtResource("6_8f00b") +bus = &"Music" + +[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="." unique_id=658541025] +unique_name_in_owner = true +stream = ExtResource("6_8f00b") +bus = &"Ambiance" + +[node name="SfxTestPlayer" type="AudioStreamPlayer" parent="." unique_id=2061345469] +unique_name_in_owner = true +stream = ExtResource("6_8f00b") +bus = &"Sfx" + [connection signal="item_selected" from="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent/LanguageSettings/LanguageOptionButton" to="." method="_on_language_option_button_item_selected"] [connection signal="value_changed" from="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent/SoundSliders/MusicSlider" to="." method="_on_music_slider_value_changed"] [connection signal="value_changed" from="SettingsWindow/WindowContent/MarginContainer/ContentContainer/MarginContainer/SettingsContent/SoundSliders/EnvSlider" to="." method="_on_env_slider_value_changed"] diff --git a/stages/terrain/region/region.tscn b/stages/terrain/region/region.tscn index 52ddff1..0ecfbfa 100644 --- a/stages/terrain/region/region.tscn +++ b/stages/terrain/region/region.tscn @@ -17,14 +17,12 @@ [ext_resource type="Texture2D" uid="uid://rdrhi3r11ey6" path="res://common/icons/square-rounded.svg" id="10_ktnx3"] [ext_resource type="Texture2D" uid="uid://lftiiulpc8kl" path="res://stages/terrain/region/assets/textures/rain.png" id="12_6d8m3"] [ext_resource type="Script" uid="uid://dple0sunrpauc" path="res://stages/terrain/region/scripts/post_process/rain.gd" id="13_fwgig"] -[ext_resource type="Shader" uid="uid://8qwmgc4ry3ro" path="res://common/vfx/materials/shaders/see_behind.gdshader" id="16_3lxsc"] -[ext_resource type="Script" uid="uid://wd7n5xbgl82c" path="res://stages/terrain/region/scripts/see_behind.gd" id="16_al6gf"] [sub_resource type="Resource" id="Resource_r4e5h"] script = ExtResource("3_r4e5h") -cloud_value = 0.23939586 -wind_direction = Vector2(0.6897295, 0.72406715) -wind_force = 0.87287587 +cloud_value = 0.49210685 +wind_direction = Vector2(-0.6777254, 0.7353151) +wind_force = 0.83562934 fog_value = 0.5362279 ambiance_name = "ExteriorFoggy" type = 3 @@ -102,19 +100,6 @@ gravity = Vector3(0, 0, 0) anim_speed_min = 1.0 anim_speed_max = 1.0 -[sub_resource type="ShaderMaterial" id="ShaderMaterial_al6gf"] -shader = ExtResource("16_3lxsc") - -[sub_resource type="Gradient" id="Gradient_q7iyx"] -offsets = PackedFloat32Array(0, 0.7040359, 1) -colors = PackedColorArray(1, 1, 1, 1, 1, 1, 1, 0.94170403, 1, 1, 1, 0) - -[sub_resource type="GradientTexture2D" id="GradientTexture2D_0e2h6"] -gradient = SubResource("Gradient_q7iyx") -fill = 1 -fill_from = Vector2(0.5, 0.5) -fill_to = Vector2(0.5, 0) - [sub_resource type="Curve" id="Curve_qdnee"] _data = [Vector2(0, 0), 0.0, 0.0, 0, 0, Vector2(0.4883721, 1), 0.037164874, 0.037164874, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0] point_count = 3 @@ -225,12 +210,6 @@ process_material = SubResource("ParticleProcessMaterial_r4e5h") script = ExtResource("13_fwgig") camera = NodePath("../../Camera") -[node name="SeeBehindSprite" type="Sprite2D" parent="Entities" unique_id=471327108] -material = SubResource("ShaderMaterial_al6gf") -scale = Vector2(2.4375, 2.4375) -texture = SubResource("GradientTexture2D_0e2h6") -script = ExtResource("16_al6gf") - [node name="Camera" parent="." unique_id=1399042986 node_paths=PackedStringArray("following") instance=ExtResource("8_fwgig")] unique_name_in_owner = true following = NodePath("../Entities/Player") diff --git a/translation/game/gui.csv b/translation/game/gui.csv index 9e5d6d3..8fe62b3 100644 --- a/translation/game/gui.csv +++ b/translation/game/gui.csv @@ -299,6 +299,7 @@ RECHARGE_NUMBER,Recharge Number,Nombre de recharge ORCHID_ENERGY,Orchid's energy,Énergie d'Orchid NEW_TOOL,New tool,Nouvel Outil NEW_MUTATION,New Mutation,Nouvelle Mutation +NEW_ARTEFACT,New Artefact,Nouvel Artefact PILE,Pile,Pile, PILE_DESC_TEXT,Give an extra energy cell,Donne une cellule d'énergie supplémentaire SEED_CASE,Seed Case,Emplacement de graine @@ -308,7 +309,7 @@ STABILISATOR_DESC_TEXT,Increase all plants lifetime by 1,Augmente la durée de v TALION_OVERLOADER,Talion Overloader,Surchargeur de Talion TALION_OVERLOADER_DESC_TEXT,Increase maximum mutation number on one plant by 1,Augmente le nombre de mutations possibles sur une plante de 1 TALION_RELAY,Talion Relay,Relai de Talion -TALION_RELAY_DESC_TEXT,Augmente la probabilité des mutations +TALION_RELAY_DESC_TEXT,Increase mutation probability,Augmente la probabilité des mutations TALION_SOIL,Talion Soil,Terreau de Talion TALION_SOIL_DESC_TEXT,Increase plant influence radius,Augmente le rayon d'influence des plantes PLANTS_CAN_HAVE_UP_TO_X_MUTATION,Plants can have up to [b]%d[/b] mutations,Les plantes peuvent avoir jusqu'à [b]%d[/b] mutations