Unstable 0.1400.1.0

2021-05-20 16:12:54 +03:00
parent 92f0264af2
commit 5bc850cddb
181 changed files with 2475 additions and 1588 deletions
@@ -25,12 +25,12 @@ namespace Barotrauma
        private readonly float screenColorRange, screenColorDuration;

        private bool sparks, shockwave, flames, smoke, flash, underwaterBubble;
-        private bool playTinnitus;
-        private bool applyFireEffects;
-        private string[] ignoreFireEffectsForTags;
-        private bool ignoreCover;
-        private bool onlyInside;
-        private bool onlyOutside;
+        private readonly Color flashColor;
+        private readonly bool playTinnitus;
+        private readonly bool applyFireEffects;
+        private readonly string[] ignoreFireEffectsForTags;
+        private readonly bool ignoreCover;
+        private readonly bool onlyInside,onlyOutside;
        private readonly float flashDuration;
        private readonly float? flashRange;
        private readonly string decal;
@@ -81,6 +81,7 @@ namespace Barotrauma
            flash           = element.GetAttributeBool("flash", true);
            flashDuration   = element.GetAttributeFloat("flashduration", 0.05f);
            if (element.Attribute("flashrange") != null) { flashRange = element.GetAttributeFloat("flashrange", 100.0f); }
+            flashColor = element.GetAttributeColor("flashcolor", Color.LightYellow);

            EmpStrength = element.GetAttributeFloat("empstrength", 0.0f);
            BallastFloraDamage = element.GetAttributeFloat("ballastfloradamage", 0.0f);
