Unstable v0.1300.0.2

Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveCombat.cs

@@ -30,6 +30,7 @@ namespace Barotrauma
         private float holdFireTimer;
         private bool hasAimed;
         private bool isLethalWeapon;
+        private bool AllowCoolDown => !IsOffensiveOrArrest || Mode != initialMode;
 
         public Character Enemy { get; private set; }
         public bool HoldPosition { get; set; }
@@ -195,17 +196,12 @@ namespace Barotrauma
 
         protected override bool Check()
         {
-            if (IsOffensiveOrArrest && Mode != initialMode)
-            {
-                Abandon = true;
-                return false;
-            }
             if (sqrDistance > maxDistance * maxDistance)
             {
                 // The target escaped from us.
                 return true;
             }
-            return IsEnemyDisabled || (!IsOffensiveOrArrest && coolDownTimer <= 0);
+            return IsEnemyDisabled || (AllowCoolDown && coolDownTimer <= 0);
         }
 
         protected override void Act(float deltaTime)
@@ -215,7 +211,7 @@ namespace Barotrauma
                 Abandon = true;
                 return;
             }
-            if (!IsOffensiveOrArrest)
+            if (AllowCoolDown)
             {
                 coolDownTimer -= deltaTime;
             }

Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveRescueAll.cs

@@ -82,7 +82,11 @@ namespace Barotrauma
             if (!HumanAIController.IsFriendly(character, target, onlySameTeam: true)) { return false; }
             if (character.AIController is HumanAIController humanAI)
             {
-                if (GetVitalityFactor(target) >= GetVitalityThreshold(humanAI.ObjectiveManager, character, target)) { return false; }
+                if (GetVitalityFactor(target) >= GetVitalityThreshold(humanAI.ObjectiveManager, character, target) ||
+                    target.CharacterHealth.GetAllAfflictions().All(a => a.Strength < a.Prefab.TreatmentThreshold)) 
+                {
+                    return false; 
+                }
                 if (!humanAI.ObjectiveManager.HasOrder<AIObjectiveRescueAll>())
                 {
                     if (!character.IsMedic && target != character)