(00d1e066a) Take also the previous node into account when determining if the bot is using stairs or not. Should fix bots occasionally dropping the diving suit in stairs.

2019-05-16 06:38:19 +03:00
parent 83cb848ecd
commit fb21fe7b44
11 changed files with 323 additions and 133 deletions
@@ -53,12 +53,13 @@ namespace Barotrauma
            (currentPath.NextNode != null && currentPath.NextNode.Ladders != null));

        /// <summary>
-        /// Returns true if the current or the next node is in stairs.
+        /// Returns true if the previous, current or the next node is in stairs.
        /// </summary>
        public bool InStairs =>
-            currentPath != null &&
-            currentPath.CurrentNode != null && (currentPath.CurrentNode.Stairs != null ||
-            (currentPath.NextNode != null && currentPath.NextNode.Stairs != null));
+            currentPath != null && (
+            currentPath.PrevNode != null && currentPath.PrevNode.Stairs != null ||
+            currentPath.CurrentNode != null && currentPath.CurrentNode.Stairs != null ||
+            currentPath.NextNode != null && currentPath.NextNode.Stairs != null);

        public bool IsNextNodeLadder
        {
@@ -179,6 +179,32 @@ namespace Barotrauma
            {
 #if DEBUG
                DebugConsole.ThrowError("AIObjectiveFixLeak failed - the item \"" + weldingTool + "\" has no RepairTool component but is tagged as a welding tool");
+#endif
+                abandon = true;
+                return;
+            }
+            Vector2 gapDiff = Leak.WorldPosition - character.WorldPosition;
+            // TODO: use the collider size/reach?
+            if (!character.AnimController.InWater && Math.Abs(gapDiff.X) < 100 && gapDiff.Y < 0.0f && gapDiff.Y > -150)
+            {
+                HumanAIController.AnimController.Crouching = true;
+            }
+            float reach = ConvertUnits.ToSimUnits(repairTool.Range);
+            bool canOperate = ConvertUnits.ToSimUnits(gapDiff.Length()) < reach * 1.5f;
+            if (canOperate)
+            {
+                TryAddSubObjective(ref operateObjective, () => new AIObjectiveOperateItem(repairTool, character, objectiveManager, option: "", requireEquip: true, operateTarget: Leak));
+            }
+            else
+            {
+                TryAddSubObjective(ref gotoObjective, () => new AIObjectiveGoTo(ConvertUnits.ToSimUnits(GetStandPosition()), character, objectiveManager) { CloseEnough = reach * 0.75f });
+            }
+            if (subObjectives.Any()) { return; }
+            var repairTool = weldingTool.GetComponent<RepairTool>();
+            if (repairTool == null)
+            {
+#if DEBUG
+                DebugConsole.ThrowError("AIObjectiveFixLeak failed - the item \"" + weldingTool + "\" has no RepairTool component but is tagged as a welding tool");
 #endif
                abandon = true;
                return;
@@ -73,36 +73,6 @@ namespace Barotrauma
            }
        }

-        public override void Update(float deltaTime)
-        {
-            if (objectiveManager.CurrentObjective == this)
-            {
-                if (randomTimer > 0)
-                {
-                    randomTimer -= deltaTime;
-                }
-                else
-                {
-                    SetRandom();
-                }
-            }
-        }
-
-        public override void Update(float deltaTime)
-        {
-            if (objectiveManager.CurrentObjective == this)
-            {
-                if (randomTimer > 0)
-                {
-                    randomTimer -= deltaTime;
-                }
-                else
-                {
-                    SetRandom();
-                }
-            }
-        }
-
        public override bool IsCompleted() => false;
        public override bool CanBeCompleted => true;

@@ -625,6 +625,10 @@ namespace Barotrauma
                    {
                        isCompleted = true;
                    }
+                    if (component.AIOperate(deltaTime, character, this))
+                    {
+                        isCompleted = true;
+                    }
                }
                else
                {