Unstable 0.1400.7.0 (Coronavirus edition)

Barotrauma/BarotraumaShared/SharedSource/Map/Map/Location.cs

@@ -192,6 +192,7 @@ namespace Barotrauma
             if (!SelectedMissions.Contains(mission) && mission != null)
             {
                 selectedMissions.Add(mission);
+                selectedMissions.Sort((m1, m2) => availableMissions.IndexOf(m1).CompareTo(availableMissions.IndexOf(m2)));
             }
         }
 
@@ -461,6 +462,18 @@ namespace Barotrauma
             CreateStore(force: true);
         }
 
+        public void UnlockInitialMissions()
+        {
+            if (Type.MissionIdentifiers.Any())
+            {
+                UnlockMissionByIdentifier(Type.MissionIdentifiers.GetRandom(Rand.RandSync.Server));
+            }
+            if (Type.MissionTags.Any())
+            {
+                UnlockMissionByTag(Type.MissionTags.GetRandom(Rand.RandSync.Server));
+            }
+        }
+
         public void UnlockMission(MissionPrefab missionPrefab, LocationConnection connection)
         {
             if (AvailableMissions.Any(m => m.Prefab == missionPrefab)) { return; }

Barotrauma/BarotraumaShared/SharedSource/Map/Map/Map.cs

@@ -484,14 +484,7 @@ namespace Barotrauma
                 {
                     Difficulty = MathHelper.Clamp(location.MapPosition.X / Width * 100, 0.0f, 100.0f)
                 };
-                if (location.Type.MissionIdentifiers.Any())
-                {
-                    location.UnlockMissionByIdentifier(location.Type.MissionIdentifiers.GetRandom());
-                }
-                if (location.Type.MissionTags.Any())
-                {
-                    location.UnlockMissionByTag(location.Type.MissionTags.GetRandom());
-                }
+                location.UnlockInitialMissions();
             }
             foreach (LocationConnection connection in Connections) 
             {