Release v0.15.12.0

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

@@ -60,7 +60,7 @@ namespace Barotrauma
 
         private LocationType addInitialMissionsForType;
 
-        public bool Discovered;
+        public bool Discovered { get; private set; }
 
         public readonly Dictionary<LocationTypeChange.Requirement, int> ProximityTimer = new Dictionary<LocationTypeChange.Requirement, int>();
         public (LocationTypeChange typeChange, int delay, MissionPrefab parentMission)? PendingLocationTypeChange;
@@ -90,7 +90,7 @@ namespace Barotrauma
 
         private const float StoreMaxReputationModifier = 0.1f;
         private const float StoreSellPriceModifier = 0.8f;
-        private const float DailySpecialPriceModifier = 0.9f;
+        private const float DailySpecialPriceModifier = 0.5f;
         private const float RequestGoodPriceModifier = 1.5f;
         public const int StoreInitialBalance = 5000;
         /// <summary>
@@ -868,6 +868,8 @@ namespace Barotrauma
             // Adjust by random price modifier
             price = ((100 + StorePriceModifier) / 100.0f) * price;
 
+            price *= priceInfo.BuyingPriceMultiplier;
+
             // Adjust by daily special status
             if (considerDailySpecials && DailySpecials.Contains(item))
             {
@@ -1004,12 +1006,22 @@ namespace Barotrauma
             stockToRemove.ForEach(i => stock.Remove(i));
             StoreStock = stock;
 
-            if (++StepsSinceSpecialsUpdated >= SpecialsUpdateInterval)
+            int extraSpecialSalesCount = GetExtraSpecialSalesCount();
+
+            if (++StepsSinceSpecialsUpdated >= SpecialsUpdateInterval || 
+                DailySpecials.Count() != DailySpecialsCount + extraSpecialSalesCount)
             {
                 CreateStoreSpecials();
             }
         }
 
+        private int GetExtraSpecialSalesCount()
+        {
+            var characters = GameSession.GetSessionCrewCharacters();
+            if (!characters.Any()) { return 0; }
+            return characters.Max(c => (int)c.GetStatValue(StatTypes.ExtraSpecialSalesCount));
+        }
+
         private void GenerateRandomPriceModifier()
         {
             StorePriceModifier = Rand.Range(-StorePriceModifierRange, StorePriceModifierRange);
@@ -1033,7 +1045,9 @@ namespace Barotrauma
                 }
                 availableStock.Add(stockItem.ItemPrefab, weight);
             }
-            for (int i = 0; i < DailySpecialsCount; i++)
+
+            int extraSpecialSalesCount = GetExtraSpecialSalesCount();
+            for (int i = 0; i < DailySpecialsCount + extraSpecialSalesCount; i++)
             {
                 if (availableStock.None()) { break; }
                 var item = ToolBox.SelectWeightedRandom(availableStock.Keys.ToList(), availableStock.Values.ToList(), Rand.RandSync.Unsynced);
@@ -1111,6 +1125,30 @@ namespace Barotrauma
             return nextStatus;
         }
 
+        public void Discover(bool checkTalents = true)
+        {
+            if (Discovered) { return; }
+            Discovered = true;
+            if (checkTalents)
+            {
+                GameSession.GetSessionCrewCharacters().ForEach(c => c.CheckTalents(AbilityEffectType.OnLocationDiscovered, new Abilities.AbilityLocation(this)));
+            }
+        }
+
+        public void Reset()
+        {
+            if (Type != OriginalType)
+            {
+                ChangeType(OriginalType);
+                PendingLocationTypeChange = null;
+            }
+            CreateStore(force: true);
+            ClearMissions();
+            LevelData?.EventHistory?.Clear();
+            UnlockInitialMissions();
+            Discovered = false;
+        }
+
         public XElement Save(Map map, XElement parentElement)
         {
             var locationElement = new XElement("location",