f8b0295...0671290

2019-03-18 22:59:45 +02:00
parent 23687fbf2f
commit 63eb4d64e5
103 changed files with 1378 additions and 4692 deletions
@@ -139,6 +139,7 @@ namespace Barotrauma
        }

        protected virtual bool ShouldInterruptSubObjective(AIObjective subObjective) => false;
+        public virtual void OnSelected() { }

        protected abstract void Act(float deltaTime);
        
@@ -117,6 +117,17 @@ namespace Barotrauma
            return weapon;
        }

+        private void Unequip()
+        {
+            if (character.SelectedItems.Contains(Weapon))
+            {
+                if (!Weapon.AllowedSlots.Contains(InvSlotType.Any) || !character.Inventory.TryPutItem(Weapon, character, new List<InvSlotType>() { InvSlotType.Any }))
+                {
+                    Weapon.Drop(character);
+                }
+            }
+        }
+
        private bool Equip(float deltaTime)
        {
            if (!character.SelectedItems.Contains(Weapon))
@@ -241,7 +252,19 @@ namespace Barotrauma
            HumanAIController.ObjectiveManager.GetObjective<AIObjectiveFindSafety>().Priority = 100;
        }

-        public override bool IsCompleted() => Enemy == null || Enemy.Removed || Enemy.IsDead || coolDownTimer <= 0.0f;
+        public override bool IsCompleted()
+        {
+            bool completed = Enemy == null || Enemy.Removed || Enemy.IsDead || coolDownTimer <= 0;
+            if (completed)
+            {
+                if (Weapon != null)
+                {
+                    Unequip();
+                }
+            }
+            return completed;
+        }
+
        public override bool CanBeCompleted => !abandon && (reloadWeaponObjective == null || reloadWeaponObjective.CanBeCompleted) && (retreatObjective == null || retreatObjective.CanBeCompleted);
        public override float GetPriority(AIObjectiveManager objectiveManager) => Enemy == null || Enemy.Removed || Enemy.IsDead ? 0 : 100;

@@ -18,7 +18,7 @@ namespace Barotrauma

        private bool isCompleted;

-        public bool IgnoreAlreadyContainedItems;
+        public string[] ignoredContainerIdentifiers;

        public Func<Item, float> GetItemPriority;

@@ -95,7 +95,7 @@ namespace Barotrauma
                getItemObjective = new AIObjectiveGetItem(character, itemIdentifiers)
                {
                    GetItemPriority = GetItemPriority,
-                    IgnoreContainedItems = IgnoreAlreadyContainedItems
+                    ignoredContainerIdentifiers = ignoredContainerIdentifiers
                };
                AddSubObjective(getItemObjective);
                return;
