From 85348bbd3f223fe9ad8b8178c2f70ffdb5cc705b Mon Sep 17 00:00:00 2001 From: Jakob Feldmann Date: Sat, 25 Jun 2022 15:43:49 +0200 Subject: [PATCH] Turret Laserpointer and raycast selfcollision fix --- src/Actors/Enemies/Machines/Turret.gd | 1 + src/Actors/Enemies/Machines/Turret.tscn | 2 +- src/Actors/Enemies/Machines/TurretStateMachine.gd | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Actors/Enemies/Machines/Turret.gd b/src/Actors/Enemies/Machines/Turret.gd index 3ccabf9..16327a2 100644 --- a/src/Actors/Enemies/Machines/Turret.gd +++ b/src/Actors/Enemies/Machines/Turret.gd @@ -42,6 +42,7 @@ func searching(): var collider = sightline.get_collider() if collider.is_in_group("player"): prey_ref = weakref(collider) + break # TODO should this stand still? # TODO Use yield and coroutine instead diff --git a/src/Actors/Enemies/Machines/Turret.tscn b/src/Actors/Enemies/Machines/Turret.tscn index 279db60..744a887 100644 --- a/src/Actors/Enemies/Machines/Turret.tscn +++ b/src/Actors/Enemies/Machines/Turret.tscn @@ -101,7 +101,7 @@ collision_mask = 123 rotation = 0.0698132 enabled = true cast_to = Vector2( 0, 100000 ) -collision_mask = 123 +collision_mask = 121 [node name="Sightline2" type="RayCast2D" parent="SightCone"] rotation = -0.0698132 diff --git a/src/Actors/Enemies/Machines/TurretStateMachine.gd b/src/Actors/Enemies/Machines/TurretStateMachine.gd index f7a1889..101381f 100644 --- a/src/Actors/Enemies/Machines/TurretStateMachine.gd +++ b/src/Actors/Enemies/Machines/TurretStateMachine.gd @@ -54,7 +54,7 @@ func _get_transition(_delta): parent.get_node("StateLabel").text = self.state var new_state if parent.is_tracking_prey() && self.state == "searching": - laserpoint.visible = true + laserpoint.visible = false new_state = "locking" # TODO Helper function with null check and reference check if !parent.is_tracking_prey() && self.state == "shooting":