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

First adjustments to the Entity System to make it work with different types

Browse Source
This commit is contained in:
Katharina Ziolkowski
2026-02-03 13:55:13 +01:00
parent 745f54b375
commit bcbc074c86
33 changed files with 12822 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scenes/entity_scenes/farm_outside.tscn
+56 -25
View File
@@ -1,4 +1,4 @@
[gd_scene load_steps=119 format=3 uid="uid://66pmq4efjip8"]
[gd_scene load_steps=122 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,6 +80,9 @@
[ext_resource type="Resource" uid="uid://tt3d166mntmi" path="res://resources/low code/farming/var_sceneNameProvider.tres" id="78_wugdx"]
[ext_resource type="Script" uid="uid://iquhbkr7pqeg" path="res://scripts/CSharp/Common/Savegame/SaveCheats.cs" id="79_tx4bp"]
[ext_resource type="Script" uid="uid://ca4s0algeij1h" path="res://scripts/CSharp/Common/Savegame/SaveIDProviderTool.cs" id="80_tj68g"]
[ext_resource type="Script" uid="uid://ca1pg6k3gn47y" path="res://scripts/CSharp/GameEntity/Management/EntitySceneContainer.cs" id="81_f57uc"]
[ext_resource type="Script" uid="uid://bilg7e33usxuv" path="res://scripts/CSharp/GameEntity/EntityPlacer/TrashEntityPlacer.cs" id="82_ec5sc"]
[ext_resource type="Texture2D" uid="uid://b2smanpdo1y5e" path="res://art/babushka_project.png" id="83_50rxh"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_wtdui"]
resource_local_to_scene = true
@@ -234,10 +237,6 @@ 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
@@ -246,6 +245,10 @@ 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
@@ -279,7 +282,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/Babushka_scene_outside_beets.tscn")
_sceneNamesToLoad = PackedStringArray("res://scenes/Babushka_scene_indoor_common_room.tscn", "res://scenes/entity_scenes/outside_beets.tscn")
[node name="Camera2D" type="Camera2D" parent="." node_paths=PackedStringArray("_followNode")]
position = Vector2(3180, 1961)
@@ -1029,7 +1032,6 @@ 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"]
@@ -1046,7 +1048,6 @@ 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"]
@@ -1064,7 +1065,6 @@ 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,30 +2209,33 @@ collision_mask = 4
position = Vector2(-106.663, 182.891)
shape = SubResource("RectangleShape2D_ycj14")
[node name="InteractionArea" parent="YSorted/Blocker" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("31_3tf35")]
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")
[node name="Fence Door" type="Sprite2D" parent="YSorted/Blocker/InteractionArea"]
[node name="Fence Door" type="Sprite2D" parent="YSorted/Blocker"]
material = SubResource("ShaderMaterial_uxa2m")
position = Vector2(1, -271)
position = Vector2(11235, 1579)
rotation = -3.13727
scale = Vector2(0.905, -0.925)
scale = Vector2(0.9049999, -0.925)
texture = ExtResource("49_l3u1d")
[node name="StaticBody2D" type="StaticBody2D" parent="YSorted/Blocker/InteractionArea/Fence Door"]
[node name="StaticBody2D" type="StaticBody2D" parent="YSorted/Blocker/Fence Door"]
collision_layer = 2
collision_mask = 4
[node name="CollisionShape2D" type="CollisionShape2D" parent="YSorted/Blocker/InteractionArea/Fence Door/StaticBody2D"]
[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"]
shape = SubResource("CircleShape2D_l7ekk")
[node name="ducks" type="Node2D" parent="YSorted"]
z_index = 1
y_sort_enabled = true
@@ -2521,6 +2524,34 @@ 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"]
@@ -2529,7 +2560,7 @@ script = ExtResource("80_tj68g")
[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/InteractionArea" to="." method="LoadSceneAtIndex"]
[connection signal="InteractedTool" from="YSorted/Blocker/Fence Door/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"]
@@ -2555,7 +2586,7 @@ script = ExtResource("80_tj68g")
[editable path="YSorted/BeetPickup/PickupInteractionArea"]
[editable path="YSorted/SeedPickup2"]
[editable path="YSorted/SeedPickup2/PickupInteractionArea"]
[editable path="YSorted/Blocker/InteractionArea"]
[editable path="YSorted/Blocker/Fence Door/InteractionArea"]
[editable path="YSorted/trash/trashObject2"]
[editable path="YSorted/trash/trashObject3"]
[editable path="YSorted/trash/trashObject4"]
scenes/entity_scenes/outside_beets.tscn
+2179
View File
File diff suppressed because it is too large Load Diff