v0.11.0.9

Barotrauma/BarotraumaShared/SharedSource/Events/EventActions/SkillCheckAction.cs

@@ -13,6 +13,9 @@ namespace Barotrauma
         [Serialize(0.0f, true)]
         public float RequiredLevel { get; set; }
 
+        [Serialize(true, true)]
+        public bool ProbabilityBased { get; set; }
+
         [Serialize("", true)]
         public string TargetTag { get; set; }
 
@@ -27,7 +30,15 @@ namespace Barotrauma
         protected override bool? DetermineSuccess()
         {
             var potentialTargets = ParentEvent.GetTargets(TargetTag).Where(e => e is Character).Select(e => e as Character);
-            return potentialTargets.Any(chr => chr.GetSkillLevel(RequiredSkill?.ToLowerInvariant()) >= RequiredLevel);
+
+            if (ProbabilityBased)
+            {
+                return potentialTargets.Any(chr => chr.GetSkillLevel(RequiredSkill?.ToLowerInvariant()) / RequiredLevel > Rand.Range(0.0f, 1.0f, Rand.RandSync.Unsynced));
+            }
+            else
+            {
+                return potentialTargets.Any(chr => chr.GetSkillLevel(RequiredSkill?.ToLowerInvariant()) >= RequiredLevel);
+            }
         }
 
         public override string ToDebugString()

Barotrauma/BarotraumaShared/SharedSource/Events/EventActions/SpawnAction.cs

@@ -68,6 +68,9 @@ namespace Barotrauma
             }
         }
 
+        [Serialize(false, true, description: "Should the AI ignore this item. This will prevent outpost NPCs cleaning up or otherwise using important items intended to be left for the players.")]
+        public bool IgnoreByAI { get; set; }
+
         private bool spawned;
         private Entity spawnedEntity;
 
@@ -123,7 +126,7 @@ namespace Barotrauma
                         var idleObjective = humanAI.ObjectiveManager.GetObjective<AIObjectiveIdle>();
                         if (idleObjective != null)
                         {
-                            idleObjective.Behavior = humanPrefab.BehaviorType;
+                            idleObjective.Behavior = humanPrefab.Behavior;
                             foreach (string moduleType in humanPrefab.PreferredOutpostModuleTypes)
                             {
                                 idleObjective.PreferredOutpostModuleTypes.Add(moduleType); 
@@ -202,6 +205,7 @@ namespace Barotrauma
                             ParentEvent.AddTarget(TargetTag, newItem);
                         }
                         spawnedEntity = newItem;
+                        newItem?.SetIgnoreByAI(IgnoreByAI);
                     }
                 }
             }

Barotrauma/BarotraumaShared/SharedSource/Events/EventActions/TagAction.cs

@@ -12,6 +12,9 @@ namespace Barotrauma
         [Serialize("", true)]
         public string Tag { get; set; }
 
+        [Serialize(true, true)]
+        public bool IgnoreIncapacitatedCharacters { get; set; }
+
         private bool isFinished = false;
 
         public TagAction(ScriptedEvent parentEvent, XElement element) : base(parentEvent, element) { }
@@ -27,12 +30,26 @@ namespace Barotrauma
 
         private void TagPlayers()
         {
-            ParentEvent.AddTargetPredicate(Tag, e => e is Character c && c.IsPlayer);
+            if (IgnoreIncapacitatedCharacters)
+            {
+                ParentEvent.AddTargetPredicate(Tag, e => e is Character c && c.IsPlayer && !c.IsIncapacitated);
+            }
+            else
+            {
+                ParentEvent.AddTargetPredicate(Tag, e => e is Character c && c.IsPlayer);
+            }
         }
 
         private void TagBots()
         {
-            ParentEvent.AddTargetPredicate(Tag, e => e is Character c && c.IsBot);
+            if (IgnoreIncapacitatedCharacters)
+            {
+                ParentEvent.AddTargetPredicate(Tag, e => e is Character c && c.IsBot && !c.IsIncapacitated);
+            }
+            else
+            {
+                ParentEvent.AddTargetPredicate(Tag, e => e is Character c && c.IsBot);
+            }
         }
 
         private void TagCrew()

Barotrauma/BarotraumaShared/SharedSource/Events/EventActions/TriggerEventAction.cs

@@ -33,7 +33,11 @@ namespace Barotrauma
                 }
                 else
                 {
-                    GameMain.GameSession.EventManager.QueuedEvents.Enqueue(eventPrefab.CreateInstance());
+                    var ev = eventPrefab.CreateInstance();
+                    if (ev != null)
+                    {
+                        GameMain.GameSession.EventManager.QueuedEvents.Enqueue(ev);
+                    }
                 }
             }