Jonathan/Babushka
2
0
Fork 0
Code Pull Requests 1 Releases Activity

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

Browse Source
This commit is contained in:
Katharina Ziolkowski
2025-12-17 00:15:42 +01:00
parent 11e24e249e
commit 4f6c5ab9c1
12 changed files with 58 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scenes/scene_outside_beets.tscn
+23 -6
View File
@@ -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://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="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="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="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="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"]
@@ -1237,7 +1239,6 @@ region_enabled = true
region_rect = Rect2(0, 604, 248, 228)
[node name="bush23" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"]
z_index = 1
y_sort_enabled = true
material = SubResource("ShaderMaterial_bcdgk")
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"]
modulate = Color(0.8428, 0.8771, 0.98, 1)
z_index = 2
z_index = -1
y_sort_enabled = true
material = SubResource("ShaderMaterial_bcdgk")
position = Vector2(15973, 3380)
@@ -1370,6 +1371,7 @@ region_enabled = true
region_rect = Rect2(130, 0, 201, 278)
[node name="bush17" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/right side"]
z_index = 3
material = SubResource("ShaderMaterial_bcdgk")
position = Vector2(5599, 3799)
scale = Vector2(-2.40318, 3.59175)
@@ -1398,13 +1400,13 @@ region_enabled = true
region_rect = Rect2(1837, 651, 139, 180)
[node name="Sonnenblume8" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/right side"]
z_index = 1
z_index = -5
y_sort_enabled = true
material = SubResource("ShaderMaterial_618my")
position = Vector2(5146, 1935)
position = Vector2(5187.001, 1864.0001)
scale = Vector2(0.373695, 0.388829)
texture = ExtResource("38_0bsmo")
offset = Vector2(0, -800)
offset = Vector2(-109.7168, -617.4004)
region_enabled = true
region_rect = Rect2(0, 0, 1440, 1576)
@@ -2076,6 +2078,17 @@ texture = ExtResource("44_njxly")
region_enabled = true
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")]
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="InteractedTool" from="YSorted/Brünnen/InteractionArea" to="YSorted/Vesna" method="TryFillWateringCan"]
[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="tree_entered" from="SceneNameSetter" to="SceneNameSetter" method="Set"]