v1.0.7.0 (Full Release)

Barotrauma/BarotraumaShared/SharedSource/Map/Entity.cs

@@ -36,6 +36,10 @@ namespace Barotrauma
 
         public bool IdFreed { get; private set; }
 
+        /// <summary>
+        /// Unique, but non-persistent identifier.
+        /// Stays the same if the entities are created in the exactly same order, but doesn't persist e.g. between the rounds.
+        /// </summary>
         public readonly ushort ID;
 
         public virtual Vector2 SimPosition => Vector2.Zero;

Barotrauma/BarotraumaShared/SharedSource/Map/Levels/Level.cs

@@ -461,6 +461,19 @@ namespace Barotrauma
             borders = new Rectangle(Point.Zero, levelData.Size);
         }
 
+        public bool ShouldSpawnCrewInsideOutpost()
+        {
+            if (StartOutpost != null &&
+                Type == LevelData.LevelType.Outpost &&
+                (StartOutpost.Info.OutpostGenerationParams?.SpawnCrewInsideOutpost ?? false) &&
+                StartOutpost.GetConnectedSubs().Any(s => s.Info.Type == SubmarineType.Player))
+            {
+                var reputation = GameMain.GameSession?.Campaign?.Map?.CurrentLocation?.Reputation;
+                return reputation == null || reputation.NormalizedValue >= Reputation.HostileThreshold;
+            }
+            return false;
+        }
+
         public static Level Generate(LevelData levelData, bool mirror, Location startLocation, Location endLocation, SubmarineInfo startOutpost = null, SubmarineInfo endOutpost = null)
         {
             Debug.Assert(levelData.Biome != null);

Barotrauma/BarotraumaShared/SharedSource/Map/MapEntity.cs

@@ -401,6 +401,7 @@ namespace Barotrauma
         private static readonly List<MapEntity> tempHighlightedEntities = new List<MapEntity>();
         public static void ClearHighlightedEntities()
         {
+            highlightedEntities.RemoveWhere(e => e.Removed);
             tempHighlightedEntities.Clear();
             tempHighlightedEntities.AddRange(highlightedEntities);
             foreach (var entity in tempHighlightedEntities)

Barotrauma/BarotraumaShared/SharedSource/Map/Submarine.cs

@@ -1379,6 +1379,24 @@ namespace Barotrauma
                 Info = new SubmarineInfo(info);
 
                 ConnectedDockingPorts = new Dictionary<Submarine, DockingPort>();
+
+                //place the sub above the top of the level
+                HiddenSubPosition = HiddenSubStartPosition;
+                if (GameMain.GameSession?.LevelData != null)
+                {
+                    HiddenSubPosition += Vector2.UnitY * GameMain.GameSession.LevelData.Size.Y;
+                }
+
+                for (int i = 0; i < loaded.Count; i++)
+                {
+                    Submarine sub = loaded[i];
+                    HiddenSubPosition =
+                        new Vector2(
+                            //1st sub on the left side, 2nd on the right, etc
+                            HiddenSubPosition.X * (i % 2 == 0 ? 1 : -1),
+                            HiddenSubPosition.Y + sub.Borders.Height + 5000.0f);
+                }
+
                 IdOffset = IdRemap.DetermineNewOffset();
 
                 List<MapEntity> newEntities = new List<MapEntity>();
@@ -1406,6 +1424,7 @@ namespace Barotrauma
 
                 Vector2 center = Vector2.Zero;
                 var matchingHulls = Hull.HullList.FindAll(h => h.Submarine == this);
+
                 if (matchingHulls.Any())
                 {
                     Vector2 topLeft = new Vector2(matchingHulls[0].Rect.X, matchingHulls[0].Rect.Y);
@@ -1427,17 +1446,6 @@ namespace Barotrauma
                 }
 
                 subBody = new SubmarineBody(this, showErrorMessages);
-
-                //place the sub above the top of the level
-                HiddenSubPosition = HiddenSubStartPosition;
-                if (GameMain.GameSession != null && GameMain.GameSession.LevelData != null)
-                {
-                    HiddenSubPosition += Vector2.UnitY * GameMain.GameSession.LevelData.Size.Y;
-                }
-                foreach (Submarine sub in loaded)
-                {
-                    HiddenSubPosition += Vector2.UnitY * (sub.Borders.Height + 5000.0f);
-                }
                 Vector2 pos = ConvertUnits.ToSimUnits(HiddenSubPosition);
                 subBody.Body.FarseerBody.SetTransformIgnoreContacts(ref pos, 0.0f);