Build 0.20.7.0

Barotrauma/BarotraumaShared/SharedSource/Map/Levels/Level.cs

@@ -3943,31 +3943,11 @@ namespace Barotrauma
                 Submarine outpost = null;
                 if (i == 0 && preSelectedStartOutpost == null || i == 1 && preSelectedEndOutpost == null)
                 {
-                    if (OutpostGenerationParams.OutpostParams.Any() || LevelData.ForceOutpostGenerationParams != null)
+                    if (LevelData.OutpostGenerationParamsExist)
                     {
                         Location location = i == 0 ? StartLocation : EndLocation;
-
-                        OutpostGenerationParams outpostGenerationParams = null;
-                        if (LevelData.ForceOutpostGenerationParams != null)
-                        {
-                            outpostGenerationParams = LevelData.ForceOutpostGenerationParams;
-                        }
-                        else
-                        {
-                            var suitableParams = OutpostGenerationParams.OutpostParams.Where(p => location == null || p.AllowedLocationTypes.Contains(location.Type.Identifier));
-                            if (!suitableParams.Any())
-                            {
-                                suitableParams = OutpostGenerationParams.OutpostParams.Where(p => location == null || !p.AllowedLocationTypes.Any());
-                                if (!suitableParams.Any())
-                                {
-                                    DebugConsole.ThrowError($"No suitable outpost generation parameters found for the location type \"{location.Type.Identifier}\". Selecting random parameters.");
-                                    suitableParams = OutpostGenerationParams.OutpostParams;
-                                }
-                            }
-
-                            outpostGenerationParams = suitableParams.GetRandom(Rand.RandSync.ServerAndClient);
-                        }
-
+                        OutpostGenerationParams outpostGenerationParams = LevelData.ForceOutpostGenerationParams ??
+                            LevelData.GetSuitableOutpostGenerationParams(location).GetRandom(Rand.RandSync.ServerAndClient);
                         LocationType locationType = location?.Type;
                         if (locationType == null)
                         {

Barotrauma/BarotraumaShared/SharedSource/Map/Levels/LevelData.cs

@@ -57,10 +57,19 @@ namespace Barotrauma
         /// </summary>
         public int? MinMainPathWidth;
 
+        /// <summary>
+        /// Events that have previously triggered in this level. Used for making events the player hasn't seen yet more likely to trigger when re-entering the level. Has a maximum size of <see cref="EventManager.MaxEventHistory"/>.
+        /// </summary>
         public readonly List<EventPrefab> EventHistory = new List<EventPrefab>();
-        public readonly List<EventPrefab> NonRepeatableEvents = new List<EventPrefab>();
-        public readonly HashSet<Identifier> UsedUniqueSets = new HashSet<Identifier>();
 
+        /// <summary>
+        /// Events that have already triggered in this level and can never trigger again. <see cref="EventSet.OncePerLevel"/>.
+        /// </summary>
+        public readonly List<EventPrefab> NonRepeatableEvents = new List<EventPrefab>();
+
+        /// <summary>
+        /// 'Exhaustible' sets won't appear in the same level until after one world step (~10 min, see Map.ProgressWorld) has passed. <see cref="EventSet.Exhaustible"/>.
+        /// </summary>
         public bool EventsExhausted { get; set; }
 
         /// <summary>
@@ -144,8 +153,6 @@ namespace Barotrauma
             string[] nonRepeatablePrefabNames = element.GetAttributeStringArray("nonrepeatableevents", new string[] { });
             NonRepeatableEvents.AddRange(EventPrefab.Prefabs.Where(p => nonRepeatablePrefabNames.Any(n => p.Identifier == n)));
 
-            UsedUniqueSets = element.GetAttributeIdentifierArray(nameof(UsedUniqueSets), Array.Empty<Identifier>()).ToHashSet();
-
             EventsExhausted = element.GetAttributeBool(nameof(EventsExhausted).ToLower(), false);
         }
 
@@ -245,6 +252,23 @@ namespace Barotrauma
             return levelData;
         }
 
+        public bool OutpostGenerationParamsExist => ForceOutpostGenerationParams != null || OutpostGenerationParams.OutpostParams.Any();
+
+        public static IEnumerable<OutpostGenerationParams> GetSuitableOutpostGenerationParams(Location location)
+        {
+            var suitableParams = OutpostGenerationParams.OutpostParams.Where(p => location == null || p.AllowedLocationTypes.Contains(location.Type.Identifier));
+            if (!suitableParams.Any())
+            {
+                suitableParams = OutpostGenerationParams.OutpostParams.Where(p => location == null || !p.AllowedLocationTypes.Any());
+                if (!suitableParams.Any())
+                {
+                    DebugConsole.ThrowError($"No suitable outpost generation parameters found for the location type \"{location.Type.Identifier}\". Selecting random parameters.");
+                    suitableParams = OutpostGenerationParams.OutpostParams;
+                }
+            }
+            return suitableParams;
+        }
+
         public void Save(XElement parentElement)
         {
             var newElement = new XElement("Level",
@@ -287,11 +311,6 @@ namespace Barotrauma
                 }
             }
 
-            if (UsedUniqueSets.Any())
-            {
-                newElement.Add(new XAttribute(nameof(UsedUniqueSets), string.Join(',', UsedUniqueSets)));
-            }
-
             parentElement.Add(newElement);
         }
     }

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

