From af8807610d64309d3d036c174ec647db72011d2f Mon Sep 17 00:00:00 2001 From: kziolkowski Date: Wed, 29 Oct 2025 16:25:31 +0100 Subject: [PATCH] :bug increased interaction area size for fence gates --- scenes/Babushka_scene_farm_outside_2d.tscn | 10 +++++- scenes/Babushka_scene_outside_beets.tscn | 38 +++++++++++++++++++--- 2 files changed, 43 insertions(+), 5 deletions(-) diff --git a/scenes/Babushka_scene_farm_outside_2d.tscn b/scenes/Babushka_scene_farm_outside_2d.tscn index 97e309b..250ec57 100644 --- a/scenes/Babushka_scene_farm_outside_2d.tscn +++ b/scenes/Babushka_scene_farm_outside_2d.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=116 format=3 uid="uid://gigb28qk8t12"] +[gd_scene load_steps=117 format=3 uid="uid://gigb28qk8t12"] [ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/characters/Player2D.tscn" id="1_7wfwe"] [ext_resource type="Texture2D" uid="uid://8sr11ex30n0m" path="res://art/mockups/Kenney_Backgrounds/Samples/uncolored_hills.png" id="2_7b2ri"] @@ -229,6 +229,10 @@ 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("13_7p0hq") shader_parameter/hue_shift = 0.0 @@ -2140,6 +2144,9 @@ position = Vector2(11234, 1850) _spriteToOutline = NodePath("Fence Door") _id = 1 +[node name="CollisionShape3D" parent="YSorted/Blocker/InteractionArea/Area2D" index="0"] +shape = SubResource("CircleShape2D_l7ekk") + [node name="Fence Door" type="Sprite2D" parent="YSorted/Blocker/InteractionArea"] material = SubResource("ShaderMaterial_uxa2m") position = Vector2(1, -271) @@ -2448,6 +2455,7 @@ timeline = "quest2_tomatoes_end" [editable path="YSorted/SeedPickup/PickupInteractionArea"] [editable path="YSorted/SeedPickup2"] [editable path="YSorted/SeedPickup2/PickupInteractionArea"] +[editable path="YSorted/Blocker/InteractionArea"] [editable path="YSorted/trash/trashObject2"] [editable path="YSorted/trash/trashObject3"] [editable path="YSorted/trash/trashObject4"] diff --git a/scenes/Babushka_scene_outside_beets.tscn b/scenes/Babushka_scene_outside_beets.tscn index a14ab81..bbd17ac 100644 --- a/scenes/Babushka_scene_outside_beets.tscn +++ b/scenes/Babushka_scene_outside_beets.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=81 format=3 uid="uid://b3ibx4resa1f3"] +[gd_scene load_steps=85 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"] @@ -28,6 +28,7 @@ [ext_resource type="Texture2D" uid="uid://3ed3dgq3irn2" path="res://art/farm/farming/farmobjekte/zaun/tilable fence end part2.png" id="26_bwvai"] [ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/characters/Player2D.tscn" id="27_qtaxr"] [ext_resource type="Resource" uid="uid://dlcmqfjvgphqu" path="res://resources/items/rake.tres" id="28_le48k"] +[ext_resource type="Resource" uid="uid://cndd64batns31" path="res://resources/items/wateringcan.tres" id="30_dr6bm"] [ext_resource type="Texture2D" uid="uid://dg7rlugnq0t45" path="res://art/farm/farming/farmobjekte/brünnen.png" id="30_lgb3w"] [ext_resource type="PackedScene" uid="uid://cqc72e4hq6bcd" path="res://prefabs/interactions/interaction_area_2d.tscn" id="31_xcb8u"] [ext_resource type="Shader" uid="uid://braevmqauoek7" path="res://shader/swaying_plant.gdshader" id="37_7c2wq"] @@ -38,6 +39,7 @@ [ext_resource type="Texture2D" uid="uid://b644ofy7fml5w" path="res://art/nature/grass/grass-5.png" id="41_0irm8"] [ext_resource type="PackedScene" uid="uid://d20oftcb5qso6" path="res://prefabs/farm/plants/beet_plant.tscn" id="41_vyqmy"] [ext_resource type="Texture2D" uid="uid://badnnid7dgnpk" path="res://art/nature/grass/grass-4.png" id="42_7jeth"] +[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="Script" uid="uid://dhxtdhfqx3bte" path="res://scripts/CSharp/Common/Farming/FieldService2D.cs" id="46_xkmgh"] @@ -120,6 +122,10 @@ 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 @@ -163,6 +169,10 @@ shader_parameter/offset = 0.0 shader = ExtResource("24_anpd4") shader_parameter/tiling_scale = Vector2(1, 20) +[sub_resource type="CircleShape2D" id="CircleShape2D_dr6bm"] +resource_local_to_scene = true +radius = 335.72162 + [sub_resource type="ShaderMaterial" id="ShaderMaterial_lwk6t"] shader = ExtResource("17_lwdq7") shader_parameter/hue_shift = 0.0 @@ -914,6 +924,21 @@ position = Vector2(2693, 1876) _fieldParent = NodePath("../Farm visuals/FieldParent") _hoe = ExtResource("28_le48k") +[node name="Animated Sprites" parent="YSorted/Vesna/CharacterBody2D/visuals" index="0"] +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 @@ -1688,9 +1713,6 @@ metadata/_custom_type_script = "uid://dhxtdhfqx3bte" position = Vector2(651, 2630.26) scale = Vector2(1, 1.00622) -[node name="FieldBehaviour" parent="YSorted/Farm visuals/FieldParent/BaseField" index="0"] -FieldState = 3 - [node name="Beet2" parent="YSorted/Farm visuals/FieldParent/BaseField/FieldBehaviour/PlantPlaceholder" index="0" node_paths=PackedStringArray("_field") instance=ExtResource("41_vyqmy")] _state = 2 _field = NodePath("../..") @@ -1790,6 +1812,9 @@ position = Vector2(3774, 2025) _spriteToOutline = NodePath("Fence Door2") _id = 0 +[node name="CollisionShape3D" parent="YSorted/Blocker/BackToFarm/Area2D" index="0"] +shape = SubResource("CircleShape2D_dr6bm") + [node name="Fence Door2" type="Sprite2D" parent="YSorted/Blocker/BackToFarm"] material = SubResource("ShaderMaterial_lwk6t") position = Vector2(60, -450) @@ -1886,11 +1911,15 @@ playback_type = 2 script = ExtResource("58_m3hs4") [connection signal="FilledWateringCan" from="YSorted/Vesna" to="Audio/SFX/FillWater SFX2" method="PlayOneShot"] +[connection signal="WateringField" from="YSorted/Vesna/FarmingControls" to="Audio/SFX/Watering SFX" method="PlayOneShot"] [connection signal="InteractedTool" from="YSorted/Brünnen/InteractionArea" to="YSorted/Vesna" method="TryFillWateringCan"] [connection signal="FieldCreated" from="YSorted/Farm visuals/FieldParent" to="Audio/SFX/Farming SFX" method="PlayOneShot"] [connection signal="InteractedTool" from="YSorted/Blocker/BackToFarm" to="." method="LoadSceneAtIndex"] [connection signal="finished" from="Audio/Background Music Ramp up" to="Audio/Background Music loop" method="PlayFromOffset"] +[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/BaseField2"] @@ -1901,4 +1930,5 @@ script = ExtResource("58_m3hs4") [editable path="YSorted/Farm visuals/FieldParent/BaseField7"] [editable path="YSorted/Farm visuals/FieldParent/BaseField8"] [editable path="YSorted/Farm visuals/FieldParent/BaseField9"] +[editable path="YSorted/Blocker/BackToFarm"] [editable path="CanvasLayer"]