added quick and dirty mock quest

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

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

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

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

dialog/Characters/vesna.dch

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

prefabs/entity_system/entity_manager.tscn

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

project.godot

@@ -11,7 +11,7 @@ config_version=5
 [application]
 
 config/name="Babushka"
-run/main_scene="uid://bopv10dqm1knc"
+run/main_scene="uid://66pmq4efjip8"
 config/features=PackedStringArray("4.5", "C#", "Forward Plus")
 run/max_fps=120
 boot_splash/fullsize=false
@@ -25,7 +25,7 @@ buses/default_bus_layout="uid://b6dwkmkyb0axk"
 
 [autoload]
 
-SceneTransition="*res://prefabs/UI/SceneTransition.tscn"
+SceneTransition="*res://scenes/SceneTransition.tscn"
 Dialogic="*res://addons/dialogic/Core/DialogicGameHandler.gd"
 InventoryManager="*res://scripts/CSharp/Common/Inventory/InventoryManager.cs"
 InputService="*res://scripts/CSharp/Common/Services/InputService.cs"
@@ -35,7 +35,6 @@ FightWorldAutoload="*res://prefabs/fight/fight_world_autoload.tscn"
 SaveGameManager="*res://scripts/CSharp/Common/Savegame/SaveGameManager.cs"
 SettingsSaveController="*res://scripts/CSharp/Common/Savegame/SettingsSaveController.cs"
 DayAndNight="*res://prefabs/day_and_night/day_and_night.tscn"
-EntityManager="*res://prefabs/entity_system/entity_manager.tscn"
 
 [dialogic]
 
@@ -189,6 +188,8 @@ directories/tres_directory={
 
 window/size/viewport_width=1920
 window/size/viewport_height=1080
+window/size/window_width_override=1200
+window/size/window_height_override=720
 window/stretch/mode="viewport"
 window/stretch/aspect="keep_height"
 
@@ -222,10 +223,6 @@ folder_colors={
 "res://shader/": "pink"
 }
 
-[filesystem]
-
-import/blender/enabled=false
-
 [global_group]
 
 Saveable=""
@@ -312,16 +309,6 @@ NextDayCheat={
 "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":32,"key_label":0,"unicode":32,"location":0,"echo":false,"script":null)
 ]
 }
-DebugEntities={
-"deadzone": 0.2,
-"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":66,"key_label":0,"unicode":98,"location":0,"echo":false,"script":null)
-]
-}
-SaveGame={
-"deadzone": 0.2,
-"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194336,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
-]
-}
 
 [internationalization]
 

scenes/entity_scenes/farm_outside.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=122 format=3 uid="uid://66pmq4efjip8"]
+[gd_scene load_steps=119 format=3 uid="uid://66pmq4efjip8"]
 
 [ext_resource type="Script" uid="uid://cssdu8viimwm6" path="res://scripts/CSharp/Common/SceneTransition.cs" id="1_o8nii"]
 [ext_resource type="Script" uid="uid://bqomwxclsbhd3" path="res://scripts/CSharp/Common/Camera/CameraController.cs" id="2_mnal7"]
@@ -80,9 +80,6 @@
 [ext_resource type="Resource" uid="uid://tt3d166mntmi" path="res://resources/low code/farming/var_sceneNameProvider.tres" id="78_wugdx"]
 [ext_resource type="Script" uid="uid://iquhbkr7pqeg" path="res://scripts/CSharp/Common/Savegame/SaveCheats.cs" id="79_tx4bp"]
 [ext_resource type="Script" uid="uid://ca4s0algeij1h" path="res://scripts/CSharp/Common/Savegame/SaveIDProviderTool.cs" id="80_tj68g"]
-[ext_resource type="Script" uid="uid://ca1pg6k3gn47y" path="res://scripts/CSharp/GameEntity/Management/EntitySceneContainer.cs" id="81_f57uc"]
-[ext_resource type="Script" uid="uid://bilg7e33usxuv" path="res://scripts/CSharp/GameEntity/EntityPlacer/TrashEntityPlacer.cs" id="82_ec5sc"]
-[ext_resource type="Texture2D" uid="uid://b2smanpdo1y5e" path="res://art/babushka_project.png" id="83_50rxh"]
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_wtdui"]
 resource_local_to_scene = true
@@ -237,6 +234,10 @@ shader_parameter/contrast_mult = 1.0
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_ycj14"]
 size = Vector2(707.116, 604.111)
 
+[sub_resource type="CircleShape2D" id="CircleShape2D_l7ekk"]
+resource_local_to_scene = true
+radius = 339.17
+
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_uxa2m"]
 shader = ExtResource("16_uvisc")
 shader_parameter/hue_shift = 0.0
@@ -245,10 +246,6 @@ shader_parameter/value_mult = 1.0
 shader_parameter/brightness_add = 0.0
 shader_parameter/contrast_mult = 1.0
 
-[sub_resource type="CircleShape2D" id="CircleShape2D_l7ekk"]
-resource_local_to_scene = true
-radius = 339.17
-
 [sub_resource type="AudioStreamPlaylist" id="AudioStreamPlaylist_ceriq"]
 loop = false
 stream_count = 1
@@ -282,7 +279,7 @@ metadata/_custom_type_script = "uid://be54lnb6gg81f"
 
 [node name="BabushkaSceneFarmOutside2d" type="Node2D"]
 script = ExtResource("1_o8nii")
-_sceneNamesToLoad = PackedStringArray("res://scenes/Babushka_scene_indoor_common_room.tscn", "res://scenes/entity_scenes/outside_beets.tscn")
+_sceneNamesToLoad = PackedStringArray("res://scenes/Babushka_scene_indoor_common_room.tscn", "res://scenes/Babushka_scene_outside_beets.tscn")
 
 [node name="Camera2D" type="Camera2D" parent="." node_paths=PackedStringArray("_followNode")]
 position = Vector2(3180, 1961)
@@ -1032,6 +1029,7 @@ shape = SubResource("CircleShape2D_tm0yg")
 
 [node name="SeedPickup" parent="YSorted" instance=ExtResource("32_e5cox")]
 position = Vector2(9927, 2257)
+_finiteSupply = 3
 metadata/SaveID = "e1bbe13f-0622-42b8-97f3-87a8af369dc0"
 
 [node name="SpawnWithItem" parent="YSorted/SeedPickup" index="0"]
@@ -1048,6 +1046,7 @@ scale = Vector2(1, 1)
 
 [node name="BeetPickup" parent="YSorted" instance=ExtResource("32_e5cox")]
 position = Vector2(5787, 2269)
+_finiteSupply = 3
 metadata/SaveID = "e1bbe13f-0622-42b8-97f3-87a8af369dc0"
 
 [node name="SpawnWithItem" parent="YSorted/BeetPickup" index="0"]
@@ -1065,6 +1064,7 @@ scale = Vector2(1, 1)
 
 [node name="SeedPickup2" parent="YSorted" instance=ExtResource("32_e5cox")]
 position = Vector2(10705, 2257)
+_finiteSupply = 3
 metadata/SaveID = "77972c50-63a7-461a-bc7d-6fa46333bc5c"
 
 [node name="SpawnWithItem" parent="YSorted/SeedPickup2" index="0"]
@@ -2209,33 +2209,30 @@ collision_mask = 4
 position = Vector2(-106.663, 182.891)
 shape = SubResource("RectangleShape2D_ycj14")
 
-[node name="Fence Door" type="Sprite2D" parent="YSorted/Blocker"]
+[node name="InteractionArea" parent="YSorted/Blocker" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("31_3tf35")]
-material = SubResource("ShaderMaterial_uxa2m")
+position = Vector2(11234, 1850)
-position = Vector2(11235, 1579)
+_spritesToOutline = [NodePath("Fence Door")]
-rotation = -3.13727
-scale = Vector2(0.9049999, -0.925)
-texture = ExtResource("49_l3u1d")
-
-[node name="StaticBody2D" type="StaticBody2D" parent="YSorted/Blocker/Fence Door"]
-collision_layer = 2
-collision_mask = 4
-
-[node name="CollisionShape2D" type="CollisionShape2D" parent="YSorted/Blocker/Fence Door/StaticBody2D"]
-position = Vector2(-113.561, 193.035)
-shape = SubResource("RectangleShape2D_2vojv")
-
-[node name="InteractionArea" parent="YSorted/Blocker/Fence Door" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("31_3tf35")]
-position = Vector2(-0.18847656, 292.97498)
-rotation = -3.1373634
-scale = Vector2(1.1049721, -1.0810815)
-skew = 0.00018894672
-_spritesToOutline = [NodePath("..")]
 _id = 1
 metadata/SaveID = "6ee77256-42af-49c9-a3f2-cf167853f6fb"
 