@@ -395,7 +396,7 @@ namespace Barotrauma
                for (int i = 0; i < structure.SectionCount; i++)
                {
                    float distFactor = 1.0f - (Vector2.Distance(structure.SectionPosition(i, true), worldPosition) / worldRange);
-                    if (distFactor <= 0.0f) continue;
+                    if (distFactor <= 0.0f) { continue; }

                    structure.AddDamage(i, damage * distFactor, attacker);

@@ -412,6 +413,19 @@ namespace Barotrauma

            if (Level.Loaded != null && !MathUtils.NearlyEqual(levelWallDamage, 0.0f))
            {
+                if (Level.Loaded?.LevelObjectManager != null)
+                {
+                    foreach (var levelObject in Level.Loaded.LevelObjectManager.GetAllObjects(worldPosition, worldRange))
+                    {
+                        if (levelObject.Prefab.TakeLevelWallDamage)
+                        {
+                            float distFactor = 1.0f - (Vector2.Distance(levelObject.WorldPosition, worldPosition) / worldRange);
+                            if (distFactor <= 0.0f) { continue; }
+                            levelObject.AddDamage(levelWallDamage * distFactor, 1.0f, null);
+                        }
+                    }
+                }
+
                for (int i = Level.Loaded.ExtraWalls.Count - 1; i >= 0; i--)
                {
                    if (!(Level.Loaded.ExtraWalls[i] is DestructibleLevelWall destructibleWall)) { continue; }
@@ -745,19 +745,22 @@ namespace Barotrauma

            Oxygen -= OxygenDeteriorationSpeed * deltaTime;

-            if ((Character.Controlled?.CharacterHealth?.GetAffliction("psychosis")?.Strength ?? 0.0f) <= 0.0f)
+            if (FakeFireSources.Count > 0)
            {
-                for (int i = FakeFireSources.Count - 1; i >= 0; i--)
+                if ((Character.Controlled?.CharacterHealth?.GetAffliction("psychosis")?.Strength ?? 0.0f) <= 0.0f)
                {
-                    if (FakeFireSources[i].CausedByPsychosis)
+                    for (int i = FakeFireSources.Count - 1; i >= 0; i--)
                    {
-                        FakeFireSources[i].Remove();
+                        if (FakeFireSources[i].CausedByPsychosis)
+                        {
+                            FakeFireSources[i].Remove();
+                        }
                    }
                }
+                FireSource.UpdateAll(FakeFireSources, deltaTime);
            }

            FireSource.UpdateAll(FireSources, deltaTime);
-            FireSource.UpdateAll(FakeFireSources, deltaTime);

            foreach (Decal decal in decals)
            {
@@ -35,7 +35,7 @@ namespace Barotrauma
            Cave = 0x4,
            Ruin = 0x8,
            Wreck = 0x10,
-            BeaconStation = 0x20,
+            BeaconStation = 0x20, // Not used anywhere
            Abyss = 0x40,
            AbyssCave = 0x80
        }
@@ -389,7 +389,7 @@ namespace Barotrauma

        private void Generate(bool mirror)
        {
-            if (Loaded != null) { Loaded.Remove(); }
+            Loaded?.Remove();
            Loaded = this;
            Generating = true;

@@ -1154,7 +1154,7 @@ namespace Barotrauma
            }

            CreateWrecks();
-            CreateBeaconStation(cells);
+            CreateBeaconStation();

            EqualityCheckValues.Add(Rand.Int(int.MaxValue, Rand.RandSync.Server));

@@ -3007,20 +3007,30 @@ namespace Barotrauma
            return originalTag + "_" + shortSeed;
        }

+        public bool IsCloseToStart(Vector2 position, float minDist) => IsCloseToStart(position.ToPoint(), minDist);
+        public bool IsCloseToEnd(Vector2 position, float minDist) => IsCloseToEnd(position.ToPoint(), minDist);
+
+        public bool IsCloseToStart(Point position, float minDist)
+        {
+            return MathUtils.LineSegmentToPointDistanceSquared(StartPosition.ToPoint(), StartExitPosition.ToPoint(), position) < minDist * minDist;
+        }
+
+        public bool IsCloseToEnd(Point position, float minDist)
+        {
+            return MathUtils.LineSegmentToPointDistanceSquared(EndPosition.ToPoint(), EndExitPosition.ToPoint(), position) < minDist * minDist;
+        }
+
        private Submarine SpawnSubOnPath(string subName, ContentFile contentFile, SubmarineType type)
        {
            var tempSW = new Stopwatch();

            // Min distance between a sub and the start/end/other sub.
            float minDistance = Sonar.DefaultSonarRange;
-            float squaredMinDistance = minDistance * minDistance;
-            Vector2 start = startPosition.ToVector2();
-            Vector2 end = endPosition.ToVector2();
            var waypoints = WayPoint.WayPointList.Where(wp =>
                wp.Submarine == null &&
                wp.SpawnType == SpawnType.Path &&
-                Vector2.DistanceSquared(wp.WorldPosition, start) > squaredMinDistance &&
-                Vector2.DistanceSquared(wp.WorldPosition, end) > squaredMinDistance).ToList();
+                !IsCloseToStart(wp.WorldPosition, minDistance) && 
+                !IsCloseToEnd(wp.WorldPosition, minDistance)).ToList();

            var subDoc = SubmarineInfo.OpenFile(contentFile.Path);
            Rectangle subBorders = Submarine.GetBorders(subDoc.Root);
@@ -3163,7 +3173,7 @@ namespace Barotrauma
                else
                {
                    var sp = spawnPoint;
-                    if (Wrecks.Any(w => Vector2.DistanceSquared(w.WorldPosition, sp) < squaredMinDistance))
+                    if (Wrecks.Any(w => Vector2.DistanceSquared(w.WorldPosition, sp) < minDistance * minDistance))
                    {
                        Debug.WriteLine($"Invalid position {spawnPoint}. Too close to other wreck(s).");
                        return false;
@@ -3321,7 +3331,13 @@ namespace Barotrauma

            int minWreckCount = Math.Min(Loaded.GenerationParams.MinWreckCount, wreckFiles.Count);
            int maxWreckCount = Math.Min(Loaded.GenerationParams.MaxWreckCount, wreckFiles.Count);
-            int wreckCount = Rand.Range(minWreckCount, maxWreckCount, Rand.RandSync.Server);
+            int wreckCount = Rand.Range(minWreckCount, maxWreckCount + 1, Rand.RandSync.Server);
+
+            if (GameMain.GameSession?.GameMode?.Missions.Any(m => m.Prefab.RequireWreck) ?? false)
+            {
+                wreckCount = Math.Max(wreckCount, 1);
+            }
+
            Wrecks = new List<Submarine>(wreckCount);
            for (int i = 0; i < wreckCount; i++)
            {
@@ -3379,7 +3395,7 @@ namespace Barotrauma

            for (int i = 0; i < 2; i++)
            {
-                if (GameMain.GameSession.GameMode is PvPMode) { continue; }
+                if (GameMain.GameSession?.GameMode is PvPMode) { continue; }
                
                bool isStart = (i == 0) == !Mirrored;
                if (isStart)
@@ -3561,7 +3577,7 @@ namespace Barotrauma
            }
        }

-        private void CreateBeaconStation(List<VoronoiCell> mainPath)
+        private void CreateBeaconStation()
        {
            if (!LevelData.HasBeaconStation) { return; }
            var beaconStationFiles = ContentPackage.GetFilesOfType(GameMain.Config.AllEnabledPackages, ContentType.BeaconStation).ToList();
@@ -8,7 +8,7 @@ using System.Xml.Linq;

 namespace Barotrauma
 {
-    partial class LevelObject : ISpatialEntity
+    partial class LevelObject : ISpatialEntity, IDamageable, ISerializableEntity
    {
        public readonly LevelObjectPrefab Prefab;
        public Vector3 Position;
@@ -21,6 +21,8 @@ namespace Barotrauma

        private int spriteIndex;

+        protected bool tookDamage;
+
        public LevelObjectPrefab ActivePrefab;

        public PhysicsBody PhysicsBody
@@ -37,11 +39,15 @@ namespace Barotrauma

        public bool NeedsNetworkSyncing
        {
-            get { return Triggers != null && Triggers.Any(t => t.NeedsNetworkSyncing); }
+            get 
+            { 
+                return tookDamage || (Triggers != null && Triggers.Any(t => t.NeedsNetworkSyncing)); 
+            }
            set 
            {
                if (Triggers == null) { return; }
-                Triggers.ForEach(t => t.NeedsNetworkSyncing = false); 
+                Triggers.ForEach(t => t.NeedsNetworkSyncing = false);
+                tookDamage = false;
            }
        }

@@ -50,6 +56,12 @@ namespace Barotrauma
            get; private set;
        }

+        public float Health
+        {
+            get;
+            private set;
+        }
+
        public Sprite Sprite
        {
            get 
@@ -67,6 +79,10 @@ namespace Barotrauma

        public Submarine Submarine => null;

+        public string Name => Prefab?.Name ?? "LevelObject (null)";
+
+        public Dictionary<string, SerializableProperty> SerializableProperties { get; } = new Dictionary<string, SerializableProperty>();
+
        public Level.Cave ParentCave;

        public LevelObject(LevelObjectPrefab prefab, Vector3 position, float scale, float rotation = 0.0f)
@@ -75,6 +91,7 @@ namespace Barotrauma
            Position = position;
            Scale = scale;
            Rotation = rotation;
+            Health = prefab.Health;

            spriteIndex = ActivePrefab.Sprites.Any() ? Rand.Int(ActivePrefab.Sprites.Count, Rand.RandSync.Server) : -1;

@@ -89,10 +106,13 @@ namespace Barotrauma

            if (PhysicsBody != null)
            {
+                PhysicsBody.UserData = this;
                PhysicsBody.SetTransformIgnoreContacts(PhysicsBody.SimPosition, -Rotation);
                PhysicsBody.BodyType = BodyType.Static;
                PhysicsBody.CollisionCategories = Physics.CollisionLevel;
-                PhysicsBody.CollidesWith = Physics.CollisionWall | Physics.CollisionCharacter;
+                PhysicsBody.CollidesWith = Prefab.TakeLevelWallDamage?
+                    Physics.CollisionWall | Physics.CollisionCharacter | Physics.CollisionProjectile : 
+                    Physics.CollisionWall | Physics.CollisionCharacter;
            }

            foreach (XElement triggerElement in prefab.LevelTriggerElements)
@@ -111,6 +131,10 @@ namespace Barotrauma
                }

                var newTrigger = new LevelTrigger(triggerElement, new Vector2(position.X, position.Y) + triggerPosition, -rotation, scale, prefab.Name);
+                if (newTrigger.PhysicsBody != null)
+                {
+                    newTrigger.PhysicsBody.UserData = this;
+                }
                int parentTriggerIndex = prefab.LevelTriggerElements.IndexOf(triggerElement.Parent);
                if (parentTriggerIndex > -1) { newTrigger.ParentTrigger = Triggers[parentTriggerIndex]; }
                Triggers.Add(newTrigger);
@@ -135,7 +159,54 @@ namespace Barotrauma
        }
        
        partial void InitProjSpecific();
-        
+
+        public AttackResult AddDamage(Character attacker, Vector2 worldPosition, Attack attack, float deltaTime, bool playSound = true)
+        {
+            if (Health <= 0.0f) { return new AttackResult(0.0f); }
+
+            float damage = 0.0f;
+            if (Prefab.TakeLevelWallDamage)
+            {
+                damage += attack.GetLevelWallDamage(deltaTime);
+            }
+            damage = Math.Max(Health, damage);
+            AddDamage(damage, deltaTime, attacker);
+            return new AttackResult(damage);
+        }
+
+        public void AddDamage(float damage, float deltaTime, Entity attacker, bool isNetworkEvent = false)
+        {
+            if (Health <= 0.0f) { return; }
+            if (GameMain.NetworkMember != null && GameMain.NetworkMember.IsClient && !isNetworkEvent)
+            {
+                return;
+            }
+            tookDamage |= !MathUtils.NearlyEqual(damage, 0.0f);
+            Health -= damage;
+            if (Health <= 0.0f)
+            {
+#if CLIENT
+                if (GameMain.GameSession?.Level?.LevelObjectManager != null)
+                {
+                    GameMain.GameSession.Level.LevelObjectManager.ForceRefreshVisibleObjects = true;
+                }
+#endif
+                if (PhysicsBody != null)
+                {
+                    PhysicsBody.Enabled = false;
+                }
+                foreach (LevelTrigger trigger in Triggers)
+                {
+                    trigger.PhysicsBody.Enabled = false;
+                    foreach (StatusEffect effect in trigger.StatusEffects)
+                    {
+                        if (effect.type != ActionType.OnBroken) { continue; }
+                        effect.Apply(effect.type, deltaTime, attacker, this, worldPosition: WorldPosition);
+                    }
+                }
+            }
+        }
+
        public Vector2 LocalToWorld(Vector2 localPosition, float swingState = 0.0f)
        {
            Vector2 emitterPos = localPosition * Scale;
@@ -169,6 +240,10 @@ namespace Barotrauma
        public void ServerWrite(IWriteMessage msg, Client c)
        {
            if (Triggers == null) { return; }
+            if (Prefab.TakeLevelWallDamage)
+            {
+                msg.WriteRangedSingle(MathHelper.Clamp(Health, 0.0f, Prefab.Health), 0.0f, Prefab.Health, 8);
+            }
            for (int j = 0; j < Triggers.Count; j++)
            {
                if (!Triggers[j].UseNetworkSyncing) { continue; }
@@ -136,27 +136,18 @@ namespace Barotrauma
                if (prefab == null) { continue; }
                if (!suitableSpawnPositions.ContainsKey(prefab))
                {
+                    float minDistance = level.Size.X * 0.2f;
+
                    suitableSpawnPositions.Add(prefab, 
                        availableSpawnPositions.Where(sp =>
                            sp.SpawnPosTypes.Any(type => prefab.SpawnPos.HasFlag(type)) && 
                            sp.Length >= prefab.MinSurfaceWidth &&
-                            (prefab.AllowAtStart || !closeToStart(sp.GraphEdge.Center)) &&
-                            (prefab.AllowAtEnd || !closeToEnd(sp.GraphEdge.Center)) &&
+                            (prefab.AllowAtStart || !level.IsCloseToStart(sp.GraphEdge.Center, minDistance)) &&
+                            (prefab.AllowAtEnd || !level.IsCloseToEnd(sp.GraphEdge.Center, minDistance)) &&
                            (sp.Alignment == Alignment.Any || prefab.Alignment.HasFlag(sp.Alignment))).ToList());

                    spawnPositionWeights.Add(prefab,
                        suitableSpawnPositions[prefab].Select(sp => sp.GetSpawnProbability(prefab)).ToList());
-
-                    bool closeToStart(Vector2 position)
-                    {
-                        float minDist = level.Size.X * 0.2f;
-                        return MathUtils.LineSegmentToPointDistanceSquared(level.StartPosition.ToPoint(), level.StartExitPosition.ToPoint(), position.ToPoint()) < minDist * minDist;
-                    }
-                    bool closeToEnd(Vector2 position)
-                    {
-                        float minDist = level.Size.X * 0.2f;
-                        return MathUtils.LineSegmentToPointDistanceSquared(level.EndPosition.ToPoint(), level.EndExitPosition.ToPoint(), position.ToPoint()) < minDist * minDist;
-                    }
                }

                SpawnPosition spawnPosition = ToolBox.SelectWeightedRandom(suitableSpawnPositions[prefab], spawnPositionWeights[prefab], Rand.RandSync.Server);
@@ -442,10 +433,10 @@ namespace Barotrauma
        public IEnumerable<LevelObject> GetAllObjects(Vector2 worldPosition, float radius)
        {
            var minIndices = GetGridIndices(worldPosition - Vector2.One * radius);
-            if (minIndices.X >= objectGrid.GetLength(0) || minIndices.Y >= objectGrid.GetLength(1)) return Enumerable.Empty<LevelObject>();
+            if (minIndices.X >= objectGrid.GetLength(0) || minIndices.Y >= objectGrid.GetLength(1)) { return Enumerable.Empty<LevelObject>(); }

            var maxIndices = GetGridIndices(worldPosition + Vector2.One * radius);
-            if (maxIndices.X < 0 || maxIndices.Y < 0) return Enumerable.Empty<LevelObject>();
+            if (maxIndices.X < 0 || maxIndices.Y < 0) { return Enumerable.Empty<LevelObject>(); }

            minIndices.X = Math.Max(0, minIndices.X);
            minIndices.Y = Math.Max(0, minIndices.Y);
@@ -460,6 +451,7 @@ namespace Barotrauma
                    if (objectGrid[x, y] == null) { continue; }
                    foreach (LevelObject obj in objectGrid[x, y])
                    {
+                        if (obj.Prefab.HideWhenBroken && obj.Health <= 0.0f) { continue; }
                        objectsInRange.Add(obj);
                    }
                }
@@ -522,6 +514,7 @@ namespace Barotrauma
                        obj.NetworkUpdateTimer = NetConfig.LevelObjectUpdateInterval;
                    }
                }
+                if (obj.Prefab.HideWhenBroken && obj.Health <= 0.0f) { continue; }

                if (obj.Triggers != null)
                {
@@ -264,6 +264,27 @@ namespace Barotrauma
            private set;
        }

+        [Serialize(false, true, description: "Can the object take damage from weapons/attacks that damage level walls."), Editable]
+        public bool TakeLevelWallDamage
+        {
+            get;
+            private set;
+        }
+
+        [Serialize(false, true), Editable]
+        public bool HideWhenBroken
+        {
+            get;
+            private set;
+        }
+
+        [Serialize(100.0f, true), Editable]
+        public float Health
+        {
+            get;
+            private set;
+        }
+
        public string Identifier
        {
            get;
@@ -38,6 +38,10 @@ namespace Barotrauma
        /// Effects applied to entities that are inside the trigger
        /// </summary>
        private readonly List<StatusEffect> statusEffects = new List<StatusEffect>();
+        public IEnumerable<StatusEffect> StatusEffects
+        {
+            get { return statusEffects; }
+        }

        /// <summary>
        /// Attacks applied to entities that are inside the trigger
@@ -205,7 +209,7 @@ namespace Barotrauma
                PhysicsBody = new PhysicsBody(element, scale)
                {
                    CollisionCategories = Physics.CollisionLevel,
-                    CollidesWith = Physics.CollisionCharacter | Physics.CollisionItem | Physics.CollisionProjectile | Physics.CollisionWall
+                    CollidesWith = Physics.CollisionCharacter | Physics.CollisionItem | Physics.CollisionProjectile | Physics.CollisionWall,
                };
                PhysicsBody.FarseerBody.OnCollision += PhysicsBody_OnCollision;
                PhysicsBody.FarseerBody.OnSeparation += PhysicsBody_OnSeparation;
@@ -523,6 +527,7 @@ namespace Barotrauma
            {
                foreach (StatusEffect effect in statusEffects)
                {
+                    if (effect.type == ActionType.OnBroken) { continue; }
                    Vector2? position = null;
                    if (effect.HasTargetType(StatusEffect.TargetType.This)) { position = WorldPosition; }
                    if (triggerer is Character character)
@@ -181,27 +181,50 @@ namespace Barotrauma
            }
        }

-        public Mission SelectedMission
+        private readonly List<Mission> selectedMissions = new List<Mission>();
+        public IEnumerable<Mission> SelectedMissions
        {
-            get;
-            set;
+            get { return selectedMissions; }
        }

-        public int SelectedMissionIndex
+        public void SelectMission(Mission mission)
        {
-            get
+            if (!SelectedMissions.Contains(mission) && mission != null)
            {
-                if (SelectedMission == null) { return -1; }
-                return availableMissions.IndexOf(SelectedMission);
+                selectedMissions.Add(mission);
            }
-            set
+        }
+
+        public void DeselectMission(Mission mission)
+        {
+            selectedMissions.Remove(mission);
+        }
+
+
+        public List<int> GetSelectedMissionIndices()
+        {
+            List<int> selectedMissionIndices = new List<int>();
+            foreach (Mission mission in SelectedMissions)
            {
-                if (value < 0 || value >= AvailableMissions.Count())
+                if (availableMissions.Contains(mission))
                {
-                    SelectedMission = null;
-                    return;
+                    selectedMissionIndices.Add(availableMissions.IndexOf(mission));
                }
-                SelectedMission = availableMissions[value];
+            }
+            return selectedMissionIndices;
+        }
+
+        public void SetSelectedMissionIndices(IEnumerable<int> missionIndices)
+        {
+            selectedMissions.Clear();
+            foreach (int missionIndex in missionIndices)
+            {
+                if (missionIndex < 0 || missionIndex >= availableMissions.Count)
+                {
+                    DebugConsole.ThrowError($"Failed to select a mission in location \"{Name}\". Mission index out of bounds ({missionIndex}, available missions: {availableMissions.Count})");
+                    break;
+                }
+                selectedMissions.Add(availableMissions[missionIndex]);
            }
        }

@@ -415,6 +438,12 @@ namespace Barotrauma
        {
            if (newType == Type) { return; }

+            if (newType == null)
+            {
+                DebugConsole.ThrowError($"Failed to change the type of the location \"{Name}\" to null.\n" + Environment.StackTrace.CleanupStackTrace());
+                return;
+            }
+
            DebugConsole.Log("Location " + baseName + " changed it's type from " + Type + " to " + newType);

            Type = newType;
@@ -573,6 +602,7 @@ namespace Barotrauma
        public void InstantiateLoadedMissions(Map map)
        {
            availableMissions.Clear();
+            selectedMissions.Clear();
            if (loadedMissions != null && loadedMissions.Any()) 
            { 
                foreach (LoadedMission loadedMission in loadedMissions)
@@ -588,7 +618,7 @@ namespace Barotrauma
                    }
                    var mission = loadedMission.MissionPrefab.Instantiate(new Location[] { this, destination }, Submarine.MainSub);
                    availableMissions.Add(mission);
-                    if (loadedMission.SelectedMission) { SelectedMission = mission; }
+                    if (loadedMission.SelectedMission) { selectedMissions.Add(mission); }
                }
                loadedMissions = null;
            }
@@ -612,7 +642,7 @@ namespace Barotrauma
        public void ClearMissions()
        {
            availableMissions.Clear();
-            SelectedMissionIndex = -1;
+            selectedMissions.Clear();
        }

        public bool HasOutpost()
@@ -1180,7 +1210,7 @@ namespace Barotrauma
                    missionsElement.Add(new XElement("mission",
                        new XAttribute("prefabid", mission.Prefab.Identifier),
                        new XAttribute("destinationindex", i),
-                        new XAttribute("selected", mission == SelectedMission)));
+                        new XAttribute("selected", selectedMissions.Contains(mission))));
                }
                locationElement.Add(missionsElement);
            }
@@ -24,7 +24,7 @@ namespace Barotrauma
        /// From -> To
        /// </summary>
        public Action<Location, Location> OnLocationChanged;
-        public Action<LocationConnection, Mission> OnMissionSelected;
+        public Action<LocationConnection, IEnumerable<Mission>> OnMissionsSelected;

        public Location EndLocation { get; private set; }

@@ -44,9 +44,9 @@ namespace Barotrauma
            get { return Locations.IndexOf(SelectedLocation); }
        }

-        public int SelectedMissionIndex
+        public IEnumerable<int> GetSelectedMissionIndices()
        {
-            get { return SelectedConnection == null ? -1 : CurrentLocation.SelectedMissionIndex; }
+            return SelectedConnection == null ? Enumerable.Empty<int>() : CurrentLocation.GetSelectedMissionIndices();
        }

        public LocationConnection SelectedConnection { get; private set; }
@@ -388,8 +388,14 @@ namespace Barotrauma
                }
            }

