added quick and dirty mock quest

.idea/.idea.Babushka/.idea/.name

@@ -0,0 +1 @@
+Babushka

.idea/.idea.Babushka/.idea/dictionaries/project.xml

@@ -0,0 +1,3 @@
+<component name="ProjectDictionaryState">
+  <dictionary name="project" />
+</component>

Babushka.sln.DotSettings

@@ -1,7 +1,5 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=236f7aa5_002D7b06_002D43ca_002Dbf2a_002D9b31bfcff09a/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Any" AccessRightKinds="Private" Description="Constant fields (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="CONSTANT_FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" WarnAboutPrefixesAndSuffixes="False" Prefix="" Suffix="" Style="AA_BB" /&gt;&lt;/Policy&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=53eecf85_002Dd821_002D40e8_002Dac97_002Dfdb734542b84/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Instance" AccessRightKinds="Protected, ProtectedInternal, Internal, Public, PrivateProtected" Description="Instance fields (not private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="FIELD" /&gt;&lt;Kind Name="READONLY_FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" WarnAboutPrefixesAndSuffixes="False" Prefix="" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=669e5282_002Dfb4b_002D4e90_002D91e7_002D07d269d04b60/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Any" AccessRightKinds="Protected, ProtectedInternal, Internal, Public, PrivateProtected" Description="Constant fields (not private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="CONSTANT_FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" WarnAboutPrefixesAndSuffixes="False" Prefix="" Suffix="" Style="AA_BB" /&gt;&lt;/Policy&gt;</s:String>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=0B2502BD29F5EC4798EEFD2950AA7E06/Description/@EntryValue">Godot Signal</s:String>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=0B2502BD29F5EC4798EEFD2950AA7E06/Text/@EntryValue">[Signal]
 public delegate void $SignalName$EventHandler($END$);</s:String>

art/characters/Vesna/angry.png.import

@@ -1,40 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://dc1xim3mqlj1o"
-path="res://.godot/imported/angry.png-e4eff51de743a11598498a3e284ae0a1.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://art/characters/Vesna/angry.png"
-dest_files=["res://.godot/imported/angry.png-e4eff51de743a11598498a3e284ae0a1.ctex"]
-
-[params]
-
-compress/mode=0
-compress/high_quality=false
-compress/lossy_quality=0.7
-compress/uastc_level=0
-compress/rdo_quality_loss=0.0
-compress/hdr_compression=1
-compress/normal_map=0
-compress/channel_pack=0
-mipmaps/generate=false
-mipmaps/limit=-1
-roughness/mode=0
-roughness/src_normal=""
-process/channel_remap/red=0
-process/channel_remap/green=1
-process/channel_remap/blue=2
-process/channel_remap/alpha=3
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/normal_map_invert_y=false
-process/hdr_as_srgb=false
-process/hdr_clamp_exposure=false
-process/size_limit=0
-detect_3d/compress_to=1

art/characters/Vesna/sad.png.import

@@ -1,40 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://bhd8ui4bdauoq"
-path="res://.godot/imported/sad.png-07f44c713781510c0fa11821d4fa50bc.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://art/characters/Vesna/sad.png"
-dest_files=["res://.godot/imported/sad.png-07f44c713781510c0fa11821d4fa50bc.ctex"]
-
-[params]
-
-compress/mode=0
-compress/high_quality=false
-compress/lossy_quality=0.7
-compress/uastc_level=0
-compress/rdo_quality_loss=0.0
-compress/hdr_compression=1
-compress/normal_map=0
-compress/channel_pack=0
-mipmaps/generate=false
-mipmaps/limit=-1
-roughness/mode=0
-roughness/src_normal=""
-process/channel_remap/red=0
-process/channel_remap/green=1
-process/channel_remap/blue=2
-process/channel_remap/alpha=3
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/normal_map_invert_y=false
-process/hdr_as_srgb=false
-process/hdr_clamp_exposure=false
-process/size_limit=0
-detect_3d/compress_to=1

art/characters/Vesna/smile.png.import

@@ -1,40 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://4xvgqwrwh3vw"
-path="res://.godot/imported/smile.png-2ef625357927edd0d495bf554ac57e21.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://art/characters/Vesna/smile.png"
-dest_files=["res://.godot/imported/smile.png-2ef625357927edd0d495bf554ac57e21.ctex"]
-
-[params]
-
-compress/mode=0
-compress/high_quality=false
-compress/lossy_quality=0.7
-compress/uastc_level=0
-compress/rdo_quality_loss=0.0
-compress/hdr_compression=1
-compress/normal_map=0
-compress/channel_pack=0
-mipmaps/generate=false
-mipmaps/limit=-1
-roughness/mode=0
-roughness/src_normal=""
-process/channel_remap/red=0
-process/channel_remap/green=1
-process/channel_remap/blue=2
-process/channel_remap/alpha=3
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/normal_map_invert_y=false
-process/hdr_as_srgb=false
-process/hdr_clamp_exposure=false
-process/size_limit=0
-detect_3d/compress_to=1

art/characters/Vesna/surprise.png.import

@@ -1,40 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://dcxkqut5edp2b"
-path="res://.godot/imported/surprise.png-79afea119cbe923f9aa9e4554a23ed80.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://art/characters/Vesna/surprise.png"
-dest_files=["res://.godot/imported/surprise.png-79afea119cbe923f9aa9e4554a23ed80.ctex"]
-
-[params]
-
-compress/mode=0
-compress/high_quality=false
-compress/lossy_quality=0.7
-compress/uastc_level=0
-compress/rdo_quality_loss=0.0
-compress/hdr_compression=1
-compress/normal_map=0
-compress/channel_pack=0
-mipmaps/generate=false
-mipmaps/limit=-1
-roughness/mode=0
-roughness/src_normal=""
-process/channel_remap/red=0
-process/channel_remap/green=1
-process/channel_remap/blue=2
-process/channel_remap/alpha=3
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/normal_map_invert_y=false
-process/hdr_as_srgb=false
-process/hdr_clamp_exposure=false
-process/size_limit=0
-detect_3d/compress_to=1

art/characters/Vesna/surprised.png.import

@@ -1,40 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://ing4qavovh4r"
-path="res://.godot/imported/surprised.png-ab52144d1f41186a697c9a0e1584b3ee.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://art/characters/Vesna/surprised.png"
-dest_files=["res://.godot/imported/surprised.png-ab52144d1f41186a697c9a0e1584b3ee.ctex"]
-
-[params]
-
-compress/mode=0
-compress/high_quality=false
-compress/lossy_quality=0.7
-compress/uastc_level=0
-compress/rdo_quality_loss=0.0
-compress/hdr_compression=1
-compress/normal_map=0
-compress/channel_pack=0
-mipmaps/generate=false
-mipmaps/limit=-1
-roughness/mode=0
-roughness/src_normal=""
-process/channel_remap/red=0
-process/channel_remap/green=1
-process/channel_remap/blue=2
-process/channel_remap/alpha=3
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/normal_map_invert_y=false
-process/hdr_as_srgb=false
-process/hdr_clamp_exposure=false
-process/size_limit=0
-detect_3d/compress_to=1

art/fightworld_background.png.import

@@ -1,40 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://ciaabo8kcx2hw"
-path="res://.godot/imported/fightworld_background.png-be6589f7fa4be8e56ee338eabec1ff36.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://art/fightworld_background.png"
-dest_files=["res://.godot/imported/fightworld_background.png-be6589f7fa4be8e56ee338eabec1ff36.ctex"]
-
-[params]
-
-compress/mode=0
-compress/high_quality=false
-compress/lossy_quality=0.7
-compress/uastc_level=0
-compress/rdo_quality_loss=0.0
-compress/hdr_compression=1
-compress/normal_map=0
-compress/channel_pack=0
-mipmaps/generate=false
-mipmaps/limit=-1
-roughness/mode=0
-roughness/src_normal=""
-process/channel_remap/red=0
-process/channel_remap/green=1
-process/channel_remap/blue=2
-process/channel_remap/alpha=3
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/normal_map_invert_y=false
-process/hdr_as_srgb=false
-process/hdr_clamp_exposure=false
-process/size_limit=0
-detect_3d/compress_to=1

art/indoor/indoor outdoor/domovoi_single.png.import

@@ -1,40 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://dfp3tpx3fjges"
-path="res://.godot/imported/domovoi_single.png-54325e2fb332bab49d527581994f50c7.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://art/indoor/indoor outdoor/domovoi_single.png"
-dest_files=["res://.godot/imported/domovoi_single.png-54325e2fb332bab49d527581994f50c7.ctex"]
-
-[params]
-
-compress/mode=0
-compress/high_quality=false
-compress/lossy_quality=0.7
-compress/uastc_level=0
-compress/rdo_quality_loss=0.0
-compress/hdr_compression=1
-compress/normal_map=0
-compress/channel_pack=0
-mipmaps/generate=false
-mipmaps/limit=-1
-roughness/mode=0
-roughness/src_normal=""
-process/channel_remap/red=0
-process/channel_remap/green=1
-process/channel_remap/blue=2
-process/channel_remap/alpha=3
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/normal_map_invert_y=false
-process/hdr_as_srgb=false
-process/hdr_clamp_exposure=false
-process/size_limit=0
-detect_3d/compress_to=1

art/indoor/vesna_indoor_bed.png.import

@@ -1,40 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://s1yoemhrupwe"
-path="res://.godot/imported/vesna_indoor_bed.png-82be6dfddfce8701f4d35f6270cb0cdb.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://art/indoor/vesna_indoor_bed.png"
-dest_files=["res://.godot/imported/vesna_indoor_bed.png-82be6dfddfce8701f4d35f6270cb0cdb.ctex"]
-
-[params]
-
-compress/mode=0
-compress/high_quality=false
-compress/lossy_quality=0.7
-compress/uastc_level=0
-compress/rdo_quality_loss=0.0
-compress/hdr_compression=1
-compress/normal_map=0
-compress/channel_pack=0
-mipmaps/generate=false
-mipmaps/limit=-1
-roughness/mode=0
-roughness/src_normal=""
-process/channel_remap/red=0
-process/channel_remap/green=1
-process/channel_remap/blue=2
-process/channel_remap/alpha=3
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/normal_map_invert_y=false
-process/hdr_as_srgb=false
-process/hdr_clamp_exposure=false
-process/size_limit=0
-detect_3d/compress_to=1

art/indoor/vesna_indoor_door.png.import

@@ -1,40 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://dnlhlf1mx01h5"
-path="res://.godot/imported/vesna_indoor_door.png-480faae15ccfa0c6172c753cd0b4d6a0.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://art/indoor/vesna_indoor_door.png"
-dest_files=["res://.godot/imported/vesna_indoor_door.png-480faae15ccfa0c6172c753cd0b4d6a0.ctex"]
-
-[params]
-
-compress/mode=0
-compress/high_quality=false
-compress/lossy_quality=0.7
-compress/uastc_level=0
-compress/rdo_quality_loss=0.0
-compress/hdr_compression=1
-compress/normal_map=0
-compress/channel_pack=0
-mipmaps/generate=false
-mipmaps/limit=-1
-roughness/mode=0
-roughness/src_normal=""
-process/channel_remap/red=0
-process/channel_remap/green=1
-process/channel_remap/blue=2
-process/channel_remap/alpha=3
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/normal_map_invert_y=false
-process/hdr_as_srgb=false
-process/hdr_clamp_exposure=false
-process/size_limit=0
-detect_3d/compress_to=1

dialog/Characters/Domovoi.dch

@@ -19,22 +19,12 @@
 },
 "style": "NPC_narrative"
 },
-&"default_portrait": "default",
+&"default_portrait": "",
 &"description": "Yeli's Domovoi",
 &"display_name": "Domovoi",
 &"mirror": false,
 &"nicknames": [""],
 &"offset": Vector2(0, 0),
-&"portraits": {
+&"portraits": {},
-"default": {
-"export_overrides": {
-"image": "\"res://art/indoor/indoor outdoor/domovoi_single.png\""
-},
-"mirror": false,
-"offset": Vector2(0, -300),
-"scale": 1.0,
-"scene": ""
-}
-},
 &"scale": 1.0
 }

dialog/Characters/semi_cat.dch

