(ebf4529cc) Use a uniform way to check if the bot has reached it's target. Should fix issues where bot is stuck when trying to get or operate an item in some cases.

2019-05-16 06:25:31 +03:00
parent e500ba2bdf
commit bf57a48c7e
17 changed files with 211 additions and 299 deletions
@@ -1,5 +1,6 @@
 using Barotrauma.Items.Components;
 using Microsoft.Xna.Framework;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Barotrauma.Extensions;
@@ -66,9 +67,7 @@ namespace Barotrauma
            }
            if (target.CanBeSelected)
            {
-                bool inSameRoom = character.CurrentHull == target.Item.CurrentHull;
-                bool withinReach = target.Item.IsInsideTrigger(character.WorldPosition) || Vector2.DistanceSquared(character.Position, target.Item.Position) < MathUtils.Pow(target.Item.InteractDistance, 2);
-                if (inSameRoom && withinReach)
+                if (character.CanInteractWith(target.Item, out _, checkLinked: false))
                {
                    if (character.SelectedConstruction != target.Item)
                    {
@@ -446,6 +445,10 @@ namespace Barotrauma
                    {
                        isCompleted = true;
                    }
+                    if (component.AIOperate(deltaTime, character, this))
+                    {
+                        isCompleted = true;
+                    }
                }
                else
                {