-            LocationConnection[] connectionsBetweenZones = new LocationConnection[generationParams.DifficultyZones];
-            foreach (var connection in Connections)
+            List<LocationConnection>[] connectionsBetweenZones = new List<LocationConnection>[generationParams.DifficultyZones];
+            for (int i = 0; i < generationParams.DifficultyZones; i++)
+            {
+                connectionsBetweenZones[i] = new List<LocationConnection>();
+            }
+            var shuffledConnections = Connections.ToList();
+            shuffledConnections.Shuffle(Rand.RandSync.Server);
+            foreach (var connection in shuffledConnections)
            {
                int zone1 = GetZoneIndex(connection.Locations[0].MapPosition.X);
                int zone2 = GetZoneIndex(connection.Locations[1].MapPosition.X);
@@ -401,17 +407,25 @@ namespace Barotrauma
                    zone1 = temp;
                }

-                if (connectionsBetweenZones[zone1] == null)
+                if (generationParams.GateCount[zone1] == 0) { continue; }
+
+                if (!connectionsBetweenZones[zone1].Any())
                {
-                    connectionsBetweenZones[zone1] = connection;
+                    connectionsBetweenZones[zone1].Add(connection);
                }
-                else
+                else if (generationParams.GateCount[zone1] == 1)
                {
-                    if (Math.Abs(connection.CenterPos.Y - Height / 2) < Math.Abs(connectionsBetweenZones[zone1].CenterPos.Y - Height / 2))
+                    //if there's only one connection, place it at the center of the map
+                    if (Math.Abs(connection.CenterPos.Y - Height / 2) < Math.Abs(connectionsBetweenZones[zone1].First().CenterPos.Y - Height / 2))
                    {
-                        connectionsBetweenZones[zone1] = connection;
+                        connectionsBetweenZones[zone1].Clear();
+                        connectionsBetweenZones[zone1].Add(connection);
                    }
                }
