diff --git a/Nodes/cannon.tscn b/Nodes/cannon.tscn index a6d1f78..54e6cc6 100644 --- a/Nodes/cannon.tscn +++ b/Nodes/cannon.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=4 format=3 uid="uid://byo1m0n20yl45"] +[gd_scene load_steps=5 format=3 uid="uid://byo1m0n20yl45"] [ext_resource type="Script" path="res://scripts/Modules/Cannon.gd" id="1_vdn0s"] [ext_resource type="AudioStream" uid="uid://fj0v7v4wuymk" path="res://Assets/Sounds/_SOUNDFX_/Explosion.wav" id="2_embm1"] +[ext_resource type="AudioStream" uid="uid://dtbjuy3hs2wq7" path="res://Assets/Sounds/_SOUNDFX_/Reload.wav" id="3_6r8s6"] [sub_resource type="BoxShape3D" id="BoxShape3D_sm3et"] size = Vector3(3.10406, 3, 2) @@ -12,7 +13,9 @@ script = ExtResource("1_vdn0s") [node name="CollisionShape3D" type="CollisionShape3D" parent="."] shape = SubResource("BoxShape3D_sm3et") -[node name="AudioStreamPlayer3D" type="AudioStreamPlayer3D" parent="."] +[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] stream = ExtResource("2_embm1") -volume_db = 19.048 -pitch_scale = 0.66 +pitch_scale = 0.43 + +[node name="AudioStreamPlayer2" type="AudioStreamPlayer" parent="."] +stream = ExtResource("3_6r8s6") diff --git a/Nodes/engine.tscn b/Nodes/engine.tscn index 8679959..ce30cff 100644 --- a/Nodes/engine.tscn +++ b/Nodes/engine.tscn @@ -1,6 +1,7 @@ -[gd_scene load_steps=4 format=3 uid="uid://chrtbakf4df4t"] +[gd_scene load_steps=5 format=3 uid="uid://bhivunrkj87cy"] [ext_resource type="Script" path="res://scripts/Modules/Engine.gd" id="1_8ew0t"] +[ext_resource type="AudioStream" uid="uid://di3yqwqsn5v5s" path="res://Assets/Sounds/_SOUNDFX_/Kohle.wav" id="2_3jidn"] [sub_resource type="BoxShape3D" id="BoxShape3D_qba77"] @@ -15,3 +16,6 @@ shape = SubResource("BoxShape3D_qba77") [node name="MeshInstance3D" type="MeshInstance3D" parent="."] mesh = SubResource("BoxMesh_wu8t1") + +[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] +stream = ExtResource("2_3jidn") diff --git a/Nodes/game.tscn b/Nodes/game.tscn index 14bc1be..737c0d5 100644 --- a/Nodes/game.tscn +++ b/Nodes/game.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=7 format=3 uid="uid://db0pxwq1hvs45"] +[gd_scene load_steps=8 format=3 uid="uid://db0pxwq1hvs45"] [ext_resource type="Script" path="res://scripts/Logic/Game.gd" id="1_iox18"] [ext_resource type="PackedScene" uid="uid://bqe8ucbruto1j" path="res://Nodes/StartNode.tscn" id="2_61aog"] @@ -6,6 +6,7 @@ [ext_resource type="PackedScene" uid="uid://md2ofbviios3" path="res://Nodes/Train_P1.tscn" id="3_0be5n"] [ext_resource type="PackedScene" uid="uid://cys06pnxfjl2m" path="res://Nodes/UI.tscn" id="4_kxuy0"] [ext_resource type="PackedScene" uid="uid://bikdn7ep2vpxw" path="res://Nodes/Train_P2.tscn" id="4_lmu0s"] +[ext_resource type="AudioStream" uid="uid://c5jhukuk8r3mf" path="res://Assets/Sounds/_MUSIC_/GameJamGameLoop.wav" id="7_0yxka"] [node name="Game" type="Node"] script = ExtResource("1_iox18") @@ -32,3 +33,8 @@ transform = Transform3D(0.875944, -0.294781, 0.381872, -0.0210188, 0.767515, 0.6 visible = false [node name="Control" parent="." instance=ExtResource("4_kxuy0")] + +[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] +stream = ExtResource("7_0yxka") +volume_db = -27.238 +autoplay = true diff --git a/scripts/Modules/Cannon.gd b/scripts/Modules/Cannon.gd index 1063547..5e1bde1 100644 --- a/scripts/Modules/Cannon.gd +++ b/scripts/Modules/Cannon.gd @@ -23,12 +23,14 @@ func interact(player): if currentStashValue < maxStashValue: currentStashValue += 1 player.clearInventory() + $AudioStreamPlayer2.play() return if player.getResource() == 1: if currentPowderStashValue < maxPowderStashValue: currentPowderStashValue += 1 player.clearInventory() + $AudioStreamPlayer2.play() return return @@ -38,6 +40,6 @@ func shoot(): currentStashValue -= 1 currentPowderStashValue = 0 currentState = STATE.INACTIVE - $AudioStreamPlayer3D.play(0) + $AudioStreamPlayer.play(0) return true return false diff --git a/scripts/Modules/Engine.gd b/scripts/Modules/Engine.gd index 4d11395..5dc88f8 100644 --- a/scripts/Modules/Engine.gd +++ b/scripts/Modules/Engine.gd @@ -22,6 +22,7 @@ func interact(player): if (train.current_speed + refuelRate) <= maxSpeed: train.current_speed += refuelRate player.clearInventory() + $AudioStreamPlayer.play() if train.current_speed >= maxSpeed: train.current_speed = maxSpeed