@@ -1,29 +1,19 @@
 {
 "@path": "res://addons/dialogic/Resources/character.gd",
 "@subpath": NodePath(""),
-&"_translation_id": "16",
+"_translation_id": "16",
-&"color": Color(1, 1, 1, 1),
+"color": Color(1, 1, 1, 1),
-&"custom_info": {
+"custom_info": {
 "sound_mood_default": "",
 "sound_moods": {},
 "style": ""
 },
-&"default_portrait": "side",
+"default_portrait": "",
-&"description": "",
+"description": "",
-&"display_name": "Black Cat",
+"display_name": "Semi Cat",
-&"mirror": false,
-&"nicknames": [""],
-&"offset": Vector2(0, 0),
-&"portraits": {
-"side": {
-"export_overrides": {
-"image": "\"res://art/animals/katze.png\""
-},
 "mirror": false,
-"offset": Vector2(0, -300),
+"nicknames": [""],
-"scale": 1.5,
+"offset": Vector2(0, 0),
-"scene": ""
+"portraits": {},
-}
+"scale": 1.0
-},
-&"scale": 1.0
 }

dialog/Characters/vesna.dch

@@ -26,15 +26,6 @@
 &"nicknames": ["vesna"],
 &"offset": Vector2(-300, 0),
 &"portraits": {
-"angry": {
-"export_overrides": {
-"image": "\"res://art/characters/Vesna/angry.png\""
-},
-"mirror": false,
-"offset": Vector2(150, 0),
-"scale": 0.65,
-"scene": ""
-},
 "front": {
 "export_overrides": {
 "image": "\"res://art/animation/Vesna2D/Vesna Anims Sequences/F01-Idle/0001.png\""
@@ -61,42 +52,6 @@
 "offset": Vector2(0, 0),
 "scale": 1.0,
 "scene": ""
-},
-"sad": {
-"export_overrides": {
-"image": "\"res://art/characters/Vesna/sad.png\""
-},
-"mirror": false,
-"offset": Vector2(150, 0),
-"scale": 0.65,
-"scene": ""
-},
-"smile": {
-"export_overrides": {
-"image": "\"res://art/characters/Vesna/smile.png\""
-},
-"mirror": false,
-"offset": Vector2(150, 0),
-"scale": 0.65,
-"scene": ""
-},
-"surprise": {
-"export_overrides": {
-"image": "\"res://art/characters/Vesna/surprise.png\""
-},
-"mirror": false,
-"offset": Vector2(150, 0),
-"scale": 0.65,
-"scene": ""
-},
-"surprised": {
-"export_overrides": {
-"image": "\"res://art/characters/Vesna/surprised.png\""
-},
-"mirror": false,
-"offset": Vector2(150, 0),
-"scale": 0.65,
-"scene": ""
 }
 },
 &"scale": 1.0

dialog/cat.dtl

@@ -1,5 +0,0 @@
-join vesna (half side) left
-join semi_cat right
-vesna: (pets)
-semi_cat: mrau!
-[end_timeline]

dialog/cat.dtl.uid

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

dialog/disclaimer.dtl

@@ -2,7 +2,7 @@ join vesna left
 vesna: Hello!
 join Yeli (_side) right
 Yeli (_frontal): Welcome to Babushka!
-vesna (half side): We are Cozy Raven. This is a preview showcase.
+vesna (half side): We are Cozy Raven. This is our first showcase.
 Yeli (_part_side): Many of the lofty, idealist, dreamy things that we wanted to implement are still in the backlog, waiting for their turn.
 vesna (front): But alas! The deadlines loomed, the bugs were strong with this one, and our days only have 24 hours.
 Yeli (_frontal): So please be kind when you test this demo. We poured our hearts and our love for the slavic folklore into this one and will continue to do so.

dialog/quests/beetroot/quest3_beets_end.dtl

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

dialog/quests/ducks/quest1_ducks_start.dtl

@@ -1,5 +1,5 @@
 join Yeli right
-join vesna (surprise) left
+join vesna left
 [quest_complete quest_resource="res://resources/quests/demo/1_talk_yeli_1.tres"]
 Yeli (_part_side): Come here, you little quacking beast!
 - What a mess!

dialog/quests/forest/quest5_forest_end.dtl

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

dialog/quests/forest/quest5_forest_start.dtl

@@ -2,7 +2,7 @@
 join vesna left
 join Chuga right
 Chuga: Look who it is!
-vesna (half side): 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?
 vesna: Will you let me through?
 Chuga: Will I?

dialog/quests/tomatoes/quest2_tomatoes_interim.dtl

@@ -1,9 +1,9 @@
-join Yeli left
+join Yeli center
-join vesna right
+join vesna center
 [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!
 label plant tomatoes
-Yeli (_frontal): Use the hoe to break up the soil. Then plant the seeds and water the fields.
+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?

dialog/quests/tomatoes/quest2_tomatoes_start.dtl

@@ -2,11 +2,11 @@ join Yeli right
 join vesna left
 [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.
-vesna (half side): 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 (_frontal): Indeed, I have.
+Yeli (_part_side): Indeed, I have.
 Yeli (_part_side): But, oh my, those ducks messed up the tomatos.
-Yeli (_frontal): Oh, would you like to assist me?
+Yeli (_part_side): Oh, would you like to assist me?
-vesna (front): 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!
 [quest_activate quest_resource="res://resources/quests/demo/4_collect_tools.tres"]
 [end_timeline]

dialog/testing/domovoi_tut.dtl

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

dialog/testing/domovoi_tut.dtl.uid

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

export_presets.cfg

@@ -9,7 +9,7 @@ custom_features=""
 export_filter="all_resources"
 include_filter=""
 exclude_filter=""
-export_path="_builds/Babushka_showcase_6a/Babushka.exe"
+export_path="_builds/Babushka_win_0_5/Babushka.exe"
 patches=PackedStringArray()
 encryption_include_filters=""
 encryption_exclude_filters=""
@@ -26,7 +26,6 @@ debug/export_console_wrapper=1
 binary_format/embed_pck=false
 texture_format/s3tc_bptc=true
 texture_format/etc2_astc=false
-shader_baker/enabled=false
 binary_format/architecture="x86_64"
 codesign/enable=false
 codesign/timestamp=true
@@ -80,7 +79,7 @@ custom_features=""
 export_filter="all_resources"
 include_filter=""
 exclude_filter=""
-export_path="_builds/Babushka_showcase_lux_06a/Babushka.x86_64"
+export_path="_builds/Babushka_linux_0_5/Babushka.x86_64"
 patches=PackedStringArray()
 encryption_include_filters=""
 encryption_exclude_filters=""
@@ -97,7 +96,6 @@ debug/export_console_wrapper=1
 binary_format/embed_pck=false
 texture_format/s3tc_bptc=true
 texture_format/etc2_astc=false
-shader_baker/enabled=false
 binary_format/architecture="x86_64"
 ssh_remote_deploy/enabled=false
 ssh_remote_deploy/host="user@host_ip"

prefabs/Interactables/trash_object.tscn

@@ -1,8 +1,7 @@
-[gd_scene load_steps=18 format=3 uid="uid://sbf12hin4kes"]
+[gd_scene load_steps=17 format=3 uid="uid://sbf12hin4kes"]
 
 [ext_resource type="Texture2D" uid="uid://bylgmr0skwtrs" path="res://art/farm/farming/farmobjekte/broken tools atlas.png" id="1_k4ca3"]
 [ext_resource type="PackedScene" uid="uid://cqc72e4hq6bcd" path="res://prefabs/interactions/interaction_area_2d.tscn" id="2_gcgfd"]
-[ext_resource type="Script" uid="uid://c2cgj153m05sp" path="res://scripts/CSharp/Common/Interactables/TrashObject.cs" id="2_u7jgg"]
 [ext_resource type="AudioStream" uid="uid://be6g8b3v3u1ai" path="res://audio/sfx/Kitchen/SFX_Cooking_Knife_PickUp_01.wav" id="3_ktmp7"]
 [ext_resource type="AudioStream" uid="uid://cgjsajsdrrn0j" path="res://audio/sfx/Kitchen/SFX_Cooking_Knife_PutDown_01.wav" id="4_ic616"]
 [ext_resource type="AudioStream" uid="uid://br4drgupled6c" path="res://audio/sfx/Kitchen/SFX_Cooking_Pot_01.wav" id="5_dx175"]
@@ -30,15 +29,13 @@ stream_7/stream = ExtResource("10_aqih4")
 stream_8/stream = ExtResource("11_kb03l")
 stream_9/stream = ExtResource("12_kka6u")
 
-[node name="trashObject" type="Sprite2D" groups=["Saveable"]]
+[node name="trashObject" type="Sprite2D"]
 z_index = 1
 y_sort_enabled = true
 texture = ExtResource("1_k4ca3")
 offset = Vector2(1, -215)
 region_enabled = true
 region_rect = Rect2(44, 479, 356, 503)
-script = ExtResource("2_u7jgg")
-metadata/SaveID = ""
 
 [node name="InteractionArea" parent="." node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("2_gcgfd")]
 position = Vector2(0, -172)
@@ -54,6 +51,6 @@ script = ExtResource("13_wswkg")
 script = ExtResource("14_dx175")
 _eventResources = Array[Object]([ExtResource("15_u7jgg")])
 
-[connection signal="Interacted" from="InteractionArea" to="." method="Collect"]
+[connection signal="Interacted" from="InteractionArea" to="." method="queue_free"]
 [connection signal="Interacted" from="InteractionArea" to="AudioStreamPlayer2D" method="PlayOneShot"]
 [connection signal="Interacted" from="InteractionArea" to="PickupAnimationEventRaiser" method="RaiseEvents"]

prefabs/SaveSystem/save_system.tscn

@@ -1,12 +0,0 @@
-[gd_scene load_steps=3 format=3 uid="uid://7pvvop5hfl01"]
-
-[ext_resource type="Script" uid="uid://iquhbkr7pqeg" path="res://scripts/CSharp/Common/Savegame/SaveCheats.cs" id="1_vcrak"]
-[ext_resource type="Script" uid="uid://ca4s0algeij1h" path="res://scripts/CSharp/Common/Savegame/SaveIDProviderTool.cs" id="2_q0tmy"]
-
-[node name="SaveSystem" type="Node"]
-
-[node name="SaveGameCheat" type="Node" parent="."]
-script = ExtResource("1_vcrak")
-
-[node name="SaveIDProvider" type="Node" parent="."]
-script = ExtResource("2_q0tmy")

prefabs/characters/Vesna.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=495 format=3 uid="uid://c25udixd5m6l0"]
+[gd_scene load_steps=489 format=3 uid="uid://c25udixd5m6l0"]
 
 [ext_resource type="Script" uid="uid://b05uyj001ehwi" path="res://scripts/CSharp/Common/Farming/VesnaBehaviour2D.cs" id="1_yd5ep"]
 [ext_resource type="Script" uid="uid://cjbclkxesh3hc" path="res://scripts/CSharp/Common/CharacterControls/PlayerMovement.cs" id="2_1vqmv"]
@@ -286,7 +286,6 @@
 [ext_resource type="Script" uid="uid://dj1qjambsa4pg" path="res://scripts/CSharp/Common/Farming/WateringCanSaveHelper.cs" id="472_kduih"]
 [ext_resource type="Texture2D" uid="uid://blh0t2ofqj2uq" path="res://art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Gießkanne/0016.png" id="472_wdxsr"]
 [ext_resource type="AudioStream" uid="uid://dymoalptxmge" path="res://audio/sfx/Footsteps/Single/Gravel/Reverb/SFX_Footstep_Gravel_04_R.wav" id="473_8hbu5"]
-[ext_resource type="Script" uid="uid://ccdhx1lt4n271" path="res://scripts/CSharp/Common/Camera/CameraTarget.cs" id="473_fn3kd"]
 [ext_resource type="AudioStream" uid="uid://4555a4w30tda" path="res://audio/sfx/Footsteps/Single/Gravel/Reverb/SFX_Footstep_Gravel_05_R.wav" id="474_t1d6r"]
 [ext_resource type="Texture2D" uid="uid://3t1m2xi4ks75" path="res://art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Gießkanne/0018.png" id="474_tu801"]
 [ext_resource type="AudioStream" uid="uid://dpqvnogggvgea" path="res://audio/sfx/Footsteps/Single/Gravel/Reverb/SFX_Footstep_Gravel_06_R.wav" id="475_83c4i"]
@@ -300,12 +299,8 @@
 [ext_resource type="Texture2D" uid="uid://bopxv06co1osl" path="res://art/animation/Vesna2D/Vesna Anims Sequences/F02-Walk/0006.png" id="482_wfdif"]
 [ext_resource type="Script" uid="uid://iquhbkr7pqeg" path="res://scripts/CSharp/Common/Savegame/SaveCheats.cs" id="483_kduih"]
 [ext_resource type="Texture2D" uid="uid://coyggdfwgkeru" path="res://art/animation/Vesna2D/Vesna Anims Sequences/F02-Walk/0008.png" id="484_32thn"]
-[ext_resource type="AudioStream" uid="uid://fsiypqhql67w" path="res://audio/sfx/Farming/SFX_GettingWater_01.wav" id="484_jb7tm"]
 [ext_resource type="Script" uid="uid://ca4s0algeij1h" path="res://scripts/CSharp/Common/Savegame/SaveIDProviderTool.cs" id="484_upuan"]
-[ext_resource type="AudioStream" uid="uid://foyw26hq1qp5" path="res://audio/sfx/Farming/SFX_GettingWater_02.wav" id="485_fn3kd"]
 [ext_resource type="Texture2D" uid="uid://du6x1h42smp6m" path="res://art/animation/Vesna2D/Vesna Anims Sequences/F02-Walk/0010.png" id="486_kobao"]
-[ext_resource type="AudioStream" uid="uid://c43a6x43jkikl" path="res://audio/sfx/Farming/SFX_GettingWater_Well_01_Reverb.wav" id="486_ux0r8"]
-[ext_resource type="Script" uid="uid://cfnrd5k1k0gxw" path="res://scripts/CSharp/Common/AudioPlayer2D.cs" id="487_7qtxa"]
 [ext_resource type="Texture2D" uid="uid://bras5gn8ov27l" path="res://art/animation/Vesna2D/Vesna Anims Sequences/F02-Walk/0012.png" id="488_ygjj5"]
 [ext_resource type="Texture2D" uid="uid://rjmsht4g8dvp" path="res://art/animation/Vesna2D/Vesna Anims Sequences/F02-Walk/0014.png" id="490_6603x"]
 [ext_resource type="Texture2D" uid="uid://diqnv8ut7lffx" path="res://art/animation/Vesna2D/Vesna Anims Sequences/F02-Walk/0016.png" id="492_0tmn6"]
@@ -489,7 +484,7 @@
 [ext_resource type="Texture2D" uid="uid://b0v61all3tsny" path="res://art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Gießkanne/0018.png" id="812_sf8kv"]
 [ext_resource type="Texture2D" uid="uid://cao7vqax8cblo" path="res://art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Gießkanne/0020.png" id="814_3uq4g"]
 [ext_resource type="Script" uid="uid://bcskt5ckh3rqa" path="res://scripts/CSharp/Common/Farming/FarmingControls2D.cs" id="817_6nrw3"]
-[ext_resource type="Script" path="res://scripts/GdScript/dialogic_toggle.gd" id="819_4na52"]
+[ext_resource type="Script" uid="uid://cvkw4qd2hxksi" path="res://scripts/GdScript/dialogic_toggle.gd" id="819_4na52"]
 
 [sub_resource type="CircleShape2D" id="CircleShape2D_ssqtd"]
 radius = 110.018
@@ -2092,17 +2087,11 @@ stream_4/stream = ExtResource("474_t1d6r")
 stream_5/stream = ExtResource("475_83c4i")
 stream_6/stream = ExtResource("476_deeju")
 
-[sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_4da77"]
+[node name="Vesna" type="Node2D" node_paths=PackedStringArray("_farmingControls", "_player2d", "_vesnaAnimations")]
-streams_count = 3
-stream_0/stream = ExtResource("484_jb7tm")
-stream_1/stream = ExtResource("485_fn3kd")
-stream_2/stream = ExtResource("486_ux0r8")
-
-[node name="Vesna" type="Node2D" node_paths=PackedStringArray("_farmingControls", "player2d", "_vesnaAnimations")]
 y_sort_enabled = true
 script = ExtResource("1_yd5ep")
 _farmingControls = NodePath("FarmingControls")
-player2d = NodePath("CharacterBody2D")
+_player2d = NodePath("CharacterBody2D")
 _vesnaAnimations = NodePath("CharacterBody2D/visuals")
 _hoe = ExtResource("2_dnm27")
 _wateringCan = ExtResource("3_e04c3")
@@ -2134,6 +2123,9 @@ frame = 7
 frame_progress = 0.229832
 offset = Vector2(0, -450)
 
+[node name="DetectionCross" parent="CharacterBody2D" instance=ExtResource("466_e04c3")]
+position = Vector2(0, -200)
+
 [node name="PlantCreatedEventListener" type="Node" parent="CharacterBody2D"]
 script = ExtResource("467_8hbu5")
 _eventResources = Array[Object]([ExtResource("468_t1d6r")])
@@ -2183,13 +2175,6 @@ scrollable = false
 script = ExtResource("472_kduih")
 _wateringCanFillStateNode = NodePath("../WateringCanFillState")
 
-[node name="DetectionCross" parent="CharacterBody2D" instance=ExtResource("466_e04c3")]
-position = Vector2(0, -260)
-
-[node name="CameraTarget" type="Node2D" parent="CharacterBody2D"]
-script = ExtResource("473_fn3kd")
-Priority = 10.0
-
 [node name="FarmingControls" type="Node2D" parent="." node_paths=PackedStringArray("_movingPlayer")]
 script = ExtResource("817_6nrw3")
 _sceneKeyProvider = ExtResource("471_83c4i")
@@ -2212,12 +2197,6 @@ script = ExtResource("471_2f15g")
 [node name="Timer" type="Timer" parent="SFX/FootstepsAudio"]
 wait_time = 0.5
 
-[node name="FillWater SFX2" type="AudioStreamPlayer2D" parent="SFX"]
-stream = SubResource("AudioStreamRandomizer_4da77")
-max_distance = 20000000.0
-playback_type = 2
-script = ExtResource("487_7qtxa")
-
 [node name="SaveSystem" type="Node" parent="."]
 
 [node name="SaveGameCheat" type="Node" parent="SaveSystem"]
@@ -2227,7 +2206,6 @@ script = ExtResource("483_kduih")
 script = ExtResource("484_upuan")
 
 [connection signal="FilledWateringCan" from="." to="CharacterBody2D/WateringCan/WateringCanUI" method="Refill"]
-[connection signal="FilledWateringCan" from="." to="SFX/FillWater SFX2" method="PlayOneShot"]
 [connection signal="InventorySelectionChanged" from="." to="CharacterBody2D/WateringCan/WateringCanUI" method="IsWateringCanActive"]
 [connection signal="PickedUpTool" from="." to="CharacterBody2D/visuals" method="ActivateTool"]
 [connection signal="PickedUpTool" from="." to="CharacterBody2D/WateringCan/WateringCanUI" method="IsWateringCanActive"]

prefabs/characters/Yeli.tscn

@@ -247,9 +247,9 @@ script = ExtResource("50_a7v1a")
 
 [connection signal="Talking" from="." to="Dialogic starter" method="open"]
 [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="InteractionArea" method="SetActiveTrue"]
+[connection signal="timelineEnded" from="Dialogic starter" to="InteractionArea" method="ToggleActive"]
-[connection signal="timelineStarted" from="Dialogic starter" to="InteractionArea" method="SetActiveFalse"]
 [connection signal="timelineEnded" from="DialogicToggle" to="." method="ToggleTalking"]
 [connection signal="timelineStarted" from="DialogicToggle" to="SFX/AudioStreamPlayer" method="PlayOneShot"]
 

prefabs/entity_placer/VesnaPlacer.tscn

@@ -1,17 +0,0 @@
-[gd_scene load_steps=4 format=3 uid="uid://cv7trh2b3dyiv"]
-
-[ext_resource type="Script" uid="uid://dcn4giw1auva4" path="res://scripts/CSharp/GameEntity/EntityPlacer/VesnaEntityPlacer.cs" id="1_nq5fu"]
-[ext_resource type="Script" uid="uid://n7oihifvqp23" path="res://scripts/CSharp/Common/Animation/VesnaAnimations.cs" id="2_cpdud"]
-[ext_resource type="Texture2D" uid="uid://cloe0etis2lcu" path="res://art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Gießkanne/0001.png" id="451_d8nvl"]
-
-[node name="VesnaPlacer" type="Node2D"]
-script = ExtResource("1_nq5fu")
-
-[node name="visuals" type="Node2D" parent="." node_paths=PackedStringArray("_sprite")]
-position = Vector2(0, -374)
-script = ExtResource("2_cpdud")
-_sprite = NodePath("")
-
-[node name="0001" type="Sprite2D" parent="visuals"]
-position = Vector2(1, 0)
-texture = ExtResource("451_d8nvl")

prefabs/entity_system/entity_manager.tscn

@@ -1,17 +0,0 @@
-[gd_scene load_steps=5 format=3 uid="uid://hdfejdnmp8sl"]
-
-[ext_resource type="Script" uid="uid://umop2b1m1qm8" path="res://scripts/CSharp/GameEntity/Management/EntityManager.cs" id="1_2bwns"]
-[ext_resource type="Script" uid="uid://bogqp274y1pgr" path="res://scripts/CSharp/GameEntity/Management/EntityNodeCreator.cs" id="2_8m173"]
-[ext_resource type="PackedScene" uid="uid://sbf12hin4kes" path="res://prefabs/Interactables/trash_object.tscn" id="3_v3vdc"]
-[ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/characters/Vesna.tscn" id="4_8m173"]
-
-[node name="EntityManager" type="Node" node_paths=PackedStringArray("_nodeCreator")]
-script = ExtResource("1_2bwns")
-_nodeCreator = NodePath("EntityCreator")
-
-[node name="EntityCreator" type="Node" parent="."]
-script = ExtResource("2_8m173")
-_entityPrefabs = Dictionary[String, PackedScene]({
-"TrashEntity": ExtResource("3_v3vdc"),
-"VesnaEntity": ExtResource("4_8m173")
-})

prefabs/farm/animals/duck.tscn

@@ -1,7 +1,8 @@
-[gd_scene load_steps=24 format=3 uid="uid://muuxxgvx33fp"]
+[gd_scene load_steps=25 format=3 uid="uid://muuxxgvx33fp"]
 
 [ext_resource type="Script" uid="uid://7m1rt7agb6rm" path="res://scripts/CSharp/Common/Temp/MVPDuck.cs" id="1_54k4r"]
 [ext_resource type="Texture2D" uid="uid://hvchk6t0xe7j" path="res://art/animals/Ente.png" id="1_cgxhx"]
+[ext_resource type="Resource" uid="uid://tt3d166mntmi" path="res://resources/low code/farming/var_sceneNameProvider.tres" id="2_fdf3t"]
 [ext_resource type="AudioStream" uid="uid://qv0aubjeyi0u" path="res://audio/sfx/Animals/SFX_Duck_Quack_01.wav" id="3_kjie1"]
 [ext_resource type="Script" uid="uid://cfnrd5k1k0gxw" path="res://scripts/CSharp/Common/AudioPlayer2D.cs" id="3_rdn2q"]
 [ext_resource type="AudioStream" uid="uid://da84l8e44scwh" path="res://audio/sfx/Animals/SFX_Duck_Quack_02.wav" id="4_54k4r"]
@@ -142,6 +143,7 @@ viewport_path = NodePath("SubViewport")
 z_index = 1
 y_sort_enabled = true
 script = ExtResource("1_54k4r")
+_sceneKeyProvider = ExtResource("2_fdf3t")
 _transferDelayMs = 1000
 _animationPlayer = NodePath("AnimationPlayer")
 

prefabs/farm/base_field.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=26 format=3 uid="uid://b1d2e7ely6hyw"]
+[gd_scene load_steps=25 format=3 uid="uid://b1d2e7ely6hyw"]
 
 [ext_resource type="Script" uid="uid://j2mhvb45egej" path="res://scripts/CSharp/Low Code/Variables/VariableNode.cs" id="1_4mg73"]
 [ext_resource type="Script" uid="uid://bdffon388rkty" path="res://scripts/CSharp/Common/Farming/FieldBehaviour2D.cs" id="1_qa01x"]
@@ -23,7 +23,6 @@
 [ext_resource type="Texture2D" uid="uid://l5ym7gi82l1b" path="res://art/ui/UI/Watercan-ui/Tropfen-ui-6.png" id="21_4mg73"]
 [ext_resource type="Resource" uid="uid://dlcmqfjvgphqu" path="res://resources/items/rake.tres" id="21_68xcd"]
 [ext_resource type="Script" uid="uid://dlbjjgbs0n4b0" path="res://scripts/CSharp/Common/Farming/FieldActivator.cs" id="22_57jmp"]
-[ext_resource type="PackedScene" uid="uid://7pvvop5hfl01" path="res://prefabs/SaveSystem/save_system.tscn" id="24_avqr3"]
 
 [sub_resource type="CircleShape2D" id="CircleShape2D_57jmp"]
 resource_local_to_scene = true
@@ -39,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", "PlantingPlaceholder", "_wateringParticles")]
+[node name="FieldBehaviour" type="Sprite2D" parent="." node_paths=PackedStringArray("_fieldIndex", "_saveIdHolder", "_fieldSprite", "_maskSprite", "_outlineSprite", "PlantingInteraction", "FieldInteractionArea", "PlantingPlaceholder", "_wateringParticles")]
 visible = false
 z_index = -1
 y_sort_enabled = true
@@ -57,6 +56,7 @@ _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")
@@ -74,11 +74,11 @@ texture = ExtResource("5_wx561")
 y_sort_enabled = true
 
 [node name="InteractionArea" parent="FieldBehaviour" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("7_2eegd")]
-process_mode = 4
 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")
@@ -115,11 +115,10 @@ scale_amount_max = 0.8
 color = Color(0.400601, 0.62444, 0.791217, 1)
 hue_variation_max = 0.4
 
-[node name="FieldActivator" type="Node2D" parent="." node_paths=PackedStringArray("_field", "_activatorArea", "_saveIdHolder")]
+[node name="FieldActivator" type="Node2D" parent="." node_paths=PackedStringArray("_field", "_activatorArea")]
 script = ExtResource("22_57jmp")
 _field = NodePath("../FieldBehaviour")
 _activatorArea = NodePath("InteractionArea")
-_saveIdHolder = NodePath("..")
 
 [node name="InteractionArea" parent="FieldActivator" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("7_2eegd")]
 _spritesToOutline = [NodePath("../../OutlineSprite")]
@@ -130,8 +129,6 @@ shape = SubResource("CircleShape2D_57jmp")
 [node name="Marker2D" type="Marker2D" parent="."]
 gizmo_extents = 157.0
 
-[node name="SaveSystem" parent="." instance=ExtResource("24_avqr3")]
-
 [connection signal="Planted" from="FieldBehaviour" to="PlantCreationEventRaiser" method="RaiseEvents"]
 [connection signal="Interacted" from="FieldBehaviour/InteractionArea" to="FieldBehaviour" method="Farm"]
 [connection signal="ItemInstanceActivated" from="InventoryListener Seeds" to="FieldBehaviour" method="ActivatedSeedInInventory"]
@@ -141,4 +138,3 @@ gizmo_extents = 157.0
 [connection signal="Interacted" from="FieldActivator/InteractionArea" to="FieldActivator/InteractionArea" method="ToggleActive"]
 
 [editable path="FieldActivator/InteractionArea"]
-[editable path="SaveSystem"]

prefabs/farm/plants/base_plant.tscn

@@ -136,7 +136,6 @@ _useOutline = false
 shape = SubResource("CircleShape2D_vjw4j")
 
 [node name="ReadyPlantInventoryItem" parent="." instance=ExtResource("6_gdrin")]
-process_mode = 4
 position = Vector2(0, 2.3)
 IsActive = false
 _saveToDisk = false

prefabs/fight/fight_scene_switcher.tscn

@@ -4,6 +4,6 @@
 
 [node name="FightSceneSwitcher" type="Node"]
 script = ExtResource("1_5dt1r")
-_fightRoomScenePath = "res://scenes/scene_fight_world_room.tscn"
+_fightRoomScenePath = "res://scenes/Babushka_scene_fight_world_room.tscn"
-_fightHappeningScene = "res://scenes/scene_fight_happening.tscn"
+_fightHappeningScene = "res://scenes/Babushka_scene_fight_happening.tscn"
-_nightEndScene = "res://scenes/scene_credits.tscn"
+_nightEndScene = "res://scenes/Babushka_scene_indoor_vesnas_room.tscn"

prefabs/interactions/detection_cross.tscn

@@ -1,21 +1,12 @@
-[gd_scene load_steps=4 format=3 uid="uid://pflu0uaig7vv"]
+[gd_scene load_steps=3 format=3 uid="uid://pflu0uaig7vv"]
 
 [ext_resource type="Script" uid="uid://ccc6m6c5khd2x" path="res://scripts/CSharp/Common/CharacterControls/DetectionCross.cs" id="1_va8tx"]
 [ext_resource type="PackedScene" uid="uid://dugr6ff1g7hi0" path="res://prefabs/interactions/detector.tscn" id="2_8hh05"]
 
-[sub_resource type="RectangleShape2D" id="RectangleShape2D_va8tx"]
+[node name="DetectionCross" type="Node2D" node_paths=PackedStringArray("_detector")]
-
-[node name="DetectionCross" type="Node2D" node_paths=PackedStringArray("_collider", "_shapeCast2D")]
 script = ExtResource("1_va8tx")
-_collider = NodePath("detector")
+_detector = NodePath("detector")
-_shapeCast2D = NodePath("ShapeCast2D")
+_xOffset = 400.0
-_xOffset = 200.0
+_yOffset = 300.0
-_yOffset = 200.0
 
-[node name="detector" parent="." node_paths=PackedStringArray("_shapeCast2D") instance=ExtResource("2_8hh05")]
+[node name="detector" parent="." instance=ExtResource("2_8hh05")]
-_shapeCast2D = NodePath("../ShapeCast2D")
-
-[node name="ShapeCast2D" type="ShapeCast2D" parent="."]
-shape = SubResource("RectangleShape2D_va8tx")
-target_position = Vector2(200, 0)
-collide_with_areas = true

prefabs/interactions/detector.tscn

@@ -1,16 +1,14 @@
-[gd_scene load_steps=4 format=3 uid="uid://dugr6ff1g7hi0"]
+[gd_scene load_steps=3 format=3 uid="uid://dugr6ff1g7hi0"]
 
 [ext_resource type="Script" uid="uid://c3pd60biootsx" path="res://scripts/CSharp/Common/CharacterControls/Detector.cs" id="1_6pib0"]
-[ext_resource type="Resource" uid="uid://clwqh3w5aqi5e" path="res://resources/low code/interactables/var_interactableToTrigger.tres" id="2_3fanv"]
 
-[sub_resource type="CircleShape2D" id="CircleShape2D_6pib0"]
+[sub_resource type="RectangleShape2D" id="RectangleShape2D_qwv4c"]
-radius = 300.0
+size = Vector2(100, 400)
 
 [node name="detector" type="Area2D"]
 collision_layer = 4
 script = ExtResource("1_6pib0")
-_itemToTriggerResource = ExtResource("2_3fanv")
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
-shape = SubResource("CircleShape2D_6pib0")
+shape = SubResource("RectangleShape2D_qwv4c")
 debug_color = Color(0.9459047, 7.2196126e-06, 0.5925879, 0.41960785)

prefabs/interactions/interaction_area_2d.tscn

@@ -1,10 +1,8 @@
-[gd_scene load_steps=8 format=3 uid="uid://cqc72e4hq6bcd"]
+[gd_scene load_steps=6 format=3 uid="uid://cqc72e4hq6bcd"]
 
 [ext_resource type="Script" uid="uid://ckp413wrub5fm" path="res://scripts/CSharp/Common/CharacterControls/InteractionArea2D.cs" id="1_5ajrf"]
-[ext_resource type="Resource" uid="uid://clwqh3w5aqi5e" path="res://resources/low code/interactables/var_interactableToTrigger.tres" id="2_o1drf"]
 [ext_resource type="Material" uid="uid://blch5kdhkbj75" path="res://art/materials/simple_interactable_outline.tres" id="2_qoey7"]
 [ext_resource type="Script" uid="uid://cp2q4k62sjo6h" path="res://scripts/CSharp/Common/CharacterControls/DetectableInteractionArea.cs" id="3_2wrrq"]
-[ext_resource type="Script" uid="uid://pqemey80frcq" path="res://scripts/CSharp/Low Code/Variables/VariableListener.cs" id="4_gj2nu"]
 
 [sub_resource type="CircleShape2D" id="CircleShape2D_npluf"]
 resource_local_to_scene = true
@@ -13,17 +11,15 @@ radius = 150.0
 [sub_resource type="Theme" id="Theme_5ajrf"]
 default_font_size = 30
 
-[node name="InteractionArea" type="Node2D" node_paths=PackedStringArray("_selectionChangeListener", "_area", "_label")]
+[node name="InteractionArea" type="Node2D" node_paths=PackedStringArray("_area", "_label")]
 script = ExtResource("1_5ajrf")
-_selectionChangeListener = NodePath("SelectionListener")
 _area = NodePath("Area2D")
 _label = NodePath("Area2D/CanvasLayer/MarginContainer/Label")
 _outlineMaterial = ExtResource("2_qoey7")
 
-[node name="Area2D" type="Area2D" parent="." node_paths=PackedStringArray("interactionArea2D")]
+[node name="Area2D" type="Area2D" parent="."]
 collision_mask = 4
 script = ExtResource("3_2wrrq")
-interactionArea2D = NodePath("..")
 
 [node name="CollisionShape3D" type="CollisionShape2D" parent="Area2D"]
 shape = SubResource("CircleShape2D_npluf")
@@ -55,8 +51,5 @@ text = "[E]"
 horizontal_alignment = 2
 vertical_alignment = 2
 
-[node name="SelectionListener" type="Node" parent="."]
+[connection signal="area_entered" from="Area2D" to="." method="OnPlayerEntered"]
-script = ExtResource("4_gj2nu")
+[connection signal="area_exited" from="Area2D" to="." method="OnPlayerExited"]
-_variableResources = Array[Object]([ExtResource("2_o1drf")])
-
-[connection signal="NewEventPayload" from="SelectionListener" to="Area2D" method="InteractionAreaSelectionChanged"]

project.godot

@@ -25,7 +25,7 @@ buses/default_bus_layout="uid://b6dwkmkyb0axk"
 
 [autoload]
 
-SceneTransition="*res://prefabs/UI/SceneTransition.tscn"
+SceneTransition="*res://scenes/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"
@@ -35,7 +35,6 @@ FightWorldAutoload="*res://prefabs/fight/fight_world_autoload.tscn"
 SaveGameManager="*res://scripts/CSharp/Common/Savegame/SaveGameManager.cs"
 SettingsSaveController="*res://scripts/CSharp/Common/Savegame/SettingsSaveController.cs"
 DayAndNight="*res://prefabs/day_and_night/day_and_night.tscn"
-EntityManager="*res://prefabs/entity_system/entity_manager.tscn"
 
 [dialogic]
 
@@ -49,9 +48,7 @@ directories/dch_directory={
 "vesna": "res://dialog/Characters/vesna.dch"
 }
 directories/dtl_directory={
-"cat": "res://dialog/cat.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_start": "res://dialog/quests/ducks/quest1_ducks_start.dtl",
 "quest2_tomatoes_end": "res://dialog/quests/tomatoes/quest2_tomatoes_end.dtl",
@@ -179,7 +176,6 @@ directories/tres_directory={
 "unselected_stylebox": "res://addons/dialogic/Editor/Events/styles/unselected_stylebox.tres",
 "var_ColorTestValue": "res://resources/low code/test/var_ColorTestValue.tres",
 "var_Counter": "res://resources/low code/test/var_Counter.tres",
-"var_interactableToTrigger": "res://resources/low code/interactables/var_interactableToTrigger.tres",
 "var_sceneNameProvider": "res://resources/low code/farming/var_sceneNameProvider.tres",
 "var_wateredFieldPosition": "res://resources/low code/farming/var_wateredFieldPosition.tres",
 "vesna_style": "res://addons/dialogic/vesna_style.tres",
@@ -192,6 +188,8 @@ directories/tres_directory={
 
 window/size/viewport_width=1920
 window/size/viewport_height=1080
+window/size/window_width_override=1200
+window/size/window_height_override=720
 window/stretch/mode="viewport"
 window/stretch/aspect="keep_height"
 
@@ -225,10 +223,6 @@ folder_colors={
 "res://shader/": "pink"
 }
 
-[filesystem]
-
-import/blender/enabled=false
-
 [global_group]
 
 Saveable=""
@@ -315,16 +309,6 @@ NextDayCheat={
 "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":32,"key_label":0,"unicode":32,"location":0,"echo":false,"script":null)
 ]
 }
-DebugEntities={
-"deadzone": 0.2,
-"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":66,"key_label":0,"unicode":98,"location":0,"echo":false,"script":null)
-]
-}
-SaveGame={
-"deadzone": 0.2,
-"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194336,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
-]
-}
 
 [internationalization]
 

resources/low code/interactables/var_interactableToTrigger.tres

@@ -1,8 +0,0 @@
-[gd_resource type="Resource" script_class="VariableResource" load_steps=2 format=3 uid="uid://clwqh3w5aqi5e"]
-
-[ext_resource type="Script" uid="uid://dtvx2cakx0bey" path="res://scripts/CSharp/Low Code/Variables/VariableResource.cs" id="1_casar"]
-
-[resource]
-script = ExtResource("1_casar")
-Payload = null
-metadata/_custom_type_script = "uid://dtvx2cakx0bey"

scenes/Babushka_scene_bootstrap.tscn

@@ -0,0 +1,23 @@
+[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="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"]
+
+[node name="BabushkaSceneBootstrap" type="Node2D"]
+
+[node name="BabushkaSceneStartMenu" parent="." instance=ExtResource("1_15ton")]
+
+[node name="SceneParent" type="Node" parent="."]
+
+[node name="WindowSettings" type="Node" parent="."]
+script = ExtResource("2_d3jfo")
+
+[node name="SaveSystem" type="Node" parent="."]
+
+[node name="SaveGameCheat" type="Node" parent="SaveSystem"]
+script = ExtResource("4_ocsjo")
+
+[node name="SaveIDProvider" type="Node" parent="SaveSystem"]
+script = ExtResource("5_iyo8m")

scenes/Babushka_scene_credits.tscn

@@ -11,7 +11,7 @@
 
 [node name="BabushkaSceneCredits" type="Node2D"]
 script = ExtResource("1_f5860")
-_sceneNamesToLoad = PackedStringArray("res://scenes/scene_bootstrap.tscn")
+_sceneNamesToLoad = PackedStringArray("res://scenes/Babushka_scene_startMenu.tscn")
 
 [node name="Sprite2D" type="Sprite2D" parent="."]
 position = Vector2(1030, 483)

scenes/Babushka_scene_disclaimer.tscn

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

scenes/Babushka_scene_fight_happening.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=21 format=3 uid="uid://cjshlwk8ajpnp"]
+[gd_scene load_steps=20 format=3 uid="uid://cjshlwk8ajpnp"]
 
 [ext_resource type="Script" uid="uid://cnhpnn8o0gybd" path="res://scripts/CSharp/Common/Fight/FightHappeningSceneSetup.cs" id="1_fiutj"]
 [ext_resource type="Script" uid="uid://c76mhhqyk4lgh" path="res://scripts/CSharp/Common/Fight/FightHappening.cs" id="1_gsk03"]
@@ -13,7 +13,6 @@
 [ext_resource type="Script" uid="uid://byf2ywov34g0x" path="res://scripts/CSharp/Common/Fight/UI/ActionSelectUiSetup.cs" id="8_bkwsr"]
 [ext_resource type="Script" uid="uid://bwm0nhvt1083k" path="res://scripts/CSharp/Common/Fight/FightMinigameHandler.cs" id="8_falfe"]
 [ext_resource type="Script" uid="uid://d2ugtb3dalrg3" path="res://scripts/CSharp/Common/Fight/FightHappeningStateDebugger.cs" id="8_tv7cl"]
-[ext_resource type="Texture2D" uid="uid://ciaabo8kcx2hw" path="res://art/fightworld_background.png" id="9_f4y3h"]
 [ext_resource type="Script" uid="uid://2f7rqk50gtdg" path="res://scripts/CSharp/Common/Fight/SwitchSceneOnFightEnd.cs" id="10_qqd8u"]
 [ext_resource type="Script" uid="uid://6nniwfxye8ss" path="res://scripts/CSharp/Common/Fight/UsedItemIndicatorVisual.cs" id="14_b4ll5"]
 [ext_resource type="Script" uid="uid://71mdwp2m4rta" path="res://scripts/CSharp/Common/Fight/UI/HealButtonVisual.cs" id="14_oy2wu"]
@@ -40,7 +39,6 @@ script = ExtResource("4_v5rv6")
 useHealItemIndicator = NodePath("../../UseItemIndicator")
 
 [node name="Camera2D" type="Camera2D" parent="."]
-scale = Vector2(0.71911293, 0.6664279)
 
 [node name="FightSetup" type="Node2D" parent="."]
 script = ExtResource("1_fiutj")
@@ -60,11 +58,6 @@ _positionDistanceFromCenter = PackedFloat32Array(300, 550, 800)
 
 [node name="EnvironmentVisuals" type="Node2D" parent="."]
 
-[node name="background" type="Sprite2D" parent="EnvironmentVisuals"]
-z_index = -100
-scale = Vector2(3, 3)
-texture = ExtResource("9_f4y3h")
-
 [node name="MinigameHandler" type="Node2D" parent="." node_paths=PackedStringArray("_minigameController")]
 script = ExtResource("8_falfe")
 _minigameController = NodePath("Minigame")

scenes/Babushka_scene_fight_world_room.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=53 format=3 uid="uid://cacnapfv7w567"]
+[gd_scene load_steps=52 format=3 uid="uid://cacnapfv7w567"]
 
 [ext_resource type="Script" uid="uid://bqomwxclsbhd3" path="res://scripts/CSharp/Common/Camera/CameraController.cs" id="1_pi6ua"]
 [ext_resource type="Texture2D" uid="uid://8sr11ex30n0m" path="res://art/mockups/Kenney_Backgrounds/Samples/uncolored_hills.png" id="2_hqa4k"]

