fixed some layering issues in beetroot scene and added a mock convo with the domovoi

pull/49/head
kziolkowski 4 weeks ago
parent 11e24e249e
commit 4f6c5ab9c1

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

@ -1,4 +1,4 @@
join Chuga left join Chuga center
Chuga: I believe youve seen enough for today. Chuga: I believe youve seen enough for today.
Chuga: And yes, you too. Chuga: And yes, you too.
Chuga: Thank you for playing! Chuga: Thank you for playing!

@ -2,7 +2,7 @@
join vesna left join vesna left
join Chuga right join Chuga right
Chuga: Look who it is! Chuga: Look who it is!
vesna: Your name was Chuga, right? I want to go to the forest! vesna (half side): Your name was Chuga, right? I want to go to the forest!
Chuga: To the forest? After everything the others told you? Chuga: To the forest? After everything the others told you?
vesna: Will you let me through? vesna: Will you let me through?
Chuga: Will I? Chuga: Will I?

@ -1,9 +1,9 @@
join Yeli center join Yeli left
join vesna center join vesna right
[quest_complete quest_resource="res://resources/quests/demo/5_talk_yeli_3.tres"] [quest_complete quest_resource="res://resources/quests/demo/5_talk_yeli_3.tres"]
Yeli (_part_side): Great! Now I need you to plant some tomatoes! Yeli (_part_side): Great! Now I need you to plant some tomatoes!
label plant tomatoes label plant tomatoes
Yeli (_part_side): Use the hoe to break up the soil. Then plant the seeds and water the fields. Yeli (_frontal): Use the hoe to break up the soil. Then plant the seeds and water the fields.
Yeli (_part_side): Got it? Yeli (_part_side): Got it?
- Of course! - Of course!
- Wait … How do I plant the tomatoes again? - Wait … How do I plant the tomatoes again?

