Rework climbing (#7706)
This commit is contained in:
@@ -1,34 +1,8 @@
|
||||
using Content.Shared.Climbing;
|
||||
using Content.Shared.DragDrop;
|
||||
using Content.Shared.Interaction;
|
||||
using Content.Shared.Interaction.Helpers;
|
||||
using Robust.Shared.GameObjects;
|
||||
|
||||
namespace Content.Client.Movement.Components
|
||||
{
|
||||
[RegisterComponent]
|
||||
[ComponentReference(typeof(IClimbable))]
|
||||
public sealed class ClimbableComponent : SharedClimbableComponent
|
||||
{
|
||||
public override bool CanDragDropOn(DragDropEvent eventArgs)
|
||||
{
|
||||
if (!base.CanDragDropOn(eventArgs))
|
||||
return false;
|
||||
namespace Content.Client.Movement.Components;
|
||||
|
||||
var user = eventArgs.User;
|
||||
var target = eventArgs.Target;
|
||||
var dragged = eventArgs.Dragged;
|
||||
bool Ignored(EntityUid entity) => entity == target || entity == user || entity == dragged;
|
||||
|
||||
var sys = EntitySystem.Get<SharedInteractionSystem>();
|
||||
|
||||
return sys.InRangeUnobstructed(user, target, Range, predicate: Ignored)
|
||||
&& sys.InRangeUnobstructed(user, dragged, Range, predicate: Ignored);
|
||||
}
|
||||
|
||||
public override bool DragDropOn(DragDropEvent eventArgs)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
[RegisterComponent]
|
||||
[Friend(typeof(ClimbSystem))]
|
||||
[ComponentReference(typeof(SharedClimbableComponent))]
|
||||
public sealed class ClimbableComponent : SharedClimbableComponent { }
|
||||
|
||||
Reference in New Issue
Block a user