Merge branch 'main' of https://gamejam.fachschaft.info/Florian/The_Dark_Side_of_Earth

enemies/boss/blob_big.gd

@@ -16,6 +16,7 @@ func _ready() -> void:
 	for child in get_children():
 		if "target_reached" in child:
 			child.connect("target_reached", _on_target_reached)
+	$SplashSound.play()
 
 func _physics_process(delta: float) -> void:
 	if ready_blobs == num_blobs:

enemies/boss/blob_big.tscn

@@ -1,7 +1,8 @@
-[gd_scene load_steps=3 format=3 uid="uid://bg2hgia0jqnqf"]
+[gd_scene load_steps=4 format=3 uid="uid://bg2hgia0jqnqf"]
 
 [ext_resource type="Script" uid="uid://b22hbgn80m4l0" path="res://enemies/boss/blob_big.gd" id="1_xkk63"]
 [ext_resource type="PackedScene" uid="uid://ck0bj7444wfsl" path="res://enemies/boss/blob_small.tscn" id="2_jl75s"]
+[ext_resource type="AudioStream" uid="uid://bl05nrrcsjaus" path="res://sounds/slime-splat-4-219250.mp3" id="3_d2us1"]
 
 [node name="blob_big" type="Node2D"]
 script = ExtResource("1_xkk63")
@@ -17,3 +18,6 @@ position = Vector2(0, -400)
 
 [node name="Blob4" parent="." instance=ExtResource("2_jl75s")]
 position = Vector2(0, 400)
+
+[node name="SplashSound" type="AudioStreamPlayer2D" parent="."]
+stream = ExtResource("3_d2us1")

enemies/boss/boss.gd

@@ -86,11 +86,14 @@ func destroy_below():
 		if(body.has_method("destroy")): body.destroy()
 
 func wave():
+	
 	var angle = atan2(player.position.y, player.position.x)
 	var dir = randi_range(0, 1) * 2 - 1
 	var speed = 3000/water.radius_base
 	water.create_tsunami(angle - speed * dir*TAU/30, dir, speed)
-	await get_tree().create_timer(4).timeout
+	await get_tree().create_timer(0.5).timeout
+	$Wave.play()
+	await get_tree().create_timer(3.5).timeout
 	attack_ready = true
 
 func water_rise():

enemies/boss/boss.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=10 format=3 uid="uid://cpe4s6vsn0ujd"]
+[gd_scene load_steps=11 format=3 uid="uid://cpe4s6vsn0ujd"]
 
 [ext_resource type="Script" uid="uid://uv672p8f4n6k" path="res://enemies/boss/boss.gd" id="1_skx2t"]
 [ext_resource type="PackedScene" uid="uid://bg2hgia0jqnqf" path="res://enemies/boss/blob_big.tscn" id="2_o1i15"]
@@ -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://ngkksuy3438s" path="res://sounds/slime-impact-352473.mp3" id="7_auiwu"]
+[ext_resource type="AudioStream" uid="uid://cd03po7vk17rt" path="res://sounds/sea-wave-34088.mp3" id="8_h4k8w"]
 
 [sub_resource type="CapsuleShape2D" id="CapsuleShape2D_lnbgr"]
 
@@ -68,5 +69,8 @@ volume_db = 12.0
 stream = ExtResource("7_auiwu")
 volume_db = 10.0
 
+[node name="Wave" type="AudioStreamPlayer2D" parent="."]
+stream = ExtResource("8_h4k8w")
+
 [connection signal="damage_taken" from="EnemyHurtbox" to="." method="_on_enemy_hurtbox_damage_taken"]
 [connection signal="died" from="EnemyHurtbox" to="." method="die"]

sounds/sea-wave-34088.mp3.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+uid="uid://cd03po7vk17rt"
+path="res://.godot/imported/sea-wave-34088.mp3-d9e94b361d3eca8b6c03bc33ecce55b9.mp3str"
+
+[deps]
+
+source_file="res://sounds/sea-wave-34088.mp3"
+dest_files=["res://.godot/imported/sea-wave-34088.mp3-d9e94b361d3eca8b6c03bc33ecce55b9.mp3str"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

sounds/slime-splat-4-219250.mp3.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+uid="uid://bl05nrrcsjaus"
+path="res://.godot/imported/slime-splat-4-219250.mp3-5a01ab917951602c4835faded340aee7.mp3str"
+
+[deps]
+
+source_file="res://sounds/slime-splat-4-219250.mp3"
+dest_files=["res://.godot/imported/slime-splat-4-219250.mp3-5a01ab917951602c4835faded340aee7.mp3str"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4