(5dc7f59e5) Remove an unnecessary check. The priority system should take care of this.

2019-05-16 05:34:37 +03:00
parent 70ffc27667
commit 6bb7f5f0f1
10 changed files with 147 additions and 221 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;

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

        protected override void Act(float deltaTime)
        {
-            // Don't allow to repair items in rooms that have a fire or an enemies inside or if outside the sub
-            if (Item.CurrentHull == null || Item.CurrentHull.FireSources.Count > 0 || Character.CharacterList.Any(c => c.CurrentHull == Item.CurrentHull && !HumanAIController.IsFriendly(c)))
-            {
-                abandon = true;
-            }
            foreach (Repairable repairable in Item.Repairables)
            {
                if (!repairable.HasRequiredItems(character, false))