From 9267278ce8be70c10f32698413a73ce2aa903bc3 Mon Sep 17 00:00:00 2001 From: kziolkowski Date: Sun, 7 Dec 2025 10:43:41 +0100 Subject: [PATCH] tried and failed at fixing all layering issues in beet scene --- prefabs/farm/base_field.tscn | 2 + scenes/Babushka_scene_outside_beets.tscn | 110 +++++++++++++++++++---- 2 files changed, 96 insertions(+), 16 deletions(-) diff --git a/prefabs/farm/base_field.tscn b/prefabs/farm/base_field.tscn index 55ee78b..f7d7083 100644 --- a/prefabs/farm/base_field.tscn +++ b/prefabs/farm/base_field.tscn @@ -41,6 +41,7 @@ texture = ExtResource("9_wx561") [node name="FieldBehaviour" type="Sprite2D" parent="." node_paths=PackedStringArray("_fieldIndex", "_saveIdHolder", "_fieldSprite", "_maskSprite", "_outlineSprite", "PlantingInteraction", "FieldInteractionArea", "PlantingPlaceholder", "_wateringParticles")] visible = false z_index = -1 +y_sort_enabled = true scale = Vector2(0.9, 1) script = ExtResource("1_qa01x") _fieldIndex = NodePath("..") @@ -70,6 +71,7 @@ texture = ExtResource("3_c014y") texture = ExtResource("5_wx561") [node name="PlantPlaceholder" type="Node2D" parent="FieldBehaviour"] +y_sort_enabled = true [node name="InteractionArea" parent="FieldBehaviour" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("7_2eegd")] position = Vector2(-28.88889, -57) diff --git a/scenes/Babushka_scene_outside_beets.tscn b/scenes/Babushka_scene_outside_beets.tscn index b3d54d8..3e31110 100644 --- a/scenes/Babushka_scene_outside_beets.tscn +++ b/scenes/Babushka_scene_outside_beets.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=98 format=3 uid="uid://b3ibx4resa1f3"] +[gd_scene load_steps=99 format=3 uid="uid://b3ibx4resa1f3"] [ext_resource type="Script" uid="uid://cssdu8viimwm6" path="res://scripts/CSharp/Common/SceneTransition.cs" id="1_6krrk"] [ext_resource type="Script" uid="uid://bqomwxclsbhd3" path="res://scripts/CSharp/Common/Camera/CameraController.cs" id="2_4ktoi"] @@ -42,6 +42,7 @@ [ext_resource type="PackedScene" uid="uid://dpbbroif2tnil" path="res://prefabs/interactions/generic_item_on_ground_2d.tscn" id="43_dr6bm"] [ext_resource type="Texture2D" uid="uid://ct7ea8ikor5rf" path="res://art/nature/grass/grass-3.png" id="43_g8k4k"] [ext_resource type="Texture2D" uid="uid://d3dwl6ph0pu1d" path="res://art/nature/grass/grass-6.png" id="44_jgrpl"] +[ext_resource type="Texture2D" uid="uid://dmo21h14toxfu" path="res://art/indoor/indoor outdoor/domovoi.png" id="44_njxly"] [ext_resource type="Texture2D" uid="uid://blb3agipyxnal" path="res://art/farm/farming/farmobjekte/zaun/fence_door.png" id="47_xfjh2"] [ext_resource type="PackedScene" uid="uid://cgjc4wurbgimy" path="res://prefabs/UI/Inventory/Inventory.tscn" id="52_gwhnv"] [ext_resource type="AudioStream" uid="uid://dku1rq5cocisg" path="res://audio/Music/Farming_90BPM_69Bars.wav" id="53_2tfpr"] @@ -125,10 +126,6 @@ shader_parameter/tiling_scale = Vector2(10, 1) [sub_resource type="RectangleShape2D" id="RectangleShape2D_0qu0h"] size = Vector2(374, 295.995) -[sub_resource type="CircleShape2D" id="CircleShape2D_34r5t"] -resource_local_to_scene = true -radius = 300.0 - [sub_resource type="ShaderMaterial" id="ShaderMaterial_2vojv"] shader = ExtResource("17_lwdq7") shader_parameter/hue_shift = 0.0 @@ -227,6 +224,10 @@ size = Vector2(707.116, 604.111) resource_local_to_scene = true radius = 294.02722 +[sub_resource type="CircleShape2D" id="CircleShape2D_34r5t"] +resource_local_to_scene = true +radius = 300.0 + [sub_resource type="AudioStreamPlaylist" id="AudioStreamPlaylist_ceriq"] loop = false stream_count = 1 @@ -881,6 +882,7 @@ texture = SubResource("NoiseTexture2D_e5alv") [node name="Fence" type="Node2D" parent="."] [node name="Back Fence left" type="Sprite2D" parent="Fence"] +z_index = -50 texture_repeat = 2 material = SubResource("ShaderMaterial_0sfl7") position = Vector2(1332.5, 1680) @@ -897,6 +899,7 @@ position = Vector2(-204.073, 76) shape = SubResource("RectangleShape2D_2vojv") [node name="Back Fence middle" type="Sprite2D" parent="Fence"] +z_index = -50 texture_repeat = 2 material = SubResource("ShaderMaterial_0sfl7") position = Vector2(7501.01, 1680) @@ -972,15 +975,6 @@ position = Vector2(-33, 554) [node name="FarmingControls" parent="YSorted/Vesna" index="1" node_paths=PackedStringArray("_camera")] _camera = NodePath("../../../Camera2D") -[node name="GenericItemOnGround" parent="YSorted/Vesna" instance=ExtResource("43_dr6bm")] -position = Vector2(2527, 232) - -[node name="SpawnWithItem" parent="YSorted/Vesna/GenericItemOnGround" index="0"] -_blueprint = ExtResource("30_dr6bm") - -[node name="CollisionShape3D" parent="YSorted/Vesna/GenericItemOnGround/PickupInteractionArea/Area2D" index="0"] -shape = SubResource("CircleShape2D_34r5t") - [node name="Brünnen" type="Sprite2D" parent="YSorted"] z_index = 1 y_sort_enabled = true @@ -1013,6 +1007,8 @@ position = Vector2(-60, 122) position = Vector2(-8213, 84) [node name="greenery" type="Node2D" parent="YSorted/Farm visuals/Static"] +z_index = 1 +y_sort_enabled = true [node name="left side" type="Node2D" parent="YSorted/Farm visuals/Static/greenery"] @@ -1395,6 +1391,16 @@ offset = Vector2(0, -50) region_enabled = true region_rect = Rect2(1464, 419, 144, 115) +[node name="bush4" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/right side"] +z_index = -6 +material = SubResource("ShaderMaterial_bcdgk") +position = Vector2(5684, 2035) +scale = Vector2(2, 2) +texture = ExtResource("20_4unvh") +offset = Vector2(0, -50) +region_enabled = true +region_rect = Rect2(1837, 651, 139, 180) + [node name="Sonnenblume8" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/right side"] z_index = 1 y_sort_enabled = true @@ -1745,10 +1751,14 @@ scale = Vector2(0.1, 8.7) texture = ExtResource("26_bwvai") [node name="FieldParent" type="Node2D" parent="YSorted/Farm visuals"] +z_index = 1 +y_sort_enabled = true position = Vector2(53, 20) scale = Vector2(1, 0.993819) [node name="BaseField" parent="YSorted/Farm visuals/FieldParent" instance=ExtResource("40_efblm")] +z_index = -1 +y_sort_enabled = true position = Vector2(651, 2630.26) scale = Vector2(1, 1.00622) metadata/SaveID = "b3b47e69-6115-4405-8da6-508b783823d2" @@ -1757,7 +1767,11 @@ metadata/SaveID = "b3b47e69-6115-4405-8da6-508b783823d2" visible = true metadata/SaveID = "7a8210bf-479d-4b4c-9758-98d23e59d5d7" +[node name="PlantPlaceholder" parent="YSorted/Farm visuals/FieldParent/BaseField/FieldBehaviour" index="1"] +z_index = 1 + [node name="Beet2" parent="YSorted/Farm visuals/FieldParent/BaseField/FieldBehaviour/PlantPlaceholder" index="0" node_paths=PackedStringArray("_field") instance=ExtResource("41_vyqmy")] +z_index = 0 _state = 2 _field = NodePath("../..") _daysWatered = 6 @@ -1769,6 +1783,8 @@ visible = false shape = SubResource("CircleShape2D_qavgq") [node name="BaseField2" parent="YSorted/Farm visuals/FieldParent" instance=ExtResource("40_efblm")] +z_index = -1 +y_sort_enabled = true position = Vector2(1226, 3098.15) scale = Vector2(1, 1.00622) Payload = 1 @@ -1778,7 +1794,11 @@ metadata/SaveID = "f536efd3-3da8-4ef5-a520-570220e6c19f" visible = true metadata/SaveID = "a1d8a0a2-c51c-4410-83c3-0edb31cbf2de" +[node name="PlantPlaceholder" parent="YSorted/Farm visuals/FieldParent/BaseField2/FieldBehaviour" index="1"] +z_index = 1 + [node name="Beet2" parent="YSorted/Farm visuals/FieldParent/BaseField2/FieldBehaviour/PlantPlaceholder" index="0" node_paths=PackedStringArray("_field") instance=ExtResource("41_vyqmy")] +z_index = 0 _state = 2 _field = NodePath("../..") _daysWatered = 6 @@ -1790,6 +1810,8 @@ visible = false shape = SubResource("CircleShape2D_njxly") [node name="BaseField3" parent="YSorted/Farm visuals/FieldParent" instance=ExtResource("40_efblm")] +z_index = -1 +y_sort_enabled = true position = Vector2(1782, 2606.11) scale = Vector2(1, 1.00622) Payload = 2 @@ -1799,7 +1821,11 @@ metadata/SaveID = "14ce64d5-8a4d-43b9-a8ff-3a57725c4dc8" visible = true metadata/SaveID = "79a65532-cb2b-4268-8eb0-8c41a3935cbb" +[node name="PlantPlaceholder" parent="YSorted/Farm visuals/FieldParent/BaseField3/FieldBehaviour" index="1"] +z_index = 1 + [node name="Beet2" parent="YSorted/Farm visuals/FieldParent/BaseField3/FieldBehaviour/PlantPlaceholder" index="0" node_paths=PackedStringArray("_field") instance=ExtResource("41_vyqmy")] +z_index = 0 _state = 2 _field = NodePath("../..") _daysWatered = 5 @@ -1811,6 +1837,8 @@ visible = false shape = SubResource("CircleShape2D_54ty3") [node name="BaseField4" parent="YSorted/Farm visuals/FieldParent" instance=ExtResource("40_efblm")] +z_index = -1 +y_sort_enabled = true position = Vector2(2559, 2624.22) scale = Vector2(1, 1.00622) Payload = 3 @@ -1821,7 +1849,11 @@ visible = true FieldState = 3 metadata/SaveID = "13fa64a3-01dc-4fd8-822e-0839c0da3163" +[node name="PlantPlaceholder" parent="YSorted/Farm visuals/FieldParent/BaseField4/FieldBehaviour" index="1"] +z_index = 1 + [node name="Beet2" parent="YSorted/Farm visuals/FieldParent/BaseField4/FieldBehaviour/PlantPlaceholder" index="0" node_paths=PackedStringArray("_field") instance=ExtResource("41_vyqmy")] +z_index = 0 _state = 2 _field = NodePath("../..") _daysWatered = 7 @@ -1833,6 +1865,8 @@ visible = false shape = SubResource("CircleShape2D_gbxtf") [node name="BaseField5" parent="YSorted/Farm visuals/FieldParent" instance=ExtResource("40_efblm")] +z_index = -1 +y_sort_enabled = true position = Vector2(3305, 2624.22) scale = Vector2(1, 1.00622) Payload = 4 @@ -1843,7 +1877,11 @@ visible = true FieldState = 3 metadata/SaveID = "414ecdb9-f3c4-4fb9-81bd-6ca575784f78" +[node name="PlantPlaceholder" parent="YSorted/Farm visuals/FieldParent/BaseField5/FieldBehaviour" index="1"] +z_index = 1 + [node name="Beet2" parent="YSorted/Farm visuals/FieldParent/BaseField5/FieldBehaviour/PlantPlaceholder" index="0" node_paths=PackedStringArray("_field") instance=ExtResource("41_vyqmy")] +z_index = 0 _state = 2 _field = NodePath("../..") _daysWatered = 6 @@ -1855,6 +1893,8 @@ visible = false shape = SubResource("CircleShape2D_6krrk") [node name="BaseField6" parent="YSorted/Farm visuals/FieldParent" instance=ExtResource("40_efblm")] +z_index = -1 +y_sort_enabled = true position = Vector2(4033, 2618.18) scale = Vector2(1, 1.00622) Payload = 5 @@ -1865,7 +1905,11 @@ visible = true FieldState = 3 metadata/SaveID = "b235febb-b231-4f8c-94e9-1f9d9f115b08" +[node name="PlantPlaceholder" parent="YSorted/Farm visuals/FieldParent/BaseField6/FieldBehaviour" index="1"] +z_index = 1 + [node name="Beet2" parent="YSorted/Farm visuals/FieldParent/BaseField6/FieldBehaviour/PlantPlaceholder" index="0" node_paths=PackedStringArray("_field") instance=ExtResource("41_vyqmy")] +z_index = 0 _state = 1 _field = NodePath("../..") _daysWatered = 5 @@ -1877,6 +1921,8 @@ visible = false shape = SubResource("CircleShape2D_4ktoi") [node name="BaseField7" parent="YSorted/Farm visuals/FieldParent" instance=ExtResource("40_efblm")] +z_index = -1 +y_sort_enabled = true position = Vector2(4755, 2630.26) scale = Vector2(1, 1.00622) Payload = 6 @@ -1887,7 +1933,11 @@ visible = true FieldState = 3 metadata/SaveID = "9ccdba91-812a-4c13-9ee0-12472e174fc9" +[node name="PlantPlaceholder" parent="YSorted/Farm visuals/FieldParent/BaseField7/FieldBehaviour" index="1"] +z_index = 1 + [node name="Beet2" parent="YSorted/Farm visuals/FieldParent/BaseField7/FieldBehaviour/PlantPlaceholder" index="0" node_paths=PackedStringArray("_field") instance=ExtResource("41_vyqmy")] +z_index = 0 _state = 2 _field = NodePath("../..") _daysWatered = 6 @@ -1899,6 +1949,8 @@ visible = false shape = SubResource("CircleShape2D_aaup4") [node name="BaseField8" parent="YSorted/Farm visuals/FieldParent" instance=ExtResource("40_efblm")] +z_index = -1 +y_sort_enabled = true position = Vector2(4418, 3226.95) scale = Vector2(1, 1.00622) Payload = 7 @@ -1909,7 +1961,11 @@ visible = true FieldState = 3 metadata/SaveID = "da44e54a-0b76-4888-ad8b-782a9d146fa3" +[node name="PlantPlaceholder" parent="YSorted/Farm visuals/FieldParent/BaseField8/FieldBehaviour" index="1"] +z_index = 1 + [node name="Beet2" parent="YSorted/Farm visuals/FieldParent/BaseField8/FieldBehaviour/PlantPlaceholder" index="0" node_paths=PackedStringArray("_field") instance=ExtResource("41_vyqmy")] +z_index = 0 _state = 2 _field = NodePath("../..") _daysWatered = 6 @@ -1921,6 +1977,8 @@ visible = false shape = SubResource("CircleShape2D_v10dc") [node name="BaseField9" parent="YSorted/Farm visuals/FieldParent" instance=ExtResource("40_efblm")] +z_index = -1 +y_sort_enabled = true position = Vector2(5317, 3208.83) scale = Vector2(1, 1.00622) Payload = 8 @@ -1930,6 +1988,9 @@ metadata/SaveID = "0de8dc13-5851-4471-be35-309cd6687ebc" visible = true metadata/SaveID = "9919b294-04a1-4a16-9783-38c8aa0e291c" +[node name="PlantPlaceholder" parent="YSorted/Farm visuals/FieldParent/BaseField9/FieldBehaviour" index="1"] +z_index = 1 + [node name="FieldActivator" parent="YSorted/Farm visuals/FieldParent/BaseField9" index="7"] visible = false @@ -1992,6 +2053,23 @@ _id = 0 [node name="CollisionShape3D" parent="YSorted/RakeGenericPickup/PickupInteractionArea/Area2D" index="0"] shape = SubResource("CircleShape2D_hpgl7") +[node name="domovoi" type="Sprite2D" parent="YSorted"] +modulate = Color(0.8982765, 0.818879, 0.7068166, 1) +z_index = -10 +position = Vector2(10542, 2026) +texture = ExtResource("44_njxly") +region_enabled = true +region_rect = Rect2(65, 149, 223, 375) + +[node name="WateringCan" parent="YSorted" instance=ExtResource("43_dr6bm")] +position = Vector2(5220, 2108) + +[node name="SpawnWithItem" parent="YSorted/WateringCan" index="0"] +_blueprint = ExtResource("30_dr6bm") + +[node name="CollisionShape3D" parent="YSorted/WateringCan/PickupInteractionArea/Area2D" index="0"] +shape = SubResource("CircleShape2D_34r5t") + [node name="CanvasLayer" parent="." instance=ExtResource("52_gwhnv")] [node name="Inventory" parent="CanvasLayer" index="1"] @@ -2074,8 +2152,6 @@ script = ExtResource("59_njxly") [connection signal="tree_entered" from="SceneNameSetter" to="SceneNameSetter" method="Set"] [editable path="YSorted/Vesna"] -[editable path="YSorted/Vesna/GenericItemOnGround"] -[editable path="YSorted/Vesna/GenericItemOnGround/PickupInteractionArea"] [editable path="YSorted/Brünnen/InteractionArea"] [editable path="YSorted/Farm visuals/FieldParent/BaseField"] [editable path="YSorted/Farm visuals/FieldParent/BaseField/FieldActivator/InteractionArea"] @@ -2098,4 +2174,6 @@ script = ExtResource("59_njxly") [editable path="YSorted/Blocker/BackToFarm"] [editable path="YSorted/RakeGenericPickup"] [editable path="YSorted/RakeGenericPickup/PickupInteractionArea"] +[editable path="YSorted/WateringCan"] +[editable path="YSorted/WateringCan/PickupInteractionArea"] [editable path="CanvasLayer"]