Unstable 0.1300.0.10

2021-04-16 15:51:16 +03:00
parent f48dfb5862
commit 245b48c3a3
29 changed files with 289 additions and 84 deletions
@@ -267,7 +267,7 @@ namespace Barotrauma

        public void UnequipEmptyItems(Item parentItem, bool avoidDroppingInSea = true) => UnequipEmptyItems(Character, parentItem, avoidDroppingInSea);

-        public void UnequipContainedItems(Item parentItem, Func<Item, bool> predicate, bool avoidDroppingInSea = true) => UnequipContainedItems(Character, parentItem, predicate, avoidDroppingInSea);
+        public void UnequipContainedItems(Item parentItem, Func<Item, bool> predicate = null, bool avoidDroppingInSea = true) => UnequipContainedItems(Character, parentItem, predicate, avoidDroppingInSea);

        public static void UnequipEmptyItems(Character character, Item parentItem, bool avoidDroppingInSea = true) => UnequipContainedItems(character, parentItem, it => it.Condition <= 0, avoidDroppingInSea);

@@ -275,14 +275,14 @@ namespace Barotrauma
        {
            var inventory = parentItem.OwnInventory;
            if (inventory == null) { return; }
-            if (inventory.AllItems.Any(predicate))
+            if (predicate == null || inventory.AllItems.Any(predicate))
            {
                foreach (Item containedItem in inventory.AllItemsMod)
                {
                    if (containedItem == null) { continue; }
-                    if (predicate(containedItem))
+                    if (predicate == null || predicate(containedItem))
                    {
-                        if (character.Submarine == null && avoidDroppingInSea)
+                        if (character.Submarine != Submarine.MainSub && avoidDroppingInSea)
                        {
                            // If we are outside of main sub, try to put the item in the inventory instead dropping it in the sea.
                            if (character.Inventory.TryPutItem(containedItem, character, CharacterInventory.anySlot))
@@ -186,11 +186,14 @@ namespace Barotrauma
            {
                findSafety.Priority = 0;
            }
-            distanceTimer -= deltaTime;
-            if (distanceTimer < 0)
+            if (!character.IsOnPlayerTeam && !objectiveManager.IsCurrentObjective<AIObjectiveFightIntruders>())
            {
-                distanceTimer = distanceCheckInterval;
-                sqrDistance = Vector2.DistanceSquared(character.WorldPosition, Enemy.WorldPosition);
+                distanceTimer -= deltaTime;
+                if (distanceTimer < 0)
+                {
+                    distanceTimer = distanceCheckInterval;
+                    sqrDistance = Vector2.DistanceSquared(character.WorldPosition, Enemy.WorldPosition);
+                }
            }
        }

@@ -34,6 +34,7 @@ namespace Barotrauma
        public float ConditionLevel { get; set; } = 1;
        public bool Equip { get; set; }
        public bool RemoveEmpty { get; set; } = true;
+        public bool RemoveExisting { get; set; }

        public bool MoveWholeStack { get; set; }

@@ -105,7 +106,11 @@ namespace Barotrauma
                }
                if (character.CanInteractWith(container.Item, checkLinked: false))
                {
-                    if (RemoveEmpty)
+                    if (RemoveExisting)
+                    {
+                        HumanAIController.UnequipContainedItems(container.Item);
+                    }
+                    else if (RemoveEmpty)
                    {
                        HumanAIController.UnequipEmptyItems(container.Item);
                    }
@@ -128,7 +133,7 @@ namespace Barotrauma
                    }
                    else
                    {
-                        if (ItemToContain.ParentInventory == character.Inventory)
+                        if (ItemToContain.ParentInventory == character.Inventory && character.Submarine == Submarine.MainSub)
                        {
                            ItemToContain.Drop(character);
                        }
@@ -60,11 +60,12 @@ namespace Barotrauma
            {
                HumanAIController.UnequipContainedItems(targetItem, it => !it.HasTag("oxygensource"));
                HumanAIController.UnequipEmptyItems(targetItem);
-                float min = character.Submarine == null ? 0.01f : MIN_OXYGEN;
+                // Seek oxygen that has at least 10% condition left, if we are inside a friendly sub.
+                // The margin helps us to survive, because we might need some oxygen before we can find more oxygen.
+                // When we are venturing outside of our sub, let's just suppose that we have enough oxygen with us and optimize it so that we don't keep switching off half used tanks.
+                float min = character.Submarine != Submarine.MainSub ? 0.01f : MIN_OXYGEN;
                if (targetItem.OwnInventory != null && targetItem.OwnInventory.AllItems.None(it => it != null && it.HasTag(OXYGEN_SOURCE) && it.Condition > min))
                {
-                    // No valid oxygen source loaded.
-                    // Seek oxygen that has at least 10% condition left.
                    TryAddSubObjective(ref getOxygen, () =>
                    {
                        if (character.IsOnPlayerTeam)
@@ -82,20 +83,22 @@ namespace Barotrauma
                        {
                            AllowToFindDivingGear = false,
                            AllowDangerousPressure = true,
-                            ConditionLevel = MIN_OXYGEN
+                            ConditionLevel = MIN_OXYGEN,
+                            RemoveExisting = true
                        };
                    },
                    onAbandon: () =>
                    {
                        getOxygen = null;
                        int remainingTanks = ReportOxygenTankCount();
-                        // Try to seek any oxygen sources.
+                        // Try to seek any oxygen sources, even if they have minimal amount of oxygen.
                        TryAddSubObjective(ref getOxygen, () =>
                        {
                            return new AIObjectiveContainItem(character, OXYGEN_SOURCE, targetItem.GetComponent<ItemContainer>(), objectiveManager, spawnItemIfNotFound: character.TeamID == CharacterTeamType.FriendlyNPC)
                            {
                                AllowToFindDivingGear = false,
-                                AllowDangerousPressure = true
+                                AllowDangerousPressure = true,
+                                RemoveExisting = true
                            };
                        },
                        onAbandon: () =>
@@ -50,7 +50,10 @@ namespace Barotrauma
            }
            else
            {
-                if (HumanAIController.NeedsDivingGear(character.CurrentHull, out _) && !HumanAIController.HasDivingGear(character, conditionPercentage: AIObjectiveFindDivingGear.MIN_OXYGEN))
+                if (HumanAIController.NeedsDivingGear(character.CurrentHull, out bool needsSuit) && 
+                    (needsSuit ? 
+                    !HumanAIController.HasDivingSuit(character, conditionPercentage: AIObjectiveFindDivingGear.MIN_OXYGEN) : 
+                    !HumanAIController.HasDivingMask(character, conditionPercentage: AIObjectiveFindDivingGear.MIN_OXYGEN)))
                {
                    Priority = 100;
                }
@@ -279,9 +279,13 @@ namespace Barotrauma
                    if (character.TeamID == CharacterTeamType.FriendlyNPC != item.SpawnedInOutpost) { continue; }
                }
                if (!CheckItem(item)) { continue; }
-                if (ignoredContainerIdentifiers != null && item.Container != null)
+                if (item.Container != null)
                {
-                    if (ignoredContainerIdentifiers.Contains(item.ContainerIdentifier)) { continue; }
+                    if (item.Container.HasTag("donttakeitems")) { continue; }
+                    if (ignoredContainerIdentifiers != null)
+                    {
+                        if (ignoredContainerIdentifiers.Contains(item.ContainerIdentifier)) { continue; }
+                    }
                }
                // Don't allow going into another sub, unless it's connected and of the same team and type.
                if (!character.Submarine.IsEntityFoundOnThisSub(item, includingConnectedSubs: true)) { continue; }
@@ -423,7 +427,7 @@ namespace Barotrauma
            // TODO: Use the item name as the variable here.
            if (character.IsOnPlayerTeam && objectiveManager.CurrentOrder == objectiveManager.CurrentObjective)
            {
-                string msg = TextManager.Get("dialogcannotreachtarget", true);
+                string msg = TextManager.Get("dialogcannotfinditem", true);
                if (msg != null)
                {
                    character.Speak(msg, identifier: "dialogcannotfinditem", minDurationBetweenSimilar: 20.0f);