(9bd8db487) Allow to aim in ladders when not moving.

2019-04-02 12:41:18 +03:00
parent 7d8b489319
commit e86d86c41f
9 changed files with 49 additions and 46 deletions
@@ -84,12 +84,9 @@ namespace Barotrauma
                    useExtinquisherTimer += deltaTime;
                    if (useExtinquisherTimer > 2.0f) useExtinquisherTimer = 0.0f;

+                    character.AIController.SteeringManager.Reset();
                    character.CursorPosition = fs.Position;
                    character.SetInput(InputType.Aim, false, true);
-                    if (!character.IsClimbing)
-                    {
-                        character.AIController.SteeringManager.Reset();
-                    }
                    extinguisher.Use(deltaTime, character);

                    if (!targetHull.FireSources.Contains(fs))
@@ -168,8 +168,11 @@ namespace Barotrauma
                // Too close -> steer away
                character.AIController.SteeringManager.SteeringManual(deltaTime, Vector2.Normalize(character.SimPosition - Item.SimPosition) / 2);
            }
-            if (character.IsClimbing || 
-                VectorExtensions.Angle(VectorExtensions.Forward(repairTool.Item.body.TransformedRotation), fromToolToTarget) < MathHelper.PiOver4)
+            else
+            {
+                character.AIController.SteeringManager.Reset();
+            }
+            if (VectorExtensions.Angle(VectorExtensions.Forward(repairTool.Item.body.TransformedRotation), fromToolToTarget) < MathHelper.PiOver4)
            {
                repairTool.Use(deltaTime, character);
            }
@@ -1122,18 +1122,22 @@ namespace Barotrauma
            //prevent the hands from going above the top of the ladders
            handPos.Y = Math.Min(-0.5f, handPos.Y);

-            MoveLimb(leftHand,
-                new Vector2(handPos.X,
-                (slide ? handPos.Y : MathUtils.Round(handPos.Y - stepHeight, stepHeight * 2.0f) + stepHeight) + ladderSimPos.Y),
-                5.2f);
+            // TODO: lock only one hand when aiming?
+            if (!PlayerInput.KeyDown(InputType.Aim) || Math.Abs(movement.Y) > 0.01f)
+            {
+                MoveLimb(leftHand,
+                    new Vector2(handPos.X,
+                    (slide ? handPos.Y : MathUtils.Round(handPos.Y - stepHeight, stepHeight * 2.0f) + stepHeight) + ladderSimPos.Y),
+                    5.2f);

-            MoveLimb(rightHand,
-                new Vector2(handPos.X,
-                (slide ? handPos.Y : MathUtils.Round(handPos.Y, stepHeight * 2.0f)) + ladderSimPos.Y),
-                5.2f);
+                MoveLimb(rightHand,
+                    new Vector2(handPos.X,
+                    (slide ? handPos.Y : MathUtils.Round(handPos.Y, stepHeight * 2.0f)) + ladderSimPos.Y),
+                    5.2f);

-            leftHand.body.ApplyTorque(Dir * 2.0f);
-            rightHand.body.ApplyTorque(Dir * 2.0f);
+                leftHand.body.ApplyTorque(Dir * 2.0f);
+                rightHand.body.ApplyTorque(Dir * 2.0f);
+            }

            Vector2 footPos = new Vector2(
                handPos.X - Dir * 0.05f,
@@ -1647,12 +1651,13 @@ namespace Barotrauma
            Vector2 itemPos = aim ? aimPos : holdPos;

            bool usingController = character.SelectedConstruction != null && character.SelectedConstruction.GetComponent<Controller>() != null;
+            bool isClimbing = character.IsClimbing && Math.Abs(character.AnimController.TargetMovement.Y) > 0.01f;

            float itemAngle;

            Holdable holdable = item.GetComponent<Holdable>();

-            if (!character.IsClimbing && !usingController && character.Stun <= 0.0f && aim && itemPos != Vector2.Zero)
+            if (!isClimbing && !usingController && character.Stun <= 0.0f && aim && itemPos != Vector2.Zero)
            {
                Vector2 mousePos = ConvertUnits.ToSimUnits(character.SmoothedCursorPosition);

@@ -1682,7 +1687,7 @@ namespace Barotrauma
            }

            Vector2 transformedHoldPos = shoulder.WorldAnchorA;
-            if (itemPos == Vector2.Zero || character.IsClimbing || usingController)
+            if (itemPos == Vector2.Zero || isClimbing || usingController)
            {
                if (character.SelectedItems[0] == item)
                {
@@ -1771,16 +1776,17 @@ namespace Barotrauma

            item.SetTransform(currItemPos, itemAngle + itemAngleRelativeToHoldAngle * Dir);

-            if (character.IsClimbing) return;
-
-            for (int i = 0; i < 2; i++)
+            if (!isClimbing)
            {
-                if (character.SelectedItems[i] != item) continue;
-                if (itemPos == Vector2.Zero) continue;
+                for (int i = 0; i < 2; i++)
+                {
+                    if (character.SelectedItems[i] != item) continue;
+                    if (itemPos == Vector2.Zero) continue;

-                Limb hand = (i == 0) ? rightHand : leftHand;
+                    Limb hand = (i == 0) ? rightHand : leftHand;

-                HandIK(hand, transformedHoldPos + transformedHandlePos[i]);
+                    HandIK(hand, transformedHoldPos + transformedHandlePos[i]);
+                }
            }
        }

@@ -1147,7 +1147,7 @@ namespace Barotrauma
            {
                //Limb head = AnimController.GetLimb(LimbType.Head);
                // Values lower than this seem to cause constantious flipping when the mouse is near the player and the player is running, because the root collider moves after flipping.
-                float followMargin = 40;
+                float followMargin = 30;
                if (dontFollowCursor)
                {
                    AnimController.TargetDir = Direction.Right;