Build 0.20.7.0

Barotrauma/BarotraumaShared/SharedSource/Characters/AI/AITarget.cs

@@ -102,6 +102,8 @@ namespace Barotrauma
 
         private bool inDetectable;
 
+        public double InDetectableSetTime;
+
         /// <summary>
         /// Should be reset to false each frame and kept indetectable by e.g. a status effect.
         /// </summary>
@@ -115,7 +117,8 @@ namespace Barotrauma
             { 
                 inDetectable = value;
                 if (inDetectable) 
-                { 
+                {
+                    InDetectableSetTime = Timing.TotalTime;
                     NeedsUpdate = true; 
                 }
             }
@@ -257,9 +260,14 @@ namespace Barotrauma
             SightRange -= speed * deltaTime * (MaxSightRange / FadeOutTime);
         }
 
+        public bool HasSector()
+        {
+            return sectorRad < MathHelper.TwoPi;
+        }
+
         public bool IsWithinSector(Vector2 worldPosition)
         {
-            if (sectorRad >= MathHelper.TwoPi) { return true; }
+            if (!HasSector()) { return true; }
             Vector2 diff = worldPosition - WorldPosition;
             return Math.Abs(MathUtils.GetShortestAngle(MathUtils.VectorToAngle(diff), MathUtils.VectorToAngle(sectorDir))) <= sectorRad * 0.5f;
         }

Barotrauma/BarotraumaShared/SharedSource/Characters/AI/EnemyAIController.cs

@@ -1083,7 +1083,7 @@ namespace Barotrauma
                         State = AIState.Idle;
                         return;
                     }
-                    else
+                    else if (!owner.HasAbilityFlag(AbilityFlags.IgnoredByEnemyAI))
                     {
                         SelectedAiTarget = owner.AiTarget;
                     }
@@ -2147,7 +2147,6 @@ namespace Barotrauma
             if (SelectedAiTarget?.Entity == null) { return false; }
             if (AttackLimb?.attack == null) { return false; }
             if (damageTarget == null) { return false; }
-            ActiveAttack = AttackLimb.attack;
             if (wallTarget != null)
             {
                 // If the selected target is not the wall target, make the wall target the selected target.
@@ -2156,9 +2155,10 @@ namespace Barotrauma
                 {
                     SelectTarget(aiTarget, GetTargetMemory(SelectedAiTarget, addIfNotFound: true).Priority);
                     State = AIState.Attack;
+                    return true;
                 }
             }
-            if (damageTarget == null) { return false; }
+            ActiveAttack = AttackLimb.attack;
             if (ActiveAttack.Ranged && ActiveAttack.RequiredAngleToShoot > 0)
             {
                 Limb referenceLimb = GetLimbToRotate(ActiveAttack);
@@ -3810,6 +3810,7 @@ namespace Barotrauma
                         {
                             SelectTarget(door.Item.AiTarget, SelectedTargetMemory.Priority);
                             State = AIState.Attack;
+                            return false;
                         }
                     }
                 }
@@ -3881,9 +3882,8 @@ namespace Barotrauma
             return targetLimb;
         }
 
-        private Character GetOwner(Item item)
+        private static Character GetOwner(Item item)
         {
-            // If the item is held by a character, attack the character instead.
             var pickable = item.GetComponent<Pickable>();
             if (pickable != null)
             {

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

@@ -413,28 +413,10 @@ namespace Barotrauma
                 }
             }
         }
-
+         
         private void ApplyTreatment(Affliction affliction, Item item)
         {
-            var targetLimb = targetCharacter.CharacterHealth.GetAfflictionLimb(affliction);
-            bool remove = false;
-            foreach (ItemComponent ic in item.Components)
-            {
-                if (!ic.HasRequiredContainedItems(user: character, addMessage: false)) { continue; }
-#if CLIENT
-                ic.PlaySound(ActionType.OnUse, character);
-#endif
-                ic.WasUsed = true;
-                ic.ApplyStatusEffects(ActionType.OnUse, 1.0f, targetCharacter, targetLimb, user: character);
-                if (ic.DeleteOnUse)
-                {
-                    remove = true;
-                }
-            }
-            if (remove)
-            {
-                Entity.Spawner?.AddItemToRemoveQueue(item);
-            }
+            item.ApplyTreatment(character, targetCharacter, targetCharacter.CharacterHealth.GetAfflictionLimb(affliction));
         }
 
         protected override bool CheckObjectiveSpecific()