@@ -78,16 +78,18 @@ namespace Barotrauma

            foreach (FireSource fs in targetHull.FireSources)
            {
-                // TODO: check if in the same room?
                bool inRange = fs.IsInDamageRange(character, MathHelper.Clamp(fs.DamageRange * 1.5f, extinguisher.Range * 0.5f, extinguisher.Range));
-                if (!character.IsClimbing && (inRange || useExtinquisherTimer > 0.0f))
+                if (targetHull == character.CurrentHull && (inRange || useExtinquisherTimer > 0.0f))
                {
                    useExtinquisherTimer += deltaTime;
                    if (useExtinquisherTimer > 2.0f) useExtinquisherTimer = 0.0f;

                    character.CursorPosition = fs.Position;
                    character.SetInput(InputType.Aim, false, true);
-                    character.AIController.SteeringManager.Reset();
+                    if (!character.IsClimbing)
+                    {
+                        character.AIController.SteeringManager.Reset();
+                    }
                    extinguisher.Use(deltaTime, character);

                    if (!targetHull.FireSources.Contains(fs))
@@ -1,5 +1,5 @@
 using Barotrauma.Items.Components;
-using System;
+using Microsoft.Xna.Framework;
 using System.Linq;

 namespace Barotrauma
@@ -10,31 +10,26 @@ namespace Barotrauma
        public override bool ForceRun => true;

        private AIObjective subObjective;
-
        private string gearTag;

        public override bool IsCompleted()
        {
            for (int i = 0; i < character.Inventory.Items.Length; i++)
            {
-                if (character.Inventory.SlotTypes[i] == InvSlotType.Any || character.Inventory.Items[i] == null) continue;
+                if (character.Inventory.SlotTypes[i] == InvSlotType.Any || character.Inventory.Items[i] == null) { continue; }
                if (character.Inventory.Items[i].HasTag(gearTag))
                {
                    var containedItems = character.Inventory.Items[i].ContainedItems;
-                    if (containedItems == null) continue;
+                    if (containedItems == null) { continue; }

                    var oxygenTank = containedItems.FirstOrDefault(it => (it.Prefab.Identifier == "oxygentank" || it.HasTag("oxygensource")) && it.Condition > 0.0f);
-                    if (oxygenTank != null) return true;
+                    if (oxygenTank != null) { return true; }
                }
            }
-
            return false;
        }

-        public override bool CanBeCompleted => subObjective == null || subObjective.CanBeCompleted;
-
-        public AIObjectiveFindDivingGear(Character character, bool needDivingSuit)
-            : base(character, "")
+        public AIObjectiveFindDivingGear(Character character, bool needDivingSuit) : base(character, "")
        {
            gearTag = needDivingSuit ? "divingsuit" : "diving";
        }
@@ -54,12 +49,11 @@ namespace Barotrauma
            else
            {
                var containedItems = item.ContainedItems;
-                if (containedItems == null) return;
-
+                if (containedItems == null) { return; }
                //check if there's an oxygen tank in the mask/suit
                foreach (Item containedItem in containedItems)
                {
-                    if (containedItem == null) continue;
+                    if (containedItem == null) { continue; }
                    if (containedItem.Condition <= 0.0f)
                    {
                        containedItem.Drop(character);
@@ -69,36 +63,21 @@ namespace Barotrauma
                        //we've got an oxygen source inside the mask/suit, all good
                        return;
                    }
-                }
-                
+                }               
                if (!(subObjective is AIObjectiveContainItem) || subObjective.IsCompleted())
                {
                    character.Speak(TextManager.Get("DialogGetOxygenTank"), null, 0, "getoxygentank", 30.0f);
                    subObjective = new AIObjectiveContainItem(character, new string[] { "oxygentank", "oxygensource" }, item.GetComponent<ItemContainer>());
                }
            }
-
            if (subObjective != null)
            {
                subObjective.TryComplete(deltaTime);
            }
        }

-        public override float GetPriority(AIObjectiveManager objectiveManager)
-        {
-            if (character.AnimController.CurrentHull == null) return 100.0f;
-
-            if (objectiveManager.CurrentOrder == this)
-            {
-                return AIObjectiveManager.OrderPriority;
-            }
-
-            return 100.0f - character.Oxygen;
-        }
-
-        public override bool IsDuplicate(AIObjective otherObjective)
-        {
-            return otherObjective is AIObjectiveFindDivingGear;
-        }
+        public override bool CanBeCompleted => subObjective == null || subObjective.CanBeCompleted;
+        public override float GetPriority(AIObjectiveManager objectiveManager) => MathHelper.Clamp(100 - character.OxygenAvailable, 0, 100);
+        public override bool IsDuplicate(AIObjective otherObjective) => otherObjective is AIObjectiveFindDivingGear;
    }
 }
@@ -2,7 +2,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Barotrauma.Items.Components;

 namespace Barotrauma
 {
@@ -25,7 +24,7 @@ namespace Barotrauma
        private float searchHullTimer;

        private AIObjectiveGoTo goToObjective;
-        private AIObjective divingGearObjective;
+        private AIObjectiveFindDivingGear divingGearObjective;

        public AIObjectiveFindSafety(Character character) : base(character, "") {  }

@@ -35,13 +34,12 @@ namespace Barotrauma
        protected override void Act(float deltaTime)
        {
            var currentHull = character.AnimController.CurrentHull;           
-            if (HumanAIController.NeedsDivingGear(currentHull))
+            if (HumanAIController.NeedsDivingGear(currentHull) && divingGearObjective == null)
            {
                bool needsDivingSuit = currentHull == null || currentHull.WaterPercentage > 90;
                bool hasEquipment = needsDivingSuit ? HumanAIController.HasDivingSuit(character) : HumanAIController.HasDivingGear(character);
-                if ((divingGearObjective == null || !divingGearObjective.CanBeCompleted) && !hasEquipment)
+                if (!hasEquipment)
                {
-                    // If the previous objective cannot be completed, create a new and try again.
                    divingGearObjective = new AIObjectiveFindDivingGear(character, needsDivingSuit);
                }
            }
@@ -55,9 +53,15 @@ namespace Barotrauma
                }
                else if (divingGearObjective.CanBeCompleted)
                {
-                    // If diving gear objective is active, wait for it to complete.
+                    // If diving gear objective is active and can be completed, wait for it to complete.
                    return;
                }
+                else
+                {
+                    divingGearObjective = null;
+                    // Reset the timer so that we get a safe hull target.
+                    searchHullTimer = 0;
+                }
            }

            if (unreachableClearTimer > 0)
