v1.5.7.0 (Summer Update)

Barotrauma/BarotraumaShared/SharedSource/Events/EventSet.cs

@@ -106,6 +106,11 @@ namespace Barotrauma
         /// </summary>
         public readonly LevelData.LevelType LevelType;
 
+        /// <summary>
+        /// If set, this layer must be present somewhere in the level.
+        /// </summary>
+        public readonly Identifier RequiredLayer;
+
         /// <summary>
         /// If set, the event set can only be chosen in locations of this type.
         /// </summary>
@@ -368,7 +373,7 @@ namespace Barotrauma
             ChooseRandom = element.GetAttributeBool("chooserandom", false);
             eventCount = element.GetAttributeInt("eventcount", 1);
             SubSetCount = element.GetAttributeInt("setcount", 1);
-            Exhaustible = element.GetAttributeBool("exhaustible", false);
+            Exhaustible = element.GetAttributeBool("exhaustible", parentSet?.Exhaustible ?? false);
             MinDistanceTraveled = element.GetAttributeFloat("mindistancetraveled", 0.0f);
             MinMissionTime = element.GetAttributeFloat("minmissiontime", 0.0f);
 
@@ -386,6 +391,8 @@ namespace Barotrauma
             ResetTime = element.GetAttributeFloat(nameof(ResetTime), parentSet?.ResetTime ?? 0);
             CampaignTutorialOnly = element.GetAttributeBool(nameof(CampaignTutorialOnly), parentSet?.CampaignTutorialOnly ?? false);
 
+            RequiredLayer = element.GetAttributeIdentifier(nameof(RequiredLayer), Identifier.Empty);
+
             ForceAtDiscoveredNr = element.GetAttributeInt(nameof(ForceAtDiscoveredNr), -1);
             ForceAtVisitedNr = element.GetAttributeInt(nameof(ForceAtVisitedNr), -1);
             if (ForceAtDiscoveredNr >= 0 && ForceAtVisitedNr >= 0)