Further sound and zindex stuff

default_bus_layout.tres

@@ -1,4 +1,39 @@
 [gd_resource type="AudioBusLayout" format=3 uid="uid://n1jx0x2j4ilo"]
 
 [resource]
-bus/0/mute = true
+bus/1/name = &"Music"
+bus/1/solo = false
+bus/1/mute = false
+bus/1/bypass_fx = false
+bus/1/volume_db = 0.0
+bus/1/send = &"Master"
+bus/2/name = &"Sounds"
+bus/2/solo = false
+bus/2/mute = false
+bus/2/bypass_fx = false
+bus/2/volume_db = 0.0
+bus/2/send = &"Master"
+bus/3/name = &"DragSounds"
+bus/3/solo = false
+bus/3/mute = false
+bus/3/bypass_fx = false
+bus/3/volume_db = 0.0
+bus/3/send = &"Sounds"
+bus/4/name = &"FallSounds"
+bus/4/solo = false
+bus/4/mute = false
+bus/4/bypass_fx = false
+bus/4/volume_db = 0.0
+bus/4/send = &"Sounds"
+bus/5/name = &"CollectSounds"
+bus/5/solo = false
+bus/5/mute = false
+bus/5/bypass_fx = false
+bus/5/volume_db = 0.0
+bus/5/send = &"Sounds"
+bus/6/name = &"KillSounds"
+bus/6/solo = false
+bus/6/mute = false
+bus/6/bypass_fx = false
+bus/6/volume_db = 0.0
+bus/6/send = &"Sounds"

entities/chupacabra.gd

@@ -25,19 +25,23 @@ func _on_eater_eaten(edible:Edible) -> void:
 func _on_dragged(_cursor: Cursor) -> void:
 	collision_layer = 16
 	collision_mask = 18
-	z_index = 1
+	z_index = Enums.ZIndex.EntityAir
+	y_sort_enabled = false
 	eater.collision_mask = 16
 	animator.play(&"drag_start")
 
 func _on_fallen() -> void:
 	collision_layer = 8
 	collision_mask = 14
-	z_index = 0
+	z_index = Enums.ZIndex.EntityGround
+	y_sort_enabled = true
 	eater.collision_mask = 8
 	animator.play(&"RESET")
 
 func _on_trapped() -> void:
 	z_index = Enums.ZIndex.EntitySacrifice
+	y_sort_enabled = false
 
 func _on_freed() -> void:
 	z_index = Enums.ZIndex.EntityGround
+	y_sort_enabled = true

entities/chupacabra.tscn

@@ -465,9 +465,11 @@ debug_color = Color(1, 1, 1, 0)
 
 [node name="DragSound" type="AudioStreamPlayer2D" parent="MovementDrag"]
 stream = ExtResource("14_u2uf4")
+bus = &"DragSounds"
 
 [node name="FallSound" type="AudioStreamPlayer2D" parent="MovementDrag"]
 stream = ExtResource("15_q7bw3")
+bus = &"FallSounds"
 
 [node name="Eater" parent="." instance=ExtResource("16_ltvqn")]
 unique_name_in_owner = true
@@ -479,6 +481,7 @@ debug_color = Color(1, 0, 0, 0)
 
 [node name="EatSound" type="AudioStreamPlayer2D" parent="Eater"]
 stream = ExtResource("17_ccla5")
+bus = &"KillSounds"
 
 [connection signal="changed_direction" from="MovementWander" to="MovementWander/WanderPriority" method="priority_conditional"]
 [connection signal="move" from="MovementWander" to="." method="_on_move"]
@@ -500,6 +503,8 @@ stream = ExtResource("17_ccla5")
 [connection signal="timeout" from="MovementSkitter/CalmTimer" to="MovementSkitter" method="clear_direction"]
 [connection signal="changed_target" from="MovementTrap" to="MovementTrap/TrapPriority" method="priority_conditional"]
 [connection signal="move" from="MovementTrap" to="." method="_on_move"]
+[connection signal="move_disabled" from="MovementTrap" to="." method="_on_freed"]
+[connection signal="move_enabled" from="MovementTrap" to="." method="_on_trapped"]
 [connection signal="area_entered" from="MovementTrap/TrackerTrap" to="MovementTrap/TrackerTrap" method="check_diet_then_track"]
 [connection signal="area_exited" from="MovementTrap/TrackerTrap" to="MovementTrap/TrackerTrap" method="untrack"]
 [connection signal="tracked" from="MovementTrap/TrackerTrap" to="MovementTrap/TrackerTrap/TargetPicker" method="sample_target_if_null" unbinds=1]

