From 44b6cbf37983f5166397881224ce0d72a2260792 Mon Sep 17 00:00:00 2001 From: Jakob Feldmann Date: Tue, 10 Oct 2023 14:00:52 +0200 Subject: [PATCH] fix: Frog jumps on harmful if its also food for him --- src/Actors/Enemies/Flyer.tscn | 2 +- src/Actors/Friendlies/WhatAreFrog.gd | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Actors/Enemies/Flyer.tscn b/src/Actors/Enemies/Flyer.tscn index d859aa5..b0997a1 100644 --- a/src/Actors/Enemies/Flyer.tscn +++ b/src/Actors/Enemies/Flyer.tscn @@ -257,7 +257,7 @@ cast_to = Vector2( 0, -1 ) collision_mask = 56 collide_with_areas = true -[node name="EnemyBody" type="CollisionShape2D" parent="." groups=["harmful"]] +[node name="EnemyBody" type="CollisionShape2D" parent="." groups=["frogfood", "harmful"]] position = Vector2( 0, -0.5 ) shape = SubResource( 1 ) diff --git a/src/Actors/Friendlies/WhatAreFrog.gd b/src/Actors/Friendlies/WhatAreFrog.gd index 001e72c..8bf716a 100644 --- a/src/Actors/Friendlies/WhatAreFrog.gd +++ b/src/Actors/Friendlies/WhatAreFrog.gd @@ -517,6 +517,7 @@ func is_jump_path_safe(v: Vector2, pos: Vector2) -> bool: abs(node_pos.x - pos.x) > abs(jump_distance) * 3 || abs(node_pos.y - pos.y) > block_size * 4 || abs(node_pos.x - pos.x) < 1 + || node.is_in_group("frogfood") ): continue var node_y = node_pos.y - block_size / 2.0