Optimize and clean up the scorpion

Author: Jacalz

Enteties/Enemies/Scorpion/Scorpion.tscn

@@ -38,39 +38,22 @@ rect = Rect2( -30, 0, 60, 20 )
 process_parent = true
 physics_process_parent = true
 
-[node name="FloorDetector" type="Node2D" parent="."]
-
-[node name="Left" type="RayCast2D" parent="FloorDetector"]
-modulate = Color( 0, 1, 0.0392157, 1 )
-position = Vector2( -55, 40 )
+[node name="FloorDetector" type="RayCast2D" parent="."]
+position = Vector2( -50, 40 )
 enabled = true
-cast_to = Vector2( 0, 10 )
+cast_to = Vector2( 0, 15 )
 collision_mask = 8
 
-[node name="Right" type="RayCast2D" parent="FloorDetector"]
-modulate = Color( 0, 1, 0.0392157, 1 )
-position = Vector2( 55, 40 )
-enabled = true
-cast_to = Vector2( 0, 10 )
-collision_mask = 2147483656
-
 [node name="KillerInstinct" type="Area2D" parent="."]
 
 [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="KillerInstinct"]
 modulate = Color( 0, 0, 0, 1 )
 polygon = PoolVector2Array( -55.7638, 43.9623, 54.2375, 43.9623, 37.6812, -34.3294, 7.0941, -55.0949, -11.9877, -47.7989, -55.2025, 4.39556 )
 
-[node name="PlayerRight" type="RayCast2D" parent="KillerInstinct"]
+[node name="Player" type="RayCast2D" parent="KillerInstinct"]
 modulate = Color( 0.486275, 0.0941176, 0.0941176, 1 )
 position = Vector2( 40, 30 )
 rotation = -1.5708
 enabled = true
 cast_to = Vector2( 0, 200 )
-
-[node name="PlayerLeft" type="RayCast2D" parent="KillerInstinct"]
-modulate = Color( 0.486275, 0.0941176, 0.0941176, 1 )
-position = Vector2( -40, 30 )
-rotation = 1.5708
-enabled = true
-cast_to = Vector2( 0, 200 )
 [connection signal="body_entered" from="KillerInstinct" to="." method="_on_KillerInstinct_body_entered"]

Enteties/Enemies/Scorpion/scorpion.gd

@@ -2,31 +2,28 @@ extends "res://Enteties/Enemies/enemy.gd"
 
 export var enable_floor_detect = true
 
-onready var LeftD = $FloorDetector/Left
-onready var RightD = $FloorDetector/Right
+onready var Floor = $FloorDetector
+onready var Player = $KillerInstinct/Player
 onready var ASprite = $AnimatedSprite
-onready var PlayerR = $KillerInstinct/PlayerRight
-onready var PlayerL = $KillerInstinct/PlayerLeft
 
 onready var player = get_tree().get_root().find_node("Chameleon", true, false)
 
 func _ready():
-	if !enable_floor_detect:
-		LeftD.enabled = false
-		RightD.enabled = false
+	Floor.enabled = enable_floor_detect
 
 func _physics_process(delta: float):
 	velocity.y += GRAVITY * delta
 
-	var need_turn = is_on_wall() or !LeftD.is_colliding() or !RightD.is_colliding()
-	var sees_left = velocity.x == SPEED and !player.hidden and PlayerL.is_colliding()
-	var sees_right =  velocity.x == -SPEED and !player.hidden and PlayerR.is_colliding()
+	var need_turn = is_on_wall() or (Floor.enabled and !Floor.is_colliding()) # Collision returns false if disabled for some reason
+	var sees_player = !player.hidden and Player.is_colliding()
 
-	if !enable_floor_detect:
-		need_turn = is_on_wall()
-	
-	if need_turn or sees_left or sees_right:
+	if !(need_turn == sees_player):
 		velocity.x *= -1
+		
+		# Need to flip the detection on changing direction
+		Floor.position.x = -Floor.position.x
+		Player.rotation_degrees = -Player.rotation_degrees
+		Player.position.x = -Player.position.x
 
 	ASprite.flip_h = velocity.x > 0
 	velocity.y = move_and_slide(velocity, UP).y