(3628de633) Use the visible hulls instead of the current hull in multiple cases.

This commit is contained in:
Joonas Rikkonen
2019-05-16 06:50:59 +03:00
parent 1e41ed6b63
commit 0ba5793b46
15 changed files with 307 additions and 356 deletions
@@ -319,7 +319,7 @@ namespace Barotrauma
}
if (retreatTarget == null || (retreatObjective != null && !retreatObjective.CanBeCompleted))
{
retreatTarget = findSafety.FindBestHull(new List<Hull>() { character.CurrentHull });
retreatTarget = findSafety.FindBestHull(HumanAIController.VisibleHulls);
}
TryAddSubObjective(ref retreatObjective, () => new AIObjectiveGoTo(retreatTarget, character, objectiveManager, false, true));
}
@@ -439,8 +439,7 @@ namespace Barotrauma
character.CursorPosition = Enemy.Position;
float engageDistance = 500;
if (squaredDistance > engageDistance * engageDistance) { return; }
bool canSeeTarget = character.CanSeeCharacter(Enemy);
if (!canSeeTarget && character.CurrentHull != Enemy.CurrentHull) { return; }
if (!character.CanSeeCharacter(Enemy)) { return; }
if (Weapon.RequireAimToUse)
{
bool isOperatingButtons = false;