Relatively minor sound tweaks + print cleanup

The player's death sound is now split up into 2 sounds, the sting which plays on the sound track, and the usual jingle, which plays on the music track. The jingle was also upgraded to a wav for that sweet, juicy lack of delay on start.

Thwomps falling, Bob-ombs exploding and P-Switches getting pressed are all classified as their own sounds now as well, separate from "cannon".

Assets/Audio/BGM/PlayerDie.json

@@ -1,5 +1,5 @@
 {
 	"variations": {
-		"default": { "source": "PlayerDie.mp3" }
+		"default": { "source": "PlayerDie.wav" }
 	}
 }

Assets/Audio/BGM/PlayerDie.mp3.import

@@ -1,19 +0,0 @@
-[remap]
-
-importer="mp3"
-type="AudioStreamMP3"
-uid="uid://e2omkslkkxlh"
-path="res://.godot/imported/PlayerDie.mp3-4092c48b6e7edbcb1eaed14f535884bd.mp3str"
-
-[deps]
-
-source_file="res://Assets/Audio/BGM/PlayerDie.mp3"
-dest_files=["res://.godot/imported/PlayerDie.mp3-4092c48b6e7edbcb1eaed14f535884bd.mp3str"]
-
-[params]
-
-loop=false
-loop_offset=0.0
-bpm=0.0
-beat_count=0
-bar_beats=4

