fix drone controller targeting issues

Ouroel · Apr 25, 2022 · 672521b · 672521b
1 parent 8cb8c86
commit 672521b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/Base/AssAI.cs b/Base/AssAI.cs
@@ -44,7 +44,8 @@ public static int FindTarget(Entity ent, Vector2 relativeCenter, float range, bo
 					float between = Vector2.DistanceSquared(npc.Center, relativeCenter);
 					if ((between < range && Vector2.DistanceSquared(relativeCenter, targetCenter) > between && between < distanceFromTarget) || targetIndex == -1)
 					{
-						if (ignoreTiles || Collision.CanHitLine(ent.position, ent.width, ent.height, npc.position, npc.width, npc.height))
+						if (ignoreTiles || Collision.CanHitLine(ent.position, ent.width, ent.height, npc.position, npc.width, npc.height) ||
+							Collision.CanHit(ent.position, ent.width, ent.height, npc.position, npc.width, npc.height))
 						{
 							distanceFromTarget = between;
 							targetCenter = npc.Center;

diff --git a/Projectiles/Minions/Drones/BasicLaserDrone.cs b/Projectiles/Minions/Drones/BasicLaserDrone.cs
@@ -303,7 +303,8 @@ private int FindClosestTargetBelow(int range = 1000)
 					float between = Vector2.Distance(npc.Center, Projectile.Center);
 					if (((between < range &&
 						Vector2.Distance(player.Center, targetCenter) > between && between < distanceFromTarget) || targetIndex == -1) &&
-						Projectile.Bottom.Y < npc.Top.Y + 40 && Collision.CanHitLine(Projectile.Center, 1, 1, npc.position, npc.width, npc.height))
+						Projectile.Bottom.Y < npc.Top.Y + 40 &&
+						(Collision.CanHitLine(Projectile.Center, 1, 1, npc.position, npc.width, npc.height) || Collision.CanHit(Projectile.Center, 1, 1, npc.position, npc.width, npc.height)))
 					{
 						distanceFromTarget = between;
 						targetCenter = npc.Center;

diff --git a/Projectiles/Minions/Drones/HeavyLaserDrone.cs b/Projectiles/Minions/Drones/HeavyLaserDrone.cs
@@ -413,7 +413,7 @@ private int FindClosestHorizontalTarget()
 					float between = Vector2.Distance(npc.Center, player.Center);
 					if (((between < range &&
 						Vector2.Distance(player.Center, targetCenter) > between && between < distanceFromTarget) || targetIndex == -1) &&
-						 Collision.CanHitLine(player.Center, 1, 1, npc.position, npc.width, npc.height))
+						 (Collision.CanHitLine(player.Center, 1, 1, npc.position, npc.width, npc.height) || Collision.CanHit(Projectile.Center, 1, 1, npc.position, npc.width, npc.height)))
 					{
 						distanceFromTarget = between;
 						targetCenter = npc.Center;