(20fcd3853) Optimizations.

Barotrauma/BarotraumaShared/Source/Characters/AI/HumanAIController.cs

@@ -12,11 +12,30 @@ namespace Barotrauma
     {
         public static bool DisableCrewAI;
 
-        const float UpdateObjectiveInterval = 0.5f;
-
         private AIObjectiveManager objectiveManager;
         
-        private float updateObjectiveTimer;
+        private float sortTimer;
+        private float crouchRaycastTimer;
+        private float reportTimer;
+        private bool shouldCrouch;
+
+        const float crouchRaycastInterval = 1;
+        const float reportInterval = 1;
+        const float sortObjectiveInterval = 1;
+
+        public static float HULL_SAFETY_THRESHOLD = 50;
+
+        public HashSet<Hull> UnsafeHulls { get; private set; } = new HashSet<Hull>();
+
+        private SteeringManager outsideSteering, insideSteering;
+
+        public IndoorsSteeringManager PathSteering => insideSteering as IndoorsSteeringManager;
+        public HumanoidAnimController AnimController => Character.AnimController as HumanoidAnimController;
+
+        public override AIObjectiveManager ObjectiveManager
+        {
+            get { return objectiveManager; }
+        }
 
         private bool shouldCrouch;
         private float crouchRaycastTimer;
@@ -53,7 +72,8 @@ namespace Barotrauma
             insideSteering = new IndoorsSteeringManager(this, true, false);
             outsideSteering = new SteeringManager(this);
             objectiveManager = new AIObjectiveManager(c);
-            updateObjectiveTimer = Rand.Range(0.0f, UpdateObjectiveInterval);
+            reportTimer = Rand.Range(0f, reportInterval);
+            sortTimer = Rand.Range(0f, sortObjectiveInterval);
             InitProjSpecific();
         }
         partial void InitProjSpecific();
@@ -78,21 +98,28 @@ namespace Barotrauma
             Character.ClearInputs();
 
             objectiveManager.UpdateObjectives(deltaTime);
-            if (updateObjectiveTimer > 0.0f)
+            if (sortTimer > 0.0f)
             {
-                updateObjectiveTimer -= deltaTime;
+                sortTimer -= deltaTime;
             }
             else
             {
                 objectiveManager.SortObjectives();
-                updateObjectiveTimer = UpdateObjectiveInterval;
+                sortTimer = sortObjectiveInterval;
             }
 
-            if (Character.SpeechImpediment < 100.0f)
+            if (reportTimer > 0.0f)
             {
-                // TODO: add a timer -> once per second is enough?
-                ReportProblems();
-                UpdateSpeaking();
+                reportTimer -= deltaTime;
+            }
+            else
+            {
+                if (Character.SpeechImpediment < 100.0f)
+                {
+                    ReportProblems();
+                    UpdateSpeaking();
+                }
+                reportTimer = reportInterval;
             }
 
             if (objectiveManager.CurrentObjective == null) { return; }
@@ -408,7 +435,7 @@ namespace Barotrauma
             crouchRaycastTimer -= deltaTime;
             if (crouchRaycastTimer > 0.0f) return;
 
-            crouchRaycastTimer = CrouchRaycastInterval;
+            crouchRaycastTimer = crouchRaycastInterval;
 
             //start the raycast in front of the character in the direction it's heading to
             Vector2 startPos = Character.SimPosition;

Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveChargeBatteries.cs

@@ -67,7 +67,7 @@ namespace Barotrauma
         {
             if (batteryList == null)
             {
-                batteryList = Item.ItemList.Select(i => i.GetComponent<PowerContainer>()).Where(b => b != null);
+                batteryList = character.Submarine.GetItems(true).Select(i => i.GetComponent<PowerContainer>()).Where(b => b != null);
             }
             return batteryList;
         }

Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveCombat.cs

@@ -279,7 +279,7 @@ namespace Barotrauma
             {
                 followTargetObjective.CloseEnough = ConvertUnits.ToSimUnits(rt.Range);
             }