-[node name="CollisionShape3D" parent="YSorted/Blocker/Fence Door/InteractionArea/Area2D" index="0"]
+[node name="CollisionShape3D" parent="YSorted/Blocker/InteractionArea/Area2D" index="0"]
 shape = SubResource("CircleShape2D_l7ekk")
 
+[node name="Fence Door" type="Sprite2D" parent="YSorted/Blocker/InteractionArea"]
+material = SubResource("ShaderMaterial_uxa2m")
+position = Vector2(1, -271)
+rotation = -3.13727
+scale = Vector2(0.905, -0.925)
+texture = ExtResource("49_l3u1d")
+
+[node name="StaticBody2D" type="StaticBody2D" parent="YSorted/Blocker/InteractionArea/Fence Door"]
+collision_layer = 2
+collision_mask = 4
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="YSorted/Blocker/InteractionArea/Fence Door/StaticBody2D"]
+position = Vector2(-113.561, 193.035)
+shape = SubResource("RectangleShape2D_2vojv")
+
 [node name="ducks" type="Node2D" parent="YSorted"]
 z_index = 1
 y_sort_enabled = true
@@ -2524,34 +2521,6 @@ script = ExtResource("79_tx4bp")
 [node name="SaveIDProvider" type="Node" parent="SaveSystem"]
 script = ExtResource("80_tj68g")
 