entities/cthulhu.gd

@@ -17,10 +17,12 @@ func _on_dragged(_cursor: Cursor) -> void:
 	collision_layer = 16
 	collision_mask = 18
 	z_index = Enums.ZIndex.EntityAir
+	y_sort_enabled = false
 	animator.play(&"drag_start")
 
 func _on_fallen() -> void:
 	collision_layer = 8
 	collision_mask = 14
 	z_index =  Enums.ZIndex.EntityGround
+	y_sort_enabled = true
 	animator.play(&"RESET")

entities/cthulhu.tscn

@@ -231,9 +231,11 @@ debug_color = Color(1, 1, 1, 0)
 
 [node name="DragSound" type="AudioStreamPlayer2D" parent="MovementDrag"]
 stream = ExtResource("11_jt7u1")
+bus = &"DragSounds"
 
 [node name="FallSound" type="AudioStreamPlayer2D" parent="MovementDrag"]
 stream = ExtResource("12_v8da5")
+bus = &"FallSounds"
 
 [connection signal="dragged" from="MovementDrag" to="." method="_on_dragged"]
 [connection signal="dragged" from="MovementDrag" to="MovementDrag/DragPriority" method="priority_alternative" unbinds=1]

entities/imp.gd

@@ -22,6 +22,7 @@ func _on_dragged(_cursor: Cursor) -> void:
 	collision_layer = 16
 	collision_mask = 18
 	z_index = Enums.ZIndex.EntityAir
+	y_sort_enabled = false
 	eater.collision_mask = 16
 	animator.play(&"drag_start")
 
@@ -29,11 +30,14 @@ func _on_fallen() -> void:
 	collision_layer = 8
 	collision_mask = 14
 	z_index = Enums.ZIndex.EntityGround
+	y_sort_enabled = true
 	eater.collision_mask = 8
 	animator.play(&"RESET")
 
 func _on_trapped() -> void:
 	z_index = Enums.ZIndex.EntitySacrifice
+	y_sort_enabled = false
 
 func _on_freed() -> void:
 	z_index = Enums.ZIndex.EntityGround
+	y_sort_enabled = true

entities/imp.tscn

@@ -330,9 +330,11 @@ debug_color = Color(1, 1, 1, 0)
 
 [node name="DragSound" type="AudioStreamPlayer2D" parent="MovementDrag"]
 stream = ExtResource("16_0frai")
+bus = &"DragSounds"
 
 [node name="FallSound" type="AudioStreamPlayer2D" parent="MovementDrag"]
 stream = ExtResource("17_lib0h")
+bus = &"FallSounds"
 
 [node name="Eater" parent="." instance=ExtResource("14_w2h8x")]
 unique_name_in_owner = true
@@ -344,6 +346,7 @@ debug_color = Color(1, 0, 0, 0)
 
 [node name="EatSound" type="AudioStreamPlayer2D" parent="Eater"]
 stream = ExtResource("19_7la6c")
+bus = &"KillSounds"
 
 [connection signal="timeout" from="GoldSpawner/SpawnTimer" to="GoldSpawner" method="spawn"]
 [connection signal="changed_direction" from="MovementWander" to="MovementWander/WanderPriority" method="priority_conditional"]
@@ -357,6 +360,8 @@ stream = ExtResource("19_7la6c")
 [connection signal="target_changed" from="MovementHunt/TrackerMeat/TargetPicker" to="MovementHunt/TrackerMeat/TargetPicker" method="sample_target_if_null" unbinds=2]
 [connection signal="changed_target" from="MovementTrap" to="MovementTrap/TrapPriority" method="priority_conditional"]
 [connection signal="move" from="MovementTrap" to="." method="_on_move"]
+[connection signal="move_disabled" from="MovementTrap" to="." method="_on_freed"]
+[connection signal="move_enabled" from="MovementTrap" to="." method="_on_trapped"]
 [connection signal="area_entered" from="MovementTrap/TrackerTrap" to="MovementTrap/TrackerTrap" method="check_diet_then_track"]
 [connection signal="area_exited" from="MovementTrap/TrackerTrap" to="MovementTrap/TrackerTrap" method="untrack"]
 [connection signal="tracked" from="MovementTrap/TrackerTrap" to="MovementTrap/TrackerTrap/TargetPicker" method="sample_target_if_null" unbinds=1]

