(6fe53068b) Add a wait timer at the beginning and a temporal spread on creating the autonomous objectives. Should improve performance, because the find target loops are thus spread a bit.

2019-05-16 05:36:58 +03:00
parent 0ca644a559
commit 01743eb7e1
15 changed files with 210 additions and 313 deletions
@@ -94,8 +94,9 @@ namespace Barotrauma
                UpdateSpeaking();
            }

-            objectiveManager.DoCurrentObjective(deltaTime);
+            if (objectiveManager.CurrentObjective == null) { return; }

+            objectiveManager.DoCurrentObjective(deltaTime);
            bool run = objectiveManager.GetCurrentPriority() > AIObjectiveManager.RunPriority;
            if (ObjectiveManager.CurrentObjective is AIObjectiveGoTo goTo && goTo.Target != null)
            {
@@ -517,11 +518,7 @@ namespace Barotrauma
            {
                if (IsFriendly(caller, c) && c.AIController is HumanAIController humanAI)
                {
-                    var objective = humanAI.ObjectiveManager.GetObjective<T1>();
-                    if (objective != null)
-                    {
-                        objective.AddTarget(target);
-                    }
+                    humanAI.ObjectiveManager.GetObjective<T1>()?.AddTarget(target);
                }
            }
        }
@@ -72,8 +72,11 @@ namespace Barotrauma
            Enemy = enemy;
            coolDownTimer = CoolDown;
            findSafety = objectiveManager.GetObjective<AIObjectiveFindSafety>();
-            findSafety.Priority = 0;
-            findSafety.unreachable.Clear();
+            if (findSafety != null)
+            {
+                findSafety.Priority = 0;
+                findSafety.unreachable.Clear();
+            }
            Mode = mode;
            if (Enemy == null)
            {
@@ -430,6 +430,49 @@ namespace Barotrauma
                {
                    character.AIController.SteeringManager.Reset();
                }
+                if (goToObjective != null) { return; }
+                if (currentHull == null) { return; }
+                //goto objective doesn't exist (a safe hull not found, or a path to a safe hull not found)
+                // -> attempt to manually steer away from hazards
+                Vector2 escapeVel = Vector2.Zero;
+                foreach (FireSource fireSource in currentHull.FireSources)
+                {
+                    Vector2 dir = character.Position - fireSource.Position;
+                    float distMultiplier = MathHelper.Clamp(100.0f / Vector2.Distance(fireSource.Position, character.Position), 0.1f, 10.0f);
+                    escapeVel += new Vector2(Math.Sign(dir.X) * distMultiplier, !character.IsClimbing ? 0 : Math.Sign(dir.Y) * distMultiplier);
+                }
+                foreach (Character enemy in Character.CharacterList)
+                {
+                    //don't run from friendly NPCs
+                    if (enemy.TeamID == Character.TeamType.FriendlyNPC) { continue; }
+                    //friendly NPCs don't run away from anything but characters controlled by EnemyAIController (= monsters)
+                    if (character.TeamID == Character.TeamType.FriendlyNPC && !(enemy.AIController is EnemyAIController)) { continue; }
+                    if (enemy.CurrentHull == currentHull && !enemy.IsDead && !enemy.IsUnconscious &&
+                        (enemy.AIController is EnemyAIController || enemy.TeamID != character.TeamID))
+                    {
+                        Vector2 dir = character.Position - enemy.Position;
+                        float distMultiplier = MathHelper.Clamp(100.0f / Vector2.Distance(enemy.Position, character.Position), 0.1f, 10.0f);
+                        escapeVel += new Vector2(Math.Sign(dir.X) * distMultiplier, !character.IsClimbing ? 0 : Math.Sign(dir.Y) * distMultiplier);
+                    }
+                }
+                if (escapeVel != Vector2.Zero)
+                {
+                    //only move if we haven't reached the edge of the room
+                    if ((escapeVel.X < 0 && character.Position.X > currentHull.Rect.X + 50) ||
+                        (escapeVel.X > 0 && character.Position.X < currentHull.Rect.Right - 50))
+                    {
+                        character.AIController.SteeringManager.SteeringManual(deltaTime, escapeVel);
+                    }
+                    else
+                    {
+                        character.AnimController.TargetDir = escapeVel.X < 0.0f ? Direction.Right : Direction.Left;
+                        character.AIController.SteeringManager.Reset();
+                    }
+                }
+                else
+                {
+                    character.AIController.SteeringManager.Reset();
+                }
            }
        }

