(10a11fd09) Rename a variable.

2019-05-16 05:32:20 +03:00
parent 2b029fc61a
commit 0714599f05
9 changed files with 208 additions and 243 deletions
@@ -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;

@@ -95,6 +110,13 @@ namespace Barotrauma
            {
                character.SelectedConstruction = null;
            }
+            if (!character.IsClimbing)
+            {
+                character.SelectedConstruction = null;
+            }
+
+            bool currentTargetIsInvalid = currentTarget == null || IsForbidden(currentTarget) || 
+                (PathSteering.CurrentPath != null && PathSteering.CurrentPath.Nodes.Any(n => HumanAIController.UnsafeHulls.Contains(n.CurrentHull)));

            bool currentTargetIsInvalid = currentTarget == null || IsForbidden(currentTarget) || 
                (PathSteering.CurrentPath != null && PathSteering.CurrentPath.Nodes.Any(n => HumanAIController.UnsafeHulls.Contains(n.CurrentHull)));
@@ -131,18 +131,18 @@ namespace Barotrauma

        protected virtual void FindTargets()
        {
-            foreach (T item in GetList())
+            foreach (T target in GetList())
            {
                if (objectiveManager.CurrentOrder != this)
                {
                    // Battery or pump states cannot be reported and therefore we must ignore them -> the bots always know if they require attention.
                    bool ignore = this is AIObjectiveChargeBatteries || this is AIObjectivePumpWater;
-                    if (!ignore && !ReportedTargets.Contains(item)) { continue; }
+                    if (!ignore && !ReportedTargets.Contains(target)) { continue; }
                }
-                if (!Filter(item)) { continue; }
-                if (!ignoreList.Contains(item))
+                if (!Filter(target)) { continue; }
+                if (!ignoreList.Contains(target))
                {
-                    targets.Add(item);
+                    targets.Add(target);
                }
            }
        }