Unstable 0.17.6.0

Barotrauma/BarotraumaClient/ClientSource/GameSession/CrewManager.cs

@@ -55,15 +55,17 @@ namespace Barotrauma
             {
                 if (_isCrewMenuOpen == value) { return; }
                 _isCrewMenuOpen = value;
-                #warning TODO: update GameSettings.CurrentConfig.CrewMenuOpen when round ends
+                PreferCrewMenuOpen = value;
             }
         }
 
+        public static bool PreferCrewMenuOpen = true;
+
         public bool AutoShowCrewList() => _isCrewMenuOpen = true;
 
         public void AutoHideCrewList() => _isCrewMenuOpen = false;
 
-        public void ResetCrewList() => _isCrewMenuOpen = GameSettings.CurrentConfig.CrewMenuOpen;
+        public void ResetCrewList() => _isCrewMenuOpen = PreferCrewMenuOpen;
 
         const float CommandNodeAnimDuration = 0.2f;
 
@@ -217,7 +219,7 @@ namespace Barotrauma
 
             screenResolution = new Point(GameMain.GraphicsWidth, GameMain.GraphicsHeight);
             prevUIScale = GUI.Scale;
-            _isCrewMenuOpen = GameSettings.CurrentConfig.CrewMenuOpen;
+            _isCrewMenuOpen = PreferCrewMenuOpen = GameSettings.CurrentConfig.CrewMenuOpen;
         }
 
         public static void CreateReportButtons(CrewManager crewManager, GUIComponent parent, IReadOnlyList<OrderPrefab> reports, bool isHorizontal)

Barotrauma/BarotraumaClient/ClientSource/GameSession/GameModes/MultiPlayerCampaign.cs

@@ -592,6 +592,13 @@ namespace Barotrauma
                 selectedMissionIndices.Add(msg.ReadByte());
             }
 
+            ushort ownedSubCount = msg.ReadUInt16();
+            List<ushort> ownedSubIndices = new List<ushort>();
+            for (int i = 0; i < ownedSubCount; i++)
+            {
+                ownedSubIndices.Add(msg.ReadUInt16());
+            }
+
             bool allowDebugTeleport = msg.ReadBoolean();
             float? reputation = null;
             if (msg.ReadBoolean()) { reputation = msg.ReadSingle(); }
@@ -697,6 +704,17 @@ namespace Barotrauma
                     campaign.Map.SetLocation(currentLocIndex == UInt16.MaxValue ? -1 : currentLocIndex);
                     campaign.Map.SelectLocation(selectedLocIndex == UInt16.MaxValue ? -1 : selectedLocIndex);
                     campaign.Map.SelectMission(selectedMissionIndices);
+
+                    GameMain.GameSession.OwnedSubmarines.Clear();
+                    foreach (int ownedSubIndex in ownedSubIndices)
+                    {
+                        SubmarineInfo sub = GameMain.Client.ServerSubmarines[ownedSubIndex];
+                        if (GameMain.NetLobbyScreen.CheckIfCampaignSubMatches(sub, NetLobbyScreen.SubmarineDeliveryData.Owned))
+                        {
+                            GameMain.GameSession.OwnedSubmarines.Add(sub);
+                        }
+                    }
+
                     campaign.Map.AllowDebugTeleport = allowDebugTeleport;
                     campaign.CargoManager.SetItemsInBuyCrate(buyCrateItems);
                     campaign.CargoManager.SetItemsInSubSellCrate(subSellCrateItems);