From f01143e887680025807b78cac267a3713b47e0d6 Mon Sep 17 00:00:00 2001 From: kziolkowski Date: Thu, 31 Jul 2025 22:09:37 +0200 Subject: [PATCH] cleaned up dialogue structure and removed vesna2 from dialogues --- dialog/{ => Characters}/Chuga.dch | 0 dialog/{ => Characters}/Chuga.dch.uid | 0 dialog/{ => Characters}/Domovoi.dch | 0 dialog/{ => Characters}/Domovoi.dch.uid | 0 dialog/{ => Characters}/Everyone.dch | 0 dialog/{ => Characters}/Everyone.dch.uid | 0 dialog/{ => Characters}/Yeli.dch | 0 dialog/{ => Characters}/Yeli.dch.uid | 0 .../defaulty_the_default_character.dch | 0 .../defaulty_the_default_character.dch.uid | 0 dialog/{ => Characters}/semi_cat.dch | 0 dialog/{ => Characters}/semi_cat.dch.uid | 0 dialog/{ => Characters}/vesna.dch | 0 dialog/{ => Characters}/vesna.dch.uid | 0 .../yeli_intro_01.dtl | 0 .../yeli_intro_01.dtl.uid | 0 .../yeli_intro_02.dtl | 0 .../yeli_intro_02.dtl.uid | 0 .../yeli_intro_03.dtl | 0 .../yeli_intro_03.dtl.uid | 0 .../yeli_intro_04.dtl | 0 .../yeli_intro_04.dtl.uid | 0 .../yeli_intro_05.dtl | 0 .../yeli_intro_05.dtl.uid | 0 .../quest4_dinner.dtl | 10 ++-- .../quest4_dinner.dtl.uid | 0 dialog/Vesna2.dch | 19 -------- dialog/Vesna2.dch.uid | 1 - dialog/quest2_tomatoes_end.dtl | 4 -- .../beetroot}/quest3_beets_end.dtl | 2 +- .../beetroot}/quest3_beets_end.dtl.uid | 0 .../beetroot}/quest3_beets_interim.dtl | 14 +++--- .../beetroot}/quest3_beets_interim.dtl.uid | 0 .../beetroot}/quest3_beets_start.dtl | 0 .../beetroot}/quest3_beets_start.dtl.uid | 0 .../{ => quests/ducks}/quest1_ducks_end.dtl | 0 .../ducks}/quest1_ducks_end.dtl.uid | 0 .../{ => quests/ducks}/quest1_ducks_start.dtl | 0 .../ducks}/quest1_ducks_start.dtl.uid | 0 .../{ => quests/forest}/quest5_forest_end.dtl | 2 +- .../forest}/quest5_forest_end.dtl.uid | 0 .../forest}/quest5_forest_start.dtl | 10 ++-- .../forest}/quest5_forest_start.dtl.uid | 0 .../quests/tomatoes/quest2_tomatoes_end.dtl | 4 ++ .../tomatoes}/quest2_tomatoes_end.dtl.uid | 0 .../tomatoes}/quest2_tomatoes_interim.dtl | 2 +- .../tomatoes}/quest2_tomatoes_interim.dtl.uid | 0 .../tomatoes}/quest2_tomatoes_start.dtl | 8 ++-- .../tomatoes}/quest2_tomatoes_start.dtl.uid | 0 project.godot | 47 +++++++++---------- scenes/Babushka_scene_farm_outside_2d.tscn | 3 +- 51 files changed, 53 insertions(+), 73 deletions(-) rename dialog/{ => Characters}/Chuga.dch (100%) rename dialog/{ => Characters}/Chuga.dch.uid (100%) rename dialog/{ => Characters}/Domovoi.dch (100%) rename dialog/{ => Characters}/Domovoi.dch.uid (100%) rename dialog/{ => Characters}/Everyone.dch (100%) rename dialog/{ => Characters}/Everyone.dch.uid (100%) rename dialog/{ => Characters}/Yeli.dch (100%) rename dialog/{ => Characters}/Yeli.dch.uid (100%) rename dialog/{ => Characters}/defaulty_the_default_character.dch (100%) rename dialog/{ => Characters}/defaulty_the_default_character.dch.uid (100%) rename dialog/{ => Characters}/semi_cat.dch (100%) rename dialog/{ => Characters}/semi_cat.dch.uid (100%) rename dialog/{ => Characters}/vesna.dch (100%) rename dialog/{ => Characters}/vesna.dch.uid (100%) rename dialog/{ => Scene1_farm_outside}/yeli_intro_01.dtl (100%) rename dialog/{ => Scene1_farm_outside}/yeli_intro_01.dtl.uid (100%) rename dialog/{ => Scene1_farm_outside}/yeli_intro_02.dtl (100%) rename dialog/{ => Scene1_farm_outside}/yeli_intro_02.dtl.uid (100%) rename dialog/{ => Scene1_farm_outside}/yeli_intro_03.dtl (100%) rename dialog/{ => Scene1_farm_outside}/yeli_intro_03.dtl.uid (100%) rename dialog/{ => Scene1_farm_outside}/yeli_intro_04.dtl (100%) rename dialog/{ => Scene1_farm_outside}/yeli_intro_04.dtl.uid (100%) rename dialog/{ => Scene1_farm_outside}/yeli_intro_05.dtl (100%) rename dialog/{ => Scene1_farm_outside}/yeli_intro_05.dtl.uid (100%) rename dialog/{ => Scene2_farm_inside}/quest4_dinner.dtl (77%) rename dialog/{ => Scene2_farm_inside}/quest4_dinner.dtl.uid (100%) delete mode 100644 dialog/Vesna2.dch delete mode 100644 dialog/Vesna2.dch.uid delete mode 100644 dialog/quest2_tomatoes_end.dtl rename dialog/{ => quests/beetroot}/quest3_beets_end.dtl (93%) rename dialog/{ => quests/beetroot}/quest3_beets_end.dtl.uid (100%) rename dialog/{ => quests/beetroot}/quest3_beets_interim.dtl (51%) rename dialog/{ => quests/beetroot}/quest3_beets_interim.dtl.uid (100%) rename dialog/{ => quests/beetroot}/quest3_beets_start.dtl (100%) rename dialog/{ => quests/beetroot}/quest3_beets_start.dtl.uid (100%) rename dialog/{ => quests/ducks}/quest1_ducks_end.dtl (100%) rename dialog/{ => quests/ducks}/quest1_ducks_end.dtl.uid (100%) rename dialog/{ => quests/ducks}/quest1_ducks_start.dtl (100%) rename dialog/{ => quests/ducks}/quest1_ducks_start.dtl.uid (100%) rename dialog/{ => quests/forest}/quest5_forest_end.dtl (86%) rename dialog/{ => quests/forest}/quest5_forest_end.dtl.uid (100%) rename dialog/{ => quests/forest}/quest5_forest_start.dtl (76%) rename dialog/{ => quests/forest}/quest5_forest_start.dtl.uid (100%) create mode 100644 dialog/quests/tomatoes/quest2_tomatoes_end.dtl rename dialog/{ => quests/tomatoes}/quest2_tomatoes_end.dtl.uid (100%) rename dialog/{ => quests/tomatoes}/quest2_tomatoes_interim.dtl (94%) rename dialog/{ => quests/tomatoes}/quest2_tomatoes_interim.dtl.uid (100%) rename dialog/{ => quests/tomatoes}/quest2_tomatoes_start.dtl (59%) rename dialog/{ => quests/tomatoes}/quest2_tomatoes_start.dtl.uid (100%) diff --git a/dialog/Chuga.dch b/dialog/Characters/Chuga.dch similarity index 100% rename from dialog/Chuga.dch rename to dialog/Characters/Chuga.dch diff --git a/dialog/Chuga.dch.uid b/dialog/Characters/Chuga.dch.uid similarity index 100% rename from dialog/Chuga.dch.uid rename to dialog/Characters/Chuga.dch.uid diff --git a/dialog/Domovoi.dch b/dialog/Characters/Domovoi.dch similarity index 100% rename from dialog/Domovoi.dch rename to dialog/Characters/Domovoi.dch diff --git a/dialog/Domovoi.dch.uid b/dialog/Characters/Domovoi.dch.uid similarity index 100% rename from dialog/Domovoi.dch.uid rename to dialog/Characters/Domovoi.dch.uid diff --git a/dialog/Everyone.dch b/dialog/Characters/Everyone.dch similarity index 100% rename from dialog/Everyone.dch rename to dialog/Characters/Everyone.dch diff --git a/dialog/Everyone.dch.uid b/dialog/Characters/Everyone.dch.uid similarity index 100% rename from dialog/Everyone.dch.uid rename to dialog/Characters/Everyone.dch.uid diff --git a/dialog/Yeli.dch b/dialog/Characters/Yeli.dch similarity index 100% rename from dialog/Yeli.dch rename to dialog/Characters/Yeli.dch diff --git a/dialog/Yeli.dch.uid b/dialog/Characters/Yeli.dch.uid similarity index 100% rename from dialog/Yeli.dch.uid rename to dialog/Characters/Yeli.dch.uid diff --git a/dialog/defaulty_the_default_character.dch b/dialog/Characters/defaulty_the_default_character.dch similarity index 100% rename from dialog/defaulty_the_default_character.dch rename to dialog/Characters/defaulty_the_default_character.dch diff --git a/dialog/defaulty_the_default_character.dch.uid b/dialog/Characters/defaulty_the_default_character.dch.uid similarity index 100% rename from dialog/defaulty_the_default_character.dch.uid rename to dialog/Characters/defaulty_the_default_character.dch.uid diff --git a/dialog/semi_cat.dch b/dialog/Characters/semi_cat.dch similarity index 100% rename from dialog/semi_cat.dch rename to dialog/Characters/semi_cat.dch diff --git a/dialog/semi_cat.dch.uid b/dialog/Characters/semi_cat.dch.uid similarity index 100% rename from dialog/semi_cat.dch.uid rename to dialog/Characters/semi_cat.dch.uid diff --git a/dialog/vesna.dch b/dialog/Characters/vesna.dch similarity index 100% rename from dialog/vesna.dch rename to dialog/Characters/vesna.dch diff --git a/dialog/vesna.dch.uid b/dialog/Characters/vesna.dch.uid similarity index 100% rename from dialog/vesna.dch.uid rename to dialog/Characters/vesna.dch.uid diff --git a/dialog/yeli_intro_01.dtl b/dialog/Scene1_farm_outside/yeli_intro_01.dtl similarity index 100% rename from dialog/yeli_intro_01.dtl rename to dialog/Scene1_farm_outside/yeli_intro_01.dtl diff --git a/dialog/yeli_intro_01.dtl.uid b/dialog/Scene1_farm_outside/yeli_intro_01.dtl.uid similarity index 100% rename from dialog/yeli_intro_01.dtl.uid rename to dialog/Scene1_farm_outside/yeli_intro_01.dtl.uid diff --git a/dialog/yeli_intro_02.dtl b/dialog/Scene1_farm_outside/yeli_intro_02.dtl similarity index 100% rename from dialog/yeli_intro_02.dtl rename to dialog/Scene1_farm_outside/yeli_intro_02.dtl diff --git a/dialog/yeli_intro_02.dtl.uid b/dialog/Scene1_farm_outside/yeli_intro_02.dtl.uid similarity index 100% rename from dialog/yeli_intro_02.dtl.uid rename to dialog/Scene1_farm_outside/yeli_intro_02.dtl.uid diff --git a/dialog/yeli_intro_03.dtl b/dialog/Scene1_farm_outside/yeli_intro_03.dtl similarity index 100% rename from dialog/yeli_intro_03.dtl rename to dialog/Scene1_farm_outside/yeli_intro_03.dtl diff --git a/dialog/yeli_intro_03.dtl.uid b/dialog/Scene1_farm_outside/yeli_intro_03.dtl.uid similarity index 100% rename from dialog/yeli_intro_03.dtl.uid rename to dialog/Scene1_farm_outside/yeli_intro_03.dtl.uid diff --git a/dialog/yeli_intro_04.dtl b/dialog/Scene1_farm_outside/yeli_intro_04.dtl similarity index 100% rename from dialog/yeli_intro_04.dtl rename to dialog/Scene1_farm_outside/yeli_intro_04.dtl diff --git a/dialog/yeli_intro_04.dtl.uid b/dialog/Scene1_farm_outside/yeli_intro_04.dtl.uid similarity index 100% rename from dialog/yeli_intro_04.dtl.uid rename to dialog/Scene1_farm_outside/yeli_intro_04.dtl.uid diff --git a/dialog/yeli_intro_05.dtl b/dialog/Scene1_farm_outside/yeli_intro_05.dtl similarity index 100% rename from dialog/yeli_intro_05.dtl rename to dialog/Scene1_farm_outside/yeli_intro_05.dtl diff --git a/dialog/yeli_intro_05.dtl.uid b/dialog/Scene1_farm_outside/yeli_intro_05.dtl.uid similarity index 100% rename from dialog/yeli_intro_05.dtl.uid rename to dialog/Scene1_farm_outside/yeli_intro_05.dtl.uid diff --git a/dialog/quest4_dinner.dtl b/dialog/Scene2_farm_inside/quest4_dinner.dtl similarity index 77% rename from dialog/quest4_dinner.dtl rename to dialog/Scene2_farm_inside/quest4_dinner.dtl index 05b1406..e40074e 100644 --- a/dialog/quest4_dinner.dtl +++ b/dialog/Scene2_farm_inside/quest4_dinner.dtl @@ -1,18 +1,18 @@ join Yeli center -join Vesna2 center +join vesna center Everyone: Smachnoho! -Vesna2: Lovely soup, Yeli! +vesna: Lovely soup, Yeli! Yeli (_part_side): God bless you, my child! That’s also thanks to you. -Vesna2: So, how do you like it in Lasnoye so far? +vesna: So, how do you like it in Lasnoye so far? - It feels different from when Vasily and I used to live here. - It’s just as I remembered it. Yeli (_part_side): Indeed, it is. Yeli (_part_side): Since the evacuation, Lasnoye and its people had to adapt to…new circumstances. Yeli (_part_side): But at its core, it’s still our motherland from back then. -Vesna2: …And the forest? Has anyone tried to go back and-- +vesna: …And the forest? Has anyone tried to go back and-- Yeli (_part_side): The forest is strictly off-limits! Yeli (_part_side): Dragana forbids it. Yeli (_part_side): The grime turned the forest into a dangerous place. Yeli (_part_side): But here you’re safe. After all, you can always count on your Yeli! -Vesna2: In that case, pass me some more soup! +vesna: In that case, pass me some more soup! [end_timeline] diff --git a/dialog/quest4_dinner.dtl.uid b/dialog/Scene2_farm_inside/quest4_dinner.dtl.uid similarity index 100% rename from dialog/quest4_dinner.dtl.uid rename to dialog/Scene2_farm_inside/quest4_dinner.dtl.uid diff --git a/dialog/Vesna2.dch b/dialog/Vesna2.dch deleted file mode 100644 index 090ef1e..0000000 --- a/dialog/Vesna2.dch +++ /dev/null @@ -1,19 +0,0 @@ -{ -"@path": "res://addons/dialogic/Resources/character.gd", -"@subpath": NodePath(""), -&"_translation_id": "", -&"color": Color(1, 1, 1, 1), -&"custom_info": { -"sound_mood_default": "", -"sound_moods": {}, -"style": "NPC_narrative" -}, -&"default_portrait": "", -&"description": "Main character", -&"display_name": "Vesna2", -&"mirror": false, -&"nicknames": [""], -&"offset": Vector2(0, 0), -&"portraits": {}, -&"scale": 1.0 -} \ No newline at end of file diff --git a/dialog/Vesna2.dch.uid b/dialog/Vesna2.dch.uid deleted file mode 100644 index 435f2ed..0000000 --- a/dialog/Vesna2.dch.uid +++ /dev/null @@ -1 +0,0 @@ -uid://c0vfdx7xal0py diff --git a/dialog/quest2_tomatoes_end.dtl b/dialog/quest2_tomatoes_end.dtl deleted file mode 100644 index 3989def..0000000 --- a/dialog/quest2_tomatoes_end.dtl +++ /dev/null @@ -1,4 +0,0 @@ -join Vesna2 center -Vesna2: I just wish I liked tomatoes more. -Vesna2: Well…Yeli probably started with the cooking. I should go inside. -[end_timeline] diff --git a/dialog/quest3_beets_end.dtl b/dialog/quests/beetroot/quest3_beets_end.dtl similarity index 93% rename from dialog/quest3_beets_end.dtl rename to dialog/quests/beetroot/quest3_beets_end.dtl index 2fdf181..0dcdbf2 100644 --- a/dialog/quest3_beets_end.dtl +++ b/dialog/quests/beetroot/quest3_beets_end.dtl @@ -1,5 +1,5 @@ join Yeli center -join Vesna2 center +join vesna center Yeli (_part_side): Wow! So many? Yeli (_part_side): Good job! Put it in the kettle! [wait_input] diff --git a/dialog/quest3_beets_end.dtl.uid b/dialog/quests/beetroot/quest3_beets_end.dtl.uid similarity index 100% rename from dialog/quest3_beets_end.dtl.uid rename to dialog/quests/beetroot/quest3_beets_end.dtl.uid diff --git a/dialog/quest3_beets_interim.dtl b/dialog/quests/beetroot/quest3_beets_interim.dtl similarity index 51% rename from dialog/quest3_beets_interim.dtl rename to dialog/quests/beetroot/quest3_beets_interim.dtl index 3b661ad..4292adc 100644 --- a/dialog/quest3_beets_interim.dtl +++ b/dialog/quests/beetroot/quest3_beets_interim.dtl @@ -1,15 +1,15 @@ -join Vesna2 center +join vesna center join Domovoi center -Vesna2: Oh no, most of the beets aren’t ripe yet. +vesna: Oh no, most of the beets aren’t ripe yet. Domovoi: Pssss! Domovoi: Yeah, you! Domovoi: The code word is “Rosty Rosty” -Vesna2: What? +vesna: What? Domovoi: Just say it! -Vesna2: Rosty…rosty? +vesna: Rosty…rosty? # Hier wächst die rote Beete magisch. Mit einem Signal/Ereignis? [signal arg="MagicWord"] -Vesna2: It worked! How did it work? -Vesna2: Thank y…and he’s gone. -What a truly quirky individual. +vesna: It worked! How did it work? +vesna: Thank y…and he’s gone. +vesna: What a truly quirky individual. [end_timeline] diff --git a/dialog/quest3_beets_interim.dtl.uid b/dialog/quests/beetroot/quest3_beets_interim.dtl.uid similarity index 100% rename from dialog/quest3_beets_interim.dtl.uid rename to dialog/quests/beetroot/quest3_beets_interim.dtl.uid diff --git a/dialog/quest3_beets_start.dtl b/dialog/quests/beetroot/quest3_beets_start.dtl similarity index 100% rename from dialog/quest3_beets_start.dtl rename to dialog/quests/beetroot/quest3_beets_start.dtl diff --git a/dialog/quest3_beets_start.dtl.uid b/dialog/quests/beetroot/quest3_beets_start.dtl.uid similarity index 100% rename from dialog/quest3_beets_start.dtl.uid rename to dialog/quests/beetroot/quest3_beets_start.dtl.uid diff --git a/dialog/quest1_ducks_end.dtl b/dialog/quests/ducks/quest1_ducks_end.dtl similarity index 100% rename from dialog/quest1_ducks_end.dtl rename to dialog/quests/ducks/quest1_ducks_end.dtl diff --git a/dialog/quest1_ducks_end.dtl.uid b/dialog/quests/ducks/quest1_ducks_end.dtl.uid similarity index 100% rename from dialog/quest1_ducks_end.dtl.uid rename to dialog/quests/ducks/quest1_ducks_end.dtl.uid diff --git a/dialog/quest1_ducks_start.dtl b/dialog/quests/ducks/quest1_ducks_start.dtl similarity index 100% rename from dialog/quest1_ducks_start.dtl rename to dialog/quests/ducks/quest1_ducks_start.dtl diff --git a/dialog/quest1_ducks_start.dtl.uid b/dialog/quests/ducks/quest1_ducks_start.dtl.uid similarity index 100% rename from dialog/quest1_ducks_start.dtl.uid rename to dialog/quests/ducks/quest1_ducks_start.dtl.uid diff --git a/dialog/quest5_forest_end.dtl b/dialog/quests/forest/quest5_forest_end.dtl similarity index 86% rename from dialog/quest5_forest_end.dtl rename to dialog/quests/forest/quest5_forest_end.dtl index c111d19..6ba59d5 100644 --- a/dialog/quest5_forest_end.dtl +++ b/dialog/quests/forest/quest5_forest_end.dtl @@ -1,6 +1,6 @@ join Chuga center Chuga: I believe you’ve seen enough for today. Chuga: And yes, you too. -Thank you for playing! +vesna: Thank you for playing! do SceneTransition.ChangeSceneToFileThreaded("res://scenes/Babushka_scene_credits.tscn") [end_timeline] diff --git a/dialog/quest5_forest_end.dtl.uid b/dialog/quests/forest/quest5_forest_end.dtl.uid similarity index 100% rename from dialog/quest5_forest_end.dtl.uid rename to dialog/quests/forest/quest5_forest_end.dtl.uid diff --git a/dialog/quest5_forest_start.dtl b/dialog/quests/forest/quest5_forest_start.dtl similarity index 76% rename from dialog/quest5_forest_start.dtl rename to dialog/quests/forest/quest5_forest_start.dtl index ce9dc6f..cf402f6 100644 --- a/dialog/quest5_forest_start.dtl +++ b/dialog/quests/forest/quest5_forest_start.dtl @@ -1,21 +1,21 @@ -join Vesna2 center +join vesna center join Chuga center Chuga: Look who it is! -Vesna2: Your name was Chuga, right? I want to go to the forest! +vesna: Your name was Chuga, right? I want to go to the forest! Chuga: To the forest? After everything the others told you? -Vesna2: Will you let me through? +vesna: Will you let me through? Chuga: Will I? Chuga: Let us have a riddle! Chuga: If you answer correctly, I let you through. Chuga: If not, I let you through anyway. -Vesna2: So, what’s the point of answering? +vesna: So, what’s the point of answering? Chuga: You give me an answer, and I give you something to see in the dark. Chuga: Or are you planning to return with bumps and bruises? Chuga: So, listen\: “I wear a crown, but I’m no king.” Vesna, what am I? - Queen Chuga: What a boring answer. - Tree - That’s it! + Chuga: That’s it! - Soup Chuga: Hate the player, not the game. Chuga: Here you go! diff --git a/dialog/quest5_forest_start.dtl.uid b/dialog/quests/forest/quest5_forest_start.dtl.uid similarity index 100% rename from dialog/quest5_forest_start.dtl.uid rename to dialog/quests/forest/quest5_forest_start.dtl.uid diff --git a/dialog/quests/tomatoes/quest2_tomatoes_end.dtl b/dialog/quests/tomatoes/quest2_tomatoes_end.dtl new file mode 100644 index 0000000..3b6d971 --- /dev/null +++ b/dialog/quests/tomatoes/quest2_tomatoes_end.dtl @@ -0,0 +1,4 @@ +join vesna center +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/quest2_tomatoes_end.dtl.uid b/dialog/quests/tomatoes/quest2_tomatoes_end.dtl.uid similarity index 100% rename from dialog/quest2_tomatoes_end.dtl.uid rename to dialog/quests/tomatoes/quest2_tomatoes_end.dtl.uid diff --git a/dialog/quest2_tomatoes_interim.dtl b/dialog/quests/tomatoes/quest2_tomatoes_interim.dtl similarity index 94% rename from dialog/quest2_tomatoes_interim.dtl rename to dialog/quests/tomatoes/quest2_tomatoes_interim.dtl index d99badc..6d26037 100644 --- a/dialog/quest2_tomatoes_interim.dtl +++ b/dialog/quests/tomatoes/quest2_tomatoes_interim.dtl @@ -1,5 +1,5 @@ join Yeli center -join Vesna2 center +join vesna center Yeli (_part_side): Great! Now I need you to plant some tomatoes! label plant tomatoes Yeli (_part_side): Use the hoe to break up the soil. Then plant the seeds and water the fields. diff --git a/dialog/quest2_tomatoes_interim.dtl.uid b/dialog/quests/tomatoes/quest2_tomatoes_interim.dtl.uid similarity index 100% rename from dialog/quest2_tomatoes_interim.dtl.uid rename to dialog/quests/tomatoes/quest2_tomatoes_interim.dtl.uid diff --git a/dialog/quest2_tomatoes_start.dtl b/dialog/quests/tomatoes/quest2_tomatoes_start.dtl similarity index 59% rename from dialog/quest2_tomatoes_start.dtl rename to dialog/quests/tomatoes/quest2_tomatoes_start.dtl index 6e21977..0741a8f 100644 --- a/dialog/quest2_tomatoes_start.dtl +++ b/dialog/quests/tomatoes/quest2_tomatoes_start.dtl @@ -1,10 +1,10 @@ join Yeli center -join Vesna2 center +join vesna center Yeli (_part_side): Thank you, my child! Your Yeli is not so agile anymore. -Vesna2: But you’re diligent! You’ve started with the preparation for dinner. +vesna: But you’re diligent! You’ve started with the preparation for dinner. Yeli (_part_side): Indeed, I have. -Yeli (_part_side): But, oh my, those ducks messed up the tomatos. +Yeli (_part_side): But, oh my, those ducks messed up the tomatos. Yeli (_part_side): Oh, would you like to assist me? -Vesna2: What do I have to do? +vesna: What do I have to do? Yeli (_part_side): First, take the hoe and watering can over there! Then come back to me! [end_timeline] diff --git a/dialog/quest2_tomatoes_start.dtl.uid b/dialog/quests/tomatoes/quest2_tomatoes_start.dtl.uid similarity index 100% rename from dialog/quest2_tomatoes_start.dtl.uid rename to dialog/quests/tomatoes/quest2_tomatoes_start.dtl.uid diff --git a/project.godot b/project.godot index 1e36fd7..35511fd 100644 --- a/project.godot +++ b/project.godot @@ -34,36 +34,35 @@ FightManagerAutoload="*res://prefabs/fight/fight_manager_autoload.tscn" [dialogic] directories/dch_directory={ -"Chuga": "res://dialog/Chuga.dch", -"Domovoi": "res://dialog/Domovoi.dch", -"Everyone": "res://dialog/Everyone.dch", -"Vesna2": "res://dialog/Vesna2.dch", -"Yeli": "res://dialog/Yeli.dch", -"defaulty_the_default_character": "res://dialog/defaulty_the_default_character.dch", -"semi_cat": "res://dialog/semi_cat.dch", -"vesna": "res://dialog/vesna.dch" +"Chuga": "res://dialog/Characters/Chuga.dch", +"Domovoi": "res://dialog/Characters/Domovoi.dch", +"Everyone": "res://dialog/Characters/Everyone.dch", +"Yeli": "res://dialog/Characters/Yeli.dch", +"defaulty_the_default_character": "res://dialog/Characters/defaulty_the_default_character.dch", +"semi_cat": "res://dialog/Characters/semi_cat.dch", +"vesna": "res://dialog/Characters/vesna.dch" } directories/dtl_directory={ "disclaimer": "res://dialog/disclaimer.dtl", -"quest1_ducks_end": "res://dialog/quest1_ducks_end.dtl", -"quest1_ducks_start": "res://dialog/quest1_ducks_start.dtl", -"quest2_tomatoes_end": "res://dialog/quest2_tomatoes_end.dtl", -"quest2_tomatoes_interim": "res://dialog/quest2_tomatoes_interim.dtl", -"quest2_tomatoes_start": "res://dialog/quest2_tomatoes_start.dtl", -"quest3_beets_end": "res://dialog/quest3_beets_end.dtl", -"quest3_beets_interim": "res://dialog/quest3_beets_interim.dtl", -"quest3_beets_start": "res://dialog/quest3_beets_start.dtl", -"quest4_dinner": "res://dialog/quest4_dinner.dtl", -"quest5_forest_end": "res://dialog/quest5_forest_end.dtl", -"quest5_forest_start": "res://dialog/quest5_forest_start.dtl", +"quest1_ducks_end": "res://dialog/quests/ducks/quest1_ducks_end.dtl", +"quest1_ducks_start": "res://dialog/quests/ducks/quest1_ducks_start.dtl", +"quest2_tomatoes_end": "res://dialog/quests/tomatoes/quest2_tomatoes_end.dtl", +"quest2_tomatoes_interim": "res://dialog/quests/tomatoes/quest2_tomatoes_interim.dtl", +"quest2_tomatoes_start": "res://dialog/quests/tomatoes/quest2_tomatoes_start.dtl", +"quest3_beets_end": "res://dialog/quests/beetroot/quest3_beets_end.dtl", +"quest3_beets_interim": "res://dialog/quests/beetroot/quest3_beets_interim.dtl", +"quest3_beets_start": "res://dialog/quests/beetroot/quest3_beets_start.dtl", +"quest4_dinner": "res://dialog/Scene2_farm_inside/quest4_dinner.dtl", +"quest5_forest_end": "res://dialog/quests/forest/quest5_forest_end.dtl", +"quest5_forest_start": "res://dialog/quests/forest/quest5_forest_start.dtl", "semi_cat": "res://dialog/semi_cat.dtl", "talk_to_plant": "res://dialog/talk_to_plant.dtl", "test_time_line": "res://dialog/test_time_line.dtl", -"yeli_intro_01": "res://dialog/yeli_intro_01.dtl", -"yeli_intro_02": "res://dialog/yeli_intro_02.dtl", -"yeli_intro_03": "res://dialog/yeli_intro_03.dtl", -"yeli_intro_04": "res://dialog/yeli_intro_04.dtl", -"yeli_intro_05": "res://dialog/yeli_intro_05.dtl" +"yeli_intro_01": "res://dialog/Scene1_farm_outside/yeli_intro_01.dtl", +"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" } variables={ "MAGICWORD": "Hokus Pokus!s", diff --git a/scenes/Babushka_scene_farm_outside_2d.tscn b/scenes/Babushka_scene_farm_outside_2d.tscn index 8cf2734..d259499 100644 --- a/scenes/Babushka_scene_farm_outside_2d.tscn +++ b/scenes/Babushka_scene_farm_outside_2d.tscn @@ -2095,10 +2095,11 @@ rotation = 1.5708 scale = Vector2(0.1, 10.8) texture = ExtResource("21_if5vh") -[node name="FieldParent" type="Node2D" parent="YSorted/Farm visuals" node_paths=PackedStringArray("_allowedArea")] +[node name="FieldParent" type="Node2D" parent="YSorted/Farm visuals" node_paths=PackedStringArray("fields", "_allowedArea")] position = Vector2(53, 20) scale = Vector2(1, 0.993819) script = ExtResource("25_0qu0h") +fields = {} _allowedArea = NodePath("Area2D") metadata/_custom_type_script = "uid://dhxtdhfqx3bte"