@@ -248,6 +248,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;
@@ -94,7 +94,7 @@ namespace Barotrauma
            FindTargetItem();
            if (targetItem == null || moveToTarget == null)
            {
-                objectiveManager.GetObjective<AIObjectiveIdle>().Wander(deltaTime);
+                objectiveManager.GetObjective<AIObjectiveIdle>()?.Wander(deltaTime);
                return;
            }
            if (moveToTarget.CurrentHull == character.CurrentHull && 
@@ -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;

@@ -52,8 +52,9 @@ namespace Barotrauma
        public void CreateAutonomousObjectives()
        {
            Objectives.Clear();
-            AddObjective(new AIObjectiveFindSafety(character, this));
-            AddObjective(new AIObjectiveIdle(character, this));
+            AddObjective(new AIObjectiveFindSafety(character, this), delay: Rand.Value() / 2);
+            AddObjective(new AIObjectiveIdle(character, this), delay: Rand.Value() / 2);
+            int objectiveCount = Objectives.Count;
            foreach (var automaticOrder in character.Info.Job.Prefab.AutomaticOrders)
            {
                var orderPrefab = Order.PrefabList.Find(o => o.AITag == automaticOrder.aiTag);
@@ -65,8 +66,10 @@ namespace Barotrauma
                matchingItems.RemoveAll(it => it.Submarine != character.Submarine);
                var item = matchingItems.GetRandom();
                var order = new Order(orderPrefab, item ?? character.CurrentHull as Entity, item?.Components.FirstOrDefault(ic => ic.GetType() == orderPrefab.ItemComponentType));
-                AddObjective(CreateObjective(order, automaticOrder.option, character, automaticOrder.priorityModifier));
+                AddObjective(CreateObjective(order, automaticOrder.option, character, automaticOrder.priorityModifier), delay: Rand.Value() / 2);
+                objectiveCount++;
            }
+            WaitTimer = Math.Max(WaitTimer, Rand.Range(0.5f, 1f) * objectiveCount);
        }

        public void AddObjective(AIObjective objective, float delay, Action callback = null)
@@ -109,7 +112,7 @@ namespace Barotrauma
            if (previousObjective != CurrentObjective)
            {
                CurrentObjective?.OnSelected();
-                GetObjective<AIObjectiveIdle>().SetRandom();
+                GetObjective<AIObjectiveIdle>()?.SetRandom();
            }
            return CurrentObjective;
        }
@@ -122,6 +125,11 @@ namespace Barotrauma
        public void UpdateObjectives(float deltaTime)
        {
            CurrentOrder?.Update(deltaTime);
+            if (WaitTimer > 0)
+            {
+                WaitTimer -= deltaTime;
+                return;
+            }
            for (int i = 0; i < Objectives.Count; i++)
            {
                var objective = Objectives[i];
@@ -177,7 +185,6 @@ namespace Barotrauma
                            !humanAI.UnsafeHulls.Contains(character.CurrentHull) && 
                            !AIObjectiveIdle.IsForbidden(character.CurrentHull))
                        {
-                            WaitTimer -= deltaTime;
                            humanAI.SteeringManager.Reset();
                        }
                        else
@@ -124,6 +124,10 @@ namespace Barotrauma
                    {
                        isCompleted = true;
                    }
+                    if (component.AIOperate(deltaTime, character, this))
+                    {
+                        isCompleted = true;
+                    }
                }
                else
                {
@@ -544,6 +544,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);
@@ -212,6 +212,33 @@ 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>();

@@ -1516,6 +1516,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; }
@@ -265,6 +265,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