From 8ce7e3081d33a9fe4549e432ae77ecb142cf47de Mon Sep 17 00:00:00 2001 From: PfandBoss <68470553+PfandBoss@users.noreply.github.com> Date: Sat, 10 Dec 2022 23:05:06 +0100 Subject: [PATCH] Added shooting sound --- Nodes/Train_P1.tscn | 4 ++-- Nodes/Train_P2.tscn | 31 +++++++++++++++++++++++++++++-- Nodes/cannon.tscn | 8 +++++++- Nodes/game.tscn | 2 +- project.godot | 2 +- scripts/Modules/Cannon.gd | 2 +- 6 files changed, 41 insertions(+), 8 deletions(-) diff --git a/Nodes/Train_P1.tscn b/Nodes/Train_P1.tscn index ed87119..d8d140f 100644 --- a/Nodes/Train_P1.tscn +++ b/Nodes/Train_P1.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=22 format=3 uid="uid://md2ofbviios3"] [ext_resource type="Script" path="res://scripts/Train.gd" id="1_0x664"] -[ext_resource type="PackedScene" uid="uid://chrtbakf4df4t" path="res://Nodes/engine.tscn" id="3_1ix85"] +[ext_resource type="PackedScene" uid="uid://bhivunrkj87cy" path="res://Nodes/engine.tscn" id="3_1ix85"] [ext_resource type="PackedScene" uid="uid://vwjd5od63jgh" path="res://Nodes/Player.tscn" id="3_in6up"] [ext_resource type="PackedScene" uid="uid://c1mymb38wqdg6" path="res://Nodes/train.tscn" id="3_jmv6b"] [ext_resource type="PackedScene" uid="uid://cet80w4yr8rse" path="res://Storage.tscn" id="4_5jw5g"] @@ -110,7 +110,7 @@ shape = SubResource("BoxShape3D_sm5ue") transform = Transform3D(1, 0, -3.55271e-15, 0, 1, 0, 3.55271e-15, 0, 1, 3.19744e-14, 3, -9) [node name="AnimatedSprite3D" type="AnimatedSprite3D" parent="CharacterBody3D"] -transform = Transform3D(0.3, 0, 0, 0, -1.31134e-08, 0.3, 0, -0.3, -1.31134e-08, 0, -1, 0) +transform = Transform3D(0.3, 0, 0, 0, -1.31134e-08, 0.3, 0, -0.3, -1.31134e-08, 0, -2, 0) frames = SubResource("SpriteFrames_6p0y6") animation = &"walking_coal" speed_scale = 2.0 diff --git a/Nodes/Train_P2.tscn b/Nodes/Train_P2.tscn index 2a43a2b..7ee3344 100644 --- a/Nodes/Train_P2.tscn +++ b/Nodes/Train_P2.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=19 format=3 uid="uid://bikdn7ep2vpxw"] +[gd_scene load_steps=23 format=3 uid="uid://bikdn7ep2vpxw"] [ext_resource type="Script" path="res://scripts/Train.gd" id="1_mcmgl"] [ext_resource type="PackedScene" uid="uid://c1mymb38wqdg6" path="res://Nodes/train.tscn" id="2_xoa1a"] @@ -13,6 +13,10 @@ [ext_resource type="Texture2D" uid="uid://djsergj3l4t2c" path="res://o_walking_ball2.png" id="9_rt6ws"] [ext_resource type="Texture2D" uid="uid://ctssikrodjqvc" path="res://o_walking_powder2.png" id="11_eefgn"] [ext_resource type="Texture2D" uid="uid://nctqw3vt5q0y" path="res://o_walking_coal2.png" id="12_581v4"] +[ext_resource type="PackedScene" uid="uid://bkpnrgcfr1jgl" path="res://Nodes/Bin.tscn" id="14_n2rwc"] +[ext_resource type="PackedScene" uid="uid://byo1m0n20yl45" path="res://Nodes/cannon.tscn" id="15_sof53"] +[ext_resource type="PackedScene" uid="uid://cet80w4yr8rse" path="res://Storage.tscn" id="16_7dojn"] +[ext_resource type="PackedScene" uid="uid://bhivunrkj87cy" path="res://Nodes/engine.tscn" id="17_regf7"] [sub_resource type="BoxShape3D" id="BoxShape3D_dijw3"] size = Vector3(1, 3.77669, 24) @@ -107,8 +111,31 @@ shape = SubResource("BoxShape3D_psmwd") transform = Transform3D(1, 0, -3.55271e-15, 0, 1, 0, 3.55271e-15, 0, 1, 2.84217e-14, 3, -8) [node name="AnimatedSprite3D" type="AnimatedSprite3D" parent="CharacterBody3D"] -transform = Transform3D(0.3, 0, 0, 0, -1.31134e-08, 0.3, 0, -0.3, -1.31134e-08, 0, -1, 0) +transform = Transform3D(0.3, 0, 0, 0, -1.31134e-08, 0.3, 0, -0.3, -1.31134e-08, 0, -2, 0) frames = SubResource("SpriteFrames_ltjyh") animation = &"walking_coal" speed_scale = 2.0 playing = true + +[node name="Bin" parent="." instance=ExtResource("14_n2rwc")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.18577, 0.622175, 10.6544) + +[node name="Cannon" parent="." instance=ExtResource("15_sof53")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.90697, 1.80346, 0.245877) + +[node name="Cannon2" parent="." instance=ExtResource("15_sof53")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.90697, 1.80346, -5.83086) + +[node name="Storage" parent="." instance=ExtResource("16_7dojn")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.30738, 0.293261, -10.1586) + +[node name="Storage2" parent="." instance=ExtResource("16_7dojn")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.67656, 0.293261, -1.79235) +currentType = 1 + +[node name="Storage3" parent="." instance=ExtResource("16_7dojn")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.79878, 0.293261, 6.13508) +currentType = 2 + +[node name="Engine" parent="." instance=ExtResource("17_regf7")] +transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, 2.86451, 1.17834, 10.1923) diff --git a/Nodes/cannon.tscn b/Nodes/cannon.tscn index 88ba1e5..a6d1f78 100644 --- a/Nodes/cannon.tscn +++ b/Nodes/cannon.tscn @@ -1,6 +1,7 @@ -[gd_scene load_steps=3 format=3 uid="uid://byo1m0n20yl45"] +[gd_scene load_steps=4 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"] [sub_resource type="BoxShape3D" id="BoxShape3D_sm3et"] size = Vector3(3.10406, 3, 2) @@ -10,3 +11,8 @@ script = ExtResource("1_vdn0s") [node name="CollisionShape3D" type="CollisionShape3D" parent="."] shape = SubResource("BoxShape3D_sm3et") + +[node name="AudioStreamPlayer3D" type="AudioStreamPlayer3D" parent="."] +stream = ExtResource("2_embm1") +volume_db = 19.048 +pitch_scale = 0.66 diff --git a/Nodes/game.tscn b/Nodes/game.tscn index 799212b..14bc1be 100644 --- a/Nodes/game.tscn +++ b/Nodes/game.tscn @@ -2,7 +2,7 @@ [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"] -[ext_resource type="PackedScene" uid="uid://nxapkgcq2c70" path="res://Nodes/light_setup.tscn" id="2_v8535"] +[ext_resource type="PackedScene" path="res://Nodes/light_setup.tscn" id="2_v8535"] [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"] diff --git a/project.godot b/project.godot index e27040c..180b597 100644 --- a/project.godot +++ b/project.godot @@ -29,7 +29,7 @@ _global_script_classes=[{ "language": &"GDScript", "path": "res://scripts/Logic/MapNode.gd" }, { -"base": "Node", +"base": "StaticBody3D", "class": &"Module", "language": &"GDScript", "path": "res://scripts/Modules/Module.gd" diff --git a/scripts/Modules/Cannon.gd b/scripts/Modules/Cannon.gd index a93d7c9..1063547 100644 --- a/scripts/Modules/Cannon.gd +++ b/scripts/Modules/Cannon.gd @@ -38,6 +38,6 @@ func shoot(): currentStashValue -= 1 currentPowderStashValue = 0 currentState = STATE.INACTIVE - print("pew") + $AudioStreamPlayer3D.play(0) return true return false