+                else if (connectionsBetweenZones[zone1].Count() < generationParams.GateCount[zone1])
+                {
+                    connectionsBetweenZones[zone1].Add(connection);
+                }
            }

            for (int i = Connections.Count - 1; i >= 0; i--)
@@ -421,7 +435,9 @@ namespace Barotrauma
                if (zone1 == zone2) { continue; }
                if (zone1 == generationParams.DifficultyZones || zone2 == generationParams.DifficultyZones) { continue; }

-                if (!connectionsBetweenZones.Contains(Connections[i]))
+                if (generationParams.GateCount[Math.Min(zone1, zone2)] == 0) { continue; }
+
+                if (!connectionsBetweenZones[Math.Min(zone1, zone2)].Contains(Connections[i]))
                {
                    Connections.RemoveAt(i);
                }
@@ -756,7 +772,7 @@ namespace Barotrauma
            OnLocationSelected?.Invoke(SelectedLocation, SelectedConnection);
        }

-        public void SelectMission(int missionIndex)
+        public void SelectMission(IEnumerable<int> missionIndices)
        {
            if (CurrentLocation == null)
            {
@@ -765,23 +781,24 @@ namespace Barotrauma
                GameAnalyticsManager.AddErrorEventOnce("Map.SelectMission:CurrentLocationNotSet", GameAnalyticsSDK.Net.EGAErrorSeverity.Error, errorMsg);
                return;
            }
-            CurrentLocation.SelectedMissionIndex = missionIndex;

-            if (CurrentLocation.SelectedMission == null) { return; }
+            CurrentLocation.SetSelectedMissionIndices(missionIndices);

-            if (CurrentLocation.SelectedMission.Locations[0] != CurrentLocation || 
-                CurrentLocation.SelectedMission.Locations[1] != CurrentLocation)
+            foreach (Mission selectedMission in CurrentLocation.SelectedMissions.ToList())
            {
-                if (SelectedConnection == null) { return; }
-                //the destination must be the same as the destination of the mission
-                if (CurrentLocation.SelectedMission != null && 
-                    CurrentLocation.SelectedMission.Locations[1] != SelectedLocation)
+                if (selectedMission.Locations[0] != CurrentLocation ||
+                    selectedMission.Locations[1] != CurrentLocation)
                {
-                    CurrentLocation.SelectedMissionIndex = -1;
+                    if (SelectedConnection == null) { return; }
+                    //the destination must be the same as the destination of the mission
+                    if (selectedMission.Locations[1] != SelectedLocation)
+                    {
+                        CurrentLocation.DeselectMission(selectedMission);
+                    }
                }
            }

-            OnMissionSelected?.Invoke(SelectedConnection, CurrentLocation.SelectedMission);
+            OnMissionsSelected?.Invoke(SelectedConnection, CurrentLocation.SelectedMissions);
        }

        public void SelectRandomLocation(bool preferUndiscovered)
