(a21f15055) Merge branch 'dev' into human-ai

Barotrauma/BarotraumaShared/Source/Characters/CharacterInfo.cs

@@ -729,6 +729,8 @@ namespace Barotrauma
 
         partial void LoadAttachmentSprites();
         
+        // TODO: change the formula so that it's not linear and so that it takes into account the usefulness of the skill 
+        // -> give a weight to each skill, because some are much more valuable than others?
         private int CalculateSalary()
         {
             if (Name == null || Job == null) return 0;

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

@@ -962,6 +962,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

@@ -212,6 +212,33 @@ 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 = labels[i];
+                customInterfaceElementList[i].Label = TextManager.Get(labels[i], returnNull: true) ?? labels[i];
             }
             UpdateLabelsProjSpecific();
         }
@@ -170,5 +170,12 @@ 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

@@ -1380,6 +1380,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

@@ -246,6 +246,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/Map/Map/LocationTypeChange.cs

@@ -27,7 +27,9 @@ namespace Barotrauma
             DisallowedAdjacentLocations = element.GetAttributeStringArray("disallowedadjacentlocations", new string[0]).ToList();
             RequiredAdjacentLocations = element.GetAttributeStringArray("requiredadjacentlocations", new string[0]).ToList();
 
-            Messages = TextManager.GetAll("LocationChange." + currentType + ".ChangeTo." + ChangeToType);
+            string messageTag = element.GetAttributeString("messagetag", "LocationChange." + currentType + ".ChangeTo." + ChangeToType);
+
+            Messages = TextManager.GetAll(messageTag);
             if (Messages == null)
             {
                 DebugConsole.ThrowError("No messages defined for the location type change " + currentType + " -> " + ChangeToType);

Barotrauma/BarotraumaShared/Source/PlayerInput.cs

@@ -88,7 +88,7 @@ namespace Barotrauma
 
         public override bool Equals(object obj)
         {
-            if (obj is KeyOrMouse keyOrMouse )
+            if (obj is KeyOrMouse keyOrMouse)
             {
                 if (MouseButton.HasValue)
                 {