Jonathan
/
Babushka
2
0
Fork 0
Code Pull Requests 3 Releases Activity

Added Farming SFX

Browse Source
pull/9/head
kziolkowski 7 months ago committed by cblech
parent 4c6d5350b2
commit 07bcab4454
6 changed files with 48 additions and 5 deletions
Show Stats Download Patch File Download Diff File

1
Babushka.sln.DotSettings.user
Unescape View File

@ -1,4 +1,5 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AArea3D_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F8a54226fa2e1c9371a8091f24cfd744aef11fe6869527dc23b9b837623a29b9_003FArea3D_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AAudioStreamPlayer2D_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FSourcesCache_003F848324b1c23114c3f5e8bbb5a42c4ade394c59a7a7a133a66b76581ca571_003FAudioStreamPlayer2D_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACastHelpers_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fd111abf504bf42b5968a609b168fd093b2e200_003Fbb_003F1c116fcd_003FCastHelpers_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ANode_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FSourcesCache_003Ff1d69ec2da76ccf9bc8a75c8e0fdca9a7ba1adf8c8c9d5047e2fa5991c02eca_003FNode_002Ecs/@EntryIndexedValue">ForceIncluded</s:String></wpf:ResourceDictionary>

2
audio/Music/Farming_90BPM_69Bars_Loop.wav.import
Unescape View File

@ -18,7 +18,7 @@ force/max_rate=false
force/max_rate_hz=44100
edit/trim=false
edit/normalize=false
edit/loop_mode=0
edit/loop_mode=2
edit/loop_begin=0
edit/loop_end=-1
compress/mode=2

32
scenes/Babushka_scene_farm_outside_2d.tscn
Unescape View File

@ -1,4 +1,4 @@
[gd_scene load_steps=61 format=3 uid="uid://gigb28qk8t12"]
[gd_scene load_steps=67 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"]
@ -37,6 +37,10 @@
[ext_resource type="Resource" uid="uid://datee0flk1e84" path="res://resources/items/scythe.tres" id="29_wtdui"]
[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="Script" uid="uid://cfnrd5k1k0gxw" path="res://scripts/CSharp/Common/AudioPlayer.cs" id="40_w3jkj"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_wtdui"]
shader = ExtResource("13_7p0hq")
@ -139,6 +143,17 @@ size = Vector2(12082, 1176)
resource_local_to_scene = true
size = Vector2(7340, 1192)
[sub_resource type="AudioStreamPlaylist" id="AudioStreamPlaylist_ceriq"]
loop = false
stream_count = 2
stream_0 = ExtResource("37_di1ed")
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")
[node name="BabushkaSceneFarmOutside2d" type="Node2D"]
[node name="ParallaxBackground" type="ParallaxBackground" parent="."]
@ -900,7 +915,8 @@ polygon = PackedVector2Array(232, -4.80005, 0, 0, 0, -96, -262.4, -97.6, -265.6,
disabled = true
[node name="FieldParent" type="Node2D" parent="YSorted/Farm visuals"]
position = Vector2(48, 0)
position = Vector2(53, 20)
scale = Vector2(1, 0.993819)
script = ExtResource("25_0qu0h")
metadata/_custom_type_script = "uid://dhxtdhfqx3bte"
@ -937,12 +953,20 @@ _inventoryOpenedOffset = -600.0
[node name="Background Music" type="AudioStreamPlayer2D" parent="Audio"]
position = Vector2(4002, 2030)
stream = ExtResource("37_8ey8m")
volume_db = -10.0
stream = SubResource("AudioStreamPlaylist_ceriq")
volume_db = -15.0
autoplay = true
max_distance = 1e+06
[node name="SFX" type="Node" parent="Audio"]
[node name="Farming SFX" type="AudioStreamPlayer2D" parent="Audio/SFX"]
stream = SubResource("AudioStreamRandomizer_ceriq")
max_distance = 2e+07
script = ExtResource("40_w3jkj")
[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"]
[connection signal="mouse_exited" from="YSorted/Farm visuals/FieldParent/Area2D" to="YSorted/Farm visuals/FieldParent" method="MouseExitedAllowedArea"]

14
scripts/CSharp/Common/AudioPlayer.cs
Unescape View File

@ -0,0 +1,14 @@
using Godot;
namespace Babushka.scripts.CSharp.Common;
public partial class AudioPlayer : AudioStreamPlayer2D
{
/// <summary>
/// For SFX and other audio that should be played only once and not looped.
/// </summary>
public void PlayOneShot()
{
Play();
}
}

1
scripts/CSharp/Common/AudioPlayer.cs.uid
Unescape View File

@ -0,0 +1 @@
uid://cfnrd5k1k0gxw

3
scripts/CSharp/Common/Farming/FieldService2D.cs
Unescape View File

@ -9,6 +9,8 @@ public partial class FieldService2D : Node2D
[Export] private Dictionary<Vector2I, FieldBehaviour2D> fields = new Dictionary<Vector2I, FieldBehaviour2D>();
private bool _fieldAllowed = false;
[Signal] public delegate void FieldCreatedEventHandler();
//Validate
@ -33,6 +35,7 @@ public partial class FieldService2D : Node2D
if (!fields.ContainsKey(key))
{
fields.Add(key, field);
EmitSignal(SignalName.FieldCreated);
return true;
}
return false;

Write Preview
Loading…
Cancel
Save