Unstable v0.19.1.0

Barotrauma/BarotraumaShared/SharedSource/GameSession/GameModes/CampaignMode.cs

@@ -133,6 +133,8 @@ namespace Barotrauma
             protected set;
         }
 
+        public bool PurchasedLostShuttlesInLatestSave, PurchasedHullRepairsInLatestSave, PurchasedItemRepairsInLatestSave;
+
         public virtual bool PurchasedHullRepairs { get; set; }
         public virtual bool PurchasedLostShuttles { get; set; }
         public virtual bool PurchasedItemRepairs { get; set; }
@@ -228,7 +230,8 @@ namespace Barotrauma
 #if CLIENT
             prevCampaignUIAutoOpenType = TransitionType.None;
 #endif
-            if (PurchasedHullRepairs)
+
+            if (PurchasedHullRepairsInLatestSave)
             {
                 foreach (Structure wall in Structure.WallList)
                 {
@@ -241,9 +244,9 @@ namespace Barotrauma
                         }
                     }
                 }
-                PurchasedHullRepairs = false;
+                PurchasedHullRepairsInLatestSave = PurchasedHullRepairs = false;
             }
-            if (PurchasedItemRepairs)
+            if (PurchasedItemRepairsInLatestSave)
             {
                 foreach (Item item in Item.ItemList)
                 {
@@ -256,9 +259,9 @@ namespace Barotrauma
                         }
                     }
                 }
-                PurchasedItemRepairs = false;
+                PurchasedItemRepairsInLatestSave = PurchasedItemRepairs = false;
             }
-            PurchasedLostShuttles = false;
+            PurchasedLostShuttlesInLatestSave = PurchasedLostShuttles = false;
             var connectedSubs = Submarine.MainSub.GetConnectedSubs();
             wasDocked = Level.Loaded.StartOutpost != null && connectedSubs.Contains(Level.Loaded.StartOutpost);
         }
@@ -725,7 +728,7 @@ namespace Barotrauma
             }
             foreach (LocationConnection connection in Map.Connections)
             {
-                connection.Difficulty = connection.Biome.MaxDifficulty;
+                connection.Difficulty = connection.Biome.AdjustedMaxDifficulty;
                 connection.LevelData = new LevelData(connection)
                 {
                     IsBeaconActive = false
@@ -734,7 +737,7 @@ namespace Barotrauma
             }
             foreach (Location location in Map.Locations)
             {
-                location.LevelData = new LevelData(location, location.Biome.MaxDifficulty);
+                location.LevelData = new LevelData(location, location.Biome.AdjustedMaxDifficulty);
                 location.Reset();
             }
             Map.SetLocation(Map.Locations.IndexOf(Map.StartLocation));

Barotrauma/BarotraumaShared/SharedSource/GameSession/GameModes/CharacterCampaignData.cs

@@ -1,27 +1,16 @@
 using System.Xml.Linq;
+using Barotrauma.Networking;
 
 namespace Barotrauma
 {
     partial class CharacterCampaignData
     {
-        public CharacterInfo CharacterInfo
-        {
-            get;
-            private set;
-        }
+        public readonly CharacterInfo CharacterInfo;
 
         public readonly string Name;
 
-        public string ClientEndPoint
-        {
-            get;
-            private set;
-        }
-        public ulong SteamID
-        {
-            get;
-            private set;
-        }
+        public readonly Address ClientAddress;
+        public readonly Option<AccountId> AccountId;
 
         private XElement itemData;
         private XElement healthData;

Barotrauma/BarotraumaShared/SharedSource/GameSession/GameModes/MultiPlayerCampaign.cs

@@ -151,9 +151,9 @@ namespace Barotrauma
         /// </summary>
         private void Load(XElement element)
         {
-            PurchasedLostShuttles = element.GetAttributeBool("purchasedlostshuttles", false);
-            PurchasedHullRepairs = element.GetAttributeBool("purchasedhullrepairs", false);
-            PurchasedItemRepairs = element.GetAttributeBool("purchaseditemrepairs", false);
+            PurchasedLostShuttlesInLatestSave = element.GetAttributeBool("purchasedlostshuttles", false);
+            PurchasedHullRepairsInLatestSave = element.GetAttributeBool("purchasedhullrepairs", false);
+            PurchasedItemRepairsInLatestSave = element.GetAttributeBool("purchaseditemrepairs", false);
             CheatsEnabled = element.GetAttributeBool("cheatsenabled", false);
             if (CheatsEnabled)
             {