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

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

@@ -320,8 +320,9 @@ namespace Barotrauma
                 {
                     State = AIState.Idle;
                 }
-                else if (Character.Health < fleeHealthThreshold)
+                else if (Character.Health < fleeHealthThreshold && SwarmBehavior == null)
                 {
+                    // Don't flee from damage if in a swarm.
                     State = AIState.Escape;
                 }
                 else if (targetingPriority != null)
@@ -330,8 +331,6 @@ namespace Barotrauma
                 }
             }
 
-            LatchOntoAI?.Update(this, deltaTime);
-
             if (SelectedAiTarget != null && (SelectedAiTarget.Entity == null || SelectedAiTarget.Entity.Removed))
             {
                 State = AIState.Idle;
@@ -369,8 +368,15 @@ namespace Barotrauma
                 default:
                     throw new NotImplementedException();
             }
-            
-            SwarmBehavior?.Update(deltaTime);
+
+            LatchOntoAI?.Update(this, deltaTime);
+            IsSteeringThroughGap = false;
+            if (SwarmBehavior != null)
+            {
+                SwarmBehavior.IsActive = State == AIState.Idle && Character.CurrentHull == null;
+                SwarmBehavior.Refresh();
+                SwarmBehavior.UpdateSteering(deltaTime);
+            }
             steeringManager.Update(Character.AnimController.GetCurrentSpeed(run));
         }
 
