Drag changes (#2487)

* Drag changes

* Higlights only show near cursor
* Don't highlight un-droppable entities
* Fixes invalid highlights issue

* Also the scanner

* 2 months fix

* Address reviews

Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>

Content.Shared/GameObjects/Components/Buckle/SharedBuckleComponent.cs

@@ -11,6 +11,7 @@ using Robust.Shared.GameObjects.Components;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Physics;
 using Robust.Shared.Serialization;
+using Robust.Shared.ViewVariables;
 
 namespace Content.Shared.GameObjects.Components.Buckle
 {
@@ -19,6 +20,18 @@ namespace Content.Shared.GameObjects.Components.Buckle
         public sealed override string Name => "Buckle";
 
         public sealed override uint? NetID => ContentNetIDs.BUCKLE;
+        /// <summary>
+        ///     The range from which this entity can buckle to a <see cref="StrapComponent"/>.
+        /// </summary>
+        [ViewVariables]
+        public float Range { get; protected set; }
+
+        public override void ExposeData(ObjectSerializer serializer)
+        {
+            base.ExposeData(serializer);
+            serializer.DataReadWriteFunction("range", SharedInteractionSystem.InteractionRange / 1.4f, value => Range = value, () => Range);
+        }
+
         /// <summary>
         ///     True if the entity is buckled, false otherwise.
         /// </summary>

Content.Shared/GameObjects/Components/Disposal/SharedDisposalMailingUnitComponent.cs

@@ -7,7 +7,7 @@ using Robust.Shared.Utility;
 
 namespace Content.Shared.GameObjects.Components.Disposal
 {
-    public abstract class SharedDisposalMailingUnitComponent : SharedDisposalUnitComponent, ICollideSpecial
+    public abstract class SharedDisposalMailingUnitComponent : SharedDisposalUnitComponent
     {
         public override string Name => "DisposalMailingUnit";
 

Content.Shared/GameObjects/Components/Disposal/SharedDisposalUnitComponent.cs

@@ -1,6 +1,11 @@
 #nullable enable
 using System;
 using System.Collections.Generic;
+using Content.Shared.GameObjects.Components.Body;
+using Content.Shared.GameObjects.Components.Damage;
+using Content.Shared.GameObjects.Components.Mobs.State;
+using Content.Shared.GameObjects.Components.Storage;
+using Content.Shared.Interfaces.GameObjects.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.GameObjects.Components;
 using Robust.Shared.GameObjects.Components.UserInterface;
@@ -12,7 +17,7 @@ using Robust.Shared.ViewVariables;
 
 namespace Content.Shared.GameObjects.Components.Disposal
 {
-    public abstract class SharedDisposalUnitComponent : Component, ICollideSpecial
+    public abstract class SharedDisposalUnitComponent : Component, ICollideSpecial, IDragDropOn
     {
         public override string Name => "DisposalUnit";
 
@@ -160,5 +165,34 @@ namespace Content.Shared.GameObjects.Components.Disposal
         {
             Key
         }
+
+        public virtual bool CanInsert(IEntity entity)
+        {
+            if (!Anchored)
+                return false;
+
+            if (!entity.TryGetComponent(out IPhysicsComponent? physics) ||
+                !physics.CanCollide)
+            {
+                if (!(entity.TryGetComponent(out IMobStateComponent? damageState) && damageState.IsDead())) {
+                    return false;
+                }
+            }
+
+            if (!entity.HasComponent<SharedStorableComponent>() &&
+                !entity.HasComponent<IBody>())
+            {
+                return false;
+            }
+
+            return true;
+        }
+
+        public virtual bool CanDragDropOn(DragDropEventArgs eventArgs)
+        {
+            return CanInsert(eventArgs.Dragged);
+        }
+
+        public abstract bool DragDropOn(DragDropEventArgs eventArgs);
     }
 }

Content.Shared/GameObjects/Components/Medical/SharedMedicalScannerComponent.cs

@@ -1,13 +1,15 @@
 using System;
 using System.Collections.Generic;
 using Content.Shared.Damage;
+using Content.Shared.GameObjects.Components.Body;
+using Content.Shared.Interfaces.GameObjects.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.GameObjects.Components.UserInterface;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.GameObjects.Components.Medical
 {
-    public class SharedMedicalScannerComponent : Component
+    public abstract class SharedMedicalScannerComponent : Component, IDragDropOn
     {
         public override string Name => "MedicalScanner";
 
@@ -78,5 +80,11 @@ namespace Content.Shared.GameObjects.Components.Medical
         }
 
 
+        public bool CanDragDropOn(DragDropEventArgs eventArgs)
+        {
+            return eventArgs.Dragged.HasComponent<IBody>();
+        }
+
+        public abstract bool DragDropOn(DragDropEventArgs eventArgs);
     }
 }

Content.Shared/GameObjects/Components/Movement/SharedClimbableComponent.cs

@@ -1,11 +1,34 @@
-using Robust.Shared.GameObjects;
+using Content.Shared.GameObjects.EntitySystems;
+using Content.Shared.Interfaces.GameObjects.Components;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Serialization;
+using Robust.Shared.ViewVariables;
 
 namespace Content.Shared.GameObjects.Components.Movement
 {
     public interface IClimbable { };
 
-    public class SharedClimbableComponent : Component, IClimbable
+    public abstract class SharedClimbableComponent : Component, IClimbable, IDragDropOn
     {
         public sealed override string Name => "Climbable";
+
+        /// <summary>
+        ///     The range from which this entity can be climbed.
+        /// </summary>
+        [ViewVariables]
+        protected float Range;
+
+        public override void ExposeData(ObjectSerializer serializer)
+        {
+            base.ExposeData(serializer);
+            serializer.DataField(ref Range, "range", SharedInteractionSystem.InteractionRange / 1.4f);
+        }
+
+        public virtual bool CanDragDropOn(DragDropEventArgs eventArgs)
+        {
+            return eventArgs.Dragged.HasComponent<SharedClimbingComponent>();
+        }
+
+        public abstract bool DragDropOn(DragDropEventArgs eventArgs);
     }
 }

Content.Shared/GameObjects/Components/Movement/SharedClimbingComponent.cs

@@ -6,11 +6,10 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.GameObjects.Components;
 using Robust.Shared.Physics;
 using Robust.Shared.Serialization;
-using Content.Shared.Interfaces.GameObjects.Components;
 
 namespace Content.Shared.GameObjects.Components.Movement
 {
-    public abstract class SharedClimbingComponent : Component, IActionBlocker, ICollideSpecial, IDraggable
+    public abstract class SharedClimbingComponent : Component, IActionBlocker, ICollideSpecial
     {
         public sealed override string Name => "Climbing";
         public sealed override uint? NetID => ContentNetIDs.CLIMBING;
@@ -47,16 +46,6 @@ namespace Content.Shared.GameObjects.Components.Movement
             return false;
         }
 
-        bool IDraggable.CanDrop(CanDropEventArgs args)
-        {
-            return args.Target.HasComponent<IClimbable>();
-        }
-
-        bool IDraggable.Drop(DragDropEventArgs args)
-        {
-            return false;
-        }
-
         public override void Initialize()
         {
             base.Initialize();

Content.Shared/GameObjects/Components/Strap/SharedStrapComponent.cs

@@ -1,4 +1,8 @@
 using System;
+using Content.Shared.GameObjects.Components.Buckle;
+using Content.Shared.GameObjects.EntitySystems;
+using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Utility;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Serialization;
@@ -23,11 +27,21 @@ namespace Content.Shared.GameObjects.Components.Strap
         Down
     }
 
-    public abstract class SharedStrapComponent : Component
+    public abstract class SharedStrapComponent : Component, IDragDropOn
     {
         public sealed override string Name => "Strap";
 
         public sealed override uint? NetID => ContentNetIDs.STRAP;
+
+        public virtual bool CanDragDropOn(DragDropEventArgs eventArgs)
+        {
+            if (!eventArgs.Dragged.TryGetComponent(out SharedBuckleComponent buckleComponent)) return false;
+            bool Ignored(IEntity entity) => entity == eventArgs.User || entity == eventArgs.Dragged || entity == eventArgs.Target;
+
+            return eventArgs.Target.InRangeUnobstructed(eventArgs.Dragged, buckleComponent.Range, predicate: Ignored);
+        }
+
+        public abstract bool DragDropOn(DragDropEventArgs eventArgs);
     }
 
     [Serializable, NetSerializable]