f8b0295...0671290

2019-03-18 22:59:45 +02:00
parent 23687fbf2f
commit 63eb4d64e5
103 changed files with 1378 additions and 4692 deletions
@@ -30,9 +30,7 @@ namespace Barotrauma
            base.Update(objectiveManager, deltaTime);
            if (ignoreListTimer > ignoreListClearInterval)
            {
-                ignoreList.Clear();
-                ignoreListTimer = 0;
-                UpdateTargets();
+                Reset();
            }
            else
            {
@@ -67,16 +65,24 @@ namespace Barotrauma
            }
        }

+        private void Reset()
+        {
+            ignoreList.Clear();
+            ignoreListTimer = 0;
+            UpdateTargets();
+        }
+
+        public override void OnSelected()
+        {
+            Reset();
+        }
+
        public override float GetPriority(AIObjectiveManager objectiveManager)
        {
            if (character.Submarine == null) { return 0; }
            if (targets.None()) { return 0; }
            float avg = targets.Average(t => Average(t));
-            if (objectiveManager.CurrentOrder == this)
-            {
-                return AIObjectiveManager.OrderPriority - MathHelper.Max(0, AIObjectiveManager.OrderPriority - avg);
-            }
-            return MathHelper.Lerp(0, AIObjectiveManager.OrderPriority, avg / 100);
+            return MathHelper.Lerp(0, AIObjectiveManager.OrderPriority + 20, avg / 100);
        }

        protected void UpdateTargets()