(c21615b5b) More optimizations.

2019-05-16 05:48:09 +03:00
parent 480bba392c
commit ed49bea3ef
13 changed files with 176 additions and 254 deletions
@@ -37,24 +37,6 @@ namespace Barotrauma
            get { return objectiveManager; }
        }

-        private bool shouldCrouch;
-        private float crouchRaycastTimer;
-        const float CrouchRaycastInterval = 1.0f;
-
-        public const 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; }
-        }
-
        public Order CurrentOrder
        {
            get;
@@ -125,6 +125,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;
@@ -74,21 +74,6 @@ 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;

@@ -15,7 +15,6 @@ namespace Barotrauma

        // By default, doesn't clear the list automatically
        protected virtual float IgnoreListClearInterval => 0;
-        protected virtual float TargetUpdateInterval => 2;

        public HashSet<T> ReportedTargets { get; private set; } = new HashSet<T>();

@@ -59,14 +58,13 @@ namespace Barotrauma
                    ignoreListTimer += deltaTime;
                }
            }
-            if (targetUpdateTimer >= TargetUpdateInterval)
+            if (targetUpdateTimer < 0)
            {
-                targetUpdateTimer = 0;
                UpdateTargets();
            }
            else
            {
-                targetUpdateTimer += deltaTime;
+                targetUpdateTimer -= deltaTime;
            }
            // Sync objectives, subobjectives and targets
            foreach (var objective in objectives)
@@ -75,7 +73,7 @@ namespace Barotrauma
                if (!objective.Value.CanBeCompleted)
                {
                    ignoreList.Add(target);
-                    targetUpdateTimer = TargetUpdateInterval;
+                    targetUpdateTimer = 0;
                }
                if (!targets.Contains(target))
                {
@@ -89,6 +87,9 @@ namespace Barotrauma
            }
        }

+        // the timer is set between 1 and 10 seconds, depending on the priority
+        private float SetTargetUpdateTimer() => targetUpdateTimer = 1 / MathHelper.Clamp(PriorityModifier * Rand.Range(0.75f, 1.25f), 0.1f, 1);
+
        public override void Reset()
        {
            ignoreList.Clear();
@@ -125,6 +126,7 @@ namespace Barotrauma

        protected void UpdateTargets()
        {
+            SetTargetUpdateTimer();
            targets.Clear();
            FindTargets();
            CreateObjectives();
@@ -90,6 +90,10 @@ namespace Barotrauma
                    {
                        isCompleted = true;
                    }
+                    if (component.AIOperate(deltaTime, character, this))
+                    {
+                        isCompleted = true;
+                    }
                }
                else
                {