(53f9210d1) Check the line of sight before fixing leaks or extinguishing fires.

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

@@ -79,26 +79,44 @@ namespace Barotrauma
             foreach (FireSource fs in targetHull.FireSources)
             {
                 bool inRange = fs.IsInDamageRange(character, MathHelper.Clamp(fs.DamageRange * 1.5f, extinguisher.Range * 0.5f, extinguisher.Range));
-                if (targetHull == character.CurrentHull && (inRange || useExtinquisherTimer > 0.0f))
+                bool move = !inRange;
+                if (inRange || useExtinquisherTimer > 0.0f)
                 {
                     useExtinquisherTimer += deltaTime;
-                    if (useExtinquisherTimer > 2.0f) useExtinquisherTimer = 0.0f;
-
+                    if (useExtinquisherTimer > 2.0f)
+                    {
+                        useExtinquisherTimer = 0.0f;
+                    }
                     character.AIController.SteeringManager.Reset();
                     character.CursorPosition = fs.Position;
                     if (extinguisher.Item.RequireAimToUse)
                     {
                         character.SetInput(InputType.Aim, false, true);
                     }
-                    extinguisher.Use(deltaTime, character);
-
-                    if (!targetHull.FireSources.Contains(fs))
+                    Limb sightLimb = null;
+                    if (character.Inventory.IsInLimbSlot(extinguisherItem, InvSlotType.RightHand))
                     {
-                        character.Speak(TextManager.Get("DialogPutOutFire").Replace("[roomname]", targetHull.Name), null, 0, "putoutfire", 10.0f);
+                        sightLimb = character.AnimController.GetLimb(LimbType.RightHand);
+                    }
+                    else if (character.Inventory.IsInLimbSlot(extinguisherItem, InvSlotType.LeftHand))
+                    {
+                        sightLimb = character.AnimController.GetLimb(LimbType.LeftHand);
+                    }
+                    if (!character.CanSeeTarget(fs, sightLimb))
+                    {
+                        move = true;
+                    }
+                    else
+                    {
+                        move = false;
+                        extinguisher.Use(deltaTime, character);
+                        if (!targetHull.FireSources.Contains(fs))
+                        {
+                            character.Speak(TextManager.Get("DialogPutOutFire").Replace("[roomname]", targetHull.Name), null, 0, "putoutfire", 10.0f);
+                        }
                     }
-                    return;
                 }
-                else
+                if (move)
                 {
                     //go to the first firesource
                     if (gotoObjective == null || !gotoObjective.CanBeCompleted || gotoObjective.IsCompleted())
@@ -109,8 +127,8 @@ namespace Barotrauma
                     {
                         gotoObjective.TryComplete(deltaTime);
                     }
-                    break;
                 }
+                break;
             }
         }
     }

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

@@ -101,10 +101,22 @@ namespace Barotrauma
                 HumanAIController.AnimController.Crouching = true;
             }
 
-            //float reach = HumanAIController.AnimController.ArmLength + ConvertUnits.ToSimUnits(repairTool.Range);
             float reach = ConvertUnits.ToSimUnits(repairTool.Range);
-            bool cannotReach = ConvertUnits.ToSimUnits(gapDiff.Length()) > reach;
-            if (cannotReach)
+            bool canReach = ConvertUnits.ToSimUnits(gapDiff.Length()) < reach;
+            if (canReach)
+            {
+                Limb sightLimb = null;
+                if (character.Inventory.IsInLimbSlot(repairTool.Item, InvSlotType.RightHand))
+                {
+                    sightLimb = character.AnimController.GetLimb(LimbType.RightHand);
+                }
+                else if (character.Inventory.IsInLimbSlot(repairTool.Item, InvSlotType.LeftHand))
+                {
+                    sightLimb = character.AnimController.GetLimb(LimbType.LeftHand);
+                }
+                canReach = character.CanSeeTarget(leak, sightLimb);
+            }
+            else
             {
                 if (gotoObjective != null)
                 {

Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Steering.cs

@@ -341,6 +341,19 @@ namespace Barotrauma.Items.Components
             return true;
         }
 
+        public override void OnItemLoaded()
+        {
+            sonar = item.GetComponent<Sonar>();
+        }
+
+        public override bool Select(Character character)
+        {
+            if (!CanBeSelected) return false;
+
+            user = character;
+            return true;
+        }
+
         public override void Update(float deltaTime, Camera cam)
         {
             networkUpdateTimer -= deltaTime;

Barotrauma/BarotraumaShared/Source/Map/FireSource.cs

@@ -26,8 +26,6 @@ namespace Barotrauma
 
         protected bool removed;
 
-        protected bool removed;
-
 #if CLIENT
         private List<Decal> burnDecals = new List<Decal>();
 #endif