(42b18ccca) Allow to return to the initial combat mode after retreating. Implement reloading (disabled because only reloads one ammunition) -> TODO: only load ammunition when found in the inventory. Implement a generic method for removing subobjectives and resetting the reference. Refuel the repair tool.

2019-05-16 05:58:15 +03:00
parent 18b6775457
commit 257889b9cc
39 changed files with 505 additions and 639 deletions
@@ -4,6 +4,7 @@ using System;
 using System.Linq;
 using Barotrauma.Extensions;
 using FarseerPhysics;
+using Barotrauma.Items.Components;

 namespace Barotrauma
 {
@@ -14,6 +15,7 @@ namespace Barotrauma
        public Item Item { get; private set; }

        private AIObjectiveGoTo goToObjective;
+        private AIObjectiveContainItem refuelObjective;
        private float previousCondition = -1;
        private RepairTool repairTool;

@@ -71,11 +73,46 @@ namespace Barotrauma
                }
            }
            // Only continue when the get item sub objectives have been completed.
-            if (subObjectives.Any(so => so is AIObjectiveGetItem)) { return; }
+            if (subObjectives.Any()) { return; }
            if (repairTool == null)
            {
                FindRepairTool();
            }
+            if (repairTool != null)
+            {
+                var containedItems = repairTool.Item.ContainedItems;
+                if (containedItems == null)
+                {
+#if DEBUG
+                    DebugConsole.ThrowError("AIObjectiveRepairItem failed - the item \"" + repairTool + "\" has no proper inventory");
+#endif
+                    abandon = true;
+                    return;
+                }
+                // Drop empty tanks
+                foreach (Item containedItem in containedItems)
+                {
+                    if (containedItem == null) { continue; }
+                    if (containedItem.Condition <= 0.0f)
+                    {
+                        containedItem.Drop(character);
+                    }
+                }
+                RelatedItem item = null;
+                Item fuel = null;
+                foreach (RelatedItem requiredItem in repairTool.requiredItems[RelatedItem.RelationType.Contained])
+                {
+                    item = requiredItem;
+                    fuel = containedItems.FirstOrDefault(it => it.Condition > 0.0f && requiredItem.MatchesItem(it));
+                    if (fuel != null) { break; }
+                }
+                if (fuel == null)
+                {
+                    RemoveSubObjective(ref goToObjective);
+                    TryAddSubObjective(ref refuelObjective, () => new AIObjectiveContainItem(character, item.Identifiers, repairTool.Item.GetComponent<ItemContainer>(), objectiveManager));
+                    return;
+                }
+            }
            if (character.CurrentHull == Item.CurrentHull && character.CanInteractWith(Item))
            {
                if (repairTool != null)
@@ -112,6 +149,7 @@ namespace Barotrauma
            }
            else
            {
+                RemoveSubObjective(ref refuelObjective);
                // If cannot reach the item, approach it.
                TryAddSubObjective(ref goToObjective,
                    constructor: () =>