tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Dragdrop fold rollerbed (#30002)

Browse Source 
* Deploy foldable

* Add NetworkedComponent and access to the component

* Add handled to afterinteract

* Use drop target location instead of setcoordinates

* Put back in hand after failed deploy

This prevents dropping the bed when clicking while inside a locker.

* Created BaseDeployFoldable for folding chairs, body bags, and rollerbeds

* Add dragdrop to fold rollerbed to hand
This commit is contained in:
ShadowCommander
2024-08-07 02:19:10 -07:00
committed by GitHub
parent d86438c22b
commit 6a5cc883ce
3 changed files with 42 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Client/Interaction/DragDropSystem.cs
View File

@@ -518,6 +518,9 @@ public sealed class DragDropSystem : SharedDragDropSystem
if (dropEv2.Handled) if (dropEv2.Handled)
return dropEv2.CanDrop; return dropEv2.CanDrop;
if (dropEv.Handled && dropEv.CanDrop)
return true;
return null; return null;
} }

33
Content.Shared/Foldable/DeployFoldableSystem.cs
View File

@@ -1,3 +1,4 @@
using Content.Shared.DragDrop;
using Content.Shared.Hands.Components; using Content.Shared.Hands.Components;
using Content.Shared.Hands.EntitySystems; using Content.Shared.Hands.EntitySystems;
using Content.Shared.Interaction; using Content.Shared.Interaction;
@@ -14,6 +15,38 @@ public sealed class DeployFoldableSystem : EntitySystem
base.Initialize(); base.Initialize();
SubscribeLocalEvent<DeployFoldableComponent, AfterInteractEvent>(OnAfterInteract); SubscribeLocalEvent<DeployFoldableComponent, AfterInteractEvent>(OnAfterInteract);
SubscribeLocalEvent<DeployFoldableComponent, CanDragEvent>(OnCanDrag);
SubscribeLocalEvent<DeployFoldableComponent, DragDropDraggedEvent>(OnDragDropDragged);
SubscribeLocalEvent<DeployFoldableComponent, CanDropDraggedEvent>(OnCanDropDragged);
}
private void OnCanDropDragged(Entity<DeployFoldableComponent> ent, ref CanDropDraggedEvent args)
{
if (args.User != args.Target)
return;
args.Handled = true;
args.CanDrop = true;
}
private void OnDragDropDragged(Entity<DeployFoldableComponent> ent, ref DragDropDraggedEvent args)
{
if (!TryComp<FoldableComponent>(ent, out var foldable)
|| !_foldable.TrySetFolded(ent, foldable, true))
return;
_hands.PickupOrDrop(args.User, ent.Owner);
args.Handled = true;
}
private void OnCanDrag(Entity<DeployFoldableComponent> ent, ref CanDragEvent args)
{
if (!TryComp<FoldableComponent>(ent, out var foldable)
|| foldable.IsFolded)
return;
args.Handled = true;
} }
private void OnAfterInteract(Entity<DeployFoldableComponent> ent, ref AfterInteractEvent args) private void OnAfterInteract(Entity<DeployFoldableComponent> ent, ref AfterInteractEvent args)

11
Content.Shared/Strip/SharedStrippableSystem.cs
View File

@@ -61,11 +61,12 @@ public abstract class SharedStrippableSystem : EntitySystem
private void OnCanDropOn(EntityUid uid, StrippingComponent component, ref CanDropTargetEvent args) private void OnCanDropOn(EntityUid uid, StrippingComponent component, ref CanDropTargetEvent args)
{ {
args.Handled = true; var val = uid == args.User &&
args.CanDrop |= uid == args.User && HasComp<StrippableComponent>(args.Dragged) &&
HasComp<StrippableComponent>(args.Dragged) && HasComp<HandsComponent>(args.User) &&
HasComp<HandsComponent>(args.User) && HasComp<StrippingComponent>(args.User);
HasComp<StrippingComponent>(args.User); args.Handled |= val;
args.CanDrop |= val;
} }
private void OnCanDrop(EntityUid uid, StrippableComponent component, ref CanDropDraggedEvent args) private void OnCanDrop(EntityUid uid, StrippableComponent component, ref CanDropDraggedEvent args)