diff --git a/Game/Assets/Audio/SoundPlayer.gd b/Game/Assets/Audio/SoundPlayer.gd index e2703c3..0505087 100644 --- a/Game/Assets/Audio/SoundPlayer.gd +++ b/Game/Assets/Audio/SoundPlayer.gd @@ -110,6 +110,11 @@ func pick_random(): return randi() % len(clips) @rpc(sync, reliable) func play(): + + # temporary + $AudioStreamPlayer3D.play() + + return # the functionality fo this node is disabled until the Godot not bundling wave files in exports issue is solved var player = voices[voice] voice = (voice + 1) % voices.size() diff --git a/Game/Assets/Effects/ImpactBlood.tscn b/Game/Assets/Effects/ImpactBlood.tscn index 8c2fb51..b0294c0 100644 --- a/Game/Assets/Effects/ImpactBlood.tscn +++ b/Game/Assets/Effects/ImpactBlood.tscn @@ -1,9 +1,10 @@ -[gd_scene load_steps=16 format=3 uid="uid://egphnvwk6cg"] +[gd_scene load_steps=17 format=3 uid="uid://egphnvwk6cg"] [ext_resource type="Script" path="res://Assets/Effects/Impact.gd" id="1"] [ext_resource type="Texture2D" uid="uid://cguy76rs8e220" path="res://Assets/Effects/Flame.png" id="2"] [ext_resource type="Shader" path="res://Assets/Effects/ImpactBlood.gdshader" id="3_4p01j"] [ext_resource type="PackedScene" uid="uid://c5cwnfuw4go1b" path="res://Assets/Audio/SoundPlayer.tscn" id="3_ftpj2"] +[ext_resource type="AudioStream" uid="uid://jimj50xmfbts" path="res://Assets/SFX/Weapons_BulletHitPlayer_01.wav" id="5_0lku5"] [ext_resource type="Texture2D" uid="uid://th4fli1vgo1a" path="res://Assets/Decals/Blood/BloodSplash_albedo.png" id="5_koq4p"] [ext_resource type="Texture2D" uid="uid://pobhi2vhmdpc" path="res://Assets/Decals/Blood/BloodSplash_normal.png" id="6_ak8en"] [ext_resource type="Texture2D" uid="uid://bosf0mht2450i" path="res://Assets/Decals/Blood/BloodSplash_orm.png" id="7_b0035"] @@ -187,6 +188,7 @@ AutoPlay = true RandomizePitch = 0.3 [node name="AudioStreamPlayer3D" parent="SoundPlayer" index="0"] +stream = ExtResource( "5_0lku5" ) unit_db = -3.0 unit_size = 2.0 diff --git a/Game/Assets/Effects/ImpactSparks.tscn b/Game/Assets/Effects/ImpactSparks.tscn index 5789f59..72532f4 100644 --- a/Game/Assets/Effects/ImpactSparks.tscn +++ b/Game/Assets/Effects/ImpactSparks.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=17 format=3 uid="uid://d1yx12uryxl26"] +[gd_scene load_steps=18 format=3 uid="uid://d1yx12uryxl26"] [ext_resource type="Script" path="res://Assets/Effects/Impact.gd" id="1"] [ext_resource type="Texture2D" uid="uid://cguy76rs8e220" path="res://Assets/Effects/Flame.png" id="2"] [ext_resource type="PackedScene" uid="uid://c5cwnfuw4go1b" path="res://Assets/Audio/SoundPlayer.tscn" id="3_oh3bk"] +[ext_resource type="AudioStream" uid="uid://e6h2bvb51xun" path="res://Assets/SFX/Weapons_BulletHitWall_05.wav" id="4_5a6ll"] [ext_resource type="Texture2D" uid="uid://cb584onhet4nd" path="res://Assets/Decals/BulletHits/BulletHitConcrete_albedo.png" id="4_6wvg3"] [ext_resource type="Texture2D" uid="uid://bs08bclmrvacp" path="res://Assets/Decals/BulletHits/BulletHitConcrete_normal.png" id="5_fr6k3"] [ext_resource type="Texture2D" uid="uid://ddncj1g0e27m8" path="res://Assets/Decals/BulletHits/BulletHitConcrete_orm.png" id="6_0nm8w"] @@ -252,6 +253,7 @@ AutoPlay = true RandomizePitch = 0.1 [node name="AudioStreamPlayer3D" parent="SoundPlayer" index="0"] +stream = ExtResource( "4_5a6ll" ) unit_db = -8.0 unit_size = 2.0 diff --git a/Game/Assets/SFX/Weapons_HandgunShot_01.wav b/Game/Assets/SFX/Weapons_HandgunShot_01.wav deleted file mode 120000 index aa513fa..0000000 --- a/Game/Assets/SFX/Weapons_HandgunShot_01.wav +++ /dev/null @@ -1 +0,0 @@ -/data/Projects/Games/Liblast/Game/Assets/SFX/Weapons_Handgun_Shot_01_B.wav \ No newline at end of file diff --git a/Game/Assets/SFX/Weapons_HandgunShot_02.wav b/Game/Assets/SFX/Weapons_HandgunShot_02.wav deleted file mode 120000 index 412697a..0000000 --- a/Game/Assets/SFX/Weapons_HandgunShot_02.wav +++ /dev/null @@ -1 +0,0 @@ -/data/Projects/Games/Liblast/Game/Assets/SFX/Weapons_Handgun_Shot_02_B.wav \ No newline at end of file diff --git a/Game/Assets/SFX/Weapons_HandgunShot_03.wav b/Game/Assets/SFX/Weapons_HandgunShot_03.wav deleted file mode 120000 index faa9567..0000000 --- a/Game/Assets/SFX/Weapons_HandgunShot_03.wav +++ /dev/null @@ -1 +0,0 @@ -/data/Projects/Games/Liblast/Game/Assets/SFX/Weapons_Handgun_Shot_03_B.wav \ No newline at end of file diff --git a/Game/Assets/Weapons/Handgun/Casing.tscn b/Game/Assets/Weapons/Handgun/Casing.tscn index 0e13661..50dc240 100644 --- a/Game/Assets/Weapons/Handgun/Casing.tscn +++ b/Game/Assets/Weapons/Handgun/Casing.tscn @@ -1,9 +1,10 @@ -[gd_scene load_steps=24 format=3 uid="uid://dfwe3bvh8lbbp"] +[gd_scene load_steps=25 format=3 uid="uid://dfwe3bvh8lbbp"] [ext_resource type="PackedScene" uid="uid://b6aa41e8u5cxi" path="res://Assets/Weapons/Handgun/Casing.gltf" id="1"] [ext_resource type="Script" path="res://Assets/Weapons/Handgun/Casing.gd" id="1_kwgjj"] [ext_resource type="PackedScene" uid="uid://c5cwnfuw4go1b" path="res://Assets/Audio/SoundPlayer.tscn" id="3_47hc3"] [ext_resource type="Texture2D" uid="uid://cguy76rs8e220" path="res://Assets/Effects/Flame.png" id="4_p6m1d"] +[ext_resource type="AudioStream" uid="uid://d2siwe07rwepl" path="res://Assets/SFX/Weapons_Handgun_Casing_01.wav" id="4_qmv6c"] [sub_resource type="CylinderShape3D" id="2"] radius = 0.079499 @@ -268,6 +269,7 @@ RandomizePitch = 0.01 Voice_Count = 2 [node name="AudioStreamPlayer3D" parent="Sound" index="0"] +stream = ExtResource( "4_qmv6c" ) unit_db = -12.0 unit_size = 2.0 max_db = -3.0 diff --git a/Game/Assets/Weapons/Weapon.tscn b/Game/Assets/Weapons/Weapon.tscn index 409b4a4..8307094 100644 --- a/Game/Assets/Weapons/Weapon.tscn +++ b/Game/Assets/Weapons/Weapon.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=5 format=3 uid="uid://bemrov0tiy08n"] +[gd_scene load_steps=6 format=3 uid="uid://bemrov0tiy08n"] [ext_resource type="PackedScene" uid="uid://bci2qnohg76xa" path="res://Assets/Weapons/Handgun/Handgun.gltf" id="1"] [ext_resource type="Script" path="res://Assets/Weapons/Weapon.gd" id="2"] [ext_resource type="PackedScene" uid="uid://c5cwnfuw4go1b" path="res://Assets/Audio/SoundPlayer.tscn" id="3_q0xp7"] +[ext_resource type="AudioStream" uid="uid://cw01fxbftb6m2" path="res://Assets/SFX/Weapons_Handgun_Shot_01_B.wav" id="4_4ao2c"] [sub_resource type="Animation" id="1"] resource_name = "Default" @@ -62,6 +63,7 @@ SoundClip = "res://Assets/SFX/Weapons_HandgunShot_01.wav" Voice_Count = 2 [node name="AudioStreamPlayer3D" parent="Handgun/SFX/Shoot" index="0"] +stream = ExtResource( "4_4ao2c" ) unit_db = 8.0 unit_size = 8.0 max_db = 6.0