@@ -977,6 +994,12 @@ namespace Barotrauma
            string prevName = location.Name;

            var newType = LocationType.List.Find(lt => lt.Identifier.Equals(change.ChangeToType, StringComparison.OrdinalIgnoreCase));
+            if (newType == null)
+            {
+                DebugConsole.ThrowError($"Failed to change the type of the location \"{location.Name}\". Location type \"{change.ChangeToType}\" not found.");
+                return;
+            }
+
            if (newType.OutpostTeam != location.Type.OutpostTeam ||
                newType.HasOutpost != location.Type.HasOutpost)
            {
@@ -67,6 +67,8 @@ namespace Barotrauma
        [Serialize(0.1f, true, description: "ConnectionDisplacementMultiplier for the UI indicator lines between locations."), Editable(0.0f, 10.0f, DecimalCount = 2)]
        public float ConnectionIndicatorDisplacementMultiplier { get; set; }

+        public int[] GateCount { get; private set; }
+
 #if CLIENT

        [Serialize(0.75f, true), Editable(DecimalCount = 2)]
@@ -201,6 +203,16 @@ namespace Barotrauma
        {
            SerializableProperties = SerializableProperty.DeserializeProperties(this, element);

+            GateCount = element.GetAttributeIntArray("gatecount", null) ?? element.GetAttributeIntArray("GateCount", null);
+            if (GateCount == null)
+            {
+                GateCount = new int[DifficultyZones];
+                for (int i = 0; i < DifficultyZones; i++)
+                {
+                    GateCount[i] = 1;
+                }
+            }
+
            foreach (XElement subElement in element.Elements())
            {
                switch (subElement.Name.ToString().ToLowerInvariant())
@@ -420,7 +420,7 @@ namespace Barotrauma
                if (cloneItem == null) { continue; }

                var door = cloneItem.GetComponent<Door>();
-                if (door != null) { door.RefreshLinkedGap(); }
+                door?.RefreshLinkedGap();

                var cloneWire = cloneItem.GetComponent<Wire>();
                if (cloneWire == null) continue;
@@ -1447,7 +1447,7 @@ namespace Barotrauma
                }
                else
                {
-                    npc.CharacterHealth.MaxVitality *= humanPrefab.HealthMultiplier;
+                    npc.AddStaticHealthMultiplier(humanPrefab.HealthMultiplier);
                }
                humanPrefab.GiveItems(npc, outpost, Rand.RandSync.Server);
                foreach (Item item in npc.Inventory.FindAllItems(it => it != null, recursive: true))
@@ -353,10 +353,7 @@ namespace Barotrauma
            }

 #if CLIENT
-            if (convexHulls!=null)
-            {
-                convexHulls.ForEach(x => x.Move(amount));
-            }
+            convexHulls?.ForEach(x => x.Move(amount));
 #endif
        }

