(f3bfe1ac4) Fix damage priority calculation.

2019-05-16 05:10:25 +03:00
parent 9cc9137fff
commit cdeb6d40b3
12 changed files with 169 additions and 28 deletions
@@ -1086,6 +1086,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
@@ -33,7 +33,7 @@ namespace Barotrauma
            // Vertical distance matters more than horizontal (climbing up/down is harder than moving horizontally)
            float dist = Math.Abs(character.WorldPosition.X - Item.WorldPosition.X) + Math.Abs(character.WorldPosition.Y - Item.WorldPosition.Y) * 2.0f;
            float distanceFactor = MathHelper.Lerp(1, 0.5f, MathUtils.InverseLerp(0, 10000, dist));
-            float damagePriority = MathHelper.Lerp(1, 0, Math.Min((Item.Condition + 10), Item.MaxCondition) / Item.MaxCondition);
+            float damagePriority = MathHelper.Lerp(1, 0, Item.Condition / Item.MaxCondition);
            float successFactor = MathHelper.Lerp(0, 1, Item.Repairables.Average(r => r.DegreeOfSuccess(character)));
            float isSelected = character.SelectedConstruction == Item ? 50 : 0;
            float baseLevel = Math.Max(Priority + isSelected, 1);
@@ -2670,6 +2670,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