merge

2025-11-12 04:16:12 +01:00 · 2022-12-10 23:31:25 +01:00
parent 7c96139422 cd6cd181d2
commit 8ab2f8d3ba
11 changed files with 92 additions and 14 deletions
--- a/Assets/Sounds/_SOUNDFX_/GleiseLoop.wav.import
+++ b/Assets/Sounds/_SOUNDFX_/GleiseLoop.wav.import
@@ -16,9 +16,9 @@ force/8_bit=false
 force/mono=false
 force/max_rate=false
 force/max_rate_hz=44100
-edit/trim=false
+edit/trim=true
 edit/normalize=false
-edit/loop_mode=0
-edit/loop_begin=0
+edit/loop_mode=2
+edit/loop_begin=10000
 edit/loop_end=-1
 compress/mode=0
--- a/Nodes/Train_P1.tscn
+++ b/Nodes/Train_P1.tscn
@@ -1,7 +1,7 @@
-[gd_scene load_steps=22 format=3 uid="uid://md2ofbviios3"]
+[gd_scene load_steps=23 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"]
@@ -16,6 +16,7 @@
 [ext_resource type="Texture2D" uid="uid://ckdlv6b7okseq" path="res://walking_powder2.png" id="10_a137a"]
 [ext_resource type="Texture2D" uid="uid://b5ioch3ad8y6r" path="res://walking_coal2.png" id="11_1jgcf"]
 [ext_resource type="PackedScene" uid="uid://bkpnrgcfr1jgl" path="res://Nodes/Bin.tscn" id="16_q3kvk"]
+[ext_resource type="AudioStream" uid="uid://b52sd64x20ulv" path="res://Assets/Sounds/_SOUNDFX_/Gunpowder.wav" id="17_ajifv"]

 [sub_resource type="BoxShape3D" id="BoxShape3D_okaqh"]
 size = Vector3(1, 3.77669, 24)
@@ -110,7 +111,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
@@ -138,3 +139,4 @@ transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0.7029
 [node name="Storage3" parent="." instance=ExtResource("4_5jw5g")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.63306, -0.501894, -11.5457)
 currentType = 1
+audioClip = ExtResource("17_ajifv")
--- 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=24 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,11 @@
 [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"]
+[ext_resource type="AudioStream" uid="uid://b52sd64x20ulv" path="res://Assets/Sounds/_SOUNDFX_/Gunpowder.wav" id="17_xnc4h"]

 [sub_resource type="BoxShape3D" id="BoxShape3D_dijw3"]
 size = Vector3(1, 3.77669, 24)
@@ -107,8 +112,32 @@ 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
+audioClip = ExtResource("17_xnc4h")
+
+[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)
--- a/Nodes/cannon.tscn
+++ b/Nodes/cannon.tscn
@@ -1,6 +1,8 @@
-[gd_scene load_steps=3 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)
@@ -10,3 +12,10 @@ script = ExtResource("1_vdn0s")

 [node name="CollisionShape3D" type="CollisionShape3D" parent="."]
 shape = SubResource("BoxShape3D_sm3et")
+
+[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
+stream = ExtResource("2_embm1")
+pitch_scale = 0.43
+
+[node name="AudioStreamPlayer2" type="AudioStreamPlayer" parent="."]
+stream = ExtResource("3_6r8s6")
--- 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")
--- a/Nodes/game.tscn
+++ b/Nodes/game.tscn
@@ -1,12 +1,22 @@
+<<<<<<< HEAD
 [gd_scene load_steps=8 format=3 uid="uid://db0pxwq1hvs45"]
+=======
+[gd_scene load_steps=10 format=3 uid="uid://db0pxwq1hvs45"]
+>>>>>>> cd6cd181d2f12c2b4200ebdaf38efa2858e2802d

 [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"]
+<<<<<<< HEAD
 [ext_resource type="PackedScene" uid="uid://bw3yluhr72n2t" path="res://Nodes/InfiniteScroller.tscn" id="7_yyvws"]
+=======
+[ext_resource type="AudioStream" uid="uid://c5jhukuk8r3mf" path="res://Assets/Sounds/_MUSIC_/GameJamGameLoop.wav" id="7_0yxka"]
+[ext_resource type="AudioStream" uid="uid://n4ynf7hg2pcl" path="res://Assets/Sounds/_SOUNDFX_/GleiseLoop.wav" id="8_4y7wx"]
+[ext_resource type="AudioStream" uid="uid://dovvnflvxtqpi" path="res://Assets/Sounds/_SOUNDFX_/WindLoop.wav" id="9_ip7lg"]
+>>>>>>> cd6cd181d2f12c2b4200ebdaf38efa2858e2802d

 [node name="Game" type="Node"]
 script = ExtResource("1_iox18")
@@ -34,4 +44,21 @@ visible = false

 [node name="Control" parent="." instance=ExtResource("4_kxuy0")]

+<<<<<<< HEAD
 [node name="InfiniteScroller" parent="." instance=ExtResource("7_yyvws")]
+=======
+[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
+stream = ExtResource("7_0yxka")
+volume_db = -27.238
+autoplay = true
+
+[node name="AudioStreamPlayer2" type="AudioStreamPlayer" parent="."]
+stream = ExtResource("8_4y7wx")
+volume_db = -10.0
+autoplay = true
+
+[node name="AudioStreamPlayer3" type="AudioStreamPlayer" parent="."]
+stream = ExtResource("9_ip7lg")
+volume_db = -2.476
+autoplay = true
+>>>>>>> cd6cd181d2f12c2b4200ebdaf38efa2858e2802d
--- a/Storage.tscn
+++ b/Storage.tscn
@@ -18,3 +18,5 @@ shape = SubResource("CylinderShape3D_c1ipa")
 [node name="Sprite3D" type="Sprite3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 2, 0)
 texture = ExtResource("2_a5kei")
+
+[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
--- 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"
--- 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
-		print("pew")
+		$AudioStreamPlayer.play(0)
 		return true
 	return false
--- 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
 				
--- a/scripts/Modules/Storage.gd
+++ b/scripts/Modules/Storage.gd
@@ -8,18 +8,20 @@ enum TYPE {AMMO, GUNPOWDER, COAL}
@export var currentType: TYPE


-
+@export var audioClip : AudioStreamWAV
 #------------Methods-------------#
 func _ready():
 	var root = get_tree().root.get_child(0)
 	#root.ammo_pickup.connect(_on_signal_storing)
 	maxStashValue = 10
 	currentStashValue = 10
+	$AudioStreamPlayer.stream = audioClip
 	
 func interact(player):
 	if currentStashValue >= 1:
 		currentStashValue -= 1
 		player.fill_inventory(currentType)
+		$AudioStreamPlayer.play()
 	return
 	
 func _on_signal_storing():