entities/monocle.gd

@@ -12,16 +12,20 @@ func _on_dragged(_cursor: Cursor) -> void:
 	collision_layer = 16
 	collision_mask = 18
 	z_index = Enums.ZIndex.EntityAir
+	y_sort_enabled = false
 	animator.play(&"drag_start")
 
 func _on_fallen() -> void:
 	collision_layer = 8
 	collision_mask = 14
 	z_index = Enums.ZIndex.EntityGround
+	y_sort_enabled = true
 	animator.play(&"RESET")
 
 func _on_trapped() -> void:
 	z_index = Enums.ZIndex.EntitySacrifice
+	y_sort_enabled = false
 
 func _on_freed() -> void:
 	z_index = Enums.ZIndex.EntityGround
+	y_sort_enabled = true

entities/monocle.tscn

@@ -137,9 +137,11 @@ debug_color = Color(1, 1, 1, 0)
 
 [node name="DragSound" type="AudioStreamPlayer2D" parent="MovementDrag"]
 stream = ExtResource("5_bs8m7")
+bus = &"DragSounds"
 
 [node name="FallSound" type="AudioStreamPlayer2D" parent="MovementDrag"]
 stream = ExtResource("5_grwug")
+bus = &"FallSounds"
 
 [connection signal="dragged" from="MovementDrag" to="." method="_on_dragged"]
 [connection signal="dragged" from="MovementDrag" to="MovementDrag/DragSound" method="play" unbinds=1]

entities/sheep.gd

@@ -18,16 +18,20 @@ func _on_dragged(_cursor: Cursor) -> void:
 	collision_layer = 16
 	collision_mask = 18
 	z_index = Enums.ZIndex.EntityAir
+	y_sort_enabled = false
 	animator.play(&"drag_start")
 
 func _on_fallen() -> void:
 	collision_layer = 8
 	collision_mask = 14
 	z_index = Enums.ZIndex.EntityGround
+	y_sort_enabled = true
 	animator.play(&"RESET")
 
 func _on_trapped() -> void:
 	z_index = Enums.ZIndex.EntitySacrifice
+	y_sort_enabled = false
 
 func _on_freed() -> void:
 	z_index = Enums.ZIndex.EntityGround
+	y_sort_enabled = true

entities/sheep.tscn

@@ -323,9 +323,11 @@ debug_color = Color(1, 1, 1, 0)
 
 [node name="DragSound" type="AudioStreamPlayer2D" parent="MovementDrag"]
 stream = ExtResource("16_nswfl")
+bus = &"DragSounds"
 
 [node name="FallSound" type="AudioStreamPlayer2D" parent="MovementDrag"]
 stream = ExtResource("17_8kst2")
+bus = &"FallSounds"
 
 [connection signal="sacrificed" from="Sacrificable" to="." method="queue_free"]
 [connection signal="move" from="MovementIdle" to="." method="_on_move"]

entities/skull.gd

@@ -12,16 +12,20 @@ func _on_dragged(_cursor: Cursor) -> void:
 	collision_layer = 16
 	collision_mask = 18
 	z_index = Enums.ZIndex.EntityAir
+	y_sort_enabled = false
 	animator.play(&"drag_start")
 
 func _on_fallen() -> void:
 	collision_layer = 8
 	collision_mask = 14
 	z_index = Enums.ZIndex.EntityGround
+	y_sort_enabled = true
 	animator.play(&"RESET")
 
 func _on_trapped() -> void:
 	z_index = Enums.ZIndex.EntitySacrifice
+	y_sort_enabled = false
 
 func _on_freed() -> void:
 	z_index = Enums.ZIndex.EntityGround
+	y_sort_enabled = true

entities/skull.tscn

@@ -138,9 +138,11 @@ debug_color = Color(1, 1, 1, 0)
 
 [node name="DragSound" type="AudioStreamPlayer2D" parent="MovementDrag"]
 stream = ExtResource("5_duqrf")
+bus = &"DragSounds"
 
 [node name="FallSound" type="AudioStreamPlayer2D" parent="MovementDrag"]
 stream = ExtResource("6_7yx26")
+bus = &"FallSounds"
 
 [connection signal="dragged" from="MovementDrag" to="." method="_on_dragged"]
 [connection signal="dragged" from="MovementDrag" to="MovementDrag/DragSound" method="play" unbinds=1]

