(62a89ce6a) Refactor and fix priority calculations. WIP, but should already improve things.

2019-05-16 05:05:53 +03:00
parent d0795791e7
commit ff5a819ad3
25 changed files with 142 additions and 65 deletions
@@ -105,7 +105,7 @@ namespace Barotrauma
            CurrentSubObjective.SortSubObjectives(objectiveManager);
        }

-        public virtual float GetPriority(AIObjectiveManager objectiveManager) => Priority;
+        public virtual float GetPriority(AIObjectiveManager objectiveManager) => Priority * PriorityModifier;

        public virtual void Update(AIObjectiveManager objectiveManager, float deltaTime)
        {
@@ -116,9 +116,8 @@ namespace Barotrauma
            }
            else if (objectiveManager.CurrentObjective == this || subObjective == this)
            {
-                Priority += Devotion * deltaTime;
+                Priority += Devotion * PriorityModifier * deltaTime;
            }
-            Priority *= PriorityModifier;
            Priority = MathHelper.Clamp(Priority, 0, 100);
            subObjectives.ForEach(so => so.Update(objectiveManager, deltaTime));
        }