diff --git a/prefabs/Interactables/inventory_dependent_interactable_test.tscn b/prefabs/Interactables/inventory_dependent_interactable_test.tscn index 78db41d..ae82d35 100644 --- a/prefabs/Interactables/inventory_dependent_interactable_test.tscn +++ b/prefabs/Interactables/inventory_dependent_interactable_test.tscn @@ -9,7 +9,6 @@ script = ExtResource("1_cu47d") _interactionArea = NodePath("InteractionArea") _itemsToReactTo = Array[Object]([ExtResource("2_s5peo")]) -_activateOnItem = true [node name="InteractionArea" parent="." node_paths=PackedStringArray("_spriteToOutline") instance=ExtResource("3_wsetd")] _active = false diff --git a/scenes/Babushka_scene_farm_outside_2d.tscn b/scenes/Babushka_scene_farm_outside_2d.tscn index 83c6cfb..45bf977 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=115 format=3 uid="uid://gigb28qk8t12"] +[gd_scene load_steps=114 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"] @@ -64,7 +64,6 @@ [ext_resource type="Script" uid="uid://dnipeibppjirs" path="res://scripts/CSharp/Common/NPC/DialogicOverlayStarter.cs" id="51_uxa2m"] [ext_resource type="Script" uid="uid://d2486x6upmwqq" path="res://scripts/GdScript/dialogic_starter.gd" id="52_lwk6t"] [ext_resource type="PackedScene" uid="uid://sbf12hin4kes" path="res://prefabs/Interactables/trash_object.tscn" id="53_ycj14"] -[ext_resource type="PackedScene" uid="uid://bs4t0t7o4jmam" path="res://prefabs/Interactables/inventory_dependent_interactable_test.tscn" id="54_fv1t2"] [ext_resource type="PackedScene" uid="uid://muuxxgvx33fp" path="res://prefabs/farm/duck.tscn" id="62_i36hd"] [ext_resource type="Script" uid="uid://cldtt4atgymm5" path="res://scripts/CSharp/Common/Quest/QuestTrigger.cs" id="66_2065p"] [ext_resource type="Resource" uid="uid://cm8kftow8br00" path="res://resources/quests/demo/1_talk_yeli_1.tres" id="67_tm0yg"] @@ -1100,6 +1099,9 @@ _blueprint = ExtResource("35_64mdn") [node name="CollisionShape3D" parent="YSorted/SeedPickup/PickupInteractionArea/Area2D" index="0"] shape = SubResource("CircleShape2D_tm0yg") +[node name="Icon" parent="YSorted/SeedPickup" index="4"] +scale = Vector2(1, 1) + [node name="Farm visuals" type="Node2D" parent="YSorted"] position = Vector2(-60, 122) @@ -1375,18 +1377,6 @@ offset = Vector2(0, -172) region_enabled = true region_rect = Rect2(1837, 651, 139, 180) -[node name="bush24" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] -modulate = Color(0.8428, 0.8771, 0.98, 1) -z_index = 2 -y_sort_enabled = true -material = SubResource("ShaderMaterial_bcdgk") -position = Vector2(15973, 3380) -scale = Vector2(-1.93815, 1.5875) -texture = ExtResource("14_mrwmr") -offset = Vector2(0, -172) -region_enabled = true -region_rect = Rect2(1464, 419, 144, 115) - [node name="bush3" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] modulate = Color(1, 0.86, 0.86, 1) material = SubResource("ShaderMaterial_bcdgk") @@ -1957,7 +1947,7 @@ region_rect = Rect2(29, 204, 219, 159) [node name="grass5" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/grass"] z_index = -5 -position = Vector2(15375, 3149) +position = Vector2(15381, 3152) scale = Vector2(5.77602, 3.87779) texture = ExtResource("44_uxa2m") region_enabled = true @@ -2276,9 +2266,6 @@ rotation = 1.77025 offset = Vector2(0, 0) region_rect = Rect2(1048, 1092, 348, 106) -[node name="InventoryDependentInteractableTest" parent="YSorted" instance=ExtResource("54_fv1t2")] -position = Vector2(10868, 3000) - [node name="CanvasLayer" parent="." instance=ExtResource("32_2nee2")] [node name="Inventory" parent="CanvasLayer" index="1"]