(98501b696) Reduce the max accepted distance for repair tool ai operate.

Barotrauma/BarotraumaShared/Source/Items/Components/Door.cs

@@ -26,8 +26,6 @@ namespace Barotrauma.Items.Components
         private bool autoOrientGap;
 
         private bool isStuck;
-        public bool IsStuck => isStuck;
-
         private float resetPredictionTimer;
 
         private Rectangle doorRect;
@@ -229,7 +227,9 @@ namespace Barotrauma.Items.Components
             {
                 msg = msg ?? (HasIntegratedButtons ? accessDeniedTxt : cannotOpenText);
             }
-            return isBroken || base.HasRequiredItems(character, addMessage, msg);
+            if (item.Condition <= RepairThreshold) { return true; }
+            //this is a bit pointless atm because if canBePicked is false it won't allow you to do Pick() anyway, however it's still good for future-proofing.
+            return requiredItems.Any() ? base.HasRequiredItems(character, addMessage, msg) : canBePicked;
         }
 
         public override bool Pick(Character picker)

Barotrauma/BarotraumaShared/Source/Items/Components/Holdable/RepairTool.cs

@@ -281,7 +281,7 @@ namespace Barotrauma.Items.Components
             float dist = fromItemToLeak.Length();
 
             //too far away -> consider this done and hope the AI is smart enough to move closer
-            if (dist > Range * 5.0f) return true;
+            if (dist > Range * 3.0f) { return true; }
 
             // TODO: use the collider size?
             if (!character.AnimController.InWater && character.AnimController is HumanoidAnimController &&
@@ -412,8 +412,7 @@ namespace Barotrauma.Items.Components
                             object value = property.GetValue(target);
                             if (value.GetType() == typeof(float))
                             {
-                                var progressBar = user.UpdateHUDProgressBar(door, door.Item.WorldPosition, (float)value / 100, Color.DarkGray * 0.5f, Color.White);
-                                if (progressBar != null) { progressBar.Size = new Vector2(60.0f, 20.0f); }
+                                user.UpdateHUDProgressBar(door, door.Item.WorldPosition, (float)value / 100, Color.DarkGray * 0.5f, Color.White);
                             }
                         }
                     }

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

@@ -639,6 +639,25 @@ namespace Barotrauma.Items.Components
                     }
                 }
                 
+                if (targetItem.Prefab.DeconstructItems.Any())
+                {
+                    inputContainer.Inventory.RemoveItem(targetItem);
+                    Entity.Spawner.AddToRemoveQueue(targetItem);
+                    MoveInputQueue();
+                    PutItemsToLinkedContainer();
+                }
+                else
+                {
+                    if (outputContainer.Inventory.Items.All(i => i != null))
+                    {
+                        targetItem.Drop(dropper: null);
+                    }
+                    else
+                    {
+                        outputContainer.Inventory.TryPutItem(targetItem, user: null, createNetworkEvent: true);
+                    }
+                }
+                
                 if (targetItem.Prefab.DeconstructItems.Any())
                 {
                     inputContainer.Inventory.RemoveItem(targetItem);

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

@@ -86,7 +86,17 @@ namespace Barotrauma.Items.Components
         {
             get { return zoom; }
         }
-        
+
+        //TODO: remove, only for testing
+#if DEBUG
+        [Serialize(false, false), Editable]
+        public bool DynamicDockingIndicator
+        {
+            get;
+            set;
+        }
+#endif
+
         public override bool IsActive
         {
             get

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

@@ -212,33 +212,6 @@ namespace Barotrauma.Items.Components
             }
         }
 
-        public Vector2? PosToMaintain
-        {
-            get { return posToMaintain; }
-            set { posToMaintain = value; }
-        }
-
-        struct ObstacleDebugInfo
-        {
-            public Vector2 Point1;
-            public Vector2 Point2;
-
-            public Vector2? Intersection;
-
-            public float Dot;
-
-            public Vector2 AvoidStrength;
-
-            public ObstacleDebugInfo(GraphEdge edge, Vector2? intersection, float dot, Vector2 avoidStrength)
-            {
-                Point1 = edge.Point1;
-                Point2 = edge.Point2;
-                Intersection = intersection;
-                Dot = dot;
-                AvoidStrength = avoidStrength;
-            }
-        }
-
         //edge point 1, edge point 2, avoid strength
         private List<ObstacleDebugInfo> debugDrawObstacles = new List<ObstacleDebugInfo>();
 

Barotrauma/BarotraumaShared/Source/Items/Components/Signal/CustomInterface.cs

@@ -125,7 +125,7 @@ namespace Barotrauma.Items.Components
             for (int i = 0; i < labels.Length; i++)
             {
                 labels[i] = i < newLabels.Length ? newLabels[i] : customInterfaceElementList[i].Label;
-                customInterfaceElementList[i].Label = TextManager.Get(labels[i], returnNull: true) ?? labels[i];
+                customInterfaceElementList[i].Label = labels[i];
             }
             UpdateLabelsProjSpecific();
         }
@@ -170,12 +170,5 @@ namespace Barotrauma.Items.Components
                 }
             }
         }
-
-        public override XElement Save(XElement parentElement)
-        {
-            labels = customInterfaceElementList.Select(ci => ci.Label).ToArray();
-            signals = customInterfaceElementList.Select(ci => ci.Signal).ToArray();
-            return base.Save(parentElement);
-        }
     }
 }

Barotrauma/BarotraumaShared/Source/Items/Item.cs

@@ -1424,6 +1424,10 @@ namespace Barotrauma
             {
                 ApplyStatusEffects(!waterProof && inWater ? ActionType.InWater : ActionType.NotInWater, deltaTime);
             }
+            if (!broken)
+            {
+                ApplyStatusEffects(!waterProof && inWater ? ActionType.InWater : ActionType.NotInWater, deltaTime);
+            }
             ApplyStatusEffects(!waterProof && inWater ? ActionType.InWater : ActionType.NotInWater, deltaTime);
 
             if (body == null || !body.Enabled || !inWater || ParentInventory != null || Removed) { return; }
@@ -1950,6 +1954,29 @@ namespace Barotrauma
             if (remove) { Spawner?.AddToRemoveQueue(this); }
         }
 
+        List<ColoredText> texts = new List<ColoredText>();
+        public List<ColoredText> GetHUDTexts(Character character)
+        {
+            texts.Clear();
+            foreach (ItemComponent ic in components)
+            {
+                if (string.IsNullOrEmpty(ic.DisplayMsg)) continue;
+                if (!ic.CanBePicked && !ic.CanBeSelected) continue;
+                if (ic is Holdable holdable && !holdable.CanBeDeattached()) continue;
+
+                Color color = Color.Gray;
+                bool hasRequiredSkillsAndItems = ic.HasRequiredSkills(character) && ic.HasRequiredItems(character, false);
+                if (hasRequiredSkillsAndItems)
+                {
+                    color = Color.Cyan;
+                }
+
+                texts.Add(new ColoredText(ic.DisplayMsg, color, false));
+            }
+
+            if (remove) { Spawner?.AddToRemoveQueue(this); }
+        }
+
         public bool Combine(Item item)
         {
             bool isCombined = false;