diff --git a/assets/Audio/Various SFX/desk-bell-ring-SBA-300115355.mp3 b/assets/Audio/Various SFX/desk-bell-ring-SBA-300115355.mp3 new file mode 100644 index 0000000..a2d7e66 Binary files /dev/null and b/assets/Audio/Various SFX/desk-bell-ring-SBA-300115355.mp3 differ diff --git a/assets/Audio/Various SFX/desk-bell-ring-SBA-300115355.mp3.import b/assets/Audio/Various SFX/desk-bell-ring-SBA-300115355.mp3.import new file mode 100644 index 0000000..7f2b85d --- /dev/null +++ b/assets/Audio/Various SFX/desk-bell-ring-SBA-300115355.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://coqv4vwxhs4na" +path="res://.godot/imported/desk-bell-ring-SBA-300115355.mp3-425946ec20468a09bc786cdbdc657cfb.mp3str" + +[deps] + +source_file="res://assets/Audio/Various SFX/desk-bell-ring-SBA-300115355.mp3" +dest_files=["res://.godot/imported/desk-bell-ring-SBA-300115355.mp3-425946ec20468a09bc786cdbdc657cfb.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/Audio/Various SFX/service-bell-ding-single-SBA-300113908.mp3 b/assets/Audio/Various SFX/service-bell-ding-single-SBA-300113908.mp3 new file mode 100644 index 0000000..a3a1865 Binary files /dev/null and b/assets/Audio/Various SFX/service-bell-ding-single-SBA-300113908.mp3 differ diff --git a/assets/Audio/Various SFX/service-bell-ding-single-SBA-300113908.mp3.import b/assets/Audio/Various SFX/service-bell-ding-single-SBA-300113908.mp3.import new file mode 100644 index 0000000..bc476f2 --- /dev/null +++ b/assets/Audio/Various SFX/service-bell-ding-single-SBA-300113908.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://il65grdrp2x3" +path="res://.godot/imported/service-bell-ding-single-SBA-300113908.mp3-80e73337c9364d1a338a20d577c33765.mp3str" + +[deps] + +source_file="res://assets/Audio/Various SFX/service-bell-ding-single-SBA-300113908.mp3" +dest_files=["res://.godot/imported/service-bell-ding-single-SBA-300113908.mp3-80e73337c9364d1a338a20d577c33765.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/player.tscn b/assets/player.tscn index 97e3f22..874fc8c 100644 --- a/assets/player.tscn +++ b/assets/player.tscn @@ -19,7 +19,7 @@ [ext_resource type="Shader" path="res://assets/crtTest.gdshader" id="14_v5svg"] [ext_resource type="AudioStream" uid="uid://c1e6vr2hndho7" path="res://assets/Audio/Weapons/Misc (Ammo Boxes, Holsters, Etc)/Kydex Unholster 002.wav" id="17_1fyjm"] [ext_resource type="AudioStream" uid="uid://dqj4cx05f25jj" path="res://assets/Audio/punch-body-hard-SBA-300156881.wav" id="19_6jglu"] -[ext_resource type="AudioStream" uid="uid://c3cnnyotrri2b" path="res://assets/Audio/Foley Inventory and Interactions/Foley Inventory and Interactions/Drop Item/Drop Jewelery A.wav" id="20_t7lfm"] +[ext_resource type="AudioStream" uid="uid://n3e7s3xucsi1" path="res://assets/Audio/Foley Inventory and Interactions/Foley Inventory and Interactions/Drop Item/Drop Jewelery B.wav" id="20_rvr83"] [sub_resource type="CanvasItemMaterial" id="CanvasItemMaterial_l5ga0"] blend_mode = 1 @@ -243,8 +243,8 @@ stream = ExtResource("17_1fyjm") stream = ExtResource("19_6jglu") [node name="EnemyKilled" type="AudioStreamPlayer" parent="Audio"] -stream = ExtResource("20_t7lfm") -volume_db = 15.0 +stream = ExtResource("20_rvr83") +volume_db = 10.0 pitch_scale = 1.5 [connection signal="tree_entered" from="." to="." method="_on_tree_entered"] diff --git a/blunderbus.tscn b/blunderbus.tscn index b3b516f..d299f5d 100644 --- a/blunderbus.tscn +++ b/blunderbus.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=39 format=4 uid="uid://dqwkal3t4gf2p"] +[gd_scene load_steps=41 format=4 uid="uid://dqwkal3t4gf2p"] [ext_resource type="Script" path="res://scripts/blunderbus.gd" id="1_w46uw"] [ext_resource type="PackedScene" uid="uid://717hhehp83k8" path="res://assets/shotgun_pellet.tscn" id="2_544x3"] @@ -234,6 +234,12 @@ point_count = 2 [sub_resource type="CurveTexture" id="CurveTexture_a61ob"] curve = SubResource("Curve_rmltw") +[sub_resource type="Gradient" id="Gradient_0viso"] +colors = PackedColorArray(1, 1, 1, 1, 1, 1, 1, 0) + +[sub_resource type="GradientTexture1D" id="GradientTexture1D_qejk1"] +gradient = SubResource("Gradient_0viso") + [sub_resource type="Curve" id="Curve_6gtuk"] min_value = -1.0 _data = [Vector2(0, -1), 0.0, 2.8, 0, 0, Vector2(1, 1), 0.0, 0.0, 0, 0] @@ -243,19 +249,19 @@ point_count = 2 curve = SubResource("Curve_6gtuk") [sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_xmjr3"] +particle_flag_rotate_y = true emission_shape = 1 emission_sphere_radius = 0.1 direction = Vector3(-2.315, 0, 0) spread = 9.706 initial_velocity_max = 1.0 gravity = Vector3(0, 0.5, 0) -scale_min = 5.0 -scale_max = 5.0 +color_ramp = SubResource("GradientTexture1D_qejk1") alpha_curve = SubResource("CurveTexture_a61ob") hue_variation_curve = SubResource("CurveTexture_td4g1") turbulence_enabled = true turbulence_noise_strength = 0.0 -turbulence_noise_scale = 0.655 +turbulence_noise_scale = 0.5 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_crqaw"] transparency = 1 @@ -267,7 +273,7 @@ billboard_mode = 1 [sub_resource type="PlaneMesh" id="PlaneMesh_756l0"] material = SubResource("StandardMaterial3D_crqaw") -size = Vector2(0.2, 0.2) +size = Vector2(1, 1) orientation = 2 [sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_ay36f"] @@ -663,6 +669,7 @@ libraries = { } [node name="SmokeTimer" type="Timer" parent="."] +wait_time = 2.0 [node name="Audio" type="Node3D" parent="."] diff --git a/scripts/blunderbus.gd b/scripts/blunderbus.gd index f224311..6e420e1 100644 --- a/scripts/blunderbus.gd +++ b/scripts/blunderbus.gd @@ -88,7 +88,7 @@ func shoot(delta): if level_control.ammo_current[gun_index] > 0: if !anim_player.is_playing(): anim_player.play("shoot") - fire_smoke.emitting = true + barrel_smoke(fire_smoke,true) elif !anim_player.is_playing() and cycle_count != 0: anim_player.play("empty") audio_empty.play() @@ -122,8 +122,8 @@ func reload(): func pellet_spawn(): var pellets_remaining = pellets_per_shot while pellets_remaining > 0: - var lv_x = randf_range(-spread.x,spread.x) - var lv_y = randf_range(-spread.y,spread.y) + var lv_x = rng.randf_range(-spread.x,spread.x) + var lv_y = rng.randf_range(-spread.y,spread.y) # instance bullet var instance_bullet = bullet.instantiate() instance_bullet.position = player.bullet_ray.global_position @@ -135,8 +135,8 @@ func pellet_spawn(): get_tree().get_root().add_child(instance_bullet) pellets_remaining -= 1 -func barrel_smoke(emitting_state): - smoke.emitting = emitting_state +func barrel_smoke(particle_system, emitting_state): + particle_system.emitting = emitting_state smoke_timer.start() func swapped_out(): @@ -144,4 +144,5 @@ func swapped_out(): func _on_smoke_timer_timeout() -> void: - barrel_smoke(false) + barrel_smoke(smoke, false) + barrel_smoke(fire_smoke, false)