Build 0.20.9.0

2022-12-01 21:59:53 +02:00
parent df805574c4
commit 31d2dc658e
66 changed files with 953 additions and 505 deletions
@@ -876,7 +876,20 @@ namespace Barotrauma
                    TargetName = Enemy.DisplayName,
                    AlwaysUseEuclideanDistance = false
                },
-                onAbandon: () => Abandon = true);
+                onAbandon: () =>
+                {
+                    if (Enemy != null && HumanAIController.VisibleHulls.Contains(Enemy.CurrentHull))
+                    {
+                        // If in the same room with an enemy -> don't try to escape because we'd want to fight it
+                        SteeringManager.Reset();
+                        RemoveSubObjective(ref followTargetObjective);
+                    }
+                    else
+                    {
+                        // else abandon and fall back to find safety mode
+                        Abandon = true;
+                    }
+                });
            if (followTargetObjective == null) { return; }
            if (Mode == CombatMode.Arrest && Enemy.IsKnockedDown)
            {
@@ -25,6 +25,8 @@ namespace Barotrauma
        private readonly Item item;
        public Item ItemToContain { get; private set; }

+        public int? TargetSlot;
+
        private AIObjectiveGetItem getItemObjective;
        private AIObjectiveGoTo goToObjective;

@@ -126,7 +128,19 @@ namespace Barotrauma
                }
                if (character.CanInteractWith(container.Item, checkLinked: false))
                {
-                    if (RemoveExisting || (RemoveExistingWhenNecessary && !container.Inventory.CanBePut(ItemToContain)))
+                    static bool CanBePut(Inventory inventory, int? targetSlot, Item itemToContain)
+                    {
+                        if (targetSlot.HasValue)
+                        {
+                            return inventory.CanBePutInSlot(itemToContain, targetSlot.Value);
+                        }
+                        else
+                        {
+                            return inventory.CanBePut(itemToContain);
+                        }
+                    }
+
+                    if (RemoveExisting || (RemoveExistingWhenNecessary && !CanBePut(container.Inventory, TargetSlot, ItemToContain)))
                    {
                        HumanAIController.UnequipContainedItems(container.Item, predicate: RemoveExistingPredicate, unequipMax: RemoveMax);
                    }
@@ -136,7 +150,20 @@ namespace Barotrauma
                    }
                    Inventory originalInventory = ItemToContain.ParentInventory;
                    var slots = originalInventory?.FindIndices(ItemToContain);
-                    if (container.Inventory.TryPutItem(ItemToContain, null))
+                    
+                    static bool TryPutItem(Inventory inventory, int? targetSlot, Item itemToContain)
+                    {
+                        if (targetSlot.HasValue)
+                        {
+                            return inventory.TryPutItem(itemToContain, targetSlot.Value, allowSwapping: false, allowCombine: false, user: null);
+                        }
+                        else
+                        {
+                            return inventory.TryPutItem(itemToContain, user: null);
+                        }
+                    }
+
+                    if (TryPutItem(container.Inventory, TargetSlot, ItemToContain))
                    {
                        if (MoveWholeStack && slots != null)
                        {
@@ -144,7 +171,7 @@ namespace Barotrauma
                            {
                                foreach (Item item in originalInventory.GetItemsAt(slot).ToList())
                                {
-                                    container.Inventory.TryPutItem(item, null);
+                                    TryPutItem(container.Inventory, TargetSlot, item);
                                }
                            }
                        }
@@ -23,9 +23,8 @@ namespace Barotrauma

        protected override float TargetEvaluation()
        {
-            if (!character.IsOnPlayerTeam) { return Targets.None() ? 0 : 100; }
-            int totalEnemies = Targets.Count();
-            if (totalEnemies == 0) { return 0; }
+            if (Targets.None()) { return 0; }
+            if (!character.IsOnPlayerTeam) { return 100; }
            if (character.IsSecurity) { return 100; }
            if (objectiveManager.IsOrder(this)) { return 100; }
            // If there's any security officers onboard, leave fighting for them.
@@ -103,13 +103,19 @@ namespace Barotrauma
                                character.Speak(TextManager.Get("DialogGetOxygenTank").Value, null, 0, "getoxygentank".ToIdentifier(), 30.0f);
                            }
                        }
-                        return new AIObjectiveContainItem(character, OXYGEN_SOURCE, targetItem.GetComponent<ItemContainer>(), objectiveManager, spawnItemIfNotFound: character.TeamID == CharacterTeamType.FriendlyNPC)
+                        var container = targetItem.GetComponent<ItemContainer>();                        
+                        var objective = new AIObjectiveContainItem(character, OXYGEN_SOURCE, container, objectiveManager, spawnItemIfNotFound: character.TeamID == CharacterTeamType.FriendlyNPC)
                        {
                            AllowToFindDivingGear = false,
                            AllowDangerousPressure = true,
                            ConditionLevel = MIN_OXYGEN,
                            RemoveExistingWhenNecessary = true
                        };
+                        if (container.HasSubContainers)
+                        {
+                            objective.TargetSlot = container.FindSuitableSubContainerIndex(OXYGEN_SOURCE);
+                        }
+                        return objective;
                    },
                    onAbandon: () =>
                    {
@@ -262,7 +262,7 @@ namespace Barotrauma
                {
                    Character followTarget = Target as Character;
                    bool needsDivingSuit = (!isInside || hasOutdoorNodes) && character.NeedsAir && !character.HasAbilityFlag(AbilityFlags.ImmuneToPressure);
-                    bool needsDivingGear = (needsDivingSuit || HumanAIController.NeedsDivingGear(targetHull, out needsDivingSuit));
+                    bool needsDivingGear = needsDivingSuit || HumanAIController.NeedsDivingGear(targetHull, out needsDivingSuit);
                    if (Mimic)
                    {
                        if (HumanAIController.HasDivingSuit(followTarget))