@@ -493,7 +499,7 @@ namespace Barotrauma
             }
             else
             {
-                if (!IsProperlyLatchedOnSub)
+                if (!IsLatchedOnSub)
                 {
                     UpdateWallTarget();
                 }
@@ -552,7 +558,7 @@ namespace Barotrauma
                 {
                     WallSection section = wallTarget.Structure.GetSection(wallTarget.SectionIndex);
                     Vector2 targetPos = wallTarget.Structure.SectionPosition(wallTarget.SectionIndex, true);
-                    if (section?.gap != null && section.gap.IsRoomToRoom && SteerThroughGap(wallTarget.Structure, section, targetPos, deltaTime))
+                    if (section?.gap != null && SteerThroughGap(wallTarget.Structure, section, targetPos, deltaTime))
                     {
                         return;
                     }
@@ -794,9 +800,21 @@ namespace Barotrauma
             return false;
         }
 
+        public bool IsSteeringThroughGap { get; private set; }
         private bool SteerThroughGap(Structure wall, WallSection section, Vector2 targetWorldPos, float deltaTime)
         {
+            IsSteeringThroughGap = true;
+            SelectedAiTarget = wall.AiTarget;
+            wallTarget = null;
+            LatchOntoAI?.DeattachFromBody();
+            Character.AnimController.ReleaseStuckLimbs();
             Hull targetHull = section.gap?.FlowTargetHull;
+            float distance = Vector2.Distance(Character.WorldPosition, targetWorldPos);
+            float maxDistance = Math.Min(wall.Rect.Width, wall.Rect.Height);
+            if (distance > maxDistance)
+            {
+                return false;
+            }
             if (targetHull != null)
             {
                 if (wall.IsHorizontal)
@@ -807,16 +825,7 @@ namespace Barotrauma
                 {
                     targetWorldPos.X = targetHull.WorldRect.Center.X;
                 }
-                LatchOntoAI?.DeattachFromBody();
-                Character.AnimController.ReleaseStuckLimbs();
-                if (steeringManager is IndoorsSteeringManager)
-                {
-                    steeringManager.SteeringManual(deltaTime, Vector2.Normalize(targetWorldPos - Character.WorldPosition));
-                }
-                else
-                {
-                    steeringManager.SteeringSeek(ConvertUnits.ToSimUnits(targetWorldPos));
-                }
+                steeringManager.SteeringManual(deltaTime, Vector2.Normalize(targetWorldPos - Character.WorldPosition));
                 return true;
             }
             return false;
@@ -1048,87 +1057,43 @@ namespace Barotrauma
         #region Targeting
         private bool IsLatchedOnSub => LatchOntoAI != null && LatchOntoAI.IsAttachedToSub;
 
-        private bool IsProperlyLatchedOnSub => LatchOntoAI != null && LatchOntoAI.IsAttachedToSub && SelectedAiTarget?.Entity == wallTarget?.Structure;
-
-        private bool IsProperlyLatchedOnSub => LatchOntoAI != null && LatchOntoAI.IsAttachedToSub && SelectedAiTarget?.Entity == wallTarget?.Structure;
-
-        private bool IsProperlyLatchedOnSub => LatchOntoAI != null && LatchOntoAI.IsAttachedToSub && SelectedAiTarget?.Entity == wallTarget?.Structure;
-
-        private bool IsProperlyLatchedOnSub => LatchOntoAI != null && LatchOntoAI.IsAttachedToSub && SelectedAiTarget?.Entity == wallTarget?.Structure;
-
-        private bool IsProperlyLatchedOnSub => LatchOntoAI != null && LatchOntoAI.IsAttachedToSub && SelectedAiTarget?.Entity == wallTarget?.Structure;
-
-        private bool IsProperlyLatchedOnSub => LatchOntoAI != null && LatchOntoAI.IsAttachedToSub && SelectedAiTarget?.Entity == wallTarget?.Structure;
-
-        private bool IsProperlyLatchedOnSub => LatchOntoAI != null && LatchOntoAI.IsAttachedToSub && SelectedAiTarget?.Entity == wallTarget?.Structure;
-
-        private bool IsProperlyLatchedOnSub => LatchOntoAI != null && LatchOntoAI.IsAttachedToSub && SelectedAiTarget?.Entity == wallTarget?.Structure;
-
-        private bool IsProperlyLatchedOnSub => LatchOntoAI != null && LatchOntoAI.IsAttachedToSub && SelectedAiTarget?.Entity == wallTarget?.Structure;
-
-        private bool IsProperlyLatchedOnSub => LatchOntoAI != null && LatchOntoAI.IsAttachedToSub && SelectedAiTarget?.Entity == wallTarget?.Structure;
-
-        private bool IsProperlyLatchedOnSub => LatchOntoAI != null && LatchOntoAI.IsAttachedToSub && SelectedAiTarget?.Entity == wallTarget?.Structure;
-
-        private bool IsProperlyLatchedOnSub => LatchOntoAI != null && LatchOntoAI.IsAttachedToSub && SelectedAiTarget?.Entity == wallTarget?.Structure;
-
-        private bool IsProperlyLatchedOnSub => LatchOntoAI != null && LatchOntoAI.IsAttachedToSub && SelectedAiTarget?.Entity == wallTarget?.Structure;
-
-        private bool IsProperlyLatchedOnSub => LatchOntoAI != null && LatchOntoAI.IsAttachedToSub && SelectedAiTarget?.Entity == wallTarget?.Structure;
-
-        private bool IsProperlyLatchedOnSub => LatchOntoAI != null && LatchOntoAI.IsAttachedToSub && SelectedAiTarget?.Entity == wallTarget?.Structure;
-
-        private bool IsProperlyLatchedOnSub => LatchOntoAI != null && LatchOntoAI.IsAttachedToSub && SelectedAiTarget?.Entity == wallTarget?.Structure;
-
-        private bool IsProperlyLatchedOnSub => LatchOntoAI != null && LatchOntoAI.IsAttachedToSub && SelectedAiTarget?.Entity == wallTarget?.Structure;
-
-        private bool IsProperlyLatchedOnSub => LatchOntoAI != null && LatchOntoAI.IsAttachedToSub && SelectedAiTarget?.Entity == wallTarget?.Structure;
-
-        private bool IsProperlyLatchedOnSub => LatchOntoAI != null && LatchOntoAI.IsAttachedToSub && SelectedAiTarget?.Entity == wallTarget?.Structure;
-
-        private bool IsProperlyLatchedOnSub => LatchOntoAI != null && LatchOntoAI.IsAttachedToSub && SelectedAiTarget?.Entity == wallTarget?.Structure;
-
-        private bool IsProperlyLatchedOnSub => LatchOntoAI != null && LatchOntoAI.IsAttachedToSub && SelectedAiTarget?.Entity == wallTarget?.Structure;
-
-        private bool IsProperlyLatchedOnSub => LatchOntoAI != null && LatchOntoAI.IsAttachedToSub && SelectedAiTarget?.Entity == wallTarget?.Structure;
-
-        private bool IsProperlyLatchedOnSub => LatchOntoAI != null && LatchOntoAI.IsAttachedToSub && SelectedAiTarget?.Entity == wallTarget?.Structure;
-
-        private bool IsProperlyLatchedOnSub => LatchOntoAI != null && LatchOntoAI.IsAttachedToSub && SelectedAiTarget?.Entity == wallTarget?.Structure;
-
-        private bool IsProperlyLatchedOnSub => LatchOntoAI != null && LatchOntoAI.IsAttachedToSub && SelectedAiTarget?.Entity == wallTarget?.Structure;
-
-        private bool IsProperlyLatchedOnSub => LatchOntoAI != null && LatchOntoAI.IsAttachedToSub && SelectedAiTarget?.Entity == wallTarget?.Structure;
-
-        private bool IsProperlyLatchedOnSub => LatchOntoAI != null && LatchOntoAI.IsAttachedToSub && SelectedAiTarget?.Entity == wallTarget?.Structure;
-
-        private bool IsProperlyLatchedOnSub => LatchOntoAI != null && LatchOntoAI.IsAttachedToSub && SelectedAiTarget?.Entity == wallTarget?.Structure;
-
-        private bool IsProperlyLatchedOnSub => LatchOntoAI != null && LatchOntoAI.IsAttachedToSub && SelectedAiTarget?.Entity == wallTarget?.Structure;
-
-        private bool IsProperlyLatchedOnSub => LatchOntoAI != null && LatchOntoAI.IsAttachedToSub && SelectedAiTarget?.Entity == wallTarget?.Structure;
-
-        private bool IsProperlyLatchedOnSub => LatchOntoAI != null && LatchOntoAI.IsAttachedToSub && SelectedAiTarget?.Entity == wallTarget?.Structure;
-
-        private bool IsProperlyLatchedOnSub => LatchOntoAI != null && LatchOntoAI.IsAttachedToSub && SelectedAiTarget?.Entity == wallTarget?.Structure;
-
-        private bool IsProperlyLatchedOnSub => LatchOntoAI != null && LatchOntoAI.IsAttachedToSub && SelectedAiTarget?.Entity == wallTarget?.Structure;
-
-        private bool IsProperlyLatchedOnSub => LatchOntoAI != null && LatchOntoAI.IsAttachedToSub && SelectedAiTarget?.Entity == wallTarget?.Structure;
-
-        private bool IsProperlyLatchedOnSub => LatchOntoAI != null && LatchOntoAI.IsAttachedToSub && SelectedAiTarget?.Entity == wallTarget?.Structure;
-
         //goes through all the AItargets, evaluates how preferable it is to attack the target,
         //whether the Character can see/hear the target and chooses the most preferable target within
         //sight/hearing range
         public AITarget UpdateTargets(Character character, out TargetingPriority priority)
         {
-            if (IsProperlyLatchedOnSub)
+            if ((SelectedAiTarget != null || wallTarget != null) && IsLatchedOnSub)
             {
-                // If attached to a valid target, just keep the target.
-                // Priority not used in this case.
-                priority = null;
-                return SelectedAiTarget;
+                var wall = SelectedAiTarget.Entity as Structure;
+                if (wall == null)
+                {
+                    wall = wallTarget.Structure;
+                }
+                // The target is not a wall or it's not the same as we are attached to -> release
+                bool releaseTarget = wall == null || !wall.Bodies.Contains(LatchOntoAI.AttachJoints[0].BodyB);
+                if (!releaseTarget)
+                {
+                    for (int i = 0; i < wall.Sections.Length; i++)
+                    {
+                        if (CanPassThroughHole(wall, i))
+                        {
+                            releaseTarget = true;
+                        }
+                    }
+                }
+                if (releaseTarget)
+                {
+                    SelectedAiTarget = null;
+                    wallTarget = null;
+                    LatchOntoAI.DeattachFromBody();
+                }
+                else if (SelectedAiTarget?.Entity == wallTarget?.Structure)
+                {
+                    // If attached to a valid target, just keep the target.
+                    // Priority not used in this case.
+                    priority = null;
+                    return SelectedAiTarget;
+                }
             }
             AITarget newTarget = null;
             priority = null;
@@ -1211,7 +1176,7 @@ namespace Barotrauma
                 else if (target.Entity != null)
                 {
                     //skip the target if it's a room and the character is already inside a sub
-                    if (character.CurrentHull != null && target.Entity is Hull) continue;
+                    if (character.CurrentHull != null && target.Entity is Hull) { continue; }
                     
                     Door door = null;
                     if (target.Entity is Item item)
@@ -1240,23 +1205,37 @@ namespace Barotrauma
                             // Ignore structures that doesn't have a body (not walls)
                             continue;
                         }
-                        // Ignore walls when inside.
-                        valueModifier = character.CurrentHull == null ? 1 : 0;
+                        if (s.IsPlatform)
+                        {
+                            continue;
+                        }
+                        if (character.CurrentHull != null)
+                        {
+                            // Ignore walls when inside.
+                            continue;
+                        }
+                        valueModifier = 1;
+                        float wallMaxHealth = 400;  // Anything more than this is ignored -> 200 = 1
+                        // Prefer weaker targets.
+                        valueModifier *= MathHelper.Lerp(1.5f, 0.5f, MathUtils.InverseLerp(0, 1, s.Health / wallMaxHealth));
                         if (aggressiveBoarding)
                         {
+                            var hulls = s.Submarine.GetHulls(false);
                             for (int i = 0; i < s.Sections.Length; i++)
                             {
                                 var section = s.Sections[i];
-                                if (CanPassThroughHole(s, i))
+                                if (section.gap != null)
                                 {
-                                    // Ignore walls that can be passed through
-                                    valueModifier = 0;
-                                    break;
-                                }
-                                else if (section.gap != null)
-                                {
-                                    // up to 100% priority increase for every gap in the wall
-                                    valueModifier *= 1 + section.gap.Open;
+                                    if (CanPassThroughHole(s, i))
+                                    {
+                                        bool leadsInside = !section.gap.IsRoomToRoom && section.gap.FlowTargetHull != null && hulls.Any(h => h.Rect.Intersects(section.rect));
+                                        valueModifier *= leadsInside ? 5 : 0;
+                                    }
+                                    else
+                                    {
+                                        // up to 100% priority increase for every gap in the wall
+                                        valueModifier *= 1 + section.gap.Open;
+                                    }
                                 }
                             }
                         }

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

@@ -54,7 +54,7 @@ namespace Barotrauma
             get { return attachJoints.Count > 0; }
         }
 
-        public bool IsAttachedToSub => IsAttached && attachTargetBody?.UserData is Entity entity && (entity is Submarine sub || entity?.Submarine != null);
+        public bool IsAttachedToSub => IsAttached && (attachTargetBody?.UserData is Submarine || attachTargetBody?.UserData is Entity entity && entity.Submarine != null);
 
         public LatchOntoAI(XElement element, EnemyAIController enemyAI)
         {
@@ -190,7 +190,7 @@ namespace Barotrauma
                 case AIController.AIState.Attack:
                     if (enemyAI.AttackingLimb != null)
                     {
-                        if (attachToSub && wallAttachPos != Vector2.Zero && attachTargetBody != null)
+                        if (attachToSub && !enemyAI.IsSteeringThroughGap && wallAttachPos != Vector2.Zero && attachTargetBody != null)
                         {
                             // is not attached or is attached to something else
                             if (!IsAttached || IsAttached && attachJoints[0].BodyB == attachTargetBody)

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

@@ -14,11 +14,16 @@ namespace Barotrauma
         private float maxDistFromCenter;
         private float cohesion;
 
-        private List<AICharacter> members = new List<AICharacter>();
+        public List<AICharacter> Members { get; private set; } = new List<AICharacter>();
+        public HashSet<AICharacter> ActiveMembers { get; private set; } = new HashSet<AICharacter>();
 
-        private AIController ai;
+        private EnemyAIController ai;
 
-        public SwarmBehavior(XElement element, AIController ai)
+        public bool IsActive { get; set; }
+        public bool IsEnoughMembers => ActiveMembers.Count > 1;
+
+
+        public SwarmBehavior(XElement element, EnemyAIController ai)
         {
             this.ai = ai;
             minDistFromClosest = ConvertUnits.ToSimUnits(element.GetAttributeFloat("mindistfromclosest", 10.0f));
@@ -32,21 +37,36 @@ namespace Barotrauma
             {
                 if (character.AIController is EnemyAIController enemyAI && enemyAI.SwarmBehavior != null)
                 {
-                    enemyAI.SwarmBehavior.members = swarm.ToList();
+                    enemyAI.SwarmBehavior.Members = swarm.ToList();
                 }
             }
         }
 
-        public void Update(float deltaTime)
+        public void Refresh()
         {
-            members.RemoveAll(m => m.IsDead || m.Removed);
-            if (members.Count < 2) { return; }
+            Members.RemoveAll(m => m.IsDead || m.Removed);
+            foreach (var member in Members)
+            {
+                if (!member.AIController.Enabled && member.IsRemotePlayer || Character.Controlled == member || !((EnemyAIController)member.AIController).SwarmBehavior.IsActive)
+                {
+                    ActiveMembers.Remove(member);
+                }
+                else
+                {
+                    ActiveMembers.Add(member);
+                }
+            }
+        }
 
+        public void UpdateSteering(float deltaTime)
+        {
+            if (!IsActive) { return; }
+            if (!IsEnoughMembers) { return; }
             //calculate the "center of mass" of the swarm and the distance to the closest character in the swarm
             float closestDistSqr = float.MaxValue;
             Vector2 center = Vector2.Zero;
             AICharacter closest = null;
-            foreach (AICharacter member in members)
+            foreach (AICharacter member in Members)
             {
                 center += member.SimPosition;
                 if (member == ai.Character) { continue; }
@@ -57,7 +77,7 @@ namespace Barotrauma
                     closest = member;
                 }
             }
-            center /= members.Count;
+            center /= Members.Count;
 
             if (closest == null) { return; }
 
@@ -83,11 +103,11 @@ namespace Barotrauma
             if (cohesion > 0.0f)
             {
                 Vector2 avgVel = Vector2.Zero;
-                foreach (AICharacter member in members)
+                foreach (AICharacter member in Members)
                 {
                     avgVel += member.AnimController.TargetMovement;
                 }
-                avgVel /= members.Count;
+                avgVel /= Members.Count;
                 ai.SteeringManager.SteeringManual(deltaTime, avgVel * cohesion);
             }
         }

Barotrauma/BarotraumaShared/Source/Characters/Animation/HumanoidAnimController.cs

@@ -560,7 +560,8 @@ namespace Barotrauma
                     //TODO: take into account that the feet aren't necessarily in CurrentHull
                     //full slowdown (1.5f) when water is up to the torso
                     surfaceY = ConvertUnits.ToSimUnits(currentHull.Surface);
-                    slowdownAmount = MathHelper.Clamp((surfaceY - colliderPos.Y) / TorsoPosition.Value, 0.0f, 1.0f) * 1.5f;
+                    float bottomPos = Math.Max(colliderPos.Y, currentHull.Rect.Y - currentHull.Rect.Height);
+                    slowdownAmount = MathHelper.Clamp((surfaceY - bottomPos) / TorsoPosition.Value, 0.0f, 1.0f) * 1.5f;
                 }
 
                 float maxSpeed = Math.Max(TargetMovement.Length() - slowdownAmount, 1.0f);

Barotrauma/BarotraumaShared/Source/Characters/Character.cs

@@ -853,7 +853,7 @@ namespace Barotrauma
             {
                 if (characterConfigFiles == null)
                 {
-                    characterConfigFiles = GameMain.Instance.GetFilesOfType(ContentType.Character);
+                    characterConfigFiles = GameMain.Instance.GetFilesOfType(ContentType.Character, searchAllContentPackages: true);
                 }
                 return characterConfigFiles;
             }
@@ -2593,152 +2593,14 @@ namespace Barotrauma
 
             if (info != null) { info.Remove(); }
 
-#if CLIENT
-            GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
-#endif
-
-#if CLIENT
-            GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
-#endif
-
-#if CLIENT
-            GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
-#endif
-
-#if CLIENT
-            GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
-#endif
-
-#if CLIENT
-            GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
-#endif
-
-#if CLIENT
-            GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
-#endif
-
-#if CLIENT
-            GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
-#endif
-
-#if CLIENT
-            GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
-#endif
-
-#if CLIENT
-            GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
-#endif
-
-#if CLIENT
-            GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
-#endif
-
-#if CLIENT
-            GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
-#endif
-
-#if CLIENT
-            GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
-#endif
-
-#if CLIENT
-            GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
-#endif
-
-#if CLIENT
-            GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
-#endif
-
-#if CLIENT
-            GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
-#endif
-
-#if CLIENT
-            GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
-#endif
-
-#if CLIENT
-            GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
-#endif
-
-#if CLIENT
-            GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
-#endif
-
-#if CLIENT
-            GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
-#endif
-
-#if CLIENT
-            GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
-#endif
-
-#if CLIENT
-            GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
-#endif
-
-#if CLIENT
-            GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
-#endif
-
-#if CLIENT
-            GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
-#endif
-
-#if CLIENT
-            GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
-#endif
-
-#if CLIENT
-            GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
-#endif
-
-#if CLIENT
-            GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
-#endif
-
-#if CLIENT
-            GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
-#endif
-
-#if CLIENT
-            GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
-#endif
-
-#if CLIENT
-            GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
-#endif
-
-#if CLIENT
-            GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
-#endif
-
-#if CLIENT
-            GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
-#endif
-
-#if CLIENT
-            GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
-#endif
-
-#if CLIENT
-            GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
-#endif
-
-#if CLIENT
-            GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
-#endif
-
-#if CLIENT
-            GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
-#endif
-
 #if CLIENT
             GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
 #endif
 
             CharacterList.Remove(this);
 
+            if (Controlled == this) { Controlled = null; }
+
             if (Inventory != null)
             {
                 foreach (Item item in Inventory.Items)

Barotrauma/BarotraumaShared/Source/Events/Missions/MonsterMission.cs

@@ -34,14 +34,33 @@ namespace Barotrauma
         {
             Level.Loaded.TryGetInterestingPosition(true, Level.PositionType.MainPath, Level.Loaded.Size.X * 0.3f, out Vector2 spawnPos);
 
-            bool isClient = GameMain.NetworkMember != null && GameMain.NetworkMember.IsClient;
+            //bool isClient = GameMain.NetworkMember != null && GameMain.NetworkMember.IsClient;
+            //for (int i = 0; i < monsterCount; i++)
+            //{
+            //    monsters.Add(Character.Create(monsterFile, spawnPos, ToolBox.RandomSeed(8), null, isClient, true, false));
+            //}
+            //monsters.ForEach(m => m.Enabled = false);
+            //SwarmBehavior.CreateSwarm(monsters.Cast<AICharacter>());
+            //sonarPositions.Add(spawnPos);
+
+            float offsetAmount = 500;
             for (int i = 0; i < monsterCount; i++)
             {
-                monsters.Add(Character.Create(monsterFile, spawnPos, ToolBox.RandomSeed(8), null, isClient, true, false));
+                CoroutineManager.InvokeAfter(() =>
+                {
+                    bool isClient = GameMain.NetworkMember != null && GameMain.NetworkMember.IsClient;
+                    var monster = Character.Create(monsterFile, spawnPos + Rand.Vector(offsetAmount, Rand.RandSync.Server), i.ToString(), null, isClient, true, true);
+                    monster.Enabled = false;
+                    monsters.Add(monster);
+                    if (monsters.Count == monsterCount)
+                    {
+                        //this will do nothing if the monsters have no swarm behavior defined, 
+                        //otherwise it'll make the spawned characters act as a swarm
+                        SwarmBehavior.CreateSwarm(monsters.Cast<AICharacter>());
+                        sonarPositions.Add(spawnPos);
+                    }
+                }, Rand.Range(0f, monsterCount / 2, Rand.RandSync.Server));
             }
-            monsters.ForEach(m => m.Enabled = false);
-            SwarmBehavior.CreateSwarm(monsters.Cast<AICharacter>());
-            sonarPositions.Add(spawnPos);
         }
 
         public override void Update(float deltaTime)

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

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

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

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

@@ -736,6 +736,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/Structure.cs

@@ -635,24 +635,6 @@ namespace Barotrauma
                 var character = ((Limb)f2.Body.UserData).character;
                 if (character.DisableImpactDamageTimer > 0.0f || ((Limb)f2.Body.UserData).Mass < 100.0f) return true;
             }
-            
-            if (!Prefab.Platform && Prefab.StairDirection == Direction.None)
-            {
-                Vector2 pos = ConvertUnits.ToDisplayUnits(f2.Body.Position);
-
-                int section = FindSectionIndex(pos);
-                if (section > -1)
-                {
-                    Vector2 normal = contact.Manifold.LocalNormal;
-
-                    float impact = Vector2.Dot(f2.Body.LinearVelocity, -normal) * f2.Body.Mass * 0.1f;
-                    if (impact < 10.0f) return true;
-#if CLIENT
-                    SoundPlayer.PlayDamageSound("StructureBlunt", impact, SectionPosition(section, true), tags: Tags);                    
-#endif
-                    AddDamage(section, impact);                 
-                }
-            }
 
             OnImpactProjSpecific(f1, f2, contact);
 

Barotrauma/BarotraumaShared/Source/Map/SubmarineBody.cs

@@ -468,7 +468,7 @@ namespace Barotrauma
 
             var gaps = newHull?.ConnectedGaps ?? Gap.GapList.Where(g => g.Submarine == submarine);
             targetPos = character.WorldPosition;
-            Gap adjacentGap = Gap.FindAdjacent(gaps, targetPos, 200.0f);
+            Gap adjacentGap = Gap.FindAdjacent(gaps, targetPos, 500.0f);
             if (adjacentGap == null) return true;
 
             if (newHull != null)

Barotrauma/BarotraumaShared/Source/Networking/EntitySpawner.cs

@@ -102,7 +102,7 @@ namespace Barotrauma
             {
                 string errorMsg = "Attempted to add a null item to entity spawn queue.\n" + Environment.StackTrace;
                 DebugConsole.ThrowError(errorMsg);
-                GameAnalyticsManager.AddErrorEventOnce("EntitySpawner.AddToSpawnQueue3:ItemPrefabNull", GameAnalyticsSDK.Net.EGAErrorSeverity.Error, errorMsg);
+                GameAnalyticsManager.AddErrorEventOnce("EntitySpawner.AddToSpawnQueue1:ItemPrefabNull", GameAnalyticsSDK.Net.EGAErrorSeverity.Error, errorMsg);
                 return;
             }
             spawnQueue.Enqueue(new ItemSpawnInfo(itemPrefab, worldPosition, condition));
@@ -115,7 +115,7 @@ namespace Barotrauma
             {
                 string errorMsg = "Attempted to add a null item to entity spawn queue.\n" + Environment.StackTrace;
                 DebugConsole.ThrowError(errorMsg);
-                GameAnalyticsManager.AddErrorEventOnce("EntitySpawner.AddToSpawnQueue3:ItemPrefabNull", GameAnalyticsSDK.Net.EGAErrorSeverity.Error, errorMsg);
+                GameAnalyticsManager.AddErrorEventOnce("EntitySpawner.AddToSpawnQueue2:ItemPrefabNull", GameAnalyticsSDK.Net.EGAErrorSeverity.Error, errorMsg);
                 return;
             }
             spawnQueue.Enqueue(new ItemSpawnInfo(itemPrefab, position, sub, condition));

Barotrauma/BarotraumaShared/Source/PlayerInput.cs

@@ -162,21 +162,6 @@ 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();