From d7ac1c6c22418740db4c0f501f6986566f39c5c6 Mon Sep 17 00:00:00 2001 From: Jonathan Date: Wed, 6 Aug 2025 20:04:24 +0200 Subject: [PATCH] Fixed retrigger yeli dialog --- dialog/yeli_quest_select.dtl | 12 +++++++----- prefabs/characters/Yeli.tscn | 6 +----- project.godot | 5 ++++- scenes/Babushka_scene_bootstrap.tscn | 1 - 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dialog/yeli_quest_select.dtl b/dialog/yeli_quest_select.dtl index 924ba48..773a607 100644 --- a/dialog/yeli_quest_select.dtl +++ b/dialog/yeli_quest_select.dtl @@ -1,8 +1,10 @@ -if {ACTIVEQUEST} == "1_talk_yeli_1": +ifquest res://resources/quests/demo/1_talk_yeli_1.tres, 1: jump quest1_ducks_start/ -elif {ACTIVEQUEST} == "3_talk_yeli_2": + [end_timeline] +ifquest res://resources/quests/demo/3_talk_yeli_2.tres, 1: jump quest2_tomatoes_start/ -elif {ACTIVEQUEST} == "5_talk_yeli_3": + [end_timeline] +ifquest res://resources/quests/demo/5_talk_yeli_3.tres, 1: jump quest2_tomatoes_interim/ -else: - No Dialog for active quest "{ACTIVEQUEST}" + [end_timeline] +No Dialog for active quest "{ACTIVEQUEST}" diff --git a/prefabs/characters/Yeli.tscn b/prefabs/characters/Yeli.tscn index 16de2cb..798496a 100644 --- a/prefabs/characters/Yeli.tscn +++ b/prefabs/characters/Yeli.tscn @@ -43,7 +43,7 @@ [ext_resource type="Texture2D" uid="uid://droj8w1mbm5k3" path="res://art/animation/Yeli2D/F02-Yeli_Talk/0019.png" id="39_vg7xi"] [ext_resource type="Texture2D" uid="uid://by5vtadhdwwag" path="res://art/animation/Yeli2D/F02-Yeli_Talk/0020.png" id="40_ipyxb"] [ext_resource type="PackedScene" uid="uid://cqc72e4hq6bcd" path="res://prefabs/interactions/interaction_area_2d.tscn" id="42_ahrat"] -[ext_resource type="Script" uid="uid://cvkw4qd2hxksi" path="res://scripts/GdScript/dialogic_toggle.gd" id="44_aqu1t"] +[ext_resource type="Script" path="res://scripts/GdScript/dialogic_toggle.gd" id="44_aqu1t"] [sub_resource type="CircleShape2D" id="CircleShape2D_at1n1"] resource_local_to_scene = true @@ -212,9 +212,6 @@ offset = Vector2(0, -450) [node name="Dialogic starter" type="Node2D" parent="."] script = ExtResource("1_at1n1") -[node name="DialogicToggle" type="Node2D" parent="Dialogic starter"] -script = ExtResource("44_aqu1t") - [node name="AnimatableBody2D" type="AnimatableBody2D" parent="."] position = Vector2(0, -172) @@ -229,6 +226,5 @@ itemToToggle = NodePath("../TalkingControl/AnimatedSprite") [connection signal="Talking" from="." to="Dialogic starter" method="open"] [connection signal="Interacted" from="InteractionArea" to="." method="ToggleTalking"] -[connection signal="timelineEnded" from="Dialogic starter/DialogicToggle" to="." method="ToggleTalking"] [editable path="InteractionArea"] diff --git a/project.godot b/project.godot index b1c0c11..c29d51e 100644 --- a/project.godot +++ b/project.godot @@ -65,7 +65,8 @@ directories/dtl_directory={ "yeli_intro_02": "res://dialog/Scene1_farm_outside/yeli_intro_02.dtl", "yeli_intro_03": "res://dialog/Scene1_farm_outside/yeli_intro_03.dtl", "yeli_intro_04": "res://dialog/Scene1_farm_outside/yeli_intro_04.dtl", -"yeli_intro_05": "res://dialog/Scene1_farm_outside/yeli_intro_05.dtl" +"yeli_intro_05": "res://dialog/Scene1_farm_outside/yeli_intro_05.dtl", +"yeli_quest_select": "res://dialog/yeli_quest_select.dtl" } variables={ "ACTIVEQUEST": "none", @@ -139,12 +140,14 @@ directories/tres_directory={ "default_vn_style": "res://addons/dialogic/Modules/DefaultLayoutParts/Style_VN_Default/default_vn_style.tres", "farming_equipment_glossary": "res://dialog/farming_equipment_glossary.tres", "hoe": "res://resources/items/hoe.tres", +"inventory_interactable_outline": "res://art/materials/inventory_interactable_outline.tres", "preview_character": "res://addons/dialogic/Modules/Character/preview_character.tres", "rake": "res://resources/items/rake.tres", "scythe": "res://resources/items/scythe.tres", "selected_styleboxflat": "res://addons/dialogic/Editor/Events/styles/selected_styleboxflat.tres", "shovel": "res://resources/items/shovel.tres", "simple_fade": "res://addons/dialogic/Modules/Background/Transitions/Defaults/simple_fade.tres", +"simple_interactable_outline": "res://art/materials/simple_interactable_outline.tres", "simple_swipe_gradient": "res://addons/dialogic/Modules/Background/Transitions/simple_swipe_gradient.tres", "speaker_textbox_style": "res://addons/dialogic/Modules/DefaultLayoutParts/Style_SpeakerTextbox/speaker_textbox_style.tres", "speechbubble": "res://dialog/speechbubble.tres", diff --git a/scenes/Babushka_scene_bootstrap.tscn b/scenes/Babushka_scene_bootstrap.tscn index 6ae60a7..5b1809d 100644 --- a/scenes/Babushka_scene_bootstrap.tscn +++ b/scenes/Babushka_scene_bootstrap.tscn @@ -5,6 +5,5 @@ [node name="BabushkaSceneBootstrap" type="Node2D"] [node name="BabushkaSceneStartMenu" parent="." instance=ExtResource("1_15ton")] -_sceneNamesToLoad = PackedStringArray("res://scenes/Babushka_scene_farm_outside_2d.tscn") [node name="SceneParent" type="Node" parent="."]