Unstable 1.8.4.0

2025-03-12 12:56:27 +00:00
parent a4c3e868e4
commit a4a3427e4e
627 changed files with 29860 additions and 10018 deletions
@@ -5,15 +5,17 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Xml.Linq;
+using Barotrauma.RuinGeneration;

 namespace Barotrauma
 {
    class LevelData
    {
+        [Flags]
        public enum LevelType
        {
-            LocationConnection,
-            Outpost
+            LocationConnection = 1,
+            Outpost = 2
        }

        public readonly LevelType Type;
@@ -47,6 +49,19 @@ namespace Barotrauma

        public SubmarineInfo ForceWreck;

+        public RuinGenerationParams ForceRuinGenerationParams;
+
+        public enum ThalamusSpawn
+        {
+            Random,
+            Forced,
+            Disabled
+        }
+        
+        public static SubmarineInfo ConsoleForceWreck;
+        public static SubmarineInfo ConsoleForceBeaconStation;
+        public static ThalamusSpawn ForceThalamus = ThalamusSpawn.Random;
+
        public bool AllowInvalidOutpost;

        public readonly Point Size;
@@ -73,10 +88,15 @@ namespace Barotrauma

        public readonly Dictionary<EventSet, int> FinishedEvents = new Dictionary<EventSet, int>();

+        /// <summary>
+        /// For backwards compatibility (previously "exhausting" one event set exhausted all of them (now we use <see cref="exhaustedEventSets"/> instead).
+        /// </summary>
+        private bool allEventsExhausted;
+
        /// <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; }
+        private HashSet<Identifier> exhaustedEventSets = new HashSet<Identifier>();

        /// <summary>
        /// The crush depth of a non-upgraded submarine in in-game coordinates. Note that this can be above the top of the level!
@@ -207,7 +227,9 @@ namespace Barotrauma
                }
            }

-            EventsExhausted = element.GetAttributeBool(nameof(EventsExhausted).ToLower(), false);
+            exhaustedEventSets = element.GetAttributeIdentifierArray(nameof(exhaustedEventSets), Array.Empty<Identifier>()).ToHashSet();
+            //backwards compatibility: previously we didn't track which individual event sets have been exhausted
+            allEventsExhausted = element.GetAttributeBool("EventsExhausted", false);
        }

        /// <summary>
@@ -216,10 +238,11 @@ namespace Barotrauma
        public LevelData(LocationConnection locationConnection)
        {
            Seed = locationConnection.Locations[0].LevelData.Seed + locationConnection.Locations[1].LevelData.Seed;
+            bool connectionIsBiomeTransition = locationConnection.Locations[0].Biome.Identifier != locationConnection.Locations[1].Biome.Identifier;
            Biome = locationConnection.Biome;
            Type = LevelType.LocationConnection;
            Difficulty = locationConnection.Difficulty;
-            GenerationParams = LevelGenerationParams.GetRandom(Seed, LevelType.LocationConnection, Difficulty, Biome.Identifier);
+            GenerationParams = LevelGenerationParams.GetRandom(Seed, LevelType.LocationConnection, Difficulty, Biome.Identifier, biomeTransition: connectionIsBiomeTransition);

            float sizeFactor = MathUtils.InverseLerp(
                MapGenerationParams.Instance.SmallLevelConnectionLength,
@@ -264,7 +287,7 @@ namespace Barotrauma
                (int)MathUtils.Round(GenerationParams.Height, Level.GridCellSize));
        }

-        public static LevelData CreateRandom(string seed = "", float? difficulty = null, LevelGenerationParams generationParams = null, bool requireOutpost = false)
+        public static LevelData CreateRandom(string seed = "", float? difficulty = null, LevelGenerationParams generationParams = null, Identifier biomeId = default, bool requireOutpost = false, bool pvpOnly = false)
        {
            if (string.IsNullOrEmpty(seed))
            {
@@ -273,14 +296,21 @@ namespace Barotrauma

            Rand.SetSyncedSeed(ToolBox.StringToInt(seed));

-            LevelType type = generationParams == null ?
-                (requireOutpost ? LevelType.Outpost : LevelType.LocationConnection) :
-                 generationParams.Type;
+            LevelType type = generationParams?.Type ??
+                             (requireOutpost
+                                      ? LevelType.Outpost
+                                      : LevelType.LocationConnection);

            float selectedDifficulty = difficulty ?? Rand.Range(30.0f, 80.0f, Rand.RandSync.ServerAndClient);

-            if (generationParams == null) { generationParams = LevelGenerationParams.GetRandom(seed, type, selectedDifficulty); }
-            var biome =
+            Biome biome = null;
+            if (!biomeId.IsEmpty && biomeId != "Random")
+            {
+                Biome.Prefabs.TryGet(biomeId, out biome);
+            }
+            generationParams ??= LevelGenerationParams.GetRandom(seed, type, selectedDifficulty, pvpOnly: pvpOnly, biomeId: biomeId);
+
+            biome ??=
                Biome.Prefabs.FirstOrDefault(b => generationParams?.AllowedBiomeIdentifiers.Contains(b.Identifier) ?? false) ??
                Biome.Prefabs.GetRandom(Rand.RandSync.ServerAndClient);

@@ -306,6 +336,32 @@ namespace Barotrauma
            return levelData;
        }

+        /// <summary>
+        /// Marks the event set as "exhausted". Exhausted 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 void ExhaustEventSet(EventSet eventSet)
+        {
+            exhaustedEventSets.Add(eventSet.Identifier);
+        }
+
+        /// <summary>
+        /// Has the event set been "exhausted"? Exhausted 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 IsEventSetExhausted(EventSet eventSet)
+        {
+            if (allEventsExhausted) { return true; }
+            return exhaustedEventSets.Contains(eventSet.Identifier);
+        }
+
+        /// <summary>
+        /// Resets all "exhausted" event sets, allowing them to appear in the level again.
+        /// </summary>
+        public void ResetExhaustedEventSets()
+        {
+            allEventsExhausted = false;
+            exhaustedEventSets.Clear();
+        }
+
        public void ReassignGenerationParams(string seed)
        {
            GenerationParams = LevelGenerationParams.GetRandom(seed, Type, Difficulty, Biome.Identifier);
@@ -341,7 +397,10 @@ namespace Barotrauma
                    new XAttribute("size", XMLExtensions.PointToString(Size)),
                    new XAttribute("generationparams", GenerationParams.Identifier),
                    new XAttribute("initialdepth", InitialDepth),
-                    new XAttribute(nameof(EventsExhausted).ToLower(), EventsExhausted));
+                    new XAttribute("exhaustedeventsets", allEventsExhausted));
+
+            newElement.Add(
+                new XAttribute(nameof(exhaustedEventSets), string.Join(',', exhaustedEventSets.Select(e => e.Value))));

            if (HasBeaconStation)
            {