(829458a66) Don't apply priority modifier on the priority value, because it's already applied to the max value. The priority value should be normalized, because we are using the lerp.

2019-05-16 05:12:07 +03:00
parent dbccd76613
commit 019712ef66
12 changed files with 90 additions and 16 deletions
@@ -1098,6 +1098,8 @@ namespace Barotrauma

        private bool IsProperlyLatchedOnSub => LatchOntoAI != null && LatchOntoAI.IsAttachedToSub && SelectedAiTarget?.Entity == wallTarget?.Structure;

+        private bool IsProperlyLatchedOnSub => LatchOntoAI != null && LatchOntoAI.IsAttachedToSub && SelectedAiTarget?.Entity == wallTarget?.Structure;
+
        //goes through all the AItargets, evaluates how preferable it is to attack the target,
        //whether the Character can see/hear the target and chooses the most preferable target within
        //sight/hearing range
@@ -101,7 +101,7 @@ namespace Barotrauma
            float maxMultiplier = MathHelper.Min(PriorityModifier, 1);
            float max = MathHelper.Min((AIObjectiveManager.OrderPriority - 1) * maxMultiplier, 90);
            float devotion = MathHelper.Min(10, Priority);
-            float value = MathHelper.Min((devotion + targetValue) / 100 * PriorityModifier, 1);
+            float value = MathHelper.Min((devotion + targetValue) / 100, 1);
            return MathHelper.Lerp(0, max, value);
        }

@@ -2694,6 +2694,10 @@ namespace Barotrauma
            GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
 #endif

+#if CLIENT
+            GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
+#endif
+
 #if CLIENT
            GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
 #endif