diff --git a/assets/Audio/Weapons/rocket-launcher-firing-SBA-300109793.wav b/assets/Audio/Weapons/rocket-launcher-firing-SBA-300109793.wav new file mode 100644 index 0000000..b8975db Binary files /dev/null and b/assets/Audio/Weapons/rocket-launcher-firing-SBA-300109793.wav differ diff --git a/assets/Audio/Weapons/rocket-launcher-firing-SBA-300109793.wav.import b/assets/Audio/Weapons/rocket-launcher-firing-SBA-300109793.wav.import new file mode 100644 index 0000000..e7d0d68 --- /dev/null +++ b/assets/Audio/Weapons/rocket-launcher-firing-SBA-300109793.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://dp71xac3vbsob" +path="res://.godot/imported/rocket-launcher-firing-SBA-300109793.wav-09ce95bbdb743c4434356250cfc57b0e.sample" + +[deps] + +source_file="res://assets/Audio/Weapons/rocket-launcher-firing-SBA-300109793.wav" +dest_files=["res://.godot/imported/rocket-launcher-firing-SBA-300109793.wav-09ce95bbdb743c4434356250cfc57b0e.sample"] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=0 diff --git a/assets/Audio/explosion-1-SBA-300286280.wav b/assets/Audio/explosion-1-SBA-300286280.wav new file mode 100644 index 0000000..32e72b2 Binary files /dev/null and b/assets/Audio/explosion-1-SBA-300286280.wav differ diff --git a/assets/Audio/explosion-1-SBA-300286280.wav.import b/assets/Audio/explosion-1-SBA-300286280.wav.import new file mode 100644 index 0000000..727b26b --- /dev/null +++ b/assets/Audio/explosion-1-SBA-300286280.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://bw7biwaysbxik" +path="res://.godot/imported/explosion-1-SBA-300286280.wav-85fda2d771834d95a74193a594525a5d.sample" + +[deps] + +source_file="res://assets/Audio/explosion-1-SBA-300286280.wav" +dest_files=["res://.godot/imported/explosion-1-SBA-300286280.wav-85fda2d771834d95a74193a594525a5d.sample"] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=0 diff --git a/assets/boombox_broken.tscn b/assets/boombox_broken.tscn index 7299730..4bae688 100644 --- a/assets/boombox_broken.tscn +++ b/assets/boombox_broken.tscn @@ -555,7 +555,7 @@ shadow_mesh = SubResource("ArrayMesh_5m3do") [sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_hp35l"] points = PackedVector3Array(0.0232605, 0.0442351, -0.010081, 0.011892, 0.0439651, -0.00243215, 0.0114977, 0.0270315, 0.0347546, 0.24038, -0.00987622, -0.0269458, 0.0505976, 0.0390113, -0.0156751, -0.0846419, 0.0442351, -0.010081, -0.0838205, 0.0439651, -0.00243215, 0.0227348, 0.0214347, 0.0399813, -0.0818819, 0.0270315, 0.0347546, 0.240018, -0.0268257, 0.0102334, -0.0763619, -0.0197363, -0.0314377, 0.230194, -0.00453337, -0.032285, 0.205485, 0.00250841, -0.0322925, 0.0500061, 0.0137895, 0.0397113, 0.20496, -0.0227292, 0.0230864, -0.0763619, -0.00627198, -0.0362969, -0.0859233, 0.0390113, -0.0156751, -0.0941047, -0.00627198, -0.0362969, -0.0951561, -0.0140759, -0.0366268, -0.0820462, 0.0214347, 0.0399813, 0.229701, -0.0273417, 0.0177622, -0.0763619, -0.0368683, 0.0134279, -0.0763619, -0.0366699, 0.00574908, -0.0763619, -0.0140759, -0.0366268, -0.0952876, -0.0197363, -0.0314377, -0.0830647, 0.0137895, 0.0397113, -0.0763619, -0.0314937, 0.019097, -0.0933819, -0.0366699, 0.00574908, -0.0925276, -0.0368683, 0.0134279, -0.0912133, -0.0314937, 0.019097) -[node name="Boombox_broken" type="Node3D"] +[node name="Boombox_broken" type="Node3D" groups=["scene_rigidbody"]] [node name="part1" type="RigidBody3D" parent="."] collision_layer = 2 diff --git a/assets/rocket.tscn b/assets/rocket.tscn index 307252c..6813b41 100644 --- a/assets/rocket.tscn +++ b/assets/rocket.tscn @@ -92,4 +92,9 @@ collision_mask = 7 [node name="radiusShape" type="CollisionShape3D" parent="BlastRadius"] shape = SubResource("SphereShape3D_vdo7n") +[node name="OmniLight3D" type="OmniLight3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.00975949, 0.807021) +light_color = Color(1, 1, 0.466667, 1) +light_energy = 2.0 + [connection signal="body_shape_entered" from="." to="." method="_on_body_shape_entered"] diff --git a/assets/rocket_explosion.tscn b/assets/rocket_explosion.tscn index 4382557..42fcf33 100644 --- a/assets/rocket_explosion.tscn +++ b/assets/rocket_explosion.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=9 format=3 uid="uid://6p7d7txcox7i"] [ext_resource type="Script" path="res://scripts/die_particles.gd" id="1_ssw3i"] -[ext_resource type="AudioStream" uid="uid://wd061pl0d7rl" path="res://assets/Audio/deep-low-explosion-SBA-300054677.wav" id="5_awm3r"] +[ext_resource type="AudioStream" uid="uid://bw7biwaysbxik" path="res://assets/Audio/explosion-1-SBA-300286280.wav" id="2_thnqf"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_e1gej"] albedo_color = Color(0.586219, 0.0370184, 0.140967, 1) @@ -33,8 +33,9 @@ hue_variation_curve = SubResource("CurveTexture_7652j") [sub_resource type="Skin" id="Skin_v2ayh"] -[node name="rocketexplosion" type="Node3D"] +[node name="rocketexplosion" type="Node3D" node_paths=PackedStringArray("audio_explode")] script = ExtResource("1_ssw3i") +audio_explode = NodePath("Audio/Explosion") [node name="dieParticles" type="GPUParticles3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.17952, 0) @@ -53,6 +54,6 @@ draw_skin = SubResource("Skin_v2ayh") [node name="Audio" type="Node3D" parent="."] -[node name="Die" type="AudioStreamPlayer3D" parent="Audio"] -stream = ExtResource("5_awm3r") +[node name="Explosion" type="AudioStreamPlayer3D" parent="Audio"] +stream = ExtResource("2_thnqf") volume_db = 10.0 diff --git a/assets/rocket_launcher.tscn b/assets/rocket_launcher.tscn index b56e1bd..d64842d 100644 --- a/assets/rocket_launcher.tscn +++ b/assets/rocket_launcher.tscn @@ -4,7 +4,7 @@ [ext_resource type="Script" path="res://scripts/rocket_launcher.gd" id="1_ra4f1"] [ext_resource type="PackedScene" uid="uid://hptaoyu5jeqk" path="res://assets/rocket.tscn" id="2_dmokb"] [ext_resource type="Texture2D" uid="uid://c2hi7c5hl2yk2" path="res://assets/Models/rocketlauncher1.normal.png" id="2_y5wa3"] -[ext_resource type="AudioStream" uid="uid://ba0w04uqqexpn" path="res://assets/Audio/Weapons/machine-gun-m16-double-shot-close-perspective-SBA-300130711.wav" id="5_cf5fu"] +[ext_resource type="AudioStream" uid="uid://dp71xac3vbsob" path="res://assets/Audio/Weapons/rocket-launcher-firing-SBA-300109793.wav" id="5_i3755"] [ext_resource type="AudioStream" uid="uid://t50i483xmj3a" path="res://assets/Audio/Weapons/toy-click-spin-SBA-300071143.wav" id="6_ylsp6"] [ext_resource type="AudioStream" uid="uid://db3iy0f1pa5lg" path="res://assets/Audio/Weapons/gun-m-16-reload-full-clip-magazine-SBA-300121257.wav" id="7_ytr7i"] @@ -386,7 +386,7 @@ libraries = { [node name="Audio" type="Node3D" parent="."] [node name="Fire" type="AudioStreamPlayer3D" parent="Audio"] -stream = ExtResource("5_cf5fu") +stream = ExtResource("5_i3755") volume_db = 7.0 bus = &"SFX" diff --git a/scenes/test_level_2v2 NO ENEMIES.tscn b/scenes/test_level_2v2 NO ENEMIES.tscn index 5b539a1..024f783 100644 --- a/scenes/test_level_2v2 NO ENEMIES.tscn +++ b/scenes/test_level_2v2 NO ENEMIES.tscn @@ -1167,7 +1167,6 @@ gun_2 = ExtResource("2_ayfr5") [node name="Player" parent="." instance=ExtResource("4_4bx26")] transform = Transform3D(-0.866025, 0, -0.5, 0, 1, 0, 0.5, 0, -0.866025, -16.0295, 1.4435, 12.1166) -AUDIO = false weapon_sway_amount = 0.07 weapon_rotation_amount = 0.07 diff --git a/scripts/die_particles.gd b/scripts/die_particles.gd index d28eeef..5589092 100644 --- a/scripts/die_particles.gd +++ b/scripts/die_particles.gd @@ -1,12 +1,12 @@ extends Node3D @onready var die_particles = $dieParticles -@onready var audio_die = $Audio/Die +@export var audio_explode : Node # Called when the node enters the scene tree for the first time. func _ready(): die_particles.emitting = true - audio_die.play() + audio_explode.play() # Called every frame. 'delta' is the elapsed time since the previous frame. func _process(delta):