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
prefabs/Interactables/trash_object.tscn
+4
View File
@@ -28,11 +28,15 @@ stream_8/stream = ExtResource("11_kb03l")
stream_9/stream = ExtResource("12_kka6u")
[node name="trashObject" type="Sprite2D"]
z_index = 1
y_sort_enabled = true
texture = ExtResource("1_k4ca3")
offset = Vector2(1, -215)
region_enabled = true
region_rect = Rect2(57, 493, 334, 475)
[node name="InteractionArea" parent="." instance=ExtResource("2_gcgfd")]
position = Vector2(0, -172)
[node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="."]
stream = SubResource("AudioStreamRandomizer_dich4")
prefabs/characters/Player2D.tscn
+1 -1
View File
@@ -2065,7 +2065,7 @@ animations = [{
"speed": 11.0
}]
[node name="Player2d" type="Node2D" node_paths=PackedStringArray("_farmingControls", "_player2d")]
[node name="Vesna" type="Node2D" node_paths=PackedStringArray("_farmingControls", "_player2d")]
y_sort_enabled = true
script = ExtResource("1_yd5ep")
_farmingControls = NodePath("FarmingControls")
prefabs/farm/duck.tscn
+9 -33
View File
@@ -158,15 +158,11 @@ libraries = {
}
[node name="bodyLookingRight" type="Node2D" parent="."]
z_index = 1
y_sort_enabled = true
position = Vector2(-5, -537)
position = Vector2(9.53674e-07, 0)
rotation = 0.0135349
[node name="head" type="Sprite2D" parent="bodyLookingRight"]
z_index = 1
y_sort_enabled = true
position = Vector2(46.9624, 76.1606)
position = Vector2(45.706, -451.714)
rotation = 0.284615
scale = Vector2(1, 0.997)
skew = 0.024546
@@ -176,8 +172,6 @@ region_enabled = true
region_rect = Rect2(45, 24, 87, 82)
[node name="beak upper" type="Sprite2D" parent="bodyLookingRight/head"]
z_index = 1
y_sort_enabled = true
position = Vector2(50.669, -7.16257)
rotation = -0.0427724
scale = Vector2(0.62715, 0.62715)
@@ -187,8 +181,6 @@ region_enabled = true
region_rect = Rect2(292, 37, 152, 98)
[node name="beak lower" type="Sprite2D" parent="bodyLookingRight/head"]
z_index = 1
y_sort_enabled = true
position = Vector2(47.9076, -15.7341)
rotation = 0.0364142
scale = Vector2(0.58615, 0.58615)
@@ -198,9 +190,7 @@ region_enabled = true
region_rect = Rect2(295, 170, 145, 39)
[node name="torso" type="Sprite2D" parent="bodyLookingRight"]
z_index = 1
y_sort_enabled = true
position = Vector2(5.90997, 355.352)
position = Vector2(4.65357, -172.523)
scale = Vector2(1.07526, 1.01724)
texture = ExtResource("1_cgxhx")
offset = Vector2(2.87376, -131.092)
@@ -208,9 +198,7 @@ region_enabled = true
region_rect = Rect2(30, 168, 125, 326)
[node name="wingR" type="Sprite2D" parent="bodyLookingRight"]
z_index = 1
y_sort_enabled = true
position = Vector2(-28, 262)
position = Vector2(-29.2564, -265.875)
rotation = -0.371117
texture = ExtResource("1_cgxhx")
offset = Vector2(-50, 50)
@@ -218,9 +206,7 @@ region_enabled = true
region_rect = Rect2(196, 231, 180, 164)
[node name="wingL" type="Sprite2D" parent="bodyLookingRight"]
z_index = 1
y_sort_enabled = true
position = Vector2(47.0695, 245.905)
position = Vector2(45.8131, -281.97)
rotation = -0.0925884
skew = -0.0345086
texture = ExtResource("1_cgxhx")
@@ -229,9 +215,7 @@ region_enabled = true
region_rect = Rect2(196, 231, 180, 164)
[node name="underbelly" type="Sprite2D" parent="bodyLookingRight"]
z_index = 1
y_sort_enabled = true
position = Vector2(-11.4038, 439.203)
position = Vector2(-12.6602, -88.6718)
rotation = -2.98225
scale = Vector2(0.672245, 0.955267)
skew = 0.0185422
@@ -241,7 +225,7 @@ region_enabled = true
region_rect = Rect2(196, 231, 180, 164)
[node name="leg left" type="Sprite2D" parent="bodyLookingRight"]
position = Vector2(36.2887, 300.645)
position = Vector2(35.0323, -227.23)
rotation = 2.42655
scale = Vector2(1.05221, 1.04106)
skew = -0.0544101
@@ -283,9 +267,7 @@ region_enabled = true
region_rect = Rect2(246, 393, 111, 111)
[node name="right leg" type="Sprite2D" parent="bodyLookingRight"]
z_index = 1
y_sort_enabled = true
position = Vector2(-24, 364)
position = Vector2(-25.2564, -163.875)
rotation = -0.463741
scale = Vector2(1.07492, 1.01762)
texture = ExtResource("1_cgxhx")
@@ -293,8 +275,6 @@ region_enabled = true
region_rect = Rect2(196, 231, 177, 161)
[node name="right thigh" type="Sprite2D" parent="bodyLookingRight/right leg"]
z_index = 1
y_sort_enabled = true
position = Vector2(-29.7603, 44.2374)
rotation = 0.249342
scale = Vector2(0.625107, 0.655894)
@@ -304,8 +284,6 @@ region_enabled = true
region_rect = Rect2(368, 263, 81, 89)
[node name="right shin" type="Sprite2D" parent="bodyLookingRight/right leg/right thigh"]
z_index = 1
y_sort_enabled = true
position = Vector2(-2.78734, 11.5692)
rotation = 0.0689206
scale = Vector2(1.12016, 1.07128)
@@ -316,8 +294,6 @@ region_enabled = true
region_rect = Rect2(360, 361, 68, 126)
[node name="right foot" type="Sprite2D" parent="bodyLookingRight/right leg/right thigh/right shin"]
z_index = 1
y_sort_enabled = true
position = Vector2(-20.0986, 67.7507)
rotation = 0.14855
scale = Vector2(1.212, 1.212)
@@ -327,7 +303,7 @@ region_enabled = true
region_rect = Rect2(246, 393, 111, 111)
[node name="InteractionArea" parent="." instance=ExtResource("15_uo3dh")]
position = Vector2(-3, -274)
position = Vector2(18, -205)
[node name="CollisionShape3D" parent="InteractionArea/Area2D" index="0"]
shape = SubResource("CircleShape2D_uo3dh")
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"]