diff --git a/Assets/SFX/Weapons-Pistol-Reload.wav b/Assets/SFX/Weapons-Handgun-Reload.wav similarity index 100% rename from Assets/SFX/Weapons-Pistol-Reload.wav rename to Assets/SFX/Weapons-Handgun-Reload.wav diff --git a/Assets/Weapons/Handgun/Handgun.tscn b/Assets/Weapons/Handgun/Handgun.tscn index fc878ca..45f7eff 100644 --- a/Assets/Weapons/Handgun/Handgun.tscn +++ b/Assets/Weapons/Handgun/Handgun.tscn @@ -1,9 +1,11 @@ -[gd_scene load_steps=12 format=2] +[gd_scene load_steps=14 format=2] [ext_resource path="res://Assets/Weapons/Handgun/Handgun.gltf" type="PackedScene" id=1] [ext_resource path="res://Assets/Weapons/Weapon.gd" type="Script" id=2] [ext_resource path="res://Assets/SFX/Weapons-Handgun-Shoot.wav" type="AudioStream" id=3] [ext_resource path="res://Assets/Effects/CircleSoft.svg" type="Texture" id=4] +[ext_resource path="res://Assets/SFX/Weapons-Empty.wav" type="AudioStream" id=5] +[ext_resource path="res://Assets/SFX/Weapons-Handgun-Reload.wav" type="AudioStream" id=6] [sub_resource type="Gradient" id=1] offsets = PoolRealArray( 0, 0.0511628, 0.0883721, 0.302326, 1 ) @@ -71,4 +73,10 @@ transform = Transform( -1.62921e-07, -1, 0, 1, -1.62921e-07, 0, 0, 0, 1, -0.0373 [node name="SoundShoot" type="AudioStreamPlayer3D" parent="."] stream = ExtResource( 3 ) +[node name="SoundEmpty" type="AudioStreamPlayer3D" parent="."] +stream = ExtResource( 5 ) + +[node name="SoundReload" type="AudioStreamPlayer3D" parent="."] +stream = ExtResource( 6 ) + [editable path="Handgun"] diff --git a/Assets/Weapons/Weapon.gd b/Assets/Weapons/Weapon.gd index 7a98733..1cdf0d9 100644 --- a/Assets/Weapons/Weapon.gd +++ b/Assets/Weapons/Weapon.gd @@ -141,3 +141,4 @@ func reload(): sync func play_reload_animation(): $Handgun/AnimationPlayer.play("Reload", 0.5, 1) + $SoundReload.play()