From 652cac4232c71e80aff3b12b7cdd90db1d4e7ef1 Mon Sep 17 00:00:00 2001 From: kziolkowski Date: Wed, 27 Aug 2025 18:00:26 +0200 Subject: [PATCH] Added typing sounds to dialogic characters --- .../babushka_dialogue_style.tres | 68 ++++++++++++++++++ audio/sfx/SFX_TwigBreaking_01.mp3.import | 4 +- .../sfx/{ => typing}/SFX_Typing_Single_01.wav | Bin .../SFX_Typing_Single_01.wav.import | 6 +- .../sfx/{ => typing}/SFX_Typing_Single_02.wav | Bin .../SFX_Typing_Single_02.wav.import | 6 +- .../sfx/{ => typing}/SFX_Typing_Single_03.wav | Bin .../SFX_Typing_Single_03.wav.import | 6 +- .../sfx/{ => typing}/SFX_Typing_Single_04.wav | Bin .../SFX_Typing_Single_04.wav.import | 6 +- .../sfx/{ => typing}/SFX_Typing_Single_05.wav | Bin .../SFX_Typing_Single_05.wav.import | 6 +- .../sfx/{ => typing}/SFX_Typing_Single_06.wav | Bin .../SFX_Typing_Single_06.wav.import | 6 +- dialog/Characters/Chuga.dch | 15 +++- dialog/Characters/Domovoi.dch | 15 +++- dialog/Characters/Everyone.dch | 15 +++- dialog/Characters/Yeli.dch | 5 +- dialog/NPC_narrative.tres | 6 +- dialog/quests/forest/quest5_forest_end.dtl | 2 +- prefabs/characters/Yeli.tscn | 24 ++++++- project.godot | 3 +- .../CharacterControls/PlayerMovement.cs | 2 - 23 files changed, 160 insertions(+), 35 deletions(-) create mode 100644 addons/babushkahelpers/babushka_dialogue_style.tres rename audio/sfx/{ => typing}/SFX_Typing_Single_01.wav (100%) rename audio/sfx/{ => typing}/SFX_Typing_Single_01.wav.import (51%) rename audio/sfx/{ => typing}/SFX_Typing_Single_02.wav (100%) rename audio/sfx/{ => typing}/SFX_Typing_Single_02.wav.import (51%) rename audio/sfx/{ => typing}/SFX_Typing_Single_03.wav (100%) rename audio/sfx/{ => typing}/SFX_Typing_Single_03.wav.import (51%) rename audio/sfx/{ => typing}/SFX_Typing_Single_04.wav (100%) rename audio/sfx/{ => typing}/SFX_Typing_Single_04.wav.import (51%) rename audio/sfx/{ => typing}/SFX_Typing_Single_05.wav (100%) rename audio/sfx/{ => typing}/SFX_Typing_Single_05.wav.import (51%) rename audio/sfx/{ => typing}/SFX_Typing_Single_06.wav (100%) rename audio/sfx/{ => typing}/SFX_Typing_Single_06.wav.import (51%) diff --git a/addons/babushkahelpers/babushka_dialogue_style.tres b/addons/babushkahelpers/babushka_dialogue_style.tres new file mode 100644 index 0000000..ec319c2 --- /dev/null +++ b/addons/babushkahelpers/babushka_dialogue_style.tres @@ -0,0 +1,68 @@ +[gd_resource type="Resource" script_class="DialogicStyle" load_steps=18 format=3 uid="uid://b2fmyjrydbg57"] + +[ext_resource type="Script" uid="uid://dfx2htp24tuvm" path="res://addons/dialogic/Resources/dialogic_style_layer.gd" id="1_hr3vo"] +[ext_resource type="PackedScene" uid="uid://c1k5m0w3r40xf" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_FullBackground/full_background_layer.tscn" id="2_cpmol"] +[ext_resource type="PackedScene" uid="uid://cn674foxwedqu" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_Input/full_advance_input_layer.tscn" id="3_12uyf"] +[ext_resource type="PackedScene" uid="uid://by6waso0mjpjp" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_SpeakerPortraitTextbox/textbox_with_speaker_portrait.tscn" id="4_ncyk4"] +[ext_resource type="PackedScene" uid="uid://dsbwnp5hegnu3" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_Glossary/glossary_popup_layer.tscn" id="5_qg2g4"] +[ext_resource type="PackedScene" uid="uid://dhk6j6eb6e3q" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_VN_Choices/vn_choice_layer.tscn" id="6_c5ex4"] +[ext_resource type="PackedScene" uid="uid://cvgf4c6gg0tsy" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_TextInput/text_input_layer.tscn" id="7_bopa1"] +[ext_resource type="PackedScene" uid="uid://lx24i8fl6uo" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_History/history_layer.tscn" id="8_oycnw"] +[ext_resource type="Script" uid="uid://b14h380mah4av" path="res://addons/dialogic/Resources/dialogic_style.gd" id="9_i6i1n"] + +[sub_resource type="Resource" id="Resource_w535h"] +script = ExtResource("1_hr3vo") +overrides = {} + +[sub_resource type="Resource" id="Resource_j3dy5"] +script = ExtResource("1_hr3vo") +scene = ExtResource("2_cpmol") +overrides = {} + +[sub_resource type="Resource" id="Resource_d5o1r"] +script = ExtResource("1_hr3vo") +scene = ExtResource("3_12uyf") +overrides = {} + +[sub_resource type="Resource" id="Resource_g7mor"] +script = ExtResource("1_hr3vo") +scene = ExtResource("4_ncyk4") +overrides = {} + +[sub_resource type="Resource" id="Resource_wgjgg"] +script = ExtResource("1_hr3vo") +scene = ExtResource("5_qg2g4") +overrides = {} + +[sub_resource type="Resource" id="Resource_45hxc"] +script = ExtResource("1_hr3vo") +scene = ExtResource("6_c5ex4") +overrides = {} + +[sub_resource type="Resource" id="Resource_c53vn"] +script = ExtResource("1_hr3vo") +scene = ExtResource("7_bopa1") +overrides = {} + +[sub_resource type="Resource" id="Resource_n6k7j"] +script = ExtResource("1_hr3vo") +scene = ExtResource("8_oycnw") +overrides = {} + +[resource] +script = ExtResource("9_i6i1n") +name = "babushka_dialogue_style" +layer_list = Array[String](["10", "11", "12", "13", "14", "15", "16"]) +layer_info = { +"": SubResource("Resource_w535h"), +"10": SubResource("Resource_j3dy5"), +"11": SubResource("Resource_d5o1r"), +"12": SubResource("Resource_g7mor"), +"13": SubResource("Resource_wgjgg"), +"14": SubResource("Resource_45hxc"), +"15": SubResource("Resource_c53vn"), +"16": SubResource("Resource_n6k7j") +} +base_overrides = {} +layers = Array[ExtResource("1_hr3vo")]([]) +metadata/_latest_layer = "" diff --git a/audio/sfx/SFX_TwigBreaking_01.mp3.import b/audio/sfx/SFX_TwigBreaking_01.mp3.import index db635ba..ce2590f 100644 --- a/audio/sfx/SFX_TwigBreaking_01.mp3.import +++ b/audio/sfx/SFX_TwigBreaking_01.mp3.import @@ -13,7 +13,7 @@ dest_files=["res://.godot/imported/SFX_TwigBreaking_01.mp3-8a8846649968a8e0f8e9b [params] loop=false -loop_offset=0 -bpm=0 +loop_offset=0.0 +bpm=0.0 beat_count=0 bar_beats=4 diff --git a/audio/sfx/SFX_Typing_Single_01.wav b/audio/sfx/typing/SFX_Typing_Single_01.wav similarity index 100% rename from audio/sfx/SFX_Typing_Single_01.wav rename to audio/sfx/typing/SFX_Typing_Single_01.wav diff --git a/audio/sfx/SFX_Typing_Single_01.wav.import b/audio/sfx/typing/SFX_Typing_Single_01.wav.import similarity index 51% rename from audio/sfx/SFX_Typing_Single_01.wav.import rename to audio/sfx/typing/SFX_Typing_Single_01.wav.import index 7ffd9dd..d3f8a9a 100644 --- a/audio/sfx/SFX_Typing_Single_01.wav.import +++ b/audio/sfx/typing/SFX_Typing_Single_01.wav.import @@ -3,12 +3,12 @@ importer="wav" type="AudioStreamWAV" uid="uid://dqcbuu7prfbnq" -path="res://.godot/imported/SFX_Typing_Single_01.wav-964e38c5174352aeed44b4107319ee9e.sample" +path="res://.godot/imported/SFX_Typing_Single_01.wav-ec6d960b919de8fef456fdea8bea2177.sample" [deps] -source_file="res://audio/sfx/SFX_Typing_Single_01.wav" -dest_files=["res://.godot/imported/SFX_Typing_Single_01.wav-964e38c5174352aeed44b4107319ee9e.sample"] +source_file="res://audio/sfx/typing/SFX_Typing_Single_01.wav" +dest_files=["res://.godot/imported/SFX_Typing_Single_01.wav-ec6d960b919de8fef456fdea8bea2177.sample"] [params] diff --git a/audio/sfx/SFX_Typing_Single_02.wav b/audio/sfx/typing/SFX_Typing_Single_02.wav similarity index 100% rename from audio/sfx/SFX_Typing_Single_02.wav rename to audio/sfx/typing/SFX_Typing_Single_02.wav diff --git a/audio/sfx/SFX_Typing_Single_02.wav.import b/audio/sfx/typing/SFX_Typing_Single_02.wav.import similarity index 51% rename from audio/sfx/SFX_Typing_Single_02.wav.import rename to audio/sfx/typing/SFX_Typing_Single_02.wav.import index 6a2c8d9..1d6373e 100644 --- a/audio/sfx/SFX_Typing_Single_02.wav.import +++ b/audio/sfx/typing/SFX_Typing_Single_02.wav.import @@ -3,12 +3,12 @@ importer="wav" type="AudioStreamWAV" uid="uid://dgxy8lhauxtvw" -path="res://.godot/imported/SFX_Typing_Single_02.wav-443a7aa27fceae83c3f53b303093a96c.sample" +path="res://.godot/imported/SFX_Typing_Single_02.wav-e1fb3fece74c791ab8138a4c131776dd.sample" [deps] -source_file="res://audio/sfx/SFX_Typing_Single_02.wav" -dest_files=["res://.godot/imported/SFX_Typing_Single_02.wav-443a7aa27fceae83c3f53b303093a96c.sample"] +source_file="res://audio/sfx/typing/SFX_Typing_Single_02.wav" +dest_files=["res://.godot/imported/SFX_Typing_Single_02.wav-e1fb3fece74c791ab8138a4c131776dd.sample"] [params] diff --git a/audio/sfx/SFX_Typing_Single_03.wav b/audio/sfx/typing/SFX_Typing_Single_03.wav similarity index 100% rename from audio/sfx/SFX_Typing_Single_03.wav rename to audio/sfx/typing/SFX_Typing_Single_03.wav diff --git a/audio/sfx/SFX_Typing_Single_03.wav.import b/audio/sfx/typing/SFX_Typing_Single_03.wav.import similarity index 51% rename from audio/sfx/SFX_Typing_Single_03.wav.import rename to audio/sfx/typing/SFX_Typing_Single_03.wav.import index 19deea4..59635d6 100644 --- a/audio/sfx/SFX_Typing_Single_03.wav.import +++ b/audio/sfx/typing/SFX_Typing_Single_03.wav.import @@ -3,12 +3,12 @@ importer="wav" type="AudioStreamWAV" uid="uid://buxdceyvmqd68" -path="res://.godot/imported/SFX_Typing_Single_03.wav-8365036b9c1cc04c0ff6cc3ca3c8c12e.sample" +path="res://.godot/imported/SFX_Typing_Single_03.wav-dddcdf1baa4c63b9ca3bc0c14f2c5d2e.sample" [deps] -source_file="res://audio/sfx/SFX_Typing_Single_03.wav" -dest_files=["res://.godot/imported/SFX_Typing_Single_03.wav-8365036b9c1cc04c0ff6cc3ca3c8c12e.sample"] +source_file="res://audio/sfx/typing/SFX_Typing_Single_03.wav" +dest_files=["res://.godot/imported/SFX_Typing_Single_03.wav-dddcdf1baa4c63b9ca3bc0c14f2c5d2e.sample"] [params] diff --git a/audio/sfx/SFX_Typing_Single_04.wav b/audio/sfx/typing/SFX_Typing_Single_04.wav similarity index 100% rename from audio/sfx/SFX_Typing_Single_04.wav rename to audio/sfx/typing/SFX_Typing_Single_04.wav diff --git a/audio/sfx/SFX_Typing_Single_04.wav.import b/audio/sfx/typing/SFX_Typing_Single_04.wav.import similarity index 51% rename from audio/sfx/SFX_Typing_Single_04.wav.import rename to audio/sfx/typing/SFX_Typing_Single_04.wav.import index 2e8ed2c..e9d9151 100644 --- a/audio/sfx/SFX_Typing_Single_04.wav.import +++ b/audio/sfx/typing/SFX_Typing_Single_04.wav.import @@ -3,12 +3,12 @@ importer="wav" type="AudioStreamWAV" uid="uid://2ktr6rikm3jl" -path="res://.godot/imported/SFX_Typing_Single_04.wav-764c240d5e06802e783d71b97a715dff.sample" +path="res://.godot/imported/SFX_Typing_Single_04.wav-6ab9917f5555b5f9929d12033fdd44c7.sample" [deps] -source_file="res://audio/sfx/SFX_Typing_Single_04.wav" -dest_files=["res://.godot/imported/SFX_Typing_Single_04.wav-764c240d5e06802e783d71b97a715dff.sample"] +source_file="res://audio/sfx/typing/SFX_Typing_Single_04.wav" +dest_files=["res://.godot/imported/SFX_Typing_Single_04.wav-6ab9917f5555b5f9929d12033fdd44c7.sample"] [params] diff --git a/audio/sfx/SFX_Typing_Single_05.wav b/audio/sfx/typing/SFX_Typing_Single_05.wav similarity index 100% rename from audio/sfx/SFX_Typing_Single_05.wav rename to audio/sfx/typing/SFX_Typing_Single_05.wav diff --git a/audio/sfx/SFX_Typing_Single_05.wav.import b/audio/sfx/typing/SFX_Typing_Single_05.wav.import similarity index 51% rename from audio/sfx/SFX_Typing_Single_05.wav.import rename to audio/sfx/typing/SFX_Typing_Single_05.wav.import index 588d84c..016e879 100644 --- a/audio/sfx/SFX_Typing_Single_05.wav.import +++ b/audio/sfx/typing/SFX_Typing_Single_05.wav.import @@ -3,12 +3,12 @@ importer="wav" type="AudioStreamWAV" uid="uid://bijpyqwuxlqqe" -path="res://.godot/imported/SFX_Typing_Single_05.wav-eeab3b806be7ba846c330907fb731892.sample" +path="res://.godot/imported/SFX_Typing_Single_05.wav-a6e837201d0da4aa141a7a107f70b355.sample" [deps] -source_file="res://audio/sfx/SFX_Typing_Single_05.wav" -dest_files=["res://.godot/imported/SFX_Typing_Single_05.wav-eeab3b806be7ba846c330907fb731892.sample"] +source_file="res://audio/sfx/typing/SFX_Typing_Single_05.wav" +dest_files=["res://.godot/imported/SFX_Typing_Single_05.wav-a6e837201d0da4aa141a7a107f70b355.sample"] [params] diff --git a/audio/sfx/SFX_Typing_Single_06.wav b/audio/sfx/typing/SFX_Typing_Single_06.wav similarity index 100% rename from audio/sfx/SFX_Typing_Single_06.wav rename to audio/sfx/typing/SFX_Typing_Single_06.wav diff --git a/audio/sfx/SFX_Typing_Single_06.wav.import b/audio/sfx/typing/SFX_Typing_Single_06.wav.import similarity index 51% rename from audio/sfx/SFX_Typing_Single_06.wav.import rename to audio/sfx/typing/SFX_Typing_Single_06.wav.import index f97e5e2..759e350 100644 --- a/audio/sfx/SFX_Typing_Single_06.wav.import +++ b/audio/sfx/typing/SFX_Typing_Single_06.wav.import @@ -3,12 +3,12 @@ importer="wav" type="AudioStreamWAV" uid="uid://ci2y37lxa8x54" -path="res://.godot/imported/SFX_Typing_Single_06.wav-68a4fb43f26984fd33687883098549ed.sample" +path="res://.godot/imported/SFX_Typing_Single_06.wav-916ff9e458c406a882bb59ada481d859.sample" [deps] -source_file="res://audio/sfx/SFX_Typing_Single_06.wav" -dest_files=["res://.godot/imported/SFX_Typing_Single_06.wav-68a4fb43f26984fd33687883098549ed.sample"] +source_file="res://audio/sfx/typing/SFX_Typing_Single_06.wav" +dest_files=["res://.godot/imported/SFX_Typing_Single_06.wav-916ff9e458c406a882bb59ada481d859.sample"] [params] diff --git a/dialog/Characters/Chuga.dch b/dialog/Characters/Chuga.dch index ebd1048..8473584 100644 --- a/dialog/Characters/Chuga.dch +++ b/dialog/Characters/Chuga.dch @@ -5,8 +5,19 @@ &"color": Color(1, 1, 1, 1), &"custom_info": { "sound_mood_default": "", -"sound_moods": {}, -"style": "" +"sound_moods": { +"Mood 1": { +"mode": 0, +"name": "Mood 1", +"pitch_base": 1.0, +"pitch_variance": 0.0, +"skip_characters": 0.0, +"sound_path": "res://audio/sfx/typing", +"volume_base": 0.0, +"volume_variance": 0.0 +} +}, +"style": "NPC_narrative" }, &"default_portrait": "_tmp", &"description": "helpful spirit forest", diff --git a/dialog/Characters/Domovoi.dch b/dialog/Characters/Domovoi.dch index 806636a..a6e0b5d 100644 --- a/dialog/Characters/Domovoi.dch +++ b/dialog/Characters/Domovoi.dch @@ -5,8 +5,19 @@ &"color": Color(1, 1, 1, 1), &"custom_info": { "sound_mood_default": "", -"sound_moods": {}, -"style": "" +"sound_moods": { +"Mood 1": { +"mode": 0, +"name": "Mood 1", +"pitch_base": 1.0, +"pitch_variance": 0.0, +"skip_characters": 0.0, +"sound_path": "res://audio/sfx/typing", +"volume_base": 0.0, +"volume_variance": 0.0 +} +}, +"style": "NPC_narrative" }, &"default_portrait": "", &"description": "Yeli's Domovoi", diff --git a/dialog/Characters/Everyone.dch b/dialog/Characters/Everyone.dch index e0a035c..fab01e8 100644 --- a/dialog/Characters/Everyone.dch +++ b/dialog/Characters/Everyone.dch @@ -5,8 +5,19 @@ &"color": Color(1, 1, 1, 1), &"custom_info": { "sound_mood_default": "", -"sound_moods": {}, -"style": "" +"sound_moods": { +"Mood 1": { +"mode": 0, +"name": "Mood 1", +"pitch_base": 1.0, +"pitch_variance": 0.0, +"skip_characters": 0.0, +"sound_path": "res://audio/sfx/typing", +"volume_base": 0.0, +"volume_variance": 0.0 +} +}, +"style": "NPC_narrative" }, &"default_portrait": "", &"description": "", diff --git a/dialog/Characters/Yeli.dch b/dialog/Characters/Yeli.dch index 4703cab..ab31057 100644 --- a/dialog/Characters/Yeli.dch +++ b/dialog/Characters/Yeli.dch @@ -12,7 +12,7 @@ "pitch_base": 1.0, "pitch_variance": 0.0, "skip_characters": 0.0, -"sound_path": "", +"sound_path": "res://audio/sfx/typing", "volume_base": 0.0, "volume_variance": 0.0 } @@ -42,7 +42,8 @@ "mirror": false, "offset": Vector2(0, 0), "scale": 1, -"scene": "" +"scene": "", +"sound_mood": "Mood 1" }, "_part_side": { "export_overrides": { diff --git a/dialog/NPC_narrative.tres b/dialog/NPC_narrative.tres index 32487a3..d1b0157 100644 --- a/dialog/NPC_narrative.tres +++ b/dialog/NPC_narrative.tres @@ -47,8 +47,10 @@ overrides = { "name_label_custom_font_size": "30.0", "name_label_use_global_color": "false", "next_indicator_enabled": "false", +"text_alignment": "1", "text_size": "40.0", -"typing_sounds_end_sound": "\"res://audio/sfx/UI/Dialog/SFX_Dialog_Open_01.wav\"" +"typing_sounds_end_sound": "\"res://audio/sfx/UI/Dialog/SFX_Dialog_Open_01.wav\"", +"typing_sounds_sounds_folder": "\"res://audio/sfx/typing\"" } [sub_resource type="Resource" id="Resource_clhbu"] @@ -101,4 +103,4 @@ layer_info = { } base_overrides = {} layers = Array[ExtResource("1_0jwhi")]([]) -metadata/_latest_layer = "15" +metadata/_latest_layer = "" diff --git a/dialog/quests/forest/quest5_forest_end.dtl b/dialog/quests/forest/quest5_forest_end.dtl index 6ba59d5..43b7b58 100644 --- a/dialog/quests/forest/quest5_forest_end.dtl +++ b/dialog/quests/forest/quest5_forest_end.dtl @@ -1,6 +1,6 @@ join Chuga center Chuga: I believe you’ve seen enough for today. Chuga: And yes, you too. -vesna: Thank you for playing! +Chuga: Thank you for playing! do SceneTransition.ChangeSceneToFileThreaded("res://scenes/Babushka_scene_credits.tscn") [end_timeline] diff --git a/prefabs/characters/Yeli.tscn b/prefabs/characters/Yeli.tscn index 4a0bcf4..fc3bde3 100644 --- a/prefabs/characters/Yeli.tscn +++ b/prefabs/characters/Yeli.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=48 format=3 uid="uid://dfvgp1my5rydh"] +[gd_scene load_steps=55 format=3 uid="uid://dfvgp1my5rydh"] [ext_resource type="Texture2D" uid="uid://c34012j5ukiuf" path="res://art/animation/Yeli2D/F01-Yeli_Idle/0001.png" id="1_03m0b"] [ext_resource type="Script" uid="uid://d2486x6upmwqq" path="res://scripts/GdScript/dialogic_starter.gd" id="1_at1n1"] @@ -44,6 +44,12 @@ [ext_resource type="Texture2D" uid="uid://by5vtadhdwwag" path="res://art/animation/Yeli2D/F02-Yeli_Talk/0020.png" id="40_ipyxb"] [ext_resource type="PackedScene" uid="uid://cqc72e4hq6bcd" path="res://prefabs/interactions/interaction_area_2d.tscn" id="42_ahrat"] [ext_resource type="Script" uid="uid://cvkw4qd2hxksi" path="res://scripts/GdScript/dialogic_toggle.gd" id="44_aqu1t"] +[ext_resource type="AudioStream" uid="uid://bsovtqwwqxqc0" path="res://audio/sfx/UI/Dialog/SFX_Dialog_01.wav" id="45_cim3h"] +[ext_resource type="AudioStream" uid="uid://blvs5qmksdvxy" path="res://audio/sfx/UI/Dialog/SFX_Dialog_02.wav" id="46_njpxl"] +[ext_resource type="AudioStream" uid="uid://b7xai1u4pmulg" path="res://audio/sfx/UI/Dialog/SFX_Dialog_03.wav" id="47_qbcgo"] +[ext_resource type="AudioStream" uid="uid://1itiu3ktu2po" path="res://audio/sfx/UI/Dialog/SFX_Dialog_04.wav" id="48_7n5j4"] +[ext_resource type="AudioStream" uid="uid://cvr2el0epo31a" path="res://audio/sfx/UI/Dialog/SFX_Dialog_05.wav" id="49_6twxa"] +[ext_resource type="Script" uid="uid://dx25g14a7xi4w" path="res://scripts/CSharp/Common/Audio/AudioPlayer.cs" id="50_a7v1a"] [sub_resource type="CircleShape2D" id="CircleShape2D_at1n1"] resource_local_to_scene = true @@ -186,6 +192,14 @@ animations = [{ radius = 84.0 height = 168.0 +[sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_ngji7"] +streams_count = 5 +stream_0/stream = ExtResource("45_cim3h") +stream_1/stream = ExtResource("46_njpxl") +stream_2/stream = ExtResource("47_qbcgo") +stream_3/stream = ExtResource("48_7n5j4") +stream_4/stream = ExtResource("49_6twxa") + [node name="Yeli" type="Node2D" node_paths=PackedStringArray("_sprite")] z_index = 1 y_sort_enabled = true @@ -224,9 +238,17 @@ scale = Vector2(0.7, 0.7) script = ExtResource("44_aqu1t") itemToToggle = NodePath("../TalkingControl/AnimatedSprite") +[node name="SFX" type="Node" parent="."] + +[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="SFX"] +stream = SubResource("AudioStreamRandomizer_ngji7") +bus = &"SFX" +script = ExtResource("50_a7v1a") + [connection signal="FinishedTalking" from="." to="InteractionArea" method="SetActiveInverse"] [connection signal="Talking" from="." to="Dialogic starter" method="open"] [connection signal="Interacted" from="InteractionArea" to="." method="ToggleTalking"] [connection signal="timelineEnded" from="DialogicToggle" to="." method="ToggleTalking"] +[connection signal="timelineStarted" from="DialogicToggle" to="SFX/AudioStreamPlayer" method="PlayOneShot"] [editable path="InteractionArea"] diff --git a/project.godot b/project.godot index b8de001..2996b44 100644 --- a/project.godot +++ b/project.godot @@ -75,7 +75,7 @@ variables={ "SHOW": "IGF" } glossary/default_case_sensitive=true -layout/style_list=["res://dialog/NPC_narrative.tres"] +layout/style_list=["res://dialog/NPC_narrative.tres", "res://addons/babushkahelpers/babushka_dialogue_style.tres"] layout/default_style="res://dialog/NPC_narrative.tres" extensions_folder="res://addons/dialogic_additions" text/letter_speed=0.01 @@ -134,6 +134,7 @@ directories/tres_directory={ "SimpleButtonNormal": "res://addons/dialogic/Editor/Events/styles/SimpleButtonNormal.tres", "TextBackground": "res://addons/dialogic/Editor/Events/styles/TextBackground.tres", "TitleBgStylebox": "res://addons/dialogic/Editor/Common/TitleBgStylebox.tres", +"babushka_dialogue_style": "res://addons/babushkahelpers/babushka_dialogue_style.tres", "beet": "res://resources/items/beet.tres", "beetRoot": "res://resources/quests/beetRoot.tres", "choice_panel_focus": "res://addons/dialogic/Modules/DefaultLayoutParts/Layer_VN_Choices/choice_panel_focus.tres", diff --git a/scripts/CSharp/Common/CharacterControls/PlayerMovement.cs b/scripts/CSharp/Common/CharacterControls/PlayerMovement.cs index f2cce59..bb95566 100644 --- a/scripts/CSharp/Common/CharacterControls/PlayerMovement.cs +++ b/scripts/CSharp/Common/CharacterControls/PlayerMovement.cs @@ -51,14 +51,12 @@ public partial class PlayerMovement : CharacterBody2D { _stepTimer.Start(); _stepTimer.SetPaused(false); - GD.Print("Start"); } if (currentVelocity.LengthSquared() == 0 && Velocity.LengthSquared() != 0) { _stepTimer.Stop(); _stepTimer.SetPaused(true); - GD.Print("Stop"); }