(a843b19d4) Optimize distance checks.

Barotrauma/BarotraumaShared/Source/Characters/AI/IndoorsSteeringManager.cs

@@ -147,7 +147,7 @@ namespace Barotrauma
         protected override Vector2 DoSteeringSeek(Vector2 target, float weight)
         {
             //find a new path if one hasn't been found yet or the target is different from the current target
-            if (currentPath == null || Vector2.Distance(target, currentTarget) > 1.0f || findPathTimer < -1.0f)
+            if (currentPath == null || Vector2.DistanceSquared(target, currentTarget) > 1.0f || findPathTimer < -1.0f)
             {
                 IsPathDirty = true;
 
@@ -286,7 +286,7 @@ namespace Barotrauma
                     character.AnimController.Anim = AnimController.Animation.None;
                     character.SelectedConstruction = null;
                 }
-                if (Vector2.DistanceSquared(pos, currentPath.CurrentNode.SimPosition) < MathUtils.Pow(collider.radius * 3, 2))
+                if (Vector2.DistanceSquared(pos, currentPath.CurrentNode.SimPosition) < MathUtils.Pow(collider.radius * 4, 2))
                 {
                     currentPath.SkipToNextNode();
                 }
@@ -301,7 +301,7 @@ namespace Barotrauma
                 bool isAboveFeet = currentPath.CurrentNode.SimPosition.Y > colliderBottom.Y;
                 bool isNotTooHigh = currentPath.CurrentNode.SimPosition.Y < colliderBottom.Y + characterHeight;
                 
-                if (horizontalDistance < collider.radius * 3 && isAboveFeet && isNotTooHigh)
+                if (horizontalDistance < collider.radius * 4 && isAboveFeet && isNotTooHigh)
                 {
                     currentPath.SkipToNextNode();
                 }
@@ -374,8 +374,8 @@ namespace Barotrauma
 
                     foreach (Controller controller in buttons)
                     {
-                        float dist = Vector2.Distance(controller.Item.WorldPosition, character.WorldPosition);
-                        if (dist > controller.Item.InteractDistance * 2.0f) continue;
+                        float dist = Vector2.DistanceSquared(controller.Item.WorldPosition, character.WorldPosition);
+                        if (dist > controller.Item.InteractDistance * controller.Item.InteractDistance * 2.0f) continue;
 
                         if (dist < closestDist || closestButton == null)
                         {

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

@@ -734,6 +734,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/Steering.cs

@@ -179,33 +179,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>();
 
@@ -522,6 +495,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/Items/Item.cs

@@ -1332,6 +1332,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; }

Barotrauma/BarotraumaShared/Source/Map/Hull.cs

@@ -645,6 +645,25 @@ namespace Barotrauma
             }
         }
 
+        public string DisplayName
+        {
+            get;
+            private set;
+        }
+
+        private string roomName;
+        [Editable, Serialize("", true, translationTextTag: "RoomName.")]
+        public string RoomName
+        {
+            get { return roomName; }
+            set
+            {
+                if (roomName == value) { return; }
+                roomName = value;
+                DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName;
+            }
+        }
+
         public override Rectangle Rect
         {
             get

Barotrauma/BarotraumaShared/Source/PlayerInput.cs

@@ -162,6 +162,21 @@ namespace Barotrauma
             get { return binding; }
         }
 
+        public void SetState()
+        {
+            hit = binding.IsHit();
+            if (hit) hitQueue = true;
+
+            held = binding.IsDown();
+            if (held) heldQueue = true;
+        }
+#endif
+
+        public KeyOrMouse State
+        {
+            get { return binding; }
+        }
+
         public void SetState()
         {
             hit = binding.IsHit();