Build 0.21.6.0

2023-01-31 18:01:29 +02:00
parent 697ec52120
commit 25fa5a9552
145 changed files with 2317 additions and 1145 deletions
@@ -18,9 +18,9 @@ namespace Barotrauma

        public const ushort ReservedIDStart = ushort.MaxValue - 3;

-        public const ushort MaxEntityCount = ushort.MaxValue - 2; //ushort.MaxValue - 2 because 0 and ushort.MaxValue are reserved values
+        public const ushort MaxEntityCount = ushort.MaxValue - 4; //ushort.MaxValue - 4 because the 4 values above are reserved values

-        private static Dictionary<ushort, Entity> dictionary = new Dictionary<ushort, Entity>();
+        private static readonly Dictionary<ushort, Entity> dictionary = new Dictionary<ushort, Entity>();
        public static IReadOnlyCollection<Entity> GetEntities()
        {
            return dictionary.Values;
@@ -85,6 +85,28 @@ namespace Barotrauma
            this.Submarine = submarine;
            spawnTime = Timing.TotalTime;

+            if (dictionary.Count >= MaxEntityCount)
+            {
+                Dictionary<Identifier, int> entityCounts = new Dictionary<Identifier, int>();
+                foreach (var entity in dictionary)
+                {
+                    if (entity.Value is MapEntity me)
+                    {
+                        if (entityCounts.ContainsKey(me.Prefab.Identifier))
+                        {
+                            entityCounts[me.Prefab.Identifier]++;
+                        }
+                        else
+                        {
+                            entityCounts[me.Prefab.Identifier] = 1;
+                        }
+                    }
+                }
+                string errorMsg = $"Maximum amount of entities ({MaxEntityCount}) exceeded! Largest numbers of entities: " +
+                  string.Join(", ", entityCounts.OrderByDescending(kvp => kvp.Value).Take(10).Select(kvp => $"{kvp.Key}: {kvp.Value}"));
+                throw new Exception(errorMsg);
+            }
+
            //give a unique ID
            ID = DetermineID(id, submarine);

@@ -50,6 +50,12 @@ namespace Barotrauma
            Description = TextManager.Get($"EntityDescription.{Identifier}");
            Tags = Enumerable.Empty<Identifier>().ToImmutableHashSet();

+            string description = element.GetAttributeString("description", string.Empty);
+            if (!description.IsNullOrEmpty())
+            {
+                Description = Description.Fallback(description);
+            }
+
            List<ushort> containedItemIDs = new List<ushort>();
            foreach (XElement entityElement in element.Elements())
            {
@@ -112,10 +112,9 @@ namespace Barotrauma
                (int)MathUtils.Round(generationParams.Height, Level.GridCellSize));
        }

-        public LevelData(XElement element, float? forceDifficulty = null)
+        public LevelData(XElement element, float? forceDifficulty = null, bool clampDifficultyToBiome = false)
        {
            Seed = element.GetAttributeString("seed", "");
-            Difficulty = forceDifficulty ?? element.GetAttributeFloat("difficulty", 0.0f);
            Size = element.GetAttributePoint("size", new Point(1000));
            Enum.TryParse(element.GetAttributeString("type", "LocationConnection"), out Type);

@@ -131,10 +130,7 @@ namespace Barotrauma
            {
                DebugConsole.ThrowError($"Error while loading a level. Could not find level generation params with the ID \"{generationParamsId}\".");
                GenerationParams = LevelGenerationParams.LevelParams.FirstOrDefault(l => l.Type == Type);
-                if (GenerationParams == null)
-                {
-                    GenerationParams = LevelGenerationParams.LevelParams.First();
-                }
+                GenerationParams ??= LevelGenerationParams.LevelParams.First();
            }

            InitialDepth = element.GetAttributeInt("initialdepth", GenerationParams.InitialDepthMin);
@@ -147,10 +143,16 @@ namespace Barotrauma
                Biome = Biome.Prefabs.First();
            }

-            string[] prefabNames = element.GetAttributeStringArray("eventhistory", new string[] { });
+            Difficulty = forceDifficulty ?? element.GetAttributeFloat("difficulty", 0.0f);
+            if (clampDifficultyToBiome)
+            {
+                Difficulty = MathHelper.Clamp(Difficulty, Biome.MinDifficulty, Biome.AdjustedMaxDifficulty);
+            }
+
+            string[] prefabNames = element.GetAttributeStringArray("eventhistory", Array.Empty<string>());
            EventHistory.AddRange(EventPrefab.Prefabs.Where(p => prefabNames.Any(n => p.Identifier == n)));

-            string[] nonRepeatablePrefabNames = element.GetAttributeStringArray("nonrepeatableevents", new string[] { });
+            string[] nonRepeatablePrefabNames = element.GetAttributeStringArray("nonrepeatableevents", Array.Empty<string>());
            NonRepeatableEvents.AddRange(EventPrefab.Prefabs.Where(p => nonRepeatablePrefabNames.Any(n => p.Identifier == n)));

            EventsExhausted = element.GetAttributeBool(nameof(EventsExhausted).ToLower(), false);
@@ -559,12 +559,9 @@ namespace Barotrauma
            killedCharacterIdentifiers = element.GetAttributeIntArray("killedcharacters", Array.Empty<int>()).ToHashSet();

            System.Diagnostics.Debug.Assert(Type != null, $"Could not find the location type \"{locationTypeId}\"!");
-            if (Type == null)
-            {
-                Type = LocationType.Prefabs.First();
-            }
+            Type ??= LocationType.Prefabs.First();

-            LevelData = new LevelData(element.Element("Level"));
+            LevelData = new LevelData(element.Element("Level"), clampDifficultyToBiome: true);

            PortraitId = ToolBox.StringToInt(Name);

@@ -531,11 +531,15 @@ namespace Barotrauma
        /// <summary>
        /// Calculated from <see cref="SubmarineElement"/>. Can be used when the sub hasn't been loaded and we can't access <see cref="Submarine.RealWorldCrushDepth"/>.
        /// </summary>
-        public float GetRealWorldCrushDepth()
+        public bool IsCrushDepthDefinedInStructures(out float realWorldCrushDepth)
        {
-            if (SubmarineElement == null) { return Level.DefaultRealWorldCrushDepth; }
+            if (SubmarineElement == null)
+            {
+                realWorldCrushDepth = Level.DefaultRealWorldCrushDepth;
+                return false;
+            }
            bool structureCrushDepthsDefined = false;
-            float realWorldCrushDepth = float.PositiveInfinity;
+            realWorldCrushDepth = float.PositiveInfinity;
            foreach (var structureElement in SubmarineElement.GetChildElements("structure"))
            {
                string name = structureElement.Attribute("name")?.Value ?? "";
@@ -553,7 +557,7 @@ namespace Barotrauma
            {
                realWorldCrushDepth = Level.DefaultRealWorldCrushDepth;
            }
-            return realWorldCrushDepth;
+            return structureCrushDepthsDefined;
        }

        //saving/loading ----------------------------------------------------