-[node name="EntityContainer" type="Node2D" parent="."]
-script = ExtResource("81_f57uc")
-sceneName = "farm_outside"
-
-[node name="TrashPlacer" type="Node2D" parent="."]
-position = Vector2(10385, 2851)
-script = ExtResource("82_ec5sc")
-
-[node name="icon" type="Sprite2D" parent="TrashPlacer"]
-visible = false
-texture = ExtResource("83_50rxh")
-
-[node name="TrashPlacer2" type="Node2D" parent="."]
-position = Vector2(10825, 3362)
-script = ExtResource("82_ec5sc")
-
-[node name="icon" type="Sprite2D" parent="TrashPlacer2"]
-visible = false
-texture = ExtResource("83_50rxh")
-
-[node name="TrashPlacer3" type="Node2D" parent="."]
-position = Vector2(10825, 3362)
-script = ExtResource("82_ec5sc")
-
-[node name="icon" type="Sprite2D" parent="TrashPlacer3"]
-visible = false
-texture = ExtResource("83_50rxh")
-
 [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"]
@@ -2560,7 +2529,7 @@ texture = ExtResource("83_50rxh")
 [connection signal="SuccessfulPickUp" from="YSorted/BeetPickup" to="YSorted/Vesna" method="HandlePickUp"]
 [connection signal="SuccessfulPickUp" from="YSorted/SeedPickup2" to="YSorted/Vesna" method="HandlePickUp"]
 [connection signal="InteractedTool" from="YSorted/Farm visuals/Static/EnterHouseInteraction" to="." method="LoadSceneAtIndex"]
-[connection signal="InteractedTool" from="YSorted/Blocker/Fence Door/InteractionArea" to="." method="LoadSceneAtIndex"]
+[connection signal="InteractedTool" from="YSorted/Blocker/InteractionArea" to="." method="LoadSceneAtIndex"]
 [connection signal="GoalReached" from="YSorted/ducks" to="YSorted/ducks/DialogicToggle" method="ToggleDialogue"]
 [connection signal="DuckCollected" from="YSorted/ducks/Duck2" to="YSorted/ducks" method="Increment"]
 [connection signal="DuckCollected" from="YSorted/ducks/Duck3" to="YSorted/ducks" method="Increment"]
@@ -2586,7 +2555,7 @@ texture = ExtResource("83_50rxh")
 [editable path="YSorted/BeetPickup/PickupInteractionArea"]
 [editable path="YSorted/SeedPickup2"]
 [editable path="YSorted/SeedPickup2/PickupInteractionArea"]
-[editable path="YSorted/Blocker/Fence Door/InteractionArea"]
+[editable path="YSorted/Blocker/InteractionArea"]
 [editable path="YSorted/trash/trashObject2"]
 [editable path="YSorted/trash/trashObject3"]
 [editable path="YSorted/trash/trashObject4"]

scenes/scene_credits.tscn

@@ -1,445 +0,0 @@
-[gd_scene load_steps=9 format=3 uid="uid://b4uito2bnud2a"]
-
-[ext_resource type="Script" uid="uid://cssdu8viimwm6" path="res://scripts/CSharp/Common/SceneTransition.cs" id="1_f5860"]
-[ext_resource type="Texture2D" uid="uid://c7atj6ohlmir3" path="res://art/ui/StartScreen/titlescreen.png" id="1_kesja"]
-[ext_resource type="Texture2D" uid="uid://du612t3xytly3" path="res://art/ui/StartScreen/babushkalog_white.png" id="2_f5860"]
-[ext_resource type="Texture2D" uid="uid://cfrhmcyhs2i53" path="res://art/ui/UI/WhiteWashBackground.png" id="3_dvwtm"]
-[ext_resource type="Texture2D" uid="uid://deitc84w2byyh" path="res://art/ui/nametag.png" id="4_a8kc7"]
-[ext_resource type="FontFile" uid="uid://bgmdn7uo215q2" path="res://art/fonts/RuslanDisplay-Regular.ttf" id="5_gsl3s"]
-[ext_resource type="Texture2D" uid="uid://blbplxfx41f8t" path="res://art/logos/Cozy Raven Logo breit.svg" id="6_l0rmr"]
-[ext_resource type="Texture2D" uid="uid://cwbv2i8ntq15d" path="res://art/logos/FS_Logo_2zeilig_rot.png" id="7_03xwf"]
-
-[node name="BabushkaSceneCredits" type="Node2D"]
-script = ExtResource("1_f5860")
-_sceneNamesToLoad = PackedStringArray("res://scenes/scene_bootstrap.tscn")
-
-[node name="Sprite2D" type="Sprite2D" parent="."]
-position = Vector2(1030, 483)
-scale = Vector2(0.535648, 0.535648)
-texture = ExtResource("1_kesja")
-
-[node name="BabushkaText" type="Sprite2D" parent="."]
-position = Vector2(1387, 129)
-scale = Vector2(0.349074, 0.349074)
-texture = ExtResource("2_f5860")
-
-[node name="WhiteWash" type="Sprite2D" parent="."]
-modulate = Color(1, 1, 1, 0.0509804)
-position = Vector2(1019, 930)
-scale = Vector2(13.1172, 4.47852)
-texture = ExtResource("3_dvwtm")
-
-[node name="Node2D10" type="Node2D" parent="."]
-position = Vector2(-18, 4)
-scale = Vector2(0.93, 0.93)
-
-[node name="Node2D2" type="Node2D" parent="Node2D10"]
-position = Vector2(39, -100)
-scale = Vector2(0.5, 0.5)
-
-[node name="Nametag2" type="Sprite2D" parent="Node2D10/Node2D2"]
-position = Vector2(596.045, 303)
-scale = Vector2(0.636364, 0.636364)
-texture = ExtResource("4_a8kc7")
-
-[node name="Label2" type="Label" parent="Node2D10/Node2D2"]
-offset_left = 296.0
-offset_top = 250.0
-offset_right = 898.0
-offset_bottom = 377.0
-theme_override_colors/font_color = Color(1, 1, 1, 1)
-theme_override_constants/shadow_offset_x = 0
-theme_override_constants/shadow_offset_y = 0
-theme_override_fonts/font = ExtResource("5_gsl3s")
-theme_override_font_sizes/font_size = 56
-text = "Producer"
-horizontal_alignment = 1
-vertical_alignment = 1
-
-[node name="Nametag" type="Sprite2D" parent="Node2D10/Node2D2"]
-position = Vector2(595, 408)
-texture = ExtResource("4_a8kc7")
-
-[node name="Label" type="Label" parent="Node2D10/Node2D2"]
-offset_left = 124.0
-offset_top = 359.0
-offset_right = 1072.0
-offset_bottom = 486.0
-theme_override_colors/font_color = Color(1, 1, 1, 1)
-theme_override_constants/shadow_offset_x = 0
-theme_override_constants/shadow_offset_y = 0
-theme_override_fonts/font = ExtResource("5_gsl3s")
-theme_override_font_sizes/font_size = 80
-text = "Kathi"
-horizontal_alignment = 1
-vertical_alignment = 1
-
-[node name="Node2D" type="Node2D" parent="Node2D10"]
-position = Vector2(39, 15)
-scale = Vector2(0.5, 0.5)
-
-[node name="Nametag2" type="Sprite2D" parent="Node2D10/Node2D"]
-position = Vector2(596.045, 303)
-scale = Vector2(0.636364, 0.636364)
-texture = ExtResource("4_a8kc7")
-
-[node name="Label2" type="Label" parent="Node2D10/Node2D"]
-offset_left = 295.0
-offset_top = 250.0
-offset_right = 897.0
-offset_bottom = 377.0
-theme_override_colors/font_color = Color(1, 1, 1, 1)
-theme_override_constants/shadow_offset_x = 0
-theme_override_constants/shadow_offset_y = 0
-theme_override_fonts/font = ExtResource("5_gsl3s")
-theme_override_font_sizes/font_size = 56
-text = "Programming"
-horizontal_alignment = 1
-vertical_alignment = 1
-
-[node name="Nametag" type="Sprite2D" parent="Node2D10/Node2D"]
-position = Vector2(595, 408)
-texture = ExtResource("4_a8kc7")
-
-[node name="Label" type="Label" parent="Node2D10/Node2D"]
-offset_left = 124.0
-offset_top = 359.0
-offset_right = 1072.0
-offset_bottom = 486.0
-theme_override_colors/font_color = Color(1, 1, 1, 1)
-theme_override_constants/shadow_offset_x = 0
-theme_override_constants/shadow_offset_y = 0
-theme_override_fonts/font = ExtResource("5_gsl3s")
-theme_override_font_sizes/font_size = 80
-text = "Jonathan"
-horizontal_alignment = 1
-vertical_alignment = 1
-
-[node name="Node2D3" type="Node2D" parent="Node2D10"]
-position = Vector2(35, 130)
-scale = Vector2(0.5, 0.5)
-
-[node name="Nametag2" type="Sprite2D" parent="Node2D10/Node2D3"]
-position = Vector2(596.045, 303)
-scale = Vector2(0.636364, 0.636364)
-texture = ExtResource("4_a8kc7")
-
-[node name="Label2" type="Label" parent="Node2D10/Node2D3"]
-offset_left = 295.0
-offset_top = 250.0
-offset_right = 897.0
-offset_bottom = 377.0
-theme_override_colors/font_color = Color(1, 1, 1, 1)
-theme_override_constants/shadow_offset_x = 0
-theme_override_constants/shadow_offset_y = 0
-theme_override_fonts/font = ExtResource("5_gsl3s")
-theme_override_font_sizes/font_size = 56
-text = "Sound Design"
-horizontal_alignment = 1
-vertical_alignment = 1
-
-[node name="Nametag" type="Sprite2D" parent="Node2D10/Node2D3"]
-position = Vector2(595, 408)
-texture = ExtResource("4_a8kc7")
-
-[node name="Label" type="Label" parent="Node2D10/Node2D3"]
-offset_left = 124.0
-offset_top = 359.0
-offset_right = 1072.0
-offset_bottom = 486.0
-theme_override_colors/font_color = Color(1, 1, 1, 1)
-theme_override_constants/shadow_offset_x = 0
-theme_override_constants/shadow_offset_y = 0
-theme_override_fonts/font = ExtResource("5_gsl3s")
-theme_override_font_sizes/font_size = 80
-text = "Laura"
-horizontal_alignment = 1
-vertical_alignment = 1
-
-[node name="Node2D4" type="Node2D" parent="Node2D10"]
-position = Vector2(35, 244)
-scale = Vector2(0.5, 0.5)
-
-[node name="Nametag2" type="Sprite2D" parent="Node2D10/Node2D4"]
-position = Vector2(596.045, 303)
-scale = Vector2(0.636364, 0.636364)
-texture = ExtResource("4_a8kc7")
-
-[node name="Label2" type="Label" parent="Node2D10/Node2D4"]
-offset_left = 295.0
-offset_top = 250.0
-offset_right = 897.0
-offset_bottom = 377.0
-theme_override_colors/font_color = Color(1, 1, 1, 1)
-theme_override_constants/shadow_offset_x = 0
-theme_override_constants/shadow_offset_y = 0
-theme_override_fonts/font = ExtResource("5_gsl3s")
-theme_override_font_sizes/font_size = 56
-text = "Project Manager"
-horizontal_alignment = 1
-vertical_alignment = 1
-
-[node name="Nametag" type="Sprite2D" parent="Node2D10/Node2D4"]
-position = Vector2(595, 408)
-texture = ExtResource("4_a8kc7")
-
-[node name="Label" type="Label" parent="Node2D10/Node2D4"]
-offset_left = 124.0
-offset_top = 359.0
-offset_right = 1072.0
-offset_bottom = 486.0
-theme_override_colors/font_color = Color(1, 1, 1, 1)
-theme_override_constants/shadow_offset_x = 0
-theme_override_constants/shadow_offset_y = 0
-theme_override_fonts/font = ExtResource("5_gsl3s")
-theme_override_font_sizes/font_size = 80
-text = "Anna"
-horizontal_alignment = 1
-vertical_alignment = 1
-
-[node name="Node2D5" type="Node2D" parent="Node2D10"]
-position = Vector2(35, 356)
-scale = Vector2(0.5, 0.5)
-
-[node name="Nametag2" type="Sprite2D" parent="Node2D10/Node2D5"]
-position = Vector2(596.045, 303)
-scale = Vector2(0.636364, 0.636364)
-texture = ExtResource("4_a8kc7")
-
-[node name="Label2" type="Label" parent="Node2D10/Node2D5"]
-offset_left = 295.0
-offset_top = 250.0
-offset_right = 897.0
-offset_bottom = 377.0
-theme_override_colors/font_color = Color(1, 1, 1, 1)
-theme_override_constants/shadow_offset_x = 0
-theme_override_constants/shadow_offset_y = 0
-theme_override_fonts/font = ExtResource("5_gsl3s")
-theme_override_font_sizes/font_size = 56
-text = "Art"
-horizontal_alignment = 1
-vertical_alignment = 1
-
-[node name="Nametag" type="Sprite2D" parent="Node2D10/Node2D5"]
-position = Vector2(595, 408)
-texture = ExtResource("4_a8kc7")
-
-[node name="Label" type="Label" parent="Node2D10/Node2D5"]
-offset_left = 124.0
-offset_top = 359.0
-offset_right = 1072.0
-offset_bottom = 486.0
-theme_override_colors/font_color = Color(1, 1, 1, 1)
-theme_override_constants/shadow_offset_x = 0
-theme_override_constants/shadow_offset_y = 0
-theme_override_fonts/font = ExtResource("5_gsl3s")
-theme_override_font_sizes/font_size = 80
-text = "Alphawolfin"
-horizontal_alignment = 1
-vertical_alignment = 1
-
-[node name="Node2D6" type="Node2D" parent="Node2D10"]
-position = Vector2(35, 581)
-scale = Vector2(0.5, 0.5)
-
-[node name="Nametag2" type="Sprite2D" parent="Node2D10/Node2D6"]
-position = Vector2(596.045, 303)
-scale = Vector2(0.636364, 0.636364)
-texture = ExtResource("4_a8kc7")
-
-[node name="Label2" type="Label" parent="Node2D10/Node2D6"]
-offset_left = 295.0
-offset_top = 250.0
-offset_right = 897.0
-offset_bottom = 377.0
-theme_override_colors/font_color = Color(1, 1, 1, 1)
-theme_override_constants/shadow_offset_x = 0
-theme_override_constants/shadow_offset_y = 0
-theme_override_fonts/font = ExtResource("5_gsl3s")
-theme_override_font_sizes/font_size = 56
-text = "Game Design"
-horizontal_alignment = 1
-vertical_alignment = 1
-
-[node name="Nametag" type="Sprite2D" parent="Node2D10/Node2D6"]
-position = Vector2(595, 408)
-texture = ExtResource("4_a8kc7")
-
-[node name="Label" type="Label" parent="Node2D10/Node2D6"]
-offset_left = 124.0
-offset_top = 359.0
-offset_right = 1072.0
-offset_bottom = 486.0
-theme_override_colors/font_color = Color(1, 1, 1, 1)
-theme_override_constants/shadow_offset_x = 0
-theme_override_constants/shadow_offset_y = 0
-theme_override_fonts/font = ExtResource("5_gsl3s")
-theme_override_font_sizes/font_size = 80
-text = "Max"
-horizontal_alignment = 1
-vertical_alignment = 1
-
-[node name="Node2D7" type="Node2D" parent="Node2D10"]
-position = Vector2(35, 695)
-scale = Vector2(0.5, 0.5)
-
-[node name="Nametag2" type="Sprite2D" parent="Node2D10/Node2D7"]
-position = Vector2(596.045, 303)
-scale = Vector2(0.636364, 0.636364)
-texture = ExtResource("4_a8kc7")
-
-[node name="Label2" type="Label" parent="Node2D10/Node2D7"]
-offset_left = 295.0
-offset_top = 250.0
-offset_right = 897.0
-offset_bottom = 377.0
-theme_override_colors/font_color = Color(1, 1, 1, 1)
-theme_override_constants/shadow_offset_x = 0
-theme_override_constants/shadow_offset_y = 0
-theme_override_fonts/font = ExtResource("5_gsl3s")
-theme_override_font_sizes/font_size = 56
-text = "Writer"
-horizontal_alignment = 1
-vertical_alignment = 1
-
-[node name="Nametag" type="Sprite2D" parent="Node2D10/Node2D7"]
-position = Vector2(595, 408)
-texture = ExtResource("4_a8kc7")
-
-[node name="Label" type="Label" parent="Node2D10/Node2D7"]
-offset_left = 124.0
-offset_top = 359.0
-offset_right = 1072.0
-offset_bottom = 486.0
-theme_override_colors/font_color = Color(1, 1, 1, 1)
-theme_override_constants/shadow_offset_x = 0
-theme_override_constants/shadow_offset_y = 0
-theme_override_fonts/font = ExtResource("5_gsl3s")
-theme_override_font_sizes/font_size = 80
-text = "Sanel"
-horizontal_alignment = 1
-vertical_alignment = 1
-
-[node name="Node2D8" type="Node2D" parent="Node2D10"]
-position = Vector2(35, 469)
-scale = Vector2(0.5, 0.5)
-
-[node name="Nametag2" type="Sprite2D" parent="Node2D10/Node2D8"]
-position = Vector2(596.045, 303)
-scale = Vector2(0.636364, 0.636364)
-texture = ExtResource("4_a8kc7")
-
-[node name="Label2" type="Label" parent="Node2D10/Node2D8"]
-offset_left = 295.0
-offset_top = 250.0
-offset_right = 897.0
-offset_bottom = 377.0
-theme_override_colors/font_color = Color(1, 1, 1, 1)
-theme_override_constants/shadow_offset_x = 0
-theme_override_constants/shadow_offset_y = 0
-theme_override_fonts/font = ExtResource("5_gsl3s")
-theme_override_font_sizes/font_size = 56
-text = "Animation"
-horizontal_alignment = 1
-vertical_alignment = 1
-
-[node name="Nametag" type="Sprite2D" parent="Node2D10/Node2D8"]
-position = Vector2(595, 408)
-texture = ExtResource("4_a8kc7")
-
-[node name="Label" type="Label" parent="Node2D10/Node2D8"]
-offset_left = 124.0
-offset_top = 359.0
-offset_right = 1072.0
-offset_bottom = 486.0
-theme_override_colors/font_color = Color(1, 1, 1, 1)
-theme_override_constants/shadow_offset_x = 0
-theme_override_constants/shadow_offset_y = 0
-theme_override_fonts/font = ExtResource("5_gsl3s")
-theme_override_font_sizes/font_size = 80
-text = "Felix"
-horizontal_alignment = 1
-vertical_alignment = 1
-
-[node name="Node2D9" type="Node2D" parent="Node2D10"]
-position = Vector2(35, 807)
-scale = Vector2(0.5, 0.5)
-
-[node name="Nametag2" type="Sprite2D" parent="Node2D10/Node2D9"]
-position = Vector2(596.045, 303)
-scale = Vector2(0.636364, 0.636364)
-texture = ExtResource("4_a8kc7")
-
-[node name="Label2" type="Label" parent="Node2D10/Node2D9"]
-offset_left = 295.0
-offset_top = 250.0
-offset_right = 897.0
-offset_bottom = 377.0
-theme_override_colors/font_color = Color(1, 1, 1, 1)
-theme_override_constants/shadow_offset_x = 0
-theme_override_constants/shadow_offset_y = 0
-theme_override_fonts/font = ExtResource("5_gsl3s")
-theme_override_font_sizes/font_size = 56
-text = "Music"
-horizontal_alignment = 1
-vertical_alignment = 1
-
-[node name="Nametag3" type="Sprite2D" parent="Node2D10/Node2D9"]
-position = Vector2(3726.91, 187.387)
-scale = Vector2(0.636364, 0.636364)
-texture = ExtResource("4_a8kc7")
-
-[node name="Label3" type="Label" parent="Node2D10/Node2D9"]
-offset_left = 3425.86
-offset_top = 134.387
-offset_right = 4027.86
-offset_bottom = 261.387
-theme_override_colors/font_color = Color(1, 1, 1, 1)
-theme_override_constants/shadow_offset_x = 0
-theme_override_constants/shadow_offset_y = 0
-theme_override_fonts/font = ExtResource("5_gsl3s")
-theme_override_font_sizes/font_size = 56
-text = "Gefördert durch"
-horizontal_alignment = 1
-vertical_alignment = 1
-
-[node name="Nametag" type="Sprite2D" parent="Node2D10/Node2D9"]
-position = Vector2(595, 408)
-texture = ExtResource("4_a8kc7")
-
-[node name="Label" type="Label" parent="Node2D10/Node2D9"]
-offset_left = 124.0
-offset_top = 359.0
-offset_right = 1072.0
-offset_bottom = 486.0
-theme_override_colors/font_color = Color(1, 1, 1, 1)
-theme_override_constants/shadow_offset_x = 0
-theme_override_constants/shadow_offset_y = 0
-theme_override_fonts/font = ExtResource("5_gsl3s")
-theme_override_font_sizes/font_size = 80
-text = "Felix"
-horizontal_alignment = 1
-vertical_alignment = 1
-
-[node name="CozyRavenLogoBreit" type="Sprite2D" parent="."]
-position = Vector2(1044.13, 876.875)
-scale = Vector2(0.150709, 0.150709)
-texture = ExtResource("6_l0rmr")
-
-[node name="fums Logo" type="Sprite2D" parent="."]
-position = Vector2(1751, 917)
-scale = Vector2(0.496692, 0.496693)
-texture = ExtResource("7_03xwf")
-
-[node name="CanvasLayer" type="CanvasLayer" parent="."]
-
-[node name="Button" type="Button" parent="CanvasLayer"]
-anchors_preset = 1
-anchor_left = 1.0
-anchor_right = 1.0
-offset_left = -75.0
-offset_bottom = 71.0
-grow_horizontal = 0
-alignment = 2
-
-[connection signal="pressed" from="CanvasLayer/Button" to="." method="LoadScene"]

scenes/scene_indoor_vesnas_room.tscn

@@ -1,172 +0,0 @@
-[gd_scene load_steps=19 format=3 uid="uid://botol7aqw81n7"]
-
-[ext_resource type="Script" uid="uid://cssdu8viimwm6" path="res://scripts/CSharp/Common/SceneTransition.cs" id="1_c6eln"]
-[ext_resource type="Texture2D" uid="uid://cugtxcfuds31r" path="res://art/indoor/Babushka_bg_01.png" id="2_j25a2"]
-[ext_resource type="Script" uid="uid://cldtt4atgymm5" path="res://scripts/CSharp/Common/Quest/QuestTrigger.cs" id="8_j25a2"]
-[ext_resource type="PackedScene" uid="uid://cqc72e4hq6bcd" path="res://prefabs/interactions/interaction_area_2d.tscn" id="8_phqdf"]
-[ext_resource type="Resource" uid="uid://csj15gnlx1jmx" path="res://resources/quests/demo/8_goto_bed.tres" id="9_heyef"]
-[ext_resource type="Texture2D" path="res://art/indoor/vesna_indoor_bed.png" id="10_hryl5"]
-[ext_resource type="Script" uid="uid://puw74w6lmcvl" path="res://scripts/CSharp/Common/Fight/NightStarter.cs" id="10_j25a2"]
-[ext_resource type="Texture2D" path="res://art/indoor/vesna_indoor_door.png" id="11_axs81"]
-[ext_resource type="Script" uid="uid://jg4jryfus3bw" path="res://scripts/CSharp/Common/DayAndNight/DayAndNightHelper.cs" id="11_heyef"]
-[ext_resource type="Texture2D" uid="uid://cop1vjvhwlsec" path="res://art/indoor/room export/Room_01_shelf.png" id="13_11fdt"]
-[ext_resource type="Texture2D" uid="uid://bleimj6jr1jka" path="res://art/general/rectangle.png" id="14_axs81"]
-[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"]
-
-[sub_resource type="RectangleShape2D" id="RectangleShape2D_l0jrn"]
-resource_local_to_scene = true
-size = Vector2(3836, 1086)
-
-[sub_resource type="RectangleShape2D" id="RectangleShape2D_2spkc"]
-size = Vector2(238.25, 189.75)
-
-[sub_resource type="CircleShape2D" id="CircleShape2D_phqdf"]
-resource_local_to_scene = true
-radius = 381.93
-
-[sub_resource type="CircleShape2D" id="CircleShape2D_2spkc"]
-resource_local_to_scene = true
-radius = 509.071
-
-[node name="VesnasRoom" type="Node2D"]
-y_sort_enabled = true
-script = ExtResource("1_c6eln")
-_sceneNamesToLoad = PackedStringArray("res://scenes/scene_indoor_common_room.tscn", "res://scenes/scene_fight_world_room.tscn")
-
-[node name="Colliders" type="Node2D" parent="."]
-position = Vector2(1297, 5292)
-scale = Vector2(4, 4)
-
-[node name="SideColliderLeft" type="StaticBody2D" parent="Colliders"]
-
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Colliders/SideColliderLeft"]
-position = Vector2(-2892, -1168)
-shape = SubResource("RectangleShape2D_l0jrn")
-
-[node name="SideColliderRight" type="StaticBody2D" parent="Colliders"]
-position = Vector2(4858, 0)
-
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Colliders/SideColliderRight"]
-position = Vector2(-2892, -1168)
-shape = SubResource("RectangleShape2D_l0jrn")
-
-[node name="TopCollider" type="StaticBody2D" parent="Colliders"]
-position = Vector2(2448.75, -595)
-
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Colliders/TopCollider"]
-position = Vector2(-2892, -1168)
-shape = SubResource("RectangleShape2D_l0jrn")
-
-[node name="BottomCollider" type="StaticBody2D" parent="Colliders"]
-position = Vector2(2495.5, 757.75)
-
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Colliders/BottomCollider"]
-position = Vector2(-2892, -1168)
-shape = SubResource("RectangleShape2D_l0jrn")
-
-[node name="BedCollider" type="StaticBody2D" parent="Colliders"]
-
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Colliders/BedCollider"]
-position = Vector2(-828.625, -1230.38)
-shape = SubResource("RectangleShape2D_2spkc")
-
-[node name="BackWall" type="Node" parent="."]
-
-[node name="Room01Walls2" type="Sprite2D" parent="BackWall"]
-modulate = Color(0.16470589, 0, 0.49803922, 1)
-z_index = -100
-position = Vector2(4992, -487)
-scale = Vector2(2, 2)
-texture = ExtResource("2_j25a2")
-offset = Vector2(-2768, 264)
-
-[node name="Room01Shelf" type="Sprite2D" parent="BackWall"]
-modulate = Color(0.16470589, 0, 0.49803922, 1)
-z_index = -50
-position = Vector2(-1978, -678)
-texture = ExtResource("13_11fdt")
-region_enabled = true
-region_rect = Rect2(1846, 471, 348, 490)
-
-[node name="Vesna" parent="." instance=ExtResource("18_3gevq")]
-position = Vector2(-471, 185)
-
-[node name="Camera2D" type="Camera2D" parent="." node_paths=PackedStringArray("_followNode")]
-position = Vector2(-1534, -26)
-offset = Vector2(0, -200)
-zoom = Vector2(0.5, 0.5)
-limit_left = -2600
-limit_top = -1400
-limit_right = 1500
-limit_bottom = 1400
-editor_draw_limits = true
-script = ExtResource("23_408bg")
-_followNode = NodePath("../Vesna/CharacterBody2D")
-
-[node name="CanvasLayer" parent="." instance=ExtResource("24_xwo8y")]
-
-[node name="BedInteraction" parent="." node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("8_phqdf")]
-position = Vector2(-1415, 489)
-_spritesToOutline = [NodePath("Bedsprite")]
-_id = 1
-
-[node name="CollisionShape3D" parent="BedInteraction/Area2D" index="0"]
-position = Vector2(-382, 9)
-shape = SubResource("CircleShape2D_phqdf")
-
-[node name="QuestCompleter" type="Node" parent="BedInteraction"]
-script = ExtResource("8_j25a2")
-questResource = ExtResource("9_heyef")
-toStatus = 2
-
-[node name="Bedsprite" type="Sprite2D" parent="BedInteraction"]
-modulate = Color(0.16470589, 0, 0.49803922, 1)
-z_index = -99
-position = Vector2(4925, -967)
-scale = Vector2(2, 2)
-texture = ExtResource("10_hryl5")
-offset = Vector2(-2768, 264)
-region_rect = Rect2(36.702454, 566.3165, 492.73346, 422.25665)
-
-[node name="DoorInteraction" parent="." node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("8_phqdf")]
-position = Vector2(777, 201)
-_spritesToOutline = [NodePath("Doorsprite")]
-_id = 0
-
-[node name="CollisionShape3D" parent="DoorInteraction/Area2D" index="0"]
-shape = SubResource("CircleShape2D_2spkc")
-
-[node name="Doorsprite" type="Sprite2D" parent="DoorInteraction"]
-modulate = Color(0.16470589, 0, 0.49803922, 1)
-z_index = -99
-position = Vector2(5559, -961)
-scale = Vector2(2, 2)
-texture = ExtResource("11_axs81")
-offset = Vector2(-2768, 264)
-region_rect = Rect2(1517.5891, 258.72107, 356.62732, 741.81134)
-
-[node name="NightStarter" type="Node" parent="."]
-script = ExtResource("10_j25a2")
-_sceneIndexToLoad = 1
-
-[node name="CountDayUp" type="Node" parent="NightStarter"]
-script = ExtResource("11_heyef")
-
-[node name="PointLight2D" type="PointLight2D" parent="."]
-position = Vector2(-630, -568)
-scale = Vector2(2.5, 1.3)
-color = Color(1, 0.73333335, 0.69803923, 1)
-energy = 1.86
-texture = ExtResource("14_axs81")
-
-[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"]
-
-[editable path="Vesna"]
-[editable path="BedInteraction"]
-[editable path="DoorInteraction"]

scripts/CSharp/Common/Inventory/ItemOnGround2D.cs

@@ -7,7 +7,7 @@ using Newtonsoft.Json.Linq;
 
 namespace Babushka.scripts.CSharp.Common.Inventory;
 
-public partial class ItemOnGround2D : Node2D
+public partial class ItemOnGround2D : PositionalEntity
 {
     private ItemInstance _itemInstance;
     
@@ -74,7 +74,6 @@ public partial class ItemOnGround2D : Node2D
         }
     }
 
-    /*
     protected override void LoadEntity(JObject json)
     {
         base.LoadEntity(json);
@@ -86,7 +85,6 @@ public partial class ItemOnGround2D : Node2D
         base.SaveEntity(json);
         json["item"] = _itemInstance.SaveToJson();
     }
-    */
 
     // old save
     /*

scripts/CSharp/GameEntity/Entities/Entity.cs

@@ -1,27 +1,23 @@
-using System;
 using Babushka.scripts.CSharp.GameEntity.LoadSave;
+using Babushka.scripts.CSharp.GameEntity.Types;
+using Godot;
 using Newtonsoft.Json.Linq;
 
 namespace Babushka.scripts.CSharp.GameEntity.Entities;
 
-public class Entity 
+public partial class Entity : Node2D
 {
-    public long id;
+    private long _id;
-    public virtual string EntityType => "";
+    protected virtual EntityType Type => EntityType.None;
 
-    public Entity()
+    protected virtual void SaveEntity(JObject json)
     {
-        id = new Random().NextInt64();
+        json["id"] = _id;
+        json["type"] = (int)Type;
     }
 
-    public virtual void SaveEntity(JObject json)
+    protected virtual void LoadEntity(JObject json)
     {
-        json["id"] = id;
+        _id = json.GetLongValue("id");
-        json["type"] = EntityType;
-    }
-
-    public virtual void LoadEntity(JObject json)
-    {
-        id = json.GetLongValue("id");
     }
 }

scripts/CSharp/GameEntity/Entities/LoadedScenesEntity.cs

@@ -1,32 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Transactions;
-using Newtonsoft.Json.Linq;
-
-namespace Babushka.scripts.CSharp.GameEntity.Entities;
-
-public class LoadedScenesEntity : Entity
-{
-    private HashSet<string> _loadedScenes = new();
-    public override string EntityType => OWN_TYPE_NAME;
-    public const string OWN_TYPE_NAME = "LoadedScenesEntity";
-    
-    public void AddScene(string sceneName) => _loadedScenes.Add(sceneName);
-    
-    public bool WasSceneLoaded(string sceneName) => _loadedScenes.Contains(sceneName);
-
-    public override void SaveEntity(JObject json)
-    {
-        base.SaveEntity(json);
-        json["scenes"] = new JArray(_loadedScenes);
-    }
-
-    public override void LoadEntity(JObject json)
-    {
-        base.LoadEntity(json);
-        JArray array = (JArray?) json["scenes"] ?? throw new Exception("No scenes found in LoadedScenesEntity.");
-        
-        _loadedScenes = array.ToObject<HashSet<string>>()!;
-    }
-}

scripts/CSharp/GameEntity/Entities/LoadedScenesEntity.cs.uid

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

scripts/CSharp/GameEntity/Entities/PositionalEntity.cs

@@ -4,29 +4,24 @@ using Newtonsoft.Json.Linq;
 
 namespace Babushka.scripts.CSharp.GameEntity.Entities;
 
-public abstract class PositionalEntity : Entity
+public partial class PositionalEntity : Entity
 {
-    public Vector2 position;
     public string sceneName = "none";
 
-    public override void SaveEntity(JObject json)
+    protected override void SaveEntity(JObject json)
     {
         base.SaveEntity(json);
-        json["posx"] = position.X;
+        json["posx"] = Position.X;
-        json["posy"] = position.Y;
+        json["posy"] = Position.Y;
         json["scene"] = sceneName;
     }
 
-    public override void LoadEntity(JObject json)
+    protected override void LoadEntity(JObject json)
     {
         base.LoadEntity(json);
-        position = new Vector2(
+        Position = new Vector2(
             json.GetFloatValue("posx"),
             json.GetFloatValue("posy"));
         sceneName = json.GetStringValue("scene");
     }
-
-    // Deals with Instantiation of the node
-    public abstract void InstantiateEntityNode(Node2D parent);
-
 }

scripts/CSharp/GameEntity/Entities/TrashEntity.cs

@@ -1,23 +0,0 @@
-using Babushka.scripts.CSharp.GameEntity.Management;
-using Godot;
-
-namespace Babushka.scripts.CSharp.GameEntity.Entities;
-
-public class TrashEntity : PositionalEntity
-{
-    public override string EntityType => OWN_TYPE_NAME;
-    public const string OWN_TYPE_NAME = "TrashEntity";
-    private EntityNodeCreator _creator;
-    
-    public TrashEntity()
-    {
-    }
-    
-    public override void InstantiateEntityNode(Node2D parent)
-    {
-        if(_creator == null) _creator = EntityManager.Instance.NodeCreator;
-        var entityNode = _creator.InstantiateNode(EntityType);
-        parent.AddChild(entityNode);
-        entityNode.GlobalPosition = position;
-    }
-}

scripts/CSharp/GameEntity/Entities/TrashEntity.cs.uid

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

scripts/CSharp/GameEntity/EntityNodes/TrashEntityNode.cs

@@ -1,16 +0,0 @@
-using Babushka.scripts.CSharp.GameEntity.Entities;
-using Godot;
-
-namespace Babushka.scripts.CSharp.GameEntity.EntityNodes;
-
-public partial class TrashEntityNode : Node2D
-{
-    private TrashEntity _trashEntity;
-
-    public void Initialize(TrashEntity trashEntity)
-    {
-            _trashEntity = trashEntity;
-    }
-    
-    
-}

scripts/CSharp/GameEntity/EntityNodes/TrashEntityNode.cs.uid

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

scripts/CSharp/GameEntity/EntityPlacer/TrashEntityPlacer.cs

@@ -1,26 +0,0 @@
-using Babushka.scripts.CSharp.GameEntity.Entities;
-using Babushka.scripts.CSharp.GameEntity.Management;
-using Godot;
-
-namespace Babushka.scripts.CSharp.GameEntity.EntityPlacer;
-
-public partial class TrashEntityPlacer : Node2D
-{
-    private string _trashEntityType = TrashEntity.OWN_TYPE_NAME;
-
-    public override void _Ready()
-    {
-        string sceneName = EntityManager.Instance.CurrentEntitySceneContainer!.sceneName;
-        var loadedScenesEntity = EntityManager.Instance.GetUniqueEntity<LoadedScenesEntity>();
-        
-        if (!loadedScenesEntity.WasSceneLoaded(sceneName))
-        {
-            TrashEntity entity = new TrashEntity();
-            entity.sceneName = sceneName;
-            entity.position = GlobalPosition;
-            EntityManager.Instance.AddEntity(entity);
-        }
-        
-        QueueFree();
-    }
-}

scripts/CSharp/GameEntity/EntityPlacer/TrashEntityPlacer.cs.uid

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

scripts/CSharp/GameEntity/LoadSave/EntityLoadSaveUtil.cs

@@ -8,7 +8,7 @@ public static class EntityLoadSaveUtil
     {
         var token = json[key];
         if (token == null) throw new MalformedJsonException(json, key, "does not exist");
-        //if (!token.HasValues) throw new MalformedJsonException(json, key, "has no value");
+        if (!token.HasValues) throw new MalformedJsonException(json, key, "has no value");
         if (token.Type != type) throw new MalformedJsonException(json, key, $"is not of type {type}");
     }
 

scripts/CSharp/GameEntity/Management/EntityManager.cs

@@ -1,157 +1,59 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Babushka.scripts.CSharp.GameEntity.Entities;
+using Babushka.scripts.CSharp.GameEntity.Types;
 using Godot;
-using Newtonsoft.Json.Linq;
 using Entity = Babushka.scripts.CSharp.GameEntity.Entities.Entity;
 using PositionalEntity = Babushka.scripts.CSharp.GameEntity.Entities.PositionalEntity;
 
 namespace Babushka.scripts.CSharp.GameEntity.Management;
 
-/// <summary>
-/// Manages the lifecycle and interactions of all entities within the game, including their creation, retrieval,
-/// and organization. The EntityManager serves as a centralized hub for managing both standard and positional entities.
-/// </summary>
 public partial class EntityManager : Node
 {
-    public static EntityManager Instance;
-    
     [Export] private EntityNodeCreator _nodeCreator = null!;
-    [Export] private string saveDirectory = "user://save_data/";
 
-    private EntitySceneContainer? _currentEntitySceneContainer;
+    private EntitySceneManager? _currentEntitySceneManager;
+
+
     private readonly List<Entity> _allEntities = new();
 
     public IEnumerable<Entity> AllEntities => _allEntities;
+
     public IEnumerable<PositionalEntity> AllPositionalEntities => _allEntities.OfType<PositionalEntity>();
-    public EntitySceneContainer? CurrentEntitySceneContainer => _currentEntitySceneContainer;
-    public EntityNodeCreator NodeCreator => _nodeCreator;
 
-    public override void _EnterTree()
+    public T NewPositionalEntity<T>(EntityType type, Vector2 position, string? scene = null) where T : PositionalEntity
     {
-        Instance = this;
+        if (scene == null)
-        Load();
+        {
+            if (_currentEntitySceneManager == null)
+                throw new Exception("No current scene. Specify scene to spawn an entity");
+            
+            scene = _currentEntitySceneManager.sceneName;
         }
 
-    public override void _Input(InputEvent @event)
+        var newEntity = _nodeCreator.Create<T>(type);
-    {
+        newEntity.Position = position;
-        // for debugging purposes
+        newEntity.sceneName = scene;
-        if (@event.IsActionPressed("DebugEntities"))
+        _allEntities.Add(newEntity);
-        {
+
-            GD.Print("Entities:");
+        _currentEntitySceneManager.AddIfNeeded(newEntity);
-            foreach (var entity in AllEntities)
+
-            {
+        return newEntity;
-                GD.Print(entity.EntityType + " " + entity.id);
-            }
     }
 
-        if(@event.IsActionPressed("SaveGame")) Save();
+    public void UnloadScene()
+    {
+        if (_currentEntitySceneManager == null) return;
+        _currentEntitySceneManager.RemoveAllEntities();
+        _currentEntitySceneManager = null;
     }
 
-    public void Save()
+    public void LoadScene(EntitySceneManager sceneManager)
     {
-        JArray array = new JArray();
+        _currentEntitySceneManager = sceneManager;
-        foreach (var entity in AllEntities)
+        foreach (var entity in AllPositionalEntities)
         {
-            JObject saveData = new JObject();
+            _currentEntitySceneManager.AddIfNeeded(entity);
-            entity.SaveEntity(saveData);
-            array.Add(saveData);
-        }
-        
-        using var SaveFile = FileAccess.Open(saveDirectory + "save.json", FileAccess.ModeFlags.Write);
-        SaveFile.StoreString(array.ToString());
-    }
-    
-    public void Load()
-    {
-        using var saveFile = FileAccess.Open(saveDirectory + "save.json", FileAccess.ModeFlags.Read);
-        if (saveFile == null) return;
-        
-        JArray array = JArray.Parse(saveFile.GetAsText());
-
-        foreach (var token in array)
-        {
-            var jobj = (JObject)token;
-
-            if (jobj == null) continue;
-
-            if (jobj.TryGetValue("type", out var entityType))
-            {
-                string entityTypeString = (string) entityType!;
-                Entity entity = InitializeEntity(entityTypeString);
-                entity.LoadEntity(jobj);
-                AddEntity(entity);
-                
         }
     }
-    }
-
-    private Entity InitializeEntity(string type)
-    {
-        Entity entity = type switch
-        {
-            TrashEntity.OWN_TYPE_NAME => new TrashEntity(),
-            LoadedScenesEntity.OWN_TYPE_NAME => new LoadedScenesEntity(),
-            _ => throw new Exception($"Trying to load unknown entity type: {type}")
-        };
-
-        return entity;
-    }
-    
-    #region ENTITY MANAGEMENT
-
-    /// <summary>
-    /// Adds an entity to the list of managed entities. If the entity is a positional entity
-    /// and its scene matches the current scene container, it is also instantiated in the scene.
-    /// </summary>
-    /// <param name="entity">The entity to be added to the manager.</param>
-    public void AddEntity(Entity entity)
-    {
-        if (!_allEntities.Contains(entity))
-            _allEntities.Add(entity);
-        if(entity is PositionalEntity positionalEntity && positionalEntity.sceneName == _currentEntitySceneContainer?.sceneName)
-            InstantiatePositionalEntityNode(positionalEntity);
-    }
-
-    private void InstantiatePositionalEntityNode(PositionalEntity entity)
-    {
-        if(_currentEntitySceneContainer == null) return;
-        entity.InstantiateEntityNode(_currentEntitySceneContainer);
-    }
-
-    /// <summary>
-    /// Retrieves the first entity of the specified type from the list of managed entities.
-    /// If no such entity exists, creates a new instance of the specified type, adds it to the manager, and returns it.
-    /// </summary>
-    /// <typeparam name="T">The type of entity to retrieve or create. Must inherit from the Entity class and have a parameterless constructor.</typeparam>
-    /// <returns>The first entity of the specified type or a newly created entity of that type if none were found.</returns>
-    public T GetUniqueEntity<T>() where T : Entity, new()
-    {
-        var result = AllEntities.OfType<T>().FirstOrDefault();
-        if (result == null)
-        {
-            var newEntity = new T();
-            AddEntity(newEntity);
-            result = newEntity;
-        }
-        return result;
-    }
-    
-    #endregion
-    
-    #region SCENE CONTAINER ACCESS
-    
-    public void SetSceneContainer(EntitySceneContainer sceneContainer)
-    {
-        _currentEntitySceneContainer = sceneContainer;
-    }
-    
-    public void UnsetSceneContainer()
-    {
-        _currentEntitySceneContainer = null;
-    }
-    
-    #endregion
-
 }

scripts/CSharp/GameEntity/Management/EntityManagerUtil.cs

@@ -4,7 +4,7 @@ namespace Babushka.scripts.CSharp.GameEntity.Management;
 
 public static class EntityManagerUtil
 {
-    public static void AddIfNeeded(this EntitySceneContainer? self, PositionalEntity entity)
+    public static void AddIfNeeded(this EntitySceneManager? self, PositionalEntity entity)
     {
         if(self == null) return;
         if(self.sceneName != entity.sceneName) return;

scripts/CSharp/GameEntity/Management/EntityNodeCreator.cs

@@ -1,25 +1,16 @@
-using System;
+using Babushka.scripts.CSharp.GameEntity.Types;
 using Godot;
 using Godot.Collections;
+using Entity = Babushka.scripts.CSharp.GameEntity.Entities.Entity;
 
 namespace Babushka.scripts.CSharp.GameEntity.Management;
 
 public partial class EntityNodeCreator : Node
 {
-    [Export] private Dictionary<string, PackedScene> _entityPrefabs;
+    [Export] private Dictionary<EntityType, PackedScene> _entityPrefabs;
 
-    public Node2D InstantiateNode(string type)
+    public T Create<T>(EntityType type) where T:Entity
     {
-        if (string.IsNullOrEmpty(type))
+        return _entityPrefabs[type].Instantiate<T>();
-        {
-            throw new NullReferenceException("The type provided for Node instantiation cannot be null or empty.");
-        }
-
-        if (!_entityPrefabs.ContainsKey(type))
-        {
-            throw new Exception($"The type provided for Node instantiation ({type}) is not specified in the EntityNodeCreator dictionary.");
-        }
-            
-        return _entityPrefabs[type].Instantiate<Node2D>();
     }
 }

scripts/CSharp/GameEntity/Management/EntitySceneContainer.cs

@@ -1,48 +0,0 @@
-using System.Linq;
-using Babushka.scripts.CSharp.GameEntity.Entities;
-using Godot;
-using PositionalEntity = Babushka.scripts.CSharp.GameEntity.Entities.PositionalEntity;
-
-namespace Babushka.scripts.CSharp.GameEntity.Management;
-
-public partial class EntitySceneContainer : Node2D
-{
-    [Export] public string sceneName = "none";
-
-    public override void _EnterTree()
-    {
-        EntityManager.Instance.SetSceneContainer(this);
-    }
-
-    public override void _ExitTree()
-    {
-        EntityManager.Instance.Save();
-        EntityManager.Instance.UnsetSceneContainer();
-    }
-
-    public override void _Ready()
-    {
-        AddAllEntities();
-        CallDeferred(nameof(RegisterWithScenesEntity));
-    }
-
-    private void RegisterWithScenesEntity()
-    {
-        var loadedScenesEntity = EntityManager.Instance.GetUniqueEntity<LoadedScenesEntity>();
-        loadedScenesEntity.AddScene(sceneName);
-    }
-
-    public void AddAllEntities()
-    {
-        foreach (var positionalEntity in EntityManager.Instance.AllPositionalEntities.Where(x => x.sceneName == sceneName))
-        {
-            AddEntity(positionalEntity);
-        }
-    }
-
-    public void AddEntity(PositionalEntity entity)
-    {
-        entity.InstantiateEntityNode(this);
-    }
-    
-}

scripts/CSharp/GameEntity/Management/EntitySceneManager.cs

@@ -0,0 +1,25 @@
+using Godot;
+using PositionalEntity = Babushka.scripts.CSharp.GameEntity.Entities.PositionalEntity;
+
+namespace Babushka.scripts.CSharp.GameEntity.Management;
+
+public partial class EntitySceneManager : Node2D
+{
+    [Export] public string sceneName = "none";
+
+    public void AddEntity(PositionalEntity entity)
+    {
+        AddChild(entity);
+    }
+
+    public void RemoveAllEntities()
+    {
+        foreach (var entity in GetChildren())
+        {
+            if (entity is PositionalEntity positionalEntity)
+            {
+                RemoveChild(entity);
+            }
+        }
+    }
+}

scripts/CSharp/GameEntity/Types/EntityType.cs

@@ -0,0 +1,7 @@
+namespace Babushka.scripts.CSharp.GameEntity.Types;
+
+public enum EntityType
+{
+    None = 0,
+    Yeli = 1,
+}

scripts/CSharp/GameEntity/Types/EntityType.cs.uid

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

scripts/CSharp/mock/DialogicStarter.cs

@@ -0,0 +1,16 @@
+using System.Threading.Tasks;
+
+namespace Babushka.scripts.CSharp.mock;
+
+public static class DialogicStarter
+{
+    public static async Task Dialog(string dialog)
+    {
+        // implement
+    }
+
+    public static void SetValue(string key, int value)
+    {
+        // implement
+    }
+}

scripts/CSharp/mock/ObjectLookup.cs

@@ -0,0 +1,12 @@
+namespace Babushka.scripts.CSharp.mock;
+
+public static class ObjectLookup
+{
+    // Referenzen werden bei startup gesetzt
+
+    // Quests
+    public static PotatoQuest potatoQuest;
+    
+    // NPCs
+    public static YeliNpc yeliNpc;
+}

scripts/CSharp/mock/PotatoQuest.cs

@@ -0,0 +1,31 @@
+using Babushka.scripts.CSharp.Common.Inventory;
+using Babushka.scripts.CSharp.GameEntity.Entities;
+using Godot;
+
+namespace Babushka.scripts.CSharp.mock;
+
+public partial class PotatoQuest:Node
+{
+    // Yeli will 5 kartoffeln haben.
+    // Man kann Yeli auch erstmal weniger geben.
+    // Yeli sagt dir dann, wie viele kartoffeln noch fehlen.
+    
+    public enum State
+    {
+        Unavailable, // bevor die quest verfügbar ist
+        YeliRequest, // Yeli fragt nach kartoffeln
+        BringPotato, // Vesna soll kartoffeln bringen
+        Done // kartoffeln abgegeben
+    }
+
+    public State state = State.Unavailable;
+    public int potatoesWanted = 5;
+    public int potatoesBrought = 0;
+    public ItemResource itemBlueprint; // potato item
+
+    public void Activate() // wird von woanders aufgerufen
+    {
+        if (state == State.Unavailable)
+            state = State.YeliRequest;
+    }
+}

scripts/CSharp/mock/PotatoQuest.cs.uid

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

scripts/CSharp/mock/YeliDialog.cs

@@ -0,0 +1,66 @@
+using System;
+using Babushka.scripts.CSharp.Common.Inventory;
+using Babushka.scripts.CSharp.Common.NPC;
+using Godot;
+
+namespace Babushka.scripts.CSharp.mock;
+
+// Dieses script enthält ALLE möglichen dialogoptionen die Yeli in der gesamten Demo hat.
+// Das script ist dafür verantwortlich den richtigen Dialog zu starten.
+public partial class YeliDialog : Node
+{
+    public async void StartDialog() // kann zu jedem zeitpunkt vom spieler getriggert werden
+    {
+        var potato = ObjectLookup.potatoQuest;
+        var yeli = ObjectLookup.yeliNpc;
+        var inventory = InventoryManager.Instance.playerInventory!;
+
+        if (yeli.isSleeping) // wenn yeli schläft kann keine quest von ihr angenommen werden, auch wenn die quest verfügbar ist
+        {
+            await DialogicStarter.Dialog("YeliSleep"); // "ZZZ"
+        }
+        else if (potato.state == PotatoQuest.State.YeliRequest)
+        {
+            await DialogicStarter.Dialog("YeliAskForPotato"); // "Can you bring me 5 potatoes?"
+            potato.state = PotatoQuest.State.BringPotato;
+        }
+        else if (potato.state == PotatoQuest.State.BringPotato)
+        {
+            var potatoesTodo = potato.potatoesWanted - potato.potatoesBrought;
+            var potatoesAvailable = inventory.TotalItemsOfBlueprint(potato.itemBlueprint);
+            var takePotatoes = Math.Min(potatoesTodo, potatoesAvailable);
+
+            inventory.TryRemoveAllItems(new ItemInstance
+                { blueprint = potato.itemBlueprint, amount = takePotatoes }); // should not fail
+            potato.potatoesWanted -= takePotatoes;
+
+            potatoesTodo = potato.potatoesWanted - potato.potatoesBrought;
+
+            var isComplete = potatoesTodo <= 0;
+            var wasSomeDelivered = takePotatoes > 0;
+
+            if (isComplete)
+            {
+                await DialogicStarter.Dialog("YeliPotatoThankYou"); // "thanks for bringing me all the potatoes"
+                potato.state = PotatoQuest.State.Done;
+            }
+            else
+            {
+                DialogicStarter.SetValue("potatoes", potatoesTodo); // setzt die Dialogic variable
+
+                if (wasSomeDelivered)
+                {
+                    await DialogicStarter.Dialog("YeliPotatoThanksButMore"); // "thank you but i need {potatoes} more potatoes"
+                }
+                else
+                {
+                    await DialogicStarter.Dialog("YeliPotatoMore"); // "I still need {potatoes} more potatoes"
+                }
+            }
+        }
+        else
+        {
+            await DialogicStarter.Dialog("YeliDefault"); // "I'm happy to have you around" oder so
+        }
+    }
+}

scripts/CSharp/mock/YeliDialog.cs.uid

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

scripts/CSharp/mock/YeliNpc.cs

@@ -0,0 +1,9 @@
+using Babushka.scripts.CSharp.GameEntity.Entities;
+
+namespace Babushka.scripts.CSharp.mock;
+
+public partial class YeliNpc : Entity
+{
+    public bool isSleeping = false;
+    
+}

shader/HSV.gdshader

@@ -12,9 +12,6 @@ uniform float brightness_add  : hint_range(-1.0, 1.0) = 0.0;
 // Contrast multiplier in RGB space. 1.0 means no change.
 uniform float contrast_mult   : hint_range(0.0, 2.0) = 1.0;
 
-//Cached Color value to reapply modulate
-varying vec4 modulate;
-
 // Converts an RGB color to HSV.
 vec3 rgb2hsv(vec3 c) {
     float cMax = max(max(c.r, c.g), c.b);
@@ -68,10 +65,6 @@ vec3 hsv2rgb(vec3 c) {
     return rgb + vec3(m);
 }
 
-void vertex(){
-	modulate = COLOR;
-}
-
 void fragment() {
     // Get the original texture color.
     vec4 tex_color = texture(TEXTURE, UV);
@@ -96,6 +89,4 @@ void fragment() {
 
     // Output the final color while preserving the original alpha.
     COLOR = vec4(col, tex_color.a);
-	//reapply vertex color value to keep modulate changes
-	COLOR = COLOR * modulate;
 }

shader/repeat_texture.gdshader

@@ -2,14 +2,8 @@ shader_type canvas_item;
 
 uniform vec2 tiling_scale = vec2(5.0, 5.0);
 uniform sampler2D noise : repeat_enable;
-varying vec4 modulate;
-
-void vertex() {
-	modulate = COLOR;
-}
 
 void fragment() {
     vec2 uv = vec2(UV.x * tiling_scale.x, UV.y * tiling_scale.y); // Change 10.0 to control tiling scale
     COLOR = texture(TEXTURE, fract(uv));
-	COLOR = COLOR * modulate;
 }

shader/swaying_plant.gdshader

@@ -26,9 +26,6 @@ uniform float heightOffset : hint_range(0.0, 1.0);
 // With the offset value, you can if you want different moves for each asset. Just put a random value (1, 2, 3) in the editor. Don't forget to mark the material as unique if you use this
 uniform float offset = 0;
 
-// caching color settings to reapply modulate value
-varying vec4 modulate;
-
 float getWind(vec2 vertex, vec2 uv, float time){
     float diff = pow(maxStrength - minStrength, 2.0);
     float strength = clamp(minStrength + diff + sin(time / interval) * diff, minStrength, maxStrength) * strengthScale;
@@ -50,13 +47,8 @@ float noise(vec2 x) {
 }
 
 void vertex() {
-	modulate = COLOR;
     vec4 pos = MODEL_MATRIX * vec4(0.0, 0.0, 0.0, 1.0);
     //float time = TIME * speed + sin(VERTEX.x * noise(VERTEX.xy) * offset);
     float time = TIME * speed + sin(pos.x * offset) * cos( pos.x * offset)  ;
     VERTEX.x += getWind(VERTEX.xy, UV, time);
 }
-
-void fragment() {
-  COLOR = modulate * COLOR;
-}