From 936983e14fd6821d890ce6fc0328f5965c82bd2d Mon Sep 17 00:00:00 2001 From: kziolkowski Date: Sat, 27 Sep 2025 17:24:01 +0200 Subject: [PATCH] :lipstick: updated dialogic style to make it clearer who is talking and have vesna always on the left side --- addons/dialogic/vesna_style.tres | 105 ++++++++++++++++++ audio/default_bus_layout.tres | 4 +- dialog/Characters/vesna.dch | 2 +- dialog/NPC_narrative.tres | 6 +- dialog/Scene1_farm_outside/yeli_intro_05.dtl | 2 +- dialog/Scene2_farm_inside/quest4_dinner.dtl | 4 +- dialog/quests/beetroot/quest3_beets_end.dtl | 4 +- .../quests/beetroot/quest3_beets_interim.dtl | 2 +- dialog/quests/ducks/quest1_ducks_end.dtl | 4 +- dialog/quests/forest/quest5_forest_end.dtl | 2 +- dialog/quests/forest/quest5_forest_start.dtl | 4 +- .../quests/tomatoes/quest2_tomatoes_end.dtl | 2 +- .../quests/tomatoes/quest2_tomatoes_start.dtl | 4 +- project.godot | 3 +- scenes/Babushka_scene_farm_outside_2d.tscn | 19 +++- 15 files changed, 146 insertions(+), 21 deletions(-) create mode 100644 addons/dialogic/vesna_style.tres diff --git a/addons/dialogic/vesna_style.tres b/addons/dialogic/vesna_style.tres new file mode 100644 index 0000000..89a40f3 --- /dev/null +++ b/addons/dialogic/vesna_style.tres @@ -0,0 +1,105 @@ +[gd_resource type="Resource" script_class="DialogicStyle" load_steps=21 format=3 uid="uid://benfqi2myyn58"] + +[ext_resource type="Script" uid="uid://dfx2htp24tuvm" path="res://addons/dialogic/Resources/dialogic_style_layer.gd" id="1_kc0s3"] +[ext_resource type="PackedScene" uid="uid://c1k5m0w3r40xf" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_FullBackground/full_background_layer.tscn" id="2_wjopr"] +[ext_resource type="PackedScene" uid="uid://cy1y14inwkplb" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_VN_Portraits/vn_portrait_layer.tscn" id="3_depsi"] +[ext_resource type="PackedScene" uid="uid://cn674foxwedqu" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_Input/full_advance_input_layer.tscn" id="4_wy5ku"] +[ext_resource type="PackedScene" uid="uid://bquja8jyk8kbr" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_VN_Textbox/vn_textbox_layer.tscn" id="5_6srh5"] +[ext_resource type="PackedScene" uid="uid://dsbwnp5hegnu3" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_Glossary/glossary_popup_layer.tscn" id="6_iipq0"] +[ext_resource type="PackedScene" uid="uid://dhk6j6eb6e3q" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_VN_Choices/vn_choice_layer.tscn" id="7_jxwbe"] +[ext_resource type="PackedScene" uid="uid://cvgf4c6gg0tsy" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_TextInput/text_input_layer.tscn" id="8_4ig6v"] +[ext_resource type="PackedScene" uid="uid://lx24i8fl6uo" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_History/history_layer.tscn" id="9_gni8k"] +[ext_resource type="Script" uid="uid://b14h380mah4av" path="res://addons/dialogic/Resources/dialogic_style.gd" id="10_l174f"] + +[sub_resource type="Resource" id="Resource_qnla8"] +script = ExtResource("1_kc0s3") +overrides = { +"global_bg_color": "Color(0.898039, 0.917647, 0.835294, 1)", +"global_font_color": "Color(0.258824, 0.12549, 0.054902, 1)", +"global_font_size": "30.0" +} + +[sub_resource type="Resource" id="Resource_awdqn"] +script = ExtResource("1_kc0s3") +scene = ExtResource("2_wjopr") +overrides = {} + +[sub_resource type="Resource" id="Resource_5pou4"] +script = ExtResource("1_kc0s3") +scene = ExtResource("3_depsi") +overrides = {} + +[sub_resource type="Resource" id="Resource_6xrvb"] +script = ExtResource("1_kc0s3") +scene = ExtResource("4_wy5ku") +overrides = {} + +[sub_resource type="Resource" id="Resource_k1327"] +script = ExtResource("1_kc0s3") +scene = ExtResource("5_6srh5") +overrides = { +"box_animation_in": "1", +"box_animation_out": "1", +"box_panel": "\"vn_textbox_default_panel.tres\"", +"name_label_box_modulate": "Color(1, 1, 1, 1)", +"name_label_box_panel": "\"res://dialog/Babushka_NPC_Namebox_background.tres\"", +"name_label_custom_font_size": "30.0", +"name_label_use_global_color": "false", +"next_indicator_enabled": "false", +"text_alignment": "1", +"text_size": "40.0", +"typing_sounds_end_sound": "\"res://audio/sfx/UI/Dialog/SFX_Dialog_Open_01.wav\"", +"typing_sounds_sounds_folder": "\"res://audio/sfx/typing\"" +} + +[sub_resource type="Resource" id="Resource_qtijl"] +script = ExtResource("1_kc0s3") +scene = ExtResource("6_iipq0") +overrides = {} + +[sub_resource type="Resource" id="Resource_nalij"] +script = ExtResource("1_kc0s3") +scene = ExtResource("7_jxwbe") +overrides = { +"font_size_custom": "30.0", +"text_color_disabled": "Color(0.605469, 0.605469, 0.605469, 1)", +"text_color_focused": "Color(1, 0.628906, 0.628906, 1)", +"text_color_hovered": "Color(0.882353, 0.572549, 0.572549, 1)", +"text_color_pressed": "Color(1, 0.882812, 0.53125, 1)", +"text_color_use_global": "false" +} + +[sub_resource type="Resource" id="Resource_ymn1b"] +script = ExtResource("1_kc0s3") +scene = ExtResource("8_4ig6v") +overrides = {} + +[sub_resource type="Resource" id="Resource_8j3qh"] +script = ExtResource("1_kc0s3") +scene = ExtResource("9_gni8k") +overrides = {} + +[sub_resource type="Resource" id="Resource_uu1x2"] +script = ExtResource("1_kc0s3") +scene = ExtResource("6_iipq0") +overrides = {} + +[resource] +script = ExtResource("10_l174f") +name = "vesna_style" +layer_list = Array[String](["10", "11", "12", "13", "14", "15", "16", "17", "18"]) +layer_info = { +"": SubResource("Resource_qnla8"), +"10": SubResource("Resource_awdqn"), +"11": SubResource("Resource_5pou4"), +"12": SubResource("Resource_6xrvb"), +"13": SubResource("Resource_k1327"), +"14": SubResource("Resource_qtijl"), +"15": SubResource("Resource_nalij"), +"16": SubResource("Resource_ymn1b"), +"17": SubResource("Resource_8j3qh"), +"18": SubResource("Resource_uu1x2") +} +base_overrides = {} +layers = Array[ExtResource("1_kc0s3")]([]) +metadata/_latest_layer = "13" diff --git a/audio/default_bus_layout.tres b/audio/default_bus_layout.tres index 5b24443..0a60bf8 100644 --- a/audio/default_bus_layout.tres +++ b/audio/default_bus_layout.tres @@ -1,12 +1,12 @@ [gd_resource type="AudioBusLayout" format=3 uid="uid://b6dwkmkyb0axk"] [resource] -bus/0/volume_db = -5.93075 +bus/0/volume_db = -18.9844 bus/1/name = &"Music" bus/1/solo = false bus/1/mute = false bus/1/bypass_fx = false -bus/1/volume_db = -17.6573 +bus/1/volume_db = -8.39524 bus/1/send = &"Master" bus/2/name = &"SFX" bus/2/solo = false diff --git a/dialog/Characters/vesna.dch b/dialog/Characters/vesna.dch index e452b0c..820a91f 100644 --- a/dialog/Characters/vesna.dch +++ b/dialog/Characters/vesna.dch @@ -17,7 +17,7 @@ "volume_variance": 0.0 } }, -"style": "NPC_narrative" +"style": "vesna_style" }, &"default_portrait": "front", &"description": "The main character. ", diff --git a/dialog/NPC_narrative.tres b/dialog/NPC_narrative.tres index d1b0157..8d2e8b1 100644 --- a/dialog/NPC_narrative.tres +++ b/dialog/NPC_narrative.tres @@ -1,6 +1,7 @@ -[gd_resource type="Resource" script_class="DialogicStyle" load_steps=21 format=3 uid="uid://f7q6jac5tsk8"] +[gd_resource type="Resource" script_class="DialogicStyle" load_steps=22 format=3 uid="uid://f7q6jac5tsk8"] [ext_resource type="Script" uid="uid://dfx2htp24tuvm" path="res://addons/dialogic/Resources/dialogic_style_layer.gd" id="1_0jwhi"] +[ext_resource type="PackedScene" uid="uid://cqpb3ie51rwl5" path="res://addons/dialogic/Modules/DefaultLayoutParts/Base_Default/default_layout_base.tscn" id="1_8wrfq"] [ext_resource type="PackedScene" uid="uid://c1k5m0w3r40xf" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_FullBackground/full_background_layer.tscn" id="2_8wrfq"] [ext_resource type="PackedScene" uid="uid://cy1y14inwkplb" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_VN_Portraits/vn_portrait_layer.tscn" id="3_t7aeg"] [ext_resource type="PackedScene" uid="uid://cn674foxwedqu" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_Input/full_advance_input_layer.tscn" id="4_85y6g"] @@ -13,6 +14,7 @@ [sub_resource type="Resource" id="Resource_wg0yj"] script = ExtResource("1_0jwhi") +scene = ExtResource("1_8wrfq") overrides = { "global_bg_color": "Color(0.898375, 0.917922, 0.835355, 1)", "global_font_color": "Color(0.257812, 0.125248, 0.0533752, 1)", @@ -103,4 +105,4 @@ layer_info = { } base_overrides = {} layers = Array[ExtResource("1_0jwhi")]([]) -metadata/_latest_layer = "" +metadata/_latest_layer = "13" diff --git a/dialog/Scene1_farm_outside/yeli_intro_05.dtl b/dialog/Scene1_farm_outside/yeli_intro_05.dtl index 2daadc0..e1037f1 100644 --- a/dialog/Scene1_farm_outside/yeli_intro_05.dtl +++ b/dialog/Scene1_farm_outside/yeli_intro_05.dtl @@ -1,5 +1,5 @@ [quest_complete quest_resource="res://resources/quests/demo/7_talk_yeli_inside_1.tres"] -join Yeli center +join Yeli right Yeli: Thank you for your help out there. Yeli: You must be tired. Please rest. I prepared a bed for you. It's in the room to the left. Yeli: There is nothing interesting to see here. diff --git a/dialog/Scene2_farm_inside/quest4_dinner.dtl b/dialog/Scene2_farm_inside/quest4_dinner.dtl index e40074e..dbbc8d6 100644 --- a/dialog/Scene2_farm_inside/quest4_dinner.dtl +++ b/dialog/Scene2_farm_inside/quest4_dinner.dtl @@ -1,5 +1,5 @@ -join Yeli center -join vesna center +join Yeli right +join vesna left Everyone: Smachnoho! vesna: Lovely soup, Yeli! Yeli (_part_side): God bless you, my child! That’s also thanks to you. diff --git a/dialog/quests/beetroot/quest3_beets_end.dtl b/dialog/quests/beetroot/quest3_beets_end.dtl index 0dcdbf2..c67accf 100644 --- a/dialog/quests/beetroot/quest3_beets_end.dtl +++ b/dialog/quests/beetroot/quest3_beets_end.dtl @@ -1,5 +1,5 @@ -join Yeli center -join vesna center +join Yeli right +join vesna left Yeli (_part_side): Wow! So many? Yeli (_part_side): Good job! Put it in the kettle! [wait_input] diff --git a/dialog/quests/beetroot/quest3_beets_interim.dtl b/dialog/quests/beetroot/quest3_beets_interim.dtl index 4292adc..66eb447 100644 --- a/dialog/quests/beetroot/quest3_beets_interim.dtl +++ b/dialog/quests/beetroot/quest3_beets_interim.dtl @@ -1,4 +1,4 @@ -join vesna center +join vesna left join Domovoi center vesna: Oh no, most of the beets aren’t ripe yet. Domovoi: Pssss! diff --git a/dialog/quests/ducks/quest1_ducks_end.dtl b/dialog/quests/ducks/quest1_ducks_end.dtl index a4bf76a..ccc9445 100644 --- a/dialog/quests/ducks/quest1_ducks_end.dtl +++ b/dialog/quests/ducks/quest1_ducks_end.dtl @@ -1,5 +1,5 @@ -join vesna center +join vesna left [quest_complete quest_resource="res://resources/quests/demo/2_collect_ducks.tres"] -That’s the last one. I should get back to Yeli. +vesna: That’s the last one. I should get back to Yeli. [quest_activate quest_resource="res://resources/quests/demo/3_talk_yeli_2.tres"] [end_timeline] diff --git a/dialog/quests/forest/quest5_forest_end.dtl b/dialog/quests/forest/quest5_forest_end.dtl index 43b7b58..27cfc4f 100644 --- a/dialog/quests/forest/quest5_forest_end.dtl +++ b/dialog/quests/forest/quest5_forest_end.dtl @@ -1,4 +1,4 @@ -join Chuga center +join Chuga left Chuga: I believe you’ve seen enough for today. Chuga: And yes, you too. Chuga: Thank you for playing! diff --git a/dialog/quests/forest/quest5_forest_start.dtl b/dialog/quests/forest/quest5_forest_start.dtl index 5c78e6f..b8ddf8e 100644 --- a/dialog/quests/forest/quest5_forest_start.dtl +++ b/dialog/quests/forest/quest5_forest_start.dtl @@ -1,6 +1,6 @@ [quest_complete quest_resource="res://resources/quests/demo/9_talk_to_chuga.tres"] -join vesna center -join Chuga center +join vesna left +join Chuga right Chuga: Look who it is! vesna: Your name was Chuga, right? I want to go to the forest! Chuga: To the forest? After everything the others told you? diff --git a/dialog/quests/tomatoes/quest2_tomatoes_end.dtl b/dialog/quests/tomatoes/quest2_tomatoes_end.dtl index 3b6d971..7c061ae 100644 --- a/dialog/quests/tomatoes/quest2_tomatoes_end.dtl +++ b/dialog/quests/tomatoes/quest2_tomatoes_end.dtl @@ -1,4 +1,4 @@ -join vesna center +join vesna left vesna: I just wish I liked tomatoes more. vesna: Well…Yeli probably started with the cooking. I should go inside. [end_timeline] diff --git a/dialog/quests/tomatoes/quest2_tomatoes_start.dtl b/dialog/quests/tomatoes/quest2_tomatoes_start.dtl index d1878bd..c3e9f03 100644 --- a/dialog/quests/tomatoes/quest2_tomatoes_start.dtl +++ b/dialog/quests/tomatoes/quest2_tomatoes_start.dtl @@ -1,5 +1,5 @@ -join Yeli center -join vesna center +join Yeli right +join vesna left [quest_complete quest_resource="res://resources/quests/demo/3_talk_yeli_2.tres"] Yeli (_part_side): Thank you, my child! Your Yeli is not so agile anymore. vesna: But you’re diligent! You’ve started with the preparation for dinner. diff --git a/project.godot b/project.godot index 2b2c401..baff4e1 100644 --- a/project.godot +++ b/project.godot @@ -75,7 +75,7 @@ variables={ "SHOW": "IGF" } glossary/default_case_sensitive=true -layout/style_list=["res://dialog/NPC_narrative.tres", "res://addons/babushkahelpers/babushka_dialogue_style.tres"] +layout/style_list=["res://dialog/NPC_narrative.tres", "res://addons/babushkahelpers/babushka_dialogue_style.tres", "res://addons/dialogic/vesna_style.tres"] layout/default_style="res://dialog/NPC_narrative.tres" extensions_folder="res://addons/dialogic_additions" text/letter_speed=0.01 @@ -166,6 +166,7 @@ directories/tres_directory={ "tomato": "res://resources/items/tomato.tres", "tomato_seed": "res://resources/items/tomato_seed.tres", "unselected_stylebox": "res://addons/dialogic/Editor/Events/styles/unselected_stylebox.tres", +"vesna_style": "res://addons/dialogic/vesna_style.tres", "vn_textbox_default_panel": "res://addons/dialogic/Modules/DefaultLayoutParts/Layer_VN_Textbox/vn_textbox_default_panel.tres", "vn_textbox_name_label_panel": "res://addons/dialogic/Modules/DefaultLayoutParts/Layer_VN_Textbox/vn_textbox_name_label_panel.tres", "wateringcan": "res://resources/items/wateringcan.tres" diff --git a/scenes/Babushka_scene_farm_outside_2d.tscn b/scenes/Babushka_scene_farm_outside_2d.tscn index 037df54..262cd94 100644 --- a/scenes/Babushka_scene_farm_outside_2d.tscn +++ b/scenes/Babushka_scene_farm_outside_2d.tscn @@ -1111,7 +1111,6 @@ texture = ExtResource("36_l7ekk") region_enabled = true [node name="SeedPickup2" parent="YSorted" instance=ExtResource("25_hukxv")] -visible = false position = Vector2(10892, 2469) _finiteSupply = 3 @@ -2347,6 +2346,24 @@ area_mask = 33 playback_type = 1 script = ExtResource("42_1nkjm") +[node name="Background Music loop2" type="AudioStreamPlayer2D" parent="Audio"] +position = Vector2(4002, 2030) +stream = ExtResource("37_8ey8m") +max_distance = 1e+06 +bus = &"Music" +area_mask = 33 +playback_type = 1 +script = ExtResource("42_1nkjm") + +[node name="Background Music loop2" type="AudioStreamPlayer2D" parent="Audio/Background Music loop2"] +position = Vector2(4002, 2030) +stream = ExtResource("37_8ey8m") +max_distance = 1e+06 +bus = &"Music" +area_mask = 33 +playback_type = 1 +script = ExtResource("42_1nkjm") + [node name="SFX" type="Node" parent="Audio"] [node name="Farming SFX" type="AudioStreamPlayer2D" parent="Audio/SFX"]