diff --git a/Babushka.csproj b/Babushka.csproj
index 70c0d51..76acd77 100644
--- a/Babushka.csproj
+++ b/Babushka.csproj
@@ -4,4 +4,7 @@
true
enable
+
+
+
\ No newline at end of file
diff --git a/addons/dialogic/New_File.tres b/addons/dialogic/New_File.tres
new file mode 100644
index 0000000..69b8a3a
--- /dev/null
+++ b/addons/dialogic/New_File.tres
@@ -0,0 +1,19 @@
+[gd_resource type="Resource" script_class="DialogicStyle" load_steps=4 format=3 uid="uid://d0w0cnruamnn1"]
+
+[ext_resource type="Script" uid="uid://dfx2htp24tuvm" path="res://addons/dialogic/Resources/dialogic_style_layer.gd" id="1_tjdw8"]
+[ext_resource type="Script" uid="uid://b14h380mah4av" path="res://addons/dialogic/Resources/dialogic_style.gd" id="2_ae84x"]
+
+[sub_resource type="Resource" id="Resource_qrxdt"]
+script = ExtResource("1_tjdw8")
+overrides = {}
+
+[resource]
+script = ExtResource("2_ae84x")
+name = "New_File"
+layer_list = Array[String]([])
+layer_info = {
+"": SubResource("Resource_qrxdt")
+}
+base_overrides = {}
+layers = Array[ExtResource("1_tjdw8")]([])
+metadata/_latest_layer = ""
diff --git a/dialog/Babushka_NPC_Namebox_background.tres b/dialog/Babushka_NPC_Namebox_background.tres
new file mode 100644
index 0000000..9180e7f
--- /dev/null
+++ b/dialog/Babushka_NPC_Namebox_background.tres
@@ -0,0 +1,11 @@
+[gd_resource type="StyleBoxTexture" load_steps=2 format=3 uid="uid://c3t3agaqj5tii"]
+
+[ext_resource type="Texture2D" uid="uid://deitc84w2byyh" path="res://art/ui/nametag.png" id="1_jsn7j"]
+
+[resource]
+content_margin_left = 40.0
+content_margin_right = 40.0
+texture = ExtResource("1_jsn7j")
+texture_margin_left = 20.0
+texture_margin_right = 20.0
+axis_stretch_vertical = 2
diff --git a/dialog/NPC_narrative.tres b/dialog/NPC_narrative.tres
new file mode 100644
index 0000000..7c85383
--- /dev/null
+++ b/dialog/NPC_narrative.tres
@@ -0,0 +1,90 @@
+[gd_resource type="Resource" script_class="DialogicStyle" load_steps=20 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://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"]
+[ext_resource type="PackedScene" uid="uid://bquja8jyk8kbr" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_VN_Textbox/vn_textbox_layer.tscn" id="5_reo2u"]
+[ext_resource type="PackedScene" uid="uid://dsbwnp5hegnu3" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_Glossary/glossary_popup_layer.tscn" id="6_i6h15"]
+[ext_resource type="PackedScene" uid="uid://dhk6j6eb6e3q" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_VN_Choices/vn_choice_layer.tscn" id="7_rg32j"]
+[ext_resource type="PackedScene" uid="uid://cvgf4c6gg0tsy" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_TextInput/text_input_layer.tscn" id="8_h83v4"]
+[ext_resource type="PackedScene" uid="uid://lx24i8fl6uo" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_History/history_layer.tscn" id="9_4c2uo"]
+[ext_resource type="Script" uid="uid://b14h380mah4av" path="res://addons/dialogic/Resources/dialogic_style.gd" id="10_e3ue2"]
+
+[sub_resource type="Resource" id="Resource_wg0yj"]
+script = ExtResource("1_0jwhi")
+overrides = {
+"global_bg_color": "Color(0.898375, 0.917922, 0.835355, 1)",
+"global_font_color": "Color(0.242786, 0.16463, 0.180255, 1)",
+"global_font_size": "20.0"
+}
+
+[sub_resource type="Resource" id="Resource_uxnk3"]
+script = ExtResource("1_0jwhi")
+scene = ExtResource("2_8wrfq")
+overrides = {}
+
+[sub_resource type="Resource" id="Resource_ihoat"]
+script = ExtResource("1_0jwhi")
+scene = ExtResource("3_t7aeg")
+overrides = {}
+
+[sub_resource type="Resource" id="Resource_pw0bl"]
+script = ExtResource("1_0jwhi")
+scene = ExtResource("4_85y6g")
+overrides = {}
+
+[sub_resource type="Resource" id="Resource_lfav5"]
+script = ExtResource("1_0jwhi")
+scene = ExtResource("5_reo2u")
+overrides = {
+"box_animation_in": "1",
+"box_animation_out": "1",
+"name_label_alignment": "2",
+"name_label_box_modulate": "Color(1, 1, 1, 1)",
+"name_label_box_panel": "\"res://dialog/Babushka_NPC_Namebox_background.tres\"",
+"name_label_use_global_color": "false",
+"next_indicator_enabled": "false",
+"text_alignment": "1",
+"text_size": "20.0",
+"typing_sounds_end_sound": "\"res://audio/sfx/UI/Dialog/SFX_Dialog_Open_01.wav\""
+}
+
+[sub_resource type="Resource" id="Resource_clhbu"]
+script = ExtResource("1_0jwhi")
+scene = ExtResource("6_i6h15")
+overrides = {}
+
+[sub_resource type="Resource" id="Resource_umvdi"]
+script = ExtResource("1_0jwhi")
+scene = ExtResource("7_rg32j")
+overrides = {}
+
+[sub_resource type="Resource" id="Resource_ci2ul"]
+script = ExtResource("1_0jwhi")
+scene = ExtResource("8_h83v4")
+overrides = {}
+
+[sub_resource type="Resource" id="Resource_sadu5"]
+script = ExtResource("1_0jwhi")
+scene = ExtResource("9_4c2uo")
+overrides = {}
+
+[resource]
+script = ExtResource("10_e3ue2")
+name = "NPC_narrative"
+layer_list = Array[String](["10", "11", "12", "13", "14", "15", "16", "17"])
+layer_info = {
+"": SubResource("Resource_wg0yj"),
+"10": SubResource("Resource_uxnk3"),
+"11": SubResource("Resource_ihoat"),
+"12": SubResource("Resource_pw0bl"),
+"13": SubResource("Resource_lfav5"),
+"14": SubResource("Resource_clhbu"),
+"15": SubResource("Resource_umvdi"),
+"16": SubResource("Resource_ci2ul"),
+"17": SubResource("Resource_sadu5")
+}
+base_overrides = {}
+layers = Array[ExtResource("1_0jwhi")]([])
+metadata/_latest_layer = ""
diff --git a/dialog/Yeli.dch b/dialog/Yeli.dch
index 75af8b8..ac1d001 100644
--- a/dialog/Yeli.dch
+++ b/dialog/Yeli.dch
@@ -6,14 +6,14 @@
&"custom_info": {
"sound_mood_default": "",
"sound_moods": {},
-"style": "speechbubble"
+"style": "NPC_narrative"
},
&"default_portrait": "_part_side",
-&"description": "",
+&"description": "Vesna's bff",
&"display_name": "Yelizaveta",
&"mirror": false,
&"nicknames": ["Yeli"],
-&"offset": Vector2(0, 0),
+&"offset": Vector2(300, 0),
&"portraits": {
"_back": {
"export_overrides": {
@@ -52,5 +52,5 @@
"scene": ""
}
},
-&"scale": 0.5
+&"scale": 0.6
}
\ No newline at end of file
diff --git a/dialog/farming_equipment_glossary.tres b/dialog/farming_equipment_glossary.tres
new file mode 100644
index 0000000..e31fa64
--- /dev/null
+++ b/dialog/farming_equipment_glossary.tres
@@ -0,0 +1,19 @@
+[gd_resource type="Resource" script_class="DialogicGlossary" load_steps=2 format=3 uid="uid://cpnbos25tejo8"]
+
+[ext_resource type="Script" uid="uid://co4irn75jvpwn" path="res://addons/dialogic/Modules/Glossary/glossary_resource.gd" id="1_cknfu"]
+
+[resource]
+script = ExtResource("1_cknfu")
+entries = {
+"Hoe": "hoe",
+"hoe": {
+"alternatives": ["Hoe"],
+"case_sensitive": false,
+"name": "hoe",
+"text": "A farming implement to till soil and prepare it for planting. Not to confuse with the rake, which softly scratches the surface of the ground and can be used to gather leaves and freshly cut grass.",
+"title": "Hoe"
+}
+}
+enabled = true
+_translation_id = ""
+_translation_keys = {}
diff --git a/dialog/speechbubble.tres b/dialog/speechbubble.tres
index a7433ac..013a654 100644
--- a/dialog/speechbubble.tres
+++ b/dialog/speechbubble.tres
@@ -34,4 +34,4 @@ layer_info = {
}
base_overrides = {}
layers = Array[ExtResource("1_6h8ua")]([])
-metadata/_latest_layer = ""
+metadata/_latest_layer = "11"
diff --git a/dialog/yeli_intro_01.dtl b/dialog/yeli_intro_01.dtl
index 33a5809..60185e2 100644
--- a/dialog/yeli_intro_01.dtl
+++ b/dialog/yeli_intro_01.dtl
@@ -1,2 +1,15 @@
join Yeli center
Yeli (_part_side): Hi Vesna! Nice to see you!
+Yeli: It's been so long!
+[text_input text="How have you been?" var="PLAYERMOOD" placeholder="Awesome!" default="Good" allow_empty="true"]
+Yeli: It's nice to hear that you've been {PLAYERMOOD}.
+Yeli: There is so much to do on the farm. Would you like to help me?
+- Absolutely!
+ Yeli: That's what I like to hear!
+- Yes!
+ Yeli: Very good!
+- When do I start?
+ Yeli: Awesome!
+Yeli: Ok then let's start with the tilling. In order to till the soil and plant something, you need a hoe.
+Yeli: You can find it leaning against the back fence somewhere. Pick it up and come back to me.
+leave Yeli
diff --git a/prefabs/UI/Inventory/Inventory.tscn b/prefabs/UI/Inventory/Inventory.tscn
index d916cac..b40e40d 100644
--- a/prefabs/UI/Inventory/Inventory.tscn
+++ b/prefabs/UI/Inventory/Inventory.tscn
@@ -1,15 +1,21 @@
-[gd_scene load_steps=6 format=3 uid="uid://cgjc4wurbgimy"]
+[gd_scene load_steps=7 format=3 uid="uid://cgjc4wurbgimy"]
[ext_resource type="Script" uid="uid://hg7jay2kt441" path="res://scripts/CSharp/Common/Inventory/InventoryUi.cs" id="1_6wusm"]
[ext_resource type="Texture2D" uid="uid://3ln8aleyxgp1" path="res://art/ui/UI/UI_bag_export_01.png" id="3_vvo7l"]
[ext_resource type="Texture2D" uid="uid://dcidjcsqk12p1" path="res://art/ui/UI/UI_bag_export_02.png" id="4_df8i8"]
[ext_resource type="Texture2D" uid="uid://c7wqla0mbu3np" path="res://art/ui/babushka_ui_tmp_inventory_select.png" id="4_tiss4"]
[ext_resource type="PackedScene" uid="uid://c0kmdjeqkqrwv" path="res://prefabs/UI/Inventory/Slot.tscn" id="5_u7kje"]
+[ext_resource type="Script" uid="uid://cvkw4qd2hxksi" path="res://prefabs/UI/Inventory/dialogic_toggle.gd" id="6_n5apg"]
[node name="CanvasLayer" type="CanvasLayer"]
layer = 90
follow_viewport_enabled = true
+[node name="DialogicToggle" type="Node2D" parent="." node_paths=PackedStringArray("itemToToggle")]
+scale = Vector2(0.7, 0.7)
+script = ExtResource("6_n5apg")
+itemToToggle = NodePath("../Inventory")
+
[node name="Inventory" type="Control" parent="."]
layout_mode = 3
anchors_preset = 15
diff --git a/prefabs/UI/Inventory/dialogic_toggle.gd b/prefabs/UI/Inventory/dialogic_toggle.gd
new file mode 100644
index 0000000..0581bc5
--- /dev/null
+++ b/prefabs/UI/Inventory/dialogic_toggle.gd
@@ -0,0 +1,14 @@
+extends Node2D
+class_name dialogic_toggle
+
+@export var itemToToggle: CanvasItem
+
+func _ready() -> void:
+ Dialogic.timeline_ended.connect(_on_timeline_ended)
+ Dialogic.timeline_started.connect(_start_dialog)
+
+func _start_dialog() -> void:
+ itemToToggle.visible = false
+
+func _on_timeline_ended() -> void:
+ itemToToggle.visible = true
diff --git a/prefabs/UI/Inventory/dialogic_toggle.gd.uid b/prefabs/UI/Inventory/dialogic_toggle.gd.uid
new file mode 100644
index 0000000..ca3d3fd
--- /dev/null
+++ b/prefabs/UI/Inventory/dialogic_toggle.gd.uid
@@ -0,0 +1 @@
+uid://cvkw4qd2hxksi
diff --git a/prefabs/characters/Yeli.tscn b/prefabs/characters/Yeli.tscn
index 015bbf5..cea2fe6 100644
--- a/prefabs/characters/Yeli.tscn
+++ b/prefabs/characters/Yeli.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=45 format=3 uid="uid://dfvgp1my5rydh"]
+[gd_scene load_steps=46 format=3 uid="uid://dfvgp1my5rydh"]
[ext_resource type="Texture2D" uid="uid://c34012j5ukiuf" path="res://art/animation/Yeli2D/F01-Yeli_Idle/0001.png" id="1_03m0b"]
[ext_resource type="Script" uid="uid://d2486x6upmwqq" path="res://scripts/GdScript/dialogic_starter.gd" id="1_at1n1"]
@@ -44,6 +44,10 @@
[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"]
+[sub_resource type="CircleShape2D" id="CircleShape2D_at1n1"]
+resource_local_to_scene = true
+radius = 300.0
+
[sub_resource type="SpriteFrames" id="SpriteFrames_f6hss"]
animations = [{
"frames": [{
@@ -183,6 +187,9 @@ script = ExtResource("1_at1n1")
[node name="InteractionArea" parent="." instance=ExtResource("42_ahrat")]
scale = Vector2(1.72, 1.72)
+[node name="CollisionShape3D" parent="InteractionArea/Area2D" index="0"]
+shape = SubResource("CircleShape2D_at1n1")
+
[node name="Label" parent="InteractionArea" index="1"]
visible = true
offset_left = -48.2558
diff --git a/project.godot b/project.godot
index b5df15e..51aedb8 100644
--- a/project.godot
+++ b/project.godot
@@ -32,10 +32,12 @@ directories/dtl_directory={
"test_time_line": "res://dialog/test_time_line.dtl",
"yeli_intro_01": "res://dialog/yeli_intro_01.dtl"
}
-variables={}
+variables={
+"PLAYERMOOD": "Good"
+}
glossary/default_case_sensitive=true
-layout/style_list=["res://dialog/speechbubble.tres"]
-layout/default_style="res://dialog/speechbubble.tres"
+layout/style_list=["res://dialog/NPC_narrative.tres"]
+layout/default_style="res://dialog/NPC_narrative.tres"
extensions_folder="res://addons/dialogic_additions"
text/letter_speed=0.01
text/initial_text_reveal_skippable=true
@@ -67,6 +69,7 @@ translation/intern/translation_folder="res://dialog/translations"
translation/id_counter=22
translation/locales=["de", "en"]
text/autopauses={}
+glossary/glossary_files=["res://dialog/farming_equipment_glossary.tres"]
[display]
@@ -82,7 +85,7 @@ project/assembly_name="Babushka"
[editor]
-movie_writer/movie_file="/home/kaddi/Documents/Repos/Godot/Babushka/clips/clip.avi"
+movie_writer/movie_file="/home/kaddi/Documents/Repos/Godot/Babushka/_clips/clip.avi"
[editor_plugins]
diff --git a/scenes/Babushka_scene_farm_outside_2d.tscn b/scenes/Babushka_scene_farm_outside_2d.tscn
index ad04397..05e939c 100644
--- a/scenes/Babushka_scene_farm_outside_2d.tscn
+++ b/scenes/Babushka_scene_farm_outside_2d.tscn
@@ -921,7 +921,7 @@ shape = SubResource("RectangleShape2D_p6n74")
[node name="CanvasLayer" parent="." instance=ExtResource("32_2nee2")]
follow_viewport_enabled = false
-[node name="Inventory" parent="CanvasLayer" index="0"]
+[node name="Inventory" parent="CanvasLayer" index="1"]
anchors_preset = 7
anchor_left = 0.5
anchor_top = 1.0