Skip to content

Commit

Permalink
Deploy foldable (space-wizards#30000)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
ShadowCommander authored and themias committed Aug 9, 2024
1 parent 6afa6b9 commit 050da69
Show file tree
Hide file tree
Showing 6 changed files with 57 additions and 3 deletions.
7 changes: 7 additions & 0 deletions Content.Shared/Foldable/DeployFoldableComponent.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
using Robust.Shared.GameStates;

namespace Content.Shared.Foldable;

[RegisterComponent, NetworkedComponent]
[Access(typeof(DeployFoldableSystem))]
public sealed partial class DeployFoldableComponent : Component;
39 changes: 39 additions & 0 deletions Content.Shared/Foldable/DeployFoldableSystem.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
using Content.Shared.Hands.Components;
using Content.Shared.Hands.EntitySystems;
using Content.Shared.Interaction;

namespace Content.Shared.Foldable;

public sealed class DeployFoldableSystem : EntitySystem
{
[Dependency] private readonly SharedHandsSystem _hands = default!;
[Dependency] private readonly FoldableSystem _foldable = default!;

public override void Initialize()
{
base.Initialize();

SubscribeLocalEvent<DeployFoldableComponent, AfterInteractEvent>(OnAfterInteract);
}

private void OnAfterInteract(Entity<DeployFoldableComponent> ent, ref AfterInteractEvent args)
{
if (args.Handled || !args.CanReach)
return;

if (!TryComp<FoldableComponent>(ent, out var foldable))
return;

if (!TryComp(args.User, out HandsComponent? hands)
|| !_hands.TryDrop(args.User, args.Used, targetDropLocation: args.ClickLocation, handsComp: hands))
return;

if (!_foldable.TrySetFolded(ent, foldable, false))
{
_hands.TryPickup(args.User, args.Used, handsComp: hands);
return;
}

args.Handled = true;
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- type: entity
id: BodyBag
parent: BaseFoldable
parent: BaseDeployFoldable
name: body bag
description: A plastic bag designed for the storage and transportation of cadavers to stop body decomposition.
components:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@
node: chair

- type: entity
parent: [SeatBase, BaseFoldable]
parent: [SeatBase, BaseDeployFoldable]
id: ChairFolding
name: folding chair
description: If you carry six of these you become the coolest kid at church.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- type: entity
id: RollerBed
parent: [BaseItem, BaseFoldable]
parent: [BaseItem, BaseDeployFoldable]
name: rollerbed
description: Used to carry patients around without damaging them.
components:
Expand Down
8 changes: 8 additions & 0 deletions Resources/Prototypes/Entities/foldable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,11 @@
unfoldedLayer:
True: {visible: false}
False: {visible: true}

- type: entity
abstract: true
parent: BaseFoldable
id: BaseDeployFoldable
name: "deploy foldable"
components:
- type: DeployFoldable

0 comments on commit 050da69

Please sign in to comment.