Faction Test 100.4.0.0

2022-11-14 18:28:28 +02:00
parent 87426b68b2
commit c772b61fc1
412 changed files with 16984 additions and 5530 deletions
@@ -87,7 +87,7 @@ namespace Barotrauma
        }

        public bool CanWalk => RagdollParams.CanWalk;
-        public bool IsMovingBackwards => !InWater && Math.Sign(targetMovement.X) == -Math.Sign(Dir);
+        public bool IsMovingBackwards => !InWater && Math.Sign(targetMovement.X) == -Math.Sign(Dir) && CurrentAnimationParams is not FishGroundedParams { Flip: false };

        // TODO: define death anim duration in XML
        protected float deathAnimTimer, deathAnimDuration = 5.0f;
@@ -135,8 +135,14 @@ namespace Barotrauma

        public override void UpdateAnim(float deltaTime)
        {
-            if (Frozen) return;
-            if (MainLimb == null) { return; }
+            //wait a bit for the ragdoll to "settle" (for joints to force the limbs to appropriate positions) before starting to animate
+            if (Timing.TotalTime - character.SpawnTime < 0.1f) { return; }
+            if (Frozen) { return; }
+            if (MainLimb == null)
+            {
+                ResetState();
+                return;
+            }
            var mainLimb = MainLimb;

            levitatingCollider = !IsHanging;
@@ -164,6 +170,7 @@ namespace Barotrauma
                    //cannot walk but on dry land -> wiggle around
                    UpdateDying(deltaTime);
                }
+                ResetState();
                return;
            }
            else
@@ -176,11 +183,17 @@ namespace Barotrauma
            {
                var lowestLimb = FindLowestLimb();

-                Collider.SetTransform(new Vector2(
-                    Collider.SimPosition.X,
-                    Math.Max(lowestLimb.SimPosition.Y + (Collider.radius + Collider.height / 2), Collider.SimPosition.Y)),
-                    0.0f);
-
+                if (InWater)
+                {
+                    Collider.SetTransform(new Vector2(Collider.SimPosition.X, MainLimb.SimPosition.Y), 0.0f);
+                }
+                else
+                {
+                    Collider.SetTransform(new Vector2(
+                        Collider.SimPosition.X,
+                        Math.Max(lowestLimb.SimPosition.Y + (Collider.Radius + Collider.Height / 2), Collider.SimPosition.Y)),
+                        0.0f);
+                }
                Collider.Enabled = true;
            }

@@ -223,6 +236,7 @@ namespace Barotrauma
            if (character.SelectedCharacter != null)
            {
                DragCharacter(character.SelectedCharacter, deltaTime);
+                ResetState();
                return;
            }
            if (character.AnimController.AnimationTestPose)
@@ -230,7 +244,11 @@ namespace Barotrauma
                ApplyTestPose();
            }
            //don't flip when simply physics is enabled
-            if (SimplePhysicsEnabled) { return; }
+            if (SimplePhysicsEnabled)
+            {
+                ResetState();
+                return;
+            }
            
            if (!character.IsRemotelyControlled && (character.AIController == null || character.AIController.CanFlip) && !Aiming)
            {
@@ -264,43 +282,47 @@ namespace Barotrauma
                }
            }

