More AI fixes/improvements:

- AI characters can refuel the reactor when needed.
- AIObjectiveContainItem.CanBeCompleted returns true if the target item cannot be obtained or if the container cannot be reached.
- AI characters only weld leaks that are part of some submarine (i.e. not ruins).

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

@@ -1,19 +1,27 @@
 using Barotrauma.Items.Components;
 using Microsoft.Xna.Framework;
+using System;
 using System.Linq;
 
 namespace Barotrauma
 {
     class AIObjectiveContainItem: AIObjective
     {
+        public int MinContainedAmount = 1;
+
         private string[] itemNames;
 
         private ItemContainer container;
-        
-        bool isCompleted;
+
+        private bool isCompleted;
 
         public bool IgnoreAlreadyContainedItems;
 
+        public Func<Item, float> GetItemPriority;
+
+        private AIObjectiveGetItem getItemObjective;
+        private AIObjectiveGoTo goToObjective;
+
         public AIObjectiveContainItem(Character character, string itemName, ItemContainer container)
             : this(character, new string[] { itemName }, container)
         {
@@ -28,7 +36,28 @@ namespace Barotrauma
 
         public override bool IsCompleted()
         {
-            return isCompleted || itemNames.Any(name => container.Inventory.FindItem(name) != null);
+            if (isCompleted) return true;
+
+            int containedItemCount = 0;
+            foreach (Item item in container.Inventory.Items)
+            {
+                if (item != null && itemNames.Any(name => item.Prefab.NameMatches(name) || item.HasTag(name))) containedItemCount++;
+            }
+
+            return containedItemCount >= MinContainedAmount;
+        }
+
+        public override bool CanBeCompleted
+        {
+            get
+            {
+                if (goToObjective != null)
+                {
+                    return goToObjective.CanBeCompleted;
+                }
+
+                return getItemObjective == null || !getItemObjective.CanBeCompleted;
+            }
         }
 
         public override float GetPriority(AIObjectiveManager objectiveManager)
@@ -49,9 +78,10 @@ namespace Barotrauma
             var itemToContain = character.Inventory.FindItem(itemNames);
             if (itemToContain == null)
             {
-                var getItem = new AIObjectiveGetItem(character, itemNames);
-                getItem.IgnoreContainedItems = IgnoreAlreadyContainedItems;
-                AddSubObjective(getItem);
+                getItemObjective = new AIObjectiveGetItem(character, itemNames);
+                getItemObjective.GetItemPriority = GetItemPriority;
+                getItemObjective.IgnoreContainedItems = IgnoreAlreadyContainedItems;
+                AddSubObjective(getItemObjective);
                 return;
             }
 
@@ -68,9 +98,10 @@ namespace Barotrauma
             else
             {
                 if (Vector2.Distance(character.Position, container.Item.Position) > container.Item.InteractDistance
-                    && !container.Item.IsInsideTrigger(character.Position))
+                    && !container.Item.IsInsideTrigger(character.WorldPosition))
                 {
-                    AddSubObjective(new AIObjectiveGoTo(container.Item, character));
+                    goToObjective = new AIObjectiveGoTo(container.Item, character);
+                    AddSubObjective(goToObjective);
                     return;
                 }
 

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

@@ -106,6 +106,9 @@ namespace Barotrauma
                 if (gap.ConnectedWall == null) continue;
                 if (gap.ConnectedDoor != null || gap.Open <= 0.0f) continue;
 
+                //TODO: prevent the AI characters from fixing leaks in the enemy sub in sub-vs-sub missions if/when multiplayer bots are implemented
+                if (gap.Submarine == null) continue;
+
                 float gapPriority = GetGapFixPriority(gap);
 
                 int index = 0;

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

@@ -1,5 +1,6 @@
 using Barotrauma.Items.Components;
 using Microsoft.Xna.Framework;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -7,6 +8,8 @@ namespace Barotrauma
 {
     class AIObjectiveGetItem : AIObjective
     {
+        public Func<Item, float> GetItemPriority;
+
         private string[] itemNames;
 
         private Item targetItem, moveToTarget;
@@ -19,6 +22,8 @@ namespace Barotrauma
 
         private AIObjectiveGoTo goToObjective;
 
+        private float currItemPriority;
+
         private bool equip;
 
         public override bool CanBeCompleted
@@ -172,8 +177,20 @@ namespace Barotrauma
                     if (owner != null && !owner.IsDead) continue;
                 }
 
-                //ignore if item is further away than the currently targeted item
-                if (moveToTarget != null && Vector2.DistanceSquared((rootContainer ?? item).Position, character.Position) > currDist) continue;
+                float itemPriority = 0.0f;
+                if (GetItemPriority != null)
+                {
+                    //ignore if the item has zero priority
+                    itemPriority = GetItemPriority(item);
+                    if (itemPriority <= 0.0f) continue;
+                }
+
+                itemPriority = itemPriority - Vector2.Distance((rootContainer ?? item).Position, character.Position) * 0.01f;
+
+                //ignore if the item has a lower priority than the currently selected one
+                if (moveToTarget != null && itemPriority < currItemPriority) continue;
+
+                currItemPriority = itemPriority;
 
                 targetItem = item;
                 moveToTarget = rootContainer ?? item;