2f107db...5202af9

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

@@ -60,10 +60,10 @@ namespace Barotrauma
                     weapon.GetComponent<RepairTool>() as ItemComponent;
                 if (weaponComponent != null && weaponComponent.requiredItems.ContainsKey(RelatedItem.RelationType.Contained))
                 {
-                    Item[] containedItems = weapon.ContainedItems;
+                    var containedItems = weapon.ContainedItems;
                     foreach (RelatedItem requiredItem in weaponComponent.requiredItems[RelatedItem.RelationType.Contained])
                     {
-                        Item containedItem = Array.Find(containedItems, it => it != null && it.Condition > 0.0f && requiredItem.MatchesItem(it));
+                        Item containedItem = containedItems.FirstOrDefault(it => it.Condition > 0.0f && requiredItem.MatchesItem(it));
                         if (containedItem == null)
                         {
                             var newReloadWeaponObjective = new AIObjectiveContainItem(character, requiredItem.Identifiers, weapon.GetComponent<ItemContainer>());

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

@@ -1,7 +1,6 @@
 using Barotrauma.Items.Components;
 using Microsoft.Xna.Framework;
 using System;
-using System.Linq;
 
 namespace Barotrauma
 {

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

@@ -1,5 +1,6 @@
 using Barotrauma.Items.Components;
 using System;
+using System.Linq;
 
 namespace Barotrauma
 {
@@ -19,7 +20,7 @@ namespace Barotrauma
                     var containedItems = character.Inventory.Items[i].ContainedItems;
                     if (containedItems == null) continue;
 
-                    var oxygenTank = Array.Find(containedItems, it => (it.Prefab.Identifier == "oxygentank" || it.HasTag("oxygensource")) && it.Condition > 0.0f);
+                    var oxygenTank = containedItems.FirstOrDefault(it => (it.Prefab.Identifier == "oxygentank" || it.HasTag("oxygensource")) && it.Condition > 0.0f);
                     if (oxygenTank != null) return true;
                 }
             }

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

@@ -2,6 +2,7 @@
 using FarseerPhysics;
 using Microsoft.Xna.Framework;
 using System;
+using System.Linq;
 
 namespace Barotrauma
 {
@@ -60,7 +61,7 @@ namespace Barotrauma
                 var containedItems = weldingTool.ContainedItems;
                 if (containedItems == null) return;
                 
-                var fuelTank = Array.Find(containedItems, i => i.HasTag("weldingfueltank") && i.Condition > 0.0f);
+                var fuelTank = containedItems.FirstOrDefault(i => i.HasTag("weldingfueltank") && i.Condition > 0.0f);
                 if (fuelTank == null)
                 {
                     AddSubObjective(new AIObjectiveContainItem(character, "weldingfueltank", weldingTool.GetComponent<ItemContainer>()));

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

@@ -108,16 +108,20 @@ namespace Barotrauma
                 //not linked to a hull -> ignore
                 if (gap.linkedTo.All(l => l == null)) { continue; }
                 
-                if (character.TeamID == 0)
+                if (character.TeamID == Character.TeamType.None)
                 {
+                    //TODO: make sure the gap isn't in another sub (outpost, respawn shuttle...?)
                     if (gap.Submarine == null) continue;
                 }
                 else
                 {
                     //prevent characters from attempting to fix leaks in the enemy sub
                     //team 1 plays in sub 0, team 2 in sub 1
-                    Submarine mySub = character.TeamID < 1 || character.TeamID > Submarine.MainSubs.Length ?
-                        Submarine.MainSub : Submarine.MainSubs[character.TeamID - 1];
+                    Submarine mySub = Submarine.MainSub;
+                    if (character.TeamID == Character.TeamType.Team2 && Submarine.MainSubs.Length > 1)
+                    {
+                        mySub = Submarine.MainSubs[1];
+                    }
 
                     if (gap.Submarine != mySub) continue;
                 }

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

@@ -24,8 +24,9 @@ namespace Barotrauma
 
         public override float GetPriority(AIObjectiveManager objectiveManager)
         {
-            if (Target != null && Target.Removed) return 0.0f;
-            if (IgnoreIfTargetDead && Target is Character character && character.IsDead) return 0.0f;
+            if (FollowControlledCharacter && Character.Controlled == null) { return 0.0f; }
+            if (Target != null && Target.Removed) { return 0.0f; }
+            if (IgnoreIfTargetDead && Target is Character character && character.IsDead) { return 0.0f; }
                         
             if (objectiveManager.CurrentOrder == this)
             {
@@ -39,15 +40,17 @@ namespace Barotrauma
         {
             get
             {
-                if (Target != null && Target.Removed) return false;
+                if (FollowControlledCharacter && Character.Controlled == null) { return false; }
 
-                if (repeat || waitUntilPathUnreachable > 0.0f) return true;
+                if (Target != null && Target.Removed) { return false; }
+
+                if (repeat || waitUntilPathUnreachable > 0.0f) { return true; }
                 var pathSteering = character.AIController.SteeringManager as IndoorsSteeringManager;
 
                 //path doesn't exist (= hasn't been searched for yet), assume for now that the target is reachable
-                if (pathSteering?.CurrentPath == null) return true;
+                if (pathSteering?.CurrentPath == null) { return true; }
 
-                if (!AllowGoingOutside && pathSteering.CurrentPath.HasOutdoorsNodes) return false;
+                if (!AllowGoingOutside && pathSteering.CurrentPath.HasOutdoorsNodes) { return false; }
 
                 return !pathSteering.CurrentPath.Unreachable;
             }
@@ -55,6 +58,8 @@ namespace Barotrauma
 
         public Entity Target { get; private set; }
 
+        public bool FollowControlledCharacter;
+
         public AIObjectiveGoTo(Entity target, Character character, bool repeat = false, bool getDivingGearIfNeeded = true)
             : base (character, "")
         {
@@ -78,12 +83,18 @@ namespace Barotrauma
 
         protected override void Act(float deltaTime)
         {
+            if (FollowControlledCharacter)
+            {
+                if (Character.Controlled == null) { return; }
+                Target = Character.Controlled;
+            }
+
             if (Target == character)
             {
                 character.AIController.SteeringManager.Reset();
                 return;
             }
-
+            
             waitUntilPathUnreachable -= deltaTime;
 
             if (character.SelectedConstruction != null && character.SelectedConstruction.GetComponent<Ladder>() == null)

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

@@ -132,7 +132,8 @@ namespace Barotrauma
                     {
                         CloseEnough = 1.5f,
                         AllowGoingOutside = true,
-                        IgnoreIfTargetDead = true
+                        IgnoreIfTargetDead = true,
+                        FollowControlledCharacter = orderGiver == character
                     };
                     break;
                 case "wait":

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

@@ -28,7 +28,7 @@ namespace Barotrauma
 
             if (!repairablesFound) { return 0.0f; }
 
-            float priority = 100.0f - item.Condition;
+            float priority = item.Prefab.Health - item.Condition;
             //vertical distance matters more than horizontal (climbing up/down is harder than moving horizontally)
             float dist = 
                 Math.Abs(character.WorldPosition.X - item.WorldPosition.X) + 

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

@@ -48,7 +48,7 @@ namespace Barotrauma
             foreach (Item item in Item.ItemList)
             {
                 //ignore items that are in full condition
-                if (item.Condition >= 100.0f) continue;
+                if (item.Condition >= item.Prefab.Health) continue;
                 foreach (Repairable repairable in item.Repairables)
                 {
                     //ignore ones that are already fixed

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

@@ -194,7 +194,7 @@ namespace Barotrauma
             var targetLimb = targetCharacter.CharacterHealth.GetAfflictionLimb(affliction);
 
             bool remove = false;
-            foreach (ItemComponent ic in item.components)
+            foreach (ItemComponent ic in item.Components)
             {
                 if (!ic.HasRequiredContainedItems(addMessage: false)) continue;
 #if CLIENT