Assets/Audio/BGM/PlayerDie.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://nqh644jckmpu"
+path="res://.godot/imported/PlayerDie.wav-bcdb87a9d37001bf5aca81c87dc79ba5.sample"
+
+[deps]
+
+source_file="res://Assets/Audio/BGM/PlayerDie.wav"
+dest_files=["res://.godot/imported/PlayerDie.wav-bcdb87a9d37001bf5aca81c87dc79ba5.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=0

Assets/Audio/SFX/DieSting.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://da1qqbyud8itr"
+path="res://.godot/imported/DieSting.wav-bcd8117bb50ff6ccd05a027b84de1281.sample"
+
+[deps]
+
+source_file="res://Assets/Audio/SFX/DieSting.wav"
+dest_files=["res://.godot/imported/DieSting.wav-bcd8117bb50ff6ccd05a027b84de1281.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=0

Scenes/Prefabs/Entities/Explosion.tscn

@@ -1,11 +1,10 @@
-[gd_scene load_steps=26 format=3 uid="uid://clbvyne1cr8gp"]
+[gd_scene load_steps=25 format=3 uid="uid://clbvyne1cr8gp"]
 
 [ext_resource type="Script" uid="uid://ritdlvkpyjd4" path="res://Scripts/Classes/Entities/Objects/Explosion.gd" id="1_aklik"]
 [ext_resource type="Texture2D" uid="uid://brjkrkihadwnj" path="res://Assets/Sprites/Particles/FireballExplosion.png" id="2_4aiuq"]
 [ext_resource type="Texture2D" uid="uid://byy3k1pdrp77" path="res://Assets/Sprites/Particles/Smoke.png" id="3_dvv3e"]
 [ext_resource type="Script" uid="uid://cbal8ms2oe1ik" path="res://Scripts/Classes/Components/ResourceSetterNew.gd" id="4_dvv3e"]
 [ext_resource type="Script" uid="uid://caq1qiwmy0mox" path="res://Scripts/Parts/BetterAnimatedSprite.gd" id="4_hjivi"]
-[ext_resource type="AudioStream" uid="uid://d12v455mw8uvu" path="res://Assets/Audio/SFX/Cannon.wav" id="5_8imqq"]
 [ext_resource type="JSON" path="res://Assets/Sprites/Particles/FireballExplosion.json" id="5_hjivi"]
 [ext_resource type="Script" uid="uid://chj8hu207lrh" path="res://Scripts/Classes/Components/EnemyPlayerDetection.gd" id="8_hjivi"]
 
@@ -310,12 +309,6 @@ libraries = {
 }
 autoplay = "Go"
 
-[node name="SFX" type="AudioStreamPlayer2D" parent="."]
-stream = ExtResource("5_8imqq")
-autoplay = true
-max_distance = 256.0
-bus = &"SFX"
-
 [node name="Collision" type="CollisionShape2D" parent="."]
 shape = SubResource("RectangleShape2D_hjivi")
 

Scripts/Classes/Entities/Enemies/Thwomp.gd

@@ -49,7 +49,7 @@ func handle_block_breaking() -> void:
 			i.destroy()
 
 func land() -> void:
-	AudioManager.play_sfx("cannon", global_position)
+	AudioManager.play_sfx("thwomp_land", global_position)
 	current_state = States.LANDED
 	await get_tree().create_timer(1, false).timeout
 	current_state = States.RISING

Scripts/Classes/Entities/Objects/BobOmbHeld.gd

@@ -33,4 +33,5 @@ func kick(object: Node2D) -> void:
 func summon_explosion() -> void:
 	var node = EXPLOSION.instantiate()
 	node.global_position = global_position + Vector2(0, -8)
+	AudioManager.play_sfx("explode", node.global_position)
 	add_sibling(node)

Scripts/Classes/Entities/Objects/PSwitch.gd

@@ -12,6 +12,6 @@ func pressed() -> void:
 	is_pressed = true
 	$Sprite.play("Pressed")
 	AudioManager.play_global_sfx("switch")
-	AudioManager.play_global_sfx("cannon")
+	AudioManager.play_global_sfx("pswitch_pressed")
 	$AnimationPlayer.play("Pressed")
 	Global.activate_p_switch()

Scripts/Classes/Entities/Player.gd

@@ -1090,6 +1090,7 @@ func die(pit: bool = false, type: String = "") -> void:
 	is_dead = true
 	visible = not pit
 	dead.emit()
+	AudioManager.play_sfx("die_sting", global_position)
 	Global.p_switch_active = false
 	Global.p_switch_timer = 0
 	stop_all_timers()
@@ -1100,11 +1101,13 @@ func die(pit: bool = false, type: String = "") -> void:
 	get_tree().paused = true
 	Level.can_set_time = true
 	Level.first_load = true
+	AudioManager.set_music_override(AudioManager.MUSIC_OVERRIDES.SILENCE, 999, false)
+	await get_tree().create_timer(physics_params("DEATH_HANG_TIMER", DEATH_PARAMETERS)).timeout
 	if Global.current_game_mode != Global.GameMode.BOO_RACE:
-		AudioManager.set_music_override(AudioManager.MUSIC_OVERRIDES.DEATH, 999, false)
+		AudioManager.set_music_override(AudioManager.MUSIC_OVERRIDES.DEATH, 9999, false)
 		await get_tree().create_timer(3).timeout
 	else:
-		AudioManager.set_music_override(AudioManager.MUSIC_OVERRIDES.RACE_LOSE, 999, false)
+		AudioManager.set_music_override(AudioManager.MUSIC_OVERRIDES.RACE_LOSE, 9999, false)
 		await get_tree().create_timer(5).timeout
 
 	death_load()

Scripts/Classes/Singletons/AudioManager.gd

@@ -17,7 +17,11 @@ const DEFAULT_SFX_LIBRARY := {
 	"kick": ("res://Assets/Audio/SFX/Kick.wav"),
 	"fireball": ("res://Assets/Audio/SFX/Fireball.wav"),
 	"1_up": ("res://Assets/Audio/SFX/1up.wav"),
+	"die_sting": ("res://Assets/Audio/SFX/DieSting.wav"),
 	"cannon": ("res://Assets/Audio/SFX/Cannon.wav"),
+	"explode": ("res://Assets/Audio/SFX/Cannon.wav"),
+	"pswitch_pressed": ("res://Assets/Audio/SFX/Cannon.wav"),
+	"thwomp_land": ("res://Assets/Audio/SFX/Cannon.wav"),
 	"checkpoint": ("res://Assets/Audio/SFX/Checkpoint.wav"),
 	"flag_slide": ("res://Assets/Audio/SFX/FlagSlide.json"),
 	"magic": ("res://Assets/Audio/SFX/Magic.wav"),
@@ -178,7 +182,7 @@ func set_music_override(stream: MUSIC_OVERRIDES, priority := 0, stop_on_finish :
 	else:
 		audio_override_queue.append(stream)
 	current_music_override = stream
-	print(OVERRIDE_STREAMS[stream])
+	#print(OVERRIDE_STREAMS[stream])
 	music_override_player.stream = create_stream_from_json(OVERRIDE_STREAMS[stream])
 	music_override_player.bus = "Music" if stream != MUSIC_OVERRIDES.FLAG_POLE else "SFX"
 	music_override_player.play()