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

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);