Rework some sound effects

9 files changed, 54 insertions, 6 deletions

diff --git a/assets/game_over.wav b/assets/game_over.wav
new file mode 100644
index 0000000..478713b
--- /dev/null
+++ b/assets/game_over.wav
diff --git a/assets/game_over.wav.import b/assets/game_over.wav.import
new file mode 100644
index 0000000..f433a7e
--- /dev/null
+++ b/assets/game_over.wav.import
@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://v13khoj3snbj"
+path="res://.godot/imported/game_over.wav-831ae686fc61847c35bc17a40e37796c.sample"
+
+[deps]
+
+source_file="res://assets/game_over.wav"
+dest_files=["res://.godot/imported/game_over.wav-831ae686fc61847c35bc17a40e37796c.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=2
diff --git a/assets/game_start.wav b/assets/game_start.wav
new file mode 100644
index 0000000..aa34150
--- /dev/null
+++ b/assets/game_start.wav
diff --git a/assets/game_start.wav.import b/assets/game_start.wav.import
new file mode 100644
index 0000000..c1dbd67
--- /dev/null
+++ b/assets/game_start.wav.import
@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://2hu6fvbwim5v"
+path="res://.godot/imported/game_start.wav-cbb502ece02f52f442cbefff02f51f90.sample"
+
+[deps]
+
+source_file="res://assets/game_start.wav"
+dest_files=["res://.godot/imported/game_start.wav-cbb502ece02f52f442cbefff02f51f90.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=2
diff --git a/assets/morale_down.wav b/assets/morale_down.wav
index c031033..8508ae1 100644
--- a/assets/morale_down.wav
+++ b/assets/morale_down.wav
diff --git a/assets/morale_down.wav.import b/assets/morale_down.wav.import
index 7725f1d..e620860 100644
--- a/assets/morale_down.wav.import
+++ b/assets/morale_down.wav.import
@@ -2,7 +2,7 @@
 
 importer="wav"
 type="AudioStreamWAV"
-uid="uid://c6104a0dr617o"
+uid="uid://bvvdlabsf2gib"
 path="res://.godot/imported/morale_down.wav-846138064654c6bc93d97dc5de5f0608.sample"
 
 [deps]
diff --git a/scenes/game.tscn b/scenes/game.tscn
index 2960967..f9ac2a7 100644
--- a/scenes/game.tscn
+++ b/scenes/game.tscn
@@ -65,7 +65,7 @@ offset_bottom = 241.0
 
 [node name="BackgroundMusic" type="AudioStreamPlayer2D" parent="."]
 stream = SubResource("AudioStreamRandomizer_kvuet")
-volume_db = -4.0
+volume_db = -6.0
 script = ExtResource("10_vtaks")
 
 [node name="Blips" type="AudioStreamPlayer2D" parent="."]
diff --git a/scenes/game_over.tscn b/scenes/game_over.tscn
index fc5be4b..b61c54e 100644
--- a/scenes/game_over.tscn
+++ b/scenes/game_over.tscn
@@ -2,7 +2,7 @@
 
 [ext_resource type="Script" uid="uid://d4ayvqargsfbd" path="res://scripts/game_over.gd" id="1_wqhvx"]
 [ext_resource type="Texture2D" uid="uid://bvuippvjk57ru" path="res://assets/game_over.jpeg" id="2_tbwuq"]
-[ext_resource type="AudioStream" uid="uid://b6gqbdoic7lr4" path="res://assets/11 - Death's Respite.wav" id="2_wqhvx"]
+[ext_resource type="AudioStream" uid="uid://v13khoj3snbj" path="res://assets/game_over.wav" id="3_racf3"]
 [ext_resource type="Shader" uid="uid://d3ktu01mh01ao" path="res://resources/oscillating_text.gdshader" id="4_racf3"]
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_7m3ot"]
@@ -31,8 +31,8 @@ texture = ExtResource("2_tbwuq")
 expand_mode = 2
 
 [node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="."]
-stream = ExtResource("2_wqhvx")
-pitch_scale = 0.7
+stream = ExtResource("3_racf3")
+pitch_scale = 0.8
 autoplay = true
 
 [node name="Label" type="Label" parent="."]
diff --git a/scripts/game_data.gd b/scripts/game_data.gd
index d050e25..cc20c13 100644
--- a/scripts/game_data.gd
+++ b/scripts/game_data.gd
@@ -41,7 +41,7 @@ func subtract_morale(amount: int):
 	emit_signal("morale_changed")
 	if (_morale < 1):
 		get_tree().change_scene_to_file("res://scenes/game_over.tscn")
-	else:
+	elif (_morale == 1):
 		_play_sound(morale_down)
 
 func get_is_spawning() -> bool: