Faction Test 100.5.0.0

2022-11-18 18:32:04 +02:00
parent c772b61fc1
commit c44fb0ad3a
118 changed files with 1424 additions and 707 deletions
@@ -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;
        }
@@ -299,7 +299,7 @@ namespace Barotrauma
                }
            }
            //pets are friendly!
-            if (PetBehavior != null || Character.Params.Group == "human")
+            if (PetBehavior != null || Character.Group == "human")
            {
                Character.TeamID = CharacterTeamType.FriendlyNPC;
            }
@@ -1085,7 +1085,7 @@ namespace Barotrauma
                        State = AIState.Idle;
                        return;
                    }
-                    else
+                    else if (!owner.HasAbilityFlag(AbilityFlags.IgnoredByEnemyAI))
                    {
                        SelectedAiTarget = owner.AiTarget;
                    }
@@ -2247,8 +2247,11 @@ 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);
@@ -3922,6 +3925,7 @@ namespace Barotrauma
                        {
                            SelectTarget(door.Item.AiTarget, SelectedTargetMemory.Priority);
                            State = AIState.Attack;
+                            return false;
                        }
                    }
                }
@@ -3993,9 +3997,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)
            {
@@ -2019,7 +2019,7 @@ namespace Barotrauma
            bool friendlyTeam = IsOnFriendlyTeam(me, other);
            bool teamGood = sameTeam || friendlyTeam && !onlySameTeam;
            if (!teamGood) { return false; }
-            bool speciesGood = other.IsPet || other.SpeciesName == me.SpeciesName || other.Params.CompareGroup(me.Params.Group);
+            bool speciesGood = other.IsPet || other.SpeciesName == me.SpeciesName || CharacterParams.CompareGroup(me.Group, other.Group);
            if (!speciesGood) { return false; }
            if (me.TeamID == CharacterTeamType.FriendlyNPC && other.TeamID == CharacterTeamType.Team1 && GameMain.GameSession?.GameMode is CampaignMode campaign)
            {
@@ -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()