(869ac975f) Merge branch 'master' into dev

Barotrauma/BarotraumaShared/Source/DebugConsole.cs

@@ -380,7 +380,7 @@ namespace Barotrauma
                 };
             }));
                        
-            commands.Add(new Command("banid", "banid [id]: Kick and ban the player with the specified client ID from the server.", (string[] args) =>
+            commands.Add(new Command("banid", "banid [id]: Kick and ban the player with the specified client ID from the server. You can see the IDs of the clients using the command \"clientlist\".", (string[] args) =>
             {
                 if (GameMain.NetworkMember == null || args.Length == 0) return;
 

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

@@ -22,7 +22,6 @@ namespace Barotrauma.Items.Components
         private float openState;
         private Sprite doorSprite, weldedSprite, brokenSprite;
         private bool scaleBrokenSprite, fadeBrokenSprite;
-        private bool createdNewGap;
         private bool autoOrientGap;
 
         private bool isStuck;
@@ -89,12 +88,7 @@ namespace Barotrauma.Items.Components
             {
                 if (linkedGap == null)
                 {
-                    linkedGap = e as Gap;
-                    if (linkedGap != null)
-                    {
-                        linkedGap.PassAmbientLight = Window != Rectangle.Empty;
-                        return linkedGap;
-                    }
+                    GetLinkedGap();
                 }
                 return linkedGap;
             }
@@ -116,16 +110,11 @@ namespace Barotrauma.Items.Components
                     rect.X -= 5;
                     rect.Width += 10;
                 }
-
                 linkedGap = new Gap(rect, !IsHorizontal, Item.Submarine)
                 {
-                    Submarine = item.Submarine,
-                    PassAmbientLight = Window != Rectangle.Empty,
-                    Open = openState
+                    Submarine = item.Submarine
                 };
                 item.linkedTo.Add(linkedGap);
-                createdNewGap = true;
-                return linkedGap;
             }
             RefreshLinkedGap();
         }
@@ -386,7 +375,8 @@ namespace Barotrauma.Items.Components
                 LinkedGap.AutoOrient();
             }
             LinkedGap.Open = openState;
-            if (createdNewGap && autoOrientGap) linkedGap.AutoOrient();
+            LinkedGap.PassAmbientLight = Window != Rectangle.Empty;
+        }
 
         public override void OnMapLoaded()
         {

Barotrauma/BarotraumaShared/Source/Items/Item.cs

@@ -285,7 +285,7 @@ namespace Barotrauma
             get { return spriteColor; }
         }
 
-        public bool IsFullCondition => Condition >= MaxCondition;
+        public bool IsFullCondition => MathUtils.NearlyEqual(Condition, MaxCondition);
         public float MaxCondition => Prefab.Health;
         public float ConditionPercentage => MathUtils.Percentage(Condition, MaxCondition);
 
@@ -304,6 +304,7 @@ namespace Barotrauma
                 if (Indestructible) return;
 
                 float prev = condition;
+
                 condition = MathHelper.Clamp(value, 0.0f, Prefab.Health);
                 if (condition == 0.0f && prev > 0.0f)
                 {

Barotrauma/BarotraumaShared/Source/Map/ItemAssemblyPrefab.cs

@@ -107,7 +107,7 @@ namespace Barotrauma
             if (Screen.Selected == GameMain.SubEditorScreen)
             {
                 MapEntity.SelectedList.Clear();
-                MapEntity.SelectedList.AddRange(entities);
+                entities.ForEach(e => MapEntity.AddSelection(e));
             }
 #endif   
             return entities;

Barotrauma/BarotraumaShared/Source/Utils/SaveUtil.cs

@@ -378,8 +378,6 @@ namespace Barotrauma
                     Thread.Sleep(250);
                 }
             }
-
-
             return true;
         }
 
@@ -470,7 +468,20 @@ namespace Barotrauma
             foreach (DirectoryInfo di in dir.GetDirectories())
             {
                 ClearFolder(di.FullName, ignoredFileNames);
-                di.Delete();
+                int maxRetries = 4;
+                for (int i = 0; i <= maxRetries; i++)
+                {
+                    try
+                    {
+                        di.Delete();
+                        break;
+                    }
+                    catch (IOException)
+                    {
+                        if (i >= maxRetries) { throw; }
+                        Thread.Sleep(250);
+                    }
+                }
             }
         }
     }