409d4d9...aeafa16 (merge human-ai)

Barotrauma/BarotraumaShared/Source/Map/Hull.cs

@@ -160,6 +160,8 @@ namespace Barotrauma
             }
         }
 
+        public float WaterPercentage => MathUtils.Percentage(WaterVolume, Volume);
+
         public float OxygenPercentage
         {
             get { return oxygen / Volume * 100.0f; }

Barotrauma/BarotraumaShared/Source/Map/Map/LocationType.cs

@@ -30,6 +30,12 @@ namespace Barotrauma
         public readonly string Name;
 
         public readonly List<LocationTypeChange> CanChangeTo = new List<LocationTypeChange>();
+
+        public bool UseInMainMenu
+        {
+            get;
+            private set;
+        }
         
         public List<string> NameFormats
         {
@@ -57,6 +63,7 @@ namespace Barotrauma
             Identifier = element.GetAttributeString("identifier", element.Name.ToString());
             Name = TextManager.Get("LocationName." + Identifier);
             nameFormats = TextManager.GetAll("LocationNameFormat." + Identifier);
+            UseInMainMenu = element.GetAttributeBool("useinmainmenu", false);
 
             string nameFile = element.GetAttributeString("namefile", "Content/Map/locationNames.txt");
             try

Barotrauma/BarotraumaShared/Source/Map/Map/Map.cs

@@ -430,6 +430,13 @@ namespace Barotrauma
             }
             CurrentLocation.SelectedMissionIndex = missionIndex;
 
+            //the destination must be the same as the destination of the mission
+            if (CurrentLocation.SelectedMission != null && 
+                CurrentLocation.SelectedMission.Locations[1] != SelectedLocation)
+            {
+                SelectLocation(CurrentLocation.SelectedMission.Locations[1]);
+            }
+
             SelectedLocation = location;
             SelectedConnection = connections.Find(c => c.Locations.Contains(CurrentLocation) && c.Locations.Contains(SelectedLocation));
             OnLocationSelected?.Invoke(SelectedLocation, SelectedConnection);

Barotrauma/BarotraumaShared/Source/Map/Submarine.cs

@@ -10,7 +10,6 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.IO;
 using System.Linq;
-using System.Reflection;
 using System.Xml.Linq;
 using Voronoi2;
 
@@ -401,7 +400,8 @@ namespace Barotrauma
             IsOutpost = true;
             ShowSonarMarker = false;
             PhysicsBody.FarseerBody.IsStatic = true;
-            
+            TeamID = Character.TeamType.FriendlyNPC;
+
             foreach (MapEntity me in MapEntity.mapEntityList)
             {
                 if (me.Submarine != this) { continue; }
@@ -458,11 +458,15 @@ namespace Barotrauma
         }
 
         /// <summary>
-        /// Returns a list of all submarines that are connected to this one via docking ports.
+        /// Don't use this directly, because the list is updated only when GetConnectedSubs() is called. The method is called so frequently that we don't want to create new list here.
+        /// </summary>
+        private readonly List<Submarine> connectedSubs = new List<Submarine>(2);
+        /// <summary>
+        /// Returns a list of all submarines that are connected to this one via docking ports, including this sub.
         /// </summary>
         public List<Submarine> GetConnectedSubs()
         {
-            List<Submarine> connectedSubs = new List<Submarine> { this };
+            connectedSubs.Clear();
             GetConnectedSubsRecursive(connectedSubs);
 
             return connectedSubs;
@@ -518,45 +522,6 @@ namespace Barotrauma
                 {
                     maxX = Math.Min(maxX, ruin.Area.X - 100.0f);
                 }
-                else
-                {
-                    maxX = Math.Min(maxX, ruin.Area.X - 100.0f);
-                }
-                else
-                {
-                    maxX = Math.Min(maxX, ruin.Area.X - 100.0f);
-                }
-                else
-                {
-                    maxX = Math.Min(maxX, ruin.Area.X - 100.0f);
-                }
-
-                if (entity.IsVisible(worldView)) { visibleEntities.Add(entity); }             
-            }
-            
-            if (minX < 0.0f && maxX > Level.Loaded.Size.X)
-            {
-                //no walls found at either side, just use the initial spawnpos and hope for the best
-            }
-            else if (minX < 0)
-            {
-                //no wall found at the left side, spawn to the left from the right-side wall
-                spawnPos.X = maxX - minWidth - 100.0f;
-            }
-            else if (maxX > Level.Loaded.Size.X)
-            {
-                //no wall found at right side, spawn to the right from the left-side wall
-                spawnPos.X = minX + minWidth + 100.0f;
-            }
-            else
-            {
-                //walls found at both sides, use their midpoint
-                spawnPos.X = (minX + maxX) / 2;
-            }
-            
-            if (minX < 0.0f && maxX > Level.Loaded.Size.X)
-            {
-                //no walls found at either side, just use the initial spawnpos and hope for the best
             }
             
             if (minX < 0.0f && maxX > Level.Loaded.Size.X)
@@ -1026,6 +991,26 @@ namespace Barotrauma
             return closest;
         }
 
+        public List<Hull> GetHulls(bool alsoFromConnectedSubs) => GetEntities(alsoFromConnectedSubs, Hull.hullList);
+        public List<Gap> GetGaps(bool alsoFromConnectedSubs) => GetEntities(alsoFromConnectedSubs, Gap.GapList);
+        public List<Item> GetItems(bool alsoFromConnectedSubs) => GetEntities(alsoFromConnectedSubs, Item.ItemList);
+
+        public List<T> GetEntities<T>(bool includingConnectedSubs, List<T> list) where T : MapEntity
+        {
+            return list.FindAll(e => IsEntityFoundOnThisSub(e, includingConnectedSubs));
+        }
+
+        public bool IsEntityFoundOnThisSub(MapEntity entity, bool includingConnectedSubs)
+        {
+            if (entity.Submarine == this) { return true; }
+            if (entity.Submarine == null) { return false; }
+            if (includingConnectedSubs)
+            {
+                return GetConnectedSubs().Any(s => s == entity.Submarine && entity.Submarine.TeamID == TeamID);
+            }
+            return false;
+        }
+
         /// <summary>
         /// Finds the sub whose borders contain the position
         /// </summary>