(4b33eda28) Merge branch 'dev' into enemy-ai

2019-03-25 19:49:34 +02:00
parent 7d74b5bd52
commit 26594e2c6c
31 changed files with 207 additions and 148 deletions
@@ -1110,13 +1110,15 @@ namespace Barotrauma
            ViewTarget = null;
            if (!AllowInput) return;

-            Vector2 smoothedCursorDiff = cursorPosition - SmoothedCursorPosition;
-            if (Controlled == this)
+            if (Controlled == this || (GameMain.NetworkMember != null && GameMain.NetworkMember.IsServer))
            {
                SmoothedCursorPosition = cursorPosition;
            }
            else
            {
+                //apply some smoothing to the cursor positions of remote players when playing as a client
+                //to make aiming look a little less choppy
+                Vector2 smoothedCursorDiff = cursorPosition - SmoothedCursorPosition;
                smoothedCursorDiff = NetConfig.InterpolateCursorPositionError(smoothedCursorDiff);
                SmoothedCursorPosition = cursorPosition - smoothedCursorDiff;
            }
@@ -1664,10 +1666,12 @@ namespace Barotrauma
                    focusedItem = null; 
                }
                findFocusedTimer -= deltaTime;
-            }            
+            }
 #endif
            //climb ladders automatically when pressing up/down inside their trigger area
-            if (SelectedConstruction == null && !AnimController.InWater && Screen.Selected != GameMain.SubEditorScreen)
+            Ladder currentLadder = SelectedConstruction?.GetComponent<Ladder>();
+            if ((SelectedConstruction == null || currentLadder != null) && 
+                !AnimController.InWater && Screen.Selected != GameMain.SubEditorScreen)
            {
                bool climbInput = IsKeyDown(InputType.Up) || IsKeyDown(InputType.Down);
                bool isControlled = Controlled == this;
@@ -1678,6 +1682,19 @@ namespace Barotrauma
                    float minDist = float.PositiveInfinity;
                    foreach (Ladder ladder in Ladder.List)
                    {
+                        if (ladder == currentLadder)
+                        {
+                            continue;
+                        }
+                        else if (currentLadder != null)
+                        {
+                            //only switch from ladder to another if the ladders are above the current ladders and pressing up, or vice versa
+                            if (ladder.Item.WorldPosition.Y > currentLadder.Item.WorldPosition.Y != IsKeyDown(InputType.Up))
+                            {
+                                continue;
+                            }
+                        }
+
                        if (CanInteractWith(ladder.Item, out float dist, checkLinked: false) && dist < minDist)
                        {
                            minDist = dist;
@@ -153,7 +153,10 @@ namespace Barotrauma
        //how high the strength has to be for the affliction icon to be shown in the UI
        public readonly float ShowIconThreshold = 0.05f;
        public readonly float MaxStrength = 100.0f;
-        
+
+        //how high the strength has to be for the affliction icon to be shown with a health scanner
+        public readonly float ShowInHealthScannerThreshold = 0.05f;
+
        public float BurnOverlayAlpha;
        public float DamageOverlayAlpha;

@@ -257,6 +260,8 @@ namespace Barotrauma
            ShowIconThreshold   = element.GetAttributeFloat("showiconthreshold", Math.Max(ActivationThreshold, 0.05f));
            MaxStrength         = element.GetAttributeFloat("maxstrength", 100.0f);

+            ShowInHealthScannerThreshold = element.GetAttributeFloat("showinhealthscannerthreshold", Math.Max(ActivationThreshold, 0.05f));
+
            DamageOverlayAlpha  = element.GetAttributeFloat("damageoverlayalpha", 0.0f);
            BurnOverlayAlpha    = element.GetAttributeFloat("burnoverlayalpha", 0.0f);

@@ -460,6 +460,7 @@ namespace Barotrauma
            {
                affliction.Strength = 0.0f;
            }
+            CalculateVitality();
        }

        private void AddLimbAffliction(Limb limb, Affliction newAffliction)