(44994edc6) Merge branch 'dev' of github.com:Regalis11/Barotrauma-development into dev

Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveFixLeak.cs

@@ -935,6 +935,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;

Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveGetItem.cs

@@ -105,6 +105,9 @@ namespace Barotrauma
             {
                 if (IsTakenBySomeone(targetItem))
                 {
+#if DEBUG
+                    DebugConsole.NewMessage($"{character.Name}: Found an item, but it's equipped by someone else. Aborting.", Color.Yellow);
+#endif
                     abandon = true;
                 }
                 else
@@ -172,7 +175,7 @@ namespace Barotrauma
                 if (targetItem == null)
                 {
 #if DEBUG
-                    DebugConsole.NewMessage($"{character.Name}: Cannot find the item, because neither identifiers nor item is was defined.");
+                    DebugConsole.NewMessage($"{character.Name}: Cannot find the item, because neither identifiers nor item is was defined.", Color.Red);
 #endif
                     abandon = true;
                 }
@@ -212,7 +215,7 @@ namespace Barotrauma
             if (currSearchIndex >= Item.ItemList.Count - 1 && targetItem == null)
             {
 #if DEBUG
-                DebugConsole.NewMessage($"{character.Name}: Cannot find the item with the following identifier(s): {string.Join(", ", itemIdentifiers)}");
+                DebugConsole.NewMessage($"{character.Name}: Cannot find the item with the following identifier(s): {string.Join(", ", itemIdentifiers)}", Color.Red);
 #endif
                 abandon = true;
             }
@@ -274,18 +277,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;
         }

Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveIdle.cs

@@ -73,6 +73,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;
 

Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveLoop.cs

@@ -34,10 +34,7 @@ namespace Barotrauma
         }
 
         public AIObjectiveLoop(Character character, AIObjectiveManager objectiveManager, float priorityModifier, string option = null) 
-            : base(character, objectiveManager, priorityModifier, option)
-        {
-            Reset();
-        }
+            : base(character, objectiveManager, priorityModifier, option) { }
 
         protected override void Act(float deltaTime) { }
         public override bool IsCompleted() => false;
@@ -98,15 +95,6 @@ namespace Barotrauma
             UpdateTargets();
         }
 
-        public override void OnSelected()
-        {
-            base.OnSelected();
-            if (HumanAIController.ObjectiveManager.CurrentOrder == this)
-            {
-                Reset();
-            }
-        }
-
         public override float GetPriority()
         {
             if (character.Submarine == null) { return 0; }

Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveManager.cs

@@ -224,6 +224,10 @@ namespace Barotrauma
                 // Recreate objectives, because some of them may be removed, if impossible to complete (e.g. due to path finding)
                 CreateAutonomousObjectives();
             }
+            else
+            {
+                CurrentOrder.Reset();
+            }
         }
 
         public AIObjective CreateObjective(Order order, string option, Character orderGiver, float priorityModifier = 1)

Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveOperateItem.cs

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