@@ -1291,19 +1291,32 @@ namespace Barotrauma
             return characters.Sum(c => (int)c.GetStatValue(StatTypes.ExtraSpecialSalesCount));
         }
 
-        public int HighestSubmarineTierAvailable(SubmarineClass submarineClass)
+        public bool CanHaveSubsForSale()
         {
-            if (!HasOutpost()) { return 0; }
-            return Biome?.HighestSubmarineTierAvailable(submarineClass, Type.Identifier) ?? SubmarineInfo.HighestTier;
+            return HasOutpost() && CanHaveCampaignInteraction(CampaignMode.InteractionType.PurchaseSub);
         }
 
-        public int HighestSubmarineTierAvailable() => HighestSubmarineTierAvailable(SubmarineClass.Undefined);
+        public int HighestSubmarineTierAvailable(SubmarineClass submarineClass = SubmarineClass.Undefined)
+        {
+            if (CanHaveSubsForSale())
+            {
+                return Biome?.HighestSubmarineTierAvailable(submarineClass, Type.Identifier) ?? SubmarineInfo.HighestTier;
+            }
+            return 0;
+        }
 
         public bool IsSubmarineAvailable(SubmarineInfo info)
         {
             return Biome?.IsSubmarineAvailable(info, Type.Identifier) ?? true;
         }
 
+        private  bool CanHaveCampaignInteraction(CampaignMode.InteractionType interactionType)
+        {
+            return LevelData != null &&
+                LevelData.OutpostGenerationParamsExist &&
+                LevelData.GetSuitableOutpostGenerationParams(this).Any(p => p.CanHaveCampaignInteraction(interactionType));
+        }
+
         public void Reset()
         {
             if (Type != OriginalType)

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

@@ -85,9 +85,9 @@ namespace Barotrauma
         }
 
         public float StoreMaxReputationModifier { get; } = 0.1f;
-        public float StoreSellPriceModifier { get; } = 0.8f;
+        public float StoreSellPriceModifier { get; } = 0.3f;
         public float DailySpecialPriceModifier { get; } = 0.5f;
-        public float RequestGoodPriceModifier { get; } = 1.5f;
+        public float RequestGoodPriceModifier { get; } = 2f;
         public int StoreInitialBalance { get; } = 5000;
         /// <summary>
         /// In percentages

Barotrauma/BarotraumaShared/SharedSource/Map/Outposts/OutpostGenerationParams.cs

@@ -260,6 +260,21 @@ namespace Barotrauma
             return humanPrefabCollections.GetRandom(randSync);
         }
 
+        public bool CanHaveCampaignInteraction(CampaignMode.InteractionType interactionType)
+        {
+            foreach (var collection in humanPrefabCollections)
+            {
+                foreach (var prefab in collection)
+                {
+                    if (prefab.CampaignInteractionType == interactionType)
+                    {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+
         public ImmutableHashSet<Identifier> GetStoreIdentifiers()
         {
             if (StoreIdentifiers == null)