(3f4e69c0d) Only unequip items when idling. Fixes bots not being able to repair, because the tools were unequipped (if they were weapons).

2019-05-16 05:34:03 +03:00
parent 155cb83f91
commit f667ed8e12
10 changed files with 201 additions and 248 deletions
@@ -201,18 +201,9 @@ namespace Barotrauma
            foreach (var item in Character.Inventory.Items)
            {
                if (item == null) { continue; }
-                bool unequip = false;
                if (ObjectiveManager.CurrentObjective is AIObjectiveIdle)
                {
-                    unequip = item.AllowedSlots.Contains(InvSlotType.RightHand | InvSlotType.LeftHand);
-                }
-                else if (!ObjectiveManager.IsCurrentObjective<AIObjectiveCombat>() && !ObjectiveManager.IsCurrentObjective<AIObjectiveFightIntruders>())
-                {
-                    unequip = item.GetComponent<RangedWeapon>() != null || item.GetComponent<MeleeWeapon>() != null;
-                }
-                if (unequip)
-                {
-                    if (Character.HasEquippedItem(item))
+                    if (item.AllowedSlots.Contains(InvSlotType.RightHand | InvSlotType.LeftHand) && Character.HasEquippedItem(item))
                    {
                        // Try to put the weapon in an Any slot, and drop it if that fails
                        if (!item.AllowedSlots.Contains(InvSlotType.Any) || !Character.Inventory.TryPutItem(item, Character, new List<InvSlotType>() { InvSlotType.Any }))
@@ -74,6 +74,21 @@ 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;

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