-            if (!CurrentFishAnimation.Flip) { return; }
-            if (IsStuck) { return; }
-            if (character.AIController != null && !character.AIController.CanFlip) { return; }
-
-            flipCooldown -= deltaTime;
-            if (TargetDir != Direction.None && TargetDir != dir)
+            if (!IsStuck && CurrentFishAnimation.Flip && character.AIController is not { CanFlip: false })
            {
-                flipTimer += deltaTime;
-                // Speed reductions are not taken into account here. It's intentional: an ai character cannot flip if it's heavily paralyzed (for example).
-                float requiredSpeed = CurrentAnimationParams.MovementSpeed / 2;
-                if (CurrentHull != null)
+                flipCooldown -= deltaTime;
+                if (TargetDir != Direction.None && TargetDir != dir)
                {
-                    // Enemy movement speeds are halved inside submarines
-                    requiredSpeed /= 2;
-                }
-                bool isMovingFastEnough = Math.Abs(MainLimb.LinearVelocity.X) > requiredSpeed;
-                bool isTryingToMoveHorizontally = Math.Abs(TargetMovement.X) > Math.Abs(TargetMovement.Y);
-                if ((flipTimer > CurrentFishAnimation.FlipDelay && flipCooldown <= 0.0f && ((isMovingFastEnough && isTryingToMoveHorizontally) || IsMovingBackwards))
-                    || character.IsRemotePlayer)
-                {
-                    Flip();
-                    if (!inWater || (CurrentSwimParams != null && CurrentSwimParams.Mirror))
+                    flipTimer += deltaTime;
+                    // Speed reductions are not taken into account here. It's intentional: an ai character cannot flip if it's heavily paralyzed (for example).
+                    float requiredSpeed = CurrentAnimationParams.MovementSpeed / 2;
+                    if (CurrentHull != null)
                    {
-                        Mirror(CurrentSwimParams != null ? CurrentSwimParams.MirrorLerp : true);
+                        // Enemy movement speeds are halved inside submarines
+                        requiredSpeed /= 2;
                    }
+                    bool isMovingFastEnough = Math.Abs(MainLimb.LinearVelocity.X) > requiredSpeed;
+                    bool isTryingToMoveHorizontally = Math.Abs(TargetMovement.X) > Math.Abs(TargetMovement.Y);
+                    if ((flipTimer > CurrentFishAnimation.FlipDelay && flipCooldown <= 0.0f && ((isMovingFastEnough && isTryingToMoveHorizontally) || IsMovingBackwards))
+                        || character.IsRemotePlayer)
+                    {
+                        Flip();
+                        if (!inWater || (CurrentSwimParams != null && CurrentSwimParams.Mirror))
+                        {
+                            Mirror(CurrentSwimParams != null ? CurrentSwimParams.MirrorLerp : true);
+                        }
+                        flipTimer = 0.0f;
+                        flipCooldown = CurrentFishAnimation.FlipCooldown;
+                    }
+                }
+                else
+                {
                    flipTimer = 0.0f;
-                    flipCooldown = CurrentFishAnimation.FlipCooldown;
                }
            }
-            else
+            ResetState();
+
+            void ResetState()
            {
-                flipTimer = 0.0f;
+                wasAiming = aiming;
+                aiming = false;
+                wasAimingMelee = aimingMelee;
+                aimingMelee = false;
            }
-            wasAiming = aiming;
-            aiming = false;
-            wasAimingMelee = aimingMelee;
-            aimingMelee = false;
        }

        private bool CanDrag(Character target)
@@ -463,19 +485,26 @@ namespace Barotrauma
            if (SimplePhysicsEnabled) { return; }
            mainLimb.PullJointEnabled = true;

