From ffa20bbdf8586b85809d1504770494ca7cc3f45a Mon Sep 17 00:00:00 2001 From: kziolkowski Date: Fri, 11 Jul 2025 00:56:51 +0200 Subject: [PATCH] Added trash to first outdoor scene --- prefabs/Interactables/trash_object.tscn | 44 +++++++++++++++++++ scenes/Babushka_scene_farm_outside_2d.tscn | 42 +++++++++++++++++- scenes/Babushka_scene_indoor_common_room.tscn | 35 ++++++++++++--- 3 files changed, 115 insertions(+), 6 deletions(-) create mode 100644 prefabs/Interactables/trash_object.tscn diff --git a/prefabs/Interactables/trash_object.tscn b/prefabs/Interactables/trash_object.tscn new file mode 100644 index 0000000..dc1a121 --- /dev/null +++ b/prefabs/Interactables/trash_object.tscn @@ -0,0 +1,44 @@ +[gd_scene load_steps=15 format=3 uid="uid://sbf12hin4kes"] + +[ext_resource type="Texture2D" uid="uid://bylgmr0skwtrs" path="res://art/farm/farming/farmobjekte/broken tools atlas.png" id="1_k4ca3"] +[ext_resource type="PackedScene" uid="uid://cqc72e4hq6bcd" path="res://prefabs/interactions/interaction_area_2d.tscn" id="2_gcgfd"] +[ext_resource type="AudioStream" uid="uid://be6g8b3v3u1ai" path="res://audio/sfx/Kitchen/SFX_Cooking_Knife_PickUp_01.wav" id="3_ktmp7"] +[ext_resource type="AudioStream" uid="uid://cgjsajsdrrn0j" path="res://audio/sfx/Kitchen/SFX_Cooking_Knife_PutDown_01.wav" id="4_ic616"] +[ext_resource type="AudioStream" uid="uid://br4drgupled6c" path="res://audio/sfx/Kitchen/SFX_Cooking_Pot_01.wav" id="5_dx175"] +[ext_resource type="AudioStream" uid="uid://dd3qyaox6mx4i" path="res://audio/sfx/Kitchen/SFX_Cooking_Pot_02.wav" id="6_u7jgg"] +[ext_resource type="AudioStream" uid="uid://b1qhh35hugoy0" path="res://audio/sfx/Kitchen/SFX_Cooking_Pot_03.wav" id="7_bu430"] +[ext_resource type="AudioStream" uid="uid://ceob726q4obuw" path="res://audio/sfx/Kitchen/SFX_Cooking_Utensils_02.wav" id="8_gnu24"] +[ext_resource type="AudioStream" uid="uid://tjuxapc4wuss" path="res://audio/sfx/Kitchen/SFX_Cutlery_02.wav" id="9_vmxy4"] +[ext_resource type="AudioStream" uid="uid://duiyhe7yiyotb" path="res://audio/sfx/Kitchen/SFX_Cutlery_03.wav" id="10_aqih4"] +[ext_resource type="AudioStream" uid="uid://bc216pfieuc8h" path="res://audio/sfx/Kitchen/SFX_Cutlery_04.wav" id="11_kb03l"] +[ext_resource type="AudioStream" uid="uid://dp6qen84ptlvx" path="res://audio/sfx/Kitchen/SFX_Cutlery_05.wav" id="12_kka6u"] +[ext_resource type="Script" uid="uid://cfnrd5k1k0gxw" path="res://scripts/CSharp/Common/AudioPlayer.cs" id="13_wswkg"] + +[sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_dich4"] +streams_count = 10 +stream_0/stream = ExtResource("3_ktmp7") +stream_1/stream = ExtResource("4_ic616") +stream_2/stream = ExtResource("5_dx175") +stream_3/stream = ExtResource("6_u7jgg") +stream_4/stream = ExtResource("7_bu430") +stream_5/stream = ExtResource("8_gnu24") +stream_6/stream = ExtResource("9_vmxy4") +stream_7/stream = ExtResource("10_aqih4") +stream_8/stream = ExtResource("11_kb03l") +stream_9/stream = ExtResource("12_kka6u") + +[node name="trashObject" type="Sprite2D"] +texture = ExtResource("1_k4ca3") +region_enabled = true +region_rect = Rect2(57, 493, 334, 475) + +[node name="InteractionArea" parent="." instance=ExtResource("2_gcgfd")] + +[node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="."] +stream = SubResource("AudioStreamRandomizer_dich4") +bus = &"SFX" +playback_type = 2 +script = ExtResource("13_wswkg") + +[connection signal="Interacted" from="InteractionArea" to="." method="queue_free"] +[connection signal="Interacted" from="InteractionArea" to="AudioStreamPlayer2D" method="PlayOneShot"] diff --git a/scenes/Babushka_scene_farm_outside_2d.tscn b/scenes/Babushka_scene_farm_outside_2d.tscn index 24cb296..2689d12 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=101 format=3 uid="uid://gigb28qk8t12"] +[gd_scene load_steps=102 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"] @@ -63,6 +63,7 @@ [ext_resource type="Script" uid="uid://l6iq8rpym5io" path="res://scripts/CSharp/Common/Util/Counter.cs" id="49_uxa2m"] [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://muuxxgvx33fp" path="res://prefabs/farm/duck.tscn" id="62_i36hd"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_wtdui"] @@ -2183,6 +2184,44 @@ position = Vector2(-4659, 2897) [node name="penSlot6" type="Node2D" parent="YSorted/pen"] position = Vector2(-5016, 3361) +[node name="trash" type="Node2D" parent="YSorted"] + +[node name="trashObject" parent="YSorted/trash" instance=ExtResource("53_ycj14")] +position = Vector2(1269, 3170) + +[node name="trashObject2" parent="YSorted/trash" instance=ExtResource("53_ycj14")] +position = Vector2(3183, 2369) +region_rect = Rect2(207, 1184, 149, 142) + +[node name="trashObject3" parent="YSorted/trash" instance=ExtResource("53_ycj14")] +position = Vector2(4724, 3519) +region_rect = Rect2(400, 1053, 163, 141) + +[node name="trashObject4" parent="YSorted/trash" instance=ExtResource("53_ycj14")] +position = Vector2(5385, 3391) +region_rect = Rect2(1048, 1092, 348, 106) + +[node name="trashObject5" parent="YSorted/trash" instance=ExtResource("53_ycj14")] +position = Vector2(8051, 2541) +region_rect = Rect2(531, 1207, 176, 167) + +[node name="trashObject6" parent="YSorted/trash" instance=ExtResource("53_ycj14")] +position = Vector2(9629, 3312) +region_rect = Rect2(207, 1184, 149, 142) + +[node name="trashObject7" parent="YSorted/trash" instance=ExtResource("53_ycj14")] +position = Vector2(12050, 3391) + +[node name="trashObject8" parent="YSorted/trash" instance=ExtResource("53_ycj14")] +position = Vector2(14589, 2505) +rotation = 1.77025 +region_rect = Rect2(629, 81, 227, 829) + +[node name="trashObject9" parent="YSorted/trash" instance=ExtResource("53_ycj14")] +position = Vector2(15197, 3447) +rotation = 1.77025 +region_rect = Rect2(1048, 1092, 348, 106) + [node name="CanvasLayer" parent="." instance=ExtResource("32_2nee2")] [node name="Inventory" parent="CanvasLayer" index="1"] @@ -2278,4 +2317,5 @@ script = ExtResource("40_w3jkj") [editable path="YSorted/ScytheGenericPickup/InteractionArea2"] [editable path="YSorted/ShovelGenericPickup"] [editable path="YSorted/ShovelGenericPickup/InteractionArea2"] +[editable path="YSorted/trash/trashObject"] [editable path="CanvasLayer"] diff --git a/scenes/Babushka_scene_indoor_common_room.tscn b/scenes/Babushka_scene_indoor_common_room.tscn index aaeb212..b7e5e31 100644 --- a/scenes/Babushka_scene_indoor_common_room.tscn +++ b/scenes/Babushka_scene_indoor_common_room.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=32 format=3 uid="uid://bm21nqepnwaik"] +[gd_scene load_steps=40 format=3 uid="uid://bm21nqepnwaik"] [ext_resource type="Script" uid="uid://cssdu8viimwm6" path="res://scripts/CSharp/Common/SceneTransition.cs" id="1_3vr4f"] [ext_resource type="Texture2D" uid="uid://cnhsxxps2cw5" path="res://art/indoor/room export/Room_01_table.png" id="2_ubg3a"] @@ -18,10 +18,17 @@ [ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/characters/Player2D.tscn" id="15_7a68a"] [ext_resource type="Script" uid="uid://31p67cdowuw4" path="res://scripts/CSharp/Common/Animation/AnimationStarter.cs" id="15_27bwy"] [ext_resource type="Texture2D" uid="uid://c4q12jiligcl7" path="res://art/animals/katze.png" id="15_sndxu"] +[ext_resource type="AudioStream" uid="uid://cohyenfo1rtxh" path="res://audio/sfx/Animals/SFX_Cat_Meow_01.wav" id="16_d7yky"] [ext_resource type="PackedScene" uid="uid://dfvgp1my5rydh" path="res://prefabs/characters/Yeli.tscn" id="16_dhsxs"] +[ext_resource type="AudioStream" uid="uid://b2cmf5ie7cwka" path="res://audio/sfx/Animals/SFX_Cat_Meow_02.wav" id="17_7a68a"] [ext_resource type="Script" uid="uid://cvkw4qd2hxksi" path="res://scripts/GdScript/dialogic_toggle.gd" id="17_k0k8c"] +[ext_resource type="AudioStream" uid="uid://cttisejnt2l8f" path="res://audio/sfx/Animals/SFX_Cat_Meow_03.wav" id="18_dhsxs"] [ext_resource type="Script" uid="uid://bqomwxclsbhd3" path="res://scripts/CSharp/Common/Camera/CameraController.cs" id="18_dw4nn"] +[ext_resource type="AudioStream" uid="uid://cbmagiou0n0t3" path="res://audio/sfx/Animals/SFX_Cat_Meow_04.wav" id="19_k0k8c"] +[ext_resource type="AudioStream" uid="uid://bk1bj01fokjp7" path="res://audio/sfx/Animals/SFX_Cat_Meow_05.wav" id="20_dw4nn"] [ext_resource type="Script" uid="uid://cldtt4atgymm5" path="res://scripts/CSharp/Common/Quest/QuestTrigger.cs" id="21_blyw3"] +[ext_resource type="AudioStream" uid="uid://r2f6xmjvyyjv" path="res://audio/sfx/Animals/SFX_Cat_Purr_01.wav" id="21_ytap8"] +[ext_resource type="Script" uid="uid://cfnrd5k1k0gxw" path="res://scripts/CSharp/Common/AudioPlayer.cs" id="22_tggq2"] [ext_resource type="Resource" uid="uid://cbpurnewhyefa" path="res://resources/quests/beetRoot.tres" id="22_yd2gv"] [ext_resource type="PackedScene" uid="uid://cgjc4wurbgimy" path="res://prefabs/UI/Inventory/Inventory.tscn" id="24_yd2gv"] @@ -33,6 +40,15 @@ size = Vector2(3836, 1086) resource_local_to_scene = true radius = 300.0 +[sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_b6vf7"] +streams_count = 6 +stream_0/stream = ExtResource("16_d7yky") +stream_1/stream = ExtResource("17_7a68a") +stream_2/stream = ExtResource("18_dhsxs") +stream_3/stream = ExtResource("19_k0k8c") +stream_4/stream = ExtResource("20_dw4nn") +stream_5/stream = ExtResource("21_ytap8") + [sub_resource type="Animation" id="Animation_j5d18"] length = 0.001 tracks/0/type = "value" @@ -192,7 +208,7 @@ _data = { [sub_resource type="CircleShape2D" id="CircleShape2D_wuntg"] resource_local_to_scene = true -radius = 300.0 +radius = 209.703 [sub_resource type="CircleShape2D" id="CircleShape2D_yd2gv"] resource_local_to_scene = true @@ -370,6 +386,11 @@ scale = Vector2(2, 2) texture = ExtResource("15_sndxu") offset = Vector2(-8, -126) +[node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="BackWall/Katze"] +stream = SubResource("AudioStreamRandomizer_b6vf7") +bus = &"SFX" +script = ExtResource("22_tggq2") + [node name="Room assets" type="Node" parent="BackWall"] [node name="wood" type="Sprite2D" parent="BackWall/Room assets"] @@ -490,15 +511,18 @@ offset = Vector2(0, -296) region_enabled = true region_rect = Rect2(2576, 802, 219, 64) +[node name="InteractionArea" parent="BackWall" instance=ExtResource("11_gpagp")] +position = Vector2(-4064, 244) + [node name="Vesna" parent="." instance=ExtResource("15_7a68a")] -position = Vector2(-1464, 136) +position = Vector2(-920, 319) [node name="Yeli" parent="." instance=ExtResource("16_dhsxs")] -position = Vector2(-2912, 432) +position = Vector2(-1395, 16) _timelinesToPlay = PackedStringArray("quest3_beets_start") [node name="CollisionShape3D" parent="Yeli/InteractionArea/Area2D" index="0"] -position = Vector2(-205.348, 131.907) +position = Vector2(-207.487, 136.185) shape = SubResource("CircleShape2D_wuntg") [node name="Label" parent="Yeli/InteractionArea" index="1"] @@ -550,6 +574,7 @@ _id = 1 [connection signal="Interacted" from="BackWall/Room01PechkaDoor/InteractionArea" to="BackWall/Room01PechkaDoor/InteractionArea" method="ToggleActive"] [connection signal="Interacted" from="BackWall/Room01PechkaDoor/InteractionArea" to="BackWall/Room assets/hand" method="PlayAnimation"] +[connection signal="Interacted" from="BackWall/InteractionArea" to="BackWall/Katze/AudioStreamPlayer2D" method="PlayOneShot"] [connection signal="timelineEnded" from="Yeli/dialogic_toggle" to="Yeli/Beetroot Quest trigger" method="Trigger"] [connection signal="InteractedTool" from="VesnasRoomDoor" to="." method="LoadSceneAtIndex"] [connection signal="InteractedTool" from="OutsideDoor" to="." method="LoadSceneAtIndex"]