:bug increased interaction area size for fence gates

addons/dialogic/vesna_style.tres

@@ -1,4 +1,4 @@
-[gd_resource type="Resource" script_class="DialogicStyle" load_steps=21 format=3 uid="uid://benfqi2myyn58"]
+[gd_resource type="Resource" script_class="DialogicStyle" load_steps=20 format=3 uid="uid://benfqi2myyn58"]
 
 [ext_resource type="Script" uid="uid://dfx2htp24tuvm" path="res://addons/dialogic/Resources/dialogic_style_layer.gd" id="1_kc0s3"]
 [ext_resource type="PackedScene" uid="uid://c1k5m0w3r40xf" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_FullBackground/full_background_layer.tscn" id="2_wjopr"]
@@ -15,8 +15,9 @@
 script = ExtResource("1_kc0s3")
 overrides = {
 "global_bg_color": "Color(0.898039, 0.917647, 0.835294, 1)",
+"global_font": "\"res://fonts/ShantellSans/static/ShantellSans-Regular.ttf\"",
 "global_font_color": "Color(0.258824, 0.12549, 0.054902, 1)",
-"global_font_size": "30.0"
+"global_font_size": "45.0"
 }
 
 [sub_resource type="Resource" id="Resource_awdqn"]
@@ -26,6 +27,9 @@ scene = ExtResource("2_wjopr")
 [sub_resource type="Resource" id="Resource_5pou4"]
 script = ExtResource("1_kc0s3")
 scene = ExtResource("3_depsi")
+overrides = {
+"portrait_size_mode": "0"
+}
 
 [sub_resource type="Resource" id="Resource_6xrvb"]
 script = ExtResource("1_kc0s3")
@@ -35,14 +39,24 @@ scene = ExtResource("4_wy5ku")
 script = ExtResource("1_kc0s3")
 scene = ExtResource("5_6srh5")
 overrides = {
+"bold_font": "\"res://fonts/ShantellSans/static/ShantellSans-Bold.ttf\"",
+"bold_italics_font": "\"res://fonts/ShantellSans/static/ShantellSans-BoldItalic.ttf\"",
 "box_animation_in": "1",
 "box_animation_out": "1",
+"box_color_custom": "Color(0.88, 0.6688, 0.73568, 1)",
+"box_color_use_global": "false",
 "box_panel": "\"vn_textbox_default_panel.tres\"",
+"box_size": "Vector2(1920, 300)",
+"italics_font": "\"res://fonts/ShantellSans/static/ShantellSans-Italic.ttf\"",
 "name_label_box_modulate": "Color(1, 1, 1, 1)",
+"name_label_box_offset": "Vector2(200, 0)",
 "name_label_box_panel": "\"res://dialog/Babushka_NPC_Namebox_background.tres\"",
-"name_label_custom_font_size": "30.0",
+"name_label_custom_font_size": "40.0",
+"name_label_font": "\"res://fonts/HomemadeApple/HomemadeApple-Regular.ttf\"",
 "name_label_use_global_color": "false",
-"next_indicator_enabled": "false",
+"name_label_use_global_font": "false",
+"next_indicator_texture": "\"res://addons/dialogic/Example Assets/next-indicator/next-indicator-dialogic-2.png\"",
+"normal_font": "\"res://fonts/ShantellSans/static/ShantellSans-Regular.ttf\"",
 "text_alignment": "1",
 "text_size": "40.0",
 "typing_sounds_end_sound": "\"res://audio/sfx/UI/Dialog/SFX_Dialog_Open_01.wav\"",
@@ -73,14 +87,10 @@ scene = ExtResource("8_4ig6v")
 script = ExtResource("1_kc0s3")
 scene = ExtResource("9_gni8k")
 
-[sub_resource type="Resource" id="Resource_uu1x2"]
-script = ExtResource("1_kc0s3")
-scene = ExtResource("6_iipq0")
-
 [resource]
 script = ExtResource("10_l174f")
 name = "vesna_style"
-layer_list = Array[String](["10", "11", "12", "13", "14", "15", "16", "17", "18"])
+layer_list = Array[String](["10", "11", "12", "13", "14", "15", "16", "17"])
 layer_info = {
 "": SubResource("Resource_qnla8"),
 "10": SubResource("Resource_awdqn"),
@@ -90,7 +100,6 @@ layer_info = {
 "14": SubResource("Resource_qtijl"),
 "15": SubResource("Resource_nalij"),
 "16": SubResource("Resource_ymn1b"),
-"17": SubResource("Resource_8j3qh"),
-"18": SubResource("Resource_uu1x2")
+"17": SubResource("Resource_8j3qh")
 }
 metadata/_latest_layer = "13"

dialog/NPC_narrative.tres

@@ -1,4 +1,4 @@
-[gd_resource type="Resource" script_class="DialogicStyle" load_steps=22 format=3 uid="uid://f7q6jac5tsk8"]
+[gd_resource type="Resource" script_class="DialogicStyle" load_steps=21 format=3 uid="uid://f7q6jac5tsk8"]
 
 [ext_resource type="Script" uid="uid://dfx2htp24tuvm" path="res://addons/dialogic/Resources/dialogic_style_layer.gd" id="1_0jwhi"]
 [ext_resource type="PackedScene" uid="uid://cqpb3ie51rwl5" path="res://addons/dialogic/Modules/DefaultLayoutParts/Base_Default/default_layout_base.tscn" id="1_8wrfq"]
@@ -17,8 +17,9 @@ script = ExtResource("1_0jwhi")
 scene = ExtResource("1_8wrfq")
 overrides = {
 "global_bg_color": "Color(0.898375, 0.917922, 0.835355, 1)",
+"global_font": "\"res://fonts/ShantellSans/static/ShantellSans-Regular.ttf\"",
 "global_font_color": "Color(0.257812, 0.125248, 0.0533752, 1)",
-"global_font_size": "30.0"
+"global_font_size": "45.0"
 }
 
 [sub_resource type="Resource" id="Resource_uxnk3"]
@@ -28,6 +29,9 @@ scene = ExtResource("2_8wrfq")
 [sub_resource type="Resource" id="Resource_ihoat"]
 script = ExtResource("1_0jwhi")
 scene = ExtResource("3_t7aeg")
+overrides = {
+"portrait_size_mode": "0"
+}
 
 [sub_resource type="Resource" id="Resource_pw0bl"]
 script = ExtResource("1_0jwhi")
@@ -37,17 +41,27 @@ scene = ExtResource("4_85y6g")
 script = ExtResource("1_0jwhi")
 scene = ExtResource("5_reo2u")
 overrides = {
+"bold_font": "\"res://fonts/ShantellSans/static/ShantellSans-Bold.ttf\"",
+"bold_italics_font": "\"res://fonts/ShantellSans/static/ShantellSans-BoldItalic.ttf\"",
 "box_animation_in": "1",
 "box_animation_out": "1",
 "box_panel": "\"vn_textbox_default_panel.tres\"",
+"box_size": "Vector2(1920, 300)",
+"italics_font": "\"res://fonts/ShantellSans/static/ShantellSans-Italic.ttf\"",
 "name_label_alignment": "2",
 "name_label_box_modulate": "Color(1, 1, 1, 1)",
+"name_label_box_offset": "Vector2(-200, 0)",
 "name_label_box_panel": "\"res://dialog/Babushka_NPC_Namebox_background.tres\"",
 "name_label_custom_font_size": "30.0",
+"name_label_font": "\"res://fonts/HomemadeApple/HomemadeApple-Regular.ttf\"",
 "name_label_use_global_color": "false",
-"next_indicator_enabled": "false",
+"name_label_use_global_font": "false",
+"next_indicator_texture": "\"res://addons/dialogic/Example Assets/next-indicator/next-indicator-dialogic-2.png\"",
+"normal_font": "\"res://fonts/ShantellSans/static/ShantellSans-Regular.ttf\"",
 "text_alignment": "1",
+"text_custom_color": "Color(0.8980392, 0.91764706, 0.8352941, 1)",
 "text_size": "40.0",
+"text_use_global_font": "false",
 "typing_sounds_end_sound": "\"res://audio/sfx/UI/Dialog/SFX_Dialog_Open_01.wav\"",
 "typing_sounds_sounds_folder": "\"res://audio/sfx/typing\""
 }
@@ -76,14 +90,10 @@ scene = ExtResource("8_h83v4")
 script = ExtResource("1_0jwhi")
 scene = ExtResource("9_4c2uo")
 
-[sub_resource type="Resource" id="Resource_0jwhi"]
-script = ExtResource("1_0jwhi")
-scene = ExtResource("6_i6h15")
-
 [resource]
 script = ExtResource("10_e3ue2")
 name = "NPC_narrative"
-layer_list = Array[String](["10", "11", "12", "13", "14", "15", "16", "17", "18"])
+layer_list = Array[String](["10", "11", "12", "13", "14", "15", "16", "17"])
 layer_info = {
 "": SubResource("Resource_wg0yj"),
 "10": SubResource("Resource_uxnk3"),
@@ -93,7 +103,6 @@ layer_info = {
 "14": SubResource("Resource_clhbu"),
 "15": SubResource("Resource_umvdi"),
 "16": SubResource("Resource_ci2ul"),
-"17": SubResource("Resource_sadu5"),
-"18": SubResource("Resource_0jwhi")
+"17": SubResource("Resource_sadu5")
 }
 metadata/_latest_layer = "13"

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)
@@ -2331,10 +2338,6 @@ offset_bottom = 30.2285
 [node name="QuestLogRoot" parent="CanvasLayer" index="2"]
 metadata/_edit_use_anchors_ = true
 
-[node name="Text" parent="CanvasLayer/Control/ColorRect" index="0"]
-text = "[Hier könnte ihre Werbung stehen]"
-autowrap_mode = 3
-
 [node name="Audio" type="Node" parent="."]
 
 [node name="Background Music Ramp up" type="AudioStreamPlayer2D" parent="Audio"]
@@ -2452,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"]

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"]
@@ -77,9 +79,9 @@ colors = PackedColorArray(0.348791, 0.400092, 0.435264, 1, 0.219333, 0.251087, 0
 [sub_resource type="FastNoiseLite" id="FastNoiseLite_ubx8m"]
 
 [sub_resource type="NoiseTexture2D" id="NoiseTexture2D_d53cn"]
-seamless = true
-color_ramp = SubResource("Gradient_kt1wx")
 noise = SubResource("FastNoiseLite_ubx8m")
+color_ramp = SubResource("Gradient_kt1wx")
+seamless = true
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_ubx8m"]
 shader = ExtResource("24_anpd4")
@@ -97,9 +99,9 @@ fractal_gain = 0.795
 domain_warp_enabled = true
 
 [sub_resource type="NoiseTexture2D" id="NoiseTexture2D_e5alv"]
-seamless = true
-color_ramp = SubResource("Gradient_eryax")
 noise = SubResource("FastNoiseLite_wgikv")
+color_ramp = SubResource("Gradient_eryax")
+seamless = true
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_0sfl7"]
 resource_local_to_scene = true
@@ -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
@@ -197,7 +207,7 @@ stream_2/stream = ExtResource("63_td2xu")
 
 [node name="BabushkaSceneFarmOutside2d" type="Node2D"]
 script = ExtResource("1_6krrk")
-_sceneNamesToLoad = PackedStringArray("res://scenes/res://scenes/Babushka_scene_farm_outside_2d.tscn.tscn")
+_sceneNamesToLoad = PackedStringArray("res://scenes/Babushka_scene_farm_outside_2d.tscn")
 
 [node name="Camera2D" type="Camera2D" parent="." node_paths=PackedStringArray("_followNode")]
 position = Vector2(3180, 1961)
@@ -920,6 +930,15 @@ 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
@@ -1694,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("../..")
@@ -1796,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)
@@ -1856,7 +1875,7 @@ offset_bottom = 30.2285
 position = Vector2(4002, 2030)
 stream = SubResource("AudioStreamPlaylist_ceriq")
 autoplay = true
-max_distance = 1e+06
+max_distance = 1000000.0
 bus = &"Music"
 area_mask = 33
 playback_type = 1
@@ -1865,7 +1884,7 @@ script = ExtResource("54_pn8sy")
 [node name="Background Music loop" type="AudioStreamPlayer2D" parent="Audio"]
 position = Vector2(4002, 2030)
 stream = ExtResource("55_aq24k")
-max_distance = 1e+06
+max_distance = 1000000.0
 bus = &"Music"
 area_mask = 33
 playback_type = 1
@@ -1875,19 +1894,19 @@ script = ExtResource("54_pn8sy")
 
 [node name="Farming SFX" type="AudioStreamPlayer2D" parent="Audio/SFX"]
 stream = SubResource("AudioStreamRandomizer_ceriq")
-max_distance = 2e+07
+max_distance = 20000000.0
 playback_type = 2
 script = ExtResource("58_m3hs4")
 
 [node name="Watering SFX" type="AudioStreamPlayer2D" parent="Audio/SFX"]
 stream = SubResource("AudioStreamRandomizer_p4qqi")
-max_distance = 2e+07
+max_distance = 20000000.0
 playback_type = 2
 script = ExtResource("58_m3hs4")
 
 [node name="FillWater SFX2" type="AudioStreamPlayer2D" parent="Audio/SFX"]
 stream = SubResource("AudioStreamRandomizer_618my")
-max_distance = 2e+07
+max_distance = 20000000.0
 playback_type = 2
 script = ExtResource("58_m3hs4")
 
@@ -1899,6 +1918,8 @@ script = ExtResource("58_m3hs4")
 [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"]
@@ -1909,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"]

scripts/CSharp/Common/Farming/VesnaBehaviour2D.cs

@@ -32,6 +32,11 @@ public partial class VesnaBehaviour2D : Node
         _inventoryManager.SlotIndexChanged += HandleInventorySelectedSlotIndexChanged;
     }
 
+    public override void _ExitTree()
+    {
+        _inventoryManager.SlotIndexChanged -= HandleInventorySelectedSlotIndexChanged;
+    }
+
     /// <summary>
     /// Called when picking up an item.
     /// Makes sure that item animations are also updated when they are occupying a currently empty spot.