@ -2,11 +2,11 @@ join Yeli right
join vesna left join vesna left
[quest_complete quest_resource="res://resources/quests/demo/3_talk_yeli_2.tres"] [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. Yeli (_part_side): Thank you, my child! Your Yeli is not so agile anymore.
vesna: But youre diligent! Youve started with the preparation for dinner. vesna (half side): But youre diligent! Youve started with the preparation for dinner.
Yeli (_part_side): Indeed, I have. Yeli (_frontal): 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? Yeli (_frontal): Oh, would you like to assist me?
vesna: What do I have to do? vesna (front): What do I have to do?
Yeli (_part_side): First, take the hoe and watering can over there! Then come back to me! Yeli (_part_side): First, take the hoe and watering can over there! Then come back to me!
[quest_activate quest_resource="res://resources/quests/demo/4_collect_tools.tres"] [quest_activate quest_resource="res://resources/quests/demo/4_collect_tools.tres"]
[end_timeline] [end_timeline]

@ -0,0 +1,8 @@
join Domovoi center
join vesna (half side) left
vesna: Hello?
...
vesna: Is someone home?
(No answer.)
vesna: Hmpf!
[end_timeline]

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

@ -247,9 +247,9 @@ script = ExtResource("50_a7v1a")
[connection signal="Talking" from="." to="Dialogic starter" method="open"] [connection signal="Talking" from="." to="Dialogic starter" method="open"]
[connection signal="Interacted" from="InteractionArea" to="." method="StartTalking"] [connection signal="Interacted" from="InteractionArea" to="." method="StartTalking"]
[connection signal="Interacted" from="InteractionArea" to="InteractionArea" method="ToggleActive"]
[connection signal="timelineEnded" from="Dialogic starter" to="." method="StopTalking"] [connection signal="timelineEnded" from="Dialogic starter" to="." method="StopTalking"]
[connection signal="timelineEnded" from="Dialogic starter" to="InteractionArea" method="ToggleActive"] [connection signal="timelineEnded" from="Dialogic starter" to="InteractionArea" method="SetActiveTrue"]
[connection signal="timelineStarted" from="Dialogic starter" to="InteractionArea" method="SetActiveFalse"]
[connection signal="timelineEnded" from="DialogicToggle" to="." method="ToggleTalking"] [connection signal="timelineEnded" from="DialogicToggle" to="." method="ToggleTalking"]
[connection signal="timelineStarted" from="DialogicToggle" to="SFX/AudioStreamPlayer" method="PlayOneShot"] [connection signal="timelineStarted" from="DialogicToggle" to="SFX/AudioStreamPlayer" method="PlayOneShot"]

@ -49,6 +49,7 @@ directories/dch_directory={
} }
directories/dtl_directory={ directories/dtl_directory={
"disclaimer": "res://dialog/disclaimer.dtl", "disclaimer": "res://dialog/disclaimer.dtl",
"domovoi_tut": "res://dialog/testing/domovoi_tut.dtl",
"quest1_ducks_end": "res://dialog/quests/ducks/quest1_ducks_end.dtl", "quest1_ducks_end": "res://dialog/quests/ducks/quest1_ducks_end.dtl",
"quest1_ducks_start": "res://dialog/quests/ducks/quest1_ducks_start.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_end": "res://dialog/quests/tomatoes/quest2_tomatoes_end.dtl",

@ -1,4 +1,4 @@
[gd_scene load_steps=98 format=3 uid="uid://b3ibx4resa1f3"] [gd_scene load_steps=100 format=3 uid="uid://b3ibx4resa1f3"]
[ext_resource type="Script" uid="uid://cssdu8viimwm6" path="res://scripts/CSharp/Common/SceneTransition.cs" id="1_6krrk"] [ext_resource type="Script" uid="uid://cssdu8viimwm6" path="res://scripts/CSharp/Common/SceneTransition.cs" id="1_6krrk"]
[ext_resource type="Script" uid="uid://bqomwxclsbhd3" path="res://scripts/CSharp/Common/Camera/CameraController.cs" id="2_4ktoi"] [ext_resource type="Script" uid="uid://bqomwxclsbhd3" path="res://scripts/CSharp/Common/Camera/CameraController.cs" id="2_4ktoi"]
@ -42,7 +42,9 @@
[ext_resource type="PackedScene" uid="uid://dpbbroif2tnil" path="res://prefabs/interactions/generic_item_on_ground_2d.tscn" id="43_dr6bm"] [ext_resource type="PackedScene" uid="uid://dpbbroif2tnil" path="res://prefabs/interactions/generic_item_on_ground_2d.tscn" id="43_dr6bm"]
[ext_resource type="Texture2D" uid="uid://ct7ea8ikor5rf" path="res://art/nature/grass/grass-3.png" id="43_g8k4k"] [ext_resource type="Texture2D" uid="uid://ct7ea8ikor5rf" path="res://art/nature/grass/grass-3.png" id="43_g8k4k"]
[ext_resource type="Texture2D" uid="uid://d3dwl6ph0pu1d" path="res://art/nature/grass/grass-6.png" id="44_jgrpl"] [ext_resource type="Texture2D" uid="uid://d3dwl6ph0pu1d" path="res://art/nature/grass/grass-6.png" id="44_jgrpl"]
[ext_resource type="Script" uid="uid://dnipeibppjirs" path="res://scripts/CSharp/Common/NPC/DialogicOverlayStarter.cs" id="44_m6p1o"]
[ext_resource type="Texture2D" uid="uid://dmo21h14toxfu" path="res://art/indoor/indoor outdoor/domovoi.png" id="44_njxly"] [ext_resource type="Texture2D" uid="uid://dmo21h14toxfu" path="res://art/indoor/indoor outdoor/domovoi.png" id="44_njxly"]
[ext_resource type="Script" uid="uid://d2486x6upmwqq" path="res://scripts/GdScript/dialogic_starter.gd" id="45_1ly1s"]
[ext_resource type="Texture2D" uid="uid://blb3agipyxnal" path="res://art/farm/farming/farmobjekte/zaun/fence_door.png" id="47_xfjh2"] [ext_resource type="Texture2D" uid="uid://blb3agipyxnal" path="res://art/farm/farming/farmobjekte/zaun/fence_door.png" id="47_xfjh2"]
[ext_resource type="PackedScene" uid="uid://cgjc4wurbgimy" path="res://prefabs/UI/Inventory/Inventory.tscn" id="52_gwhnv"] [ext_resource type="PackedScene" uid="uid://cgjc4wurbgimy" path="res://prefabs/UI/Inventory/Inventory.tscn" id="52_gwhnv"]
[ext_resource type="AudioStream" uid="uid://dku1rq5cocisg" path="res://audio/Music/Farming_90BPM_69Bars.wav" id="53_2tfpr"] [ext_resource type="AudioStream" uid="uid://dku1rq5cocisg" path="res://audio/Music/Farming_90BPM_69Bars.wav" id="53_2tfpr"]
@ -1237,7 +1239,6 @@ region_enabled = true
region_rect = Rect2(0, 604, 248, 228) region_rect = Rect2(0, 604, 248, 228)
[node name="bush23" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] [node name="bush23" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"]
z_index = 1
y_sort_enabled = true y_sort_enabled = true
material = SubResource("ShaderMaterial_bcdgk") material = SubResource("ShaderMaterial_bcdgk")
position = Vector2(15022, 3301) position = Vector2(15022, 3301)
@ -1249,7 +1250,7 @@ region_rect = Rect2(1837, 651, 139, 180)
[node name="bush24" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] [node name="bush24" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"]
modulate = Color(0.8428, 0.8771, 0.98, 1) modulate = Color(0.8428, 0.8771, 0.98, 1)
z_index = 2 z_index = -1
y_sort_enabled = true y_sort_enabled = true
material = SubResource("ShaderMaterial_bcdgk") material = SubResource("ShaderMaterial_bcdgk")
position = Vector2(15973, 3380) position = Vector2(15973, 3380)
@ -1370,6 +1371,7 @@ region_enabled = true
region_rect = Rect2(130, 0, 201, 278) region_rect = Rect2(130, 0, 201, 278)
[node name="bush17" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/right side"] [node name="bush17" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/right side"]
z_index = 3
material = SubResource("ShaderMaterial_bcdgk") material = SubResource("ShaderMaterial_bcdgk")
position = Vector2(5599, 3799) position = Vector2(5599, 3799)
scale = Vector2(-2.40318, 3.59175) scale = Vector2(-2.40318, 3.59175)
@ -1398,13 +1400,13 @@ region_enabled = true
region_rect = Rect2(1837, 651, 139, 180) region_rect = Rect2(1837, 651, 139, 180)
[node name="Sonnenblume8" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/right side"] [node name="Sonnenblume8" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/right side"]
z_index = 1 z_index = -5
y_sort_enabled = true y_sort_enabled = true
material = SubResource("ShaderMaterial_618my") material = SubResource("ShaderMaterial_618my")
position = Vector2(5146, 1935) position = Vector2(5187.001, 1864.0001)
scale = Vector2(0.373695, 0.388829) scale = Vector2(0.373695, 0.388829)
texture = ExtResource("38_0bsmo") texture = ExtResource("38_0bsmo")
offset = Vector2(0, -800) offset = Vector2(-109.7168, -617.4004)
region_enabled = true region_enabled = true
region_rect = Rect2(0, 0, 1440, 1576) region_rect = Rect2(0, 0, 1440, 1576)
@ -2076,6 +2078,17 @@ texture = ExtResource("44_njxly")
region_enabled = true region_enabled = true
region_rect = Rect2(65, 149, 223, 375) region_rect = Rect2(65, 149, 223, 375)
[node name="InteractionArea" parent="YSorted/domovoi" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("31_xcb8u")]
_spritesToOutline = [NodePath("..")]
[node name="dialogic overlay starter" type="Node2D" parent="YSorted/domovoi"]
script = ExtResource("44_m6p1o")
_timelinesToPlay = PackedStringArray("domovoi_tut")
_startOnReady = false
[node name="dialogic starter" type="Node" parent="YSorted/domovoi/dialogic overlay starter"]
script = ExtResource("45_1ly1s")
[node name="WateringCan" parent="YSorted" instance=ExtResource("43_dr6bm")] [node name="WateringCan" parent="YSorted" instance=ExtResource("43_dr6bm")]
position = Vector2(5220, 2108) position = Vector2(5220, 2108)
@ -2163,6 +2176,10 @@ script = ExtResource("59_njxly")
[connection signal="FilledWateringCan" from="YSorted/Vesna" to="Audio/SFX/FillWater SFX2" method="PlayOneShot"] [connection signal="FilledWateringCan" from="YSorted/Vesna" to="Audio/SFX/FillWater SFX2" method="PlayOneShot"]
[connection signal="InteractedTool" from="YSorted/Brünnen/InteractionArea" to="YSorted/Vesna" method="TryFillWateringCan"] [connection signal="InteractedTool" from="YSorted/Brünnen/InteractionArea" to="YSorted/Vesna" method="TryFillWateringCan"]
[connection signal="InteractedTool" from="YSorted/Blocker/BackToFarm" to="." method="LoadSceneAtIndex"] [connection signal="InteractedTool" from="YSorted/Blocker/BackToFarm" to="." method="LoadSceneAtIndex"]
[connection signal="Interacted" from="YSorted/domovoi/InteractionArea" to="YSorted/domovoi/dialogic overlay starter" method="ToggleDialogue"]
[connection signal="Dialogue" from="YSorted/domovoi/dialogic overlay starter" to="YSorted/domovoi/dialogic overlay starter/dialogic starter" method="open"]
[connection signal="timelineEnded" from="YSorted/domovoi/dialogic overlay starter/dialogic starter" to="YSorted/domovoi/InteractionArea" method="SetActiveTrue"]
[connection signal="timelineStarted" from="YSorted/domovoi/dialogic overlay starter/dialogic starter" to="YSorted/domovoi/InteractionArea" method="SetActiveFalse"]
[connection signal="finished" from="Audio/Background Music Ramp up" to="Audio/Background Music loop" method="PlayFromOffset"] [connection signal="finished" from="Audio/Background Music Ramp up" to="Audio/Background Music loop" method="PlayFromOffset"]
[connection signal="tree_entered" from="SceneNameSetter" to="SceneNameSetter" method="Set"] [connection signal="tree_entered" from="SceneNameSetter" to="SceneNameSetter" method="Set"]

@ -131,9 +131,20 @@ public partial class InteractionArea2D : Node2D
public void ToggleActive() public void ToggleActive()
{ {
GD.Print($"Toggle active {GetParent().Name}: {!_active}");
_active = !_active; _active = !_active;
_label.Hide(); _label.Hide();
} }
public void SetActiveTrue()
{
IsActive = true;
}
public void SetActiveFalse()
{
IsActive = false;
}
} }

@ -58,7 +58,7 @@ public partial class FieldBehaviour2D : Sprite2D, ISaveable
private void UpdateInteractionArea() private void UpdateInteractionArea()
{ {
// fieldstate == tilled / watered && samen im Inventar // fieldstate == tilled / watered && samen im Inventar
_canPlant = (FieldState == FieldState.Tilled || FieldState == FieldState.Watered) && _seedsActive; _canPlant = (FieldState == FieldState.Tilled || FieldState == FieldState.Watered) && _seedsActive && !IsPlanted;
// fieldstate == tilled && watering can ausgewählt // fieldstate == tilled && watering can ausgewählt
_canWater = (FieldState == FieldState.Tilled || IsPlanted) && _wateringCanActive && WateringCanState.GetFillState() > 0; _canWater = (FieldState == FieldState.Tilled || IsPlanted) && _wateringCanActive && WateringCanState.GetFillState() > 0;

Loading…
Cancel
Save