entities/top_hat.gd

@@ -12,16 +12,20 @@ func _on_dragged(_cursor: Cursor) -> void:
 	collision_layer = 16
 	collision_mask = 18
 	z_index = Enums.ZIndex.EntityAir
+	y_sort_enabled = false
 	animator.play(&"drag_start")
 
 func _on_fallen() -> void:
 	collision_layer = 8
 	collision_mask = 14
 	z_index = Enums.ZIndex.EntityGround
+	y_sort_enabled = true
 	animator.play(&"RESET")
 
 func _on_trapped() -> void:
 	z_index = Enums.ZIndex.EntitySacrifice
+	y_sort_enabled = false
 
 func _on_freed() -> void:
 	z_index = Enums.ZIndex.EntityGround
+	y_sort_enabled = true

entities/top_hat.tscn

@@ -136,9 +136,11 @@ shape = SubResource("CircleShape2D_juisb")
 debug_color = Color(1, 1, 1, 0)
 
 [node name="DragSound" type="AudioStreamPlayer2D" parent="MovementDrag"]
+bus = &"DragSounds"
 
 [node name="FallSound" type="AudioStreamPlayer2D" parent="MovementDrag"]
 stream = ExtResource("6_6tpnh")
+bus = &"FallSounds"
 
 [connection signal="dragged" from="MovementDrag" to="." method="_on_dragged"]
 [connection signal="dragged" from="MovementDrag" to="MovementDrag/DragSound" method="play" unbinds=1]

entities/watcher.gd

@@ -17,16 +17,20 @@ func _on_dragged(_cursor: Cursor) -> void:
 	collision_layer = 16
 	collision_mask = 18
 	z_index = Enums.ZIndex.EntityAir
+	y_sort_enabled = false
 	animator.play(&"drag_start")
 
 func _on_fallen() -> void:
 	collision_layer = 8
 	collision_mask = 14
 	z_index = Enums.ZIndex.EntityGround
+	y_sort_enabled = true
 	animator.play(&"RESET")
 
 func _on_trapped() -> void:
 	z_index = Enums.ZIndex.EntitySacrifice
+	y_sort_enabled = false
 
 func _on_freed() -> void:
 	z_index = Enums.ZIndex.EntityGround
+	y_sort_enabled = true

entities/watcher.tscn

@@ -216,12 +216,16 @@ debug_color = Color(1, 1, 1, 0)
 
 [node name="DragSound" type="AudioStreamPlayer2D" parent="MovementDrag"]
 stream = ExtResource("11_rydo5")
+bus = &"DragSounds"
 
 [node name="FallSound" type="AudioStreamPlayer2D" parent="MovementDrag"]
 stream = ExtResource("12_0h21e")
+bus = &"FallSounds"
 
 [connection signal="changed_target" from="MovementTrap" to="MovementTrap/TrapPriority" method="priority_conditional"]
 [connection signal="move" from="MovementTrap" to="." method="_on_move"]
+[connection signal="move_disabled" from="MovementTrap" to="." method="_on_freed"]
+[connection signal="move_enabled" from="MovementTrap" to="." method="_on_trapped"]
 [connection signal="area_entered" from="MovementTrap/TrackerTrap" to="MovementTrap/TrackerTrap" method="check_diet_then_track"]
 [connection signal="area_exited" from="MovementTrap/TrackerTrap" to="MovementTrap/TrackerTrap" method="untrack"]
 [connection signal="tracked" from="MovementTrap/TrackerTrap" to="MovementTrap/TrackerTrap/TargetPicker" method="sample_target_if_null" unbinds=1]

players/gold_pickup_player.tscn

@@ -5,5 +5,6 @@
 [node name="GoldPickupPlayer" type="AudioStreamPlayer2D"]
 stream = ExtResource("1_rpx7k")
 autoplay = true
+bus = &"CollectSounds"
 
 [connection signal="finished" from="." to="." method="queue_free"]

scenes/game/main_game.tscn

@@ -903,53 +903,54 @@ collision_mask = 0
 [node name="Shape" type="CollisionShape2D" parent="Walls/LeftBoundary"]
 shape = SubResource("WorldBoundaryShape2D_htttx")
 
