diff --git a/enemies/boss/boss.gd b/enemies/boss/boss.gd index e1486cb..6dbd91f 100644 --- a/enemies/boss/boss.gd +++ b/enemies/boss/boss.gd @@ -112,7 +112,8 @@ func die(): for child in get_children(): if not child is AudioStreamPlayer2D: child.queue_free() - await $AudioStreamPlayer2D.finished + $DeathSound.play() + await $DeathSound.finished queue_free() func _on_enemy_hurtbox_damage_taken(_damage, _dir) -> void: diff --git a/enemies/boss/boss.tscn b/enemies/boss/boss.tscn index e314c51..c8f6894 100644 --- a/enemies/boss/boss.tscn +++ b/enemies/boss/boss.tscn @@ -7,6 +7,7 @@ [ext_resource type="PackedScene" uid="uid://chs0u61f45nau" path="res://utils/earth_aligner.tscn" id="4_lnbgr"] [ext_resource type="AudioStream" uid="uid://co07360hqn6fk" path="res://sounds/686321__cjspellsfish__punch-land-soft.wav" id="6_opohk"] [ext_resource type="AudioStream" uid="uid://c54uipjpvhal7" path="res://sounds/751710__el_boss__tree-hit-skier-tree-impact-variation-2-of-3.wav" id="7_auiwu"] +[ext_resource type="AudioStream" uid="uid://ngkksuy3438s" path="res://sounds/slime-impact-352473.mp3" id="7_auiwu"] [sub_resource type="CapsuleShape2D" id="CapsuleShape2D_lnbgr"] @@ -63,6 +64,9 @@ volume_db = 15.0 [node name="SoundSlam" type="AudioStreamPlayer2D" parent="."] stream = ExtResource("7_auiwu") volume_db = 12.0 +[node name="DeathSound" type="AudioStreamPlayer2D" parent="."] +stream = ExtResource("7_auiwu") +volume_db = 10.0 [connection signal="damage_taken" from="EnemyHurtbox" to="." method="_on_enemy_hurtbox_damage_taken"] [connection signal="died" from="EnemyHurtbox" to="." method="die"] diff --git a/enemies/boss/slime-impact-352473.mp3.import b/enemies/boss/slime-impact-352473.mp3.import deleted file mode 100644 index d3221ca..0000000 --- a/enemies/boss/slime-impact-352473.mp3.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="mp3" -type="AudioStreamMP3" -uid="uid://ngkksuy3438s" -path="res://.godot/imported/slime-impact-352473.mp3-fb4475c7240b9b9964b3f9549708ada2.mp3str" - -[deps] - -source_file="res://enemies/boss/slime-impact-352473.mp3" -dest_files=["res://.godot/imported/slime-impact-352473.mp3-fb4475c7240b9b9964b3f9549708ada2.mp3str"] - -[params] - -loop=false -loop_offset=0 -bpm=0 -beat_count=0 -bar_beats=4 diff --git a/main.tscn b/main.tscn index 218b46d..fddf114 100644 --- a/main.tscn +++ b/main.tscn @@ -82,6 +82,9 @@ texture = ExtResource("3_kek77") script = ExtResource("10_efxa6") boss = ExtResource("11_efxa6") +[node name="Boss" parent="." instance=ExtResource("11_efxa6")] +position = Vector2(0, -2800) + [connection signal="active_item_changed" from="Player" to="UIOverlay/ItemUI" method="_on_player_active_item_changed"] [connection signal="health_changed" from="Player" to="UIOverlay/Healthbar" method="_on_player_health_changed"] [connection signal="max_hp_changed" from="Player" to="UIOverlay/Healthbar" method="_on_player_max_hp_changed"] diff --git a/enemies/boss/slime-impact-352473.mp3 b/sounds/slime-impact-352473.mp3 similarity index 100% rename from enemies/boss/slime-impact-352473.mp3 rename to sounds/slime-impact-352473.mp3 diff --git a/sounds/slime-impact-352473.mp3.import b/sounds/slime-impact-352473.mp3.import new file mode 100644 index 0000000..f34f4a2 --- /dev/null +++ b/sounds/slime-impact-352473.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://ngkksuy3438s" +path="res://.godot/imported/slime-impact-352473.mp3-962a925e1560f7138d13e0a5d96fb9ca.mp3str" + +[deps] + +source_file="res://sounds/slime-impact-352473.mp3" +dest_files=["res://.godot/imported/slime-impact-352473.mp3-962a925e1560f7138d13e0a5d96fb9ca.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4