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

Add BreakOnDropItem, update do afters, remove unnecessary declarations (#30361)

Browse Source 
* Add BreakOnDropItem, update do afters, remove unnecessary declarations

* bola

* Changed my mind about the nuke

* gennies too

* Make the comments more clear.

* Sorry for the trailing commas

* Revert "Sorry for the trailing commas"

This reverts commit e60fd9a30977393df3344948e6d5c0ce035723cd.

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
This commit is contained in:
Plykiya
2024-08-08 04:39:46 -07:00
committed by GitHub
parent bd51cf330b
commit 190ceda02e
29 changed files with 74 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Content.Shared/DoAfter/SharedDoAfterSystem.Update.cs
View File

@@ -1,5 +1,6 @@
using Content.Shared.Gravity;
using Content.Shared.Hands.Components;
using Content.Shared.Hands.EntitySystems;
using Content.Shared.Interaction;
using Content.Shared.Physics;
using Robust.Shared.Utility;
@@ -11,6 +12,7 @@ public abstract partial class SharedDoAfterSystem : EntitySystem
[Dependency] private readonly IDynamicTypeFactory _factory = default!;
[Dependency] private readonly SharedGravitySystem _gravity = default!;
[Dependency] private readonly SharedInteractionSystem _interaction = default!;
[Dependency] private readonly SharedHandsSystem _hands = default!;
private DoAfter[] _doAfters = Array.Empty<DoAfter>();
@@ -217,16 +219,22 @@ public abstract partial class SharedDoAfterSystem : EntitySystem
if (args.AttemptFrequency == AttemptFrequency.EveryTick && !TryAttemptEvent(doAfter))
return true;
// Check if the do-after requires hands to perform at first
// For example, you need hands to strip clothes off of someone
// This does not mean their hand needs to be empty.
if (args.NeedHand)
{
if (!handsQuery.TryGetComponent(args.User, out var hands) || hands.Count == 0)
return true;
if (args.BreakOnHandChange && (hands.ActiveHand?.Name != doAfter.InitialHand
|| hands.ActiveHandEntity != doAfter.InitialItem))
{
// If an item was in the user's hand to begin with,
// check if the user is no longer holding the item.
if (args.BreakOnDropItem && !_hands.IsHolding((args.User, hands), doAfter.InitialItem))
return true;
// If the user changes which hand is active at all, interrupt the do-after
if (args.BreakOnHandChange && hands.ActiveHand?.Name != doAfter.InitialHand)
return true;
}
}
if (args.RequireCanInteract && !_actionBlocker.CanInteract(args.User, args.Target))