From 28e13e4e80f74c466172a102f11f1d32bcfe5d8e Mon Sep 17 00:00:00 2001 From: kziolkowski Date: Sun, 15 Jun 2025 19:44:16 +0200 Subject: [PATCH] Added WateringCan SFX --- scenes/Babushka_scene_farm_outside_2d.tscn | 18 +++++++++++++++--- .../CSharp/Common/Farming/VesnaBehaviour2D.cs | 2 ++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/scenes/Babushka_scene_farm_outside_2d.tscn b/scenes/Babushka_scene_farm_outside_2d.tscn index d53b589..9a67b8b 100644 --- a/scenes/Babushka_scene_farm_outside_2d.tscn +++ b/scenes/Babushka_scene_farm_outside_2d.tscn @@ -38,8 +38,8 @@ [ext_resource type="PackedScene" uid="uid://cgjc4wurbgimy" path="res://prefabs/UI/Inventory/Inventory.tscn" id="32_2nee2"] [ext_resource type="AudioStream" uid="uid://cfqg50am0swb7" path="res://audio/Music/Farming_90BPM_69Bars_Loop.wav" id="37_8ey8m"] [ext_resource type="AudioStream" uid="uid://dku1rq5cocisg" path="res://audio/Music/Farming_90BPM_69Bars.wav" id="37_di1ed"] -[ext_resource type="AudioStream" uid="uid://vcftvrpi6c7k" path="res://audio/sfx/Farming/SFX_Harke_03_Solo.wav" id="39_di1ed"] -[ext_resource type="AudioStream" uid="uid://bxh5m04vdo0sr" path="res://audio/sfx/Farming/SFX_Harke_04_Solo.wav" id="39_w3jkj"] +[ext_resource type="AudioStream" uid="uid://fsiypqhql67w" path="res://audio/sfx/Farming/SFX_GettingWater_01.wav" id="39_di1ed"] +[ext_resource type="AudioStream" uid="uid://foyw26hq1qp5" path="res://audio/sfx/Farming/SFX_GettingWater_02.wav" id="40_ceriq"] [ext_resource type="Script" uid="uid://cfnrd5k1k0gxw" path="res://scripts/CSharp/Common/AudioPlayer.cs" id="40_w3jkj"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_wtdui"] @@ -152,7 +152,7 @@ stream_1 = ExtResource("37_8ey8m") [sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_ceriq"] streams_count = 2 stream_0/stream = ExtResource("39_di1ed") -stream_1/stream = ExtResource("39_w3jkj") +stream_1/stream = ExtResource("40_ceriq") [node name="BabushkaSceneFarmOutside2d" type="Node2D"] @@ -965,6 +965,18 @@ stream = SubResource("AudioStreamRandomizer_ceriq") max_distance = 2e+07 script = ExtResource("40_w3jkj") +[node name="Watering SFX" type="AudioStreamPlayer2D" parent="Audio/SFX"] +stream = SubResource("AudioStreamRandomizer_ceriq") +max_distance = 2e+07 +script = ExtResource("40_w3jkj") + +[node name="FillWater SFX2" type="AudioStreamPlayer2D" parent="Audio/SFX"] +stream = SubResource("AudioStreamRandomizer_ceriq") +max_distance = 2e+07 +script = ExtResource("40_w3jkj") + +[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="mouse_entered" from="YSorted/Farm visuals/FieldParent/Area2D" to="YSorted/Farm visuals/FieldParent" method="MouseEnteredAllowedArea"] diff --git a/scripts/CSharp/Common/Farming/VesnaBehaviour2D.cs b/scripts/CSharp/Common/Farming/VesnaBehaviour2D.cs index 5d14bce..118ede5 100644 --- a/scripts/CSharp/Common/Farming/VesnaBehaviour2D.cs +++ b/scripts/CSharp/Common/Farming/VesnaBehaviour2D.cs @@ -14,6 +14,7 @@ public partial class VesnaBehaviour2D : Node [Export] private ItemResource _wateringCan; [Signal] public delegate void PickedUpToolEventHandler(bool success, int toolId); + [Signal] public delegate void FilledWateringCanEventHandler(); private InventoryManager _inventoryManager; private InventoryInstance _inventoryInstance; @@ -64,6 +65,7 @@ public partial class VesnaBehaviour2D : Node { _farmingControls.FillWateringCan(true); _player2d.PlayWateringCanFillupAnimation(); + EmitSignal(SignalName.FilledWateringCan); } }