Add client pulling prediction (#2041)

* WIP changes * Merge conflict fixes * Bring pull controlelr to current year * Sync and predict PullController on the client * Clean imports * Slow down pullers and make pulling tighter * Stop pulls on pullable or puller component removals * Make pulling not occur when moving towards the pulled entity
2020-10-16 20:35:09 +02:00
parent 0345fbbd22
commit b1fe4bad01
24 changed files with 734 additions and 341 deletions
--- a/Content.Server/GameObjects/Components/Pulling/PullableComponent.cs
+++ b/Content.Server/GameObjects/Components/Pulling/PullableComponent.cs
@@ -0,0 +1,74 @@
+#nullable enable
+using Content.Shared.GameObjects.Components.Items;
+using Content.Shared.GameObjects.Components.Pulling;
+using Content.Shared.GameObjects.EntitySystems;
+using Content.Shared.GameObjects.Verbs;
+using Content.Shared.Physics.Pull;
+using Robust.Shared.GameObjects;
+using Robust.Shared.GameObjects.Components;
+using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.Localization;
+
+namespace Content.Server.GameObjects.Components.Pulling
+{
+    [RegisterComponent]
+    [ComponentReference(typeof(SharedPullableComponent))]
+    public class PullableComponent : SharedPullableComponent
+    {
+        [Verb]
+        public class PullingVerb : Verb<PullableComponent>
+        {
+            protected override void GetData(IEntity user, PullableComponent component, VerbData data)
+            {
+                data.Visibility = VerbVisibility.Invisible;
+
+                if (user == component.Owner)
+                {
+                    return;
+                }
+
+                if (!user.Transform.Coordinates.TryDistance(user.EntityManager, component.Owner.Transform.Coordinates, out var distance) ||
+                    distance > SharedInteractionSystem.InteractionRange)
+                {
+                    return;
+                }
+
+                if (!user.HasComponent<ISharedHandsComponent>() ||
+                    !user.TryGetComponent(out IPhysicsComponent? userPhysics) ||
+                    !component.Owner.TryGetComponent(out IPhysicsComponent? targetPhysics) ||
+                    targetPhysics.Anchored)
+                {
+                    return;
+                }
+
+                var controller = targetPhysics.EnsureController<PullController>();
+
+                data.Visibility = VerbVisibility.Visible;
+                data.Text = controller.Puller == userPhysics
+                    ? Loc.GetString("Stop pulling")
+                    : Loc.GetString("Pull");
+            }
+
+            protected override void Activate(IEntity user, PullableComponent component)
+            {
+                if (!user.TryGetComponent(out IPhysicsComponent? userCollidable) ||
+                    !component.Owner.TryGetComponent(out IPhysicsComponent? targetCollidable) ||
+                    targetCollidable.Anchored)
+                {
+                    return;
+                }
+
+                var controller = targetCollidable.EnsureController<PullController>();
+
+                if (controller.Puller == userCollidable)
+                {
+                    component.TryStopPull();
+                }
+                else
+                {
+                    component.TryStartPull(user);
+                }
+            }
+        }
+    }
+}