diff --git a/Audio/DiJazz.ogg b/Audio/DiJazz.ogg new file mode 100644 index 0000000..774cf35 Binary files /dev/null and b/Audio/DiJazz.ogg differ diff --git a/Audio/DiJazz.ogg.import b/Audio/DiJazz.ogg.import new file mode 100644 index 0000000..f7ed976 --- /dev/null +++ b/Audio/DiJazz.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/DiJazz.ogg-77bab22d4bfb5646c474b7a8065fbc4d.oggstr" + +[deps] + +source_file="res://Audio/DiJazz.ogg" +dest_files=[ "res://.import/DiJazz.ogg-77bab22d4bfb5646c474b7a8065fbc4d.oggstr" ] + +[params] + +loop=true +loop_offset=0 diff --git a/Player.tscn b/Player.tscn index 7b65541..0aae30f 100644 --- a/Player.tscn +++ b/Player.tscn @@ -12,7 +12,7 @@ [ext_resource path="res://Audio/step4.wav" type="AudioStream" id=10] [ext_resource path="res://Audio/step1.wav" type="AudioStream" id=11] [ext_resource path="res://Audio/mixkit-fast-whoosh-transition-1490.wav" type="AudioStream" id=12] -[ext_resource path="res://Audio/PasMenuMusic.ogg" type="AudioStream" id=13] +[ext_resource path="res://Audio/DiJazz.ogg" type="AudioStream" id=13] [ext_resource path="res://Music.gd" type="Script" id=14] [sub_resource type="CapsuleShape" id=2] @@ -170,21 +170,25 @@ wait_time = 0.5 [node name="Step2" type="AudioStreamPlayer3D" parent="."] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -5, 0 ) stream = ExtResource( 8 ) +unit_db = 6.0 bus = "SFX" [node name="Step3" type="AudioStreamPlayer3D" parent="."] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -5, 0 ) stream = ExtResource( 9 ) +unit_db = 6.0 bus = "SFX" [node name="Step1" type="AudioStreamPlayer3D" parent="."] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -5, 0 ) stream = ExtResource( 11 ) +unit_db = 6.0 bus = "SFX" [node name="Step4" type="AudioStreamPlayer3D" parent="."] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -5, 0 ) stream = ExtResource( 10 ) +unit_db = 6.0 bus = "SFX" [node name="AudioCharge" type="AudioStreamPlayer3D" parent="."] diff --git a/Scenes/Enemy.gd b/Scenes/Enemy.gd index 315d5e5..660f3df 100644 --- a/Scenes/Enemy.gd +++ b/Scenes/Enemy.gd @@ -14,6 +14,7 @@ onready var hitbox = $HitBox/CollisionShape onready var particles = $CPUParticles onready var death_timer = $DeathTimer onready var mesh = $MeshInstance +onready var Explosion = $Explosion func _ready(): var rng = RandomNumberGenerator.new() @@ -42,6 +43,7 @@ func get_slapped(slap_level, slap_kill, slap_vector): func get_shot(hitboxOwner): hitboxOwner.die() + Explosion.play() die() func die(): diff --git a/Scenes/Enemy.tscn b/Scenes/Enemy.tscn index 1810afb..d0d5baa 100644 --- a/Scenes/Enemy.tscn +++ b/Scenes/Enemy.tscn @@ -6,6 +6,7 @@ [ext_resource path="res://Textures/MetalCorrodedHeavy001/MetalCorrodedHeavy001_METALNESS_1K_METALNESS.jpg" type="Texture" id=4] [ext_resource path="res://Textures/MetalCorrodedHeavy001/MetalCorrodedHeavy001_Flat.jpg" type="Texture" id=5] [ext_resource path="res://Textures/MetalCorrodedHeavy001/MetalCorrodedHeavy001_NRM_1K_METALNESS.jpg" type="Texture" id=6] +[ext_resource path="res://Audio/boom.wav" type="AudioStream" id=7] [sub_resource type="SphereMesh" id=6] @@ -25,7 +26,6 @@ normal_texture = ExtResource( 6 ) [sub_resource type="SphereShape" id=7] [sub_resource type="SphereShape" id=8] -radius = 1.53964 [sub_resource type="SphereShape" id=9] @@ -102,3 +102,6 @@ scale_amount_curve = SubResource( 15 ) wait_time = 3.0 [connection signal="timeout" from="DeathTimer" to="." method="_on_DeathTimer_timeout"] +[node name="Explosion" type="AudioStreamPlayer3D" parent="."] +stream = ExtResource( 7 ) +bus = "SFX"