@@ -77,6 +77,7 @@ namespace Barotrauma

        private static Vector2 lastPickedPosition;
        private static float lastPickedFraction;
+        private static Fixture lastPickedFixture;
        private static Vector2 lastPickedNormal;

        private Vector2 prevPosition;
@@ -99,6 +100,11 @@ namespace Barotrauma
            get { return lastPickedFraction; }
        }

+        public static Fixture LastPickedFixture
+        {
+            get { return lastPickedFixture; }
+        }
+
        public static Vector2 LastPickedNormal
        {
            get { return lastPickedNormal; }
@@ -669,6 +675,7 @@ namespace Barotrauma

            float closestFraction = 1.0f;
            Vector2 closestNormal = Vector2.Zero;
+            Fixture closestFixture = null;
            Body closestBody = null;
            if (allowInsideFixture)
            {
@@ -682,13 +689,15 @@ namespace Barotrauma

                    closestFraction = 0.0f;
                    closestNormal = Vector2.Normalize(rayEnd - rayStart);
-                    if (fixture.Body != null) closestBody = fixture.Body;
+                    closestFixture = fixture;
+                    if (fixture.Body != null) { closestBody = fixture.Body; }
                    return false;
                }, ref aabb);
                if (closestFraction <= 0.0f)
                {
                    lastPickedPosition = rayStart;
                    lastPickedFraction = closestFraction;
+                    lastPickedFixture = closestFixture;
                    lastPickedNormal = closestNormal;
                    return closestBody;
                }
