(38b5d9aad) Experimental changes to syncing ragdolled (unconscious/dead) characters: - Higher error tolerance when syncing the positions. It's often hard to get the main limb exactly to the same position as the collider, because the positions of the limbs aren't synced and the pose of the ragdoll may differ between the server and clients. Increasing the tolerance makes it less likely for dead/unconscious characters to "twitch" when the game attempts to force the main limb to the position of the collider. - If the position of the ragdoll differs from the position of the collider so much that CheckDistFromCollider disables limb collisions, apply an additional force to all limbs to force the ragdoll to the correct position. Otherwise the ragdoll can occasionally start "hanging" midair, clipping through solid objects, because the main limb's pull joint doesn't necessarily have enough force to pull the entire ragdoll up to the collider.

2019-04-01 22:47:03 +03:00
parent 11f2bf4b38
commit ec7e23061b
130 changed files with 1359 additions and 2352 deletions
@@ -426,11 +426,11 @@ namespace Barotrauma.Items.Components

        public override bool Use(float deltaTime, Character character = null)
        {
-            if (!attachable || item.body == null) { return character == null || character.IsKeyDown(InputType.Aim); }
+            if (!attachable || item.body == null) return (character == null || character.IsKeyDown(InputType.Aim));
            if (character != null)
            {
-                if (!character.IsKeyDown(InputType.Aim)) { return false; }
-                if (!CanBeAttached()) { return false; }
+                if (!character.IsKeyDown(InputType.Aim)) return false;
+                if (!CanBeAttached()) return false;
 #if SERVER
                if (GameMain.Server != null)
                {
@@ -438,12 +438,7 @@ namespace Barotrauma.Items.Components
                    GameServer.Log(character.LogName + " attached " + item.Name + " to a wall", ServerLog.MessageType.ItemInteraction);
                }
 #endif
-            }
-
-            if (GameMain.NetworkMember == null || GameMain.NetworkMember.IsServer)
-            {
-                if (character != null) { item.Drop(character); }
-                AttachToWall();
+                item.Drop(character);
            }

            return true;
@@ -555,7 +550,7 @@ namespace Barotrauma.Items.Components
        public override void ServerWrite(NetBuffer msg, Client c, object[] extraData = null)
        {
            base.ServerWrite(msg, c, extraData);
-            if (!attachable || body == null) { return; }
+            if (!attachable || body == null) return;

            msg.Write(Attached);
            msg.Write(body.SimPosition.X);
@@ -2,15 +2,12 @@
 using Lidgren.Network;
 using Microsoft.Xna.Framework;
 using System;
-using System.Linq;
 using System.Xml.Linq;

 namespace Barotrauma.Items.Components
 {
    partial class LevelResource : ItemComponent, IServerSerializable
    {
-        private float lastSentDeattachTimer;
-
        [Serialize(1.0f, false)]
        public float DeattachDuration
        {
@@ -24,29 +21,12 @@ namespace Barotrauma.Items.Components
            get { return deattachTimer; }
            set
            {
-                //clients don't deattach the item until the server says so (handled in ClientRead)
-                if (GameMain.NetworkMember != null && GameMain.NetworkMember.IsClient)
-                {
-                    return;
-                }
                deattachTimer = Math.Max(0.0f, value);
-#if SERVER
-                if (deattachTimer >= DeattachDuration)
-                {
-                    if (holdable.Attached){ item.CreateServerEvent(this); }
-                    holdable.DeattachFromWall();
-                }
-                else if (Math.Abs(lastSentDeattachTimer - deattachTimer) > 0.1f)
-                {
-                    item.CreateServerEvent(this);
-                    lastSentDeattachTimer = deattachTimer;
-                }
-#else
-                if (deattachTimer >= DeattachDuration)
+                //clients don't deattach the item until the server says so (handled in ClientRead)
+                if ((GameMain.NetworkMember == null || !GameMain.NetworkMember.IsClient) && deattachTimer >= DeattachDuration)
                {
                    holdable.DeattachFromWall();
                }
-#endif
            }
        }

@@ -87,10 +67,7 @@ namespace Barotrauma.Items.Components
                return;
            }
            holdable.Reattachable = false;
-            if (requiredItems.Any())
-            {
-                holdable.PickingTime = float.MaxValue;
-            }
+            holdable.PickingTime = float.MaxValue;

            var body = item.body ?? holdable.Body;
            
@@ -17,8 +17,6 @@ namespace Barotrauma.Items.Components
        private readonly List<string> fixableEntities;
        private Vector2 pickedPosition;
        private float activeTimer;
-
-        private Vector2 debugRayStartPos, debugRayEndPos;
        
        [Serialize(0.0f, false)]
        public float Range { get; set; }
@@ -158,7 +156,7 @@ namespace Barotrauma.Items.Components
            var collisionCategories = Physics.CollisionWall | Physics.CollisionCharacter | Physics.CollisionItem | Physics.CollisionLevel | Physics.CollisionRepair;
            if (RepairThroughWalls)
            {
-                var bodies = Submarine.PickBodies(rayStart, rayEnd, ignoredBodies, collisionCategories, ignoreSensors: false, allowInsideFixture: true);
+                var bodies = Submarine.PickBodies(rayStart, rayEnd, ignoredBodies, collisionCategories, ignoreSensors: false);
                foreach (Body body in bodies)
                {
                    FixBody(user, deltaTime, degreeOfSuccess, body);
@@ -166,7 +164,7 @@ namespace Barotrauma.Items.Components
            }
            else
            {
-                FixBody(user, deltaTime, degreeOfSuccess, Submarine.PickBody(rayStart, rayEnd, ignoredBodies, collisionCategories, ignoreSensors: false, allowInsideFixture: true));
+                FixBody(user, deltaTime, degreeOfSuccess, Submarine.PickBody(rayStart, rayEnd, ignoredBodies, collisionCategories, ignoreSensors: false));
            }
            
            if (ExtinguishAmount > 0.0f && item.CurrentHull != null)
@@ -249,7 +247,6 @@ namespace Barotrauma.Items.Components

                var levelResource = targetItem.GetComponent<LevelResource>();
                if (levelResource != null && levelResource.IsActive &&
-                    levelResource.requiredItems.Any() &&
                    levelResource.HasRequiredItems(user, addMessage: false))
                {
                    levelResource.DeattachTimer += deltaTime;
@@ -104,8 +104,8 @@ namespace Barotrauma.Items.Components
 #if SERVER
                    GameServer.Log(picker.LogName + " threw " + item.Name, ServerLog.MessageType.ItemInteraction);
 #endif
-                    Character thrower = picker;
-                    item.Drop(thrower, createNetworkEvent: GameMain.NetworkMember == null || GameMain.NetworkMember.IsServer);
+
+                    item.Drop(picker, createNetworkEvent: GameMain.NetworkMember == null || GameMain.NetworkMember.IsServer);
                    item.body.ApplyLinearImpulse(throwVector * throwForce * item.body.Mass * 3.0f);

                    ac.GetLimb(LimbType.Head).body.ApplyLinearImpulse(throwVector*10.0f);