Unstable 0.1300.0.7

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

@@ -419,7 +419,7 @@ namespace Barotrauma
                 int zone1 = GetZoneIndex(Connections[i].Locations[0].MapPosition.X);
                 int zone2 = GetZoneIndex(Connections[i].Locations[1].MapPosition.X);
                 if (zone1 == zone2) { continue; }
-                if (zone2 == generationParams.DifficultyZones) { continue; }
+                if (zone1 == generationParams.DifficultyZones || zone2 == generationParams.DifficultyZones) { continue; }
 
                 if (!connectionsBetweenZones.Contains(Connections[i]))
                 {
@@ -464,7 +464,10 @@ namespace Barotrauma
 
             foreach (Location location in Locations)
             {
-                location.LevelData = new LevelData(location);
+                location.LevelData = new LevelData(location)
+                {
+                    Difficulty = MathHelper.Clamp(location.MapPosition.X / Width * 100, 0.0f, 100.0f)
+                };
                 if (location.Type.MissionIdentifiers.Any())
                 {
                     location.UnlockMissionByIdentifier(location.Type.MissionIdentifiers.GetRandom());

Barotrauma/BarotraumaShared/SharedSource/Map/PriceInfo.cs

@@ -20,15 +20,20 @@ namespace Barotrauma
         /// Can the item be a Daily Special or a Requested Good
         /// </summary>
         public readonly bool CanBeSpecial;
+        /// <summary>
+        /// The item isn't available in stores unless the level's difficulty is above this value
+        /// </summary>
+        public readonly int MinLevelDifficulty;
 
         /// <summary>
         /// Support for the old style of determining item prices
         /// when there were individual Price elements for each location type
         /// where the item was for sale.
         /// </summary>
-        public PriceInfo (XElement element)
+        public PriceInfo(XElement element)
         {
             Price = element.GetAttributeInt("buyprice", 0);
+            MinLevelDifficulty = element.GetAttributeInt("minleveldifficulty", 0);
             CanBeBought = true;
             var minAmount = GetMinAmount(element);
             MinAvailableAmount = Math.Min(minAmount, CargoManager.MaxQuantity);
@@ -37,13 +42,14 @@ namespace Barotrauma
             MaxAvailableAmount = Math.Max(maxAmount, MinAvailableAmount);
         }
 
-        public PriceInfo(int price, bool canBeBought, int minAmount = 0, int maxAmount = 0, bool canBeSpecial = true)
+        public PriceInfo(int price, bool canBeBought, int minAmount = 0, int maxAmount = 0, bool canBeSpecial = true, int minLevelDifficulty = 0)
         {
             Price = price;
             CanBeBought = canBeBought;
             MinAvailableAmount = Math.Min(minAmount, CargoManager.MaxQuantity);
             maxAmount = Math.Min(maxAmount, CargoManager.MaxQuantity);
             MaxAvailableAmount = Math.Max(maxAmount, minAmount);
+            MinLevelDifficulty = minLevelDifficulty;
             CanBeSpecial = canBeSpecial;
         }
 
@@ -54,6 +60,7 @@ namespace Barotrauma
             var soldByDefault = element.GetAttributeBool("soldbydefault", true);
             var minAmount = GetMinAmount(element);
             var maxAmount = GetMaxAmount(element);
+            var minLevelDifficulty = element.GetAttributeInt("minleveldifficulty", 0);
             var canBeSpecial = element.GetAttributeBool("canbespecial", true);
             var priceInfos = new List<Tuple<string, PriceInfo>>();
 
@@ -65,14 +72,16 @@ namespace Barotrauma
                     new PriceInfo(price: (int)(priceMultiplier * basePrice), canBeBought: sold,
                         minAmount: sold ? GetMinAmount(childElement, minAmount) : 0,
                         maxAmount: sold ? GetMaxAmount(childElement, maxAmount) : 0,
-                        canBeSpecial: canBeSpecial)));
+                        canBeSpecial,
+                        childElement.GetAttributeInt("minleveldifficulty", minLevelDifficulty))));
             }
 
             var canBeBoughtAtOtherLocations = soldByDefault && element.GetAttributeBool("soldeverywhere", true);
             defaultPrice = new PriceInfo(basePrice, canBeBoughtAtOtherLocations,
                 minAmount: canBeBoughtAtOtherLocations ? minAmount : 0,
                 maxAmount: canBeBoughtAtOtherLocations ? maxAmount : 0,
-                canBeSpecial: canBeSpecial);
+                canBeSpecial, 
+                minLevelDifficulty);
             
             return priceInfos;
         }

Barotrauma/BarotraumaShared/SharedSource/Map/Structure.cs

@@ -819,16 +819,12 @@ namespace Barotrauma
                 }
                 for (int i = 1; i <= particleAmount; i++)
                 {
+                    var worldRect = section.WorldRect;
                     Vector2 particlePos = new Vector2(
-                        Rand.Range(section.rect.X, section.rect.Right),
-                        Rand.Range(section.rect.Y - section.rect.Height, section.rect.Y));
+                        Rand.Range(worldRect.X, worldRect.Right),
+                        Rand.Range(worldRect.Y - worldRect.Height, worldRect.Y));
 
-                    if (Submarine != null)
-                    {
-                        particlePos += Submarine.DrawPosition;
-                    }
-
-                    var particle = GameMain.ParticleManager.CreateParticle("shrapnel", particlePos, Rand.Vector(Rand.Range(1.0f, 50.0f)));
+                    var particle = GameMain.ParticleManager.CreateParticle("shrapnel", particlePos, Rand.Vector(Rand.Range(1.0f, 50.0f)), collisionIgnoreTimer: 1f);
                     if (particle == null) break;
                 }
             }