0.15.21.0

2021-12-16 01:05:43 +09:00
parent 617d9ede88
commit 7d43cb1e91
74 changed files with 487 additions and 541 deletions
@@ -149,12 +149,12 @@ namespace Barotrauma
            }
            MTRandom rand = new MTRandom(seed);

-            EventSet initialEventSet = SelectRandomEvents(EventSet.List, rand);
+            EventSet initialEventSet = SelectRandomEvents(EventSet.List, requireCampaignSet: GameMain.GameSession?.GameMode is CampaignMode, rand);
            EventSet additiveSet = null;
            if (initialEventSet != null && initialEventSet.Additive)
            {
                additiveSet = initialEventSet;
-                initialEventSet = SelectRandomEvents(EventSet.List.FindAll(e => !e.Additive), rand);
+                initialEventSet = SelectRandomEvents(EventSet.List.FindAll(e => !e.Additive), requireCampaignSet: GameMain.GameSession?.GameMode is CampaignMode, rand);
            }
            if (initialEventSet != null)
            {
@@ -418,6 +418,11 @@ namespace Barotrauma
            pathFinder = null;
        }

+        public void SkipEventCooldown()
+        {
+            eventCoolDown = 0.0f;
+        }
+
        private float CalculateCommonness(EventPrefab eventPrefab, float baseCommonness)
        {
            if (level.LevelData.NonRepeatableEvents.Contains(eventPrefab)) { return 0.0f; }
@@ -500,7 +505,7 @@ namespace Barotrauma
                    }
                    if (eventSet.ChildSets.Count > 0)
                    {
-                        var newEventSet = SelectRandomEvents(eventSet.ChildSets, rand);
+                        var newEventSet = SelectRandomEvents(eventSet.ChildSets, random: rand);
                        if (newEventSet != null)
                        {
                            CreateEvents(newEventSet, rand);
@@ -535,18 +540,38 @@ namespace Barotrauma
            }
        }

-        private EventSet SelectRandomEvents(List<EventSet> eventSets, Random random = null)
+        private EventSet SelectRandomEvents(List<EventSet> eventSets, bool? requireCampaignSet = null, Random random = null)
        {
            if (level == null) { return null; }
            Random rand = random ?? new MTRandom(ToolBox.StringToInt(level.Seed));

            var allowedEventSets = 
                eventSets.Where(es => 
-                    es.IsCampaignSet == GameMain.GameSession?.GameMode is CampaignMode &&
                    level.Difficulty >= es.MinLevelDifficulty && level.Difficulty <= es.MaxLevelDifficulty && 
                    level.LevelData.Type == es.LevelType && 
                    (string.IsNullOrEmpty(es.BiomeIdentifier) || es.BiomeIdentifier.Equals(level.LevelData.Biome.Identifier, StringComparison.OrdinalIgnoreCase)));

+            if (requireCampaignSet.HasValue)
+            {
+                if (requireCampaignSet.Value)
+                {
+                    if (allowedEventSets.Any(es => es.IsCampaignSet))
+                    {
+                        allowedEventSets =
+                            allowedEventSets.Where(es => es.IsCampaignSet);
+                    }
+                    else
+                    {
+                        DebugConsole.AddWarning("No campaign event sets available. Using a non-campaign-specific set instead.");
+                    }
+                }
+                else
+                {
+                    allowedEventSets =
+                        allowedEventSets.Where(es => !es.IsCampaignSet);
+                }
+            }
+
            Location location = (GameMain.GameSession?.GameMode as CampaignMode)?.Map?.CurrentLocation ?? level?.StartLocation;
            LocationType locationType = location?.GetLocationType();
            
@@ -196,7 +196,7 @@ namespace Barotrauma
            DelayWhenCrewAway = element.GetAttributeBool("delaywhencrewaway", !PerRuin && !PerCave && !PerWreck);
            OncePerOutpost = element.GetAttributeBool("onceperoutpost", false);
            TriggerEventCooldown = element.GetAttributeBool("triggereventcooldown", true);
-            IsCampaignSet = element.GetAttributeBool("campaign", LevelType == LevelData.LevelType.Outpost);
+            IsCampaignSet = element.GetAttributeBool("campaign", LevelType == LevelData.LevelType.Outpost || (parentSet?.IsCampaignSet ?? false));

            Commonness[""] = element.GetAttributeFloat("commonness", 1.0f);
            foreach (XElement subElement in element.Elements())
@@ -42,15 +42,15 @@ namespace Barotrauma
        {
            if (maxAmount <= 1)
            {
-                return "MonsterEvent (" + speciesName + ")";
+                return $"MonsterEvent ({speciesName}, {SpawnPosType})";
            }
            else if (minAmount < maxAmount)
            {
-                return "MonsterEvent (" + speciesName + " x" + minAmount + "-" + maxAmount + ")";
+                return $"MonsterEvent ({speciesName} x{minAmount}-{maxAmount}, {SpawnPosType})";
            }
            else
            {
-                return "MonsterEvent (" + speciesName + " x" + maxAmount + ")";
+                return $"MonsterEvent ({speciesName} x{maxAmount}, {SpawnPosType})";
            }
        }