From b9c5de6dc39aeacaf15c2922918ee87a3931611e Mon Sep 17 00:00:00 2001 From: kziolkowski Date: Wed, 9 Jul 2025 22:49:07 +0200 Subject: [PATCH] Made labels visible on ducks --- prefabs/farm/duck.tscn | 16 ++++++- scenes/Babushka_scene_farm_outside_2d.tscn | 51 ++++++++++++++++++++-- 2 files changed, 63 insertions(+), 4 deletions(-) diff --git a/prefabs/farm/duck.tscn b/prefabs/farm/duck.tscn index f9dbcc6..91a849e 100644 --- a/prefabs/farm/duck.tscn +++ b/prefabs/farm/duck.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=22 format=3 uid="uid://muuxxgvx33fp"] +[gd_scene load_steps=23 format=3 uid="uid://muuxxgvx33fp"] [ext_resource type="Script" uid="uid://7m1rt7agb6rm" path="res://scripts/CSharp/Common/Temp/MVPDuck.cs" id="1_54k4r"] [ext_resource type="Texture2D" uid="uid://hvchk6t0xe7j" path="res://art/animals/Ente.png" id="1_cgxhx"] @@ -131,6 +131,10 @@ _data = { &"new_animation": SubResource("Animation_kjie1") } +[sub_resource type="CircleShape2D" id="CircleShape2D_uo3dh"] +resource_local_to_scene = true +radius = 300.0 + [node name="Duck" type="Node2D" node_paths=PackedStringArray("_animationPlayer")] z_index = 1 y_sort_enabled = true @@ -326,5 +330,15 @@ region_rect = Rect2(246, 393, 111, 111) [node name="InteractionArea" parent="." instance=ExtResource("15_uo3dh")] position = Vector2(-3, -274) +[node name="CollisionShape3D" parent="InteractionArea/Area2D" index="0"] +shape = SubResource("CircleShape2D_uo3dh") + +[node name="Label" parent="InteractionArea" index="1"] +modulate = Color(0, 0, 0, 1) +z_index = 1 +y_sort_enabled = true + [connection signal="Interacted" from="InteractionArea" to="." method="TransferToTargetAfterDelay"] [connection signal="Interacted" from="InteractionArea" to="Audio/NakNak" method="PlayOneShot"] + +[editable path="InteractionArea"] diff --git a/scenes/Babushka_scene_farm_outside_2d.tscn b/scenes/Babushka_scene_farm_outside_2d.tscn index 998816d..7c77eab 100644 --- a/scenes/Babushka_scene_farm_outside_2d.tscn +++ b/scenes/Babushka_scene_farm_outside_2d.tscn @@ -2093,13 +2093,58 @@ collision_mask = 4 position = Vector2(1.75458, 76) shape = SubResource("RectangleShape2D_2vojv") -[node name="Duck2" parent="YSorted" node_paths=PackedStringArray("_penTarget") instance=ExtResource("62_i36hd")] +[node name="ducks" type="Node2D" parent="YSorted"] + +[node name="Duck2" parent="YSorted/ducks" node_paths=PackedStringArray("_penTarget") instance=ExtResource("62_i36hd")] position = Vector2(4374, 2652) -_penTarget = NodePath("../penSlot1") +_penTarget = NodePath("../../pen/penSlot1") + +[node name="Duck3" parent="YSorted/ducks" node_paths=PackedStringArray("_penTarget") instance=ExtResource("62_i36hd")] +position = Vector2(9259, 3194) +_penTarget = NodePath("../../pen/penSlot2") + +[node name="Duck4" parent="YSorted/ducks" node_paths=PackedStringArray("_penTarget") instance=ExtResource("62_i36hd")] +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")] +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")] +position = Vector2(232, 2862) +_penTarget = NodePath("../../pen/penSlot5") + +[node name="Duck7" parent="YSorted/ducks" node_paths=PackedStringArray("_penTarget") instance=ExtResource("62_i36hd")] +position = Vector2(2409, 3958) +rotation = 3.14159 +scale = Vector2(1, -1) +_penTarget = NodePath("../../pen/penSlot6") -[node name="penSlot1" type="Node2D" parent="YSorted"] +[node name="pen" type="Node2D" parent="YSorted"] + +[node name="penSlot1" type="Node2D" parent="YSorted/pen"] position = Vector2(-5480.62, 2109.14) +[node name="penSlot2" type="Node2D" parent="YSorted/pen"] +position = Vector2(-5030, 2378) + +[node name="penSlot3" type="Node2D" parent="YSorted/pen"] +position = Vector2(-5413, 2856) + +[node name="penSlot4" type="Node2D" parent="YSorted/pen"] +position = Vector2(-4491, 2345) + +[node name="penSlot5" type="Node2D" parent="YSorted/pen"] +position = Vector2(-4659, 2897) + +[node name="penSlot6" type="Node2D" parent="YSorted/pen"] +position = Vector2(-5016, 3361) + [node name="CanvasLayer" parent="." instance=ExtResource("32_2nee2")] [node name="Inventory" parent="CanvasLayer" index="1"]