scenes/Babushka_scene_indoor_common_room.tscn

@@ -1,39 +1,37 @@
-[gd_scene load_steps=43 format=3 uid="uid://bm21nqepnwaik"]
+[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_3al6t"]
+[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_ufnxe"]
+[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_pejp6"]
+[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_nc3ef"]
+[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_cpb5b"]
+[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://b2rj7wkyu6ehy" path="res://art/indoor/room export/Room_01_pechka.png" id="6_ecq66"]
+[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://dhvi5404cqioa" path="res://art/indoor/room export/Room_01_window.png" id="7_8mqg7"]
+[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://bpi35nxbhput8" path="res://art/indoor/room export/Room_01_pechkaDoor.png" id="8_bv3pn"]
+[ext_resource type="Texture2D" uid="uid://b2rj7wkyu6ehy" path="res://art/indoor/room export/Room_01_pechka.png" id="8_ofqcg"]
-[ext_resource type="PackedScene" uid="uid://cqc72e4hq6bcd" path="res://prefabs/interactions/interaction_area_2d.tscn" id="9_qaiit"]
+[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://tyypifpte0pb" path="res://art/indoor/room export/Room_01_chugun.png" id="10_rj4v5"]
+[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://404glx32r1w8" path="res://art/indoor/room export/Room_01_bench.png" id="11_7ohth"]
+[ext_resource type="Texture2D" uid="uid://tyypifpte0pb" path="res://art/indoor/room export/Room_01_chugun.png" id="11_as3nm"]
-[ext_resource type="Texture2D" uid="uid://c4q12jiligcl7" path="res://art/animals/katze.png" id="12_dckqa"]
+[ext_resource type="PackedScene" uid="uid://cqc72e4hq6bcd" path="res://prefabs/interactions/interaction_area_2d.tscn" id="11_gpagp"]
-[ext_resource type="AudioStream" uid="uid://cohyenfo1rtxh" path="res://audio/sfx/Animals/SFX_Cat_Meow_01.wav" id="13_65rkx"]
+[ext_resource type="Texture2D" uid="uid://cop1vjvhwlsec" path="res://art/indoor/room export/Room_01_shelf.png" id="12_bu2a1"]
-[ext_resource type="AudioStream" uid="uid://b2cmf5ie7cwka" path="res://audio/sfx/Animals/SFX_Cat_Meow_02.wav" id="14_mse84"]
+[ext_resource type="Texture2D" uid="uid://404glx32r1w8" path="res://art/indoor/room export/Room_01_bench.png" id="13_rongr"]
-[ext_resource type="AudioStream" uid="uid://cttisejnt2l8f" path="res://audio/sfx/Animals/SFX_Cat_Meow_03.wav" id="15_26mhc"]
+[ext_resource type="Texture2D" uid="uid://ckvytnpi8gcxq" path="res://art/eyes_atlas.png" id="14_d7yky"]
-[ext_resource type="AudioStream" uid="uid://cbmagiou0n0t3" path="res://audio/sfx/Animals/SFX_Cat_Meow_04.wav" id="16_vt5fp"]
+[ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/characters/Vesna.tscn" id="15_7a68a"]
-[ext_resource type="AudioStream" uid="uid://bk1bj01fokjp7" path="res://audio/sfx/Animals/SFX_Cat_Meow_05.wav" id="17_n8vep"]
+[ext_resource type="Script" uid="uid://31p67cdowuw4" path="res://scripts/CSharp/Common/Animation/AnimationStarter.cs" id="15_27bwy"]
-[ext_resource type="AudioStream" uid="uid://r2f6xmjvyyjv" path="res://audio/sfx/Animals/SFX_Cat_Purr_01.wav" id="18_3oexm"]
+[ext_resource type="Texture2D" uid="uid://c4q12jiligcl7" path="res://art/animals/katze.png" id="15_sndxu"]
-[ext_resource type="Script" uid="uid://cfnrd5k1k0gxw" path="res://scripts/CSharp/Common/AudioPlayer2D.cs" id="19_a2xrf"]
+[ext_resource type="AudioStream" uid="uid://cohyenfo1rtxh" path="res://audio/sfx/Animals/SFX_Cat_Meow_01.wav" id="16_d7yky"]
-[ext_resource type="Script" uid="uid://31p67cdowuw4" path="res://scripts/CSharp/Common/Animation/AnimationStarter.cs" id="20_lkkn4"]
+[ext_resource type="PackedScene" uid="uid://dfvgp1my5rydh" path="res://prefabs/characters/Yeli.tscn" id="16_dhsxs"]
-[ext_resource type="Script" uid="uid://dnipeibppjirs" path="res://scripts/CSharp/Common/NPC/DialogicOverlayStarter.cs" id="20_pejp6"]
+[ext_resource type="AudioStream" uid="uid://b2cmf5ie7cwka" path="res://audio/sfx/Animals/SFX_Cat_Meow_02.wav" id="17_7a68a"]
-[ext_resource type="Texture2D" uid="uid://ckvytnpi8gcxq" path="res://art/eyes_atlas.png" id="21_m0gmu"]
+[ext_resource type="Script" uid="uid://cvkw4qd2hxksi" path="res://scripts/GdScript/dialogic_toggle.gd" id="17_k0k8c"]
-[ext_resource type="Script" uid="uid://d2486x6upmwqq" path="res://scripts/GdScript/dialogic_starter.gd" id="21_nc3ef"]
+[ext_resource type="AudioStream" uid="uid://cttisejnt2l8f" path="res://audio/sfx/Animals/SFX_Cat_Meow_03.wav" id="18_dhsxs"]
-[ext_resource type="Texture2D" uid="uid://bqwhptcgg5ons" path="res://art/indoor/room export/Room_01_dorr_R.png" id="22_ahl31"]
+[ext_resource type="Script" uid="uid://bqomwxclsbhd3" path="res://scripts/CSharp/Common/Camera/CameraController.cs" id="18_dw4nn"]
-[ext_resource type="Texture2D" uid="uid://da67c7avarwq2" path="res://art/indoor/kitchen_bgAssets.png" id="23_hgs5o"]
+[ext_resource type="AudioStream" uid="uid://cbmagiou0n0t3" path="res://audio/sfx/Animals/SFX_Cat_Meow_04.wav" id="19_k0k8c"]
-[ext_resource type="Texture2D" uid="uid://vyk63d0pgqm5" path="res://art/indoor/room export/Room_01_dioor L.png" id="24_t86aa"]
+[ext_resource type="AudioStream" uid="uid://bk1bj01fokjp7" path="res://audio/sfx/Animals/SFX_Cat_Meow_05.wav" id="20_dw4nn"]
-[ext_resource type="Texture2D" uid="uid://cop1vjvhwlsec" path="res://art/indoor/room export/Room_01_shelf.png" id="25_0pvxk"]
+[ext_resource type="Script" uid="uid://cldtt4atgymm5" path="res://scripts/CSharp/Common/Quest/QuestTrigger.cs" id="21_blyw3"]
-[ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/characters/Vesna.tscn" id="26_yq173"]
+[ext_resource type="AudioStream" uid="uid://r2f6xmjvyyjv" path="res://audio/sfx/Animals/SFX_Cat_Purr_01.wav" id="21_ytap8"]
-[ext_resource type="PackedScene" uid="uid://dfvgp1my5rydh" path="res://prefabs/characters/Yeli.tscn" id="27_pfr1s"]
+[ext_resource type="Script" uid="uid://cfnrd5k1k0gxw" path="res://scripts/CSharp/Common/AudioPlayer2D.cs" id="22_tggq2"]
-[ext_resource type="Script" uid="uid://cvkw4qd2hxksi" path="res://scripts/GdScript/dialogic_toggle.gd" id="28_l3q6o"]
+[ext_resource type="Resource" uid="uid://cbpurnewhyefa" path="res://resources/quests/beetRoot.tres" id="22_yd2gv"]
-[ext_resource type="Script" uid="uid://cldtt4atgymm5" path="res://scripts/CSharp/Common/Quest/QuestTrigger.cs" id="29_6elg7"]
+[ext_resource type="Texture2D" uid="uid://da67c7avarwq2" path="res://art/indoor/kitchen_bgAssets.png" id="23_d7yky"]
-[ext_resource type="Resource" uid="uid://cbpurnewhyefa" path="res://resources/quests/beetRoot.tres" id="30_pd0e4"]
+[ext_resource type="PackedScene" uid="uid://cgjc4wurbgimy" path="res://prefabs/UI/Inventory/Inventory.tscn" id="24_yd2gv"]
-[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
@@ -45,12 +43,12 @@ radius = 300.0
 
 [sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_b6vf7"]
 streams_count = 6
-stream_0/stream = ExtResource("13_65rkx")
+stream_0/stream = ExtResource("16_d7yky")
-stream_1/stream = ExtResource("14_mse84")
+stream_1/stream = ExtResource("17_7a68a")
-stream_2/stream = ExtResource("15_26mhc")
+stream_2/stream = ExtResource("18_dhsxs")
-stream_3/stream = ExtResource("16_vt5fp")
+stream_3/stream = ExtResource("19_k0k8c")
-stream_4/stream = ExtResource("17_n8vep")
+stream_4/stream = ExtResource("20_dw4nn")
-stream_5/stream = ExtResource("18_3oexm")
+stream_5/stream = ExtResource("21_ytap8")
 
 [sub_resource type="Animation" id="Animation_j5d18"]
 length = 0.001
@@ -220,8 +218,8 @@ radius = 400.0
 [node name="Common Room" type="Node2D"]
 z_index = 1
 y_sort_enabled = true
-script = ExtResource("1_3al6t")
+script = ExtResource("1_3vr4f")
-_sceneNamesToLoad = PackedStringArray("res://scenes/scene_indoor_vesnas_room.tscn", "res://scenes/scene_indoor_kitchen.tscn", "res://scenes/scene_farm_outside_2d.tscn")
+_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")
 
 [node name="Foreground" type="Node" parent="."]
 
@@ -229,7 +227,7 @@ _sceneNamesToLoad = PackedStringArray("res://scenes/scene_indoor_vesnas_room.tsc
 z_index = 2
 y_sort_enabled = true
 position = Vector2(-1888, 1112)
-texture = ExtResource("2_ufnxe")
+texture = ExtResource("2_ubg3a")
 offset = Vector2(0, -200)
 region_enabled = true
 region_rect = Rect2(1012, 1743, 1470, 417)
@@ -238,7 +236,7 @@ region_rect = Rect2(1012, 1743, 1470, 417)
 z_index = 3
 y_sort_enabled = true
 position = Vector2(-3032, 2096)
-texture = ExtResource("3_pejp6")
+texture = ExtResource("3_gpagp")
 offset = Vector2(216, -1064)
 region_enabled = true
 region_rect = Rect2(1534, 1976, 379, 184)
@@ -246,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_pejp6")
+texture = ExtResource("3_gpagp")
 offset = Vector2(184, -1056)
 region_enabled = true
 region_rect = Rect2(1534, 1976, 379, 184)
@@ -255,7 +253,7 @@ region_rect = Rect2(1534, 1976, 379, 184)
 z_index = 1
 y_sort_enabled = true
 position = Vector2(-1904, 1192)
-texture = ExtResource("4_nc3ef")
+texture = ExtResource("4_27bwy")
 offset = Vector2(0, -800)
 region_enabled = true
 region_rect = Rect2(2093, 49, 421, 630)
@@ -290,14 +288,14 @@ shape = SubResource("RectangleShape2D_a2ood")
 z_index = -100
 position = Vector2(4992, -487)
 scale = Vector2(2, 2)
-texture = ExtResource("5_cpb5b")
+texture = ExtResource("5_sndxu")
 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_cpb5b")
+texture = ExtResource("5_sndxu")
 flip_h = true
 region_rect = Rect2(111, 292, 3323, 2160)
 
@@ -310,32 +308,32 @@ shape = SubResource("RectangleShape2D_a2ood")
 [node name="Room01Pechka" type="Sprite2D" parent="BackWall"]
 z_index = -80
 position = Vector2(-224, -392)
-texture = ExtResource("6_ecq66")
+texture = ExtResource("8_ofqcg")
 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("7_8mqg7")
+texture = ExtResource("9_aoesu")
 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("7_8mqg7")
+texture = ExtResource("9_aoesu")
 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("8_bv3pn")
+texture = ExtResource("10_xcryd")
 region_enabled = true
 region_rect = Rect2(2360, 864, 356, 251)
 
-[node name="InteractionArea" parent="BackWall/Room01PechkaDoor" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("9_qaiit")]
+[node name="InteractionArea" parent="BackWall/Room01PechkaDoor" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("11_gpagp")]
 position = Vector2(0, -3)
 _spritesToOutline = [NodePath("..")]
 
@@ -345,7 +343,7 @@ shape = SubResource("CircleShape2D_gpagp")
 [node name="Room01Chugun" type="Sprite2D" parent="BackWall"]
 z_index = -40
 position = Vector2(16, -560)
-texture = ExtResource("10_rj4v5")
+texture = ExtResource("11_as3nm")
 region_enabled = true
 region_rect = Rect2(2469, 459, 247, 131)
 
@@ -353,40 +351,32 @@ region_rect = Rect2(2469, 459, 247, 131)
 z_index = -10
 y_sort_enabled = true
 position = Vector2(-5070, 1051)
-texture = ExtResource("11_7ohth")
+texture = ExtResource("13_rongr")
 flip_h = true
 region_enabled = true
 region_rect = Rect2(1156, 1185, 940, 189)
 
 [node name="Katze" type="Sprite2D" parent="BackWall/Bench"]
-z_index = 15
+z_index = -10
 position = Vector2(61, -87)
 scale = Vector2(2, 2)
-texture = ExtResource("12_dckqa")
+texture = ExtResource("15_sndxu")
 offset = Vector2(-8, -126)
 
 [node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="BackWall/Bench/Katze"]
 stream = SubResource("AudioStreamRandomizer_b6vf7")
 bus = &"SFX"
-script = ExtResource("19_a2xrf")
+script = ExtResource("22_tggq2")
 
-[node name="InteractionArea" parent="BackWall/Bench/Katze" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("9_qaiit")]
+[node name="InteractionArea" parent="BackWall/Bench/Katze" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("11_gpagp")]
 position = Vector2(-6.5, -44)
 scale = Vector2(0.5, 0.5)
 _spritesToOutline = [NodePath("..")]
 
-[node name="dialogic overlay starter" type="Node2D" parent="BackWall/Bench/Katze"]
-script = ExtResource("20_pejp6")
-_timelinesToPlay = PackedStringArray("cat")
-_startOnReady = false
-
-[node name="dialogic starter" type="Node" parent="BackWall/Bench/Katze/dialogic overlay starter"]
-script = ExtResource("21_nc3ef")
-
 [node name="Bench2" type="Sprite2D" parent="BackWall"]
 z_index = -10
 position = Vector2(-2906, 243)
-texture = ExtResource("11_7ohth")
+texture = ExtResource("13_rongr")
 region_enabled = true
 region_rect = Rect2(1156, 1185, 940, 189)
 
@@ -396,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_nc3ef")
+texture = ExtResource("4_27bwy")
 offset = Vector2(0, -296)
 region_enabled = true
 region_rect = Rect2(2244, 763, 274, 91)
@@ -405,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_nc3ef")
+texture = ExtResource("4_27bwy")
 offset = Vector2(-14.6475, -97.651)
 region_enabled = true
 region_rect = Rect2(3157, 688, 118.519, 221)
@@ -415,7 +405,7 @@ z_index = -10
 y_sort_enabled = true
 position = Vector2(-852, -187)
 rotation = -0.0663225
-texture = ExtResource("4_nc3ef")
+texture = ExtResource("4_27bwy")
 offset = Vector2(0, -296)
 region_enabled = true
 region_rect = Rect2(2624, 435, 49, 76)
@@ -426,11 +416,11 @@ y_sort_enabled = true
 position = Vector2(-101, -6)
 rotation = -0.0663225
 scale = Vector2(1e-05, 1e-05)
-texture = ExtResource("4_nc3ef")
+texture = ExtResource("4_27bwy")
 offset = Vector2(43.3898, 128.128)
 region_enabled = true
 region_rect = Rect2(3362, 139, 101, 269)
-script = ExtResource("20_lkkn4")
+script = ExtResource("15_27bwy")
 _animationPlayer = NodePath("SpiritAnimation")
 _animationName = "hand_stretch"
 _repeatable = false
@@ -446,7 +436,7 @@ playback_auto_capture = false
 z_index = -10
 y_sort_enabled = true
 position = Vector2(287, -157.5)
-texture = ExtResource("4_nc3ef")
+texture = ExtResource("4_27bwy")
 offset = Vector2(0, -296)
 region_enabled = true
 region_rect = Rect2(2964, 137, 321, 213)
@@ -454,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_nc3ef")
+texture = ExtResource("4_27bwy")
 offset = Vector2(0, -296)
 region_enabled = true
 region_rect = Rect2(2600, 165, 127, 199)
@@ -462,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_nc3ef")
+texture = ExtResource("4_27bwy")
 offset = Vector2(0, -296)
 region_enabled = true
 region_rect = Rect2(2761, 161, 135, 199)
@@ -472,7 +462,7 @@ visible = false
 z_index = -10
 position = Vector2(-169, -80)
 scale = Vector2(0.4, 0.4)
-texture = ExtResource("21_m0gmu")
+texture = ExtResource("14_d7yky")
 region_enabled = true
 region_rect = Rect2(2647, 15, 286, 183)
 
@@ -482,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_nc3ef")
+texture = ExtResource("4_27bwy")
 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_nc3ef")
+texture = ExtResource("4_27bwy")
 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_nc3ef")
+texture = ExtResource("4_27bwy")
 offset = Vector2(0, -296)
 region_enabled = true
 region_rect = Rect2(2576, 802, 219, 64)
@@ -506,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("22_ahl31")
+texture = ExtResource("6_blyw3")
 region_enabled = true
 region_rect = Rect2(3161, 313, 679, 1050)
 
-[node name="KitchendoorInteraction" parent="BackWall/Doors/Door_Kitchen" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("9_qaiit")]
+[node name="KitchendoorInteraction" parent="BackWall/Doors/Door_Kitchen" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("11_gpagp")]
 position = Vector2(-7, 248)
 scale = Vector2(1.5, 1.5)
 _spritesToOutline = [NodePath("..")]
@@ -519,11 +509,11 @@ _id = 1
 [node name="Door_Outside" type="Sprite2D" parent="BackWall/Doors"]
 z_index = -50
 position = Vector2(-4917, -226)
-texture = ExtResource("23_hgs5o")
+texture = ExtResource("23_d7yky")
 region_enabled = true
 region_rect = Rect2(3009, 666, 679, 1050)
 
-[node name="OutsideDoor" parent="BackWall/Doors/Door_Outside" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("9_qaiit")]
+[node name="OutsideDoor" parent="BackWall/Doors/Door_Outside" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("11_gpagp")]
 position = Vector2(-7, 248)
 scale = Vector2(1.5, 1.5)
 _spritesToOutline = [NodePath("..")]
@@ -532,11 +522,11 @@ _id = 2
 [node name="Door_Bedroom" type="Sprite2D" parent="BackWall/Doors"]
 z_index = -50
 position = Vector2(-1620, -259)
-texture = ExtResource("24_t86aa")
+texture = ExtResource("7_yd2gv")
 region_enabled = true
 region_rect = Rect2(0, 165, 763, 1224)
 
-[node name="VesnasRoomDoor" parent="BackWall/Doors/Door_Bedroom" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("9_qaiit")]
+[node name="VesnasRoomDoor" parent="BackWall/Doors/Door_Bedroom" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("11_gpagp")]
 position = Vector2(2, 233)
 _spritesToOutline = [NodePath("..")]
 _id = 0
@@ -547,7 +537,7 @@ shape = SubResource("CircleShape2D_yd2gv")
 [node name="Shelf" type="Sprite2D" parent="BackWall"]
 z_index = -50
 position = Vector2(-880, -416)
-texture = ExtResource("25_0pvxk")
+texture = ExtResource("12_bu2a1")
 region_enabled = true
 region_rect = Rect2(1846, 471, 348, 490)
 
@@ -556,16 +546,16 @@ visible = false
 z_index = -10
 y_sort_enabled = true
 position = Vector2(23, 378.5)
-texture = ExtResource("4_nc3ef")
+texture = ExtResource("4_27bwy")
 offset = Vector2(0, -296)
 region_enabled = true
 region_rect = Rect2(2748, 432, 174, 191)
 
-[node name="Vesna" parent="." instance=ExtResource("26_yq173")]
+[node name="Vesna" parent="." instance=ExtResource("15_7a68a")]
 y_sort_enabled = false
-position = Vector2(-4473, 319)
+position = Vector2(-920, 319)
 
-[node name="Yeli" parent="." instance=ExtResource("27_pfr1s")]
+[node name="Yeli" parent="." instance=ExtResource("16_dhsxs")]
 z_index = 0
 y_sort_enabled = false
 position = Vector2(-2841, 198)
@@ -585,11 +575,11 @@ position = Vector2(-224, 373)
 position = Vector2(-565, 464)
 
 [node name="dialogic_toggle" type="Node2D" parent="Yeli"]
-script = ExtResource("28_l3q6o")
+script = ExtResource("17_k0k8c")
 
 [node name="Beetroot Quest trigger" type="Node2D" parent="Yeli"]
-script = ExtResource("29_6elg7")
+script = ExtResource("21_blyw3")
-questResource = ExtResource("30_pd0e4")
+questResource = ExtResource("22_yd2gv")
 toStatus = 1
 makeActive = true
 
@@ -602,18 +592,14 @@ limit_top = -1050
 limit_right = 1400
 limit_bottom = 1150
 editor_draw_limits = true
-script = ExtResource("31_x6an5")
+script = ExtResource("18_dw4nn")
 _followNode = NodePath("../Vesna/CharacterBody2D")
 
-[node name="CanvasLayer" parent="." instance=ExtResource("32_i4hb6")]
+[node name="CanvasLayer" parent="." instance=ExtResource("24_yd2gv")]
 
 [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"]
 [connection signal="Interacted" from="BackWall/Bench/Katze/InteractionArea" to="BackWall/Bench/Katze/AudioStreamPlayer2D" method="PlayOneShot"]
-[connection signal="Interacted" from="BackWall/Bench/Katze/InteractionArea" to="BackWall/Bench/Katze/dialogic overlay starter" method="ToggleDialogue"]
-[connection signal="Dialogue" from="BackWall/Bench/Katze/dialogic overlay starter" to="BackWall/Bench/Katze/dialogic overlay starter/dialogic starter" method="open"]
-[connection signal="timelineEnded" from="BackWall/Bench/Katze/dialogic overlay starter/dialogic starter" to="BackWall/Bench/Katze/InteractionArea" method="SetActiveTrue"]
-[connection signal="timelineStarted" from="BackWall/Bench/Katze/dialogic overlay starter/dialogic starter" to="BackWall/Bench/Katze/InteractionArea" method="SetActiveFalse"]
 [connection signal="InteractedTool" from="BackWall/Doors/Door_Kitchen/KitchendoorInteraction" to="." method="LoadSceneAtIndex"]
 [connection signal="InteractedTool" from="BackWall/Doors/Door_Outside/OutsideDoor" to="." method="LoadSceneAtIndex"]
 [connection signal="InteractedTool" from="BackWall/Doors/Door_Bedroom/VesnasRoomDoor" to="." method="LoadSceneAtIndex"]

scenes/Babushka_scene_indoor_kitchen.tscn

@@ -20,7 +20,7 @@ radius = 300.0
 z_index = 1
 y_sort_enabled = true
 script = ExtResource("1_ftmt4")
-_sceneNamesToLoad = PackedStringArray("res://scenes/scene_indoor_common_room.tscn")
+_sceneNamesToLoad = PackedStringArray("res://scenes/Babushka_scene_indoor_common_room.tscn")
 
 [node name="Foreground" type="Node" parent="."]
 
@@ -53,7 +53,7 @@ z_index = -100
 
 [node name="Ceiling" type="Sprite2D" parent="Background"]
 z_index = -100
-position = Vector2(-2453, -1303)
+position = Vector2(-2453, -1419)
 scale = Vector2(2, 2)
 texture = ExtResource("2_qsw8g")
 region_enabled = true
@@ -61,7 +61,7 @@ region_rect = Rect2(0, 1749.6222, 3840, 358.11316)
 
 [node name="WallUpper" type="Sprite2D" parent="Background"]
 z_index = -100
-position = Vector2(-2469, -975)
+position = Vector2(-2469, -969)
 scale = Vector2(26, 2)
 texture = ExtResource("2_qsw8g")
 region_enabled = true

scenes/Babushka_scene_indoor_vesnas_room.tscn

@@ -1,13 +1,11 @@
-[gd_scene load_steps=18 format=3 uid="uid://ceaa2qj2bmw43"]
+[gd_scene load_steps=16 format=3 uid="uid://ceaa2qj2bmw43"]
 
 [ext_resource type="Script" uid="uid://cssdu8viimwm6" path="res://scripts/CSharp/Common/SceneTransition.cs" id="1_c6eln"]
 [ext_resource type="Texture2D" uid="uid://cugtxcfuds31r" path="res://art/indoor/Babushka_bg_01.png" id="2_j25a2"]
 [ext_resource type="Script" uid="uid://cldtt4atgymm5" path="res://scripts/CSharp/Common/Quest/QuestTrigger.cs" id="8_j25a2"]
 [ext_resource type="PackedScene" uid="uid://cqc72e4hq6bcd" path="res://prefabs/interactions/interaction_area_2d.tscn" id="8_phqdf"]
 [ext_resource type="Resource" uid="uid://csj15gnlx1jmx" path="res://resources/quests/demo/8_goto_bed.tres" id="9_heyef"]
-[ext_resource type="Texture2D" uid="uid://s1yoemhrupwe" path="res://art/indoor/vesna_indoor_bed.png" id="10_hryl5"]
 [ext_resource type="Script" uid="uid://puw74w6lmcvl" path="res://scripts/CSharp/Common/Fight/NightStarter.cs" id="10_j25a2"]
-[ext_resource type="Texture2D" uid="uid://dnlhlf1mx01h5" path="res://art/indoor/vesna_indoor_door.png" id="11_axs81"]
 [ext_resource type="Script" uid="uid://jg4jryfus3bw" path="res://scripts/CSharp/Common/DayAndNight/DayAndNightHelper.cs" id="11_heyef"]
 [ext_resource type="Texture2D" uid="uid://cop1vjvhwlsec" path="res://art/indoor/room export/Room_01_shelf.png" id="13_11fdt"]
 [ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/characters/Vesna.tscn" id="18_3gevq"]
@@ -32,7 +30,7 @@ radius = 509.071
 [node name="VesnasRoom" type="Node2D"]
 y_sort_enabled = true
 script = ExtResource("1_c6eln")
-_sceneNamesToLoad = PackedStringArray("res://scenes/scene_indoor_common_room.tscn", "res://scenes/scene_fight_world_room.tscn")
+_sceneNamesToLoad = PackedStringArray("res://scenes/Babushka_scene_indoor_common_room.tscn", "res://scenes/Babushka_scene_fight_world_room.tscn")
 
 [node name="Colliders" type="Node2D" parent="."]
 position = Vector2(1297, 5292)
@@ -104,9 +102,8 @@ _followNode = NodePath("../Vesna/CharacterBody2D")
 
 [node name="CanvasLayer" parent="." instance=ExtResource("24_xwo8y")]
 
-[node name="BedInteraction" parent="." node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("8_phqdf")]
+[node name="BedInteraction" parent="." instance=ExtResource("8_phqdf")]
 position = Vector2(-1415, 489)
-_spritesToOutline = [NodePath("Bedsprite")]
 _id = 1
 
 [node name="CollisionShape3D" parent="BedInteraction/Area2D" index="0"]
@@ -118,30 +115,13 @@ script = ExtResource("8_j25a2")
 questResource = ExtResource("9_heyef")
 toStatus = 2
 
-[node name="Bedsprite" type="Sprite2D" parent="BedInteraction"]
+[node name="DoorInteraction" parent="." instance=ExtResource("8_phqdf")]
-z_index = -99
-position = Vector2(4925, -967)
-scale = Vector2(2, 2)
-texture = ExtResource("10_hryl5")
-offset = Vector2(-2768, 264)
-region_rect = Rect2(36.702454, 566.3165, 492.73346, 422.25665)
-
-[node name="DoorInteraction" parent="." node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("8_phqdf")]
 position = Vector2(777, 201)
-_spritesToOutline = [NodePath("Doorsprite")]
 _id = 0
 
 [node name="CollisionShape3D" parent="DoorInteraction/Area2D" index="0"]
 shape = SubResource("CircleShape2D_2spkc")
 
-[node name="Doorsprite" type="Sprite2D" parent="DoorInteraction"]
-z_index = -99
-position = Vector2(5559, -961)
-scale = Vector2(2, 2)
-texture = ExtResource("11_axs81")
-offset = Vector2(-2768, 264)
-region_rect = Rect2(1517.5891, 258.72107, 356.62732, 741.81134)
-
 [node name="NightStarter" type="Node" parent="."]
 script = ExtResource("10_j25a2")
 _sceneIndexToLoad = 1

scenes/Babushka_scene_outside_beets.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=100 format=3 uid="uid://b3ibx4resa1f3"]
+[gd_scene load_steps=99 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,9 +42,7 @@
 [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"]
@@ -203,6 +201,10 @@ radius = 325.2599
 resource_local_to_scene = true
 radius = 325.2599
 
+[sub_resource type="CircleShape2D" id="CircleShape2D_4pibb"]
+resource_local_to_scene = true
+radius = 325.2599
+
 [sub_resource type="CircleShape2D" id="CircleShape2D_dr6bm"]
 resource_local_to_scene = true
 radius = 335.72162
@@ -249,7 +251,7 @@ stream_2/stream = ExtResource("63_td2xu")
 
 [node name="BabushkaSceneBeets" type="Node2D"]
 script = ExtResource("1_6krrk")
-_sceneNamesToLoad = PackedStringArray("res://scenes/scene_farm_outside_2d.tscn")
+_sceneNamesToLoad = PackedStringArray("res://scenes/Babushka_scene_farm_outside_2d.tscn")
 
 [node name="Camera2D" type="Camera2D" parent="." node_paths=PackedStringArray("_followNode")]
 position = Vector2(3180, 1961)
@@ -1239,6 +1241,7 @@ 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)
@@ -1250,7 +1253,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 = -1
+z_index = 2
 y_sort_enabled = true
 material = SubResource("ShaderMaterial_bcdgk")
 position = Vector2(15973, 3380)
@@ -1371,7 +1374,6 @@ 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)
@@ -1400,13 +1402,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 = -5
+z_index = 1
 y_sort_enabled = true
 material = SubResource("ShaderMaterial_618my")
-position = Vector2(5187.001, 1864.0001)
+position = Vector2(5146, 1935)
 scale = Vector2(0.373695, 0.388829)
 texture = ExtResource("38_0bsmo")
-offset = Vector2(-109.7168, -617.4004)
+offset = Vector2(0, -800)
 region_enabled = true
 region_rect = Rect2(0, 0, 1440, 1576)
 
@@ -1763,7 +1765,6 @@ metadata/SaveID = "b3b47e69-6115-4405-8da6-508b783823d2"
 
 [node name="FieldBehaviour" parent="YSorted/Farm visuals/FieldParent/BaseField" index="1"]
 visible = true
-FieldState = 1
 metadata/SaveID = "7a8210bf-479d-4b4c-9758-98d23e59d5d7"
 
 [node name="PlantPlaceholder" parent="YSorted/Farm visuals/FieldParent/BaseField/FieldBehaviour" index="1"]
@@ -1776,7 +1777,6 @@ _field = NodePath("../..")
 _daysWatered = 6
 
 [node name="FieldActivator" parent="YSorted/Farm visuals/FieldParent/BaseField" index="7"]
-process_mode = 4
 visible = false
 
 [node name="CollisionShape3D" parent="YSorted/Farm visuals/FieldParent/BaseField/FieldActivator/InteractionArea/Area2D" index="0"]
@@ -1792,7 +1792,6 @@ metadata/SaveID = "f536efd3-3da8-4ef5-a520-570220e6c19f"
 
 [node name="FieldBehaviour" parent="YSorted/Farm visuals/FieldParent/BaseField2" index="1"]
 visible = true
-FieldState = 1
 metadata/SaveID = "a1d8a0a2-c51c-4410-83c3-0edb31cbf2de"
 
 [node name="PlantPlaceholder" parent="YSorted/Farm visuals/FieldParent/BaseField2/FieldBehaviour" index="1"]
@@ -1805,7 +1804,6 @@ _field = NodePath("../..")
 _daysWatered = 6
 
 [node name="FieldActivator" parent="YSorted/Farm visuals/FieldParent/BaseField2" index="7"]
-process_mode = 4
 visible = false
 
 [node name="CollisionShape3D" parent="YSorted/Farm visuals/FieldParent/BaseField2/FieldActivator/InteractionArea/Area2D" index="0"]
@@ -1821,7 +1819,6 @@ metadata/SaveID = "14ce64d5-8a4d-43b9-a8ff-3a57725c4dc8"
 
 [node name="FieldBehaviour" parent="YSorted/Farm visuals/FieldParent/BaseField3" index="1"]
 visible = true
-FieldState = 1
 metadata/SaveID = "79a65532-cb2b-4268-8eb0-8c41a3935cbb"
 
 [node name="PlantPlaceholder" parent="YSorted/Farm visuals/FieldParent/BaseField3/FieldBehaviour" index="1"]
@@ -1829,15 +1826,11 @@ z_index = 1
 
 [node name="Beet2" parent="YSorted/Farm visuals/FieldParent/BaseField3/FieldBehaviour/PlantPlaceholder" index="0" node_paths=PackedStringArray("_field") instance=ExtResource("41_vyqmy")]
 z_index = 0
-_state = 3
+_state = 2
 _field = NodePath("../..")
 _daysWatered = 5
 
-[node name="InteractionArea" parent="YSorted/Farm visuals/FieldParent/BaseField3/FieldBehaviour" index="2"]
-_active = true
-
 [node name="FieldActivator" parent="YSorted/Farm visuals/FieldParent/BaseField3" index="7"]
-process_mode = 4
 visible = false
 
 [node name="CollisionShape3D" parent="YSorted/Farm visuals/FieldParent/BaseField3/FieldActivator/InteractionArea/Area2D" index="0"]
@@ -1853,7 +1846,7 @@ metadata/SaveID = "6872ce5d-6f42-47d7-97e2-a7214ff3b08c"
 
 [node name="FieldBehaviour" parent="YSorted/Farm visuals/FieldParent/BaseField4" index="1"]
 visible = true
-FieldState = 1
+FieldState = 3
 metadata/SaveID = "13fa64a3-01dc-4fd8-822e-0839c0da3163"
 
 [node name="PlantPlaceholder" parent="YSorted/Farm visuals/FieldParent/BaseField4/FieldBehaviour" index="1"]
@@ -1861,12 +1854,11 @@ z_index = 1
 
 [node name="Beet2" parent="YSorted/Farm visuals/FieldParent/BaseField4/FieldBehaviour/PlantPlaceholder" index="0" node_paths=PackedStringArray("_field") instance=ExtResource("41_vyqmy")]
 z_index = 0
-_state = 3
+_state = 2
 _field = NodePath("../..")
 _daysWatered = 7
 
 [node name="FieldActivator" parent="YSorted/Farm visuals/FieldParent/BaseField4" index="7"]
-process_mode = 4
 visible = false
 
 [node name="CollisionShape3D" parent="YSorted/Farm visuals/FieldParent/BaseField4/FieldActivator/InteractionArea/Area2D" index="0"]
@@ -1882,7 +1874,7 @@ metadata/SaveID = "f163c38d-9ee0-4844-9def-479833febb4e"
 
 [node name="FieldBehaviour" parent="YSorted/Farm visuals/FieldParent/BaseField5" index="1"]
 visible = true
-FieldState = 1
+FieldState = 3
 metadata/SaveID = "414ecdb9-f3c4-4fb9-81bd-6ca575784f78"
 
 [node name="PlantPlaceholder" parent="YSorted/Farm visuals/FieldParent/BaseField5/FieldBehaviour" index="1"]
@@ -1895,7 +1887,6 @@ _field = NodePath("../..")
 _daysWatered = 6
 
 [node name="FieldActivator" parent="YSorted/Farm visuals/FieldParent/BaseField5" index="7"]
-process_mode = 4
 visible = false
 
 [node name="CollisionShape3D" parent="YSorted/Farm visuals/FieldParent/BaseField5/FieldActivator/InteractionArea/Area2D" index="0"]
@@ -1911,7 +1902,7 @@ metadata/SaveID = "da691381-ee82-4f86-abf3-dda2c9f19337"
 
 [node name="FieldBehaviour" parent="YSorted/Farm visuals/FieldParent/BaseField6" index="1"]
 visible = true
-FieldState = 1
+FieldState = 3
 metadata/SaveID = "b235febb-b231-4f8c-94e9-1f9d9f115b08"
 
 [node name="PlantPlaceholder" parent="YSorted/Farm visuals/FieldParent/BaseField6/FieldBehaviour" index="1"]
@@ -1924,7 +1915,6 @@ _field = NodePath("../..")
 _daysWatered = 5
 
 [node name="FieldActivator" parent="YSorted/Farm visuals/FieldParent/BaseField6" index="7"]
-process_mode = 4
 visible = false
 
 [node name="CollisionShape3D" parent="YSorted/Farm visuals/FieldParent/BaseField6/FieldActivator/InteractionArea/Area2D" index="0"]
@@ -1940,7 +1930,7 @@ metadata/SaveID = "8116fa8b-b164-4d39-a1ed-6cd476d18f94"
 
 [node name="FieldBehaviour" parent="YSorted/Farm visuals/FieldParent/BaseField7" index="1"]
 visible = true
-FieldState = 1
+FieldState = 3
 metadata/SaveID = "9ccdba91-812a-4c13-9ee0-12472e174fc9"
 
 [node name="PlantPlaceholder" parent="YSorted/Farm visuals/FieldParent/BaseField7/FieldBehaviour" index="1"]
@@ -1953,7 +1943,6 @@ _field = NodePath("../..")
 _daysWatered = 6
 
 [node name="FieldActivator" parent="YSorted/Farm visuals/FieldParent/BaseField7" index="7"]
-process_mode = 4
 visible = false
 
 [node name="CollisionShape3D" parent="YSorted/Farm visuals/FieldParent/BaseField7/FieldActivator/InteractionArea/Area2D" index="0"]
@@ -1969,7 +1958,7 @@ metadata/SaveID = "5298f423-4c3b-45b5-94fb-d4aef36bac21"
 
 [node name="FieldBehaviour" parent="YSorted/Farm visuals/FieldParent/BaseField8" index="1"]
 visible = true
-FieldState = 1
+FieldState = 3
 metadata/SaveID = "da44e54a-0b76-4888-ad8b-782a9d146fa3"
 
 [node name="PlantPlaceholder" parent="YSorted/Farm visuals/FieldParent/BaseField8/FieldBehaviour" index="1"]
@@ -1982,7 +1971,6 @@ _field = NodePath("../..")
 _daysWatered = 6
 
 [node name="FieldActivator" parent="YSorted/Farm visuals/FieldParent/BaseField8" index="7"]
-process_mode = 4
 visible = false
 
 [node name="CollisionShape3D" parent="YSorted/Farm visuals/FieldParent/BaseField8/FieldActivator/InteractionArea/Area2D" index="0"]
@@ -1991,28 +1979,23 @@ shape = SubResource("CircleShape2D_v10dc")
 [node name="BaseField9" parent="YSorted/Farm visuals/FieldParent" instance=ExtResource("40_efblm")]
 z_index = -1
 y_sort_enabled = true
-position = Vector2(5368, 3226.9458)
+position = Vector2(5317, 3208.83)
 scale = Vector2(1, 1.00622)
-Payload = 7
+Payload = 8
-metadata/SaveID = ""
+metadata/SaveID = "0de8dc13-5851-4471-be35-309cd6687ebc"
 
 [node name="FieldBehaviour" parent="YSorted/Farm visuals/FieldParent/BaseField9" index="1"]
 visible = true
-FieldState = 1
+metadata/SaveID = "9919b294-04a1-4a16-9783-38c8aa0e291c"
-metadata/SaveID = "da44e54a-0b76-4888-ad8b-782a9d146fa3"
 
 [node name="PlantPlaceholder" parent="YSorted/Farm visuals/FieldParent/BaseField9/FieldBehaviour" index="1"]
 z_index = 1
 
 [node name="FieldActivator" parent="YSorted/Farm visuals/FieldParent/BaseField9" index="7"]
-process_mode = 4
 visible = false
 
-[node name="InteractionArea" parent="YSorted/Farm visuals/FieldParent/BaseField9/FieldActivator" index="0" node_paths=PackedStringArray("_spritesToOutline")]
-_spritesToOutline = [NodePath("../../../BaseField8/OutlineSprite")]
-
 [node name="CollisionShape3D" parent="YSorted/Farm visuals/FieldParent/BaseField9/FieldActivator/InteractionArea/Area2D" index="0"]
-shape = SubResource("CircleShape2D_v10dc")
+shape = SubResource("CircleShape2D_4pibb")
 
 [node name="Blocker" type="Node2D" parent="YSorted"]
 
@@ -2022,7 +2005,7 @@ _spritesToOutline = [NodePath("Fence Door2")]
 _id = 0
 
 [node name="CollisionShape3D" parent="YSorted/Blocker/BackToFarm/Area2D" index="0"]
-position = Vector2(-37, -303)
+position = Vector2(-37, -208)
 shape = SubResource("CircleShape2D_dr6bm")
 
 [node name="Fence Door2" type="Sprite2D" parent="YSorted/Blocker/BackToFarm"]
@@ -2078,17 +2061,6 @@ 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)
 
@@ -2176,10 +2148,6 @@ 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"]
 
@@ -2187,31 +2155,22 @@ script = ExtResource("59_njxly")
 [editable path="YSorted/Brünnen/InteractionArea"]
 [editable path="YSorted/Farm visuals/FieldParent/BaseField"]
 [editable path="YSorted/Farm visuals/FieldParent/BaseField/FieldActivator/InteractionArea"]
-[editable path="YSorted/Farm visuals/FieldParent/BaseField/SaveSystem"]
 [editable path="YSorted/Farm visuals/FieldParent/BaseField2"]
 [editable path="YSorted/Farm visuals/FieldParent/BaseField2/FieldActivator/InteractionArea"]
-[editable path="YSorted/Farm visuals/FieldParent/BaseField2/SaveSystem"]
 [editable path="YSorted/Farm visuals/FieldParent/BaseField3"]
 [editable path="YSorted/Farm visuals/FieldParent/BaseField3/FieldActivator/InteractionArea"]
-[editable path="YSorted/Farm visuals/FieldParent/BaseField3/SaveSystem"]
 [editable path="YSorted/Farm visuals/FieldParent/BaseField4"]
 [editable path="YSorted/Farm visuals/FieldParent/BaseField4/FieldActivator/InteractionArea"]
-[editable path="YSorted/Farm visuals/FieldParent/BaseField4/SaveSystem"]
 [editable path="YSorted/Farm visuals/FieldParent/BaseField5"]
 [editable path="YSorted/Farm visuals/FieldParent/BaseField5/FieldActivator/InteractionArea"]
-[editable path="YSorted/Farm visuals/FieldParent/BaseField5/SaveSystem"]
 [editable path="YSorted/Farm visuals/FieldParent/BaseField6"]
 [editable path="YSorted/Farm visuals/FieldParent/BaseField6/FieldActivator/InteractionArea"]
-[editable path="YSorted/Farm visuals/FieldParent/BaseField6/SaveSystem"]
 [editable path="YSorted/Farm visuals/FieldParent/BaseField7"]
 [editable path="YSorted/Farm visuals/FieldParent/BaseField7/FieldActivator/InteractionArea"]
-[editable path="YSorted/Farm visuals/FieldParent/BaseField7/SaveSystem"]
 [editable path="YSorted/Farm visuals/FieldParent/BaseField8"]
 [editable path="YSorted/Farm visuals/FieldParent/BaseField8/FieldActivator/InteractionArea"]
-[editable path="YSorted/Farm visuals/FieldParent/BaseField8/SaveSystem"]
 [editable path="YSorted/Farm visuals/FieldParent/BaseField9"]
 [editable path="YSorted/Farm visuals/FieldParent/BaseField9/FieldActivator/InteractionArea"]
-[editable path="YSorted/Farm visuals/FieldParent/BaseField9/SaveSystem"]
 [editable path="YSorted/Blocker/BackToFarm"]
 [editable path="YSorted/RakeGenericPickup"]
 [editable path="YSorted/RakeGenericPickup/PickupInteractionArea"]

scenes/Babushka_scene_startMenu.tscn

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

scenes/entity_scenes/farm_outside.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=118 format=3 uid="uid://66pmq4efjip8"]
+[gd_scene load_steps=119 format=3 uid="uid://66pmq4efjip8"]
 
 [ext_resource type="Script" uid="uid://cssdu8viimwm6" path="res://scripts/CSharp/Common/SceneTransition.cs" id="1_o8nii"]
 [ext_resource type="Script" uid="uid://bqomwxclsbhd3" path="res://scripts/CSharp/Common/Camera/CameraController.cs" id="2_mnal7"]
@@ -26,7 +26,7 @@
 [ext_resource type="Texture2D" uid="uid://btea6eyucsyxj" path="res://art/farm/farming/farmobjekte/zaun/tilable fence middle part.png" id="24_hr375"]
 [ext_resource type="Texture2D" uid="uid://3ed3dgq3irn2" path="res://art/farm/farming/farmobjekte/zaun/tilable fence end part2.png" id="25_e15ep"]
 [ext_resource type="PackedScene" uid="uid://dfvgp1my5rydh" path="res://prefabs/characters/Yeli.tscn" id="26_hp2qi"]
-[ext_resource type="PackedScene" uid="uid://cv7trh2b3dyiv" path="res://prefabs/entity_placer/VesnaPlacer.tscn" id="27_nqcah"]
+[ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/characters/Vesna.tscn" id="27_slkey"]
 [ext_resource type="Resource" uid="uid://dlcmqfjvgphqu" path="res://resources/items/rake.tres" id="28_678ve"]
 [ext_resource type="Texture2D" uid="uid://dg7rlugnq0t45" path="res://art/farm/farming/farmobjekte/brünnen.png" id="29_6crsp"]
 [ext_resource type="Script" uid="uid://boehox1ydbcnx" path="res://scripts/CSharp/Common/Farming/WellBehaviour.cs" id="30_1l41q"]
@@ -63,6 +63,9 @@
 [ext_resource type="Script" uid="uid://cfnrd5k1k0gxw" path="res://scripts/CSharp/Common/AudioPlayer2D.cs" id="61_sfnme"]
 [ext_resource type="AudioStream" uid="uid://dapsknn486aee" path="res://audio/sfx/Farming/SFX_WateringPlants_01.wav" id="62_38bnv"]
 [ext_resource type="AudioStream" uid="uid://dnyne8wov50so" path="res://audio/sfx/Farming/SFX_WateringPlants_02.wav" id="63_cbwuo"]
+[ext_resource type="AudioStream" uid="uid://fsiypqhql67w" path="res://audio/sfx/Farming/SFX_GettingWater_01.wav" id="64_netyg"]
+[ext_resource type="AudioStream" uid="uid://foyw26hq1qp5" path="res://audio/sfx/Farming/SFX_GettingWater_02.wav" id="65_ujx1u"]
+[ext_resource type="AudioStream" uid="uid://c43a6x43jkikl" path="res://audio/sfx/Farming/SFX_GettingWater_Well_01_Reverb.wav" id="66_hokxo"]
 [ext_resource type="Script" uid="uid://cldtt4atgymm5" path="res://scripts/CSharp/Common/Quest/QuestTrigger.cs" id="67_qfkw3"]
 [ext_resource type="Resource" uid="uid://cm8kftow8br00" path="res://resources/quests/demo/1_talk_yeli_1.tres" id="68_ukjtk"]
 [ext_resource type="Script" uid="uid://c741nyedy26mx" path="res://scripts/CSharp/Common/QuestBehaviour/DetectInventoryContains.cs" id="69_3q2kg"]
@@ -77,9 +80,6 @@
 [ext_resource type="Resource" uid="uid://tt3d166mntmi" path="res://resources/low code/farming/var_sceneNameProvider.tres" id="78_wugdx"]
 [ext_resource type="Script" uid="uid://iquhbkr7pqeg" path="res://scripts/CSharp/Common/Savegame/SaveCheats.cs" id="79_tx4bp"]
 [ext_resource type="Script" uid="uid://ca4s0algeij1h" path="res://scripts/CSharp/Common/Savegame/SaveIDProviderTool.cs" id="80_tj68g"]
-[ext_resource type="Script" uid="uid://ca1pg6k3gn47y" path="res://scripts/CSharp/GameEntity/Management/EntitySceneContainer.cs" id="81_f57uc"]
-[ext_resource type="Script" uid="uid://bilg7e33usxuv" path="res://scripts/CSharp/GameEntity/EntityPlacer/TrashEntityPlacer.cs" id="82_ec5sc"]
-[ext_resource type="Texture2D" uid="uid://b2smanpdo1y5e" path="res://art/babushka_project.png" id="83_50rxh"]
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_wtdui"]
 resource_local_to_scene = true
@@ -234,6 +234,10 @@ shader_parameter/contrast_mult = 1.0
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_ycj14"]
 size = Vector2(707.116, 604.111)
 
+[sub_resource type="CircleShape2D" id="CircleShape2D_l7ekk"]
+resource_local_to_scene = true
+radius = 339.17
+
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_uxa2m"]
 shader = ExtResource("16_uvisc")
 shader_parameter/hue_shift = 0.0
@@ -242,10 +246,6 @@ shader_parameter/value_mult = 1.0
 shader_parameter/brightness_add = 0.0
 shader_parameter/contrast_mult = 1.0
 
-[sub_resource type="CircleShape2D" id="CircleShape2D_l7ekk"]
-resource_local_to_scene = true
-radius = 339.17
-
 [sub_resource type="AudioStreamPlaylist" id="AudioStreamPlaylist_ceriq"]
 loop = false
 stream_count = 1
@@ -261,6 +261,12 @@ streams_count = 2
 stream_0/stream = ExtResource("62_38bnv")
 stream_1/stream = ExtResource("63_cbwuo")
 
+[sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_618my"]
+streams_count = 3
+stream_0/stream = ExtResource("64_netyg")
+stream_1/stream = ExtResource("65_ujx1u")
+stream_2/stream = ExtResource("66_hokxo")
+
 [sub_resource type="Resource" id="Resource_y820s"]
 script = ExtResource("70_i0rxh")
 blueprint = ExtResource("33_iuqnb")
@@ -273,9 +279,9 @@ metadata/_custom_type_script = "uid://be54lnb6gg81f"
 
 [node name="BabushkaSceneFarmOutside2d" type="Node2D"]
 script = ExtResource("1_o8nii")
-_sceneNamesToLoad = PackedStringArray("res://scenes/Babushka_scene_indoor_common_room.tscn", "res://scenes/entity_scenes/outside_beets.tscn")
+_sceneNamesToLoad = PackedStringArray("res://scenes/Babushka_scene_indoor_common_room.tscn", "res://scenes/Babushka_scene_outside_beets.tscn")
 
-[node name="Camera2D" type="Camera2D" parent="."]
+[node name="Camera2D" type="Camera2D" parent="." node_paths=PackedStringArray("_followNode")]
 position = Vector2(3180, 1961)
 scale = Vector2(1, 0.993819)
 offset = Vector2(0, -500)
@@ -286,6 +292,7 @@ limit_right = 16000
 limit_bottom = 4700
 editor_draw_limits = true
 script = ExtResource("2_mnal7")
+_followNode = NodePath("../YSorted/Vesna/CharacterBody2D")
 
 [node name="ParallaxBackground" type="ParallaxBackground" parent="."]
 
@@ -951,8 +958,14 @@ y_sort_enabled = true
 position = Vector2(6403, 3362)
 _timelinesToPlay = PackedStringArray("yeli_quest_select")
 
-[node name="VesnaPlacer" parent="YSorted" instance=ExtResource("27_nqcah")]
+[node name="Vesna" parent="YSorted" instance=ExtResource("27_slkey")]
-position = Vector2(9178, 2365)
+z_index = 1
+position = Vector2(9322, 2018)
+_hoe = ExtResource("28_678ve")
+
+[node name="FarmingControls" parent="YSorted/Vesna" index="1" node_paths=PackedStringArray("_camera", "_fieldParent")]
+_camera = NodePath("../../../Camera2D")
+_fieldParent = NodePath("../../FieldParent")
 
 [node name="Well" type="Sprite2D" parent="YSorted" node_paths=PackedStringArray("_interactionArea")]
 z_index = 1
@@ -1016,6 +1029,7 @@ shape = SubResource("CircleShape2D_tm0yg")
 
 [node name="SeedPickup" parent="YSorted" instance=ExtResource("32_e5cox")]
 position = Vector2(9927, 2257)
+_finiteSupply = 3
 metadata/SaveID = "e1bbe13f-0622-42b8-97f3-87a8af369dc0"
 
 [node name="SpawnWithItem" parent="YSorted/SeedPickup" index="0"]
@@ -1032,6 +1046,7 @@ scale = Vector2(1, 1)
 
 [node name="BeetPickup" parent="YSorted" instance=ExtResource("32_e5cox")]
 position = Vector2(5787, 2269)
+_finiteSupply = 3
 metadata/SaveID = "e1bbe13f-0622-42b8-97f3-87a8af369dc0"
 
 [node name="SpawnWithItem" parent="YSorted/BeetPickup" index="0"]
@@ -1049,6 +1064,7 @@ scale = Vector2(1, 1)
 
 [node name="SeedPickup2" parent="YSorted" instance=ExtResource("32_e5cox")]
 position = Vector2(10705, 2257)
+_finiteSupply = 3
 metadata/SaveID = "77972c50-63a7-461a-bc7d-6fa46333bc5c"
 
 [node name="SpawnWithItem" parent="YSorted/SeedPickup2" index="0"]
@@ -2193,33 +2209,30 @@ collision_mask = 4
 position = Vector2(-106.663, 182.891)
 shape = SubResource("RectangleShape2D_ycj14")
 
-[node name="Fence Door" type="Sprite2D" parent="YSorted/Blocker"]
+[node name="InteractionArea" parent="YSorted/Blocker" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("31_3tf35")]
-material = SubResource("ShaderMaterial_uxa2m")
+position = Vector2(11234, 1850)
-position = Vector2(11235, 1579)
+_spritesToOutline = [NodePath("Fence Door")]
-rotation = -3.13727
-scale = Vector2(0.9049999, -0.925)
-texture = ExtResource("49_l3u1d")
-
-[node name="StaticBody2D" type="StaticBody2D" parent="YSorted/Blocker/Fence Door"]
-collision_layer = 2
-collision_mask = 4
-
-[node name="CollisionShape2D" type="CollisionShape2D" parent="YSorted/Blocker/Fence Door/StaticBody2D"]
-position = Vector2(-113.561, 193.035)
-shape = SubResource("RectangleShape2D_2vojv")
-
-[node name="InteractionArea" parent="YSorted/Blocker/Fence Door" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("31_3tf35")]
-position = Vector2(-0.18847656, 292.97498)
-rotation = -3.1373634
-scale = Vector2(1.1049721, -1.0810815)
-skew = 0.00018894672
-_spritesToOutline = [NodePath("..")]
 _id = 1
 metadata/SaveID = "6ee77256-42af-49c9-a3f2-cf167853f6fb"
 
-[node name="CollisionShape3D" parent="YSorted/Blocker/Fence Door/InteractionArea/Area2D" index="0"]
+[node name="CollisionShape3D" parent="YSorted/Blocker/InteractionArea/Area2D" index="0"]
 shape = SubResource("CircleShape2D_l7ekk")
 
+[node name="Fence Door" type="Sprite2D" parent="YSorted/Blocker/InteractionArea"]
+material = SubResource("ShaderMaterial_uxa2m")
+position = Vector2(1, -271)
+rotation = -3.13727
+scale = Vector2(0.905, -0.925)
+texture = ExtResource("49_l3u1d")
+
+[node name="StaticBody2D" type="StaticBody2D" parent="YSorted/Blocker/InteractionArea/Fence Door"]
+collision_layer = 2
+collision_mask = 4
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="YSorted/Blocker/InteractionArea/Fence Door/StaticBody2D"]
+position = Vector2(-113.561, 193.035)
+shape = SubResource("RectangleShape2D_2vojv")
+
 [node name="ducks" type="Node2D" parent="YSorted"]
 z_index = 1
 y_sort_enabled = true
@@ -2464,6 +2477,12 @@ max_distance = 20000000.0
 playback_type = 2
 script = ExtResource("61_sfnme")
 
+[node name="FillWater SFX2" type="AudioStreamPlayer2D" parent="Audio/SFX"]
+stream = SubResource("AudioStreamRandomizer_618my")
+max_distance = 20000000.0
+playback_type = 2
+script = ExtResource("61_sfnme")
+
 [node name="SpecialQuestTrigger" type="Node" parent="."]
 
 [node name="QuestInstantStart" type="Node" parent="SpecialQuestTrigger"]
@@ -2502,50 +2521,15 @@ script = ExtResource("79_tx4bp")
 [node name="SaveIDProvider" type="Node" parent="SaveSystem"]
 script = ExtResource("80_tj68g")
 
-[node name="EntityContainer" type="Node2D" parent="."]
+[connection signal="FilledWateringCan" from="YSorted/Vesna" to="Audio/SFX/FillWater SFX2" method="PlayOneShot"]
-script = ExtResource("81_f57uc")
+[connection signal="InteractedTool" from="YSorted/Well/InteractionArea" to="YSorted/Vesna" method="TryFillWateringCan"]
-sceneName = "farm_outside"
+[connection signal="SuccessfulPickUp" from="YSorted/CanGenericPickup" to="YSorted/Vesna" method="HandlePickUp"]
-
+[connection signal="SuccessfulPickUp" from="YSorted/RakeGenericPickup" to="YSorted/Vesna" method="HandlePickUp"]
-[node name="TrashPlacer" type="Node2D" parent="."]
+[connection signal="SuccessfulPickUp" from="YSorted/SeedPickup" to="YSorted/Vesna" method="HandlePickUp"]
-position = Vector2(10385, 2851)
+[connection signal="SuccessfulPickUp" from="YSorted/BeetPickup" to="YSorted/Vesna" method="HandlePickUp"]
-script = ExtResource("82_ec5sc")
+[connection signal="SuccessfulPickUp" from="YSorted/SeedPickup2" to="YSorted/Vesna" method="HandlePickUp"]
-
-[node name="icon" type="Sprite2D" parent="TrashPlacer"]
-visible = false
-texture = ExtResource("83_50rxh")
-
-[node name="TrashPlacer2" type="Node2D" parent="."]
-position = Vector2(10825, 3362)
-script = ExtResource("82_ec5sc")
-
-[node name="icon" type="Sprite2D" parent="TrashPlacer2"]
-visible = false
-texture = ExtResource("83_50rxh")
-
-[node name="TrashPlacer3" type="Node2D" parent="."]
-position = Vector2(9897, 3328)
-script = ExtResource("82_ec5sc")
-
-[node name="icon" type="Sprite2D" parent="TrashPlacer3"]
-visible = false
-texture = ExtResource("83_50rxh")
-
-[connection signal="area_entered" from="YSorted/Well/InteractionArea/Area2D" to="YSorted/Well/InteractionArea" method="OnPlayerEntered"]
-[connection signal="area_exited" from="YSorted/Well/InteractionArea/Area2D" to="YSorted/Well/InteractionArea" method="OnPlayerExited"]
-[connection signal="area_entered" from="YSorted/CanGenericPickup/PickupInteractionArea/Area2D" to="YSorted/CanGenericPickup/PickupInteractionArea" method="OnPlayerEntered"]
-[connection signal="area_exited" from="YSorted/CanGenericPickup/PickupInteractionArea/Area2D" to="YSorted/CanGenericPickup/PickupInteractionArea" method="OnPlayerExited"]
-[connection signal="area_entered" from="YSorted/RakeGenericPickup/PickupInteractionArea/Area2D" to="YSorted/RakeGenericPickup/PickupInteractionArea" method="OnPlayerEntered"]
-[connection signal="area_exited" from="YSorted/RakeGenericPickup/PickupInteractionArea/Area2D" to="YSorted/RakeGenericPickup/PickupInteractionArea" method="OnPlayerExited"]
-[connection signal="area_entered" from="YSorted/SeedPickup/PickupInteractionArea/Area2D" to="YSorted/SeedPickup/PickupInteractionArea" method="OnPlayerEntered"]
-[connection signal="area_exited" from="YSorted/SeedPickup/PickupInteractionArea/Area2D" to="YSorted/SeedPickup/PickupInteractionArea" method="OnPlayerExited"]
-[connection signal="area_entered" from="YSorted/BeetPickup/PickupInteractionArea/Area2D" to="YSorted/BeetPickup/PickupInteractionArea" method="OnPlayerEntered"]
-[connection signal="area_exited" from="YSorted/BeetPickup/PickupInteractionArea/Area2D" to="YSorted/BeetPickup/PickupInteractionArea" method="OnPlayerExited"]
-[connection signal="area_entered" from="YSorted/SeedPickup2/PickupInteractionArea/Area2D" to="YSorted/SeedPickup2/PickupInteractionArea" method="OnPlayerEntered"]
-[connection signal="area_exited" from="YSorted/SeedPickup2/PickupInteractionArea/Area2D" to="YSorted/SeedPickup2/PickupInteractionArea" method="OnPlayerExited"]
 [connection signal="InteractedTool" from="YSorted/Farm visuals/Static/EnterHouseInteraction" to="." method="LoadSceneAtIndex"]
-[connection signal="InteractedTool" from="YSorted/Blocker/Fence Door/InteractionArea" to="." method="LoadSceneAtIndex"]
+[connection signal="InteractedTool" from="YSorted/Blocker/InteractionArea" to="." method="LoadSceneAtIndex"]
-[connection signal="area_entered" from="YSorted/Blocker/Fence Door/InteractionArea/Area2D" to="YSorted/Blocker/Fence Door/InteractionArea" method="OnPlayerEntered"]
-[connection signal="area_exited" from="YSorted/Blocker/Fence Door/InteractionArea/Area2D" to="YSorted/Blocker/Fence Door/InteractionArea" method="OnPlayerExited"]
 [connection signal="GoalReached" from="YSorted/ducks" to="YSorted/ducks/DialogicToggle" method="ToggleDialogue"]
 [connection signal="DuckCollected" from="YSorted/ducks/Duck2" to="YSorted/ducks" method="Increment"]
 [connection signal="DuckCollected" from="YSorted/ducks/Duck3" to="YSorted/ducks" method="Increment"]
@@ -2559,6 +2543,7 @@ texture = ExtResource("83_50rxh")
 [connection signal="OnFulfilled" from="SpecialQuestTrigger/FieldWorkTrigger" to="SpecialQuestTrigger/FieldWorkTrigger/StartDialog" method="open"]
 [connection signal="tree_entered" from="SceneNameSetter" to="SceneNameSetter" method="Set"]
 
+[editable path="YSorted/Vesna"]
 [editable path="YSorted/Well/InteractionArea"]
 [editable path="YSorted/CanGenericPickup"]
 [editable path="YSorted/CanGenericPickup/PickupInteractionArea"]
@@ -2570,7 +2555,7 @@ texture = ExtResource("83_50rxh")
 [editable path="YSorted/BeetPickup/PickupInteractionArea"]
 [editable path="YSorted/SeedPickup2"]
 [editable path="YSorted/SeedPickup2/PickupInteractionArea"]
-[editable path="YSorted/Blocker/Fence Door/InteractionArea"]
+[editable path="YSorted/Blocker/InteractionArea"]
 [editable path="YSorted/trash/trashObject2"]
 [editable path="YSorted/trash/trashObject3"]
 [editable path="YSorted/trash/trashObject4"]

scenes/scene_bootstrap.tscn

@@ -1,16 +0,0 @@
-[gd_scene load_steps=4 format=3 uid="uid://bopv10dqm1knc"]
-
-[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="PackedScene" uid="uid://7pvvop5hfl01" path="res://prefabs/SaveSystem/save_system.tscn" id="3_s8cy4"]
-
-[node name="BabushkaSceneBootstrap" type="Node2D"]
-
-[node name="BabushkaSceneStartMenu" parent="." instance=ExtResource("1_15ton")]
-
-[node name="SceneParent" type="Node" parent="."]
-
-[node name="WindowSettings" type="Node" parent="."]
-script = ExtResource("2_d3jfo")
-
-[node name="SaveSystem" parent="." instance=ExtResource("3_s8cy4")]

scripts/CSharp/Common/Animation/VesnaAnimations.cs

@@ -1,8 +1,6 @@
 using System.Threading.Tasks;
 using Babushka.scripts.CSharp.Common.Inventory;
 using Babushka.scripts.CSharp.Common.Services;
-using Babushka.scripts.CSharp.GameEntity.Entities;
-using Babushka.scripts.CSharp.GameEntity.Management;
 using Godot;
 
 namespace Babushka.scripts.CSharp.Common.Animation;
@@ -29,12 +27,12 @@ public partial class VesnaAnimations : Node
 
     private void SetupSubscriptions()
     {
-	    EntityManager.Instance.GetUniqueEntity<VesnaEntity>().inventory.InventoryContentsChanged += HandleNewItemInInventory;
+	    InventoryManager.Instance.playerInventory.InventoryContentsChanged += HandleNewItemInInventory;
     }
 
     public override void _ExitTree()
     {
-	    EntityManager.Instance.GetUniqueEntity<VesnaEntity>().inventory.InventoryContentsChanged -= HandleNewItemInInventory;
+	    InventoryManager.Instance.playerInventory.InventoryContentsChanged -= HandleNewItemInInventory;
     }
 
     private void HandleNewItemInInventory()

scripts/CSharp/Common/Camera/CameraController.cs

@@ -5,8 +5,26 @@ namespace Babushka.scripts.CSharp.Common.Camera;
 
 public partial class CameraController : Camera2D
 {
+	#region Singleton ( Contains _EnterTree() ) // TODO: use autoload or other solution
+
+    public static CameraController Instance { get; private set; } = null!;
+
+    public override void _EnterTree()
+    {
+        Instance = this;
+    }
+
+    #endregion
+    
+    [Export] private Node2D _followNode;
+
+    public FightHappening? fightToShow;
+    
+
     public override void _Process(double delta)
     {
-        GlobalPosition = CameraTarget.GetActiveTarget().GlobalPosition;
+        this.GlobalPosition = /*fightToShow?.camPositionNode.GlobalPosition ??*/ _followNode.GlobalPosition;
+        
     }
+    
 }

scripts/CSharp/Common/Camera/CameraTarget.cs

@@ -1,29 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using Godot;
-
-namespace Babushka.scripts.CSharp.Common.Camera;
-
-public partial class CameraTarget : Node2D
-{
-    private static readonly List<CameraTarget> AllTargets = new();
-
-    public static CameraTarget GetActiveTarget() // Called every frame. Maybe needs performance optimization in the future
-    {
-        return AllTargets
-            .OrderByDescending(t => t.Priority)
-            .First();
-    }
-
-    [Export] public float Priority { get; set; }
-
-    public override void _EnterTree()
-    {
-        AllTargets.Add(this);
-    }
-    
-    public override void _ExitTree()
-    {
-        AllTargets.Remove(this);
-    }
-}

scripts/CSharp/Common/Camera/CameraTarget.cs.uid

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

scripts/CSharp/Common/CharacterControls/DetectableInteractionArea.cs

@@ -7,17 +7,4 @@ namespace Babushka.scripts.CSharp.Common.CharacterControls;
 /// </summary>
 public partial class DetectableInteractionArea : Area2D
 {
-    [Export] public InteractionArea2D interactionArea2D;
-    
-    public void InteractionAreaSelectionChanged(Variant instanceID)
-    {
-        if (instanceID.AsString() == GetInstanceId().ToString())
-        {
-            interactionArea2D.HighlightInteractable();
-        }
-        else
-        {
-            interactionArea2D.ResetHighlight();
-        }
-    }
 }

scripts/CSharp/Common/CharacterControls/DetectionCross.cs

@@ -7,8 +7,7 @@ namespace Babushka.scripts.CSharp.Common.CharacterControls;
 /// </summary>
 public partial class DetectionCross : Node2D
 {
-    [Export] private Detector _collider;
+    [Export] private Detector _detector;
-    [Export] private ShapeCast2D _shapeCast2D;
     [Export] private float _xOffset;
     [Export] private float _yOffset;
 
@@ -18,8 +17,6 @@ public partial class DetectionCross : Node2D
     /// <param name="direction"></param>
     public void SetDirection(Vector2 direction)
     {
-        Vector2 newPos = new Vector2(direction.X * _xOffset, direction.Y * _yOffset);
+        _detector.Position = new Vector2(direction.X * _xOffset, direction.Y * _yOffset);
-        _collider.Position = newPos;
-        _shapeCast2D.TargetPosition = newPos;
     }
 }

scripts/CSharp/Common/CharacterControls/Detector.cs

@@ -1,6 +1,4 @@
-using System.Collections.Generic;
 using Babushka.scripts.CSharp.Common.Services;
-using Babushka.scripts.CSharp.Low_Code.Variables;
 using Godot;
 
 namespace Babushka.scripts.CSharp.Common.CharacterControls;
@@ -10,11 +8,18 @@ namespace Babushka.scripts.CSharp.Common.CharacterControls;
 /// </summary>
 public partial class Detector : Area2D
 {
-    [Export] private bool _active = true;
-    [Export] private ShapeCast2D _shapeCast2D;
-    [Export] private VariableResource _itemToTriggerResource;
 
-    private List<ulong> _areasInDetector = new();
+    [Export] private bool _active = true;
+    
+    /// <summary>
+    /// Called when entering an interactionArea node.
+    /// </summary>
+    [Signal] public delegate void InteractableEnteredEventHandler();
+    
+    /// <summary>
+    /// Called when exiting an interactionArea node.
+    /// </summary>
+    [Signal] public delegate void InteractableExitedEventHandler();
     
     public bool IsActive
     {
@@ -36,62 +41,29 @@ public partial class Detector : Area2D
     /// Called every time this node enters an Area2D. 
     /// </summary>
     /// <param name="area"></param>
-    public void OnEnteredInteractable(Area2D area)
+    public void OnEnteredInteractable(Node area)
     {
         if (!_active || !InputService.Instance.InputEnabled)
             return;
 
-        PopulateList();
+        if (area is DetectableInteractionArea interactionArea2D)
-        CalculateClosestInteractable();
+        {
+            EmitSignal(SignalName.InteractableEntered);
+        }
     }
 
     /// <summary>
     /// Called whenever this node exits an Area2D.
     /// </summary>
     /// <param name="area"></param>
-    public void OnExitedInteractable(Area2D area)
+    public void OnExitedInteractable(Node area)
     {
         if (!_active || !InputService.Instance.InputEnabled)
             return;
         
-        PopulateList();
+        if (area is DetectableInteractionArea interactionArea2D)
-        CalculateClosestInteractable();
-    }
-
-    private void PopulateList()
-    {
-        // repopulate the list of areas in the detector to account for enabled / disabled areas
-        var currentOverlap = GetOverlappingAreas();
-        _areasInDetector = new List<ulong>();
-
-        foreach (var area2D in currentOverlap)
         {
-            if (area2D is DetectableInteractionArea detectable)
+            EmitSignal(SignalName.InteractableExited);
-            {
-                ulong id = detectable.GetInstanceId();
-                _areasInDetector.Add(id);
-            }
         }
     }
-    
-    private void CalculateClosestInteractable()
-    {
-        float smallestDistance = float.MaxValue;
-        string closestInteractable = null;
-        foreach (var area in _areasInDetector)
-        {
-            Area2D? area2D = InstanceFromId(area) as Area2D;
-            if(area2D == null)
-                continue;
-            
-            float distance = area2D.GlobalPosition.DistanceSquaredTo(ToGlobal(_shapeCast2D.TargetPosition));
-            if (distance < smallestDistance)
-            {
-                closestInteractable = area.ToString();
-                smallestDistance = distance;
-            }
-        }
-        _itemToTriggerResource.Payload = closestInteractable;
-    }
-    
 }

scripts/CSharp/Common/CharacterControls/InteractionArea2D.cs

@@ -1,6 +1,5 @@
 using System.Linq;
 using Babushka.scripts.CSharp.Common.Services;
-using Babushka.scripts.CSharp.Low_Code.Variables;
 using Godot;
 
 namespace Babushka.scripts.CSharp.Common.CharacterControls;
@@ -8,7 +7,6 @@ namespace Babushka.scripts.CSharp.Common.CharacterControls;
 public partial class InteractionArea2D : Node2D
 {
     [ExportGroup("Settings")]
-    [Export] private VariableListener _selectionChangeListener;
     [Export] private Area2D _area;
     [Export] private Label _label;
     [Export] private bool _active = true;
@@ -19,7 +17,6 @@ public partial class InteractionArea2D : Node2D
     [Export] private int _id = -1; // TODO: remove
 
     private Material[] _backupMaterials;
-    private bool _initializationComplete;
 
     [Signal] public delegate void InteractedToolEventHandler(int id); // TODO: remove
 
@@ -28,19 +25,9 @@ public partial class InteractionArea2D : Node2D
     public bool IsActive
     {
         get => _active;
-        set
+        set => _active = value;
-        {
-            ProcessMode = value ? ProcessModeEnum.Inherit : ProcessModeEnum.Disabled;
-            Visible = value;
-            _selectionChangeListener.ProcessMode = value ? ProcessModeEnum.Inherit : ProcessModeEnum.Disabled;
-            _active = value;
-            if(!_active && _initializationComplete)
-                ResetHighlight();
-        } 
     }
 
-    public bool IsSelectedByDetector { get; set; } = false;
-
     public void SetActiveInverse(bool active)
     {
         IsActive = !active;
@@ -51,14 +38,11 @@ public partial class InteractionArea2D : Node2D
         if (_useOutline)
         {
             _backupMaterials = _spritesToOutline.Select(s => s.Material).ToArray();
-            _initializationComplete = true;
         }
     }
 
-    public void HighlightInteractable()
+    public void OnPlayerEntered(Node2D player)
     {
-        IsSelectedByDetector = true;
-        
         if (!_active || !InputService.Instance.InputEnabled)
             return;
 
@@ -74,9 +58,8 @@ public partial class InteractionArea2D : Node2D
         }
     }
 
-    public void ResetHighlight()
+    public void OnPlayerExited(Node2D player)
     {
-        IsSelectedByDetector = false;
         _label.Hide();
 
         if (!_useOutline)
@@ -94,9 +77,6 @@ public partial class InteractionArea2D : Node2D
         if (!_active || !InputService.Instance.InputEnabled)
             return;
 
-        if(!IsSelectedByDetector)
-            return;
-
         if (@event.IsAction("interact") && @event.IsPressed())
         {
             TryInteract();
@@ -112,7 +92,16 @@ public partial class InteractionArea2D : Node2D
     {
         if (_area.HasOverlappingAreas())
         {
-            ResetHighlight();
+            _label.Hide();
+
+            if (_useOutline)
+            {
+                for (var i = 0; i < _spritesToOutline.Length; i++)
+                {
+                    var sprite = _spritesToOutline[i];
+                    sprite.Material = _backupMaterials[i];
+                }
+            }
             Interact();
         }
     }
@@ -131,20 +120,8 @@ public partial class InteractionArea2D : Node2D
 
     public void ToggleActive()
     {
-        GD.Print($"Toggle active {GetParent().Name}: {!_active}");
         _active = !_active;
         _label.Hide();
     }
 
-    public void SetActiveTrue()
-    {
-        IsActive = true;
-    }
-    
-    public void SetActiveFalse()
-    {
-        IsActive = false;
-    }
-
-
 }

scripts/CSharp/Common/CharacterControls/PlayerMovement.cs

@@ -1,5 +1,4 @@
 using Babushka.scripts.CSharp.Common.Services;
-using Babushka.scripts.CSharp.GameEntity.Entities;
 using Godot;
 
 namespace Babushka.scripts.CSharp.Common.CharacterControls;
@@ -9,14 +8,6 @@ public partial class PlayerMovement : CharacterBody2D
     [Export] private float _speed = 1000f;
     [Export] private Timer _stepTimer;
 
-    private PositionalEntity _entity;
-
-    public void Initialize(PositionalEntity entity)
-    {
-        _entity = entity;
-        GlobalPosition = entity.position;
-    }
-    
     public override void _Process(double delta)
     {
         bool anyActionPressed = false;
@@ -85,7 +76,6 @@ public partial class PlayerMovement : CharacterBody2D
             
             Velocity = currentVelocity;
             MoveAndSlide();
-            _entity.position = GlobalPosition;
         }
         else
         {

scripts/CSharp/Common/Farming/FarmingControls2D.cs

@@ -8,11 +8,11 @@ public partial class FarmingControls2D : Node2D
 {
     [Export] private VariableResource _sceneKeyProvider;
     [Export] private Node2D _movingPlayer;
-    //[Export] private Camera2D _camera; // can be replaced with GetViewport().GetCamera2D()
+    [Export] private Camera2D _camera;
 
     [Export] private float _wateringCanParticlesVerticalOffset = 50f;
     [Export] private Vector2I _fieldOffsetVector = new Vector2I(735, 651);
-    //[Export] private Node2D _fieldParent; // never used
+    [Export] private Node2D _fieldParent;
 
     private int _toolId = -1;
     private bool _wateringCanFilled = false;
@@ -51,8 +51,7 @@ public partial class FarmingControls2D : Node2D
 
     private Vector2I GetAdjustedMousePosition()
     {
-        var camera = GetViewport().GetCamera2D();
+        Vector2 mousePosition = _camera.GetGlobalMousePosition();
-        Vector2 mousePosition = camera.GetGlobalMousePosition();
         Vector2I mousePositionInteger = (Vector2I) mousePosition;
         Vector2I adjustedPosition = AdjustValue(mousePositionInteger, _fieldOffsetVector);
         return adjustedPosition;

scripts/CSharp/Common/Farming/FieldActivator.cs

@@ -1,18 +1,15 @@
 using Babushka.scripts.CSharp.Common.CharacterControls;
-using Babushka.scripts.CSharp.Common.Savegame;
 using Godot;
-using Godot.Collections;
 
 namespace Babushka.scripts.CSharp.Common.Farming;
 
 /// <summary>
 /// Enables a preset field in the scene sothat it can be used for farming.
 /// </summary>
-public partial class FieldActivator : Node, ISaveable
+public partial class FieldActivator : Node
 {
     [Export] private FieldBehaviour2D _field;
     [Export] private InteractionArea2D _activatorArea;
-    [Export] private Node _saveIdHolder;
 
     private bool _used = false;
     private bool _rakeInHand;
@@ -21,7 +18,6 @@ public partial class FieldActivator : Node, ISaveable
 
     public override void _Ready()
     {
-        LoadFromSaveData();
         ToggleInteractionArea();
     }
     
@@ -36,8 +32,6 @@ public partial class FieldActivator : Node, ISaveable
             _field.UpdateFieldState(FieldState.Tilled);
             EmitSignal(SignalName.FieldCreated, _field);
             _used = true;
-            ToggleInteractionArea();
-            UpdateSaveData();
         }
     }
 
@@ -48,8 +42,6 @@ public partial class FieldActivator : Node, ISaveable
     /// <param name="activated"></param>
     public void RakeActivated(bool activated)
     {
-        if (_used || ProcessMode == ProcessModeEnum.Disabled)
-            return;
         _rakeInHand = activated;
         ToggleInteractionArea();
     }
@@ -59,35 +51,4 @@ public partial class FieldActivator : Node, ISaveable
         _activatorArea.IsActive = !_used && _rakeInHand;
     }
     
-    public void UpdateSaveData()
-    {
-        var payloadData = new Dictionary<string, Variant>
-        {
-            { "field_activator_used", _used }
-        };
-        
-        // Building a unique id from the top node's save id and a qualifier to make it new.
-        string parent_id = _saveIdHolder.GetMeta("SaveID").AsString();
-        string id = $"{parent_id}_field_activator";
-        SavegameService.AppendDataToSave( id, payloadData);
-    }
-
-    public void LoadFromSaveData()
-    {
-        string parent_id = _saveIdHolder.GetMeta("SaveID").AsString(); 
-        string id = $"{parent_id}_field_activator";
-        
-        Dictionary<string, Variant> save = SavegameService.GetSaveData(id);
-        if (save.Count > 0)
-        {
-            if (save.TryGetValue("field_activator_used", out Variant usedVar))
-            {
-                _used = usedVar.AsBool();
-            }
-            else
-            {
-                _used = false;
-            }
-        }
-    }
 }

scripts/CSharp/Common/Farming/FieldBehaviour2D.cs

@@ -3,8 +3,6 @@ using Babushka.scripts.CSharp.Common.CharacterControls;
 using Babushka.scripts.CSharp.Common.DayAndNight;
 using Babushka.scripts.CSharp.Common.Inventory;
 using Babushka.scripts.CSharp.Common.Savegame;
-using Babushka.scripts.CSharp.GameEntity.Entities;
-using Babushka.scripts.CSharp.GameEntity.Management;
 using Babushka.scripts.CSharp.Low_Code.Events;
 using Babushka.scripts.CSharp.Low_Code.Variables;
 using Godot;
@@ -35,6 +33,7 @@ public partial class FieldBehaviour2D : Sprite2D, ISaveable
     
     [ExportGroup("Field Interactions")]
     [Export] public InteractionArea2D PlantingInteraction;
+    [Export] public InteractionArea2D FieldInteractionArea;
     
     [ExportGroup("Configuration")]
     [Export] public Node2D PlantingPlaceholder;
@@ -49,8 +48,6 @@ 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";
@@ -60,11 +57,11 @@ public partial class FieldBehaviour2D : Sprite2D, ISaveable
     private void UpdateInteractionArea()
     {
         // fieldstate == tilled / watered && samen im Inventar
-        _canPlant = (FieldState == FieldState.Tilled ||  FieldState == FieldState.Watered) && _seedsActive && !IsPlanted;
+        _canPlant = (FieldState == FieldState.Tilled ||  FieldState == FieldState.Watered) && _seedsActive;
         // fieldstate == tilled && watering can ausgewählt
-        _canWater = (FieldState == FieldState.Tilled || IsPlanted) && _wateringCanActive && WateringCanState.GetFillState() > 0;
+        _canWater = (FieldState == FieldState.Tilled || FieldState == FieldState.Planted) && _wateringCanActive;
         
-        PlantingInteraction.IsActive = _canPlant || _canWater;
+        FieldInteractionArea.IsActive = _canPlant || _canWater;
     }
 
     public void ActivatedSeedInInventory(bool activated)
@@ -81,17 +78,9 @@ public partial class FieldBehaviour2D : Sprite2D, ISaveable
 
     public override void _EnterTree()
     {
-        WateringCanState.OnFill += UpdateInteractionArea;
-        WateringCanState.OnEmpty += UpdateInteractionArea;
         LoadFromSaveData();
     }
 
-    public override void _ExitTree()
-    {
-        WateringCanState.OnFill -= UpdateInteractionArea;
-        WateringCanState.OnEmpty -= UpdateInteractionArea;
-    }
-
     public override void _Ready()
     {
         if(PlantingPlaceholder.GetChildCount() > 0)
@@ -115,14 +104,17 @@ public partial class FieldBehaviour2D : Sprite2D, ISaveable
             case FieldState.Tilled:
                 FieldState = FieldState.Tilled;
                 _fieldSprite.Texture = Tilled;
-                if(!IsPlanted)
+                PlantingInteraction.IsActive = true;
-                    PlantingInteraction.IsActive = true;
                 break;
             case FieldState.Watered:
                 FieldState = FieldState.Watered;
                 _fieldSprite.Texture = Watered;
-                if(!IsPlanted)
+                PlantingInteraction.IsActive = true;
-                    PlantingInteraction.IsActive = true;
+                break;
+            case FieldState.Planted:
+                FieldState = FieldState.Planted;
+                _fieldSprite.Texture = Tilled;
+                PlantingInteraction.IsActive = false;
                 break;
             default:
                 FieldState = FieldState.NotFound;
@@ -133,6 +125,7 @@ public partial class FieldBehaviour2D : Sprite2D, ISaveable
             UpdateSaveData();
     }
 
+
     public void Water()
     {
         if (WateringCanState.GetFillState() > 0 && FieldState != FieldState.Watered)
@@ -158,7 +151,7 @@ public partial class FieldBehaviour2D : Sprite2D, ISaveable
         if (_canPlant && TryPlant())
         { 
             EmitSignal(SignalName.Planted);
-            UpdateSaveData();
+            UpdateFieldState(FieldState.Planted);
         }
 
         if (_canWater)
@@ -167,21 +160,11 @@ public partial class FieldBehaviour2D : Sprite2D, ISaveable
         }
     }
 
-    public void ChangePlantedState()
-    {
-        IsPlanted = true;
-        if(FieldState == FieldState.Tilled)
-            _fieldSprite.Texture = Tilled;
-        if(FieldState == FieldState.Watered)
-            _fieldSprite.Texture = Watered;
-        PlantingInteraction.IsActive = false;
-    }
-
     private bool TryPlant()
     {
         bool success = false;
-        int currentSlotIndex = EntityManager.Instance.GetUniqueEntity<VesnaEntity>().CurrentSelectedSlotIndex;
+        int currentSlotIndex = InventoryManager.Instance.CurrentSelectedSlotIndex;
-        ItemInstance? item = EntityManager.Instance.GetUniqueEntity<VesnaEntity>().inventory.Slots[currentSlotIndex].itemInstance;
+        ItemInstance? item = InventoryManager.Instance.playerInventory.Slots[currentSlotIndex].itemInstance;
         
         if (item == null || PlantingPlaceholder.GetChildCount() > 0 || item.amount == 0)
             return success;
@@ -191,7 +174,7 @@ public partial class FieldBehaviour2D : Sprite2D, ISaveable
         if (!string.IsNullOrEmpty(plantPrefabPath))
         {
             PlantPrefab(plantPrefabPath);
-            EntityManager.Instance.GetUniqueEntity<VesnaEntity>().inventory.RemoveItem(currentSlotIndex);
+            InventoryManager.Instance.playerInventory.RemoveItem(currentSlotIndex);
             success = true;
         }
         
@@ -204,7 +187,6 @@ public partial class FieldBehaviour2D : Sprite2D, ISaveable
 
         if (_currentPlant != null)
         {
-            ChangePlantedState();
             _currentPlant.DayPlanted = _currentDay;
         }
     }
@@ -227,7 +209,6 @@ public partial class FieldBehaviour2D : Sprite2D, ISaveable
     {
         _currentPlant = null;
         UpdateFieldState(FieldState.Empty, true);
-        IsPlanted = false;
     }
     
     #region SAVE AND LOAD
@@ -240,10 +221,10 @@ 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 (IsPlanted)
+        if (_currentPlant != null)
         {
             payloadData.Add(
                 "plant_data", new Dictionary<string, Variant>()
@@ -277,7 +258,6 @@ 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))
@@ -334,10 +314,17 @@ 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
+                            // if the field was watered the day before, set it to tilled or planted.
                             if (fieldStateInt == 3)
                             {
-                                fieldStateInt = 1;
+                                if (_currentPlant != null)
+                                {
+                                    fieldStateInt = 2;
+                                }
+                                else
+                                {
+                                    fieldStateInt = 1;
+                                }
                             }
                         }
                     }

scripts/CSharp/Common/Farming/FieldState.cs

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

scripts/CSharp/Common/Farming/PlantBehaviour2D.cs

@@ -3,6 +3,7 @@ using System.Diagnostics;
 using Babushka.scripts.CSharp.Common.Inventory;
 using Babushka.scripts.CSharp.Low_Code.Variables;
 using Godot;
+using Godot.Collections;
 
 namespace Babushka.scripts.CSharp.Common.Farming;
 
@@ -185,8 +186,7 @@ public partial class PlantBehaviour2D : Node2D
 
     private void SetActiveHarvestablePlant(bool active)
     {
-        _harvestablePlant.IsActive = active;
+        //_harvestablePlant.IsActive = active;
-        _harvestablePlant.ProcessMode = active ? ProcessModeEnum.Inherit : ProcessModeEnum.Disabled;
         _harvestablePlant.UpdateVisuals();
     }
 

scripts/CSharp/Common/Farming/VesnaBehaviour2D.cs

@@ -2,17 +2,15 @@ using Babushka.scripts.CSharp.Common.Animation;
 using Babushka.scripts.CSharp.Common.CharacterControls;
 using Babushka.scripts.CSharp.Common.Inventory;
 using Babushka.scripts.CSharp.Common.Services;
-using Babushka.scripts.CSharp.GameEntity.Entities;
-using Babushka.scripts.CSharp.GameEntity.Management;
 using Godot;
 
 namespace Babushka.scripts.CSharp.Common.Farming;
 
-public partial class VesnaBehaviour2D : Node2D // EntityNode
+public partial class VesnaBehaviour2D : Node
 {
     [ExportGroup("Farming")]
     [Export] private FarmingControls2D _farmingControls;
-    [Export] public PlayerMovement player2d;
+    [Export] private PlayerMovement _player2d;
     [Export] private VesnaAnimations _vesnaAnimations;
     [Export] private ItemResource _hoe;
     [Export] private ItemResource _wateringCan;
@@ -22,32 +20,34 @@ public partial class VesnaBehaviour2D : Node2D // EntityNode
     
     [Signal] public delegate void InventorySelectionChangedEventHandler(int toolId);
 
-    //private InventoryManager _inventoryManager;
+    private InventoryManager _inventoryManager;
-    private VesnaEntity _vesnaEntity;
+    private InventoryInstance _inventoryInstance;
-    private InventoryInstance _playerInventory;
     
     public override void _Ready()
     {
-        _vesnaEntity = EntityManager.Instance.GetUniqueEntity<VesnaEntity>();
+        _inventoryManager = InventoryManager.Instance;
-        _playerInventory = _vesnaEntity.inventory;
+        _inventoryInstance = _inventoryManager.playerInventory;
-        _vesnaEntity.SlotIndexChanged += HandleInventorySelectedSlotIndexChanged;
+        _inventoryManager.SlotIndexChanged += HandleInventorySelectedSlotIndexChanged;
-        _playerInventory.InventoryContentsChanged += UpdateToolInHand;
     }
 
     public override void _ExitTree()
     {
-        _vesnaEntity.SlotIndexChanged -= HandleInventorySelectedSlotIndexChanged;
+        _inventoryManager.SlotIndexChanged -= HandleInventorySelectedSlotIndexChanged;
-        _playerInventory.InventoryContentsChanged -= UpdateToolInHand;
     }
 
-    private void HandleInventorySelectedSlotIndexChanged(int _ = 0)
+    /// <summary>
+    /// Called when picking up an item.
+    /// Makes sure that item animations are also updated when they are occupying a currently empty spot.
+    /// </summary>
+    public void HandlePickUp()
     {
-        UpdateToolInHand();
+        //Calls the same event handler as the inventory to ensure the currently selected item is updated in the animation.
+        HandleInventorySelectedSlotIndexChanged(0);
     }
     
-    private void UpdateToolInHand()
+    private void HandleInventorySelectedSlotIndexChanged(int newIndex = 0)
     {
-        InventorySlot currentSlot = _playerInventory.Slots[_vesnaEntity.CurrentSelectedSlotIndex];
+        InventorySlot currentSlot = InventoryManager.Instance.GetCurrentSelectedSlot();
         ItemInstance? currentItem = currentSlot.itemInstance;
         
         int toolId = -1;

scripts/CSharp/Common/Farming/WateringCanState.cs

@@ -30,7 +30,6 @@ public static class WateringCanState
     public static event WateringCanDelegate WateringCanActiveStateChanged;
     public static event Action? OnWater;
     public static event Action? OnFill;
-    public static event Action? OnEmpty;
         
 
     
@@ -53,11 +52,6 @@ public static class WateringCanState
             _fillstate--;
             OnWater?.Invoke();
         }
-
-        if (_fillstate == 0)
-        {
-            OnEmpty?.Invoke();
-        }
     }
 
     /// <summary>

scripts/CSharp/Common/Farming/WellBehaviour.cs

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

scripts/CSharp/Common/Fight/Actions/EatBeetrootAction.cs

@@ -3,8 +3,6 @@ using System.Diagnostics;
 using System.Threading.Tasks;
 using Babushka.scripts.CSharp.Common.Inventory;
 using Babushka.scripts.CSharp.Common.Util;
-using Babushka.scripts.CSharp.GameEntity.Entities;
-using Babushka.scripts.CSharp.GameEntity.Management;
 
 namespace Babushka.scripts.CSharp.Common.Fight.Actions;
 
@@ -19,7 +17,7 @@ public class EatBeetrootAction : FighterAction
     {
         Debug.Assert(FightWorld.Instance.itemBeetrootToEatForHealth != null,
             "Item to eat for health has not been set in the FightWorld autoload");
-        return !EntityManager.Instance.GetUniqueEntity<VesnaEntity>().inventory.HasItems(new ItemInstance
+        return !InventoryManager.Instance.playerInventory!.HasItems(new ItemInstance
             { blueprint = FightWorld.Instance.itemBeetrootToEatForHealth });
     }
 
@@ -37,7 +35,7 @@ public class EatBeetrootAction : FighterAction
     {
         var fighter = HappeningData.fighterTurn.Current;
 
-        var result = EntityManager.Instance.GetUniqueEntity<VesnaEntity>().inventory.TryRemoveAllItems(
+        var result = InventoryManager.Instance.playerInventory!.TryRemoveAllItems(
             new ItemInstance { blueprint = FightWorld.Instance.itemBeetrootToEatForHealth! });
 
         if (result != InventoryActionResult.Success)

scripts/CSharp/Common/Fight/UI/HealButtonVisual.cs

@@ -1,6 +1,4 @@
 using Babushka.scripts.CSharp.Common.Inventory;
-using Babushka.scripts.CSharp.GameEntity.Entities;
-using Babushka.scripts.CSharp.GameEntity.Management;
 using Godot;
 
 namespace Babushka.scripts.CSharp.Common.Fight.UI;
@@ -11,7 +9,7 @@ public partial class HealButtonVisual : Button
     
     public void UpdateText()
     {
-        var healItemsLeft = EntityManager.Instance.GetUniqueEntity<VesnaEntity>().inventory.TotalItemsOfBlueprint(_healItemBlueprint);
+        var healItemsLeft = InventoryManager.Instance.playerInventory!.TotalItemsOfBlueprint(_healItemBlueprint);
         Text = $"x{healItemsLeft} - Heal";
     }
 }

scripts/CSharp/Common/Interactables/TrashObject.cs

@@ -1,69 +0,0 @@
-using Godot;
-using Babushka.scripts.CSharp.Common.Savegame;
-using Godot.Collections;
-
-/// <summary>
-/// Simple collectible scene objects with saveable state.
-/// </summary>
-public partial class TrashObject : Sprite2D, ISaveable
-{
-    private bool _collected;
-    
-    /// <summary>
-    /// Loads objects state on scene start.
-    /// </summary>
-    public override void _Ready()
-    {
-        LoadFromSaveData();
-    }
-
-    /// <summary>
-    /// Sets object state to collected and updates save data.
-    /// </summary>
-    public void Collect()
-    {
-        SetCollectedState();
-        UpdateSaveData();
-    }
-
-    private void SetCollectedState()
-    {
-        _collected = true;
-        Visible = false;
-        ProcessMode = ProcessModeEnum.Disabled;
-    }
-    
-    /// <summary>
-    /// Updates the save data with the current state of the object.
-    /// </summary>
-    public void UpdateSaveData()
-    {
-        var payloadData = new Dictionary<string, Variant>
-        {
-            { "collectedState", _collected },
-        };
-        
-        string id = GetMeta("SaveID").AsString();
-        SavegameService.AppendDataToSave( id, payloadData);
-    }
-
-    /// <summary>
-    /// Loads objects state from save data.
-    /// </summary>
-    public void LoadFromSaveData()
-    {
-        string id = GetMeta("SaveID").AsString();
-
-        Dictionary<string, Variant> save = SavegameService.GetSaveData(id);
-        if (save.Count > 0)
-        {
-            if (save.TryGetValue("collectedState", out Variant collectedVar))
-            {
-                if (collectedVar.AsBool())
-                {
-                    SetCollectedState();
-                }
-            }
-        }
-    }
-}

scripts/CSharp/Common/Interactables/TrashObject.cs.uid

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

scripts/CSharp/Common/Inventory/InventoryInstance.cs

@@ -4,21 +4,24 @@ using Godot;
 using System.Collections.Generic;
 using System.Linq;
 using Babushka.scripts.CSharp.Common.Savegame;
-using Babushka.scripts.CSharp.GameEntity.LoadSave;
-using Newtonsoft.Json.Linq;
 
 namespace Babushka.scripts.CSharp.Common.Inventory;
 
-public partial class InventoryInstance : IJsonSerializable
+public partial class InventoryInstance : Node, ISaveable
 {
-    private readonly List<InventorySlot> _slots;
+    private List<InventorySlot> _slots = new();
     public IReadOnlyList<InventorySlot> Slots => _slots;
 
-    public event Action? SlotAmountChanged;
+    [Signal]
-    public event Action? InventoryContentsChanged;
+    public delegate void SlotAmountChangedEventHandler();
+
+    [Signal]
+    public delegate void InventoryContentsChangedEventHandler();
+
+    public static string ID = "inventoryInstance";
 
     /// <summary>
-    /// The total amount of InventorySlots in the inventory (empty and occupied).
+    /// The total amount of Inventoryslots in the inventory (empty and occupied).
     /// </summary>
     [Export]
     public int SlotAmount
@@ -38,20 +41,29 @@ public partial class InventoryInstance : IJsonSerializable
                 }
             }
 
-            SlotAmountChanged?.Invoke();
+            EmitSignal(SignalName.SlotAmountChanged);
         }
     }
 
-    public InventoryInstance(int slotCount)
+    public override void _EnterTree()
     {
-        _slots = new();
+        LoadFromSaveData();
-        SlotAmount = slotCount;
+        InventoryContentsChanged += UpdateSaveData;
+        SlotAmountChanged += UpdateSaveData;
+        SavegameService.OnSaveGameReset += SaveGameReset;
+    }
+
+    public override void _ExitTree()
+    {
+        InventoryContentsChanged -= UpdateSaveData;
+        SlotAmountChanged -= UpdateSaveData;
+        SavegameService.OnSaveGameReset -= SaveGameReset;
     }
 
     public InventoryActionResult AddItem(ItemInstance newItem)
     {
         var result = AddItemAndStackRecursive(newItem, 0);
-        InventoryContentsChanged?.Invoke();
+        EmitSignal(SignalName.InventoryContentsChanged);
         return result;
     }
 
@@ -125,7 +137,7 @@ public partial class InventoryInstance : IJsonSerializable
         if (itemInstance.amount == 0)
             _slots[inventorySlot].itemInstance = null;
 
-        InventoryContentsChanged?.Invoke();
+        EmitSignal(SignalName.InventoryContentsChanged);
         return InventoryActionResult.Success;
     }
 
@@ -162,7 +174,7 @@ public partial class InventoryInstance : IJsonSerializable
                 break;
         }
         
-        InventoryContentsChanged?.Invoke();
+        EmitSignal(SignalName.InventoryContentsChanged);
         return InventoryActionResult.Success;
     }
 
@@ -175,7 +187,7 @@ public partial class InventoryInstance : IJsonSerializable
             return InventoryActionResult.DestinationFull;
 
         _slots[destinationSlot].itemInstance = itemInstance;
-        InventoryContentsChanged?.Invoke();
+        EmitSignal(SignalName.InventoryContentsChanged);
         return InventoryActionResult.Success;
     }
 
@@ -196,26 +208,61 @@ public partial class InventoryInstance : IJsonSerializable
         return items.All(HasItems);
     }
 
-    public void LoadFromJson(JObject json)
+    #region SAVE AND LOAD
-    {
-        var itemsArray = (JArray?)json["items"];
-        if (itemsArray == null) return;
 
-        foreach (var (itemToken, slot) in itemsArray.Zip(_slots))
+    public void UpdateSaveData()
+    {
+        var payloadData = new Godot.Collections.Dictionary<string, Variant>();
+
+        for (int i = 0; i < _slots.Count; i++)
         {
-            var itemObj = (JObject?)itemToken;
+            if (!_slots[i].IsEmpty())
-            if (itemObj == null) continue;
+            {
-            slot.LoadFromJson(itemObj);
+                string key = i.ToString();
+                string[] value = new string[2];
+                value[0] = _slots[i].itemInstance.blueprint.ResourcePath;
+                value[1] = _slots[i].itemInstance.amount.ToString();
+                payloadData.Add(key, value);
+            }
         }
 
-        InventoryContentsChanged?.Invoke();
+        SavegameService.AppendDataToSave(ID, payloadData);
     }
 
-    public JObject SaveToJson()
+    public void LoadFromSaveData()
     {
-        return new JObject
+        var id = ID;
+
+        Godot.Collections.Dictionary<string, Variant> save = SavegameService.GetSaveData(id);
+
+        if (save.Count > 0)
         {
-            ["items"] = new JArray(_slots.Select(s => s.SaveToJson()))
+            for (int i = 0; i < _slots.Count; i++)
-        };
+            {
+                if (save.TryGetValue(i.ToString(), out Variant inventoryItemData))
+                {
+                    string[] savePayload = inventoryItemData.AsStringArray();
+                    ItemResource resource = ResourceLoader.Load<ItemResource>(savePayload[0]);
+                    int _amount = int.Parse(savePayload[1]);
+
+                    ItemInstance instance = new ItemInstance { blueprint = resource, amount = _amount };
+                    AddItem(instance);
+                }
+            }
+        }
     }
+
+    /// <summary>
+    /// Called when a new save is created.
+    /// Needs to do a runtime check because the InventoryInstance is already in existence at the beginning of the first scene.
+    /// </summary>
+    private void SaveGameReset()
+    {
+        foreach (var slot in _slots)
+        {
+            slot.itemInstance = null;
+        }
+    }
+
+    #endregion
 }

scripts/CSharp/Common/Inventory/InventoryListener.cs

@@ -1,5 +1,3 @@
-using Babushka.scripts.CSharp.GameEntity.Entities;
-using Babushka.scripts.CSharp.GameEntity.Management;
 using Godot;
 
 namespace Babushka.scripts.CSharp.Common.Inventory;
@@ -10,25 +8,16 @@ public partial class InventoryListener : Node
     
     [Signal] public delegate void ItemInstanceActivatedEventHandler(bool activated);
 
-    private VesnaEntity _vesnaEntity;
-    private InventoryInstance _playerInventory;
-
-    public override void _EnterTree()
-    {
-        _vesnaEntity = EntityManager.Instance.GetUniqueEntity<VesnaEntity>();
-        _playerInventory = _vesnaEntity.inventory;
-    }
-
     public override void _Ready()
     {
-        _playerInventory.InventoryContentsChanged += HandleNewItemInInventory;
+        InventoryManager.Instance.playerInventory.InventoryContentsChanged += HandleNewItemInInventory;
-        _vesnaEntity.SlotIndexChanged += HandleNewItemInInventory;
+        InventoryManager.Instance.SlotIndexChanged += HandleNewItemInInventory;
     }
 
     public override void _ExitTree()
     {
-        _playerInventory.InventoryContentsChanged -= HandleNewItemInInventory;
+        InventoryManager.Instance.playerInventory.InventoryContentsChanged -= HandleNewItemInInventory;
-        _vesnaEntity.SlotIndexChanged -= HandleNewItemInInventory;
+        InventoryManager.Instance.SlotIndexChanged -= HandleNewItemInInventory;
     }
 
     private void HandleNewItemInInventory(int newIndex)
@@ -38,8 +27,8 @@ public partial class InventoryListener : Node
 
     private void HandleNewItemInInventory()
     {
-        int currentSlotIndex = _vesnaEntity.CurrentSelectedSlotIndex;
+        int currentSlotIndex = InventoryManager.Instance.CurrentSelectedSlotIndex;
-        ItemInstance? instance = _playerInventory.Slots[currentSlotIndex].itemInstance;
+        ItemInstance? instance = InventoryManager.Instance.playerInventory.Slots[currentSlotIndex].itemInstance;
         if (instance != null)
         {
             ItemResource? item = instance.blueprint;

scripts/CSharp/Common/Inventory/InventoryManager.cs

@@ -5,9 +5,26 @@ namespace Babushka.scripts.CSharp.Common.Inventory;
 
 public partial class InventoryManager : Node
 {
-    public static InventoryManager Instance { get; private set; } = null!;
+    [Signal]
+    public delegate void SlotIndexChangedEventHandler(int newIndex);
     
     
+    public static InventoryManager Instance { get; private set; } = null!;
+    public int CurrentSelectedSlotIndex
+    {
+        get => _currentSelectedSlotIndex;
+        set
+        {
+            if (value >= 0 && value <= 8)
+            {
+                _currentSelectedSlotIndex = value;
+                EmitSignalSlotIndexChanged(_currentSelectedSlotIndex);
+            }
+        }
+    }
+
+    public InventoryInstance? playerInventory;
+
     private int _currentSelectedSlotIndex = 0;
 
     public override void _EnterTree()
@@ -17,6 +34,9 @@ public partial class InventoryManager : Node
 
     public override void _Ready()
     {
+        playerInventory = new InventoryInstance();
+        playerInventory.SlotAmount = 37;
+        AddChild(playerInventory);
     }
 
     public InventoryActionResult CreateItem(
@@ -62,4 +82,19 @@ public partial class InventoryManager : Node
     {
         return inventory.RemoveItem(inventorySlot);
     }
+
+    public InventoryActionResult CollectItem(ItemInstance itemInstance)
+    {
+        return playerInventory.AddItem(itemInstance);
+    }
+
+    public InventorySlot GetCurrentSelectedSlot()
+    {
+        if (CurrentSelectedSlotIndex < 0 || CurrentSelectedSlotIndex > 8)
+            throw new ArgumentOutOfRangeException(
+                nameof(CurrentSelectedSlotIndex),
+                "currentInventoryBarIndex must be between 0 and 8 (inclusively)");
+
+        return playerInventory.Slots[CurrentSelectedSlotIndex];
+    }
 }

scripts/CSharp/Common/Inventory/InventorySlot.cs

@@ -1,14 +1,11 @@
 #nullable enable
-using Babushka.scripts.CSharp.GameEntity.LoadSave;
-using Newtonsoft.Json.Linq;
-
 namespace Babushka.scripts.CSharp.Common.Inventory;
 
 /// <summary>
 /// Represents a virtual object wrapper for an item instance.
 /// Can return the containing item or null.
 /// </summary>
-public class InventorySlot: IJsonSerializable
+public class InventorySlot
 {
     /// <summary>
     /// The inventory item instance that may or may not be bound to this slot.
@@ -23,27 +20,5 @@ public class InventorySlot: IJsonSerializable
     {
         return itemInstance == null;
     }
-
-    public void LoadFromJson(JObject json)
-    {
-        var itemJson = json.Value<JObject>("item");
-        if (itemJson != null)
-        {
-            itemInstance = new ItemInstance();
-            itemInstance.LoadFromJson(itemJson);
-        }
-        else
-        {
-            itemInstance = null;
-        }
-    }
-
-    public JObject SaveToJson()
-    {
-        return new JObject()
-        {
-            ["item"] = itemInstance?.SaveToJson()
-        };
-    }
 }
 

scripts/CSharp/Common/Inventory/InventoryTestScript.cs

@@ -1,6 +1,4 @@
-using Babushka.scripts.CSharp.GameEntity.Entities;
+using Godot;
-using Babushka.scripts.CSharp.GameEntity.Management;
-using Godot;
 namespace Babushka.scripts.CSharp.Common.Inventory;
 
 public partial class InventoryTestScript : Node
@@ -12,7 +10,7 @@ public partial class InventoryTestScript : Node
     {
         foreach (var itemResource in _testItemsToCreate)
         {
-            InventoryManager.Instance.CreateItem(itemResource, EntityManager.Instance.GetUniqueEntity<VesnaEntity>().inventory);
+            InventoryManager.Instance.CreateItem(itemResource, InventoryManager.Instance.playerInventory);
         }
     }
 }

scripts/CSharp/Common/Inventory/InventoryUi.cs

@@ -1,5 +1,3 @@
-using Babushka.scripts.CSharp.GameEntity.Entities;
-using Babushka.scripts.CSharp.GameEntity.Management;
 using Godot;
 
 namespace Babushka.scripts.CSharp.Common.Inventory;
@@ -12,7 +10,6 @@ public partial class InventoryUi : Control
     [Export] private Control _slotSelect;
 
     private InventoryInstance _playerInventory;
-    private VesnaEntity _vesnaEntity;
     private int? _slotOnMouse;
     private bool _inventoryExtended = false;
     private Tween? _inventoryExtensionTween;
@@ -21,18 +18,17 @@ public partial class InventoryUi : Control
 
     public override void _Ready()
     {
-        _vesnaEntity = EntityManager.Instance.GetUniqueEntity<VesnaEntity>();
+        _playerInventory = InventoryManager.Instance.playerInventory;
-        _playerInventory = _vesnaEntity.inventory;
         //PopulateSlots();
         SubscribeSlots();
         SetSlotContent();
         SetSlotSelectPosition();
-        _playerInventory.InventoryContentsChanged += SetSlotContent;
+        InventoryManager.Instance.playerInventory.InventoryContentsChanged += SetSlotContent;
     }
 
     public override void _ExitTree()
     {
-        _playerInventory.InventoryContentsChanged -= SetSlotContent;
+        InventoryManager.Instance.playerInventory.InventoryContentsChanged -= SetSlotContent;
         UnsubscribeSlots();
     }
 
@@ -79,7 +75,7 @@ public partial class InventoryUi : Control
 
     private void SetSlotSelectPosition()
     {
-        _slotSelect.GlobalPosition = _headerSlots[_vesnaEntity.CurrentSelectedSlotIndex].GlobalPosition;
+        _slotSelect.GlobalPosition = _headerSlots[InventoryManager.Instance.CurrentSelectedSlotIndex].GlobalPosition;
     }
 
     private void PopulateSlots()
@@ -151,17 +147,17 @@ public partial class InventoryUi : Control
 
         if (Input.IsActionJustPressed("ui_inventory_disadvance"))
         {
-            _vesnaEntity.CurrentSelectedSlotIndex++;
+            InventoryManager.Instance.CurrentSelectedSlotIndex++;
-            if (_vesnaEntity.CurrentSelectedSlotIndex > 8)
+            if (InventoryManager.Instance.CurrentSelectedSlotIndex > 8)
-                _vesnaEntity.CurrentSelectedSlotIndex = 0;
+                InventoryManager.Instance.CurrentSelectedSlotIndex = 0;
             SetSlotSelectPosition();
         }
 
         if (Input.IsActionJustPressed("ui_inventory_advance"))
         {
-            _vesnaEntity.CurrentSelectedSlotIndex--;
+            InventoryManager.Instance.CurrentSelectedSlotIndex--;
-            if (_vesnaEntity.CurrentSelectedSlotIndex < 0)
+            if (InventoryManager.Instance.CurrentSelectedSlotIndex < 0)
-                _vesnaEntity.CurrentSelectedSlotIndex = 8;
+                InventoryManager.Instance.CurrentSelectedSlotIndex = 8;
             SetSlotSelectPosition();
         }
     }

scripts/CSharp/Common/Inventory/ItemInstance.cs

@@ -9,7 +9,7 @@ namespace Babushka.scripts.CSharp.Common.Inventory;
 [GlobalClass]
 public partial class ItemInstance : Resource, IJsonSerializable
 {
-    [Export] public ItemResource blueprint;
+    [Export] public required ItemResource blueprint;
     [Export] public int amount = 1;
 
     public ItemInstance Clone()

scripts/CSharp/Common/Inventory/ItemOnGround2D.cs

@@ -1,22 +1,16 @@
 using Babushka.scripts.CSharp.Common.Savegame;
 using Babushka.scripts.CSharp.GameEntity.Entities;
-using Babushka.scripts.CSharp.GameEntity.Management;
+using Babushka.scripts.CSharp.GameEntity.LoadSave;
 using Godot;
 using Godot.Collections;
+using Newtonsoft.Json.Linq;
 
 namespace Babushka.scripts.CSharp.Common.Inventory;
 
-public partial class ItemOnGround2D : Node, ISaveable
+public partial class ItemOnGround2D : PositionalEntity
 {
     private ItemInstance _itemInstance;
     
-    [Export] public bool IsActive = true;
-    [Export] private bool _infiniteSupply = false;
-    [Export] private int _finiteSupply = 1;
-    [Export] private bool _saveToDisk = true;
-
-    private int pickUpCounter = 0; 
-    
     [Signal] public delegate void SuccessfulPickUpEventHandler();
     
     
@@ -36,17 +30,13 @@ public partial class ItemOnGround2D : Node, ISaveable
 
     public override void _Ready()
     {
-        LoadFromSaveData();
         UpdateVisuals();
         _pickupErrorLabel.Text = "";
     }
 
     public void TryPickUp()
     {
-        if (!IsActive)
+        var result = InventoryManager.Instance.CollectItem(itemInstance.Clone());
-            return;
-        
-        var result = EntityManager.Instance.GetUniqueEntity<VesnaEntity>().inventory.AddItem(itemInstance.Clone());
         EmitSignal(SignalName.SuccessfulPickUp);
         if (result == InventoryActionResult.Success)
         {
@@ -60,16 +50,7 @@ public partial class ItemOnGround2D : Node, ISaveable
 
     private void Pickup()
     {
-        if (!_infiniteSupply)
+        // remove from entity manager
-        {
-            pickUpCounter++;
-            if (pickUpCounter >= _finiteSupply)
-            {
-                QueueFree();
-            }
-
-            UpdateSaveData();
-        }
     }
 
     private void FailToPickup()
@@ -82,9 +63,6 @@ public partial class ItemOnGround2D : Node, ISaveable
 
     public void UpdateVisuals()
     {
-        if (!IsActive)
-            return;
-        
         _iconSprite.Texture = itemInstance?.blueprint?.icon;
         if (_iconSprite.Texture == null)
         {
@@ -96,7 +74,20 @@ public partial class ItemOnGround2D : Node, ISaveable
         }
     }
 
-    // todo: What do we do with instances that are created at runtime?
+    protected override void LoadEntity(JObject json)
+    {
+        base.LoadEntity(json);
+        _itemInstance.LoadFromJson(json.GetObject("item"));
+    }
+
+    protected override void SaveEntity(JObject json)
+    {
+        base.SaveEntity(json);
+        json["item"] = _itemInstance.SaveToJson();
+    }
+
+    // old save
+    /*
     public void UpdateSaveData()
     {
         if (!_saveToDisk)
@@ -113,54 +104,51 @@ public partial class ItemOnGround2D : Node, ISaveable
 
     public void LoadFromSaveData()
     {
-        // WON'T FIX - WILL BE REDONE ANYWAY
+        if (!_saveToDisk)
+            return;
         
+        if (_infiniteSupply)
+            return;
+        
+        // standard check: how many times has this item been collected?
+        string id = GetMeta("SaveID").AsString(); 
+        
+        Dictionary<string, Variant> save = SavegameService.GetSaveData(id);
+        if (save.Count > 0)
+        {
+            if(save.TryGetValue("pickupCounter", out Variant countVar))
+            {
+                int count = countVar.AsInt32();
+                for (int i = 0; i < count; i++)
+                {
+                    Pickup();
+                }
+            }
+        }
         
-        //if (!_saveToDisk)
-        //    return;
-        //
-        //if (_infiniteSupply)
-        //    return;
-        //
-        //// standard check: how many times has this item been collected?
-        //string id = GetMeta("SaveID").AsString(); 
-        //
-        //Dictionary<string, Variant> save = SavegameService.GetSaveData(id);
-        //if (save.Count > 0)
-        //{
-        //    if(save.TryGetValue("pickupCounter", out Variant countVar))
-        //    {
-        //        int count = countVar.AsInt32();
-        //        for (int i = 0; i < count; i++)
-        //        {
-        //            Pickup();
-        //        }
-        //    }
-        //}
-        //
         //separate check for unique items: If already in inventory, delete this instance.
-        //ItemResource itemResource = itemInstance.blueprint; 
+        ItemResource itemResource = itemInstance.blueprint;
-        //Dictionary<string, Variant> savegameData = SavegameService.GetSaveData(InventoryInstance.ID);
+        Dictionary<string, Variant> savegameData = SavegameService.GetSaveData(InventoryInstance.ID);
-        //if (savegameData.Count > 0)
+        if (savegameData.Count > 0)
-        //{
+        {
-        //    foreach (var kvp in savegameData)
+            foreach (var kvp in savegameData)
-        //    {
+            {
-        //        // if it's a unique item, then it can only exist once in the world (either as a pickup OR in the inventory)
+                // if it's a unique item, then it can only exist once in the world (either as a pickup OR in the inventory)
-        //        if (itemInstance.blueprint.isUnique)
+                if (itemInstance.blueprint.isUnique)
-        //        {
+                {
-        //            //comparing resource path to identify the item
+                    //comparing resource path to identify the item
-        //            string[] valuePair = kvp.Value.AsStringArray();
+                    string[] valuePair = kvp.Value.AsStringArray();
-        //            if (valuePair[0] == itemResource.ResourcePath)
+                    if (valuePair[0] == itemResource.ResourcePath)
-        //            {
+                    {
-        //                int amountInInventory = int.Parse(valuePair[1]);
+                        int amountInInventory = int.Parse(valuePair[1]);
-        //                // comparing amount to see if it's all in the inventory now.
+                        // comparing amount to see if it's all in the inventory now.
-        //                if (amountInInventory > 0)
+                        if (amountInInventory > 0)
-        //                {
+                        {
-        //                    Pickup();
+                            Pickup();
-        //                }
+                        }
-        //            }
+                    }
-        //        }
+                }
-        //    }
+            }
-        //}
+        }
-    }
+    }*/
 }

scripts/CSharp/Common/Items/InventoryDependentInteractable.cs

@@ -1,7 +1,5 @@
 using Babushka.scripts.CSharp.Common.CharacterControls;
 using Babushka.scripts.CSharp.Common.Inventory;
-using Babushka.scripts.CSharp.GameEntity.Entities;
-using Babushka.scripts.CSharp.GameEntity.Management;
 using Godot;
 using Godot.Collections;
 
@@ -13,20 +11,20 @@ public partial class InventoryDependentInteractable : Node2D
     [Export] private Array<ItemResource> _itemsToReactTo;
     [Export] private bool _activateOnItem = true;
     
-    private VesnaEntity _vesnaEntity;
+    private InventoryManager _inventoryManager;
-    private InventoryInstance _playerInventory;
+    private InventoryInstance _inventoryInstance;
 
     public override void _Ready()
     {
-        _vesnaEntity = EntityManager.Instance.GetUniqueEntity<VesnaEntity>();
+        _inventoryManager = InventoryManager.Instance;
-        _playerInventory = _vesnaEntity.inventory;
+        _inventoryInstance = _inventoryManager.playerInventory;
-        _vesnaEntity.SlotIndexChanged += HandleInventorySelectedSlotIndexChanged;
+        _inventoryManager.SlotIndexChanged += HandleInventorySelectedSlotIndexChanged;
     }
 
     private void HandleInventorySelectedSlotIndexChanged(int newIndex)
     {
-        int currentSlotIndex = _vesnaEntity.CurrentSelectedSlotIndex;
+        int currentSlotIndex = InventoryManager.Instance.CurrentSelectedSlotIndex;
-        ItemInstance? item = _playerInventory.Slots[currentSlotIndex].itemInstance;
+        ItemInstance? item = InventoryManager.Instance.playerInventory.Slots[currentSlotIndex].itemInstance;
 
         if (item != null)
         {

scripts/CSharp/Common/QuestBehaviour/DetectInventoryContains.cs

@@ -4,8 +4,6 @@ using System.Collections.Generic;
 using System.Linq;
 using Babushka.scripts.CSharp.Common.Inventory;
 using Babushka.scripts.CSharp.Common.Quest;
-using Babushka.scripts.CSharp.GameEntity.Entities;
-using Babushka.scripts.CSharp.GameEntity.Management;
 
 public partial class DetectInventoryContains : QuestFulfillmentBase
 {
@@ -14,7 +12,7 @@ public partial class DetectInventoryContains : QuestFulfillmentBase
     public override void _Ready()
     {
         QuestManager.Instance!.QuestsChanged += CheckInventory;
-        EntityManager.Instance.GetUniqueEntity<VesnaEntity>().inventory.InventoryContentsChanged += CheckInventory;
+        InventoryManager.Instance.playerInventory.InventoryContentsChanged += CheckInventory;
 
         CheckInventory();
     }
@@ -22,12 +20,12 @@ public partial class DetectInventoryContains : QuestFulfillmentBase
     public override void _ExitTree()
     {
         QuestManager.Instance!.QuestsChanged -= CheckInventory;
-        EntityManager.Instance.GetUniqueEntity<VesnaEntity>().inventory.InventoryContentsChanged -= CheckInventory;
+        InventoryManager.Instance.playerInventory.InventoryContentsChanged -= CheckInventory;
     }
 
     private void CheckInventory()
     {
-        if (IsQuestActive() && EntityManager.Instance.GetUniqueEntity<VesnaEntity>().inventory.HasItems(_itemsToContain))
+        if (IsQuestActive() && InventoryManager.Instance.playerInventory.HasItems(_itemsToContain))
         {
             Fulfill();
         }