Merge remote-tracking branch 'origin/feature_sanel-dialogic' into feature/showcase_kathi

# Conflicts:
#	project.godot
feature/fight_system
kziolkowski 6 months ago
commit e84ef716f6

@ -0,0 +1,19 @@
{
"@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": ""
},
&"default_portrait": "",
&"description": "helpful spirit forest",
&"display_name": "Chuga",
&"mirror": false,
&"nicknames": [""],
&"offset": Vector2(0, 0),
&"portraits": {},
&"scale": 1.0
}

@ -0,0 +1 @@
uid://dkbi4kpwu5o07

@ -0,0 +1,19 @@
{
"@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": ""
},
&"default_portrait": "",
&"description": "Yeli's Domovoi",
&"display_name": "Domovoi",
&"mirror": false,
&"nicknames": [""],
&"offset": Vector2(0, 0),
&"portraits": {},
&"scale": 1.0
}

@ -0,0 +1 @@
uid://75u6ft7n7w0l

@ -0,0 +1,19 @@
{
"@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": ""
},
&"default_portrait": "",
&"description": "",
&"display_name": "Everyone",
&"mirror": false,
&"nicknames": [""],
&"offset": Vector2(0, 0),
&"portraits": {},
&"scale": 1.0
}

@ -0,0 +1 @@
uid://6o18wptg611k

@ -0,0 +1,19 @@
{
"@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
}

@ -0,0 +1 @@
uid://c0vfdx7xal0py

@ -0,0 +1,3 @@
join Vesna2 center
Thats the last one. I should get back to Yeli.
[end_timeline]

@ -0,0 +1 @@
uid://m4koh11hl7dr

@ -0,0 +1,8 @@
join Yeli center
join Vesna2 center
Yeli (_part_side): Come here, you little quacking beast!
- What a mess!
- You havent called me that way yet.
Yeli (_part_side): Vesna, oh, thank goodness!
Yeli (_part_side): Please could you get the runner ducks back into their coop?
[end_timeline]

@ -0,0 +1 @@
uid://8hbdcasjfqe2

@ -0,0 +1,4 @@
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]

@ -0,0 +1 @@
uid://caar10vf25avk

@ -0,0 +1,10 @@
join Yeli center
join Vesna2 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.
Yeli (_part_side): Got it?
- Of course!
- Wait … How do I plant the tomatoes again?
jump plant tomatoes
[end_timeline]

@ -0,0 +1,10 @@
join Yeli center
join Vesna2 center
Yeli (_part_side): Thank you, my child! Your Yeli is not so agile anymore.
Vesna2: But youre diligent! Youve 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): Oh, would you like to assist me?
Vesna2: 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]

@ -0,0 +1,9 @@
join Yeli center
join Vesna2 center
Yeli (_part_side): Wow! So many?
Yeli (_part_side): Good job! Put it in the kettle!
[wait_input]
Yeli (_part_side): Mmmh! This will be something.
Yeli (_part_side): Thank you! I can take everything else from here.
Yeli (_part_side): See you for dinner!
[end_timeline]

@ -0,0 +1 @@
uid://bh4ept5nbdxes

@ -0,0 +1,15 @@
join Vesna2 center
join Domovoi center
Vesna2: Oh no, most of the beets arent ripe yet.
Domovoi: Pssss!
Domovoi: Yeah, you!
Domovoi: The code word is “Rosty Rosty”
Vesna2: What?
Domovoi: Just say it!
Vesna2: Rosty…rosty?
# Hier wächst die rote Beete magisch. Mit einem Signal/Ereignis?
[signal]
Vesna2: It worked! How did it work?
Vesna2: Thank y…and hes gone.
What a truly quirky individual.
[end_timeline]

@ -0,0 +1,21 @@
join Yeli center
join Vesna2 center
Yeli (_part_side): You see, you dont need a man to keep your garden in shape.
- Just a little help from Vesna.
- Frankly, I kept Vasily away from our garden after he destroyed our sunflowers.
Yeli (_part_side): Haha! True words.
Yeli (_part_side): Its your very first time in this house in a long time, isnt it?
Vesna2: Yes. And you have two cats now?
Yeli (_part_side): No, no, the second bowl is for the Domovoi, as a gift.
Yeli (_part_side): Your Yeli still practices the old traditions.
Vesna2: And have you spotted any Domovois since?
Yeli (_part_side): No, but would you believe it, the cat grew double the size. Haha!
Vesna2: Your cat really gets the best of the best. Your soup already smells great!
Yeli (_part_side): But its missing…something.
Yeli (_part_side): Ah!
label bring_beets
Yeli (_part_side): Would you bring me some beets from the garden while I take care of the soup? Heres the key!
- Sure!
- What do you need again?
jump bring_beets
[end_timeline]

@ -0,0 +1 @@
uid://dsc2d4fpu8ip2

@ -0,0 +1,18 @@
join Yeli center
join Vesna2 center
Everyone: Smachnoho!
Vesna2: Lovely soup, Yeli!
Yeli (_part_side): God bless you, my child! Thats also thanks to you.
Vesna2: So, how do you like it in Lasnoye so far?
- It feels different from when Vasily and I used to live here.
- Its 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, its still our motherland from back then.
Vesna2: …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 youre safe. After all, you can always count on your Yeli!
Vesna2: In that case, pass me some more soup!
[end_timeline]

@ -0,0 +1 @@
uid://b176n5u7bplyh

@ -0,0 +1,5 @@
join Chuga center
Chuga: I believe youve seen enough for today.
Chuga: And yes, you too.
Thank you for playing!
[end_timeline]

@ -0,0 +1 @@
uid://ck5nt0bykudeb

@ -0,0 +1,22 @@
join Vesna2 center
join Chuga center
Chuga: Look who it is!
Vesna2: 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?
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, whats 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 Im no king.” Vesna, what am I?
- Queen
Chuga: What a boring answer.
- Tree
Thats it!
- Soup
Chuga: Hate the player, not the game.
Chuga: Here you go!
[end_timeline]

@ -32,6 +32,10 @@ QuestManager="*res://scripts/CSharp/Common/Quest/QuestManager.cs"
[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",
@ -39,6 +43,17 @@ directories/dch_directory={
}
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",
"semi_cat": "res://dialog/semi_cat.dtl",
"test_time_line": "res://dialog/test_time_line.dtl",
"yeli_intro_01": "res://dialog/yeli_intro_01.dtl",

Loading…
Cancel
Save