@@ -702,6 +711,7 @@ namespace Barotrauma
                {
                    closestFraction = fraction;
                    closestNormal = normal;
+                    closestFixture = fixture;
                    if (fixture.Body != null) closestBody = fixture.Body;
                }
                return fraction;
@@ -709,6 +719,7 @@ namespace Barotrauma

            lastPickedPosition = rayStart + (rayEnd - rayStart) * closestFraction;
            lastPickedFraction = closestFraction;
+            lastPickedFixture = closestFixture;
            lastPickedNormal = closestNormal;

            return closestBody;
@@ -752,6 +763,7 @@ namespace Barotrauma
                    lastPickedPosition = rayStart + (rayEnd - rayStart) * fraction;
                    lastPickedFraction = fraction;
                    lastPickedNormal = normal;
+                    lastPickedFixture = fixture;
                }
                //continue
                return -1;
@@ -772,6 +784,7 @@ namespace Barotrauma
                    lastPickedPosition = rayStart;
                    lastPickedFraction = 0.0f;
                    lastPickedNormal = Vector2.Normalize(rayEnd - rayStart);
+                    lastPickedFixture = fixture;
                    bodies.Add(fixture.Body);
                    bodyDist[fixture.Body] = 0.0f;
                    return false;
@@ -828,6 +841,7 @@ namespace Barotrauma
        {
            Body closestBody = null;
            float closestFraction = 1.0f;
+            Fixture closestFixture = null;
            Vector2 closestNormal = Vector2.Zero;

            if (Vector2.DistanceSquared(rayStart, rayEnd) < 0.01f)
@@ -847,6 +861,8 @@ namespace Barotrauma
                if (ignoreSubs && fixture.Body.UserData is Submarine) { return -1; }
                if (ignoreBranches && fixture.Body.UserData is VineTile) { return -1; }
                if (fixture.Body.UserData as string == "ruinroom") { return -1; }
+                //the hulls have solid fixtures in the submarine's world space collider, ignore them
+                if (fixture.UserData is Hull) { return -1; }
                if (fixture.Body.UserData is Structure structure)
                {
                    if (structure.IsPlatform || structure.StairDirection != Direction.None) { return -1; }
@@ -861,6 +877,7 @@ namespace Barotrauma
                {
                    closestBody = fixture.Body;
                    closestFraction = fraction;
+                    closestFixture = fixture;
                    closestNormal = normal;
                }
                return closestFraction;
@@ -870,6 +887,7 @@ namespace Barotrauma

            lastPickedPosition = rayStart + (rayEnd - rayStart) * closestFraction;
            lastPickedFraction = closestFraction;
+            lastPickedFixture = closestFixture;
            lastPickedNormal = closestNormal;
            return closestBody;
        }
@@ -944,19 +962,23 @@ namespace Barotrauma
                mapEntity.Move(HiddenSubPosition);
            }

-            foreach (Item item in Item.ItemList)
+            for (int i = 0; i < 2; i++)
            {
-                if (bodyItems.Contains(item))
+                foreach (Item item in Item.ItemList)
                {
-                    item.Submarine = this;
-                    if (Position == Vector2.Zero) item.Move(-HiddenSubPosition);
+                    //two passes: flip docking ports on the 2nd pass because the doors need to be correctly flipped for the port's orientation to be determined correctly
+                    if ((item.GetComponent<DockingPort>() != null) == (i == 0)) { continue; }
+                    if (bodyItems.Contains(item))
+                    {
+                        item.Submarine = this;
+                        if (Position == Vector2.Zero) { item.Move(-HiddenSubPosition); }
+                    }
+                    else if (item.Submarine != this)
+                    {
+                        continue;
+                    }
+                    item.FlipX(true);
                }
-                else if (item.Submarine != this)
-                {
-                    continue;
-                }
-
-                item.FlipX(true);
            }

            Item.UpdateHulls();