(a2943d8b7) Merge branch 'dev' into human-ai

Barotrauma/BarotraumaServer/Source/GameSession/GameModes/MultiPlayerCampaign.cs

@@ -168,6 +168,8 @@ namespace Barotrauma
             msg.Write(isRunning && endWatchman != null ? endWatchman.ID : (UInt16)0);
 
             msg.Write(Money);
+            msg.Write(PurchasedHullRepairs);
+            msg.Write(PurchasedItemRepairs);
 
             msg.Write((UInt16)CargoManager.PurchasedItems.Count);
             foreach (PurchasedItem pi in CargoManager.PurchasedItems)
@@ -192,6 +194,8 @@ namespace Barotrauma
         {
             UInt16 selectedLocIndex = msg.ReadUInt16();
             byte selectedMissionIndex = msg.ReadByte();
+            bool purchasedHullRepairs = msg.ReadBoolean();
+            bool purchasedItemRepairs = msg.ReadBoolean();
             UInt16 purchasedItemCount = msg.ReadUInt16();
 
             List<PurchasedItem> purchasedItems = new List<PurchasedItem>();
@@ -208,6 +212,17 @@ namespace Barotrauma
                 return;
             }
 
+            if (purchasedHullRepairs && !this.PurchasedHullRepairs && Money >= HullRepairCost)
+            {
+                this.PurchasedHullRepairs = true;
+                Money -= HullRepairCost;
+            }
+            if (purchasedItemRepairs && !this.PurchasedItemRepairs && Money >= ItemRepairCost)
+            {
+                this.PurchasedItemRepairs = true;
+                Money -= ItemRepairCost;
+            }
+
             Map.SelectLocation(selectedLocIndex == UInt16.MaxValue ? -1 : selectedLocIndex);
             if (Map.SelectedConnection != null)
             {