Unstable v0.1300.0.0 (February 19th 2021)

Barotrauma/BarotraumaShared/SharedSource/Events/Missions/NestMission.cs

@@ -20,7 +20,9 @@ namespace Barotrauma
 
         private readonly float itemSpawnRadius = 800.0f;
         private readonly float approachItemsRadius = 1000.0f;
+        private readonly float nestObjectRadius = 1000.0f;
         private readonly float monsterSpawnRadius = 3000.0f;
+        private readonly int nestObjectAmount = 10;
 
         private readonly bool requireDelivery;
 
@@ -33,7 +35,14 @@ namespace Barotrauma
         {
             get
             {
-                yield return nestPosition;                
+                if (State > 0)
+                {
+                    Enumerable.Empty<Vector2>();
+                }
+                else
+                {
+                    yield return nestPosition;
+                }
             }
         }
 
@@ -46,6 +55,9 @@ namespace Barotrauma
             approachItemsRadius = prefab.ConfigElement.GetAttributeFloat("approachitemsradius", itemSpawnRadius * 2.0f);
             monsterSpawnRadius = prefab.ConfigElement.GetAttributeFloat("monsterspawnradius", approachItemsRadius * 2.0f);
 
+            nestObjectRadius = prefab.ConfigElement.GetAttributeFloat("nestobjectradius", itemSpawnRadius * 2.0f);
+            nestObjectAmount = prefab.ConfigElement.GetAttributeInt("nestobjectamount", 10);
+
             requireDelivery = prefab.ConfigElement.GetAttributeBool("requiredelivery", false);
 
             string spawnPositionTypeStr = prefab.ConfigElement.GetAttributeString("spawntype", "");
@@ -55,7 +67,6 @@ namespace Barotrauma
                 spawnPositionType = Level.PositionType.Cave | Level.PositionType.Ruin;
             }
 
-
             foreach (var monsterElement in prefab.ConfigElement.GetChildElements("monster"))
             {
                 string speciesName = monsterElement.GetAttributeString("character", string.Empty);
@@ -79,8 +90,18 @@ namespace Barotrauma
 
         }
 
-        public override void Start(Level level)
+        protected override void StartMissionSpecific(Level level)
         {
+            if (items.Any())
+            {
+#if DEBUG
+                throw new Exception($"items.Count > 0 ({items.Count})");
+#else
+                DebugConsole.AddWarning("Item list was not empty at the start of a nest mission. The mission instance may not have been ended correctly on previous rounds.");
+                items.Clear();
+#endif
+            }
+
             if (!IsClient)
             {
                 //ruin/cave/wreck items are allowed to spawn close to the sub
@@ -90,6 +111,25 @@ namespace Barotrauma
                 List<GraphEdge> spawnEdges = new List<GraphEdge>();
                 if (spawnPositionType == Level.PositionType.Cave)
                 {
+                    Level.Cave closestCave = null;
+                    float closestCaveDist = float.PositiveInfinity;
+                    foreach (var cave in Level.Loaded.Caves)
+                    {
+                        float dist = Vector2.DistanceSquared(nestPosition, cave.Area.Center.ToVector2());
+                        if (dist < closestCaveDist)
+                        {
+                            closestCave = cave;
+                            closestCaveDist = dist;
+                        }
+                    }
+                    if (closestCave != null)
+                    {
+                        closestCave.DisplayOnSonar = true;
+                        SpawnNestObjects(level, closestCave);
+#if SERVER
+                        selectedCave = closestCave;
+#endif
+                    }
                     var nearbyCells = Level.Loaded.GetCells(nestPosition, searchDepth: 3);
                     if (nearbyCells.Any())
                     {
@@ -171,6 +211,11 @@ namespace Barotrauma
             }
         }
 
+        private void SpawnNestObjects(Level level, Level.Cave cave)
+        {
+            level.LevelObjectManager.PlaceNestObjects(level, cave, nestPosition, nestObjectRadius, nestObjectAmount);
+        }
+
         public override void Update(float deltaTime)
         {
             if (IsClient)
@@ -258,9 +303,17 @@ namespace Barotrauma
 
         public override void End()
         {
-            if (!AllItemsDestroyedOrRetrieved()) 
+            if (AllItemsDestroyedOrRetrieved())
             {
-                return;
+                GiveReward();
+                completed = true;
+                if (completed)
+                {
+                    if (Prefab.LocationTypeChangeOnCompleted != null)
+                    {
+                        ChangeLocationType(Prefab.LocationTypeChangeOnCompleted);
+                    }
+                }
             }
             foreach (Item item in items)
             {
@@ -270,8 +323,6 @@ namespace Barotrauma
                 }
             }
             items.Clear();
-            GiveReward();
-            completed = true;
             failed = !completed && state > 0;
         }
     }