(b0edb0a51) Fix bots not being able to equip anything.

2019-05-16 06:19:46 +03:00
parent 69494dcde8
commit 0df7ed4ac0
12 changed files with 242 additions and 260 deletions
@@ -805,6 +805,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;
@@ -274,18 +274,18 @@ namespace Barotrauma
            return false;
        }

-        public static bool IsTakenBySomeone(Item item)
+        private bool IsTakenBySomeone(Item item)
        {
            //if the item is inside a character's inventory, don't steal it unless the character is dead
            if (item.ParentInventory is CharacterInventory)
            {
-                if (item.ParentInventory.Owner is Character owner && !owner.IsDead) { return true; }
+                if (item.ParentInventory.Owner is Character owner && owner != character && !owner.IsDead) { return true; }
            }
            //if the item is inside an item, which is inside a character's inventory, don't steal it unless the character is dead
            Item rootContainer = item.GetRootContainer();
            if (rootContainer != null && rootContainer.ParentInventory is CharacterInventory)
            {
-                if (rootContainer.ParentInventory.Owner is Character owner && !owner.IsDead) { return true; }
+                if (rootContainer.ParentInventory.Owner is Character owner && owner != character && !owner.IsDead) { return true; }
            }
            return false;
        }
@@ -73,21 +73,6 @@ namespace Barotrauma
            }
        }

-        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;

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