-            if (aiming && movement.Length() <= 0.1f)
-            {
-                Vector2 mousePos = ConvertUnits.ToSimUnits(character.CursorPosition);
-                Vector2 diff = (mousePos - (GetLimb(LimbType.Torso) ?? MainLimb).SimPosition) * Dir;
-                TargetMovement = new Vector2(0.0f, -0.1f);
-                float newRotation = MathUtils.VectorToAngle(diff);
-                Collider.SmoothRotate(newRotation, CurrentSwimParams.SteerTorque * character.SpeedMultiplier);
-            }
-
-            if (!isMoving)
+            if (!isMoving && !CurrentSwimParams.UpdateAnimationWhenNotMoving)
            {
                WalkPos = MathHelper.SmoothStep(WalkPos, MathHelper.PiOver2, deltaTime * 5);
                mainLimb.PullJointWorldAnchorB = Collider.SimPosition;
+                if (aiming)
+                {
+                    Vector2 mousePos = ConvertUnits.ToSimUnits(character.CursorPosition);
+                    Vector2 diff = (mousePos - (GetLimb(LimbType.Torso) ?? MainLimb).SimPosition) * Dir;
+                    TargetMovement = new Vector2(0.0f, -0.1f);
+                    float newRotation = MathHelper.WrapAngle(MathUtils.VectorToAngle(diff) - MathHelper.PiOver2 * Dir);
+                    Collider.SmoothRotate(newRotation, CurrentSwimParams.SteerTorque * character.SpeedMultiplier * 2);
+                    if (TorsoAngle.HasValue)
+                    {
+                        Limb torso = GetLimb(LimbType.Torso);
+                        if (torso != null)
+                        {
+                            SmoothRotateWithoutWrapping(torso, newRotation + TorsoAngle.Value * Dir, mainLimb, TorsoTorque * 2);
+                        }
+                    }
+                }
            }
            else
            {
@@ -168,7 +168,7 @@ namespace Barotrauma
        {
            get
            {
-                float shoulderHeight = Collider.height / 2.0f;
+                float shoulderHeight = Collider.Height / 2.0f;
                if (inWater)
                {
                    shoulderHeight += 0.4f;
@@ -299,7 +299,7 @@ namespace Barotrauma
                
                Collider.SetTransform(new Vector2(
                    Collider.SimPosition.X,
-                    Math.Max(lowestLimb.SimPosition.Y + (Collider.radius + Collider.height / 2), Collider.SimPosition.Y)),
+                    Math.Max(lowestLimb.SimPosition.Y + (Collider.Radius + Collider.Height / 2), Collider.SimPosition.Y)),
                    Collider.Rotation);
                
                Collider.FarseerBody.ResetDynamics();
@@ -610,15 +610,18 @@ namespace Barotrauma
                torsoAngle -= herpesStrength / 150.0f;
                torso.body.SmoothRotate(torsoAngle * Dir, CurrentGroundedParams.TorsoTorque);
            }
-            if (!Aiming && CurrentGroundedParams.FixedHeadAngle && HeadAngle.HasValue)
+            if (!head.Disabled)
            {
-                float headAngle = HeadAngle.Value;
-                if (Crouching && !movingHorizontally) { headAngle -= HumanCrouchParams.ExtraHeadAngleWhenStationary; }
-                head.body.SmoothRotate(headAngle * Dir, CurrentGroundedParams.HeadTorque);
-            }
-            else
-            {
-                RotateHead(head);
+                if (!Aiming && CurrentGroundedParams.FixedHeadAngle && HeadAngle.HasValue)
+                {
+                    float headAngle = HeadAngle.Value;
+                    if (Crouching && !movingHorizontally) { headAngle -= HumanCrouchParams.ExtraHeadAngleWhenStationary; }
+                    head.body.SmoothRotate(headAngle * Dir, CurrentGroundedParams.HeadTorque);
+                }
+                else
+                {
+                    RotateHead(head);
+                }
            }

            if (!onGround)
@@ -1117,7 +1120,7 @@ namespace Barotrauma
                ladderSimPos -= currentHull.Submarine.SimPosition;
            }

-            float bottomPos = Collider.SimPosition.Y - ColliderHeightFromFloor - Collider.radius - Collider.height / 2.0f;
+            float bottomPos = Collider.SimPosition.Y - ColliderHeightFromFloor - Collider.Radius - Collider.Height / 2.0f;
            float torsoPos = TorsoPosition ?? 0;
            MoveLimb(torso, new Vector2(ladderSimPos.X - 0.35f * Dir, bottomPos + torsoPos), 10.5f);
            float headPos = HeadPosition ?? 0;
@@ -1212,7 +1215,7 @@ namespace Barotrauma

            if (character.SimPosition.Y > ladderSimPos.Y) { climbForce.Y = Math.Min(0.0f, climbForce.Y); }
            //reached the bottom -> can't go further down
-            float minHeightFromFloor = ColliderHeightFromFloor / 2 + Collider.height;
+            float minHeightFromFloor = ColliderHeightFromFloor / 2 + Collider.Height;
            if (floorFixture != null && 
                !floorFixture.CollisionCategories.HasFlag(Physics.CollisionStairs) &&
                !floorFixture.CollisionCategories.HasFlag(Physics.CollisionPlatform) &&
@@ -1389,7 +1392,7 @@ namespace Barotrauma
                target.Oxygen += deltaTime * 0.5f; //Stabilize them        
            }

-            bool powerfulCPR = character.HasAbilityFlag(AbilityFlags.PowerfulCPR);
+            float cprBoost = character.GetStatValue(StatTypes.CPRBoost);
           
            int skill = (int)character.GetSkillLevel("medical");
            //pump for 15 seconds (cprAnimTimer 0-15), then do mouth-to-mouth for 2 seconds (cprAnimTimer 15-17)
@@ -1406,7 +1409,7 @@ namespace Barotrauma
                {
                    if (target.Oxygen < -10.0f)
                    {
-                        if (powerfulCPR)
+                        if (cprBoost >= 1f)
                        {
                            //prevent the patient from suffocating no matter how fast their oxygen level is dropping
                            target.Oxygen = Math.Max(target.Oxygen, -10.0f);
@@ -1453,7 +1456,7 @@ namespace Barotrauma
                        reviveChance = (float)Math.Pow(reviveChance, CPRSettings.Active.ReviveChanceExponent);
                        reviveChance = MathHelper.Clamp(reviveChance, CPRSettings.Active.ReviveChanceMin, CPRSettings.Active.ReviveChanceMax);

-                        if (powerfulCPR) { reviveChance *= 2.0f; }
+                        reviveChance *= 1f + cprBoost;

                        if (Rand.Range(0.0f, 1.0f, Rand.RandSync.ServerAndClient) <= reviveChance)
                        {
@@ -1833,8 +1836,6 @@ namespace Barotrauma
                {
                    heldItem.FlipX(relativeToSub: false);
                }
-                // TODO: was this added by a mistake?
-                //heldItem.FlipX(relativeToSub: false);
            }

            foreach (Limb limb in Limbs)
@@ -169,18 +169,18 @@ namespace Barotrauma
                if (value == colliderIndex || collider == null) { return; }
                if (value >= collider.Count || value < 0) { return; }

-                if (collider[colliderIndex].height < collider[value].height)
+                if (collider[colliderIndex].Height < collider[value].Height)
                {
                    Vector2 pos1 = collider[colliderIndex].SimPosition;
-                    pos1.Y -= collider[colliderIndex].height * ColliderHeightFromFloor;
+                    pos1.Y -= collider[colliderIndex].Height * ColliderHeightFromFloor;
                    Vector2 pos2 = pos1;
-                    pos2.Y += collider[value].height * 1.1f;
+                    pos2.Y += collider[value].Height * 1.1f;
                    if (GameMain.World.RayCast(pos1, pos2).Any(f => f.CollisionCategories.HasFlag(Physics.CollisionWall) && !(f.Body.UserData is Submarine))) { return; }
                }

                Vector2 pos = collider[colliderIndex].SimPosition;
-                pos.Y -= collider[colliderIndex].height * 0.5f;
-                pos.Y += collider[value].height * 0.5f;
+                pos.Y -= collider[colliderIndex].Height * 0.5f;
+                pos.Y += collider[value].Height * 0.5f;
                collider[value].SetTransform(pos, collider[colliderIndex].Rotation);

                collider[value].LinearVelocity  = collider[colliderIndex].LinearVelocity;
@@ -571,6 +571,10 @@ namespace Barotrauma

        protected void AddLimb(LimbParams limbParams)
        {
+            if (limbParams.ID < 0 || limbParams.ID > 255)
+            {
+                throw new Exception($"Invalid limb params in limb \"{limbParams.Type}\". \"{limbParams.ID}\" is not a valid limb ID.");
+            }
            byte ID = Convert.ToByte(limbParams.ID);
            Limb limb = new Limb(this, character, limbParams);
            limb.body.FarseerBody.OnCollision += OnLimbCollision;
@@ -676,6 +680,10 @@ namespace Barotrauma
                }
                return true;
            }
+            else if (character.Submarine != null && structure.Submarine != null && character.Submarine != structure.Submarine)
+            {
+                return false;
+            }

            Vector2 colliderBottom = GetColliderBottom();
            if (structure.IsPlatform)
@@ -873,7 +881,7 @@ namespace Barotrauma

            foreach (Limb limb in Limbs)
            {
-                if (limb == null || limb.IsSevered) { continue; }
+                if (limb == null || limb.IsSevered || !limb.DoesFlip) { continue; }
                limb.Dir = Dir;
                limb.MouthPos = new Vector2(-limb.MouthPos.X, limb.MouthPos.Y);
                limb.MirrorPullJoint();
@@ -1279,7 +1287,7 @@ namespace Barotrauma

            if (!inWater && character.AllowInput && levitatingCollider && Collider.LinearVelocity.Y > -ImpactTolerance && onGround)
            {
-                float targetY = standOnFloorY + ((float)Math.Abs(Math.Cos(Collider.Rotation)) * Collider.height * 0.5f) + Collider.radius + ColliderHeightFromFloor;
+                float targetY = standOnFloorY + ((float)Math.Abs(Math.Cos(Collider.Rotation)) * Collider.Height * 0.5f) + Collider.Radius + ColliderHeightFromFloor;
                if (Math.Abs(Collider.SimPosition.Y - targetY) > 0.01f && onGround)
                {
                    if (Stairs != null)
@@ -1597,7 +1605,7 @@ namespace Barotrauma
            {
                floorFixture = standOnFloorFixture;
                standOnFloorY = rayStart.Y + (rayEnd.Y - rayStart.Y) * standOnFloorFraction;
-                if (rayStart.Y - standOnFloorY < Collider.height * 0.5f + Collider.radius + ColliderHeightFromFloor * 1.2f)
+                if (rayStart.Y - standOnFloorY < Collider.Height * 0.5f + Collider.Radius + ColliderHeightFromFloor * 1.2f)
                {
                    onGround = true;
                    if (standOnFloorFixture.CollisionCategories == Physics.CollisionStairs)
@@ -1787,7 +1795,7 @@ namespace Barotrauma

        protected void CheckDistFromCollider()
        {
-            float allowedDist = Math.Max(Math.Max(Collider.radius, Collider.width), Collider.height) * 2.0f;
+            float allowedDist = Math.Max(Math.Max(Collider.Radius, Collider.Width), Collider.Height) * 2.0f;
            allowedDist = Math.Max(allowedDist, 1.0f);
            float resetDist = allowedDist * 5.0f;