Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23

godot/Level/Island.tscn

@@ -27,8 +27,8 @@
 [ext_resource type="PackedScene" uid="uid://bw3k2c75qavce" path="res://Models/beach_decor/bucket.tscn" id="27_f3p1i"]
 [ext_resource type="PackedScene" path="res://Level/World/DayNightEnvironment.tscn" id="27_jutn4"]
 [ext_resource type="PackedScene" uid="uid://g4gmc0pwlak1" path="res://Models/buildings/fence.tscn" id="28_prydb"]
-[ext_resource type="PackedScene" uid="uid://ckbba1bs71tl" path="res://crate.tscn" id="28_x0lrj"]
-[ext_resource type="PackedScene" path="res://spawner.tscn" id="29_etvc6"]
+[ext_resource type="PackedScene" path="res://crate.tscn" id="28_x0lrj"]
+[ext_resource type="PackedScene" uid="uid://d0uw7ykhb1cx8" path="res://spawner.tscn" id="29_etvc6"]
 [ext_resource type="PackedScene" uid="uid://e0s4phx2jiit" path="res://cultist.tscn" id="30_8gvtc"]
 
 [sub_resource type="Animation" id="Animation_jpnyu"]

godot/Villager.gd

@@ -11,7 +11,7 @@ var aggressor
 
 func _ready():
 	super._ready()
-	$SoundTimer.wait_time = rng.randi_range(15, 65)
+	$SoundTimer.wait_time = rng.randi_range(15, 240)
 	$SoundTimer.start()
 
 func _process(delta):
@@ -76,5 +76,5 @@ func _on_collision_detection_body_entered(body):
 
 func _on_sound_timer_timeout():
 	$happyslime.play()
-	$SoundTimer.wait_time = rng.randi_range(15, 65)
+	$SoundTimer.wait_time = rng.randi_range(60, 240)
 	$SoundTimer.start()

godot/villager_shared.tscn

@@ -29,6 +29,7 @@ wait_time = 45.0
 
 [node name="happyslime" type="AudioStreamPlayer3D" parent="." index="6"]
 stream = ExtResource("3_v720k")
+volume_db = -15.0
 
 [connection signal="body_entered" from="Area3D" to="." method="_on_area_3d_body_entered"]
 [connection signal="timeout" from="SoundTimer" to="." method="_on_sound_timer_timeout"]