From 9ca4cf10d23cd37ffb6d4770c22745c5b9d7124c Mon Sep 17 00:00:00 2001 From: Haze Weathers Date: Mon, 8 Jul 2024 15:22:49 -0400 Subject: [PATCH] sploosh! BZAAP! --- autoloads/audio.gd | 2 ++ autoloads/game.gd | 7 ++++++- objects/environment/death tile/death_tile.gd | 1 + objects/player/player.gd | 3 +++ objects/player/player.tscn | 2 +- 5 files changed, 13 insertions(+), 2 deletions(-) diff --git a/autoloads/audio.gd b/autoloads/audio.gd index 0d9c600..b0792f5 100644 --- a/autoloads/audio.gd +++ b/autoloads/audio.gd @@ -25,6 +25,8 @@ const a_sword = preload("res://audio/sounds/sword.ogg") const a_doublejump = preload("res://audio/sounds/double_jump.ogg") const a_shoot = preload("res://audio/sounds/shoot_arrow.ogg") const a_die = preload("res://audio/sounds/die.ogg") +const a_die_splash = preload("res://audio/sounds/splash.ogg") +const a_die_zap = preload("res://audio/sounds/splash.ogg") const a_die_skeleton = preload("res://audio/sounds/die_skeleton.ogg") const a_scrump_die = preload("res://audio/sounds/scrump_die.ogg") const a_explosion = preload("res://audio/sounds/explosion.ogg") diff --git a/autoloads/game.gd b/autoloads/game.gd index 624bf6f..3df331f 100644 --- a/autoloads/game.gd +++ b/autoloads/game.gd @@ -50,6 +50,7 @@ var can_restart: bool = true var current_palette: String = "default" var still_playing: bool = false var last_mm_button = null +var alternate_death = null #== marathon mode ==# var marathon_mode: bool = false var marathon_score: int = 0 @@ -317,7 +318,11 @@ func _on_player_died() -> void: # count death lives -= 1 # play death sound - Audio.play_sound(Audio.a_die, Audio.ac_die) + if alternate_death: + Audio.play_sound(alternate_death, Audio.ac_die) + else: + Audio.play_sound(Audio.a_die, Audio.ac_die) + alternate_death = null # death score penalty if use_lives == false && lives < 0: score = max(0, score - 500) as int diff --git a/objects/environment/death tile/death_tile.gd b/objects/environment/death tile/death_tile.gd index f654002..fa7dbbc 100644 --- a/objects/environment/death tile/death_tile.gd +++ b/objects/environment/death tile/death_tile.gd @@ -3,4 +3,5 @@ extends Area2D func _on_Area2D_area_entered(area): #Kill player if area.is_in_group("player_hitbox"): + Game.alternate_death = Audio.a_die_zap area.get_parent().die() diff --git a/objects/player/player.gd b/objects/player/player.gd index e70a4da..7d9a59c 100644 --- a/objects/player/player.gd +++ b/objects/player/player.gd @@ -517,11 +517,14 @@ func _on_Hitbox_body_entered(body: Node) -> void: if body.is_in_group("no_blood"): skip_blood = true if body.is_in_group("has_splash"): + Game.alternate_death = Audio.a_die_splash var particles = SplashParticles.instance() particles.global_position = death_splatter_position.global_position particles.color = body.splash_color particles.emitting = true get_parent().add_child(particles) + if body.is_in_group("death_zap"): + Game.alternate_death = Audio.a_die_zap die() diff --git a/objects/player/player.tscn b/objects/player/player.tscn index 70d033d..a85e2c0 100644 --- a/objects/player/player.tscn +++ b/objects/player/player.tscn @@ -1302,8 +1302,8 @@ align = 1 [connection signal="state_entered" from="StateChart/Root/Movement/Teleporting" to="." method="_on_Inactive_state_entered"] [connection signal="state_entered" from="StateChart/Root/Movement/Teleporting" to="." method="_on_Teleporting_state_entered"] [connection signal="state_exited" from="StateChart/Root/Movement/Teleporting" to="." method="_on_Inactive_state_exited"] -[connection signal="state_entered" from="StateChart/Root/Movement/Appearing" to="." method="_on_Inactive_state_entered"] [connection signal="state_entered" from="StateChart/Root/Movement/Appearing" to="." method="_on_Appearing_state_entered"] +[connection signal="state_entered" from="StateChart/Root/Movement/Appearing" to="." method="_on_Inactive_state_entered"] [connection signal="state_exited" from="StateChart/Root/Movement/Appearing" to="." method="_on_Inactive_state_exited"] [connection signal="state_entered" from="StateChart/Root/Health/Respawn" to="." method="_on_Respawn_state_entered"] [connection signal="state_entered" from="StateChart/Root/Health/Dead" to="." method="_on_Dead_state_entered"]