diff --git a/pulsjam2025/NPC/penguin/group.gd b/pulsjam2025/NPC/penguin/group.gd index 07a87e99b48e3d3347dd88a6a0b3ea22eaa82f1e..918a8e14aaee69bc88d3623ec00110fc442f66dc 100644 --- a/pulsjam2025/NPC/penguin/group.gd +++ b/pulsjam2025/NPC/penguin/group.gd @@ -47,13 +47,13 @@ func notify_pengu_suspend(): p.suspend() func _on_timer_timeout(): - var coin = randf_range(0, 1) + var coin = randf_range(0, 2) var pengu_to_move: Penguin if (coin == 1): - pengu_to_move = penguins.reduce(func(best, current): return best if best.cluster_score > current.cluster_score else current) - else: pengu_to_move = penguins[randf_range(0, len(penguins)-1)] - + else: + pengu_to_move = penguins.reduce(func(best, current): return best if best.cluster_score > current.cluster_score else current) + if not is_instance_valid(pengu_to_move): return if pengu_to_move.get_parent() is IceFloe: diff --git a/pulsjam2025/Player/PlayerMovement.gd b/pulsjam2025/Player/PlayerMovement.gd index 55639aa0007e0eda377289f623f57cde0008c716..f2ad35341c4f87c5b367e6c523d732b33cc491ba 100644 --- a/pulsjam2025/Player/PlayerMovement.gd +++ b/pulsjam2025/Player/PlayerMovement.gd @@ -166,7 +166,6 @@ func _ungrapple() -> void: print("Un-Grabbed") Grappled = false lastGrabbedEisscholle = null - Grappled = false # Apply a slight dampening when releasing to further reduce slingshot effect velocity *= 0.85 @@ -180,3 +179,7 @@ func _on_fish_cooldown_timer_timeout() -> void: func _on_area_2d_body_entered(body: Node2D) -> void: CurrentEisscholle = body + + +func _on_area_2d_body_exited(body: Node2D) -> void: + CurrentEisscholle = null diff --git a/pulsjam2025/Player/PlayerScene.tscn b/pulsjam2025/Player/PlayerScene.tscn index 0d64172b92f435e455a656219b9d09d217cb8701..67cce095a796f31a890dc62ab073856820eea719 100644 --- a/pulsjam2025/Player/PlayerScene.tscn +++ b/pulsjam2025/Player/PlayerScene.tscn @@ -78,3 +78,4 @@ shape = SubResource("CircleShape2D_b3kip") [connection signal="timeout" from="FishCooldownTimer" to="." method="_on_fish_cooldown_timer_timeout"] [connection signal="timeout" from="FishDespawnTimer" to="." method="_on_fish_despawn_timer_timeout"] [connection signal="body_entered" from="Area2D" to="." method="_on_area_2d_body_entered"] +[connection signal="body_exited" from="Area2D" to="." method="_on_area_2d_body_exited"]