Human AI improvements & fixes:

- Replaced item name comparisons with Prefab.NameMatches (-> item names can be changed without breaking the AIs). - Having an AIObjective set as the current order of the character doesn't automatically cause it to have a high priority. For example, the order to fix leaks has a low priority if there are no leaks to fix. - AIObjectiveFixLeaks makes sure the character is wearing a diving suit before going to fix a leak. The characters used to run in and out of flooded rooms because the AIObjectiveFindSafety objective would become active as soon as the character entered the room, causing the character to run out, and then immediately run back because they are no longer in immediate danger of drowning, making the FixLeaks objective the most high-priority one. - Characters attempt to find a room with no water in AIObjectiveIdle even if the character is wearing a diving suit. - AIObjectiveFindSafety considers flooded rooms dangerous even if the character is wearing a diving suit (-> the character attempts to go into a more dry room instead of happily idling in the flooded one). - Distance to a hull doesn't decrease its desirability nearly as much in AIObjectiveFindSafety (-> fixes characters not bothering to move into a non-flooded room if it's far away). - AIObjectiveOperateItem makes sure the item is equipped before using it (-> characters can't weld leaks with the welder in their inventory).
2017-12-21 19:49:26 +02:00
parent 9ed2871ede
commit 604fc65154
17 changed files with 310 additions and 169 deletions
@@ -1,5 +1,6 @@
 using Barotrauma.Items.Components;
 using Microsoft.Xna.Framework;
+using System.Collections.Generic;
 using System.Linq;

 namespace Barotrauma
@@ -14,6 +15,8 @@ namespace Barotrauma

        private bool canBeCompleted;

+        private bool requireEquip;
+
        public override bool CanBeCompleted
        {
            get
@@ -27,11 +30,21 @@ namespace Barotrauma
            get { return operateTarget; }
        }

-        public AIObjectiveOperateItem(ItemComponent item, Character character, string option, Entity operateTarget = null, bool useController = false)
-            :base (character, option)
+        public override float GetPriority(AIObjectiveManager objectiveManager)
+        {
+            if (objectiveManager.CurrentOrder == this)
+            {
+                return AIObjectiveManager.OrderPriority;
+            }
+
+            return 1.0f;
+        }
+
+        public AIObjectiveOperateItem(ItemComponent item, Character character, string option, bool requireEquip, Entity operateTarget = null, bool useController = false)
+            : base (character, option)
        {
            this.component = item;
-
+            this.requireEquip = requireEquip;
            this.operateTarget = operateTarget;

            if (useController)
@@ -72,6 +85,43 @@ namespace Barotrauma
                }
                else
                {
+                    if (requireEquip && !character.HasEquippedItem(component.Item))
+                    {
+                        //the item has to be equipped before using it if it's holdable
+                        var holdable = component.Item.GetComponent<Holdable>();
+                        if (holdable == null)
+                        {
+                            DebugConsole.ThrowError("AIObjectiveOperateItem failed - equipping item " + component.Item + " is required but the item has no Holdable component");
+                            return;
+                        }
+
+                        for (int i = 0; i < CharacterInventory.limbSlots.Length; i++)
+                        {
+                            if (CharacterInventory.limbSlots[i] == InvSlotType.Any ||
+                                !holdable.AllowedSlots.Any(s => s.HasFlag(CharacterInventory.limbSlots[i])))
+                            {
+                                continue;
+                            }
+
+                            //equip slot already taken
+                            if (character.Inventory.Items[i] != null)
+                            {
+                                //try to put the item in an Any slot, and drop it if that fails
+                                if (!character.Inventory.Items[i].AllowedSlots.Contains(InvSlotType.Any) ||
+                                    !character.Inventory.TryPutItem(character.Inventory.Items[i], character, new List<InvSlotType>() { InvSlotType.Any }))
+                                {
+                                    character.Inventory.Items[i].Drop();
+                                }
+                            }
+                            if (character.Inventory.TryPutItem(component.Item, i, true, character))
+                            {
+                                component.Item.Equip(character);
+                                break;
+                            }
+                        }
+                        return;
+                    }
+
                    if (component.AIOperate(deltaTime, character, this)) isCompleted = true;
                }
            }