-            if (retreatTarget != null)
+            else if (WeaponComponent is RepairTool rt)
             {
                 SteeringManager.Reset();
                 Mode = CombatMode.Retreat;

Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveFixLeak.cs

@@ -100,6 +100,31 @@ namespace Barotrauma
             {
 #if DEBUG
                 DebugConsole.ThrowError("AIObjectiveFixLeak failed - the item \"" + weldingTool + "\" has no RepairTool component but is tagged as a welding tool");
+#endif
+                abandon = true;
+                return;
+            }
+            Vector2 gapDiff = Leak.WorldPosition - character.WorldPosition;
+            // TODO: use the collider size/reach?
+            if (!character.AnimController.InWater && Math.Abs(gapDiff.X) < 100 && gapDiff.Y < 0.0f && gapDiff.Y > -150)
+            {
+                HumanAIController.AnimController.Crouching = true;
+            }
+            float reach = ConvertUnits.ToSimUnits(repairTool.Range);
+            bool canOperate = ConvertUnits.ToSimUnits(gapDiff.Length()) < reach;
+            if (canOperate)
+            {
+                TryAddSubObjective(ref operateObjective, () => new AIObjectiveOperateItem(repairTool, character, objectiveManager, option: "", requireEquip: true, operateTarget: Leak));
+            }
+            else
+            {
+                TryAddSubObjective(ref gotoObjective, () => new AIObjectiveGoTo(ConvertUnits.ToSimUnits(GetStandPosition()), character, objectiveManager) { CloseEnough = reach * 0.75f });
+            }
+            var repairTool = weldingTool.GetComponent<RepairTool>();
+            if (repairTool == null)
+            {
+#if DEBUG
+                DebugConsole.ThrowError("AIObjectiveFixLeak failed - the item \"" + weldingTool + "\" has no RepairTool component but is tagged as a welding tool");
 #endif
                 abandon = true;
                 return;

Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveGetItem.cs

@@ -212,7 +212,6 @@ namespace Barotrauma
                 currItemPriority = itemPriority;
                 targetItem = item;
                 moveToTarget = rootContainer ?? item;
-
             }
             //if searched through all the items and a target wasn't found, can't be completed
             if (currSearchIndex >= Item.ItemList.Count - 1 && targetItem == null)

Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveIdle.cs

@@ -74,6 +74,21 @@ namespace Barotrauma
             }
         }
 
+        public override void Update(float deltaTime)
+        {
+            if (objectiveManager.CurrentObjective == this)
+            {
+                if (randomTimer > 0)
+                {
+                    randomTimer -= deltaTime;
+                }
+                else
+                {
+                    SetRandom();
+                }
+            }
+        }
+
         public override bool IsCompleted() => false;
         public override bool CanBeCompleted => true;
 

Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveOperateItem.cs

@@ -86,6 +86,10 @@ namespace Barotrauma
                     {
                         isCompleted = true;
                     }
+                    if (component.AIOperate(deltaTime, character, this))
+                    {
+                        isCompleted = true;
+                    }
                 }
                 else
                 {

Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Deconstructor.cs

@@ -753,6 +753,25 @@ namespace Barotrauma.Items.Components
                     }
                 }
                 
+                if (targetItem.Prefab.DeconstructItems.Any())
+                {
+                    inputContainer.Inventory.RemoveItem(targetItem);
+                    Entity.Spawner.AddToRemoveQueue(targetItem);
+                    MoveInputQueue();
+                    PutItemsToLinkedContainer();
+                }
+                else
+                {
+                    if (outputContainer.Inventory.Items.All(i => i != null))
+                    {
+                        targetItem.Drop(dropper: null);
+                    }
+                    else
+                    {
+                        outputContainer.Inventory.TryPutItem(targetItem, user: null, createNetworkEvent: true);
+                    }
+                }
+                
                 if (targetItem.Prefab.DeconstructItems.Any())
                 {
                     inputContainer.Inventory.RemoveItem(targetItem);

Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Steering.cs

@@ -212,33 +212,6 @@ namespace Barotrauma.Items.Components
             }
         }
 
-        public Vector2? PosToMaintain
-        {
-            get { return posToMaintain; }
-            set { posToMaintain = value; }
-        }
-
-        struct ObstacleDebugInfo
-        {
-            public Vector2 Point1;
-            public Vector2 Point2;
-
-            public Vector2? Intersection;
-
-            public float Dot;
-
-            public Vector2 AvoidStrength;
-
-            public ObstacleDebugInfo(GraphEdge edge, Vector2? intersection, float dot, Vector2 avoidStrength)
-            {
-                Point1 = edge.Point1;
-                Point2 = edge.Point2;
-                Intersection = intersection;
-                Dot = dot;
-                AvoidStrength = avoidStrength;
-            }
-        }
-
         //edge point 1, edge point 2, avoid strength
         private List<ObstacleDebugInfo> debugDrawObstacles = new List<ObstacleDebugInfo>();
 

Barotrauma/BarotraumaShared/Source/Items/Item.cs

@@ -1672,6 +1672,10 @@ namespace Barotrauma
             {
                 ApplyStatusEffects(!waterProof && inWater ? ActionType.InWater : ActionType.NotInWater, deltaTime);
             }
+            if (!broken)
+            {
+                ApplyStatusEffects(!waterProof && inWater ? ActionType.InWater : ActionType.NotInWater, deltaTime);
+            }
             ApplyStatusEffects(!waterProof && inWater ? ActionType.InWater : ActionType.NotInWater, deltaTime);
 
             if (body == null || !body.Enabled || !inWater || ParentInventory != null || Removed) { return; }

Barotrauma/BarotraumaShared/Source/Map/Hull.cs

@@ -379,6 +379,25 @@ namespace Barotrauma
             }
         }
 
+        public string DisplayName
+        {
+            get;
+            private set;
+        }
+
+        private string roomName;
+        [Editable, Serialize("", true, translationTextTag: "RoomName.")]
+        public string RoomName
+        {
+            get { return roomName; }
+            set
+            {
+                if (roomName == value) { return; }
+                roomName = value;
+                DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName;
+            }
+        }
+
         public override Rectangle Rect
         {
             get