Add pulling (#1409)

* Initial framework for pulling. * Make it possible to pull items via (temporary) keybind Ctrl+Click, make items follow the player correctly. * Make other objects pullable, implement functionality for moving an object being pulled, make only one object able to be pulled at a time. * Make sure that MoveTo won't allow collisions with the player * Update everything to work with the new physics engine * Update Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs Co-authored-by: ComicIronic <comicironic@gmail.com> * Physics update and convert to direct type casts * Add notnull checks * Add pull keybinds to the tutorial window * Move PullController to shared * Fix pulled items getting left behind * Fix moving pulled objects into walls * Remove flooring of coordinates when moving pulled objects * Add missing null check in PutInHand * Change pulling keybind to control and throwing to alt * Change PhysicsComponent references to IPhysicsComponent * Add trying to pull a pulled entity disabling the pull * Add pulled status effect * Fix merge conflicts * Merge fixes * Make players pullable * Fix being able to pull yourself * Change pull moving to use a velocity * Update pulled and pulling icons to not be buckle A tragedy * Make pulled and pulling icons more consistent * Remove empty not pulled and not pulling images * Pulled icon update * Pulled icon update * Add clicking pulling status effect to stop the pull * Fix spacewalking when pulling * Merge conflict fixes * Add a pull verb * Fix nullable error * Add pulling through the entity drop down menu Co-authored-by: Jackson Lewis <inquisitivepenguin@protonmail.com> Co-authored-by: ComicIronic <comicironic@gmail.com>
2020-07-27 00:54:32 +02:00
parent b9e1f9283d
commit 0a82aba88e
26 changed files with 450 additions and 15 deletions
--- a/Content.Server/GlobalVerbs/PullingVerb.cs
+++ b/Content.Server/GlobalVerbs/PullingVerb.cs
@@ -0,0 +1,76 @@
+using Content.Server.GameObjects.Components.GUI;
+using Content.Server.GameObjects.Components.Movement;
+using Content.Shared.GameObjects;
+using Content.Shared.GameObjects.Components.Items;
+using Content.Shared.GameObjects.EntitySystems;
+using Content.Shared.Physics;
+using Robust.Server.Interfaces.GameObjects;
+using Robust.Shared.GameObjects.Components;
+using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.Localization;
+
+namespace Content.Server.GlobalVerbs
+{
+    /// <summary>
+    ///     Global verb that pulls an entity.
+    /// </summary>
+    [GlobalVerb]
+    public class PullingVerb : GlobalVerb
+    {
+        public override bool RequireInteractionRange => false;
+
+        public override void GetData(IEntity user, IEntity target, VerbData data)
+        {
+            data.Visibility = VerbVisibility.Invisible;
+
+            if (user == target ||
+                !user.HasComponent<IActorComponent>() ||
+                !target.HasComponent<PullableComponent>())
+            {
+                return;
+            }
+
+            var dist = user.Transform.GridPosition.Position - target.Transform.GridPosition.Position;
+            if (dist.LengthSquared > SharedInteractionSystem.InteractionRangeSquared)
+            {
+                return;
+            }
+
+            if (!user.HasComponent<ISharedHandsComponent>() ||
+                !user.TryGetComponent(out ICollidableComponent userCollidable) ||
+                !target.TryGetComponent(out ICollidableComponent targetCollidable))
+            {
+                return;
+            }
+
+            var controller = targetCollidable.EnsureController<PullController>();
+
+            data.Visibility = VerbVisibility.Visible;
+            data.Text = controller.Puller == userCollidable
+                ? Loc.GetString("Stop pulling")
+                : Loc.GetString("Pull");
+        }
+
+        public override void Activate(IEntity user, IEntity target)
+        {
+            if (!user.TryGetComponent(out ICollidableComponent userCollidable) ||
+                !target.TryGetComponent(out ICollidableComponent targetCollidable) ||
+                !target.TryGetComponent(out PullableComponent pullable) ||
+                !user.TryGetComponent(out HandsComponent hands))
+            {
+                return;
+            }
+
+            var controller = targetCollidable.EnsureController<PullController>();
+
+            if (controller.Puller == userCollidable)
+            {
+                hands.StopPull();
+            }
+            else
+            {
+                hands.StartPull(pullable);
+            }
+        }
+    }
+}