@@ -83,17 +87,18 @@ namespace Barotrauma
                    {
                        if (goToObjective.Target != bestHull)
                        {
-                            goToObjective = new AIObjectiveGoTo(bestHull, character)
+                            // If we need diving gear, we should already have it, if possible.
+                            goToObjective = new AIObjectiveGoTo(bestHull, character, getDivingGearIfNeeded: false)
                            {
-                                AllowGoingOutside = true
+                                AllowGoingOutside = HumanAIController.HasDivingSuit(character)
                            };
                        }
                    }
                    else
                    {
-                        goToObjective = new AIObjectiveGoTo(bestHull, character)
+                        goToObjective = new AIObjectiveGoTo(bestHull, character, getDivingGearIfNeeded: false)
                        {
-                            AllowGoingOutside = true
+                            AllowGoingOutside = HumanAIController.HasDivingSuit(character)
                        };
                    }
                }
@@ -110,6 +115,7 @@ namespace Barotrauma
                        unreachable.Add(goToObjective.Target as Hull);
                    }
                    goToObjective = null;
+                    SteeringManager.SteeringWander();
                }
            }
            else if (currentHull != null)
@@ -126,6 +132,11 @@ namespace Barotrauma

                foreach (Character enemy in Character.CharacterList)
                {
+                    //don't run from friendly NPCs
+                    if (enemy.TeamID == Character.TeamType.FriendlyNPC) { continue; }
+                    //friendly NPCs don't run away from anything but characters controlled by EnemyAIController (= monsters)
+                    if (character.TeamID == Character.TeamType.FriendlyNPC && !(enemy.AIController is EnemyAIController)) { continue; }
+
                    if (enemy.CurrentHull == currentHull && !enemy.IsDead && !enemy.IsUnconscious && 
                        (enemy.AIController is EnemyAIController || enemy.TeamID != character.TeamID))
                    {
@@ -170,13 +181,15 @@ namespace Barotrauma
                    if (unreachable.Contains(hull)) { continue; }
                    if (!character.Submarine.IsConnectedTo(hull.Submarine)) { continue; }
                    hullSafety = HumanAIController.GetHullSafety(hull, character);
-                    var path = PathSteering.PathFinder.FindPath(character.SimPosition, hull.SimPosition);
-                    int unsafeNodes = path.Nodes.Count(n => n.CurrentHull != character.CurrentHull && HumanAIController.UnsafeHulls.Contains(n.CurrentHull));
                    // Vertical distance matters more than horizontal (climbing up/down is harder than moving horizontally)
                    float dist = Math.Abs(character.WorldPosition.X - hull.WorldPosition.X) + Math.Abs(character.WorldPosition.Y - hull.WorldPosition.Y) * 2.0f;
                    float distanceFactor = MathHelper.Lerp(1, 0.9f, MathUtils.InverseLerp(0, 10000, dist));
                    hullSafety *= distanceFactor;
                    // Each unsafe node reduces the hull safety value.
+                    // Ignore current hull, because otherwise the would block all paths from the current hull to the target hull.
+                    var path = PathSteering.PathFinder.FindPath(character.SimPosition, hull.SimPosition);
+                    if (path.Unreachable) { continue; }
+                    int unsafeNodes = path.Nodes.Count(n => n.CurrentHull != character.CurrentHull && HumanAIController.UnsafeHulls.Contains(n.CurrentHull));
                    hullSafety /= 1 + unsafeNodes;
                    // If the target is not inside a friendly submarine, considerably reduce the hull safety.
                    if (!character.Submarine.IsEntityFoundOnThisSub(hull, true))
@@ -31,7 +31,7 @@ namespace Barotrauma

        public override bool IsCompleted()
        {
-            return leak.Open <= 0.0f || leak.Removed || pathUnreachable;
+            return leak.Open <= 0.0f || leak.Removed;
        }

        public override bool CanBeCompleted => !abandon && base.CanBeCompleted;
@@ -94,16 +94,15 @@ namespace Barotrauma
            if (repairTool == null) { return; }

            Vector2 gapDiff = leak.WorldPosition - character.WorldPosition;
-            var humanoidController = character.AnimController as HumanoidAnimController;

            // TODO: use the collider size/reach?
-            if (!character.AnimController.InWater && humanoidController != null && Math.Abs(gapDiff.X) < 100 && gapDiff.Y < 0.0f && gapDiff.Y > -150)
+            if (!character.AnimController.InWater && Math.Abs(gapDiff.X) < 100 && gapDiff.Y < 0.0f && gapDiff.Y > -150)
            {
-                ((HumanoidAnimController)character.AnimController).Crouching = true;
+                HumanAIController.AnimController.Crouching = true;
            }

-            float armLength = humanoidController != null ? ConvertUnits.ToDisplayUnits(humanoidController.ArmLength) : 100;
-            bool cannotReach = gapDiff.Length() > armLength + repairTool.Range;
+            float reach = HumanAIController.AnimController.ArmLength + ConvertUnits.ToSimUnits(repairTool.Range);
+            bool cannotReach = ConvertUnits.ToSimUnits(gapDiff.Length()) > reach;
            if (cannotReach)
            {
                if (gotoObjective != null)
@@ -116,7 +115,10 @@ namespace Barotrauma
                }
                else
                {
-                    gotoObjective = new AIObjectiveGoTo(ConvertUnits.ToSimUnits(GetStandPosition()), character);
+                    gotoObjective = new AIObjectiveGoTo(ConvertUnits.ToSimUnits(GetStandPosition()), character)
+                    {
+                        CloseEnough = reach * 0.75f
+                    };
                    if (!subObjectives.Contains(gotoObjective))
                    {
                        AddSubObjective(gotoObjective);
@@ -3,6 +3,7 @@ using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Barotrauma.Extensions;

 namespace Barotrauma
 {
@@ -14,19 +15,15 @@ namespace Barotrauma

        //can be either tags or identifiers
        private string[] itemIdentifiers;
-
        private Item targetItem, moveToTarget;
-
        private int currSearchIndex;
-
-        public bool IgnoreContainedItems;
-
+        public string[] ignoredContainerIdentifiers;
        private AIObjectiveGoTo goToObjective;
-
        private float currItemPriority;
-
        private bool equip;

+        private HashSet<Item> ignoredItems = new HashSet<Item>();
+
        private bool canBeCompleted = true;
        public override bool CanBeCompleted => canBeCompleted;

@@ -36,25 +33,19 @@ namespace Barotrauma
            {
                return AIObjectiveManager.OrderPriority;
            }
-
            return 1.0f;
        }

-        public AIObjectiveGetItem(Character character, Item targetItem, bool equip = false)
-            : base(character, "")
+        public AIObjectiveGetItem(Character character, Item targetItem, bool equip = false) : base(character, "")
        {
            currSearchIndex = -1;
            this.equip = equip;
            this.targetItem = targetItem;
        }

-        public AIObjectiveGetItem(Character character, string itemIdentifier, bool equip = false)
-            : this(character, new string[] { itemIdentifier }, equip)
-        {
-        }
+        public AIObjectiveGetItem(Character character, string itemIdentifier, bool equip = false) : this(character, new string[] { itemIdentifier }, equip) { }

-        public AIObjectiveGetItem(Character character, string[] itemIdentifiers, bool equip = false)
-            : base(character, "")
+        public AIObjectiveGetItem(Character character, string[] itemIdentifiers, bool equip = false) : base(character, "")
        {
            currSearchIndex = -1;
            this.equip = equip;
@@ -108,12 +99,12 @@ namespace Barotrauma
            FindTargetItem();
            if (targetItem == null || moveToTarget == null)
            {
-                // TODO: cannot be completed?
-                character?.AIController?.SteeringManager?.Reset();
+                SteeringManager.SteeringWander();
                return;
            }

-            if (Vector2.Distance(character.Position, moveToTarget.Position) < targetItem.InteractDistance * 2.0f)
+            if (moveToTarget.CurrentHull == character.CurrentHull && 
+                Vector2.DistanceSquared(character.Position, moveToTarget.Position) < MathUtils.Pow(targetItem.InteractDistance * 2, 2))
            {
                int targetSlot = -1;
                if (equip)
@@ -169,9 +160,13 @@ namespace Barotrauma
                }

                goToObjective.TryComplete(deltaTime);
-                if (!goToObjective.CanBeCompleted) targetItem = null;
+                if (!goToObjective.CanBeCompleted)
+                {
+                    targetItem = null;
+                    moveToTarget = null;
+                    ignoredItems.Add(targetItem);
+                }
            }
-
        }

        /// <summary>
@@ -196,22 +191,30 @@ namespace Barotrauma
                currSearchIndex++;

                var item = Item.ItemList[currSearchIndex];
+                if (ignoredItems.Contains(item)) { continue; }
+                if (item.Submarine == null) { continue; }
+                else if (item.Submarine.TeamID != character.TeamID) { continue; }
+                else if (character.Submarine != null && !character.Submarine.IsEntityFoundOnThisSub(item, true)) { continue; }

-                if (item.CurrentHull == null || item.Condition <= 0.0f) continue;
-                if (IgnoreContainedItems && item.Container != null) continue;
-                if (!itemIdentifiers.Any(id => item.Prefab.Identifier == id || item.HasTag(id))) continue;
+                if (item.CurrentHull == null || item.Condition <= 0.0f) { continue; }
+                if (itemIdentifiers.None(id => item.Prefab.Identifier == id || item.HasTag(id))) { continue; }
+
+                if (ignoredContainerIdentifiers != null && item.Container != null)
+                {
+                    if (ignoredContainerIdentifiers.Contains(item.ContainerIdentifier)) { continue; }
+                }

                //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) continue;
+                    if (item.ParentInventory.Owner is Character owner && !owner.IsDead) { continue; }
                }

                //if the item is inside an item, which is inside a character's inventory, don't steal it
                Item rootContainer = item.GetRootContainer();
                if (rootContainer != null && rootContainer.ParentInventory is CharacterInventory)
                {
-                    if (rootContainer.ParentInventory.Owner is Character owner && !owner.IsDead) continue;
+                    if (rootContainer.ParentInventory.Owner is Character owner && !owner.IsDead) { continue; }
                }

                float itemPriority = 0.0f;
@@ -219,13 +222,13 @@ namespace Barotrauma
                {
                    //ignore if the item has zero priority
                    itemPriority = GetItemPriority(item);
-                    if (itemPriority <= 0.0f) continue;
+                    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;
+                if (moveToTarget != null && itemPriority < currItemPriority) { continue; }

                currItemPriority = itemPriority;

@@ -186,11 +186,11 @@ namespace Barotrauma

            bool completed = false;

-            float allowedDistance = 0.5f;
+            float allowedDistance = CloseEnough;

            if (Target is Item item)
            {
-                allowedDistance = Math.Max(ConvertUnits.ToSimUnits(item.InteractDistance), allowedDistance);
+                allowedDistance = Math.Max(ConvertUnits.ToSimUnits(item.InteractDistance), CloseEnough);
                if (item.IsInsideTrigger(character.WorldPosition)) completed = true;
            }
            else if (Target is Character targetCharacter)
@@ -200,6 +200,7 @@ namespace Barotrauma
                        // Check that there is no unsafe or forbidden hulls on the way to the target
                        // Only do this when the current hull is ok, because otherwise the would block all paths from the current hull to the target hull.
                        var path = PathSteering.PathFinder.FindPath(character.SimPosition, hull.SimPosition);
+                        if (path.Unreachable) { continue; }
                        if (path.Nodes.Any(n => HumanAIController.UnsafeHulls.Contains(n.CurrentHull) || IsForbidden(n.CurrentHull))) { continue; }
                    }

@@ -30,9 +30,7 @@ namespace Barotrauma
            base.Update(objectiveManager, deltaTime);
            if (ignoreListTimer > ignoreListClearInterval)
            {
-                ignoreList.Clear();
-                ignoreListTimer = 0;
-                UpdateTargets();
+                Reset();
            }
            else
            {
@@ -67,16 +65,24 @@ namespace Barotrauma
            }
        }

+        private void Reset()
+        {
+            ignoreList.Clear();
+            ignoreListTimer = 0;
+            UpdateTargets();
+        }
+
+        public override void OnSelected()
+        {
+            Reset();
+        }
+
        public override float GetPriority(AIObjectiveManager objectiveManager)
        {
            if (character.Submarine == null) { return 0; }
            if (targets.None()) { return 0; }
            float avg = targets.Average(t => Average(t));
-            if (objectiveManager.CurrentOrder == this)
-            {
-                return AIObjectiveManager.OrderPriority - MathHelper.Max(0, AIObjectiveManager.OrderPriority - avg);
-            }
-            return MathHelper.Lerp(0, AIObjectiveManager.OrderPriority, avg / 100);
+            return MathHelper.Lerp(0, AIObjectiveManager.OrderPriority + 20, avg / 100);
        }

        protected void UpdateTargets()
@@ -67,6 +67,7 @@ namespace Barotrauma

        private AIObjective GetCurrentObjective()
        {
+            var previousObjective = CurrentObjective;
            var firstObjective = Objectives.FirstOrDefault();
            if (CurrentOrder != null && firstObjective != null && CurrentOrder.GetPriority(this) > firstObjective.GetPriority(this))
            {
@@ -76,6 +77,10 @@ namespace Barotrauma
            {
                CurrentObjective = firstObjective;
            }
+            if (previousObjective != CurrentObjective)
+            {
+                CurrentObjective?.OnSelected();
+            }
            return CurrentObjective;
        }

@@ -3,6 +3,7 @@ using Microsoft.Xna.Framework;
 using System;
 using System.Linq;
 using Barotrauma.Extensions;
+using FarseerPhysics;

 namespace Barotrauma
 {
@@ -84,7 +85,14 @@ namespace Barotrauma
            }
            if (character.CanInteractWith(Item))
            {
-                OperateRepairTool(deltaTime);
+                if (repairTool == null)
+                {
+                    FindRepairTool();
+                }
+                if (repairTool != null)
+                {
+                    OperateRepairTool(deltaTime);
+                }
                foreach (Repairable repairable in Item.Repairables)
                {
                    if (repairable.CurrentFixer != null && repairable.CurrentFixer != character)
@@ -121,13 +129,17 @@ namespace Barotrauma
                    subObjectives.Remove(goToObjective);
                }
                goToObjective = new AIObjectiveGoTo(Item, character);
+                if (repairTool != null)
+                {
+                    goToObjective.CloseEnough = (HumanAIController.AnimController.ArmLength + ConvertUnits.ToSimUnits(repairTool.Range)) * 0.75f;
+                }
                AddSubObjective(goToObjective);
            }
        }

-        private void OperateRepairTool(float deltaTime)
+        private RepairTool repairTool;
+        private void FindRepairTool()
        {
-            // Operate repair tool, if required.
            foreach (Repairable repairable in Item.Repairables)
            {
                foreach (var kvp in repairable.requiredItems)
@@ -138,19 +150,29 @@ namespace Barotrauma
                        {
                            if (requiredItem.MatchesItem(item))
                            {
-                                var repairTool = item.GetComponent<RepairTool>();
-                                if (repairTool != null)
-                                {
-                                    character.CursorPosition = Item.Position;
-                                    character.SetInput(InputType.Aim, false, true);
-                                    repairTool.Use(deltaTime, character);
-                                    return;
-                                }
+                                repairTool = item.GetComponent<RepairTool>();
                            }
                        }
                    }
                }
            }
        }
