v0.19.0.0 (unstable)

Barotrauma/BarotraumaShared/SharedSource/GameSession/CargoManager.cs

@@ -302,6 +302,10 @@ namespace Barotrauma
             var itemsInStoreCrate = GetBuyCrateItems(storeIdentifier, create: true);
             foreach (PurchasedItem item in itemsToPurchase)
             {
+                // Exchange money
+                int itemValue = item.Quantity * buyValues[item.ItemPrefab];
+                if (!campaign.TryPurchase(client, itemValue)) { continue; }
+
                 // Add to the purchased items
                 var purchasedItem = itemsPurchasedFromStore.Find(pi => pi.ItemPrefab == item.ItemPrefab);
                 if (purchasedItem != null)
@@ -313,9 +317,6 @@ namespace Barotrauma
                     purchasedItem = new PurchasedItem(item.ItemPrefab, item.Quantity, client);
                     itemsPurchasedFromStore.Add(purchasedItem);
                 }
-                // Exchange money
-                int itemValue = item.Quantity * buyValues[item.ItemPrefab];
-                campaign.TryPurchase(client, itemValue);
                 if (GameMain.IsSingleplayer)
                 {
                     GameAnalyticsManager.AddMoneySpentEvent(itemValue, GameAnalyticsManager.MoneySink.Store, item.ItemPrefab.Identifier.Value);

Barotrauma/BarotraumaShared/SharedSource/GameSession/Data/CampaignMetadata.cs

@@ -96,20 +96,17 @@ namespace Barotrauma
         private object GetTypeOrDefault(Identifier identifier, Type type, object defaultValue)
         {
             object? value = GetValue(identifier);
-
-            if (value == null)
+            if (value != null)
             {
-                SetValue(identifier, defaultValue);
+                if (value.GetType() == type)
+                {
+                    return value;
+                }
+                else
+                {
+                    DebugConsole.ThrowError($"Attempted to get value \"{identifier}\" as a {type} but the value is {value.GetType()}.");
+                }
             }
-            else if (value.GetType() == type)
-            {
-                return value;
-            }
-            else
-            {
-                DebugConsole.ThrowError($"Attempted to get value \"{identifier}\" as a {type} but the value is {value.GetType()}.");
-            }
-
             return defaultValue;
         }
 

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

@@ -34,7 +34,7 @@ namespace Barotrauma
         public double TotalPlayTime;
         public int TotalPassedLevels;
 
-        public enum InteractionType { None, Talk, Examine, Map, Crew, Store, Repair, Upgrade, PurchaseSub, MedicalClinic, Cargo }
+        public enum InteractionType { None, Talk, Examine, Map, Crew, Store, Upgrade, PurchaseSub, MedicalClinic, Cargo }
 
         public static bool BlocksInteraction(InteractionType interactionType)
         {
@@ -85,7 +85,9 @@ namespace Barotrauma
 
         public bool CheatsEnabled;
 
-        public const int HullRepairCost = 500, ItemRepairCost = 500, ShuttleReplaceCost = 1000;
+        public const float HullRepairCostPerDamage = 0.5f, ItemRepairCostPerRepairDuration = 1.0f;
+        public const int ShuttleReplaceCost = 1000;
+        public const int MaxHullRepairCost = 2000, MaxItemRepairCost = 2000;
 
         protected bool wasDocked;
 
@@ -152,8 +154,9 @@ namespace Barotrauma
             {
                 if (!(e.ChangedData.BalanceChanged is Some<int> { Value: var changed })) { return; }
 
-                bool isGain = changed > 0;
+                if (changed != 0) { return; }
 
+                bool isGain = changed > 0;
                 Color clr = isGain ? GUIStyle.Yellow : GUIStyle.Red;
 
                 switch (e.Owner)
@@ -260,6 +263,39 @@ namespace Barotrauma
             wasDocked = Level.Loaded.StartOutpost != null && connectedSubs.Contains(Level.Loaded.StartOutpost);
         }
 
+        public int GetHullRepairCost()
+        {
+            float totalDamage = 0;
+            foreach (Structure wall in Structure.WallList)
+            {
+                if (wall.Submarine == null || wall.Submarine.Info.Type != SubmarineType.Player) { continue; }
+                if (wall.Submarine == Submarine.MainSub || Submarine.MainSub.DockedTo.Contains(wall.Submarine))
+                {
+                    for (int i = 0; i < wall.SectionCount; i++)
+                    {
+                        totalDamage += wall.SectionDamage(i);
+                    }
+                }
+            }
+            return (int)Math.Min(totalDamage * HullRepairCostPerDamage, MaxHullRepairCost);
+        }
+
+        public int GetItemRepairCost()
+        {
+            float totalRepairDuration = 0.0f;
+            foreach (Item item in Item.ItemList)
+            {
+                if (item.Submarine == null || item.Submarine.Info.Type != SubmarineType.Player) { continue; }
+                if (item.Submarine == Submarine.MainSub || Submarine.MainSub.DockedTo.Contains(item.Submarine))
+                {
+                    var repairable = item.GetComponent<Repairable>();
+                    if (repairable == null) { continue; }
+                    totalRepairDuration += repairable.FixDurationHighSkill * (1.0f - item.Condition / item.MaxCondition);
+                }
+            }
+            return (int)Math.Min(totalRepairDuration * ItemRepairCostPerRepairDuration, MaxItemRepairCost);
+        }
+
         public void InitCampaignData()
         {
             Factions = new List<Faction>();

Barotrauma/BarotraumaShared/SharedSource/GameSession/GameSession.cs

@@ -864,7 +864,7 @@ namespace Barotrauma
                 double roundDuration = Timing.TotalTime - RoundStartTime;
                 GameAnalyticsManager.AddProgressionEvent(
                     success ? GameAnalyticsManager.ProgressionStatus.Complete : GameAnalyticsManager.ProgressionStatus.Fail,
-                    GameMode?.Name?.Value ?? "none",
+                    GameMode?.Preset.Identifier.Value ?? "none",
                     roundDuration);
                 string eventId = "EndRound:" + (GameMode?.Preset?.Identifier.Value ?? "none") + ":";
                 LogEndRoundStats(eventId);

Barotrauma/BarotraumaShared/SharedSource/GameSession/UpgradeManager.cs

@@ -60,16 +60,6 @@ namespace Barotrauma
         /// </summary>
         public const bool UpgradeAlsoConnectedSubs = true;
 
-        /// <summary>
-        /// Prevents the player from upgrading the submarine when we are switching to a new one.
-        /// </summary>
-        /// <remarks>
-        /// In singleplayer we check if CampaignMode.PendingSubmarineSwitch is not null indicating we are switching submarines
-        /// but in multiplayer that value is not synced so we use this variable instead by setting it to false in <see cref="UpgradeManager.ClientRead"/> 
-        /// and then set it back to true when the round ends in <see cref="MultiPlayerCampaign.End"/>
-        /// </remarks>
-        public bool CanUpgrade = true;
-
         /// <summary>
         /// This is used by the client in multiplayer, acts like a secondary PendingUpgrades list
         /// but is not affected by server messages.
@@ -713,9 +703,9 @@ namespace Barotrauma
 
         public bool CanUpgradeSub()
         {
-            if (GameMain.NetworkMember != null && GameMain.NetworkMember.IsClient) { return CanUpgrade; }
-
-            return Campaign.PendingSubmarineSwitch == null;
+            return 
+                Campaign.PendingSubmarineSwitch == null || 
+                Campaign.PendingSubmarineSwitch.Name == Submarine.MainSub.Info.Name;
         }
 
         public void Save(XElement? parent)