Merge branch 'develop' into minigame_hit_feedback

Merge pull request 'Added randomnes into attack minigame' (#36 ) from minigame_variation into develop
Reviewed-on: #36 Reviewed-by: kziolkowski <katharina.ziolkowski@gmail.com>
2025-12-06 19:54:05 +01:00 · 2025-12-06 19:53:49 +01:00 · 2025-12-06 19:53:44 +01:00 · 2025-12-06 19:46:23 +01:00 · 2025-12-06 12:15:31 +01:00 · 2025-12-04 22:34:17 +01:00
66 changed files with 1394 additions and 335 deletions
@@ -472,7 +472,7 @@ offset_right = 54.4142
 offset_bottom = 207.286
 grow_horizontal = 0
 grow_vertical = 2
-text = "[I]"
+text = "[i]"
 label_settings = SubResource("LabelSettings_l3npx")

 [node name="QuestLogRoot" parent="." instance=ExtResource("7_vvo7l")]
@@ -1,4 +1,4 @@
-[gd_scene load_steps=485 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"]
@@ -283,6 +283,7 @@
 [ext_resource type="Resource" uid="uid://tt3d166mntmi" path="res://resources/low code/farming/var_sceneNameProvider.tres" id="471_83c4i"]
 [ext_resource type="AudioStream" uid="uid://fihv17va3r58" path="res://audio/sfx/Footsteps/Single/Gravel/Reverb/SFX_Footstep_Gravel_02_R.wav" id="471_e04c3"]
 [ext_resource type="AudioStream" uid="uid://cvvjd2i6x047n" path="res://audio/sfx/Footsteps/Single/Gravel/Reverb/SFX_Footstep_Gravel_03_R.wav" id="472_g32y8"]
+[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="AudioStream" uid="uid://4555a4w30tda" path="res://audio/sfx/Footsteps/Single/Gravel/Reverb/SFX_Footstep_Gravel_05_R.wav" id="474_t1d6r"]
@@ -294,8 +295,11 @@
 [ext_resource type="Texture2D" uid="uid://dqubvx1a08kn4" path="res://art/animation/Vesna2D/Vesna Anims Sequences/F02-Walk/0002.png" id="478_5myrm"]
 [ext_resource type="Texture2D" uid="uid://dystt4hyqad74" path="res://art/animation/Vesna2D/Vesna Anims Sequences/F02-Walk/0004.png" id="480_wnay3"]
 [ext_resource type="Resource" uid="uid://cmqapbvv0hev2" path="res://resources/low code/farming/event_watering.tres" id="481_t1d6r"]
+[ext_resource type="Script" uid="uid://d27xoo1reo5gu" path="res://scripts/CSharp/Low Code/Variables/SaveableVariableNode.cs" id="482_0ptfk"]
 [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="Script" uid="uid://ca4s0algeij1h" path="res://scripts/CSharp/Common/Savegame/SaveIDProviderTool.cs" id="484_upuan"]
 [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="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"]
@@ -2119,28 +2123,6 @@ frame = 7
 frame_progress = 0.229832
 offset = Vector2(0, -450)

-[node name="WateringCanUI" type="Node2D" parent="CharacterBody2D" node_paths=PackedStringArray("_slider")]
-position = Vector2(0, -929)
-scale = Vector2(2, 2)
-script = ExtResource("467_j4m0f")
-_slider = NodePath("HSlider")
-
-[node name="HSlider" type="HSlider" parent="CharacterBody2D/WateringCanUI"]
-visible = false
-modulate = Color(0.3515, 0.780425, 0.95, 1)
-custom_minimum_size = Vector2(150, 50)
-anchors_preset = 5
-anchor_left = 0.5
-anchor_right = 0.5
-offset_left = -43.0
-offset_right = 57.0
-offset_bottom = 64.0
-grow_horizontal = 2
-max_value = 1.0
-step = 0.0
-editable = false
-scrollable = false
-
 [node name="DetectionCross" parent="CharacterBody2D" instance=ExtResource("466_e04c3")]
 position = Vector2(0, -200)

@@ -2152,6 +2134,47 @@ _eventResources = Array[Object]([ExtResource("468_t1d6r")])
 script = ExtResource("467_8hbu5")
 _eventResources = Array[Object]([ExtResource("469_t1d6r")])

+[node name="WateringCan" type="Node2D" parent="CharacterBody2D"]
+
+[node name="WateringCanFillState" type="Node" parent="CharacterBody2D/WateringCan" groups=["Saveable"]]
+script = ExtResource("482_0ptfk")
+Payload = 0
+metadata/SaveID = "2d2f153b-8a09-45a9-b114-79259c833f9f"
+
+[node name="WateringEventListener" type="Node" parent="CharacterBody2D/WateringCan"]
+script = ExtResource("467_8hbu5")
+_eventResources = Array[Object]([ExtResource("481_t1d6r")])
+
+[node name="WateringCanUI" type="Node2D" parent="CharacterBody2D/WateringCan" node_paths=PackedStringArray("_slider")]
+position = Vector2(0, -939)
+scale = Vector2(2, 2)
+script = ExtResource("467_j4m0f")
+_slider = NodePath("HSlider")
+
+[node name="HSlider" type="HSlider" parent="CharacterBody2D/WateringCan/WateringCanUI"]
+visible = false
+modulate = Color(0.3515, 0.780425, 0.95, 1)
+custom_minimum_size = Vector2(150, 50)
+anchors_preset = 5
+anchor_left = 0.5
+anchor_right = 0.5
+offset_left = -115.0
+offset_top = -33.999996
+offset_right = 35.0
+offset_bottom = 30.000004
+grow_horizontal = 2
+scale = Vector2(1.4200003, 2.5611823)
+size_flags_horizontal = 3
+size_flags_vertical = 2
+max_value = 1.0
+step = 0.0
+editable = false
+scrollable = false
+
+[node name="WateringCanSaveHelper" type="Node" parent="CharacterBody2D/WateringCan" node_paths=PackedStringArray("_wateringCanFillStateNode")]
+script = ExtResource("472_kduih")
+_wateringCanFillStateNode = NodePath("../WateringCanFillState")
+
 [node name="FarmingControls" type="Node2D" parent="." node_paths=PackedStringArray("_movingPlayer")]
 script = ExtResource("817_6nrw3")
 _sceneKeyProvider = ExtResource("471_83c4i")
@@ -2174,18 +2197,23 @@ script = ExtResource("471_2f15g")
 [node name="Timer" type="Timer" parent="SFX/FootstepsAudio"]
 wait_time = 0.5

-[node name="WateringEventListener" type="Node" parent="."]
-script = ExtResource("467_8hbu5")
-_eventResources = Array[Object]([ExtResource("481_t1d6r")])
+[node name="SaveSystem" type="Node" parent="."]

-[connection signal="FilledWateringCan" from="." to="CharacterBody2D/WateringCanUI" method="Refill"]
-[connection signal="InventorySelectionChanged" from="." to="CharacterBody2D/WateringCanUI" method="IsWateringCanActive"]
+[node name="SaveGameCheat" type="Node" parent="SaveSystem"]
+script = ExtResource("483_kduih")
+
+[node name="SaveIDProvider" type="Node" parent="SaveSystem"]
+script = ExtResource("484_upuan")
+
+[connection signal="FilledWateringCan" from="." to="CharacterBody2D/WateringCan/WateringCanUI" method="Refill"]
+[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/WateringCanUI" method="IsWateringCanActive"]
+[connection signal="PickedUpTool" from="." to="CharacterBody2D/WateringCan/WateringCanUI" method="IsWateringCanActive"]
 [connection signal="LookDirection" from="CharacterBody2D/visuals" to="CharacterBody2D/DetectionCross" method="SetDirection"]
 [connection signal="EventRaised" from="CharacterBody2D/PlantCreatedEventListener" to="CharacterBody2D/visuals" method="PlayFarmingAnimation"]
 [connection signal="EventRaised" from="CharacterBody2D/PickedUpInteractableListener" to="CharacterBody2D/visuals" method="PlayPickUpAnimation"]
+[connection signal="OnLoadingComplete" from="CharacterBody2D/WateringCan/WateringCanFillState" to="CharacterBody2D/WateringCan/WateringCanSaveHelper" method="OnLoad"]
+[connection signal="EventRaised" from="CharacterBody2D/WateringCan/WateringEventListener" to="CharacterBody2D/visuals" method="PlayWateringAnimation"]
+[connection signal="EventRaised" from="CharacterBody2D/WateringCan/WateringEventListener" to="CharacterBody2D/WateringCan/WateringCanUI" method="Water"]
 [connection signal="timelineStarted" from="DialogicToggle" to="SFX/FootstepsAudio/Timer" method="stop"]
 [connection signal="timeout" from="SFX/FootstepsAudio/Timer" to="SFX/FootstepsAudio" method="PlayOneShot"]
-[connection signal="EventRaised" from="WateringEventListener" to="CharacterBody2D/visuals" method="PlayWateringAnimation"]
-[connection signal="EventRaised" from="WateringEventListener" to="CharacterBody2D/WateringCanUI" method="Water"]
@@ -0,0 +1,15 @@
+[gd_scene load_steps=3 format=3 uid="uid://cqy831wnquvpc"]
+
+[ext_resource type="Script" uid="uid://d27xoo1reo5gu" path="res://scripts/CSharp/Low Code/Variables/SaveableVariableNode.cs" id="1_386s0"]
+[ext_resource type="Script" uid="uid://du5facslfvg77" path="res://scripts/CSharp/Common/DayAndNight/CalendarController.cs" id="2_bl8tj"]
+
+[node name="Day and Night" type="Node"]
+
+[node name="Controller" type="Node" parent="." node_paths=PackedStringArray("_dayCounter")]
+script = ExtResource("2_bl8tj")
+_dayCounter = NodePath("../DayCounter")
+
+[node name="DayCounter" type="Node" parent="." groups=["Saveable"]]
+script = ExtResource("1_386s0")
+Payload = 0
+metadata/SaveID = "12c6da2e-fc71-4281-a04a-dfd3c7943975"
@@ -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"]
@@ -138,10 +139,11 @@ radius = 200.0
 [sub_resource type="ViewportTexture" id="ViewportTexture_4830j"]
 viewport_path = NodePath("SubViewport")

-[node name="Duck" type="Node2D" node_paths=PackedStringArray("_animationPlayer")]
+[node name="Duck" type="Node2D" node_paths=PackedStringArray("_animationPlayer") groups=["Saveable"]]
 z_index = 1
 y_sort_enabled = true
 script = ExtResource("1_54k4r")
+_sceneKeyProvider = ExtResource("2_fdf3t")
 _transferDelayMs = 1000
 _animationPlayer = NodePath("AnimationPlayer")

@@ -160,11 +162,11 @@ libraries = {
 &"": SubResource("AnimationLibrary_54k4r")
 }

-[node name="InteractionArea" parent="." node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("15_uo3dh")]
+[node name="duck interaction" parent="." node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("15_uo3dh")]
 position = Vector2(18, -250)
 _spritesToOutline = [NodePath("../Duck rendered")]

-[node name="CollisionShape3D" parent="InteractionArea/Area2D" index="0"]
+[node name="CollisionShape3D" parent="duck interaction/Area2D" index="0"]
 shape = SubResource("CircleShape2D_uo3dh")

 [node name="Duck rendered" type="Sprite2D" parent="."]
@@ -321,7 +323,7 @@ offset = Vector2(40, 40)
 region_enabled = true
 region_rect = Rect2(246, 393, 111, 111)

-[connection signal="Interacted" from="InteractionArea" to="." method="TransferToTargetAfterDelay"]
-[connection signal="Interacted" from="InteractionArea" to="Audio/NakNak" method="PlayOneShot"]
+[connection signal="Interacted" from="duck interaction" to="." method="TransferToTargetAfterDelay"]
+[connection signal="Interacted" from="duck interaction" to="Audio/NakNak" method="PlayOneShot"]

-[editable path="InteractionArea"]
+[editable path="duck interaction"]
@@ -28,7 +28,7 @@
 resource_local_to_scene = true
 radius = 325.2599

-[node name="BaseField" type="Node2D"]
+[node name="BaseField" type="Node2D" groups=["Saveable"]]
 script = ExtResource("1_4mg73")
 Payload = 0

@@ -38,13 +38,13 @@ z_index = 1
 scale = Vector2(1.3499999, 1.5)
 texture = ExtResource("9_wx561")

-[node name="FieldBehaviour" type="Sprite2D" parent="." node_paths=PackedStringArray("_fieldIndex", "_fieldSprite", "_maskSprite", "_outlineSprite", "PlantingInteraction", "FieldInteractionArea", "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
 scale = Vector2(0.9, 1)
 script = ExtResource("1_qa01x")
-SaveId = "field"
 _fieldIndex = NodePath("..")
+_saveIdHolder = NodePath("..")
 _sceneKeyProvider = ExtResource("11_cjahb")
 FieldState = 0
 _fieldSprite = NodePath("MaskedField/FieldTexture")
@@ -1,4 +1,4 @@
-[gd_scene load_steps=11 format=3 uid="uid://gishbn0a8eke"]
+[gd_scene load_steps=12 format=3 uid="uid://gishbn0a8eke"]

 [ext_resource type="Script" uid="uid://cms357f23fmfy" path="res://scripts/CSharp/Common/Farming/PlantBehaviour2D.cs" id="1_66p1c"]
 [ext_resource type="Texture2D" uid="uid://mrnc81ukugh6" path="res://art/farm/farming/farmobjekte/plant_template.png" id="2_oyl0t"]
@@ -6,6 +6,7 @@
 [ext_resource type="PackedScene" uid="uid://cqc72e4hq6bcd" path="res://prefabs/interactions/interaction_area_2d.tscn" id="5_3j24b"]
 [ext_resource type="PackedScene" uid="uid://dpbbroif2tnil" path="res://prefabs/interactions/generic_item_on_ground_2d.tscn" id="6_gdrin"]
 [ext_resource type="Resource" uid="uid://blr8tine5m0ma" path="res://resources/items/tomato.tres" id="7_vjw4j"]
+[ext_resource type="Script" uid="uid://j2mhvb45egej" path="res://scripts/CSharp/Low Code/Variables/VariableNode.cs" id="8_3og52"]
 [ext_resource type="Texture2D" uid="uid://bleimj6jr1jka" path="res://art/general/rectangle.png" id="9_vjw4j"]

 [sub_resource type="ShaderMaterial" id="ShaderMaterial_u4cty"]
@@ -28,7 +29,7 @@ radius = 300.0
 resource_local_to_scene = true
 radius = 300.0

-[node name="BasePlant" type="Node2D" node_paths=PackedStringArray("_seeds", "_smallPlants", "_bigPlants", "_readyPlants", "_harvestablePlant", "_magicEffect")]
+[node name="BasePlant" type="Node2D" node_paths=PackedStringArray("_seeds", "_smallPlants", "_bigPlants", "_readyPlants", "_harvestablePlant", "_magicEffect", "_lifecycle")]
 z_index = 1
 y_sort_enabled = true
 script = ExtResource("1_66p1c")
@@ -38,6 +39,7 @@ _bigPlants = [NodePath("BigPlant/01"), NodePath("BigPlant/02"), NodePath("BigPla
 _readyPlants = [NodePath("ReadyPlantInventoryItem/ReadyPlant/01"), NodePath("ReadyPlantInventoryItem/ReadyPlant/02"), NodePath("ReadyPlantInventoryItem/ReadyPlant/03")]
 _harvestablePlant = NodePath("ReadyPlantInventoryItem")
 _magicEffect = NodePath("magic vfx")
+_lifecycle = NodePath("LifeCycle")

 [node name="Seeds" type="Node2D" parent="."]
 position = Vector2(0, 0.5)
@@ -136,6 +138,7 @@ shape = SubResource("CircleShape2D_vjw4j")
 [node name="ReadyPlantInventoryItem" parent="." instance=ExtResource("6_gdrin")]
 position = Vector2(0, 2.3)
 IsActive = false
+_saveToDisk = false

 [node name="SpawnWithItem" parent="ReadyPlantInventoryItem" index="0"]
 _blueprint = ExtResource("7_vjw4j")
@@ -206,6 +209,10 @@ scale_amount_max = 0.1
 color = Color(0.400601, 0.62444, 0.791217, 1)
 hue_variation_max = 0.4

+[node name="LifeCycle" type="Node" parent="."]
+script = ExtResource("8_3og52")
+Payload = 3
+
 [connection signal="Interacted" from="GrowingInteractionArea" to="." method="Grow"]
 [connection signal="SuccessfulPickUp" from="ReadyPlantInventoryItem" to="." method="queue_free"]

@@ -30,10 +30,11 @@ stream_1/stream = ExtResource("7_edjam")
 stream_2/stream = ExtResource("8_kflfw")
 stream_3/stream = ExtResource("9_dltn0")

-[node name="GenericItemOnGround" type="Node2D"]
+[node name="GenericItemOnGround" type="Node2D" groups=["Saveable"]]
 z_index = 1
 y_sort_enabled = true
 script = ExtResource("1_tlhp6")
+metadata/SaveID = ""

 [node name="SpawnWithItem" type="Node" parent="."]
 script = ExtResource("3_xu8me")
@@ -32,8 +32,9 @@ InputService="*res://scripts/CSharp/Common/Services/InputService.cs"
 QuestManager="*res://prefabs/quests/quest_manager_autoload.tscn"
 Signal_Debugger="*res://addons/SignalVisualizer/Debugger/SignalDebugger.gd"
 FightWorldAutoload="*res://prefabs/fight/fight_world_autoload.tscn"
-FieldService="*res://scripts/CSharp/Common/Farming/FieldService.cs"
 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"

 [dialogic]

@@ -220,6 +221,10 @@ folder_colors={
 "res://shader/": "pink"
 }

+[global_group]
+
+Saveable=""
+
 [input]

 move_left={
@@ -264,6 +269,7 @@ interact={
 ui_inventory_open_close={
 "deadzone": 0.5,
 "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":73,"key_label":0,"unicode":105,"location":0,"echo":false,"script":null)
+, 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":4194306,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
 ]
 }
 ui_inventory_advance={
@@ -296,6 +302,11 @@ ui_inventory_journal_open_close={
 "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":74,"key_label":0,"unicode":106,"location":0,"echo":false,"script":null)
 ]
 }
+NextDayCheat={
+"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":32,"key_label":0,"unicode":32,"location":0,"echo":false,"script":null)
+]
+}

 [internationalization]

@@ -13,4 +13,5 @@ name = "Hoe"
 color = Color(0.751421, 0.329615, 0.570911, 1)
 icon = SubResource("AtlasTexture_i5wdx")
 maxStack = 1
+isUnique = true
 metadata/_custom_type_script = "uid://cbskymrxs6ksu"
@@ -13,4 +13,5 @@ name = "Can"
 color = Color(0.336269, 0.489145, 0.825324, 1)
 icon = SubResource("AtlasTexture_tqw18")
 maxStack = 1
+isUnique = true
 metadata/_custom_type_script = "uid://cbskymrxs6ksu"
@@ -1,10 +1,23 @@
-[gd_scene load_steps=2 format=3 uid="uid://bopv10dqm1knc"]
+[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")]
-_sceneNamesToLoad = PackedStringArray("res://scenes/Babushka_scene_farm_outside_2d.tscn")

 [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")
@@ -1,6 +1,6 @@
-[gd_scene load_steps=116 format=3 uid="uid://gigb28qk8t12"]
+[gd_scene load_steps=118 format=3 uid="uid://gigb28qk8t12"]

-[ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/characters/Player2D.tscn" id="1_7wfwe"]
+[ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/characters/Vesna.tscn" id="1_7wfwe"]
 [ext_resource type="Texture2D" uid="uid://8sr11ex30n0m" path="res://art/mockups/Kenney_Backgrounds/Samples/uncolored_hills.png" id="2_7b2ri"]
 [ext_resource type="Script" uid="uid://bqomwxclsbhd3" path="res://scripts/CSharp/Common/Camera/CameraController.cs" id="3_p4qqi"]
 [ext_resource type="Texture2D" uid="uid://be1nofeo7an0" path="res://art/mockups/Kenney_Backgrounds/PNG/cloud2.png" id="3_r34wi"]
@@ -38,7 +38,6 @@
 [ext_resource type="Resource" uid="uid://d1uuxp1lp4aro" path="res://resources/items/tomato_seed.tres" id="35_64mdn"]
 [ext_resource type="Texture2D" uid="uid://65e44yde224q" path="res://art/farm/Babushka_house_01.png" id="36_e5b7x"]
 [ext_resource type="Resource" uid="uid://duq7tshxv6uhp" path="res://resources/items/beet_seed.tres" id="36_fv1t2"]
-[ext_resource type="Texture2D" uid="uid://cyyxqmphcrjj" path="res://art/farm/farming/farmobjekte/tomaten/tomaten_template.png" id="36_l7ekk"]
 [ext_resource type="AudioStream" uid="uid://cfqg50am0swb7" path="res://audio/Music/Farming_90BPM_69Bars_Loop.wav" id="37_8ey8m"]
 [ext_resource type="AudioStream" uid="uid://dku1rq5cocisg" path="res://audio/Music/Farming_90BPM_69Bars.wav" id="37_di1ed"]
 [ext_resource type="Shader" uid="uid://braevmqauoek7" path="res://shader/swaying_plant.gdshader" id="37_taxvr"]
@@ -79,6 +78,8 @@
 [ext_resource type="Script" uid="uid://dih1b0opgc3f7" path="res://scripts/GdScript/dialogic_start_specific.gd" id="77_l7ekk"]
 [ext_resource type="Resource" uid="uid://tt3d166mntmi" path="res://resources/low code/farming/var_sceneNameProvider.tres" id="77_xcwle"]
 [ext_resource type="PackedScene" uid="uid://b1d2e7ely6hyw" path="res://prefabs/farm/base_field.tscn" id="78_xcwle"]
+[ext_resource type="Script" uid="uid://iquhbkr7pqeg" path="res://scripts/CSharp/Common/Savegame/SaveCheats.cs" id="79_065st"]
+[ext_resource type="Script" uid="uid://ca4s0algeij1h" path="res://scripts/CSharp/Common/Savegame/SaveIDProviderTool.cs" id="80_w1kgo"]

 [sub_resource type="ShaderMaterial" id="ShaderMaterial_wtdui"]
 shader = ExtResource("13_7p0hq")
@@ -1059,9 +1060,9 @@ collision_mask = 4
 position = Vector2(145.5, -224)
 shape = SubResource("RectangleShape2D_0sfl7")

-[node name="InteractionArea" parent="YSorted/Well" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("27_klb81")]
-_spritesToOutline = [NodePath("..")]
+[node name="InteractionArea" parent="YSorted/Well" instance=ExtResource("27_klb81")]
 _id = 1
+metadata/SaveID = "b8f7b7fe-e057-4974-ba12-9134722998de"

 [node name="CollisionShape3D" parent="YSorted/Well/InteractionArea/Area2D" index="0"]
 position = Vector2(146, -130)
@@ -1069,10 +1070,16 @@ shape = SubResource("CircleShape2D_p6n74")

 [node name="CanGenericPickup" parent="YSorted" instance=ExtResource("25_hukxv")]
 position = Vector2(8192, 3507)
+metadata/SaveID = "5a823507-8107-40ce-8b32-6d0f81a3c44e"

 [node name="SpawnWithItem" parent="YSorted/CanGenericPickup" index="0"]
 _blueprint = ExtResource("28_ipqaa")

+[node name="PickupInteractionArea" parent="YSorted/CanGenericPickup" index="3" node_paths=PackedStringArray("_spritesToOutline")]
+_outlineMaterial = null
+_spritesToOutline = []
+metadata/SaveID = "0c006f5c-c472-4f89-908b-d8f34503ba37"
+
 [node name="CollisionShape3D" parent="YSorted/CanGenericPickup/PickupInteractionArea/Area2D" index="0"]
 shape = SubResource("CircleShape2D_2065p")

@@ -1081,21 +1088,30 @@ offset = Vector2(0, -50)

 [node name="RakeGenericPickup" parent="YSorted" instance=ExtResource("25_hukxv")]
 position = Vector2(8391, 2060)
+metadata/SaveID = "e13886b1-2131-4072-bc06-7d8abb19357b"

 [node name="SpawnWithItem" parent="YSorted/RakeGenericPickup" index="0"]
 _blueprint = ExtResource("28_6b2nr")

+[node name="PickupInteractionArea" parent="YSorted/RakeGenericPickup" index="3" node_paths=PackedStringArray("_spritesToOutline")]
+_outlineMaterial = null
+_spritesToOutline = []
+metadata/SaveID = "c148aa78-114b-4770-a040-8498483edb1d"
+
 [node name="CollisionShape3D" parent="YSorted/RakeGenericPickup/PickupInteractionArea/Area2D" index="0"]
 shape = SubResource("CircleShape2D_tm0yg")

 [node name="SeedPickup" parent="YSorted" instance=ExtResource("25_hukxv")]
 position = Vector2(9927, 2257)
-_infiniteSupply = true
 _finiteSupply = 3
+metadata/SaveID = "e1bbe13f-0622-42b8-97f3-87a8af369dc0"

 [node name="SpawnWithItem" parent="YSorted/SeedPickup" index="0"]
 _blueprint = ExtResource("35_64mdn")

+[node name="PickupInteractionArea" parent="YSorted/SeedPickup" index="3"]
+metadata/SaveID = "ad152c51-3631-42c1-9aa4-4df896b35d8c"
+
 [node name="CollisionShape3D" parent="YSorted/SeedPickup/PickupInteractionArea/Area2D" index="0"]
 shape = SubResource("CircleShape2D_tm0yg")

@@ -1105,10 +1121,14 @@ scale = Vector2(1, 1)
 [node name="SeedPickup2" parent="YSorted" instance=ExtResource("25_hukxv")]
 position = Vector2(10705, 2257)
 _finiteSupply = 3
+metadata/SaveID = "77972c50-63a7-461a-bc7d-6fa46333bc5c"

 [node name="SpawnWithItem" parent="YSorted/SeedPickup2" index="0"]
 _blueprint = ExtResource("36_fv1t2")

+[node name="PickupInteractionArea" parent="YSorted/SeedPickup2" index="3"]
+metadata/SaveID = "09e115e7-1d21-485a-be3e-b3fff9c83e78"
+
 [node name="CollisionShape3D" parent="YSorted/SeedPickup2/PickupInteractionArea/Area2D" index="0"]
 shape = SubResource("CircleShape2D_tm0yg")

@@ -1122,58 +1142,72 @@ position = Vector2(0, -200)

 [node name="BaseField" parent="YSorted/FieldParent/right" instance=ExtResource("78_xcwle")]
 position = Vector2(8807, 3061)
+metadata/SaveID = "533e356b-386b-49c9-beb1-4484f2a5164f"

 [node name="BaseField2" parent="YSorted/FieldParent/right" instance=ExtResource("78_xcwle")]
 position = Vector2(9335, 3562)
 Payload = 1
+metadata/SaveID = "79084490-9e12-4153-9ae8-6162b5348c37"

 [node name="BaseField3" parent="YSorted/FieldParent/right" instance=ExtResource("78_xcwle")]
 position = Vector2(9854, 3071)
 Payload = 2
+metadata/SaveID = "7332aadf-2583-468b-889c-ccbad96137f8"

 [node name="BaseField4" parent="YSorted/FieldParent/right" instance=ExtResource("78_xcwle")]
 position = Vector2(10361, 3536)
 Payload = 3
+metadata/SaveID = "493f7b1f-3d01-4d66-b668-6014ef9b3c15"

 [node name="BaseField5" parent="YSorted/FieldParent/right" instance=ExtResource("78_xcwle")]
 position = Vector2(10948, 3025)
 Payload = 4
+metadata/SaveID = "ba9d21eb-7c31-4459-bd90-ae23e9a09eb1"

 [node name="BaseField6" parent="YSorted/FieldParent/right" instance=ExtResource("78_xcwle")]
 position = Vector2(11296, 3607)
 Payload = 5
+metadata/SaveID = "e6a3367e-afe1-4c5d-abd9-153cc365dce0"

 [node name="BaseField7" parent="YSorted/FieldParent/right" instance=ExtResource("78_xcwle")]
 position = Vector2(11869, 3026)
 Payload = 6
+metadata/SaveID = "08de526f-e22f-42a4-a3f9-549d2dc15b5d"

 [node name="BaseField8" parent="YSorted/FieldParent/right" instance=ExtResource("78_xcwle")]
 position = Vector2(12353, 3554)
 Payload = 7
+metadata/SaveID = "9fd46633-8028-48e6-9176-ffe8c7a26a2e"

 [node name="BaseField9" parent="YSorted/FieldParent/right" instance=ExtResource("78_xcwle")]
 position = Vector2(12828, 2999)
 Payload = 8
+metadata/SaveID = "82e139eb-47f4-4ce4-962f-f72d22f9fe45"

 [node name="BaseField10" parent="YSorted/FieldParent/right" instance=ExtResource("78_xcwle")]
 position = Vector2(13285, 3536)
 Payload = 9
+metadata/SaveID = "03ff923a-614a-4fc9-8865-f5290ec16169"

 [node name="BaseField11" parent="YSorted/FieldParent/right" instance=ExtResource("78_xcwle")]
 position = Vector2(13733, 2990)
 Payload = 10
+metadata/SaveID = "1347c031-e8c0-44f9-9d42-80084ae9bc29"

 [node name="BaseField12" parent="YSorted/FieldParent/right" instance=ExtResource("78_xcwle")]
 position = Vector2(14261, 3474)
 Payload = 11
+metadata/SaveID = "c0b02859-bd5c-4780-8ca7-80b4234ee1d7"

 [node name="BaseField13" parent="YSorted/FieldParent/right" instance=ExtResource("78_xcwle")]
 position = Vector2(14753, 2982)
 Payload = 12
+metadata/SaveID = "bee82b2a-a437-4d3a-b003-dac55dfd24aa"

 [node name="BaseField14" parent="YSorted/FieldParent/right" instance=ExtResource("78_xcwle")]
 position = Vector2(15201, 3519)
 Payload = 13
+metadata/SaveID = "4750a191-6902-46d4-9b2e-964c1aa0a29c"

 [node name="left" type="Node2D" parent="YSorted/FieldParent"]
 position = Vector2(-8661, -143)
@@ -1181,50 +1215,62 @@ position = Vector2(-8661, -143)
 [node name="BaseField" parent="YSorted/FieldParent/left" instance=ExtResource("78_xcwle")]
 position = Vector2(8807, 3061)
 Payload = 14
+metadata/SaveID = "b44ef2e7-898a-40d0-975b-ba75d7df4601"

 [node name="BaseField2" parent="YSorted/FieldParent/left" instance=ExtResource("78_xcwle")]
 position = Vector2(9227, 3562)
 Payload = 15
+metadata/SaveID = "5705ba02-f444-4f2b-b527-b95578132b87"

 [node name="BaseField3" parent="YSorted/FieldParent/left" instance=ExtResource("78_xcwle")]
 position = Vector2(9756, 3111)
 Payload = 16
+metadata/SaveID = "bca9073b-0b2f-4371-a645-a37aa04f4e23"

 [node name="BaseField4" parent="YSorted/FieldParent/left" instance=ExtResource("78_xcwle")]
 position = Vector2(10322, 3536)
 Payload = 17
+metadata/SaveID = "f636a1ef-016d-4361-9b6e-1d59262a8c04"

 [node name="BaseField5" parent="YSorted/FieldParent/left" instance=ExtResource("78_xcwle")]
 position = Vector2(10810, 3055)
 Payload = 18
+metadata/SaveID = "d074a30d-3f52-4788-879a-4ea8c5818c32"

 [node name="BaseField6" parent="YSorted/FieldParent/left" instance=ExtResource("78_xcwle")]
 position = Vector2(11266, 3607)
 Payload = 19
+metadata/SaveID = "8296a15c-be4a-4127-b0f7-8a330dd2a843"

 [node name="BaseField7" parent="YSorted/FieldParent/left" instance=ExtResource("78_xcwle")]
 position = Vector2(11741, 3026)
 Payload = 20
+metadata/SaveID = "02468d9f-0120-42ff-806d-0aaa351f055c"

 [node name="BaseField8" parent="YSorted/FieldParent/left" instance=ExtResource("78_xcwle")]
 position = Vector2(12255, 3593)
 Payload = 21
+metadata/SaveID = "803f7df5-23a8-424a-8389-08371ea80101"

 [node name="BaseField9" parent="YSorted/FieldParent/left" instance=ExtResource("78_xcwle")]
 position = Vector2(12690, 3019)
 Payload = 22
+metadata/SaveID = "88efb617-5e57-4b16-8ceb-c45c56463690"

 [node name="BaseField10" parent="YSorted/FieldParent/left" instance=ExtResource("78_xcwle")]
 position = Vector2(13216, 3556)
 Payload = 23
+metadata/SaveID = "ca6c1e3d-2c4e-4977-a89e-55d265f65faf"

 [node name="BaseField11" parent="YSorted/FieldParent/left" instance=ExtResource("78_xcwle")]
 position = Vector2(13684, 3000)
 Payload = 24
+metadata/SaveID = "262fbec5-597d-432e-8dd0-50d53fd51b59"

 [node name="BaseField12" parent="YSorted/FieldParent/left" instance=ExtResource("78_xcwle")]
 position = Vector2(14143, 3523)
 Payload = 25
+metadata/SaveID = "05389ea3-d19b-42fc-8bf0-b0755437ec10"

 [node name="Farm visuals" type="Node2D" parent="YSorted"]
 position = Vector2(-60, 122)
@@ -1247,11 +1293,11 @@ collision_mask = 6
 position = Vector2(-252.56, 231.32)
 polygon = PackedVector2Array(247.227, 43.5123, 44.7822, 43.5123, -87.2178, 45.123, -104.329, -55.2797, -154.107, -73.5347, -160.107, -380.38, -175.44, -400.783, -63.44, -512.461, 97.8934, -541.991, 261.671, -599.172, 374.782, -526.421, 502.338, -526.421, 637.893, -396.488, 598.56, -360.783, 596.338, -58.2327, 528.782, -58.2327, 501.449, 45.9283)

-[node name="EnterHouseInteraction" parent="YSorted/Farm visuals/Static" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("27_klb81")]
+[node name="EnterHouseInteraction" parent="YSorted/Farm visuals/Static" instance=ExtResource("27_klb81")]
 position = Vector2(5834, 2354)
 scale = Vector2(2.425, 2.425)
-_spritesToOutline = [NodePath("DoorSprite")]
 _id = 0
+metadata/SaveID = "5a93071f-c1ab-4b4b-b74e-a6324d44ddf8"

 [node name="DoorSprite" type="Sprite2D" parent="YSorted/Farm visuals/Static/EnterHouseInteraction"]
 position = Vector2(0.412364, -33.1959)
@@ -2223,6 +2269,7 @@ shape = SubResource("RectangleShape2D_ycj14")
 position = Vector2(11234, 1850)
 _spritesToOutline = [NodePath("Fence Door")]
 _id = 1
+metadata/SaveID = "6ee77256-42af-49c9-a3f2-cf167853f6fb"

 [node name="CollisionShape3D" parent="YSorted/Blocker/InteractionArea/Area2D" index="0"]
 shape = SubResource("CircleShape2D_l7ekk")
@@ -2243,7 +2290,6 @@ position = Vector2(-113.561, 193.035)
 shape = SubResource("RectangleShape2D_2vojv")

 [node name="ducks" type="Node2D" parent="YSorted"]
-visible = false
 z_index = 1
 y_sort_enabled = true
 script = ExtResource("49_uxa2m")
@@ -2254,12 +2300,14 @@ z_index = 0
 y_sort_enabled = false
 position = Vector2(4374, 2652)
 _penTarget = NodePath("../../pen/penSlot1")
+metadata/SaveID = "348bd0e3-1da5-4f10-84ab-b0444e99d541"

 [node name="Duck3" parent="YSorted/ducks" node_paths=PackedStringArray("_penTarget") instance=ExtResource("62_i36hd")]
 z_index = 0
 y_sort_enabled = false
 position = Vector2(9259, 3194)
 _penTarget = NodePath("../../pen/penSlot2")
+metadata/SaveID = "94c8a740-2745-4162-91e7-66f36b8681e0"

 [node name="Duck4" parent="YSorted/ducks" node_paths=PackedStringArray("_penTarget") instance=ExtResource("62_i36hd")]
 z_index = 0
@@ -2268,6 +2316,7 @@ position = Vector2(13441, 3612)
 rotation = 3.14159
 scale = Vector2(1, -1)
 _penTarget = NodePath("../../pen/penSlot3")
+metadata/SaveID = "b3508312-eb61-4520-8349-e49e0e5328d3"

 [node name="Duck5" parent="YSorted/ducks" node_paths=PackedStringArray("_penTarget") instance=ExtResource("62_i36hd")]
 z_index = 0
@@ -2276,12 +2325,14 @@ position = Vector2(15330, 2487)
 rotation = 3.14159
 scale = Vector2(1, -1)
 _penTarget = NodePath("../../pen/penSlot4")
+metadata/SaveID = "b73895c2-6366-4c7e-b5e2-23f3dc9485f2"

 [node name="Duck6" parent="YSorted/ducks" node_paths=PackedStringArray("_penTarget") instance=ExtResource("62_i36hd")]
 z_index = 0
 y_sort_enabled = false
 position = Vector2(232, 2862)
 _penTarget = NodePath("../../pen/penSlot5")
+metadata/SaveID = "a963b9d2-862f-458b-be2c-9a54ec1bde90"

 [node name="Duck7" parent="YSorted/ducks" node_paths=PackedStringArray("_penTarget") instance=ExtResource("62_i36hd")]
 z_index = 0
@@ -2290,6 +2341,7 @@ position = Vector2(2409, 3958)
 rotation = 3.14159
 scale = Vector2(1, -1)
 _penTarget = NodePath("../../pen/penSlot6")
+metadata/SaveID = "748aff78-10eb-4a4e-bb6d-a8ee25d472d1"

 [node name="DialogicToggle" type="Node2D" parent="YSorted/ducks"]
 script = ExtResource("51_uxa2m")
@@ -2336,8 +2388,10 @@ position = Vector2(3183, 2369)
 offset = Vector2(1, -50)
 region_rect = Rect2(207, 1184, 149, 142)

-[node name="InteractionArea" parent="YSorted/trash/trashObject2" index="0"]
+[node name="InteractionArea" parent="YSorted/trash/trashObject2" index="0" node_paths=PackedStringArray("_spritesToOutline")]
 position = Vector2(-9, -46)
+_spritesToOutline = []
+metadata/SaveID = "549bbcf4-ea57-4b8f-80b1-b13ca648559b"

 [node name="trashObject3" parent="YSorted/trash" instance=ExtResource("53_ycj14")]
 z_index = 0
@@ -2346,8 +2400,10 @@ position = Vector2(4724, 3519)
 offset = Vector2(1, -50)
 region_rect = Rect2(400, 1053, 163, 141)

-[node name="InteractionArea" parent="YSorted/trash/trashObject3" index="0"]
+[node name="InteractionArea" parent="YSorted/trash/trashObject3" index="0" node_paths=PackedStringArray("_spritesToOutline")]
 position = Vector2(-13, -53)
+_spritesToOutline = []
+metadata/SaveID = "29874314-50c1-4a21-9494-18f936d6e097"

 [node name="trashObject4" parent="YSorted/trash" instance=ExtResource("53_ycj14")]
 z_index = 0
@@ -2356,8 +2412,10 @@ position = Vector2(5385, 3391)
 offset = Vector2(1, -50)
 region_rect = Rect2(1048, 1092, 348, 106)

-[node name="InteractionArea" parent="YSorted/trash/trashObject4" index="0"]
+[node name="InteractionArea" parent="YSorted/trash/trashObject4" index="0" node_paths=PackedStringArray("_spritesToOutline")]
 position = Vector2(0, -59)
+_spritesToOutline = []
+metadata/SaveID = "7ccaa831-5526-40ed-8ca3-31ba2ad929a6"

 [node name="trashObject5" parent="YSorted/trash" instance=ExtResource("53_ycj14")]
 z_index = 0
@@ -2393,8 +2451,10 @@ rotation = 1.77025
 offset = Vector2(0, 0)
 region_rect = Rect2(1048, 1092, 348, 106)

-[node name="InteractionArea" parent="YSorted/trash/trashObject9" index="0"]
+[node name="InteractionArea" parent="YSorted/trash/trashObject9" index="0" node_paths=PackedStringArray("_spritesToOutline")]
 position = Vector2(22.40873, 25.05658)
+_spritesToOutline = []
+metadata/SaveID = "7bf227d6-3844-41e9-a9cd-524052aced3b"

 [node name="CanvasLayer" parent="." instance=ExtResource("32_2nee2")]

@@ -2509,6 +2569,14 @@ script = ExtResource("76_l7ekk")
 _variableResource = ExtResource("77_xcwle")
 _payloadToSet = "farmOutside"

+[node name="SaveSystem" type="Node" parent="."]
+
+[node name="SaveGameCheat" type="Node" parent="SaveSystem"]
+script = ExtResource("79_065st")
+
+[node name="SaveIDProvider" type="Node" parent="SaveSystem"]
+script = ExtResource("80_w1kgo")
+
 [connection signal="FilledWateringCan" from="YSorted/Vesna" to="Audio/SFX/FillWater SFX2" method="PlayOneShot"]
 [connection signal="InteractedTool" from="YSorted/Well/InteractionArea" to="YSorted/Vesna" method="TryFillWateringCan"]
 [connection signal="SuccessfulPickUp" from="YSorted/CanGenericPickup" to="YSorted/Vesna" method="HandlePickUp"]
@@ -26,7 +26,7 @@
 [ext_resource type="Shader" uid="uid://xnky830dtfsn" path="res://shader/repeat_texture.gdshader" id="24_1bax8"]
 [ext_resource type="Texture2D" uid="uid://btea6eyucsyxj" path="res://art/farm/farming/farmobjekte/zaun/tilable fence middle part.png" id="25_ox3k7"]
 [ext_resource type="Texture2D" uid="uid://3ed3dgq3irn2" path="res://art/farm/farming/farmobjekte/zaun/tilable fence end part2.png" id="26_rnkrk"]
-[ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/characters/Player2D.tscn" id="28_d4s66"]
+[ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/characters/Vesna.tscn" id="28_d4s66"]
 [ext_resource type="Resource" uid="uid://dlcmqfjvgphqu" path="res://resources/items/rake.tres" id="29_36k8l"]
 [ext_resource type="Resource" uid="uid://cndd64batns31" path="res://resources/items/wateringcan.tres" id="30_te7n5"]
 [ext_resource type="Texture2D" uid="uid://dg7rlugnq0t45" path="res://art/farm/farming/farmobjekte/brünnen.png" id="31_h1k77"]
@@ -54,6 +54,7 @@ _minigameController = NodePath("Minigame")
 [node name="Minigame" parent="MinigameHandler" instance=ExtResource("8_2b3cf")]
 process_mode = 4
 visible = false
+position = Vector2(23, -29)

 [node name="SwitchSceneOnFightEnd" type="Node" parent="." node_paths=PackedStringArray("_fightSceneSwitcher")]
 script = ExtResource("10_qqd8u")
@@ -190,6 +191,7 @@ _label = NodePath("Label")
 _current = NodePath("Current")

 [node name="Label" type="Label" parent="StateMachineDebugger"]
+visible = false
 offset_left = -982.0
 offset_top = -497.0
 offset_right = -893.0
@@ -197,6 +199,7 @@ offset_bottom = -474.0
 text = "Hello world"

 [node name="Current" type="Label" parent="StateMachineDebugger"]
+visible = false
 offset_left = 705.0
 offset_top = -495.0
 offset_right = 794.0
@@ -23,7 +23,7 @@
 [ext_resource type="Texture2D" uid="uid://bmjjfd5ngptxe" path="res://art/nature/baum märz 2025/backtreebois team kennedy.png" id="21_mlqvj"]
 [ext_resource type="Texture2D" uid="uid://bcw6oeovkmiup" path="res://art/nature/baum märz 2025/sonnenblumeseamless.png" id="22_22c4u"]
 [ext_resource type="Shader" uid="uid://xnky830dtfsn" path="res://shader/repeat_texture.gdshader" id="23_2ouqg"]
-[ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/characters/Player2D.tscn" id="24_ffcio"]
+[ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/characters/Vesna.tscn" id="24_ffcio"]
 [ext_resource type="Resource" uid="uid://dlcmqfjvgphqu" path="res://resources/items/rake.tres" id="25_3h260"]
 [ext_resource type="Resource" uid="uid://cndd64batns31" path="res://resources/items/wateringcan.tres" id="26_1bhpp"]
 [ext_resource type="Shader" uid="uid://braevmqauoek7" path="res://shader/swaying_plant.gdshader" id="27_txtka"]
@@ -27,7 +27,7 @@
 [ext_resource type="Script" uid="uid://di0xxwfw43m0i" path="res://scripts/CSharp/Common/FightOld/FightStarter.cs" id="26_gg38r"]
 [ext_resource type="PackedScene" uid="uid://hk8ahyp6dgl6" path="res://prefabs/fightOld/fight_base_scene.tscn" id="27_55b52"]
 [ext_resource type="PackedScene" uid="uid://bp64p6y72j71w" path="res://prefabs/fightOld/fighters/enemy_blob_fighter.tscn" id="27_hfhye"]
-[ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/characters/Player2D.tscn" id="29_3jjxs"]
+[ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/characters/Vesna.tscn" id="29_3jjxs"]
 [ext_resource type="PackedScene" uid="uid://ddpl8cbck7e6s" path="res://prefabs/characters/Chugar.tscn" id="29_26tkn"]
 [ext_resource type="PackedScene" uid="uid://cr66tpdr5rma5" path="res://prefabs/fightOld/fighters/enemy_mavkha_fighter.tscn" id="29_hfhye"]
 [ext_resource type="Resource" uid="uid://dlcmqfjvgphqu" path="res://resources/items/rake.tres" id="30_l10vl"]
@@ -15,7 +15,7 @@
 [ext_resource type="Texture2D" uid="uid://cop1vjvhwlsec" path="res://art/indoor/room export/Room_01_shelf.png" id="12_bu2a1"]
 [ext_resource type="Texture2D" uid="uid://404glx32r1w8" path="res://art/indoor/room export/Room_01_bench.png" id="13_rongr"]
 [ext_resource type="Texture2D" uid="uid://ckvytnpi8gcxq" path="res://art/eyes_atlas.png" id="14_d7yky"]
-[ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/characters/Player2D.tscn" id="15_7a68a"]
+[ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/characters/Vesna.tscn" id="15_7a68a"]
 [ext_resource type="Script" uid="uid://31p67cdowuw4" path="res://scripts/CSharp/Common/Animation/AnimationStarter.cs" id="15_27bwy"]
 [ext_resource type="Texture2D" uid="uid://c4q12jiligcl7" path="res://art/animals/katze.png" id="15_sndxu"]
 [ext_resource type="AudioStream" uid="uid://cohyenfo1rtxh" path="res://audio/sfx/Animals/SFX_Cat_Meow_01.wav" id="16_d7yky"]
@@ -218,7 +218,7 @@ radius = 400.0
 z_index = 1
 y_sort_enabled = true
 script = ExtResource("1_3vr4f")
-_sceneNamesToLoad = PackedStringArray("res://scenes/Babushka_scene_indoor_vesnas_room.tscn", "res://scenes/Babushka_scene_farm_outside_2d_ducksCollected.tscn")
+_sceneNamesToLoad = PackedStringArray("res://scenes/Babushka_scene_indoor_vesnas_room.tscn", "res://scenes/Babushka_scene_farm_outside_2d.tscn")

 [node name="Foreground" type="Node" parent="."]

@@ -1,4 +1,4 @@
-[gd_scene load_steps=15 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"]
@@ -6,8 +6,9 @@
 [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="Script" uid="uid://puw74w6lmcvl" path="res://scripts/CSharp/Common/Fight/NightStarter.cs" id="10_j25a2"]
+[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/Player2D.tscn" id="18_3gevq"]
+[ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/characters/Vesna.tscn" id="18_3gevq"]
 [ext_resource type="Script" uid="uid://bqomwxclsbhd3" path="res://scripts/CSharp/Common/Camera/CameraController.cs" id="23_408bg"]
 [ext_resource type="PackedScene" uid="uid://cgjc4wurbgimy" path="res://prefabs/UI/Inventory/Inventory.tscn" id="24_xwo8y"]

@@ -125,8 +126,12 @@ shape = SubResource("CircleShape2D_2spkc")
 script = ExtResource("10_j25a2")
 _sceneIndexToLoad = 1

+[node name="CountDayUp" type="Node" parent="NightStarter"]
+script = ExtResource("11_heyef")
+
 [connection signal="Interacted" from="BedInteraction" to="BedInteraction/QuestCompleter" method="Trigger"]
 [connection signal="Interacted" from="BedInteraction" to="NightStarter" method="StartNight"]
+[connection signal="Interacted" from="BedInteraction" to="NightStarter/CountDayUp" method="IncreaseDayCount"]
 [connection signal="Interacted" from="DoorInteraction" to="." method="LoadScene"]
 [connection signal="LoadScene" from="NightStarter" to="." method="LoadSceneAtIndex"]

@@ -1,4 +1,4 @@
-[gd_scene load_steps=96 format=3 uid="uid://b3ibx4resa1f3"]
+[gd_scene load_steps=98 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"]
@@ -26,7 +26,7 @@
 [ext_resource type="Shader" uid="uid://xnky830dtfsn" path="res://shader/repeat_texture.gdshader" id="24_anpd4"]
 [ext_resource type="Texture2D" uid="uid://btea6eyucsyxj" path="res://art/farm/farming/farmobjekte/zaun/tilable fence middle part.png" id="25_8mej4"]
 [ext_resource type="Texture2D" uid="uid://3ed3dgq3irn2" path="res://art/farm/farming/farmobjekte/zaun/tilable fence end part2.png" id="26_bwvai"]
-[ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/characters/Player2D.tscn" id="27_qtaxr"]
+[ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/characters/Vesna.tscn" id="27_qtaxr"]
 [ext_resource type="Resource" uid="uid://dlcmqfjvgphqu" path="res://resources/items/rake.tres" id="28_le48k"]
 [ext_resource type="Resource" uid="uid://cndd64batns31" path="res://resources/items/wateringcan.tres" id="30_dr6bm"]
 [ext_resource type="Texture2D" uid="uid://dg7rlugnq0t45" path="res://art/farm/farming/farmobjekte/brünnen.png" id="30_lgb3w"]
@@ -52,7 +52,9 @@
 [ext_resource type="AudioStream" uid="uid://bxh5m04vdo0sr" path="res://audio/sfx/Farming/SFX_Harke_04_Solo.wav" id="57_euap5"]
 [ext_resource type="Resource" uid="uid://tt3d166mntmi" path="res://resources/low code/farming/var_sceneNameProvider.tres" id="57_hpgl7"]
 [ext_resource type="Script" uid="uid://cfnrd5k1k0gxw" path="res://scripts/CSharp/Common/AudioPlayer2D.cs" id="58_m3hs4"]
+[ext_resource type="Script" uid="uid://iquhbkr7pqeg" path="res://scripts/CSharp/Common/Savegame/SaveCheats.cs" id="58_qavgq"]
 [ext_resource type="AudioStream" uid="uid://dapsknn486aee" path="res://audio/sfx/Farming/SFX_WateringPlants_01.wav" id="59_km2vg"]
+[ext_resource type="Script" uid="uid://ca4s0algeij1h" path="res://scripts/CSharp/Common/Savegame/SaveIDProviderTool.cs" id="59_njxly"]
 [ext_resource type="AudioStream" uid="uid://dnyne8wov50so" path="res://audio/sfx/Farming/SFX_WateringPlants_02.wav" id="60_qi2gu"]
 [ext_resource type="AudioStream" uid="uid://fsiypqhql67w" path="res://audio/sfx/Farming/SFX_GettingWater_01.wav" id="61_wy1mx"]
 [ext_resource type="AudioStream" uid="uid://foyw26hq1qp5" path="res://audio/sfx/Farming/SFX_GettingWater_02.wav" id="62_kmjnt"]
@@ -1749,9 +1751,11 @@ scale = Vector2(1, 0.993819)
 [node name="BaseField" parent="YSorted/Farm visuals/FieldParent" instance=ExtResource("40_efblm")]
 position = Vector2(651, 2630.26)
 scale = Vector2(1, 1.00622)
+metadata/SaveID = "b3b47e69-6115-4405-8da6-508b783823d2"

 [node name="FieldBehaviour" parent="YSorted/Farm visuals/FieldParent/BaseField" index="1"]
 visible = true
+metadata/SaveID = "7a8210bf-479d-4b4c-9758-98d23e59d5d7"

 [node name="Beet2" parent="YSorted/Farm visuals/FieldParent/BaseField/FieldBehaviour/PlantPlaceholder" index="0" node_paths=PackedStringArray("_field") instance=ExtResource("41_vyqmy")]
 _state = 2
@@ -1767,9 +1771,11 @@ shape = SubResource("CircleShape2D_qavgq")
 position = Vector2(1226, 3098.15)
 scale = Vector2(1, 1.00622)
 Payload = 1
+metadata/SaveID = "f536efd3-3da8-4ef5-a520-570220e6c19f"

 [node name="FieldBehaviour" parent="YSorted/Farm visuals/FieldParent/BaseField2" index="1"]
 visible = true
+metadata/SaveID = "a1d8a0a2-c51c-4410-83c3-0edb31cbf2de"

 [node name="Beet2" parent="YSorted/Farm visuals/FieldParent/BaseField2/FieldBehaviour/PlantPlaceholder" index="0" node_paths=PackedStringArray("_field") instance=ExtResource("41_vyqmy")]
 _state = 2
@@ -1785,9 +1791,11 @@ shape = SubResource("CircleShape2D_njxly")
 position = Vector2(1782, 2606.11)
 scale = Vector2(1, 1.00622)
 Payload = 2
+metadata/SaveID = "14ce64d5-8a4d-43b9-a8ff-3a57725c4dc8"

 [node name="FieldBehaviour" parent="YSorted/Farm visuals/FieldParent/BaseField3" index="1"]
 visible = true
+metadata/SaveID = "79a65532-cb2b-4268-8eb0-8c41a3935cbb"

 [node name="Beet2" parent="YSorted/Farm visuals/FieldParent/BaseField3/FieldBehaviour/PlantPlaceholder" index="0" node_paths=PackedStringArray("_field") instance=ExtResource("41_vyqmy")]
 _state = 2
@@ -1803,10 +1811,12 @@ shape = SubResource("CircleShape2D_54ty3")
 position = Vector2(2559, 2624.22)
 scale = Vector2(1, 1.00622)
 Payload = 3
+metadata/SaveID = "6872ce5d-6f42-47d7-97e2-a7214ff3b08c"

 [node name="FieldBehaviour" parent="YSorted/Farm visuals/FieldParent/BaseField4" index="1"]
 visible = true
 FieldState = 3
+metadata/SaveID = "13fa64a3-01dc-4fd8-822e-0839c0da3163"

 [node name="Beet2" parent="YSorted/Farm visuals/FieldParent/BaseField4/FieldBehaviour/PlantPlaceholder" index="0" node_paths=PackedStringArray("_field") instance=ExtResource("41_vyqmy")]
 _state = 2
@@ -1822,10 +1832,12 @@ shape = SubResource("CircleShape2D_gbxtf")
 position = Vector2(3305, 2624.22)
 scale = Vector2(1, 1.00622)
 Payload = 4
+metadata/SaveID = "f163c38d-9ee0-4844-9def-479833febb4e"

 [node name="FieldBehaviour" parent="YSorted/Farm visuals/FieldParent/BaseField5" index="1"]
 visible = true
 FieldState = 3
+metadata/SaveID = "414ecdb9-f3c4-4fb9-81bd-6ca575784f78"

 [node name="Beet2" parent="YSorted/Farm visuals/FieldParent/BaseField5/FieldBehaviour/PlantPlaceholder" index="0" node_paths=PackedStringArray("_field") instance=ExtResource("41_vyqmy")]
 _state = 2
@@ -1841,10 +1853,12 @@ shape = SubResource("CircleShape2D_6krrk")
 position = Vector2(4033, 2618.18)
 scale = Vector2(1, 1.00622)
 Payload = 5
+metadata/SaveID = "da691381-ee82-4f86-abf3-dda2c9f19337"

 [node name="FieldBehaviour" parent="YSorted/Farm visuals/FieldParent/BaseField6" index="1"]
 visible = true
 FieldState = 3
+metadata/SaveID = "b235febb-b231-4f8c-94e9-1f9d9f115b08"

 [node name="Beet2" parent="YSorted/Farm visuals/FieldParent/BaseField6/FieldBehaviour/PlantPlaceholder" index="0" node_paths=PackedStringArray("_field") instance=ExtResource("41_vyqmy")]
 _state = 1
@@ -1860,10 +1874,12 @@ shape = SubResource("CircleShape2D_4ktoi")
 position = Vector2(4755, 2630.26)
 scale = Vector2(1, 1.00622)
 Payload = 6
+metadata/SaveID = "8116fa8b-b164-4d39-a1ed-6cd476d18f94"

 [node name="FieldBehaviour" parent="YSorted/Farm visuals/FieldParent/BaseField7" index="1"]
 visible = true
 FieldState = 3
+metadata/SaveID = "9ccdba91-812a-4c13-9ee0-12472e174fc9"

 [node name="Beet2" parent="YSorted/Farm visuals/FieldParent/BaseField7/FieldBehaviour/PlantPlaceholder" index="0" node_paths=PackedStringArray("_field") instance=ExtResource("41_vyqmy")]
 _state = 2
@@ -1879,10 +1895,12 @@ shape = SubResource("CircleShape2D_aaup4")
 position = Vector2(4418, 3226.95)
 scale = Vector2(1, 1.00622)
 Payload = 7
+metadata/SaveID = "5298f423-4c3b-45b5-94fb-d4aef36bac21"

 [node name="FieldBehaviour" parent="YSorted/Farm visuals/FieldParent/BaseField8" index="1"]
 visible = true
 FieldState = 3
+metadata/SaveID = "da44e54a-0b76-4888-ad8b-782a9d146fa3"

 [node name="Beet2" parent="YSorted/Farm visuals/FieldParent/BaseField8/FieldBehaviour/PlantPlaceholder" index="0" node_paths=PackedStringArray("_field") instance=ExtResource("41_vyqmy")]
 _state = 2
@@ -1898,9 +1916,11 @@ shape = SubResource("CircleShape2D_v10dc")
 position = Vector2(5317, 3208.83)
 scale = Vector2(1, 1.00622)
 Payload = 8
+metadata/SaveID = "0de8dc13-5851-4471-be35-309cd6687ebc"

 [node name="FieldBehaviour" parent="YSorted/Farm visuals/FieldParent/BaseField9" index="1"]
 visible = true
+metadata/SaveID = "9919b294-04a1-4a16-9783-38c8aa0e291c"

 [node name="FieldActivator" parent="YSorted/Farm visuals/FieldParent/BaseField9" index="7"]
 visible = false
@@ -2031,6 +2051,14 @@ script = ExtResource("56_34r5t")
 _variableResource = ExtResource("57_hpgl7")
 _payloadToSet = "beetRootScene"

+[node name="SaveSystem" type="Node" parent="."]
+
+[node name="SaveGameCheat" type="Node" parent="SaveSystem"]
+script = ExtResource("58_qavgq")
+
+[node name="SaveIDProvider" type="Node" parent="SaveSystem"]
+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"]
@@ -1,6 +1,7 @@
-[gd_scene load_steps=4 format=3 uid="uid://c6wnoif01ltld"]
+[gd_scene load_steps=5 format=3 uid="uid://c6wnoif01ltld"]

 [ext_resource type="Script" uid="uid://cssdu8viimwm6" path="res://scripts/CSharp/Common/SceneTransition.cs" id="1_fj2fh"]
+[ext_resource type="Script" uid="uid://iquhbkr7pqeg" path="res://scripts/CSharp/Common/Savegame/SaveCheats.cs" id="3_dl0t1"]
 [ext_resource type="Texture2D" uid="uid://c7atj6ohlmir3" path="res://art/ui/StartScreen/titlescreen.png" id="3_r0y6o"]
 [ext_resource type="Texture2D" uid="uid://du612t3xytly3" path="res://art/ui/StartScreen/babushkalog_white.png" id="4_dl0t1"]

@@ -21,37 +22,6 @@ expand_mode = 2
 stretch_mode = 6
 metadata/_edit_use_anchors_ = true

-[node name="Start" type="Button" parent="CanvasLayer/TextureRect"]
-custom_minimum_size = Vector2(100, 30)
-layout_mode = 1
-anchors_preset = 4
-anchor_top = 0.5
-anchor_bottom = 0.5
-offset_left = 200.0
-offset_top = -15.5
-offset_right = 400.0
-offset_bottom = 24.5
-grow_vertical = 2
-scale = Vector2(2, 2)
-toggle_mode = true
-text = "Start"
-
-[node name="Quit" type="Button" parent="CanvasLayer/TextureRect"]
-custom_minimum_size = Vector2(100, 30)
-layout_mode = 1
-anchors_preset = 4
-anchor_top = 0.5
-anchor_bottom = 0.5
-offset_left = 200.0
-offset_top = 97.0
-offset_right = 400.0
-offset_bottom = 137.0
-grow_vertical = 2
-scale = Vector2(2, 2)
-toggle_mode = true
-text = "Quit
-"
-
 [node name="Text" type="TextureRect" parent="CanvasLayer/TextureRect"]
 layout_mode = 1
 offset_left = 50.0
@@ -62,5 +32,55 @@ scale = Vector2(0.5, 0.5)
 texture = ExtResource("4_dl0t1")
 stretch_mode = 3

-[connection signal="pressed" from="CanvasLayer/TextureRect/Start" to="." method="LoadScene"]
-[connection signal="pressed" from="CanvasLayer/TextureRect/Quit" to="." method="Quit"]
+[node name="VBoxContainer" type="VBoxContainer" parent="CanvasLayer/TextureRect"]
+custom_minimum_size = Vector2(500, 300)
+layout_mode = 0
+offset_left = 204.0
+offset_top = 497.0
+offset_right = 704.0
+offset_bottom = 797.0
+
+[node name="MarginContainer" type="MarginContainer" parent="CanvasLayer/TextureRect/VBoxContainer"]
+layout_mode = 2
+theme_override_constants/margin_top = 10
+theme_override_constants/margin_bottom = 10
+
+[node name="Continue" type="Button" parent="CanvasLayer/TextureRect/VBoxContainer/MarginContainer"]
+custom_minimum_size = Vector2(100, 80)
+layout_mode = 2
+theme_override_font_sizes/font_size = 36
+toggle_mode = true
+text = "Continue
+"
+
+[node name="MarginContainer2" type="MarginContainer" parent="CanvasLayer/TextureRect/VBoxContainer"]
+layout_mode = 2
+theme_override_constants/margin_top = 10
+theme_override_constants/margin_bottom = 10
+
+[node name="New Game" type="Button" parent="CanvasLayer/TextureRect/VBoxContainer/MarginContainer2"]
+custom_minimum_size = Vector2(100, 80)
+layout_mode = 2
+theme_override_font_sizes/font_size = 36
+toggle_mode = true
+text = "New Game
+"
+script = ExtResource("3_dl0t1")
+
+[node name="MarginContainer3" type="MarginContainer" parent="CanvasLayer/TextureRect/VBoxContainer"]
+layout_mode = 2
+theme_override_constants/margin_top = 10
+theme_override_constants/margin_bottom = 10
+
+[node name="Quit" type="Button" parent="CanvasLayer/TextureRect/VBoxContainer/MarginContainer3"]
+custom_minimum_size = Vector2(100, 80)
+layout_mode = 2
+theme_override_font_sizes/font_size = 36
+toggle_mode = true
+text = "Quit
+"
+
+[connection signal="pressed" from="CanvasLayer/TextureRect/VBoxContainer/MarginContainer/Continue" to="." method="LoadScene"]
+[connection signal="pressed" from="CanvasLayer/TextureRect/VBoxContainer/MarginContainer2/New Game" to="." method="LoadScene"]
+[connection signal="pressed" from="CanvasLayer/TextureRect/VBoxContainer/MarginContainer2/New Game" to="CanvasLayer/TextureRect/VBoxContainer/MarginContainer2/New Game" method="Reset"]
+[connection signal="pressed" from="CanvasLayer/TextureRect/VBoxContainer/MarginContainer3/Quit" to="." method="Quit"]
@@ -1,7 +1,7 @@
 [gd_scene load_steps=3 format=3 uid="uid://chvc0e4441o2k"]

 [ext_resource type="Texture2D" uid="uid://ejq7h5pgxl84" path="res://art/indoor/küchenraum.png" id="2_ttdge"]
-[ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/characters/Player2D.tscn" id="3_oibke"]
+[ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/characters/Vesna.tscn" id="3_oibke"]

 [node name="IndoorTest" type="Node2D"]

@@ -10,7 +10,7 @@
 [ext_resource type="Texture2D" uid="uid://bradm5u7vjjxq" path="res://art/mockups/trees/darktree8.png" id="9_viosu"]
 [ext_resource type="Texture2D" uid="uid://bryqg0hb4f0ry" path="res://art/mockups/trees/darktree9.png" id="10_clutx"]
 [ext_resource type="Texture2D" uid="uid://c1iyeflkwaqxf" path="res://art/testingground/mushroom1.png" id="11_ovtse"]
-[ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/characters/Player2D.tscn" id="12_k41x3"]
+[ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/characters/Vesna.tscn" id="12_k41x3"]

 [node name="AbandonedStreet" type="Node2D"]

@@ -18,12 +18,23 @@ public partial class VesnaAnimations : Node
    /// Emits the last look direction of the player to other scripts.
    /// </summary>
    [Signal] public delegate void LookDirectionEventHandler(Vector2 direction);
-    
-    public override void _Ready()
+
+    public override void _EnterTree()
+    {
+	    // calling with a 1-frame delay to avoid race conditions.
+	    CallDeferred(nameof(SetupSubscriptions));
+    }
+
+    private void SetupSubscriptions()
    {
 	    InventoryManager.Instance.playerInventory.InventoryContentsChanged += HandleNewItemInInventory;
    }

+    public override void _ExitTree()
+    {
+	    InventoryManager.Instance.playerInventory.InventoryContentsChanged -= HandleNewItemInInventory;
+    }
+
    private void HandleNewItemInInventory()
    {
 	    // for future Kathi: this does not, in fact, check if an item has been added only, but triggers on every content change!
@@ -1,4 +1,3 @@
-using System;
 using System.Linq;
 using Babushka.scripts.CSharp.Common.Services;
 using Godot;
@@ -7,7 +6,7 @@ namespace Babushka.scripts.CSharp.Common.CharacterControls;

 public partial class InteractionArea2D : Node2D
 {
-    
+    [ExportGroup("Settings")]
    [Export] private Area2D _area;
    [Export] private Label _label;
    [Export] private bool _active = true;
@@ -42,7 +41,6 @@ public partial class InteractionArea2D : Node2D
        }
    }

-
    public void OnPlayerEntered(Node2D player)
    {
        if (!_active || !InputService.Instance.InputEnabled)
@@ -104,12 +102,16 @@ public partial class InteractionArea2D : Node2D
                    sprite.Material = _backupMaterials[i];
                }
            }
-
-            EmitSignal(SignalName.InteractedTool, _id);
-            EmitSignal(SignalName.Interacted);
+            Interact();
        }
    }

+    private void Interact()
+    {
+        EmitSignal(SignalName.InteractedTool, _id);
+        EmitSignal(SignalName.Interacted);
+    }
+
    public void SetSpriteActiveState(bool success, int id) // TODO: remove
    {
        if (!_active)
@@ -121,4 +123,5 @@ public partial class InteractionArea2D : Node2D
        _active = !_active;
        _label.Hide();
    }
+
 }
@@ -0,0 +1,44 @@
+using Babushka.scripts.CSharp.Low_Code.Variables;
+using Godot;
+
+namespace Babushka.scripts.CSharp.Common.DayAndNight;
+
+public partial class CalendarController : Node
+{
+    [Export] private SaveableVariableNode _dayCounter;
+
+    public static CalendarController? Instance;
+
+    public int CurrentDay
+    {
+        get
+        {
+            if (Instance == null)
+                return 0;
+            return Instance._dayCounter.Payload.AsInt32();
+        }
+    }
+
+    public override void _Ready()
+    {
+        if (Instance == null)
+        {
+            Instance = this;
+        }
+    }
+
+    public override void _Input(InputEvent @event)
+    {
+        if (@event.IsActionPressed("NextDayCheat"))
+        {
+            GoToNextDay();
+        }
+    }
+
+    public void GoToNextDay()
+    {
+        int days = _dayCounter.Payload.AsInt32();
+        days++;
+        _dayCounter.Payload = days;
+    }
+}
@@ -0,0 +1 @@
+uid://du5facslfvg77
@@ -0,0 +1,11 @@
+using Godot;
+
+namespace Babushka.scripts.CSharp.Common.DayAndNight;
+
+public partial class DayAndNightHelper : Node
+{
+    public void IncreaseDayCount()
+    {
+        CalendarController.Instance?.GoToNextDay();
+    }
+}
@@ -0,0 +1 @@
+uid://jg4jryfus3bw
@@ -1,7 +1,5 @@
-using System;
 using Babushka.scripts.CSharp.Low_Code.Variables;
 using Godot;
-using Godot.Collections;

 namespace Babushka.scripts.CSharp.Common.Farming;

@@ -1,5 +1,6 @@
 using System;
 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.Low_Code.Events;
@@ -13,11 +14,11 @@ namespace Babushka.scripts.CSharp.Common.Farming;
 /// Defines the behaviour of the field, i.e. interactions, states and effects.
 /// </summary>
 [GlobalClass]
-public partial class FieldBehaviour2D : Sprite2D
+public partial class FieldBehaviour2D : Sprite2D, ISaveable
 {
    [ExportGroup("Persistence")]
-    [Export] public string SaveId = "";
    [Export] private VariableNode _fieldIndex;
+    [Export] private Node _saveIdHolder;
    [Export] public VariableResource _sceneKeyProvider;
    [Export] public FieldState FieldState = FieldState.Tilled;
    
@@ -45,8 +46,11 @@ public partial class FieldBehaviour2D : Sprite2D

    private bool _canPlant;
    private bool _canWater;
+    private int _currentDay;

    private PlantBehaviour2D? _currentPlant;
+    
+    private const string DAY_COUNTER_SAVE_ID = "12c6da2e-fc71-4281-a04a-dfd3c7943975";

    [Signal] public delegate void PlantedEventHandler();

@@ -56,6 +60,7 @@ public partial class FieldBehaviour2D : Sprite2D
        _canPlant = (FieldState == FieldState.Tilled ||  FieldState == FieldState.Watered) && _seedsActive;
        // fieldstate == tilled && watering can ausgewählt
        _canWater = (FieldState == FieldState.Tilled || FieldState == FieldState.Planted) && _wateringCanActive;
+        
        FieldInteractionArea.IsActive = _canPlant || _canWater;
    }

@@ -71,22 +76,24 @@ public partial class FieldBehaviour2D : Sprite2D
        UpdateInteractionArea();
    }

-    public override void _Ready()
+    public override void _EnterTree()
    {
        LoadFromSaveData();
+    }
+
+    public override void _Ready()
+    {
        if(PlantingPlaceholder.GetChildCount() > 0)
            _currentPlant = PlantingPlaceholder.GetChild<PlantBehaviour2D>(0);
        UpdateFieldState(FieldState);
        
-        FieldService.Instance.TryAddEntry(_sceneKeyProvider.Payload.AsString(),_fieldIndex.Payload.AsInt32(), this);
-        
        int randomIndex = new Random().Next(0, _maskTexture.Length);
        _maskSprite.Texture = _maskTexture[randomIndex];
        _outlineSprite.Texture = _maskOutlineTextures[randomIndex];
        base._Ready();
    }
    
-    public void UpdateFieldState(FieldState state)
+    public void UpdateFieldState(FieldState state, bool updateSaveAfter = true)
    {
        switch (state)
        {
@@ -114,18 +121,25 @@ public partial class FieldBehaviour2D : Sprite2D
                break;
        }
        UpdateInteractionArea();
-        UpdateSaveData();
+        if(updateSaveAfter)
+            UpdateSaveData();
    }


    public void Water()
    {
-        if (WateringCanState.GetFillState() > 0)
+        if (WateringCanState.GetFillState() > 0 && FieldState != FieldState.Watered)
        {
            UpdateFieldState(FieldState.Watered);
            _wateringParticles.Emitting = true;
            WateringCanState.Water();
            _wateringEvent.Raise();
+
+            if (_currentPlant != null)
+            {
+                _currentPlant.DaysWatered++;
+                UpdateSaveData();
+            }
        }
    }
    
@@ -168,6 +182,16 @@ public partial class FieldBehaviour2D : Sprite2D
    }

    private void PlantPrefab(string prefabPath)
+    {
+        InstantiatePlant(prefabPath);
+
+        if (_currentPlant != null)
+        {
+            _currentPlant.DayPlanted = _currentDay;
+        }
+    }
+
+    private void InstantiatePlant(string prefabPath)
    {
        PackedScene prefab = ResourceLoader.Load<PackedScene>(prefabPath, nameof(PackedScene));
        Node2D plant2d = prefab.Instantiate<Node2D>();
@@ -183,15 +207,15 @@ public partial class FieldBehaviour2D : Sprite2D
    
    #region SAVE AND LOAD

+    /// <summary>
+    /// Update save data as prep for scene transition (when data is saved and loaded from disk).
+    /// </summary>
    public void UpdateSaveData()
    {
-        var saveData = new SaveData();
-        
-        saveData.SceneName = _sceneKeyProvider.Payload.AsString();
-        saveData.Id = SaveId + _fieldIndex.Payload.AsString();
        var payloadData = new Dictionary<string, Variant>
        {
-            { "field_state", (int)FieldState }
+            { "field_state", (int)FieldState },
+            { "day_count_on_last_exit", _currentDay}
        };

        if (_currentPlant != null)
@@ -200,62 +224,101 @@ public partial class FieldBehaviour2D : Sprite2D
                "plant_data", new Dictionary<string, Variant>()
                {
                    { "prefab_path", _currentPlant.PrefabPath },
-                    { "plant_state", (int)_currentPlant.State },
-                    { "plant_days_growing", _currentPlant.DaysGrowing }
+                    { "plant_start_day", _currentPlant.DayPlanted },
+                    { "plant_watered_days", _currentPlant.DaysWatered }
                }
            );
        }
        
-        saveData.JsonPayload = Json.Stringify(payloadData, indent: "\t");
-        
-        SavegameService.AppendSave(saveData);
+        string id = _saveIdHolder.GetMeta("SaveID").AsString();
+        SavegameService.AppendDataToSave(id, payloadData);
    }

+    /// <summary>
+    /// Loads on scene enter.
+    /// </summary>
    public void LoadFromSaveData()
    {
-        var sceneName = _sceneKeyProvider.Payload.AsString();
-        var id = SaveId + _fieldIndex.Payload.AsString();
-        string jsonPayload = SavegameService.GetSaveData(sceneName, id);
-        Dictionary<string, Variant> save = Json.ParseString(jsonPayload).AsGodotDictionary<string, Variant>();
+        // Get field and plant data
+        string id = _saveIdHolder.GetMeta("SaveID").AsString();
+        
+        Dictionary<string, Variant> save = SavegameService.GetSaveData(id);

        if (save.Count > 0)
        {
-            if (save.TryGetValue("field_state", out Variant fieldStateVar))
-            {
-                int fieldStateInt = fieldStateVar.AsInt32();
-                FieldState = (FieldState) fieldStateInt;
-
-                if (fieldStateInt != 0)
-                {
-                    Visible = true;
-                    UpdateFieldState(FieldState);
-                }
-            }
-
+            // get plant first because it's also relevant for the field state
            if (save.TryGetValue("plant_data", out Variant plantDataVar))
            {
                Dictionary<string, Variant> plantDataDict =  plantDataVar.AsGodotDictionary<string, Variant>();

                if (plantDataDict.TryGetValue("prefab_path", out Variant prefabPathVar))
                {
-                    PlantPrefab(prefabPathVar.AsString());
+                    InstantiatePlant(prefabPathVar.AsString());
                }
                else
                {
                    return;
                }
-
-                if (plantDataDict.TryGetValue("plant_state", out Variant plantStateVar) && _currentPlant != null)
+                if (plantDataDict.TryGetValue("plant_start_day", out Variant plantStartDay) && _currentPlant != null)
                {
-                    _currentPlant.State = (PlantState) plantStateVar.AsInt32();
-                    _currentPlant.GrowPlant();
+                    _currentPlant.DayPlanted = plantStartDay.AsInt32();
                }
-
-                if (plantDataDict.TryGetValue("plant_days_growing", out Variant plantDaysGrowingVar) && _currentPlant != null)
+                if (plantDataDict.TryGetValue("plant_watered_days", out Variant plantDaysWatered) && _currentPlant != null)
                {
-                    _currentPlant.DaysGrowing = plantDaysGrowingVar.AsInt32();
+                    _currentPlant.DaysWatered = plantDaysWatered.AsInt32();
+                }
+            }
+            
+            // Get current day count: Load only. Saving the day count is handled on the day and night prefab.
+            Dictionary<string, Variant> dayCountSave = SavegameService.GetSaveData(DAY_COUNTER_SAVE_ID);
+
+            if (dayCountSave.Count > 0)
+            {
+                if (dayCountSave.TryGetValue("payload", out Variant dayCountVar))
+                {
+                    _currentDay = dayCountVar.AsInt32();
+                    if (_currentPlant != null)
+                    {
+                        _currentPlant.CurrentDayInCalendar = _currentDay;
+                    }
+                }
+            }
+            
+            // get field state
+            if (save.TryGetValue("field_state", out Variant fieldStateVar))
+            {
+                int fieldStateInt = fieldStateVar.AsInt32();
+
+                // if the field has been unlocked, make it visible.
+                if (fieldStateInt != 0)
+                {
+                    Visible = true;
+
+                    if (save.TryGetValue("day_count_on_last_exit", out Variant lastDayCountVar))
+                    {
+                        int lastDayCount =  lastDayCountVar.AsInt32();
+                        
+                        // if day is today, then just use the provided field state as is.
+                        if (CalendarController.Instance != null && _currentDay != lastDayCount)
+                        {
+                            // if the field was watered the day before, set it to tilled or planted.
+                            if (fieldStateInt == 3)
+                            {
+                                if (_currentPlant != null)
+                                {
+                                    fieldStateInt = 2;
+                                }
+                                else
+                                {
+                                    fieldStateInt = 1;
+                                }
+                            }
+                        }
+                    }
+                    
+                    FieldState = (FieldState) fieldStateInt;
+                    UpdateFieldState(FieldState, false);
                }
-                
            }
        }
    }
@@ -1,100 +0,0 @@
-using System.Collections.Generic;
-using Godot;
-
-namespace Babushka.scripts.CSharp.Common.Farming;
-
-public partial class FieldService : Node
-{
-    private Dictionary<string, FieldsInScene>? _outerDict = null!;
-    public static FieldService Instance { get; private set; } = null!;
-
-    public override void _EnterTree()
-    {
-            Instance = this;
-            _outerDict = new Dictionary<string, FieldsInScene>();
-    }
-
-    public override void _ExitTree()
-    {
-        Instance = null;
-        _outerDict = null;
-    }
-
-
-    //Create
-    public bool TryAddEntry(string sceneName, int fieldIndex, FieldBehaviour2D field)
-    {
-        if (_outerDict != null )
-        {
-            FieldsInScene innerDict;
-            bool outerDictEntryExists = _outerDict.TryGetValue(sceneName, out innerDict);
-            
-            if (!outerDictEntryExists)
-            {
-                innerDict = new FieldsInScene();
-                _outerDict.Add(sceneName, innerDict);
-            }
-            
-            if (!innerDict.fields.ContainsKey(fieldIndex))
-            {
-                innerDict.fields.Add(fieldIndex, field);
-                return true;
-            }
-        }
-        return false;
-    }
-    
-    // Read
-    public FieldBehaviour2D? TryGet(string key, int fieldIndex)
-    {
-        if (_outerDict != null && _outerDict.TryGetValue(key, out FieldsInScene? field))
-        {
-            if (field.fields.TryGetValue(fieldIndex, out FieldBehaviour2D? fieldInstance))
-            {
-                return fieldInstance;
-            }
-        }
-        return null;
-    }
-    
-    
-    //Update
-    public void UpdateEntry(string key, int fieldIndex, FieldBehaviour2D state)
-    {
-        if (_outerDict != null && _outerDict.TryGetValue(key, out FieldsInScene? field))
-        {
-            if (field.fields.ContainsKey(fieldIndex))
-            {
-                field.fields[fieldIndex] = state;
-            }
-            else
-            {
-                TryAddEntry(key, fieldIndex, state);
-            }
-        }
-    }
-    
-    //Delete
-    public void RemoveEntry(string key, int fieldIndex)
-    {
-        if (_outerDict != null && _outerDict.TryGetValue(key, out FieldsInScene? field))
-        {
-            if (field.fields.ContainsKey(fieldIndex))
-            {
-                field.fields.Remove(fieldIndex);
-            }
-        }
-    }
-}
-
-internal class FieldsInScene 
-{
-    public Dictionary<int, FieldBehaviour2D?> fields;
-
-    public FieldsInScene()
-    {
-        fields = new Dictionary<int, FieldBehaviour2D?>();
-    }
-}
-
-
@@ -1 +0,0 @@
-uid://slo0uydmmvnu
@@ -1,6 +1,9 @@
 using System;
+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;

@@ -9,7 +12,8 @@ namespace Babushka.scripts.CSharp.Common.Farming;
 /// </summary>
 public partial class PlantBehaviour2D : Node2D
 {
-    [Export] private string _prefabPath;
+
+    [ExportGroup("Plant State")]
    [Export] private Sprite2D[] _seeds;
    [Export] private Sprite2D[] _smallPlants;
    [Export] private Sprite2D[] _bigPlants;
@@ -19,11 +23,18 @@ public partial class PlantBehaviour2D : Node2D
    [Export] private ItemOnGround2D _harvestablePlant;
    [Export] private CpuParticles2D _magicEffect;
    [Export] private bool _magicWordNeeded = true;
+    
+    [ExportGroup("PlantConfig")]
+    [Export] private string _prefabPath;
+    [Export] private VariableNode _lifecycle;

    private string _magicWordDialogicEventName = "MagicWord";
    private Sprite2D? _currentPlantSprite = null;
    private bool _magicWordSaid = false;
    private bool _calledOnReady = false;
+    private int _dayPlanted;
+    private int _currentDay;
+    private int _daysWatered;

    public PlantState State
    {
@@ -31,8 +42,26 @@ public partial class PlantBehaviour2D : Node2D
        set => _state = value;
    } 
    
-    public int DaysGrowing { get; set; }
-    
+    /// <summary>
+    /// The day count at the day this plant was planted.
+    /// </summary>
+    public int DayPlanted
+    {
+        get => _dayPlanted;
+        set => _dayPlanted = value; 
+    }
+
+    public int CurrentDayInCalendar
+    {
+        get => _currentDay;
+        set
+        {
+            if (_currentDay == value) return;
+            _currentDay = value;
+            DaysGrowingChanged();
+        }
+    }
+
    public string PrefabPath => _prefabPath;

    /// <summary>
@@ -44,6 +73,15 @@ public partial class PlantBehaviour2D : Node2D
        set => _field = value;
    }

+    public int DaysWatered
+    {
+        get => _daysWatered;
+        set
+        {
+            _daysWatered =  value;
+        } 
+    }
+
    public override void _Ready()
    {
        if (_state == PlantState.None)
@@ -58,13 +96,32 @@ public partial class PlantBehaviour2D : Node2D
            GrowPlant();
        }
    }
+    
+    private void DaysGrowingChanged()
+    {
+        int lifecycle = _lifecycle.Payload.AsInt32();
+        Debug.Assert(lifecycle > 0);
+
+        float growth = (float)_daysWatered / lifecycle;
+        int growthFloor = Mathf.FloorToInt(growth);
+
+        _state = growthFloor switch
+        {
+            0 => PlantState.None,
+            1 => PlantState.Planted,
+            2 => PlantState.SmallPlant,
+            _ => PlantState.BigPlant
+        };
+
+        _calledOnReady = true;
+        Grow();
+    }

    public void Grow()
    {
        GrowPlant();
    }
    
-    
    /// <summary>
    /// Transitions the plant to its next growth stage.
    /// </summary>
@@ -0,0 +1,33 @@
+using Babushka.scripts.CSharp.Low_Code.Variables;
+using Godot;
+
+namespace Babushka.scripts.CSharp.Common.Farming;
+
+public partial class WateringCanSaveHelper : Node
+{
+    [Export] private SaveableVariableNode _wateringCanFillStateNode;
+
+    public override void _EnterTree()
+    {
+        WateringCanState.OnFill += SetFillState;
+        WateringCanState.OnWater += SetFillState;
+    }
+
+    public override void _ExitTree()
+    {
+        WateringCanState.OnFill -= SetFillState;
+        WateringCanState.OnWater -= SetFillState;
+    }
+    
+
+    public void SetFillState()
+    {
+        _wateringCanFillStateNode.Payload = WateringCanState.GetFillState();
+    }
+    
+    private void OnLoad()
+    {
+        WateringCanState.SetFillState(_wateringCanFillStateNode.Payload.AsInt32());
+    }
+    
+}
@@ -0,0 +1 @@
+uid://dj1qjambsa4pg
@@ -29,6 +29,7 @@ public static class WateringCanState
    public delegate void WateringCanDelegate(bool state);
    public static event WateringCanDelegate WateringCanActiveStateChanged;
    public static event Action? OnWater;
+    public static event Action? OnFill;
        

    
@@ -38,6 +39,7 @@ public static class WateringCanState
    public static void Fill()
    {
        _fillstate = MAX_FILLSTATE;
+        OnFill?.Invoke();
    }

    /// <summary>
@@ -69,6 +71,15 @@ public static class WateringCanState
        return _fillstate;
    }

+    /// <summary>
+    /// Public setter. Used for saving and loading.
+    /// </summary>
+    /// <param name="fillstate"></param>
+    public static void SetFillState(int fillstate)
+    {
+        _fillstate = fillstate;
+    }
+
    /// <summary>
    /// Sets the Active state of the watering can, i.e. if it is currently in hand and if the ui should be active.
    /// </summary>
@@ -1,36 +1,44 @@
-using Godot;
-using System;
 using System.Collections.Generic;
-using System.Threading.Tasks;
-using Babushka.scripts.CSharp.Common.Fight;
 using Babushka.scripts.CSharp.Common.Fight.ActionDetails;
 using Babushka.scripts.CSharp.Common.Minigame;
+using Godot;
+using static Babushka.scripts.CSharp.Common.Minigame.MinigameController.RegionTheme;
+
+namespace Babushka.scripts.CSharp.Common.Fight;

 public partial class FightMinigameHandler : Node
 {
    #region Shortcuts

-    private FightWorld.FightHappeningData HappeningData => FightWorld.Instance.fightHappeningData ?? throw new NoFightHappeningException();
+    private FightWorld.FightHappeningData HappeningData =>
+        FightWorld.Instance.fightHappeningData ?? throw new NoFightHappeningException();

    #endregion
-    
-    [Export] private MinigameController _minigameController;
+
+    [Export] private MinigameController _minigameController = null!;


    public void OnStateEnter(FightHappening.FightState to)
    {
-        if(to!=FightHappening.FightState.InputActionDetail) return;
-        
-        var currentDetail = HappeningData.actionStaging!.CurrentDetail();
-        if(currentDetail is not MinigameActionDetail minigameDetail) return;
+        if (to != FightHappening.FightState.InputActionDetail) return;

+        var currentDetail = HappeningData.actionStaging!.CurrentDetail();
+        if (currentDetail is not MinigameActionDetail minigameDetail) return;
+
+        var region1 = R(2, 4);
+        var region2 = R([0, 1, 1, 2]);
+        var region3 = R([7, 8, 9, 9]);
+        var region4 = R([0, 1, 1, 2]);
+        var region5 = R(2, 4);
+        var region6 = R(4, 6);
+        
        _minigameController.Run(new MinigameController.Builder<int>()
-            .AddRegion(4).RegionWithText("4").RegionWithTheme(MinigameController.RegionTheme.Normal)
-            .AddRegion(0).RegionWithProportion(1.5f).RegionWithText("0").RegionWithTheme(MinigameController.RegionTheme.Bad)
-            .AddRegion(8).RegionWithProportion(0.5f).RegionWithText("8").RegionWithTheme(MinigameController.RegionTheme.VeryGood)
-            .AddRegion(0).RegionWithProportion(1.5f).RegionWithText("0").RegionWithTheme(MinigameController.RegionTheme.Bad)
-            .AddRegion(3).RegionWithText("3").RegionWithTheme(MinigameController.RegionTheme.NormalAlt1)
-            .AddRegion(5).RegionWithText("5").RegionWithTheme(MinigameController.RegionTheme.NormalAlt2)
+            .AddRegion(region1).RegionWithProportion(R(0.7, 1.3)).RegionWithText(region1.ToString()).RegionWithTheme(Normal)
+            .AddRegion(region2).RegionWithProportion(R(1, 1.8)).RegionWithText(region2.ToString()).RegionWithTheme(Bad)
+            .AddRegion(region3).RegionWithProportion(R(0.3, 1)).RegionWithText(region3.ToString()).RegionWithTheme(VeryGood)
+            .AddRegion(region4).RegionWithProportion(R(1, 1.8)).RegionWithText(region4.ToString()).RegionWithTheme(Bad)
+            .AddRegion(region5).RegionWithProportion(R(0.7, 1.3)).RegionWithText(region5.ToString()).RegionWithTheme(NormalAlt1)
+            .AddRegion(region6).RegionWithProportion(R(0.7, 1.3)).RegionWithText(region6.ToString()).RegionWithTheme(NormalAlt2)
            .WithHitCount(3)
        ).ContinueWith(task =>
        {
@@ -40,4 +48,25 @@ public partial class FightMinigameHandler : Node
            FightHappening.Instance.CallDeferred("DetailFilled");
        });
    }
-}
+
+
+    #region Utils
+
+    // this is to make the minigame set up a bit less convoluted
+    private static int R(int min, int max)
+    {
+        return GD.RandRange(min, max);
+    }
+
+    private static float R(double min, double max)
+    {
+        return (float)GD.RandRange(min, max);
+    }
+
+    private static int R(List<int> list)
+    {
+        return list[GD.RandRange(0, list.Count - 1)];
+    }
+
+    #endregion
+}
@@ -3,10 +3,11 @@ using System;
 using Godot;
 using System.Collections.Generic;
 using System.Linq;
+using Babushka.scripts.CSharp.Common.Savegame;

 namespace Babushka.scripts.CSharp.Common.Inventory;

-public partial class InventoryInstance : Node
+public partial class InventoryInstance : Node, ISaveable
 {
    private List<InventorySlot> _slots = new();
    public IReadOnlyList<InventorySlot> Slots => _slots;
@@ -16,6 +17,8 @@ public partial class InventoryInstance : Node

    [Signal]
    public delegate void InventoryContentsChangedEventHandler();
+    
+    public static string ID = "inventoryInstance";

    /// <summary>
    /// The total amount of Inventoryslots in the inventory (empty and occupied).
@@ -42,6 +45,21 @@ public partial class InventoryInstance : Node
        }
    }

+    public override void _EnterTree()
+    {
+        LoadFromSaveData();
+        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);
@@ -156,4 +174,61 @@ public partial class InventoryInstance : Node
    {
        return items.All(HasItems);
    }
+    
+     #region SAVE AND LOAD
+
+    public void UpdateSaveData()
+    {
+        var payloadData = new Godot.Collections.Dictionary<string, Variant>();
+
+        for (int i = 0; i < _slots.Count; i++)
+        {
+            if (!_slots[i].IsEmpty())
+            {
+                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);
+            }
+        }
+        
+        SavegameService.AppendDataToSave(ID, payloadData);
+    }
+
+    public void LoadFromSaveData()
+    {
+        var id = ID;
+        
+        Godot.Collections.Dictionary<string, Variant> save = SavegameService.GetSaveData(id);
+
+        if (save.Count > 0)
+        {
+            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
 }
@@ -23,7 +23,7 @@ public partial class InventoryManager : Node
        }
    }

-    public InventoryInstance playerInventory = new InventoryInstance();
+    public InventoryInstance? playerInventory;

    private int _currentSelectedSlotIndex = 0;

@@ -34,7 +34,9 @@ public partial class InventoryManager : Node

    public override void _Ready()
    {
+        playerInventory = new InventoryInstance();
        playerInventory.SlotAmount = 37;
+        AddChild(playerInventory);
    }

    public InventoryActionResult CreateItem(
@@ -18,7 +18,6 @@ public partial class InventoryUi : Control

    public override void _Ready()
    {
-        GD.Print("Ready inventory ui");
        _playerInventory = InventoryManager.Instance.playerInventory;
        //PopulateSlots();
        SubscribeSlots();
@@ -29,6 +28,7 @@ public partial class InventoryUi : Control

    public override void _ExitTree()
    {
+        InventoryManager.Instance.playerInventory.InventoryContentsChanged -= SetSlotContent;
        UnsubscribeSlots();
    }

@@ -1,18 +1,22 @@
+using Babushka.scripts.CSharp.Common.Savegame;
 using Godot;
+using Godot.Collections;

 namespace Babushka.scripts.CSharp.Common.Inventory;

-public partial class ItemOnGround2D : Node
+public partial class ItemOnGround2D : Node, ISaveable
 {
    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();
+    

    private Label _itemLabel => GetNode<Label>("ItemLabel");
    private Label _pickupErrorLabel => GetNode<Label>("PickupErrorLabel");
@@ -30,6 +34,7 @@ public partial class ItemOnGround2D : Node

    public override void _Ready()
    {
+        LoadFromSaveData();
        UpdateVisuals();
        _pickupErrorLabel.Text = "";
    }
@@ -43,24 +48,36 @@ public partial class ItemOnGround2D : Node
        EmitSignal(SignalName.SuccessfulPickUp);
        if (result == InventoryActionResult.Success)
        {
-            if (!_infiniteSupply)
-            {
-                    pickUpCounter++;
-                    if (pickUpCounter >= _finiteSupply)
-                    {
-                        QueueFree();
-                    }
-            }
+            Pickup();
        }
        else
        {
-            _pickupErrorLabel.Text = "Inventory Full";
-            var tween = GetTree().CreateTween();
-            tween.TweenInterval(2);
-            tween.TweenCallback(Callable.From(() => _pickupErrorLabel.Text = ""));
+            FailToPickup();
        }
    }

+    private void Pickup()
+    {
+        if (!_infiniteSupply)
+        {
+            pickUpCounter++;
+            if (pickUpCounter >= _finiteSupply)
+            {
+                QueueFree();
+            }
+
+            UpdateSaveData();
+        }
+    }
+
+    private void FailToPickup()
+    {
+        _pickupErrorLabel.Text = "Inventory Full";
+        var tween = GetTree().CreateTween();
+        tween.TweenInterval(2);
+        tween.TweenCallback(Callable.From(() => _pickupErrorLabel.Text = ""));
+    }
+
    public void UpdateVisuals()
    {
        if (!IsActive)
@@ -76,4 +93,69 @@ public partial class ItemOnGround2D : Node
            _itemLabel.Text = "";
        }
    }
+
+    // todo: What do we do with instances that are created at runtime?
+    public void UpdateSaveData()
+    {
+        if (!_saveToDisk)
+            return;
+        
+        var payloadData = new Dictionary<string, Variant>
+        {
+            {"pickupCounter",  pickUpCounter}
+        };
+        
+        string id = GetMeta("SaveID").AsString();
+        SavegameService.AppendDataToSave( id, payloadData);
+    }
+
+    public void LoadFromSaveData()
+    {
+        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;
+        Dictionary<string, Variant> savegameData = SavegameService.GetSaveData(InventoryInstance.ID);
+        if (savegameData.Count > 0)
+        {
+            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 (itemInstance.blueprint.isUnique)
+                {
+                    //comparing resource path to identify the item
+                    string[] valuePair = kvp.Value.AsStringArray();
+                    if (valuePair[0] == itemResource.ResourcePath)
+                    {
+                        int amountInInventory = int.Parse(valuePair[1]);
+                        // comparing amount to see if it's all in the inventory now.
+                        if (amountInInventory > 0)
+                        {
+                            Pickup();
+                        }
+                    }
+                }
+            }
+        }
+    }
 }
@@ -17,6 +17,9 @@ public partial class ItemResource : Resource
    [Export]
    public int maxStack;
    
+    [Export]
+    public bool isUnique;
+    
    public ItemResource()
    {
        name = "";
@@ -21,7 +21,7 @@ public partial class MinigameController : Node2D
        God,
        VeryGood
    }
-    
+
    public class Builder<T>
    {
        internal class Region
@@ -108,6 +108,8 @@ public partial class MinigameController : Node2D

    [Signal] public delegate void ArmMovedEventHandler(float newPos);

+    [Signal] public delegate void RegionHitEventHandler(int regionIndex);
+
    public override void _EnterTree()
    {
        HideMinigame();
@@ -125,6 +127,7 @@ public partial class MinigameController : Node2D
        ShowMinigame();
        Setup(builder);
        await _minigameComplete!.Task;
+        await ToSignal(GetTree().CreateTimer(.3), "timeout");
        var returnValue = _hits!.Select(h => builder.regions[h].value).ToList();
        Reset();
        HideMinigame();
@@ -145,6 +148,7 @@ public partial class MinigameController : Node2D
        }

        _hits.Add(i);
+        EmitSignalRegionHit(i);

        _armSpeed = -_armSpeed;

@@ -174,16 +178,18 @@ public partial class MinigameController : Node2D

        // spawn regions
        var regionSum = 0f;
-        foreach (var region in builder.regions)
+        foreach (var (region, i) in builder.regions.Select((region, i) => (region, i)))
        {
            var regionVisual = _regionVisualPrefab.Instantiate<RegionVisual>();
            _regionsParent.AddChild(regionVisual);

+            RegionHit += regionVisual.HitAnimation;
+
            var normalisedAngleStart = regionSum / totalRegionProportion;
            var normalisedAngleEnd = (regionSum + region.proportion) / totalRegionProportion;
            var normalAngles = new Vector2(normalisedAngleStart, normalisedAngleEnd);

-            regionVisual.Setup(normalAngles, _baseRegionColor.RandomHue(), region.text, region.theme);
+            regionVisual.Setup(normalAngles, region.text, region.theme, i);

            regionSum += region.proportion;

@@ -207,6 +213,13 @@ public partial class MinigameController : Node2D
    {
        _minigameComplete = null;
        _hits = null;
-        _regionsParent.GetChildren().ForEach(c => c.QueueFree());
+        _regionsParent.GetChildren().ForEach(c =>
+        {
+            if (c is RegionVisual rv)
+            {
+                RegionHit -= rv.HitAnimation;
+            }
+            c.QueueFree();
+        });
    }
 }
@@ -1,27 +1,42 @@
-using Godot;
 using System;
-using Babushka.scripts.CSharp.Common.Minigame;
+using Godot;
 using Godot.Collections;

+namespace Babushka.scripts.CSharp.Common.Minigame;
+
 public partial class RegionVisual : Node
 {
-    [Export] private Sprite2D _sliceSprite;
-    [Export] private Label _textLabel;
-    [Export] private Node2D _labelPivot;
+    [Export] private Sprite2D _sliceSprite = null!;
+    [Export] private Label _textLabel = null!;
+    [Export] private Node2D _labelPivot = null!;

    [Export(PropertyHint.DictionaryType)] private Dictionary<MinigameController.RegionTheme, Color> _fillColors = new();

-    public void Setup(Vector2 normalAngles, Color color, string regionText, MinigameController.RegionTheme regionTheme)
+    private int _index;
+
+    public void Setup(Vector2 normalAngles, string regionText, MinigameController.RegionTheme regionTheme, int index)
    {
        var mat = (_sliceSprite.Material as ShaderMaterial)!;
        mat.SetShaderParameter("angles", normalAngles);
        mat.SetShaderParameter("fillColor", GetFillColor(regionTheme));

-        var averageAngleRadians = (normalAngles.X + normalAngles.Y) * float.Pi; // '/ 2' from the average and '* 2' from the radians cancel out
+        // '/ 2' from the average and '* 2' from the radians cancel out
+        var averageAngleRadians = (normalAngles.X + normalAngles.Y) * float.Pi;
        _labelPivot.Rotation = averageAngleRadians;
        _textLabel.Rotation = -averageAngleRadians;

        _textLabel.Text = regionText;
+
+        _index = index;
+    }
+
+    public void HitAnimation(int regionIndex)
+    {
+        if(regionIndex != _index) return;
+        
+        var tween = GetTree().CreateTween();
+        tween.TweenProperty(_sliceSprite, "scale", new Vector2(1.5f, 1.5f), 0.1f);
+        tween.TweenProperty(_sliceSprite, "scale", new Vector2(1f, 1f), 0.2f);
    }

    private Color GetFillColor(MinigameController.RegionTheme theme)
@@ -12,8 +12,6 @@ public partial class QuestTrigger : Node

    public void Trigger()
    {
-        GD.Print("trigger");
-
        if (questResource == null)
            throw new Exception("QuestResource is not set on QuestTrigger node.");

@@ -0,0 +1,19 @@
+namespace Babushka.scripts.CSharp.Common.Savegame;
+
+/// <summary>
+/// Defines the behaviour of Nodes that have fields that should save / load to disk.
+/// When implementing new Saveable objects, please beware: Please check if object instances need to be identified separately.
+/// If so, make sure to give them a proper ID. You can use the <see cref="SaveIDProvider"/> tool for that.
+/// </summary>
+public interface ISaveable 
+{
+    /// <summary>
+    /// Adds or updates the field data that shall be stored to disk.
+    /// </summary>
+    public void UpdateSaveData();
+    
+    /// <summary>
+    /// Loads the field data from disk.
+    /// </summary>
+    public void LoadFromSaveData();
+}
@@ -0,0 +1 @@
+uid://bqapxuprxuj20
@@ -0,0 +1,15 @@
+using Godot;
+
+namespace Babushka.scripts.CSharp.Common.Savegame;
+
+[Tool]
+public partial class SaveCheats : Node
+{
+    [ExportToolButton("ResetSave")] Callable _raiseAction => Callable.From(Reset);
+    
+    public void Reset()
+    {
+        SavegameService.Reset();
+    }
+    
+}
@@ -0,0 +1 @@
+uid://iquhbkr7pqeg
@@ -9,12 +9,20 @@ namespace Babushka.scripts.CSharp.Common.Savegame;
 [Serializable]
 public class SaveData 
 {
-    public string SceneName;
+    // for future use in case the structure changes.
+    public const int VERSION = 1;
+    public int version { get; set; } = VERSION;
+
+    public bool IsVersionValid()
+    {
+        return VERSION == version;
+    }
+    
    public string Id;
    public string JsonPayload;

    public string ToString()
    {
-        return SceneName + " " + Id + " " + JsonPayload;
+        return Id + " " + JsonPayload;
    }
 }
@@ -7,12 +7,15 @@ namespace Babushka.scripts.CSharp.Common.Savegame;
 /// </summary>
 public partial class SaveGameManager : Node
 {
+    public static string USER_DATA_FILE_PATH = "user://save_data/userData.json";
+    
    public static SaveGameManager? Instance { get; private set; } = null!;

    public override void _EnterTree()
    {
        Instance = this;
-        
+        USER_DATA_FILE_PATH = ProjectSettings.GlobalizePath(USER_DATA_FILE_PATH);
+        SavegameService.SavePath = USER_DATA_FILE_PATH;
        SavegameService.Load();
    }
    
@@ -0,0 +1,34 @@
+using System;
+using Godot;
+using Godot.Collections;
+
+namespace Babushka.scripts.CSharp.Common.Savegame;
+
+/// <summary>
+/// And editor tool that lives in the scene scope and iterates over saveable nodes and assigns them unique IDs where necessary.
+/// It only works if the object (prefab) in question has been added to the "Saveable"-group beforehand.
+/// </summary>
+[Tool]
+public partial class SaveIDProviderTool : Node
+{
+    /// <summary>
+    /// Creates an inspector button that calls the AssignIDs method.
+    /// </summary>
+    [ExportToolButton("Assign IDs")] private Callable assignIDs => Callable.From(AssignIDs);
+
+    private void AssignIDs()
+    {
+        Array<Node> saveables = GetTree().GetNodesInGroup("Saveable");
+        foreach (var node in saveables)
+        {
+            GD.Print($"Checking {node.Name}.");
+            if (!node.HasMeta("SaveID") || string.IsNullOrEmpty(node.GetMeta("SaveID").AsString()))
+            {
+                string saveID = Guid.NewGuid().ToString();
+                node.SetMeta("SaveID", saveID);
+                GD.Print($"Setting Save ID for node {node.Name}: " + saveID);
+            }
+            
+        }
+    }
+}
@@ -0,0 +1 @@
+uid://ca4s0algeij1h
@@ -9,31 +9,41 @@ namespace Babushka.scripts.CSharp.Common.Savegame;
 /// Handles the saving and loading of game states.
 /// Holds the central SaveData object that serves as a temporary SaveFile.
 /// Automatically writes to disk on every scene change.
+/// Uses the Godot Json Serializer, which may implicitly convert integers to floats, so be careful when extending!
 /// </summary>
 public static class SavegameService
 {
-    public static readonly string SavePath = "user://babushka_savegame.json";
+    public static string SavePath = "";

    public static Dictionary<string, string> SaveDatas = new ();
    
    public static bool _loaded = false;
    
+    public delegate void SaveGameDelegate();
+    public static event SaveGameDelegate OnSaveGameReset = delegate {};
+
+
+    public static void AppendDataToSave( string id, Dictionary<string, Variant> payload)
+    {
+        var saveData = new SaveData();
+        saveData.Id = id;
+        saveData.JsonPayload = Json.Stringify(payload, indent: "\t");
+        AppendSave(saveData);
+    }

    /// <summary>
    /// Adds or overwrites an entry in the SaveData dictionary.
    /// </summary>
    /// <param name="saveData"></param>
-    public static void AppendSave(SaveData saveData)
+    private static void AppendSave(SaveData saveData)
    {
-        string key = string.Concat(saveData.SceneName, "_", saveData.Id);
-
-        if (SaveDatas.TryGetValue(key, out var value))
+        if (SaveDatas.TryGetValue(saveData.Id, out var value))
        {
-            SaveDatas[key] = saveData.JsonPayload;
+            SaveDatas[saveData.Id] = saveData.JsonPayload;
        }
        else
        {
-            SaveDatas.Add(key, saveData.JsonPayload);
+            SaveDatas.Add(saveData.Id, saveData.JsonPayload);
        }
    }
    
@@ -45,21 +55,21 @@ public static class SavegameService
    /// <param name="sceneName"></param>
    /// <param name="id"></param>
    /// <returns></returns>
-    public static string GetSaveData(string sceneName, string id)
+    public static Dictionary<string, Variant> GetSaveData(string id)
    {
-        string saveData = "";
+        Dictionary<string, Variant> saveData = new();
        
-        string key = string.Concat(sceneName, "_", id);
+        string saveDataString = "";
        
        if (!_loaded)
        {
-            GD.Print("SavegameService: SaveFile not loaded.");
            return saveData;
        }
-        
-        if (SaveDatas.ContainsKey(key))
+
+        if (SaveDatas.ContainsKey(id))
        {
-            saveData = SaveDatas[key];
+            saveDataString = SaveDatas[id];
+            saveData = Json.ParseString(saveDataString).AsGodotDictionary<string, Variant>();
        }

        return saveData;
@@ -72,8 +82,24 @@ public static class SavegameService
    public static void Save()
    {
        string json = Json.Stringify(SaveDatas, indent: "\t");
-        using var file = FileAccess.Open(SavePath, FileAccess.ModeFlags.Write);
-        file.StoreString(json);
+        // create cloud directory
+
+        CreateSaveDirectory();
+        
+        try
+        {
+            using var file = FileAccess.Open(SavePath, FileAccess.ModeFlags.Write);
+            file.StoreString(json);
+        }
+        catch (Exception e)
+        {
+            GD.Print(e.Message);
+        }
+    }
+
+    private static void CreateSaveDirectory()
+    {
+        System.IO.Directory.CreateDirectory(System.IO.Path.GetDirectoryName(SavePath) ?? "");
    }

    /// <summary>
@@ -83,8 +109,16 @@ public static class SavegameService
    {
        try
        {
+            if (!System.IO.File.Exists(SavePath))
+            {
+                SaveDatas = new();
+                CreateSaveDirectory();
+            }
+            
            string saveDataJson = FileAccess.GetFileAsString(SavePath);
-            SaveDatas = Json.ParseString(saveDataJson).AsGodotDictionary<string, string>();  
+            if(!string.IsNullOrEmpty(saveDataJson))
+                SaveDatas = Json.ParseString(saveDataJson).AsGodotDictionary<string, string>();  
+            
        }
        catch(Exception e)
        {
@@ -94,4 +128,11 @@ public static class SavegameService

        _loaded = true;
    }
+
+    public static void Reset()
+    {
+        SaveDatas = new ();
+        Save();
+        OnSaveGameReset();
+    }
 }
@@ -0,0 +1,31 @@
+
+namespace Babushka.scripts.CSharp.Common.Savegame;
+
+/// <summary>
+/// Data structure for device-specific settings that should be saved / loaded to disk.
+/// Will not be synced across devices.
+/// </summary>
+public class SettingsData
+{
+    /// <summary>
+    /// To be incremented (and migrated) on modification.
+    /// </summary>
+    public const int VERSION = 1;
+    public int version { get; set; } = VERSION;
+
+    public bool IsVersionValid()
+    {
+        return VERSION == version;
+    }
+    
+    public double runtimeSeconds { get; set; }
+    public int windowSizeX { get; set; } = 800;
+    public int windowSizeY { get; set; } = 600;
+    public int windowPositionX { get; set; } = 100;
+    public int windowPositionY { get; set; } = 100;
+    public bool windowBorderless { get; set; }
+    public float volumeMaster { get; set; } = 1.0f;
+    public float volumeFx { get; set; } = 1.0f;
+    public float volumeMusic { get; set; } = 1.0f;
+
+}
@@ -0,0 +1 @@
+uid://ol8xw1ekx0c2
@@ -0,0 +1,108 @@
+using System;
+using System.Text.Json;
+using Godot;
+
+namespace Babushka.scripts.CSharp.Common.Savegame;
+
+/// <summary>
+/// Handles the saving and loading of local settings data.
+/// </summary>
+[GlobalClass]
+public partial class SettingsSaveController : Node
+{
+    public static string SETTINGS_FILE_PATH = "user://userSettings.json";
+    public static SettingsSaveController Instance;
+    
+    public SettingsData? settings = new SettingsData();
+    public SettingsData settingsDefault = new SettingsData();
+    
+    public event Action OnSettingsReloaded;
+    
+    private bool _loadedData;
+    private DateTime _readyTime;
+
+    public bool LoadedData => _loadedData;
+    
+    public override void _EnterTree()
+    {        
+        SETTINGS_FILE_PATH = ProjectSettings.GlobalizePath(SETTINGS_FILE_PATH);
+        _readyTime = DateTime.Now;
+        Instance = this;
+        LoadSettings();
+    }
+    
+    public override void _ExitTree()
+    {
+        if (settings != null) 
+            settings.runtimeSeconds += (DateTime.Now - _readyTime).TotalSeconds;
+        SaveSettings();
+        Instance = null;
+    }
+    
+    /// <summary>
+    /// Saves Settings Data onto disk.
+    /// </summary>
+    public void SaveSettings()
+    {
+        try
+        {
+            string jsonString = JsonSerializer.Serialize(
+                settings,
+                new JsonSerializerOptions() { WriteIndented = true}
+            );
+        
+            System.IO.File.WriteAllText(SETTINGS_FILE_PATH, jsonString);
+        }
+        catch (Exception e)
+        {
+            GD.PrintErr("Error Saving Settings:", e);
+            Console.WriteLine(e);
+        }
+    }
+    
+    /// <summary>
+    /// Loads Settings data from disk.
+    /// </summary>
+    public void LoadSettings()
+    {
+        _loadedData = false;
+        
+        try
+        {
+            if (!System.IO.File.Exists(SETTINGS_FILE_PATH))
+            {
+                settings = new SettingsData();
+            }
+            else
+            {
+                string jsonString = System.IO.File.ReadAllText(SETTINGS_FILE_PATH);
+                SettingsData? loadedSettings = JsonSerializer.Deserialize<SettingsData>(jsonString);
+                if (loadedSettings != null && !loadedSettings.IsVersionValid())
+                {
+                    _loadedData = false;
+                }
+                else
+                {
+                    settings = loadedSettings;
+                    _loadedData = true;   
+                }
+            }
+        }
+        catch (Exception e)
+        {
+            GD.PrintErr("Loading Error:", e);
+            Console.WriteLine(e);
+        }
+        
+    }
+    
+    /// <summary>
+    /// Resets Settings to default.
+    /// </summary>
+    public void ResetSettings()
+    {
+        settings = JsonSerializer.Deserialize<SettingsData>(JsonSerializer.Serialize<SettingsData>(settingsDefault));
+        OnSettingsReloaded?.Invoke();
+    }
+
+}
@@ -0,0 +1 @@
+uid://cc7gnydmbcft7
@@ -0,0 +1,101 @@
+using Godot;
+
+namespace Babushka.scripts.CSharp.Common.Savegame;
+
+/// <summary>
+/// Tracks important window settings and communicates with the <see cref="SettingsSaveController"/> to save/load them.
+/// </summary>
+public partial class WindowSettingsSync : Node
+{
+    private Window window;
+    
+    public override void _Ready()
+    {
+        window = GetWindow();
+        window.SizeChanged += SaveWindowSize;
+        
+        SyncSettings();
+        SettingsSaveController.Instance.OnSettingsReloaded += SyncSettings;
+    }
+
+
+    public override void _ExitTree()
+    {
+        SaveWindowPosition();
+        SaveWindowBorderless();
+        SaveWindowSize();
+        SettingsSaveController.Instance.SaveSettings();
+    }
+    
+    /// <summary>
+    /// Tries to get previous settings from settings-savefile, if available.
+    /// </summary>
+    public void SyncSettings()
+    {
+        if (!SettingsSaveController.Instance.LoadedData)
+        {
+            SaveWindowPosition();
+            SaveWindowSize();
+            SaveWindowBorderless();
+            return; 
+        }
+        
+        SettingsData? settingsData =  SettingsSaveController.Instance.settings;
+        if (settingsData != null)
+        {
+            window.Position = new Vector2I(settingsData.windowPositionX, settingsData.windowPositionY);
+            ValidateWindowPosition();
+            
+            window.Size = new Vector2I(settingsData.windowSizeX, settingsData.windowSizeY);
+            window.Borderless = settingsData.windowBorderless;
+        }
+    }
+
+    private void ValidateWindowPosition()
+    {
+        bool validWindowPosition = false;
+        foreach (Rect2I displayRect in DisplayServer.GetDisplayCutouts())
+        {
+            if (displayRect.HasPoint(window.Position))
+            {
+                validWindowPosition = true;
+                break;
+            }
+        }
+            
+        if (!validWindowPosition)
+        {
+            window.MoveToCenter();
+            SaveWindowPosition();
+        }
+    }
+    
+    private void SaveWindowPosition()
+    {
+        SettingsData? settingsData = SettingsSaveController.Instance.settings;
+
+        if (settingsData != null)
+        {
+            settingsData.windowPositionX = window.Position.X;
+            settingsData.windowPositionY = window.Position.Y;
+        }
+    }
+
+    private void SaveWindowSize()
+    {
+        SettingsData? settingsData = SettingsSaveController.Instance.settings;
+        if (settingsData != null)
+        {
+            settingsData.windowSizeX = window.Size.X;
+            settingsData.windowSizeY = window.Size.Y;
+        }
+    }
+
+    private void SaveWindowBorderless()
+    {
+        SettingsData? settingsData = SettingsSaveController.Instance.settings;
+        if (settingsData != null)
+            settingsData.windowBorderless = window.Borderless;
+    }
+
+}
@@ -0,0 +1 @@
+uid://bbp0dyddwdbl8
@@ -34,6 +34,7 @@ public partial class SceneTransition : Node

    public void Quit()
    {
+        SettingsSaveController.Instance.SaveSettings();
        GetTree().Quit();
    }

@@ -1,13 +1,17 @@
 using System.Threading.Tasks;
+using Babushka.scripts.CSharp.Common.Savegame;
+using Babushka.scripts.CSharp.Low_Code.Variables;
 using Godot;
+using Godot.Collections;

 namespace Babushka.scripts.CSharp.Common.Temp;

 /// <summary>
 /// Temporary Duck behaviour to make sure we can use them in the first showcase
 /// </summary>
-public partial class MVPDuck : Node2D
+public partial class MVPDuck : Node2D, ISaveable
 {
+    [ExportGroup("Animation")]
    [Export] private Node2D _penTarget;
    [Export] private int _transferDelayMs;
    [Export] private AnimationPlayer _animationPlayer;
@@ -17,6 +21,11 @@ public partial class MVPDuck : Node2D
    
    [Signal] public delegate void DuckCollectedEventHandler();

+    public override void _Ready()
+    {
+        LoadFromSaveData();
+    }
+
    public void TransferToTargetAfterDelay()
    {
        if (!_collected)
@@ -25,7 +34,6 @@ public partial class MVPDuck : Node2D
            PlayAnimation();
            _collected = true;
        }
-
    }

    private void PlayAnimation()
@@ -40,7 +48,51 @@ public partial class MVPDuck : Node2D
        if(!_penTarget.Equals(null))
            Position = _penTarget.GlobalPosition;
        EmitSignal(SignalName.DuckCollected);
+        UpdateSaveData();
    }

+#region SAVE AND LOAD

+    /// <summary>
+    // Saves duck position.
+    /// </summary>
+    public void UpdateSaveData()
+    {
+        var payloadData = new Dictionary<string, Variant>
+        {
+            { "globalPositionX", GlobalPosition.X },
+            { "globalPositionY", GlobalPosition.Y },
+        };
+        
+        string id = GetMeta("SaveID").AsString();
+        SavegameService.AppendDataToSave( id, payloadData);
+    }
+
+    /// <summary>
+    /// Loads duck position.
+    /// </summary>
+    public void LoadFromSaveData()
+    {
+        string id = GetMeta("SaveID").AsString(); 
+        
+        Dictionary<string, Variant> save = SavegameService.GetSaveData(id);
+        if (save.Count > 0)
+        {
+            float xPos = 0;
+            float yPos = 0;
+            if (save.TryGetValue("globalPositionX", out Variant xPosVar))
+            {
+                xPos = xPosVar.AsSingle();
+            }
+            
+            if (save.TryGetValue("globalPositionY", out Variant yPosVar))
+            {
+                yPos = yPosVar.AsSingle();
+            }
+
+            GlobalPosition = new Vector2(xPos, yPos);
+        }
+    }
+    
+    #endregion
 }
@@ -56,7 +56,7 @@ public static class NodeExtension
        /// <param name="node"></param>
        /// <typeparam name="T"></typeparam>
        /// <returns></returns>
-        public static T GetComponent<T>(Node node)
+        public static T? GetComponent<T>(Node node)
        {
            if (node is T)
            {
@@ -0,0 +1,68 @@
+using Babushka.scripts.CSharp.Common.Savegame;
+using Godot;
+using Godot.Collections;
+
+namespace Babushka.scripts.CSharp.Low_Code.Variables;
+
+public partial class SaveableVariableNode : VariableNode, ISaveable
+{
+    [Export] private bool _debug;
+
+    [Signal]
+    public delegate void OnLoadingCompleteEventHandler();
+
+    public override void _EnterTree()
+    {
+        LoadFromSaveData();
+        ValueChanged += UpdateSaveData;
+        SavegameService.OnSaveGameReset += SaveGameReset;
+    }
+
+    private void SaveGameReset()
+    {
+        Payload = default;
+        GD.Print($"Saveable Variable reset to {Payload}");
+    }
+
+    public override void _ExitTree()
+    {
+        ValueChanged -= UpdateSaveData;
+        SavegameService.OnSaveGameReset -= SaveGameReset;
+    }
+
+    public void UpdateSaveData()
+    {
+        var payloadData = new Dictionary<string, Variant>
+        {
+            { "payload", Payload },
+        };
+        
+        string id = GetMeta("SaveID").AsString();
+        SavegameService.AppendDataToSave( id, payloadData);
+    }
+
+    public void LoadFromSaveData()
+    {
+        string id = GetMeta("SaveID").AsString(); 
+        Dictionary<string, Variant> save = SavegameService.GetSaveData(id);
+        if (save.Count > 0)
+        {
+            if (Payload.VariantType == Variant.Type.Int)
+            {
+                Payload = save["payload"].AsInt32();
+                
+            }
+            else
+            {
+                Payload = save["payload"];
+            }
+
+            if (_debug)
+            {
+                GD.Print($"SaveableVariable {Name} loaded payload: {Payload}.");
+            }
+        }
+
+        EmitSignal(SignalName.OnLoadingComplete);
+    }
+}
@@ -0,0 +1 @@
+uid://d27xoo1reo5gu
@@ -7,5 +7,23 @@ namespace Babushka.scripts.CSharp.Low_Code.Variables;
 /// </summary>
 public partial class VariableNode : Node
 {
-    [Export] public Variant Payload { get; set; }
+    [Export] public Variant Payload
+    {
+        get
+        {
+            return _payload;
+        }
+        set
+        {
+            if (_payload.Equals(value))
+                return; 
+                
+            _payload = value;
+            EmitSignal(SignalName.ValueChanged);
+        } 
+    }
+
+    private Variant _payload;
+
+    [Signal] public delegate void ValueChangedEventHandler();
 }
Author	SHA1	Message	Date
kziolkowski	b7d1f9d8d5	Merge branch 'develop' into minigame_hit_feedback	2025-12-06 19:54:05 +01:00
kziolkowski	12bf632932	Merge pull request 'Added randomnes into attack minigame' (#36 ) from minigame_variation into develop Reviewed-on: #36 Reviewed-by: kziolkowski <katharina.ziolkowski@gmail.com>	2025-12-06 19:53:49 +01:00
kziolkowski	0d985e5bf6	Merge branch 'develop' into minigame_variation	2025-12-06 19:53:44 +01:00
kziolkowski	e86b3e81dd	Merge pull request 'fighting minigame has no more Overlap with Vesna' (#38 ) from fighting_minigame_fix_overlap_with_Vesna into develop Reviewed-on: #38 Reviewed-by: kziolkowski <katharina.ziolkowski@gmail.com>	2025-12-06 19:46:23 +01:00
jlink	14a73daa75	fighting minigame has no more Overlap with Vesna	2025-12-06 12:15:31 +01:00
kziolkowski	1dd4a694d0	Merge pull request 'feature/day_and_night' (#34 ) from feature/day_and_night into develop Reviewed-on: #34	2025-12-04 22:34:17 +01:00
kziolkowski	9b8933e698	♻️ removed no longer used method	2025-12-04 22:33:45 +01:00
kziolkowski	9f4cda0e6d	♻️ Replaced _ready mit _entertree (while deferring)	2025-12-04 22:22:40 +01:00
kziolkowski	1c865730a3	🚚 renamed directory	2025-12-04 22:05:33 +01:00
jonathan	aa4f1c55b5	✨Added visual feedback when hitting a region in the minigame	2025-12-04 21:18:47 +01:00
jonathan	aad6c44567	Added randomnes into attack minigame	2025-12-04 18:00:20 +01:00
jlink	8e9359d6f8	Merge pull request 'fight log no longer visible and door interactable' (#35 ) from remove_fightlog into develop Reviewed-on: #35	2025-12-04 17:39:10 +01:00
jlink	7696271727	fight log no longer visible and door interactable	2025-12-04 17:31:31 +01:00
kziolkowski	229dd04bc1	✨ Made bed interaction count up the days and verified that you can now play a full loop	2025-12-03 18:55:45 +01:00
kziolkowski	8407ce4c1f	✨ Added Tab button mapping to inventory and fixed label descriptor	2025-12-03 18:18:54 +01:00
kziolkowski	b9a52dadcc	✨ fields can now seperate "today" from any other day	2025-12-03 17:56:45 +01:00
kziolkowski	0ecae5a4d9	✨ watering can fillstate is saving and loading	2025-12-03 17:04:38 +01:00
kziolkowski	c288af296c	✨ made plants only grow when watered	2025-12-02 17:44:44 +01:00
kziolkowski	e65330786e	🐛 fixed dayplanted confusion on plants	2025-12-02 15:45:44 +01:00
kziolkowski	c7a4aea70b	✨ Starting a new game resets the inventory now	2025-12-02 12:08:19 +01:00
kziolkowski	b6caf4dbed	🐛 Fixed ObjectDisposedException Errors on plant/field and InventorySlot	2025-12-02 11:42:48 +01:00
kziolkowski	51a145a994	🚚 renamed player prefab to Vesna	2025-12-02 11:41:48 +01:00
kziolkowski	41b30a4274	🚧 days are counted, plants know which day it is, but harvestables are still broken	2025-11-28 20:25:47 +01:00
kziolkowski	a1fb71119f	🚧 WIP binding the plant growth to the day count in the savefile	2025-11-26 20:12:27 +01:00
kziolkowski	67d5b67c21	💄 Added new game button that resets the savegame (also did some layouting)	2025-11-26 18:52:33 +01:00
kziolkowski	684131f495	✨ Make SaveableVariableNodes and a simple cheat to count up days	2025-11-26 18:00:45 +01:00
kziolkowski	f32033cb5f	Merge pull request 'Made the fight world completable' (#33 ) from feature/night_to_day into develop Reviewed-on: #33	2025-11-26 15:11:13 +01:00
kziolkowski	1ad463ccb0	🔥 removed unused code	2025-11-26 14:43:55 +01:00
kziolkowski	451ea82706	Merge pull request 'feature/save_and_loaaaaaad' (#32 ) from feature/save_and_loaaaaaad into develop Reviewed-on: #32	2025-11-26 14:41:29 +01:00
kziolkowski	75e4bdd7fd	♻️ removed Print statements	2025-11-25 17:20:58 +01:00
kziolkowski	f37f7c7ceb	✨ added saving and loading support to collectable inventory items	2025-11-25 17:14:30 +01:00
kziolkowski	70383fc16e	✨ Implemented load check for unique inventory items	2025-11-25 17:00:50 +01:00
kziolkowski	88f3c90eec	♻️ inventory works	2025-11-25 16:13:17 +01:00
kziolkowski	9d818e5079	♻️ refactored field code to work with the new id system	2025-11-25 15:29:36 +01:00
kziolkowski	e9cd4ce276	♻️ reworked and debugged the SaveSystem. Removed unnecessary scene reference.	2025-11-25 14:39:31 +01:00
kziolkowski	638ebaff46	📝 Added documentation	2025-11-25 13:46:46 +01:00
kziolkowski	b4013b1ff2	:feature: made GetComponent nullable in NodeExtension	2025-11-25 13:34:22 +01:00
kziolkowski	c695115a4a	:feature: implemented saving and loading for ducks, 🔥 removed save implementation from interactionArea	2025-11-25 13:33:53 +01:00
kziolkowski	c68727aebe	🚧 intermediate state with homework	2025-11-23 22:50:32 +01:00
kziolkowski	bee6249c6f	🚧 implemented interaction area loading	2025-11-23 22:25:59 +01:00
kziolkowski	fda2b95b38	Savesystem rework	2025-11-23 21:02:40 +01:00
kziolkowski	4bbaab1a2a	Created ISaveable interface and made existing saveable classes inherit from it.	2025-11-23 20:10:42 +01:00
kziolkowski	4ed6f4e7d9	Reworked existing save system for user data: Made path steam-compatible, added Versioning and try/catch to save	2025-11-21 21:04:37 +01:00
kziolkowski	ce29711614	❇️ Added Settings classes to save and load local configurations	2025-11-21 20:33:52 +01:00
kziolkowski	2947011a1a	working intermediate state of the save system	2025-11-21 17:27:46 +01:00
kziolkowski	2a4425b9db	✨ Added Save and load support to the inventory	2025-11-19 15:18:33 +01:00
kziolkowski	72079044bd	🚧 WIP implementing save and load for the inventory	2025-11-18 18:30:17 +01:00