-[node name="DefaultSpawnParent" type="Node2D" parent="."]
-unique_name_in_owner = true
-
-[node name="Skull" parent="." instance=ExtResource("6_5k7gy")]
-position = Vector2(2, 3)
-
-[node name="Monocle" parent="." instance=ExtResource("7_lahut")]
-position = Vector2(-56, 56)
-
-[node name="TopHat" parent="." instance=ExtResource("8_atoon")]
-position = Vector2(56, -50)
-
-[node name="Sheep" parent="." instance=ExtResource("9_qrqqu")]
-position = Vector2(-310, 166)
-
-[node name="Imp2" parent="." instance=ExtResource("10_yw228")]
-position = Vector2(408, 225)
-
-[node name="Imp" parent="." instance=ExtResource("10_yw228")]
-position = Vector2(393, -137)
-
-[node name="Sheep2" parent="." instance=ExtResource("9_qrqqu")]
-position = Vector2(-415, 202)
-
-[node name="Sheep3" parent="." instance=ExtResource("9_qrqqu")]
-position = Vector2(-386, 112)
-
-[node name="Sheep4" parent="." instance=ExtResource("9_qrqqu")]
-position = Vector2(-314, 261)
-
-[node name="Sheep5" parent="." instance=ExtResource("9_qrqqu")]
-position = Vector2(-211, 241)
-
-[node name="Sheep6" parent="." instance=ExtResource("9_qrqqu")]
-position = Vector2(-491, 137)
-
-[node name="Sheep7" parent="." instance=ExtResource("9_qrqqu")]
-position = Vector2(-177, 154)
-
-[node name="Chupacabra" parent="." instance=ExtResource("11_ixo4x")]
-position = Vector2(6, -210)
-
-[node name="Watcher" parent="." instance=ExtResource("14_8rumi")]
-position = Vector2(189, 171)
-
-[node name="Cthulhu" parent="." instance=ExtResource("15_k41qf")]
-position = Vector2(226, -137)
-
 [node name="SummoningCirclePentagram" parent="." instance=ExtResource("16_nhsrb")]
 position = Vector2(-321, -191)
+
+[node name="DefaultSpawnParent" type="Node2D" parent="."]
+unique_name_in_owner = true
+y_sort_enabled = true
+
+[node name="Skull" parent="DefaultSpawnParent" instance=ExtResource("6_5k7gy")]
+position = Vector2(2, 3)
+
+[node name="Monocle" parent="DefaultSpawnParent" instance=ExtResource("7_lahut")]
+position = Vector2(-56, 56)
+
+[node name="TopHat" parent="DefaultSpawnParent" instance=ExtResource("8_atoon")]
+position = Vector2(56, -50)
+
+[node name="Sheep" parent="DefaultSpawnParent" instance=ExtResource("9_qrqqu")]
+position = Vector2(-310, 166)
+
+[node name="Imp2" parent="DefaultSpawnParent" instance=ExtResource("10_yw228")]
+position = Vector2(408, 225)
+
+[node name="Imp" parent="DefaultSpawnParent" instance=ExtResource("10_yw228")]
+position = Vector2(393, -137)
+
+[node name="Sheep2" parent="DefaultSpawnParent" instance=ExtResource("9_qrqqu")]
+position = Vector2(-415, 202)
+
+[node name="Sheep3" parent="DefaultSpawnParent" instance=ExtResource("9_qrqqu")]
+position = Vector2(-386, 112)
+
+[node name="Sheep4" parent="DefaultSpawnParent" instance=ExtResource("9_qrqqu")]
+position = Vector2(-314, 261)
+
+[node name="Sheep5" parent="DefaultSpawnParent" instance=ExtResource("9_qrqqu")]
+position = Vector2(-211, 241)
+
+[node name="Sheep6" parent="DefaultSpawnParent" instance=ExtResource("9_qrqqu")]
+position = Vector2(-491, 137)
+
+[node name="Sheep7" parent="DefaultSpawnParent" instance=ExtResource("9_qrqqu")]
+position = Vector2(-177, 154)
+
+[node name="Chupacabra" parent="DefaultSpawnParent" instance=ExtResource("11_ixo4x")]
+position = Vector2(6, -210)
+
+[node name="Watcher" parent="DefaultSpawnParent" instance=ExtResource("14_8rumi")]
+position = Vector2(189, 171)
+
+[node name="Cthulhu" parent="DefaultSpawnParent" instance=ExtResource("15_k41qf")]
+position = Vector2(226, -137)