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

Fixed ysorting on ducks and trash

Browse Source
This commit is contained in:
Katharina Ziolkowski
2025-07-26 16:51:05 +02:00
parent 486cfb5546
commit ab23d41496
5 changed files with 80 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scenes/Babushka_scene_farm_outside_2d.tscn
+36 -1
View File
@@ -2133,34 +2133,48 @@ position = Vector2(-106.663, 182.891)
shape = SubResource("RectangleShape2D_ycj14")
[node name="ducks" type="Node2D" parent="YSorted"]
z_index = 1
y_sort_enabled = true
script = ExtResource("49_uxa2m")
_goal = 6
[node name="Duck2" parent="YSorted/ducks" node_paths=PackedStringArray("_penTarget") instance=ExtResource("62_i36hd")]
z_index = 0
y_sort_enabled = false
position = Vector2(4374, 2652)
_penTarget = NodePath("../../pen/penSlot1")
[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")
[node name="Duck4" parent="YSorted/ducks" node_paths=PackedStringArray("_penTarget") instance=ExtResource("62_i36hd")]
z_index = 0
y_sort_enabled = false
position = Vector2(13441, 3612)
rotation = 3.14159
scale = Vector2(1, -1)
_penTarget = NodePath("../../pen/penSlot3")
[node name="Duck5" parent="YSorted/ducks" node_paths=PackedStringArray("_penTarget") instance=ExtResource("62_i36hd")]
z_index = 0
y_sort_enabled = false
position = Vector2(15330, 2487)
rotation = 3.14159
scale = Vector2(1, -1)
_penTarget = NodePath("../../pen/penSlot4")
[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")
[node name="Duck7" parent="YSorted/ducks" node_paths=PackedStringArray("_penTarget") instance=ExtResource("62_i36hd")]
z_index = 0
y_sort_enabled = false
position = Vector2(2409, 3958)
rotation = 3.14159
scale = Vector2(1, -1)
@@ -2195,41 +2209,63 @@ position = Vector2(-4659, 2897)
position = Vector2(-5016, 3361)
[node name="trash" type="Node2D" parent="YSorted"]
z_index = 1
y_sort_enabled = true
[node name="trashObject" parent="YSorted/trash" instance=ExtResource("53_ycj14")]
z_index = 0
y_sort_enabled = false
position = Vector2(1269, 3170)
[node name="trashObject2" parent="YSorted/trash" instance=ExtResource("53_ycj14")]
z_index = 0
y_sort_enabled = false
position = Vector2(3183, 2369)
region_rect = Rect2(207, 1184, 149, 142)
[node name="trashObject3" parent="YSorted/trash" instance=ExtResource("53_ycj14")]
z_index = 0
y_sort_enabled = false
position = Vector2(4724, 3519)
region_rect = Rect2(400, 1053, 163, 141)
[node name="trashObject4" parent="YSorted/trash" instance=ExtResource("53_ycj14")]
z_index = 0
y_sort_enabled = false
position = Vector2(5385, 3391)
region_rect = Rect2(1048, 1092, 348, 106)
[node name="trashObject5" parent="YSorted/trash" instance=ExtResource("53_ycj14")]
z_index = 0
y_sort_enabled = false
position = Vector2(8051, 2541)
region_rect = Rect2(531, 1207, 176, 167)
[node name="trashObject6" parent="YSorted/trash" instance=ExtResource("53_ycj14")]
z_index = 0
y_sort_enabled = false
position = Vector2(9629, 3312)
region_rect = Rect2(207, 1184, 149, 142)
[node name="trashObject7" parent="YSorted/trash" instance=ExtResource("53_ycj14")]
z_index = 0
y_sort_enabled = false
position = Vector2(12050, 3391)
[node name="trashObject8" parent="YSorted/trash" instance=ExtResource("53_ycj14")]
z_index = 0
y_sort_enabled = false
position = Vector2(14589, 2505)
rotation = 1.77025
scale = Vector2(1, 1)
region_rect = Rect2(629, 81, 227, 829)
[node name="trashObject9" parent="YSorted/trash" instance=ExtResource("53_ycj14")]
z_index = 0
y_sort_enabled = false
position = Vector2(15197, 3447)
rotation = 1.77025
scale = Vector2(1, 1)
region_rect = Rect2(1048, 1092, 348, 106)
[node name="CanvasLayer" parent="." instance=ExtResource("32_2nee2")]
@@ -2324,5 +2360,4 @@ script = ExtResource("40_w3jkj")
[editable path="YSorted/ScytheGenericPickup/PickupInteractionArea"]
[editable path="YSorted/ShovelGenericPickup"]
[editable path="YSorted/ShovelGenericPickup/PickupInteractionArea"]
[editable path="YSorted/trash/trashObject"]
[editable path="CanvasLayer"]
scenes/Babushka_scene_farm_outside_2d_ducksCollected.tscn
+30 -21
View File
@@ -1,4 +1,4 @@
[gd_scene load_steps=100 format=3 uid="uid://cic8y0mdk3vd2"]
[gd_scene load_steps=103 format=3 uid="uid://cic8y0mdk3vd2"]
[ext_resource type="Script" uid="uid://cssdu8viimwm6" path="res://scripts/CSharp/Common/SceneTransition.cs" id="1_gwe0p"]
[ext_resource type="Script" uid="uid://bqomwxclsbhd3" path="res://scripts/CSharp/Common/Camera/CameraController.cs" id="2_1kqg8"]
@@ -151,11 +151,23 @@ size = Vector2(1041, 368)
resource_local_to_scene = true
radius = 371.058
[sub_resource type="CircleShape2D" id="CircleShape2D_2nee2"]
[sub_resource type="CircleShape2D" id="CircleShape2D_tkk2w"]
resource_local_to_scene = true
radius = 300.0
[sub_resource type="CircleShape2D" id="CircleShape2D_ipqaa"]
[sub_resource type="CircleShape2D" id="CircleShape2D_gwe0p"]
resource_local_to_scene = true
radius = 300.0
[sub_resource type="CircleShape2D" id="CircleShape2D_1kqg8"]
resource_local_to_scene = true
radius = 300.0
[sub_resource type="CircleShape2D" id="CircleShape2D_6nf5r"]
resource_local_to_scene = true
radius = 300.0
[sub_resource type="CircleShape2D" id="CircleShape2D_2532c"]
resource_local_to_scene = true
radius = 300.0
@@ -1044,8 +1056,8 @@ position = Vector2(6095, 2087)
[node name="SpawnWithItem" parent="YSorted/HoeGenericPickup" index="0"]
_blueprint = ExtResource("34_n176s")
[node name="CollisionShape3D" parent="YSorted/HoeGenericPickup/InteractionArea2/Area2D" index="0"]
shape = SubResource("CircleShape2D_2nee2")
[node name="CollisionShape3D" parent="YSorted/HoeGenericPickup/PickupInteractionArea/Area2D" index="0"]
shape = SubResource("CircleShape2D_tkk2w")
[node name="CanGenericPickup" parent="YSorted" instance=ExtResource("33_tml8r")]
position = Vector2(8192, 3507)
@@ -1053,11 +1065,8 @@ position = Vector2(8192, 3507)
[node name="SpawnWithItem" parent="YSorted/CanGenericPickup" index="0"]
_blueprint = ExtResource("30_te7n5")
[node name="InteractionArea2" parent="YSorted/CanGenericPickup" index="3"]
position = Vector2(0, -159)
[node name="CollisionShape3D" parent="YSorted/CanGenericPickup/InteractionArea2/Area2D" index="0"]
shape = SubResource("CircleShape2D_ipqaa")
[node name="CollisionShape3D" parent="YSorted/CanGenericPickup/PickupInteractionArea/Area2D" index="0"]
shape = SubResource("CircleShape2D_gwe0p")
[node name="RakeGenericPickup" parent="YSorted" instance=ExtResource("33_tml8r")]
position = Vector2(8391, 2060)
@@ -1065,8 +1074,8 @@ position = Vector2(8391, 2060)
[node name="SpawnWithItem" parent="YSorted/RakeGenericPickup" index="0"]
_blueprint = ExtResource("29_36k8l")
[node name="CollisionShape3D" parent="YSorted/RakeGenericPickup/InteractionArea2/Area2D" index="0"]
shape = SubResource("CircleShape2D_ipqaa")
[node name="CollisionShape3D" parent="YSorted/RakeGenericPickup/PickupInteractionArea/Area2D" index="0"]
shape = SubResource("CircleShape2D_1kqg8")
[node name="ScytheGenericPickup" parent="YSorted" instance=ExtResource("33_tml8r")]
visible = false
@@ -1075,8 +1084,8 @@ position = Vector2(15642, 2158)
[node name="SpawnWithItem" parent="YSorted/ScytheGenericPickup" index="0"]
_blueprint = ExtResource("35_p4sr7")
[node name="CollisionShape3D" parent="YSorted/ScytheGenericPickup/InteractionArea2/Area2D" index="0"]
shape = SubResource("CircleShape2D_ipqaa")
[node name="CollisionShape3D" parent="YSorted/ScytheGenericPickup/PickupInteractionArea/Area2D" index="0"]
shape = SubResource("CircleShape2D_6nf5r")
[node name="ShovelGenericPickup" parent="YSorted" instance=ExtResource("33_tml8r")]
visible = false
@@ -1085,8 +1094,8 @@ position = Vector2(5454, 2049)
[node name="SpawnWithItem" parent="YSorted/ShovelGenericPickup" index="0"]
_blueprint = ExtResource("36_vri5g")
[node name="CollisionShape3D" parent="YSorted/ShovelGenericPickup/InteractionArea2/Area2D" index="0"]
shape = SubResource("CircleShape2D_ipqaa")
[node name="CollisionShape3D" parent="YSorted/ShovelGenericPickup/PickupInteractionArea/Area2D" index="0"]
shape = SubResource("CircleShape2D_2532c")
[node name="Farm visuals" type="Node2D" parent="YSorted"]
position = Vector2(-60, 122)
@@ -2259,13 +2268,13 @@ script = ExtResource("59_0knno")
[editable path="YSorted/Vesna"]
[editable path="YSorted/Brünnen/InteractionArea"]
[editable path="YSorted/HoeGenericPickup"]
[editable path="YSorted/HoeGenericPickup/InteractionArea2"]
[editable path="YSorted/HoeGenericPickup/PickupInteractionArea"]
[editable path="YSorted/CanGenericPickup"]
[editable path="YSorted/CanGenericPickup/InteractionArea2"]
[editable path="YSorted/CanGenericPickup/PickupInteractionArea"]
[editable path="YSorted/RakeGenericPickup"]
[editable path="YSorted/RakeGenericPickup/InteractionArea2"]
[editable path="YSorted/RakeGenericPickup/PickupInteractionArea"]
[editable path="YSorted/ScytheGenericPickup"]
[editable path="YSorted/ScytheGenericPickup/InteractionArea2"]
[editable path="YSorted/ScytheGenericPickup/PickupInteractionArea"]
[editable path="YSorted/ShovelGenericPickup"]
[editable path="YSorted/ShovelGenericPickup/InteractionArea2"]
[editable path="YSorted/ShovelGenericPickup/PickupInteractionArea"]
[editable path="CanvasLayer"]