diff --git a/prefabs/characters/Player2D.tscn b/prefabs/characters/Player2D.tscn index cb1244a..4e36931 100644 --- a/prefabs/characters/Player2D.tscn +++ b/prefabs/characters/Player2D.tscn @@ -2097,12 +2097,10 @@ script = ExtResource("2_1vqmv") _stepTimer = NodePath("../SFX/FootstepsAudio/Timer") [node name="CollisionShape2D" type="CollisionShape2D" parent="CharacterBody2D"] -visible = false z_index = 1 y_sort_enabled = true position = Vector2(-24, -13) shape = SubResource("CircleShape2D_ssqtd") -disabled = true debug_color = Color(0.923708, 0.202722, 0.475262, 0.42) [node name="visuals" type="Node2D" parent="CharacterBody2D" node_paths=PackedStringArray("_sprite", "_wateringParticles") groups=["Pickup", "PlantGrowing"]] diff --git a/prefabs/characters/Yeli.tscn b/prefabs/characters/Yeli.tscn index fc3bde3..2e4ac29 100644 --- a/prefabs/characters/Yeli.tscn +++ b/prefabs/characters/Yeli.tscn @@ -53,7 +53,7 @@ [sub_resource type="CircleShape2D" id="CircleShape2D_at1n1"] resource_local_to_scene = true -radius = 300.0 +radius = 500.0 [sub_resource type="SpriteFrames" id="SpriteFrames_f6hss"] animations = [{ @@ -208,7 +208,6 @@ _sprite = NodePath("TalkingControl/AnimatedSprite") [node name="InteractionArea" parent="." node_paths=PackedStringArray("_spriteToOutline") instance=ExtResource("42_ahrat")] position = Vector2(0, -450) -scale = Vector2(2.805, 2.805) _spriteToOutline = NodePath("../TalkingControl/AnimatedSprite") [node name="CollisionShape3D" parent="InteractionArea/Area2D" index="0"] diff --git a/prefabs/farm/animals/duck.tscn b/prefabs/farm/animals/duck.tscn index 3edde1e..042f9e0 100644 --- a/prefabs/farm/animals/duck.tscn +++ b/prefabs/farm/animals/duck.tscn @@ -133,7 +133,7 @@ _data = { [sub_resource type="CircleShape2D" id="CircleShape2D_uo3dh"] resource_local_to_scene = true -radius = 443.041 +radius = 200.0 [sub_resource type="ViewportTexture" id="ViewportTexture_4830j"] viewport_path = NodePath("SubViewport") diff --git a/prefabs/interactions/generic_item_on_ground_2d.tscn b/prefabs/interactions/generic_item_on_ground_2d.tscn index c43511a..574dac0 100644 --- a/prefabs/interactions/generic_item_on_ground_2d.tscn +++ b/prefabs/interactions/generic_item_on_ground_2d.tscn @@ -63,7 +63,6 @@ _spriteToOutline = NodePath("../Icon") shape = SubResource("CircleShape2D_tlhp6") [node name="Icon" type="Sprite2D" parent="."] -position = Vector2(5, -300) scale = Vector2(0.868852, 0.868852) texture = ExtResource("5_harr4") diff --git a/scenes/Babushka_scene_farm_outside_2d.tscn b/scenes/Babushka_scene_farm_outside_2d.tscn index 15b7e18..c411938 100644 --- a/scenes/Babushka_scene_farm_outside_2d.tscn +++ b/scenes/Babushka_scene_farm_outside_2d.tscn @@ -171,7 +171,7 @@ radius = 300.0 [sub_resource type="CircleShape2D" id="CircleShape2D_tm0yg"] resource_local_to_scene = true -radius = 300.0 +radius = 200.0 [sub_resource type="ShaderMaterial" id="ShaderMaterial_lhtpe"] @@ -2247,6 +2247,9 @@ position = Vector2(3183, 2369) offset = Vector2(1, -50) region_rect = Rect2(207, 1184, 149, 142) +[node name="InteractionArea" parent="YSorted/trash/trashObject2" index="0"] +position = Vector2(-9, -46) + [node name="trashObject3" parent="YSorted/trash" instance=ExtResource("53_ycj14")] z_index = 0 y_sort_enabled = false @@ -2254,6 +2257,9 @@ position = Vector2(4724, 3519) offset = Vector2(1, -50) region_rect = Rect2(400, 1053, 163, 141) +[node name="InteractionArea" parent="YSorted/trash/trashObject3" index="0"] +position = Vector2(-13, -53) + [node name="trashObject4" parent="YSorted/trash" instance=ExtResource("53_ycj14")] z_index = 0 y_sort_enabled = false @@ -2261,6 +2267,9 @@ position = Vector2(5385, 3391) offset = Vector2(1, -50) region_rect = Rect2(1048, 1092, 348, 106) +[node name="InteractionArea" parent="YSorted/trash/trashObject4" index="0"] +position = Vector2(0, -59) + [node name="trashObject5" parent="YSorted/trash" instance=ExtResource("53_ycj14")] z_index = 0 y_sort_enabled = false @@ -2295,6 +2304,9 @@ rotation = 1.77025 offset = Vector2(0, 0) region_rect = Rect2(1048, 1092, 348, 106) +[node name="InteractionArea" parent="YSorted/trash/trashObject9" index="0"] +position = Vector2(22.40873, 25.05658) + [node name="CanvasLayer" parent="." instance=ExtResource("32_2nee2")] [node name="Inventory" parent="CanvasLayer" index="1"] @@ -2440,4 +2452,8 @@ timeline = "quest2_tomatoes_end" [editable path="YSorted/SeedPickup/PickupInteractionArea"] [editable path="YSorted/SeedPickup2"] [editable path="YSorted/SeedPickup2/PickupInteractionArea"] +[editable path="YSorted/trash/trashObject2"] +[editable path="YSorted/trash/trashObject3"] +[editable path="YSorted/trash/trashObject4"] +[editable path="YSorted/trash/trashObject9"] [editable path="CanvasLayer"]