Unstable 0.1400.2.0 (a mimir edition)

2021-05-28 19:04:09 +03:00
parent 5bc850cddb
commit 0b3fb5e440
126 changed files with 1623 additions and 787 deletions
@@ -20,7 +20,7 @@ namespace Barotrauma
        {
            if (battery == null) { return false; }
            var item = battery.Item;
-            if (item.IgnoreByAI) { return false; }
+            if (item.IgnoreByAI(character)) { return false; }
            if (!item.IsInteractable(character)) { return false; }
            if (item.Submarine == null) { return false; }
            if (item.CurrentHull == null) { return false; }
@@ -61,7 +61,7 @@ namespace Barotrauma

        protected override void Act(float deltaTime)
        {
-            if (item.IgnoreByAI)
+            if (item.IgnoreByAI(character))
            {
                Abandon = true;
                return;
@@ -82,16 +82,17 @@ namespace Barotrauma

        public static bool IsValidContainer(Item container, Character character, bool allowUnloading = true) =>
            allowUnloading &&
-            !container.IgnoreByAI && 
+            !container.IgnoreByAI(character) && 
            container.IsInteractable(character) && 
            container.HasTag("allowcleanup") && 
            container.ParentInventory == null && container.OwnInventory != null && container.OwnInventory.AllItems.Any() && 
+            container.GetComponent<ItemContainer>() is ItemContainer itemContainer && itemContainer.HasAccess(character) &&
            IsItemInsideValidSubmarine(container, character);

        public static bool IsValidTarget(Item item, Character character, bool checkInventory, bool allowUnloading = true)
        {
            if (item == null) { return false; }
-            if (item.IgnoreByAI) { return false; }
+            if (item.IgnoreByAI(character)) { return false; }
            if (!item.IsInteractable(character)) { return false; }
            if (item.SpawnedInOutpost) { return false; }
            if (item.ParentInventory != null)
@@ -64,7 +64,7 @@ namespace Barotrauma
        protected override bool CheckObjectiveSpecific()
        {
            if (IsCompleted) { return true; }
-            if (container == null || (container.Item != null && container.Item.IsThisOrAnyContainerIgnoredByAI()))
+            if (container == null || (container.Item != null && container.Item.IsThisOrAnyContainerIgnoredByAI(character)))
            {
                Abandon = true;
                return false;
@@ -87,11 +87,11 @@ namespace Barotrauma
            }
        }

-        private bool CheckItem(Item i) => itemIdentifiers.Any(id => i.Prefab.Identifier == id || i.HasTag(id)) && i.ConditionPercentage >= ConditionLevel && !i.IsThisOrAnyContainerIgnoredByAI();
+        private bool CheckItem(Item i) => itemIdentifiers.Any(id => i.Prefab.Identifier == id || i.HasTag(id)) && i.ConditionPercentage >= ConditionLevel && !i.IsThisOrAnyContainerIgnoredByAI(character);

        protected override void Act(float deltaTime)
        {
-            if (container?.Item == null || container.Item.Removed || container.Item.IsThisOrAnyContainerIgnoredByAI())
+            if (container?.Item == null || container.Item.Removed || container.Item.IsThisOrAnyContainerIgnoredByAI(character))
            {
                Abandon = true;
                return;
@@ -147,7 +147,7 @@ namespace Barotrauma
                        DialogueIdentifier = "dialogcannotreachtarget",
                        TargetName = container.Item.Name,
                        AbortCondition = obj =>
-                            container?.Item == null || container.Item.Removed || container.Item.IsThisOrAnyContainerIgnoredByAI() ||
+                            container?.Item == null || container.Item.Removed || container.Item.IsThisOrAnyContainerIgnoredByAI(character) ||
                            ItemToContain == null || ItemToContain.Removed ||
                            !ItemToContain.IsOwnedBy(character) || container.Item.GetRootInventoryOwner() is Character c && c != character,
                        SpeakIfFails = !objectiveManager.IsCurrentOrder<AIObjectiveCleanupItems>()
@@ -63,13 +63,16 @@ namespace Barotrauma

        protected override void Act(float deltaTime)
        {
-            Item itemToDecontain = targetItem ?? sourceContainer.Inventory.FindItem(i => itemIdentifiers.Any(id => i.Prefab.Identifier == id || i.HasTag(id) && !i.IgnoreByAI), recursive: false);
+            Item itemToDecontain = 
+                targetItem ?? 
+                sourceContainer.Inventory.FindItem(i => itemIdentifiers.Any(id => i.Prefab.Identifier == id || i.HasTag(id) && !i.IgnoreByAI(character)), recursive: false);
+
            if (itemToDecontain == null)
            {
                Abandon = true;
                return;
            }
-            if (itemToDecontain.IgnoreByAI)
+            if (itemToDecontain.IgnoreByAI(character))
            {
                Abandon = true;
                return;
@@ -38,10 +38,13 @@ namespace Barotrauma
                Priority = 0;
                Abandon = true;
            }
-            else if (HumanAIController.IsTrueForAnyCrewMember(other => other != HumanAIController && other.Character.IsBot && other.ObjectiveManager.GetActiveObjective<AIObjectiveFixLeak>()?.Leak == Leak))
+            else if (HumanAIController.IsTrueForAnyCrewMember(
+                other => other != HumanAIController && 
+                other.Character.IsBot &&
+                other.ObjectiveManager.GetActiveObjective<AIObjectiveFixLeaks>() is AIObjectiveFixLeaks fixLeaks &&
+                fixLeaks.SubObjectives.Any(so => so is AIObjectiveFixLeak fixObjective && fixObjective.Leak == Leak)))
            {
                Priority = 0;
-                Abandon = true;
            }
            else
            {
@@ -74,7 +74,7 @@ namespace Barotrauma
            // Don't fix a leak on a wall section set to be ignored
            if (gap.ConnectedWall != null)
            {
-                if (gap.ConnectedWall.Sections.Any(s => s.gap == gap && s.IgnoreByAI)) { return false; } 
+                if (gap.ConnectedWall.Sections.Any(s => s.gap == gap && s.IgnoreByAI(character))) { return false; } 
                if (gap.ConnectedWall.MaxHealth <= 0.0f) { return false; }
            }
            if (gap.ConnectedWall == null || gap.ConnectedDoor != null || gap.Open <= 0 || gap.linkedTo.All(l => l == null)) { return false; }
@@ -305,6 +305,7 @@ namespace Barotrauma
                if (rootInventoryOwner is Item ownerItem)
                {
                    if (!ownerItem.IsInteractable(character)) { continue; }
+                    if (!(ownerItem.GetComponent<ItemContainer>()?.HasRequiredItems(character, addMessage: false) ?? true)) { continue; }
                }
                Vector2 itemPos = (rootInventoryOwner ?? item).WorldPosition;
                float yDist = Math.Abs(character.WorldPosition.Y - itemPos.Y);
@@ -403,7 +404,7 @@ namespace Barotrauma
        private bool CheckItem(Item item)
        {
            if (!item.IsInteractable(character)) { return false; }
-            if (item.IsThisOrAnyContainerIgnoredByAI()) { return false; }
+            if (item.IsThisOrAnyContainerIgnoredByAI(character)) { return false; }
            if (ignoredItems.Contains(item)) { return false; };
            if (item.Condition < TargetCondition) { return false; }
            if (ItemFilter != null && !ItemFilter(item)) { return false; }
@@ -118,7 +118,7 @@ namespace Barotrauma
                    targetItem.CurrentHull.FireSources.Any() ||
                    HumanAIController.IsItemOperatedByAnother(target, out _) ||
                    Character.CharacterList.Any(c => c.CurrentHull == targetItem.CurrentHull && !HumanAIController.IsFriendly(c) && HumanAIController.IsActive(c))
-                    || component.Item.IgnoreByAI || (useController && controller.Item.IgnoreByAI))
+                    || component.Item.IgnoreByAI(character) || useController && controller.Item.IgnoreByAI(character))
                {
                    Priority = 0;
                }
@@ -27,7 +27,7 @@ namespace Barotrauma
        protected override bool Filter(Pump pump)
        {
            if (pump == null) { return false; }
-            if (pump.Item.IgnoreByAI) { return false; }
+            if (pump.Item.IgnoreByAI(character)) { return false; }
            if (!pump.Item.IsInteractable(character)) { return false; }
            if (pump.Item.HasTag("ballast")) { return false; }
            if (pump.Item.Submarine == null) { return false; }
@@ -34,7 +34,7 @@ namespace Barotrauma

        protected override float GetPriority()
        {
-            if (!IsAllowed || Item.IgnoreByAI)
+            if (!IsAllowed || Item.IgnoreByAI(character))
            {
                Priority = 0;
                Abandon = true;
@@ -44,10 +44,10 @@ namespace Barotrauma
                }
                return Priority;
            }
-            // Ignore items that are being repaired by someone else.
-            if (Item.Repairables.Any(r => r.CurrentFixer != null && r.CurrentFixer != character))
+            if (HumanAIController.IsItemRepairedByAnother(Item, out _))
            {
                Priority = 0;
+                IsCompleted = true;
            }
            else
            {
@@ -16,7 +16,7 @@ namespace Barotrauma
        /// </summary>
        public string RelevantSkill;

-        private readonly Item prioritizedItem;
+        public Item PrioritizedItem { get; private set; }

        public override bool AllowMultipleInstances => true;
        public override bool AllowInAnySub => true;
@@ -28,7 +28,7 @@ namespace Barotrauma
        public AIObjectiveRepairItems(Character character, AIObjectiveManager objectiveManager, float priorityModifier = 1, Item prioritizedItem = null)
            : base(character, objectiveManager, priorityModifier)
        {
-            this.prioritizedItem = prioritizedItem;
+            PrioritizedItem = prioritizedItem;
        }

        protected override void CreateObjectives()
@@ -76,7 +76,7 @@ namespace Barotrauma
            {
                if (item.Repairables.None(r => r.requiredSkills.Any(s => s.Identifier.Equals(RelevantSkill, StringComparison.OrdinalIgnoreCase)))) { return false; }
            }
-            return true;
+            return !HumanAIController.IsItemRepairedByAnother(item, out _);
        }

        public static bool ViableForRepair(Item item, Character character, HumanAIController humanAIController)
@@ -139,7 +139,7 @@ namespace Barotrauma
        protected override IEnumerable<Item> GetList() => Item.ItemList;

        protected override AIObjective ObjectiveConstructor(Item item) 
-            => new AIObjectiveRepairItem(character, item, objectiveManager, priorityModifier: PriorityModifier, isPriority: item == prioritizedItem);
+            => new AIObjectiveRepairItem(character, item, objectiveManager, priorityModifier: PriorityModifier, isPriority: item == PrioritizedItem);

        protected override void OnObjectiveCompleted(AIObjective objective, Item target)
            => HumanAIController.RemoveTargets<AIObjectiveRepairItems, Item>(character, target);
@@ -147,7 +147,7 @@ namespace Barotrauma
        public static bool IsValidTarget(Item item, Character character)
        {
            if (item == null) { return false; }
-            if (item.IgnoreByAI) { return false; }
+            if (item.IgnoreByAI(character)) { return false; }
            if (!item.IsInteractable(character)) { return false; }
            if (item.IsFullCondition) { return false; }
            if (item.CurrentHull == null) { return false; }