+
+        private void OperateRepairTool(float deltaTime)
+        {
+            character.CursorPosition = Item.Position;
+            character.SetInput(InputType.Aim, false, true);
+            Vector2 fromToolToTarget = Item.Position - repairTool.Item.Position;
+            if (fromToolToTarget.LengthSquared() < MathUtils.Pow(repairTool.Range / 2, 2))
+            {
+                // Too close -> steer away
+                character.AIController.SteeringManager.SteeringManual(deltaTime, Vector2.Normalize(character.SimPosition - Item.SimPosition) / 2);
+            }
+            if (character.IsClimbing || 
+                VectorExtensions.Angle(VectorExtensions.Forward(repairTool.Item.body.TransformedRotation), fromToolToTarget) < MathHelper.PiOver4)
+            {
+                repairTool.Use(deltaTime, character);
+            }
+        }
    }
 }
@@ -51,8 +51,14 @@ namespace Barotrauma
                    {
                        foreach (Repairable repairable in item.Repairables)
                        {
-                            if (item.Condition > repairable.ShowRepairUIThreshold) { ignore = true; }
-                            else if (RequireAdequateSkills && !repairable.HasRequiredSkills(character)) { ignore = true; }
+                            if (!objectives.ContainsKey(item) && item.Condition > repairable.ShowRepairUIThreshold)
+                            {
+                                ignore = true;
+                            }
+                            else if (RequireAdequateSkills && !repairable.HasRequiredSkills(character))
+                            {
+                                ignore = true;
+                            }
                            if (ignore) { break; }
                        }
                    }