Compare commits

...

8 Commits

@ -38,7 +38,7 @@ z_index = 1
scale = Vector2(1.3499999, 1.5)
texture = ExtResource("9_wx561")
[node name="FieldBehaviour" type="Sprite2D" parent="." node_paths=PackedStringArray("_fieldIndex", "_saveIdHolder", "_fieldSprite", "_maskSprite", "_outlineSprite", "PlantingInteraction", "FieldInteractionArea", "PlantingPlaceholder", "_wateringParticles")]
[node name="FieldBehaviour" type="Sprite2D" parent="." node_paths=PackedStringArray("_fieldIndex", "_saveIdHolder", "_fieldSprite", "_maskSprite", "_outlineSprite", "PlantingInteraction", "PlantingPlaceholder", "_wateringParticles")]
visible = false
z_index = -1
y_sort_enabled = true
@ -56,7 +56,6 @@ _maskTexture = Array[Texture2D]([ExtResource("2_w8caw"), ExtResource("3_c014y"),
Tilled = ExtResource("5_wx561")
Watered = ExtResource("6_7m4xq")
PlantingInteraction = NodePath("InteractionArea")
FieldInteractionArea = NodePath("InteractionArea")
PlantingPlaceholder = NodePath("PlantPlaceholder")
ItemRepository = ExtResource("7_w8caw")
_wateringParticles = NodePath("../pouring water vfx")
@ -79,7 +78,6 @@ position = Vector2(-28.88889, -57)
scale = Vector2(1.1111112, 1)
_active = false
_spritesToOutline = [NodePath("../../OutlineSprite")]
_showLabel = false
[node name="PlantCreationEventRaiser" type="Node" parent="."]
script = ExtResource("9_teirr")

@ -13,8 +13,9 @@ radius = 150.0
[sub_resource type="Theme" id="Theme_5ajrf"]
default_font_size = 30
[node name="InteractionArea" type="Node2D" node_paths=PackedStringArray("_area", "_label")]
[node name="InteractionArea" type="Node2D" node_paths=PackedStringArray("_selectionChangeListener", "_area", "_label")]
script = ExtResource("1_5ajrf")
_selectionChangeListener = NodePath("SelectionListener")
_area = NodePath("Area2D")
_label = NodePath("Area2D/CanvasLayer/MarginContainer/Label")
_outlineMaterial = ExtResource("2_qoey7")

@ -25,7 +25,7 @@ buses/default_bus_layout="uid://b6dwkmkyb0axk"
[autoload]
SceneTransition="*res://scenes/SceneTransition.tscn"
SceneTransition="*res://prefabs/UI/SceneTransition.tscn"
Dialogic="*res://addons/dialogic/Core/DialogicGameHandler.gd"
InventoryManager="*res://scripts/CSharp/Common/Inventory/InventoryManager.cs"
InputService="*res://scripts/CSharp/Common/Services/InputService.cs"
@ -187,8 +187,8 @@ directories/tres_directory={
[display]
window/size/viewport_width=1980
window/size/viewport_height=1020
window/size/viewport_width=1920
window/size/viewport_height=1080
window/stretch/mode="viewport"
window/stretch/aspect="keep_height"

@ -1,6 +1,6 @@
[gd_scene load_steps=5 format=3 uid="uid://bopv10dqm1knc"]
[ext_resource type="PackedScene" uid="uid://c6wnoif01ltld" path="res://scenes/Babushka_scene_startMenu.tscn" id="1_15ton"]
[ext_resource type="PackedScene" uid="uid://c6wnoif01ltld" path="res://scenes/scene_startMenu.tscn" id="1_15ton"]
[ext_resource type="Script" uid="uid://bbp0dyddwdbl8" path="res://scripts/CSharp/Common/Savegame/WindowSettingsSync.cs" id="2_d3jfo"]
[ext_resource type="Script" uid="uid://iquhbkr7pqeg" path="res://scripts/CSharp/Common/Savegame/SaveCheats.cs" id="4_ocsjo"]
[ext_resource type="Script" uid="uid://ca4s0algeij1h" path="res://scripts/CSharp/Common/Savegame/SaveIDProviderTool.cs" id="5_iyo8m"]

@ -1,37 +1,37 @@
[gd_scene load_steps=41 format=3 uid="uid://bm21nqepnwaik"]
[ext_resource type="Script" uid="uid://cssdu8viimwm6" path="res://scripts/CSharp/Common/SceneTransition.cs" id="1_3vr4f"]
[ext_resource type="Texture2D" uid="uid://cnhsxxps2cw5" path="res://art/indoor/room export/Room_01_table.png" id="2_ubg3a"]
[ext_resource type="Texture2D" uid="uid://blg50is4kuh2f" path="res://art/indoor/room export/Room_01_chair.png" id="3_gpagp"]
[ext_resource type="Texture2D" uid="uid://x7trh4dgsvoe" path="res://art/indoor/room export/Room_01_assets.png" id="4_27bwy"]
[ext_resource type="Texture2D" uid="uid://waqmjrxduxfq" path="res://art/indoor/room export/Room_01_walls.png" id="5_sndxu"]
[ext_resource type="Texture2D" uid="uid://bqwhptcgg5ons" path="res://art/indoor/room export/Room_01_dorr_R.png" id="6_blyw3"]
[ext_resource type="Texture2D" uid="uid://vyk63d0pgqm5" path="res://art/indoor/room export/Room_01_dioor L.png" id="7_yd2gv"]
[ext_resource type="Texture2D" uid="uid://b2rj7wkyu6ehy" path="res://art/indoor/room export/Room_01_pechka.png" id="8_ofqcg"]
[ext_resource type="Texture2D" uid="uid://dhvi5404cqioa" path="res://art/indoor/room export/Room_01_window.png" id="9_aoesu"]
[ext_resource type="Texture2D" uid="uid://bpi35nxbhput8" path="res://art/indoor/room export/Room_01_pechkaDoor.png" id="10_xcryd"]
[ext_resource type="Texture2D" uid="uid://tyypifpte0pb" path="res://art/indoor/room export/Room_01_chugun.png" id="11_as3nm"]
[ext_resource type="PackedScene" uid="uid://cqc72e4hq6bcd" path="res://prefabs/interactions/interaction_area_2d.tscn" id="11_gpagp"]
[ext_resource type="Texture2D" uid="uid://cop1vjvhwlsec" path="res://art/indoor/room export/Room_01_shelf.png" id="12_bu2a1"]
[ext_resource type="Texture2D" uid="uid://404glx32r1w8" path="res://art/indoor/room export/Room_01_bench.png" id="13_rongr"]
[ext_resource type="Texture2D" uid="uid://ckvytnpi8gcxq" path="res://art/eyes_atlas.png" id="14_d7yky"]
[ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/characters/Vesna.tscn" id="15_7a68a"]
[ext_resource type="Script" uid="uid://31p67cdowuw4" path="res://scripts/CSharp/Common/Animation/AnimationStarter.cs" id="15_27bwy"]
[ext_resource type="Texture2D" uid="uid://c4q12jiligcl7" path="res://art/animals/katze.png" id="15_sndxu"]
[ext_resource type="AudioStream" uid="uid://cohyenfo1rtxh" path="res://audio/sfx/Animals/SFX_Cat_Meow_01.wav" id="16_d7yky"]
[ext_resource type="PackedScene" uid="uid://dfvgp1my5rydh" path="res://prefabs/characters/Yeli.tscn" id="16_dhsxs"]
[ext_resource type="AudioStream" uid="uid://b2cmf5ie7cwka" path="res://audio/sfx/Animals/SFX_Cat_Meow_02.wav" id="17_7a68a"]
[ext_resource type="Script" uid="uid://cvkw4qd2hxksi" path="res://scripts/GdScript/dialogic_toggle.gd" id="17_k0k8c"]
[ext_resource type="AudioStream" uid="uid://cttisejnt2l8f" path="res://audio/sfx/Animals/SFX_Cat_Meow_03.wav" id="18_dhsxs"]
[ext_resource type="Script" uid="uid://bqomwxclsbhd3" path="res://scripts/CSharp/Common/Camera/CameraController.cs" id="18_dw4nn"]
[ext_resource type="AudioStream" uid="uid://cbmagiou0n0t3" path="res://audio/sfx/Animals/SFX_Cat_Meow_04.wav" id="19_k0k8c"]
[ext_resource type="AudioStream" uid="uid://bk1bj01fokjp7" path="res://audio/sfx/Animals/SFX_Cat_Meow_05.wav" id="20_dw4nn"]
[ext_resource type="Script" uid="uid://cldtt4atgymm5" path="res://scripts/CSharp/Common/Quest/QuestTrigger.cs" id="21_blyw3"]
[ext_resource type="AudioStream" uid="uid://r2f6xmjvyyjv" path="res://audio/sfx/Animals/SFX_Cat_Purr_01.wav" id="21_ytap8"]
[ext_resource type="Script" uid="uid://cfnrd5k1k0gxw" path="res://scripts/CSharp/Common/AudioPlayer2D.cs" id="22_tggq2"]
[ext_resource type="Resource" uid="uid://cbpurnewhyefa" path="res://resources/quests/beetRoot.tres" id="22_yd2gv"]
[ext_resource type="Texture2D" uid="uid://da67c7avarwq2" path="res://art/indoor/kitchen_bgAssets.png" id="23_d7yky"]
[ext_resource type="PackedScene" uid="uid://cgjc4wurbgimy" path="res://prefabs/UI/Inventory/Inventory.tscn" id="24_yd2gv"]
[ext_resource type="Script" uid="uid://cssdu8viimwm6" path="res://scripts/CSharp/Common/SceneTransition.cs" id="1_3al6t"]
[ext_resource type="Texture2D" uid="uid://cnhsxxps2cw5" path="res://art/indoor/room export/Room_01_table.png" id="2_ufnxe"]
[ext_resource type="Texture2D" uid="uid://blg50is4kuh2f" path="res://art/indoor/room export/Room_01_chair.png" id="3_pejp6"]
[ext_resource type="Texture2D" uid="uid://x7trh4dgsvoe" path="res://art/indoor/room export/Room_01_assets.png" id="4_nc3ef"]
[ext_resource type="Texture2D" uid="uid://waqmjrxduxfq" path="res://art/indoor/room export/Room_01_walls.png" id="5_cpb5b"]
[ext_resource type="Texture2D" uid="uid://b2rj7wkyu6ehy" path="res://art/indoor/room export/Room_01_pechka.png" id="6_ecq66"]
[ext_resource type="Texture2D" uid="uid://dhvi5404cqioa" path="res://art/indoor/room export/Room_01_window.png" id="7_8mqg7"]
[ext_resource type="Texture2D" uid="uid://bpi35nxbhput8" path="res://art/indoor/room export/Room_01_pechkaDoor.png" id="8_bv3pn"]
[ext_resource type="PackedScene" uid="uid://cqc72e4hq6bcd" path="res://prefabs/interactions/interaction_area_2d.tscn" id="9_qaiit"]
[ext_resource type="Texture2D" uid="uid://tyypifpte0pb" path="res://art/indoor/room export/Room_01_chugun.png" id="10_rj4v5"]
[ext_resource type="Texture2D" uid="uid://404glx32r1w8" path="res://art/indoor/room export/Room_01_bench.png" id="11_7ohth"]
[ext_resource type="Texture2D" uid="uid://c4q12jiligcl7" path="res://art/animals/katze.png" id="12_dckqa"]
[ext_resource type="AudioStream" uid="uid://cohyenfo1rtxh" path="res://audio/sfx/Animals/SFX_Cat_Meow_01.wav" id="13_65rkx"]
[ext_resource type="AudioStream" uid="uid://b2cmf5ie7cwka" path="res://audio/sfx/Animals/SFX_Cat_Meow_02.wav" id="14_mse84"]
[ext_resource type="AudioStream" uid="uid://cttisejnt2l8f" path="res://audio/sfx/Animals/SFX_Cat_Meow_03.wav" id="15_26mhc"]
[ext_resource type="AudioStream" uid="uid://cbmagiou0n0t3" path="res://audio/sfx/Animals/SFX_Cat_Meow_04.wav" id="16_vt5fp"]
[ext_resource type="AudioStream" uid="uid://bk1bj01fokjp7" path="res://audio/sfx/Animals/SFX_Cat_Meow_05.wav" id="17_n8vep"]
[ext_resource type="AudioStream" uid="uid://r2f6xmjvyyjv" path="res://audio/sfx/Animals/SFX_Cat_Purr_01.wav" id="18_3oexm"]
[ext_resource type="Script" uid="uid://cfnrd5k1k0gxw" path="res://scripts/CSharp/Common/AudioPlayer2D.cs" id="19_a2xrf"]
[ext_resource type="Script" uid="uid://31p67cdowuw4" path="res://scripts/CSharp/Common/Animation/AnimationStarter.cs" id="20_lkkn4"]
[ext_resource type="Texture2D" uid="uid://ckvytnpi8gcxq" path="res://art/eyes_atlas.png" id="21_m0gmu"]
[ext_resource type="Texture2D" uid="uid://bqwhptcgg5ons" path="res://art/indoor/room export/Room_01_dorr_R.png" id="22_ahl31"]
[ext_resource type="Texture2D" uid="uid://da67c7avarwq2" path="res://art/indoor/kitchen_bgAssets.png" id="23_hgs5o"]
[ext_resource type="Texture2D" uid="uid://vyk63d0pgqm5" path="res://art/indoor/room export/Room_01_dioor L.png" id="24_t86aa"]
[ext_resource type="Texture2D" uid="uid://cop1vjvhwlsec" path="res://art/indoor/room export/Room_01_shelf.png" id="25_0pvxk"]
[ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/characters/Vesna.tscn" id="26_yq173"]
[ext_resource type="PackedScene" uid="uid://dfvgp1my5rydh" path="res://prefabs/characters/Yeli.tscn" id="27_pfr1s"]
[ext_resource type="Script" uid="uid://cvkw4qd2hxksi" path="res://scripts/GdScript/dialogic_toggle.gd" id="28_l3q6o"]
[ext_resource type="Script" uid="uid://cldtt4atgymm5" path="res://scripts/CSharp/Common/Quest/QuestTrigger.cs" id="29_6elg7"]
[ext_resource type="Resource" uid="uid://cbpurnewhyefa" path="res://resources/quests/beetRoot.tres" id="30_pd0e4"]
[ext_resource type="Script" uid="uid://bqomwxclsbhd3" path="res://scripts/CSharp/Common/Camera/CameraController.cs" id="31_x6an5"]
[ext_resource type="PackedScene" uid="uid://cgjc4wurbgimy" path="res://prefabs/UI/Inventory/Inventory.tscn" id="32_i4hb6"]
[sub_resource type="RectangleShape2D" id="RectangleShape2D_a2ood"]
resource_local_to_scene = true
@ -43,12 +43,12 @@ radius = 300.0
[sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_b6vf7"]
streams_count = 6
stream_0/stream = ExtResource("16_d7yky")
stream_1/stream = ExtResource("17_7a68a")
stream_2/stream = ExtResource("18_dhsxs")
stream_3/stream = ExtResource("19_k0k8c")
stream_4/stream = ExtResource("20_dw4nn")
stream_5/stream = ExtResource("21_ytap8")
stream_0/stream = ExtResource("13_65rkx")
stream_1/stream = ExtResource("14_mse84")
stream_2/stream = ExtResource("15_26mhc")
stream_3/stream = ExtResource("16_vt5fp")
stream_4/stream = ExtResource("17_n8vep")
stream_5/stream = ExtResource("18_3oexm")
[sub_resource type="Animation" id="Animation_j5d18"]
length = 0.001
@ -218,8 +218,8 @@ radius = 400.0
[node name="Common Room" type="Node2D"]
z_index = 1
y_sort_enabled = true
script = ExtResource("1_3vr4f")
_sceneNamesToLoad = PackedStringArray("res://scenes/Babushka_scene_indoor_vesnas_room.tscn", "res://scenes/Babushka_scene_indoor_kitchen.tscn", "res://scenes/Babushka_scene_farm_outside_2d.tscn")
script = ExtResource("1_3al6t")
_sceneNamesToLoad = PackedStringArray("res://scenes/scene_indoor_vesnas_room.tscn", "res://scenes/scene_indoor_kitchen.tscn", "res://scenes/scene_farm_outside_2d.tscn")
[node name="Foreground" type="Node" parent="."]
@ -227,7 +227,7 @@ _sceneNamesToLoad = PackedStringArray("res://scenes/Babushka_scene_indoor_vesnas
z_index = 2
y_sort_enabled = true
position = Vector2(-1888, 1112)
texture = ExtResource("2_ubg3a")
texture = ExtResource("2_ufnxe")
offset = Vector2(0, -200)
region_enabled = true
region_rect = Rect2(1012, 1743, 1470, 417)
@ -236,7 +236,7 @@ region_rect = Rect2(1012, 1743, 1470, 417)
z_index = 3
y_sort_enabled = true
position = Vector2(-3032, 2096)
texture = ExtResource("3_gpagp")
texture = ExtResource("3_pejp6")
offset = Vector2(216, -1064)
region_enabled = true
region_rect = Rect2(1534, 1976, 379, 184)
@ -244,7 +244,7 @@ region_rect = Rect2(1534, 1976, 379, 184)
[node name="Chair2" type="Sprite2D" parent="Foreground"]
y_sort_enabled = true
position = Vector2(-1064, 2064)
texture = ExtResource("3_gpagp")
texture = ExtResource("3_pejp6")
offset = Vector2(184, -1056)
region_enabled = true
region_rect = Rect2(1534, 1976, 379, 184)
@ -253,7 +253,7 @@ region_rect = Rect2(1534, 1976, 379, 184)
z_index = 1
y_sort_enabled = true
position = Vector2(-1904, 1192)
texture = ExtResource("4_27bwy")
texture = ExtResource("4_nc3ef")
offset = Vector2(0, -800)
region_enabled = true
region_rect = Rect2(2093, 49, 421, 630)
@ -288,14 +288,14 @@ shape = SubResource("RectangleShape2D_a2ood")
z_index = -100
position = Vector2(4992, -487)
scale = Vector2(2, 2)
texture = ExtResource("5_sndxu")
texture = ExtResource("5_cpb5b")
offset = Vector2(-2768, 264)
[node name="wall 1" type="Sprite2D" parent="BackWall"]
z_index = -100
position = Vector2(-4368, 40)
scale = Vector2(2, 2)
texture = ExtResource("5_sndxu")
texture = ExtResource("5_cpb5b")
flip_h = true
region_rect = Rect2(111, 292, 3323, 2160)
@ -308,32 +308,32 @@ shape = SubResource("RectangleShape2D_a2ood")
[node name="Room01Pechka" type="Sprite2D" parent="BackWall"]
z_index = -80
position = Vector2(-224, -392)
texture = ExtResource("8_ofqcg")
texture = ExtResource("6_ecq66")
region_enabled = true
region_rect = Rect2(2236, 0, 724, 1392)
[node name="Room01Window2" type="Sprite2D" parent="BackWall"]
z_index = -50
position = Vector2(-5870, -408)
texture = ExtResource("9_aoesu")
texture = ExtResource("7_8mqg7")
region_enabled = true
region_rect = Rect2(1020, 338, 607, 757)
[node name="Room01Window3" type="Sprite2D" parent="BackWall"]
z_index = -50
position = Vector2(-3931, -397)
texture = ExtResource("9_aoesu")
texture = ExtResource("7_8mqg7")
region_enabled = true
region_rect = Rect2(1020, 338, 607, 757)
[node name="Room01PechkaDoor" type="Sprite2D" parent="BackWall"]
z_index = -50
position = Vector2(-240, -100)
texture = ExtResource("10_xcryd")
texture = ExtResource("8_bv3pn")
region_enabled = true
region_rect = Rect2(2360, 864, 356, 251)
[node name="InteractionArea" parent="BackWall/Room01PechkaDoor" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("11_gpagp")]
[node name="InteractionArea" parent="BackWall/Room01PechkaDoor" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("9_qaiit")]
position = Vector2(0, -3)
_spritesToOutline = [NodePath("..")]
@ -343,7 +343,7 @@ shape = SubResource("CircleShape2D_gpagp")
[node name="Room01Chugun" type="Sprite2D" parent="BackWall"]
z_index = -40
position = Vector2(16, -560)
texture = ExtResource("11_as3nm")
texture = ExtResource("10_rj4v5")
region_enabled = true
region_rect = Rect2(2469, 459, 247, 131)
@ -351,24 +351,24 @@ region_rect = Rect2(2469, 459, 247, 131)
z_index = -10
y_sort_enabled = true
position = Vector2(-5070, 1051)
texture = ExtResource("13_rongr")
texture = ExtResource("11_7ohth")
flip_h = true
region_enabled = true
region_rect = Rect2(1156, 1185, 940, 189)
[node name="Katze" type="Sprite2D" parent="BackWall/Bench"]
z_index = -10
z_index = 10
position = Vector2(61, -87)
scale = Vector2(2, 2)
texture = ExtResource("15_sndxu")
texture = ExtResource("12_dckqa")
offset = Vector2(-8, -126)
[node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="BackWall/Bench/Katze"]
stream = SubResource("AudioStreamRandomizer_b6vf7")
bus = &"SFX"
script = ExtResource("22_tggq2")
script = ExtResource("19_a2xrf")
[node name="InteractionArea" parent="BackWall/Bench/Katze" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("11_gpagp")]
[node name="InteractionArea" parent="BackWall/Bench/Katze" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("9_qaiit")]
position = Vector2(-6.5, -44)
scale = Vector2(0.5, 0.5)
_spritesToOutline = [NodePath("..")]
@ -376,7 +376,7 @@ _spritesToOutline = [NodePath("..")]
[node name="Bench2" type="Sprite2D" parent="BackWall"]
z_index = -10
position = Vector2(-2906, 243)
texture = ExtResource("13_rongr")
texture = ExtResource("11_7ohth")
region_enabled = true
region_rect = Rect2(1156, 1185, 940, 189)
@ -386,7 +386,7 @@ region_rect = Rect2(1156, 1185, 940, 189)
z_index = -10
y_sort_enabled = true
position = Vector2(-177, 554.5)
texture = ExtResource("4_27bwy")
texture = ExtResource("4_nc3ef")
offset = Vector2(0, -296)
region_enabled = true
region_rect = Rect2(2244, 763, 274, 91)
@ -395,7 +395,7 @@ region_rect = Rect2(2244, 763, 274, 91)
z_index = -10
y_sort_enabled = true
position = Vector2(336.487, 275.616)
texture = ExtResource("4_27bwy")
texture = ExtResource("4_nc3ef")
offset = Vector2(-14.6475, -97.651)
region_enabled = true
region_rect = Rect2(3157, 688, 118.519, 221)
@ -405,7 +405,7 @@ z_index = -10
y_sort_enabled = true
position = Vector2(-852, -187)
rotation = -0.0663225
texture = ExtResource("4_27bwy")
texture = ExtResource("4_nc3ef")
offset = Vector2(0, -296)
region_enabled = true
region_rect = Rect2(2624, 435, 49, 76)
@ -416,11 +416,11 @@ y_sort_enabled = true
position = Vector2(-101, -6)
rotation = -0.0663225
scale = Vector2(1e-05, 1e-05)
texture = ExtResource("4_27bwy")
texture = ExtResource("4_nc3ef")
offset = Vector2(43.3898, 128.128)
region_enabled = true
region_rect = Rect2(3362, 139, 101, 269)
script = ExtResource("15_27bwy")
script = ExtResource("20_lkkn4")
_animationPlayer = NodePath("SpiritAnimation")
_animationName = "hand_stretch"
_repeatable = false
@ -436,7 +436,7 @@ playback_auto_capture = false
z_index = -10
y_sort_enabled = true
position = Vector2(287, -157.5)
texture = ExtResource("4_27bwy")
texture = ExtResource("4_nc3ef")
offset = Vector2(0, -296)
region_enabled = true
region_rect = Rect2(2964, 137, 321, 213)
@ -444,7 +444,7 @@ region_rect = Rect2(2964, 137, 321, 213)
[node name="herb 1" type="Sprite2D" parent="BackWall/Room assets/herbsline"]
y_sort_enabled = true
position = Vector2(-72, 136)
texture = ExtResource("4_27bwy")
texture = ExtResource("4_nc3ef")
offset = Vector2(0, -296)
region_enabled = true
region_rect = Rect2(2600, 165, 127, 199)
@ -452,7 +452,7 @@ region_rect = Rect2(2600, 165, 127, 199)
[node name="herb 2" type="Sprite2D" parent="BackWall/Room assets/herbsline"]
y_sort_enabled = true
position = Vector2(64, 80)
texture = ExtResource("4_27bwy")
texture = ExtResource("4_nc3ef")
offset = Vector2(0, -296)
region_enabled = true
region_rect = Rect2(2761, 161, 135, 199)
@ -462,7 +462,7 @@ visible = false
z_index = -10
position = Vector2(-169, -80)
scale = Vector2(0.4, 0.4)
texture = ExtResource("14_d7yky")
texture = ExtResource("21_m0gmu")
region_enabled = true
region_rect = Rect2(2647, 15, 286, 183)
@ -472,21 +472,21 @@ position = Vector2(-205, -8)
[node name="apple" type="Sprite2D" parent="BackWall/Room assets/offerings"]
z_index = -1
position = Vector2(229.5, 331.5)
texture = ExtResource("4_27bwy")
texture = ExtResource("4_nc3ef")
region_enabled = true
region_rect = Rect2(2822, 764, 93, 87)
[node name="bread" type="Sprite2D" parent="BackWall/Room assets/offerings"]
z_index = -2
position = Vector2(157.5, 339.5)
texture = ExtResource("4_27bwy")
texture = ExtResource("4_nc3ef")
region_enabled = true
region_rect = Rect2(2951, 783, 155, 78)
[node name="plate" type="Sprite2D" parent="BackWall/Room assets/offerings"]
z_index = -20
position = Vector2(189.5, 659.5)
texture = ExtResource("4_27bwy")
texture = ExtResource("4_nc3ef")
offset = Vector2(0, -296)
region_enabled = true
region_rect = Rect2(2576, 802, 219, 64)
@ -496,11 +496,11 @@ region_rect = Rect2(2576, 802, 219, 64)
[node name="Door_Kitchen" type="Sprite2D" parent="BackWall/Doors"]
z_index = -50
position = Vector2(923, -221)
texture = ExtResource("6_blyw3")
texture = ExtResource("22_ahl31")
region_enabled = true
region_rect = Rect2(3161, 313, 679, 1050)
[node name="KitchendoorInteraction" parent="BackWall/Doors/Door_Kitchen" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("11_gpagp")]
[node name="KitchendoorInteraction" parent="BackWall/Doors/Door_Kitchen" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("9_qaiit")]
position = Vector2(-7, 248)
scale = Vector2(1.5, 1.5)
_spritesToOutline = [NodePath("..")]
@ -509,11 +509,11 @@ _id = 1
[node name="Door_Outside" type="Sprite2D" parent="BackWall/Doors"]
z_index = -50
position = Vector2(-4917, -226)
texture = ExtResource("23_d7yky")
texture = ExtResource("23_hgs5o")
region_enabled = true
region_rect = Rect2(3009, 666, 679, 1050)
[node name="OutsideDoor" parent="BackWall/Doors/Door_Outside" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("11_gpagp")]
[node name="OutsideDoor" parent="BackWall/Doors/Door_Outside" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("9_qaiit")]
position = Vector2(-7, 248)
scale = Vector2(1.5, 1.5)
_spritesToOutline = [NodePath("..")]
@ -522,11 +522,11 @@ _id = 2
[node name="Door_Bedroom" type="Sprite2D" parent="BackWall/Doors"]
z_index = -50
position = Vector2(-1620, -259)
texture = ExtResource("7_yd2gv")
texture = ExtResource("24_t86aa")
region_enabled = true
region_rect = Rect2(0, 165, 763, 1224)
[node name="VesnasRoomDoor" parent="BackWall/Doors/Door_Bedroom" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("11_gpagp")]
[node name="VesnasRoomDoor" parent="BackWall/Doors/Door_Bedroom" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("9_qaiit")]
position = Vector2(2, 233)
_spritesToOutline = [NodePath("..")]
_id = 0
@ -537,7 +537,7 @@ shape = SubResource("CircleShape2D_yd2gv")
[node name="Shelf" type="Sprite2D" parent="BackWall"]
z_index = -50
position = Vector2(-880, -416)
texture = ExtResource("12_bu2a1")
texture = ExtResource("25_0pvxk")
region_enabled = true
region_rect = Rect2(1846, 471, 348, 490)
@ -546,16 +546,16 @@ visible = false
z_index = -10
y_sort_enabled = true
position = Vector2(23, 378.5)
texture = ExtResource("4_27bwy")
texture = ExtResource("4_nc3ef")
offset = Vector2(0, -296)
region_enabled = true
region_rect = Rect2(2748, 432, 174, 191)
[node name="Vesna" parent="." instance=ExtResource("15_7a68a")]
[node name="Vesna" parent="." instance=ExtResource("26_yq173")]
y_sort_enabled = false
position = Vector2(-4473, 319)
[node name="Yeli" parent="." instance=ExtResource("16_dhsxs")]
[node name="Yeli" parent="." instance=ExtResource("27_pfr1s")]
z_index = 0
y_sort_enabled = false
position = Vector2(-2841, 198)
@ -575,11 +575,11 @@ position = Vector2(-224, 373)
position = Vector2(-565, 464)
[node name="dialogic_toggle" type="Node2D" parent="Yeli"]
script = ExtResource("17_k0k8c")
script = ExtResource("28_l3q6o")
[node name="Beetroot Quest trigger" type="Node2D" parent="Yeli"]
script = ExtResource("21_blyw3")
questResource = ExtResource("22_yd2gv")
script = ExtResource("29_6elg7")
questResource = ExtResource("30_pd0e4")
toStatus = 1
makeActive = true
@ -592,10 +592,10 @@ limit_top = -1050
limit_right = 1400
limit_bottom = 1150
editor_draw_limits = true
script = ExtResource("18_dw4nn")
script = ExtResource("31_x6an5")
_followNode = NodePath("../Vesna/CharacterBody2D")
[node name="CanvasLayer" parent="." instance=ExtResource("24_yd2gv")]
[node name="CanvasLayer" parent="." instance=ExtResource("32_i4hb6")]
[connection signal="Interacted" from="BackWall/Room01PechkaDoor/InteractionArea" to="BackWall/Room01PechkaDoor/InteractionArea" method="ToggleActive"]
[connection signal="Interacted" from="BackWall/Room01PechkaDoor/InteractionArea" to="BackWall/Room assets/hand" method="PlayAnimation"]

@ -20,7 +20,7 @@ radius = 300.0
z_index = 1
y_sort_enabled = true
script = ExtResource("1_ftmt4")
_sceneNamesToLoad = PackedStringArray("res://scenes/Babushka_scene_indoor_common_room.tscn")
_sceneNamesToLoad = PackedStringArray("res://scenes/scene_indoor_common_room.tscn")
[node name="Foreground" type="Node" parent="."]

@ -30,7 +30,7 @@ radius = 509.071
[node name="VesnasRoom" type="Node2D"]
y_sort_enabled = true
script = ExtResource("1_c6eln")
_sceneNamesToLoad = PackedStringArray("res://scenes/Babushka_scene_indoor_common_room.tscn", "res://scenes/Babushka_scene_fight_world_room.tscn")
_sceneNamesToLoad = PackedStringArray("res://scenes/scene_indoor_common_room.tscn", "res://scenes/scene_fight_world_room.tscn")
[node name="Colliders" type="Node2D" parent="."]
position = Vector2(1297, 5292)

@ -251,7 +251,7 @@ stream_2/stream = ExtResource("63_td2xu")
[node name="BabushkaSceneBeets" type="Node2D"]
script = ExtResource("1_6krrk")
_sceneNamesToLoad = PackedStringArray("res://scenes/Babushka_scene_farm_outside_2d.tscn")
_sceneNamesToLoad = PackedStringArray("res://scenes/scene_farm_outside_2d.tscn")
[node name="Camera2D" type="Camera2D" parent="." node_paths=PackedStringArray("_followNode")]
position = Vector2(3180, 1961)
@ -1765,6 +1765,7 @@ metadata/SaveID = "b3b47e69-6115-4405-8da6-508b783823d2"
[node name="FieldBehaviour" parent="YSorted/Farm visuals/FieldParent/BaseField" index="1"]
visible = true
FieldState = 2
metadata/SaveID = "7a8210bf-479d-4b4c-9758-98d23e59d5d7"
[node name="PlantPlaceholder" parent="YSorted/Farm visuals/FieldParent/BaseField/FieldBehaviour" index="1"]
@ -1792,6 +1793,7 @@ metadata/SaveID = "f536efd3-3da8-4ef5-a520-570220e6c19f"
[node name="FieldBehaviour" parent="YSorted/Farm visuals/FieldParent/BaseField2" index="1"]
visible = true
FieldState = 2
metadata/SaveID = "a1d8a0a2-c51c-4410-83c3-0edb31cbf2de"
[node name="PlantPlaceholder" parent="YSorted/Farm visuals/FieldParent/BaseField2/FieldBehaviour" index="1"]
@ -1819,6 +1821,7 @@ metadata/SaveID = "14ce64d5-8a4d-43b9-a8ff-3a57725c4dc8"
[node name="FieldBehaviour" parent="YSorted/Farm visuals/FieldParent/BaseField3" index="1"]
visible = true
FieldState = 2
metadata/SaveID = "79a65532-cb2b-4268-8eb0-8c41a3935cbb"
[node name="PlantPlaceholder" parent="YSorted/Farm visuals/FieldParent/BaseField3/FieldBehaviour" index="1"]
@ -1846,7 +1849,7 @@ metadata/SaveID = "6872ce5d-6f42-47d7-97e2-a7214ff3b08c"
[node name="FieldBehaviour" parent="YSorted/Farm visuals/FieldParent/BaseField4" index="1"]
visible = true
FieldState = 3
FieldState = 2
metadata/SaveID = "13fa64a3-01dc-4fd8-822e-0839c0da3163"
[node name="PlantPlaceholder" parent="YSorted/Farm visuals/FieldParent/BaseField4/FieldBehaviour" index="1"]
@ -1874,7 +1877,7 @@ metadata/SaveID = "f163c38d-9ee0-4844-9def-479833febb4e"
[node name="FieldBehaviour" parent="YSorted/Farm visuals/FieldParent/BaseField5" index="1"]
visible = true
FieldState = 3
FieldState = 2
metadata/SaveID = "414ecdb9-f3c4-4fb9-81bd-6ca575784f78"
[node name="PlantPlaceholder" parent="YSorted/Farm visuals/FieldParent/BaseField5/FieldBehaviour" index="1"]
@ -1902,7 +1905,7 @@ metadata/SaveID = "da691381-ee82-4f86-abf3-dda2c9f19337"
[node name="FieldBehaviour" parent="YSorted/Farm visuals/FieldParent/BaseField6" index="1"]
visible = true
FieldState = 3
FieldState = 2
metadata/SaveID = "b235febb-b231-4f8c-94e9-1f9d9f115b08"
[node name="PlantPlaceholder" parent="YSorted/Farm visuals/FieldParent/BaseField6/FieldBehaviour" index="1"]
@ -1930,7 +1933,7 @@ metadata/SaveID = "8116fa8b-b164-4d39-a1ed-6cd476d18f94"
[node name="FieldBehaviour" parent="YSorted/Farm visuals/FieldParent/BaseField7" index="1"]
visible = true
FieldState = 3
FieldState = 2
metadata/SaveID = "9ccdba91-812a-4c13-9ee0-12472e174fc9"
[node name="PlantPlaceholder" parent="YSorted/Farm visuals/FieldParent/BaseField7/FieldBehaviour" index="1"]
@ -1958,7 +1961,7 @@ metadata/SaveID = "5298f423-4c3b-45b5-94fb-d4aef36bac21"
[node name="FieldBehaviour" parent="YSorted/Farm visuals/FieldParent/BaseField8" index="1"]
visible = true
FieldState = 3
FieldState = 2
metadata/SaveID = "da44e54a-0b76-4888-ad8b-782a9d146fa3"
[node name="PlantPlaceholder" parent="YSorted/Farm visuals/FieldParent/BaseField8/FieldBehaviour" index="1"]
@ -1986,6 +1989,7 @@ metadata/SaveID = "0de8dc13-5851-4471-be35-309cd6687ebc"
[node name="FieldBehaviour" parent="YSorted/Farm visuals/FieldParent/BaseField9" index="1"]
visible = true
FieldState = 2
metadata/SaveID = "9919b294-04a1-4a16-9783-38c8aa0e291c"
[node name="PlantPlaceholder" parent="YSorted/Farm visuals/FieldParent/BaseField9/FieldBehaviour" index="1"]

@ -7,7 +7,7 @@
[node name="BabushkaSceneStartMenu" type="Node2D"]
script = ExtResource("1_fj2fh")
_sceneNamesToLoad = PackedStringArray("res://scenes/Babushka_scene_farm_outside_2d.tscn")
_sceneNamesToLoad = PackedStringArray("res://scenes/scene_farm_outside_2d.tscn")
[node name="CanvasLayer" type="CanvasLayer" parent="."]

@ -8,7 +8,6 @@ namespace Babushka.scripts.CSharp.Common.CharacterControls;
public partial class DetectableInteractionArea : Area2D
{
[Export] public InteractionArea2D interactionArea2D;
public void InteractionAreaSelectionChanged(Variant instanceID)
{

@ -76,7 +76,6 @@ public partial class Detector : Area2D
private void CalculateClosestInteractable()
{
GD.Print($"Areas in detector: {_areasInDetector.Count}");
float smallestDistance = float.MaxValue;
string closestInteractable = null;
foreach (var area in _areasInDetector)
@ -92,7 +91,6 @@ public partial class Detector : Area2D
smallestDistance = distance;
}
}
GD.Print($"Closest interactable: {closestInteractable}");
_itemToTriggerResource.Payload = closestInteractable;
}

@ -1,12 +1,14 @@
using System.Linq;
using Babushka.scripts.CSharp.Common.Services;
using Babushka.scripts.CSharp.Low_Code.Variables;
using Godot;
namespace Babushka.scripts.CSharp.Common.CharacterControls;
public partial class InteractionArea2D : Node2D
{
[ExportGroup("Settings")]
[ExportGroup("Settings")]
[Export] private VariableListener _selectionChangeListener;
[Export] private Area2D _area;
[Export] private Label _label;
[Export] private bool _active = true;
@ -29,6 +31,7 @@ public partial class InteractionArea2D : Node2D
{
ProcessMode = value ? ProcessModeEnum.Inherit : ProcessModeEnum.Disabled;
Visible = value;
_selectionChangeListener.ProcessMode = value ? ProcessModeEnum.Inherit : ProcessModeEnum.Disabled;
_active = value;
}
}
@ -63,7 +66,6 @@ public partial class InteractionArea2D : Node2D
foreach (var sprite in _spritesToOutline)
{
GD.Print($"Highlighting outline material on {sprite.Name} Nr. {GetInstanceId()}");
sprite.Material = _outlineMaterial;
}
}
@ -79,7 +81,6 @@ public partial class InteractionArea2D : Node2D
for (var i = 0; i < _spritesToOutline.Length; i++)
{
var sprite = _spritesToOutline[i];
GD.Print($"Resetting outline material on {sprite.Name} Nr. {GetInstanceId()}");
sprite.Material = _backupMaterials[i];
}
}
@ -107,16 +108,7 @@ public partial class InteractionArea2D : Node2D
{
if (_area.HasOverlappingAreas())
{
_label.Hide();
if (_useOutline)
{
for (var i = 0; i < _spritesToOutline.Length; i++)
{
var sprite = _spritesToOutline[i];
sprite.Material = _backupMaterials[i];
}
}
ResetHighlight();
Interact();
}
}

@ -47,6 +47,8 @@ public partial class FieldBehaviour2D : Sprite2D, ISaveable
private bool _canWater;
private int _currentDay;
public bool IsPlanted;
private PlantBehaviour2D? _currentPlant;
private const string DAY_COUNTER_SAVE_ID = "12c6da2e-fc71-4281-a04a-dfd3c7943975";
@ -58,7 +60,7 @@ public partial class FieldBehaviour2D : Sprite2D, ISaveable
// fieldstate == tilled / watered && samen im Inventar
_canPlant = (FieldState == FieldState.Tilled || FieldState == FieldState.Watered) && _seedsActive;
// fieldstate == tilled && watering can ausgewählt
_canWater = (FieldState == FieldState.Tilled || FieldState == FieldState.Planted) && _wateringCanActive;
_canWater = (FieldState == FieldState.Tilled || IsPlanted) && _wateringCanActive;
PlantingInteraction.IsActive = _canPlant || _canWater;
}
@ -103,17 +105,14 @@ public partial class FieldBehaviour2D : Sprite2D, ISaveable
case FieldState.Tilled:
FieldState = FieldState.Tilled;
_fieldSprite.Texture = Tilled;
PlantingInteraction.IsActive = true;
if(!IsPlanted)
PlantingInteraction.IsActive = true;
break;
case FieldState.Watered:
FieldState = FieldState.Watered;
_fieldSprite.Texture = Watered;
PlantingInteraction.IsActive = true;
break;
case FieldState.Planted:
FieldState = FieldState.Planted;
_fieldSprite.Texture = Tilled;
PlantingInteraction.IsActive = false;
if(!IsPlanted)
PlantingInteraction.IsActive = true;
break;
default:
FieldState = FieldState.NotFound;
@ -124,7 +123,6 @@ public partial class FieldBehaviour2D : Sprite2D, ISaveable
UpdateSaveData();
}
public void Water()
{
if (WateringCanState.GetFillState() > 0 && FieldState != FieldState.Watered)
@ -150,7 +148,7 @@ public partial class FieldBehaviour2D : Sprite2D, ISaveable
if (_canPlant && TryPlant())
{
EmitSignal(SignalName.Planted);
UpdateFieldState(FieldState.Planted);
UpdateSaveData();
}
if (_canWater)
@ -158,6 +156,17 @@ public partial class FieldBehaviour2D : Sprite2D, ISaveable
Water();
}
}
public void ChangePlantedState()
{
GD.Print("Adding Plant.");
IsPlanted = true;
if(FieldState == FieldState.Tilled)
_fieldSprite.Texture = Tilled;
if(FieldState == FieldState.Watered)
_fieldSprite.Texture = Watered;
PlantingInteraction.IsActive = false;
}
private bool TryPlant()
{
@ -186,6 +195,7 @@ public partial class FieldBehaviour2D : Sprite2D, ISaveable
if (_currentPlant != null)
{
ChangePlantedState();
_currentPlant.DayPlanted = _currentDay;
}
}
@ -208,6 +218,7 @@ public partial class FieldBehaviour2D : Sprite2D, ISaveable
{
_currentPlant = null;
UpdateFieldState(FieldState.Empty, true);
IsPlanted = false;
}
#region SAVE AND LOAD
@ -220,11 +231,12 @@ public partial class FieldBehaviour2D : Sprite2D, ISaveable
var payloadData = new Dictionary<string, Variant>
{
{ "field_state", (int)FieldState },
{ "day_count_on_last_exit", _currentDay}
{ "day_count_on_last_exit", _currentDay},
};
if (_currentPlant != null)
if (IsPlanted)
{
GD.Print("Saving plant data.");
payloadData.Add(
"plant_data", new Dictionary<string, Variant>()
{
@ -257,6 +269,7 @@ public partial class FieldBehaviour2D : Sprite2D, ISaveable
// get plant first because it's also relevant for the field state
if (save.TryGetValue("plant_data", out Variant plantDataVar))
{
IsPlanted = true;
Dictionary<string, Variant> plantDataDict = plantDataVar.AsGodotDictionary<string, Variant>();
if (plantDataDict.TryGetValue("prefab_path", out Variant prefabPathVar))
@ -313,17 +326,10 @@ public partial class FieldBehaviour2D : Sprite2D, ISaveable
// if day is today, then just use the provided field state as is.
if (CalendarController.Instance != null && _currentDay != lastDayCount)
{
// if the field was watered the day before, set it to tilled or planted.
// if the field was watered the day before, set it to tilled
if (fieldStateInt == 3)
{
if (_currentPlant != null)
{
fieldStateInt = 2;
}
else
{
fieldStateInt = 1;
}
fieldStateInt = 1;
}
}
}

@ -7,7 +7,6 @@ public enum FieldState
{
Empty = 0,
Tilled = 1,
Planted = 2,
Watered = 3,
NotFound = 99
}

@ -7,11 +7,16 @@ public partial class WellBehaviour : Node2D
{
[Export] private InteractionArea2D _interactionArea;
public override void _Ready()
public override void _EnterTree()
{
WateringCanState.WateringCanActiveStateChanged += OnWateringCanStateChanged;
}
public override void _ExitTree()
{
WateringCanState.WateringCanActiveStateChanged -= OnWateringCanStateChanged;
}
private void OnWateringCanStateChanged(bool state)
{
_interactionArea.IsActive = state;

@ -63,6 +63,9 @@ public partial class VariableListener : Node
/// </summary>
public void EventPayloadChanged(Variant payload, Variant oldPayload)
{
if (ProcessMode == ProcessModeEnum.Disabled)
return;
if(_showLog)
GD.Print($"Calling Event Payload Changed Signals on: " + Name);
EmitSignal(SignalName.PayloadChanged, payload, oldPayload);

Loading…
Cancel
Save