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

More DoAfter Changes (#14609)

Browse Source 
* DoAfters

* Compact Clone()

* Fix mice and cuffables

* Try generalize attempt events

* moves climbabledoafter event to shared, fixes issue with climbable target

* Fix merge (cuffing)

* Make all events netserializable

* handful of doafter events moved

* moves the rest of the events to their respective shared folders

* Changes all mentions of server doafter to shared

* stop stripping cancellation

* fix merge errors

* draw paused doafters

* handle unpausing

* missing netserializable ref

* removes break on stun reference

* removes cuffing state reference

* Fix tools

* Fix door prying.

* Fix construction

* Fix dumping

* Fix wielding assert

* fix rev

* Fix test

* more test fixes

---------

Co-authored-by: keronshb <keronshb@live.com>
This commit is contained in:
Leon Friedrich
2023-04-03 13:13:48 +12:00
committed by GitHub
parent 9e66fac805
commit 19277a2276
170 changed files with 3042 additions and 2954 deletions
Download Patch File Download Diff File Expand all files Collapse all files

254
Content.Server/Strip/StrippableSystem.cs
View File

@@ -1,5 +1,4 @@
using System.Linq;
using Content.Server.DoAfter;
using Content.Server.Ensnaring;
using Content.Server.Hands.Components;
using Content.Shared.CombatMode;
@@ -12,7 +11,6 @@ using Content.Shared.Popups;
using Content.Shared.Strip.Components;
using Content.Shared.Verbs;
using Robust.Server.GameObjects;
using System.Threading;
using Content.Server.Administration.Logs;
using Content.Shared.Cuffs;
using Content.Shared.Cuffs.Components;
@@ -30,8 +28,8 @@ namespace Content.Server.Strip
[Dependency] private readonly SharedCuffableSystem _cuffable = default!;
[Dependency] private readonly SharedHandsSystem _handsSystem = default!;
[Dependency] private readonly InventorySystem _inventorySystem = default!;
[Dependency] private readonly DoAfterSystem _doAfterSystem = default!;
[Dependency] private readonly SharedPopupSystem _popupSystem = default!;
[Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
[Dependency] private readonly SharedPopupSystem _popup = default!;
[Dependency] private readonly EnsnareableSystem _ensnaring = default!;
[Dependency] private readonly UserInterfaceSystem _userInterfaceSystem = default!;
[Dependency] private readonly IAdminLogManager _adminLogger = default!;
@@ -61,12 +59,12 @@ namespace Content.Server.Strip
if (!TryComp<EnsnaringComponent>(entity, out var ensnaring))
continue;
_ensnaring.TryFree(uid, entity, ensnaring, user);
_ensnaring.TryFree(uid, user, entity, ensnaring);
return;
}
}
private void OnStripButtonPressed(EntityUid uid, StrippableComponent component, StrippingSlotButtonPressed args)
private void OnStripButtonPressed(EntityUid target, StrippableComponent component, StrippingSlotButtonPressed args)
{
if (args.Session.AttachedEntity is not {Valid: true} user ||
!TryComp<HandsComponent>(user, out var userHands))
@@ -74,19 +72,19 @@ namespace Content.Server.Strip
if (args.IsHand)
{
StripHand(uid, user, args.Slot, component, userHands);
StripHand(target, user, args.Slot, component, userHands);
return;
}
if (!TryComp<InventoryComponent>(component.Owner, out var inventory))
if (!TryComp<InventoryComponent>(target, out var inventory))
return;
var hasEnt = _inventorySystem.TryGetSlotEntity(component.Owner, args.Slot, out _, inventory);
var hasEnt = _inventorySystem.TryGetSlotEntity(target, args.Slot, out var held, inventory);
if (userHands.ActiveHandEntity != null && !hasEnt)
PlaceActiveHandItemInInventory(user, args.Slot, component);
PlaceActiveHandItemInInventory(user, target, userHands.ActiveHandEntity.Value, args.Slot, component);
else if (userHands.ActiveHandEntity == null && hasEnt)
TakeItemFromInventory(user, args.Slot, component);
TakeItemFromInventory(user, target, held!.Value, args.Slot, component);
}
private void StripHand(EntityUid target, EntityUid user, string handId, StrippableComponent component, HandsComponent userHands)
@@ -104,10 +102,10 @@ namespace Content.Server.Strip
return;
}
if (hand.IsEmpty && userHands.ActiveHandEntity != null)
PlaceActiveHandItemInHands(user, handId, component);
else if (!hand.IsEmpty && userHands.ActiveHandEntity == null)
TakeItemFromHands(user, handId, component);
if (userHands.ActiveHandEntity != null && hand.HeldEntity == null)
PlaceActiveHandItemInHands(user, target, userHands.ActiveHandEntity.Value, handId, component);
else if (userHands.ActiveHandEntity == null && hand.HeldEntity != null)
TakeItemFromHands(user,target, hand.HeldEntity.Value, handId, component);
}
public override void StartOpeningStripper(EntityUid user, StrippableComponent component, bool openInCombat = false)
@@ -166,287 +164,291 @@ namespace Content.Server.Strip
if (args.Target == args.User)
return;
if (!HasComp<ActorComponent>(args.User))
if (!TryComp<ActorComponent>(args.User, out var actor))
return;
args.Handled = true;
StartOpeningStripper(args.User, component);
}
/// <summary>
/// Places item in user's active hand to an inventory slot.
/// </summary>
private async void PlaceActiveHandItemInInventory(EntityUid user, string slot, StrippableComponent component)
private async void PlaceActiveHandItemInInventory(
EntityUid user,
EntityUid target,
EntityUid held,
string slot,
StrippableComponent component)
{
var userHands = Comp<HandsComponent>(user);
bool Check()
{
if (userHands.ActiveHand?.HeldEntity is not { } held)
if (userHands.ActiveHandEntity != held)
return false;
if (!_handsSystem.CanDropHeld(user, userHands.ActiveHand!))
{
user.PopupMessageCursor(Loc.GetString("strippable-component-not-holding-anything"));
_popup.PopupCursor(Loc.GetString("strippable-component-cannot-drop"), user);
return false;
}
if (!_handsSystem.CanDropHeld(user, userHands.ActiveHand))
if (_inventorySystem.TryGetSlotEntity(target, slot, out _))
{
user.PopupMessageCursor(Loc.GetString("strippable-component-cannot-drop"));
_popup.PopupCursor(Loc.GetString("strippable-component-item-slot-occupied",("owner", target)), user);
return false;
}
if (!_inventorySystem.HasSlot(component.Owner, slot))
return false;
if (_inventorySystem.TryGetSlotEntity(component.Owner, slot, out _))
if (!_inventorySystem.CanEquip(user, target, held, slot, out _))
{
user.PopupMessageCursor(Loc.GetString("strippable-component-item-slot-occupied",("owner", component.Owner)));
return false;
}
if (!_inventorySystem.CanEquip(user, component.Owner, held, slot, out _))
{
user.PopupMessageCursor(Loc.GetString("strippable-component-cannot-equip-message",("owner", component.Owner)));
_popup.PopupCursor(Loc.GetString("strippable-component-cannot-equip-message",("owner", target)), user);
return false;
}
return true;
}
if (!_inventorySystem.TryGetSlot(component.Owner, slot, out var slotDef))
if (!_inventorySystem.TryGetSlot(target, slot, out var slotDef))
{
Logger.Error($"{ToPrettyString(user)} attempted to place an item in a non-existent inventory slot ({slot}) on {ToPrettyString(component.Owner)}");
Logger.Error($"{ToPrettyString(user)} attempted to place an item in a non-existent inventory slot ({slot}) on {ToPrettyString(target)}");
return;
}
var (time, stealth) = GetStripTimeModifiers(user, component.Owner, slotDef.StripTime);
var userEv = new BeforeStripEvent(slotDef.StripTime);
RaiseLocalEvent(user, userEv);
var ev = new BeforeGettingStrippedEvent(userEv.Time, userEv.Stealth);
RaiseLocalEvent(target, ev);
var doAfterArgs = new DoAfterEventArgs(user, time, CancellationToken.None, component.Owner)
var doAfterArgs = new DoAfterArgs(user, ev.Time, new AwaitedDoAfterEvent(), null, target: target, used: held)
{
ExtraCheck = Check,
BreakOnStun = true,
AttemptFrequency = AttemptFrequency.EveryTick,
BreakOnDamage = true,
BreakOnTargetMove = true,
BreakOnUserMove = true,
NeedHand = true,
DuplicateCondition = DuplicateConditions.SameTool // Block any other DoAfters featuring this same entity.
};
if (!stealth && Check() && userHands.ActiveHandEntity != null)
if (!ev.Stealth && Check() && userHands.ActiveHandEntity != null)
{
var message = Loc.GetString("strippable-component-alert-owner-insert",
("user", Identity.Entity(user, EntityManager)), ("item", userHands.ActiveHandEntity));
_popupSystem.PopupEntity(message, component.Owner, component.Owner, PopupType.Large);
_popup.PopupEntity(message, target, target, PopupType.Large);
}
var result = await _doAfterSystem.WaitDoAfter(doAfterArgs);
var result = await _doAfter.WaitDoAfter(doAfterArgs);
if (result != DoAfterStatus.Finished) return;
if (userHands.ActiveHand?.HeldEntity is { } held
&& _handsSystem.TryDrop(user, userHands.ActiveHand, handsComp: userHands))
{
_inventorySystem.TryEquip(user, component.Owner, held, slot);
DebugTools.Assert(userHands.ActiveHand?.HeldEntity == held);
_adminLogger.Add(LogType.Stripping, LogImpact.Medium, $"{ToPrettyString(user):user} has placed the item {ToPrettyString(held):item} in {ToPrettyString(component.Owner):target}'s {slot} slot");
if (_handsSystem.TryDrop(user, handsComp: userHands))
{
_inventorySystem.TryEquip(user, target, held, slot);
_adminLogger.Add(LogType.Stripping, LogImpact.Medium, $"{ToPrettyString(user):user} has placed the item {ToPrettyString(held):item} in {ToPrettyString(target):target}'s {slot} slot");
}
}
/// <summary>
/// Places item in user's active hand in one of the entity's hands.
/// </summary>
private async void PlaceActiveHandItemInHands(EntityUid user, string handName, StrippableComponent component)
private async void PlaceActiveHandItemInHands(
EntityUid user,
EntityUid target,
EntityUid held,
string handName,
StrippableComponent component)
{
var hands = Comp<HandsComponent>(component.Owner);
var hands = Comp<HandsComponent>(target);
var userHands = Comp<HandsComponent>(user);
bool Check()
{
if (userHands.ActiveHandEntity == null)
{
user.PopupMessageCursor(Loc.GetString("strippable-component-not-holding-anything"));
if (userHands.ActiveHandEntity != held)
return false;
}
if (!_handsSystem.CanDropHeld(user, userHands.ActiveHand!))
{
user.PopupMessageCursor(Loc.GetString("strippable-component-cannot-drop"));
_popup.PopupCursor(Loc.GetString("strippable-component-cannot-drop"), user);
return false;
}
if (!hands.Hands.TryGetValue(handName, out var hand)
|| !_handsSystem.CanPickupToHand(component.Owner, userHands.ActiveHandEntity.Value, hand, checkActionBlocker: false, hands))
|| !_handsSystem.CanPickupToHand(target, userHands.ActiveHandEntity.Value, hand, checkActionBlocker: false, hands))
{
user.PopupMessageCursor(Loc.GetString("strippable-component-cannot-put-message",("owner", component.Owner)));
_popup.PopupCursor(Loc.GetString("strippable-component-cannot-put-message",("owner", target)), user);
return false;
}
return true;
}
var (time, stealth) = GetStripTimeModifiers(user, component.Owner, component.HandStripDelay);
var userEv = new BeforeStripEvent(component.HandStripDelay);
RaiseLocalEvent(user, userEv);
var ev = new BeforeGettingStrippedEvent(userEv.Time, userEv.Stealth);
RaiseLocalEvent(target, ev);
var doAfterArgs = new DoAfterEventArgs(user, time, CancellationToken.None, component.Owner)
var doAfterArgs = new DoAfterArgs(user, ev.Time, new AwaitedDoAfterEvent(), null, target: target, used: held)
{
ExtraCheck = Check,
BreakOnStun = true,
AttemptFrequency = AttemptFrequency.EveryTick,
BreakOnDamage = true,
BreakOnTargetMove = true,
BreakOnUserMove = true,
NeedHand = true,
DuplicateCondition = DuplicateConditions.SameTool
};
if (!stealth
&& Check()
&& userHands.Hands.TryGetValue(handName, out var handSlot)
&& handSlot.HeldEntity != null)
{
_popupSystem.PopupEntity(
Loc.GetString("strippable-component-alert-owner-insert",
("user", Identity.Entity(user, EntityManager)),
("item", handSlot.HeldEntity)),
component.Owner, component.Owner, PopupType.Large);
}
var result = await _doAfterSystem.WaitDoAfter(doAfterArgs);
var result = await _doAfter.WaitDoAfter(doAfterArgs);
if (result != DoAfterStatus.Finished) return;
if (userHands.ActiveHandEntity is not { } held)
return;
_handsSystem.TryDrop(user, checkActionBlocker: false, handsComp: userHands);
_handsSystem.TryPickup(component.Owner, held, handName, checkActionBlocker: false, animateUser: true, animate: !stealth, handsComp: hands);
_adminLogger.Add(LogType.Stripping, LogImpact.Medium, $"{ToPrettyString(user):user} has placed the item {ToPrettyString(held):item} in {ToPrettyString(component.Owner):target}'s hands");
_handsSystem.TryPickup(target, held, handName, checkActionBlocker: false, animateUser: true, handsComp: hands);
_adminLogger.Add(LogType.Stripping, LogImpact.Medium, $"{ToPrettyString(user):user} has placed the item {ToPrettyString(held):item} in {ToPrettyString(target):target}'s hands");
// hand update will trigger strippable update
}
/// <summary>
/// Takes an item from the inventory and places it in the user's active hand.
/// </summary>
private async void TakeItemFromInventory(EntityUid user, string slot, StrippableComponent component)
private async void TakeItemFromInventory(
EntityUid user,
EntityUid target,
EntityUid item,
string slot,
StrippableComponent component)
{
bool Check()
{
if (!_inventorySystem.HasSlot(component.Owner, slot))
return false;
if (!_inventorySystem.TryGetSlotEntity(component.Owner, slot, out _))
if (!_inventorySystem.TryGetSlotEntity(target, slot, out var ent) && ent == item)
{
user.PopupMessageCursor(Loc.GetString("strippable-component-item-slot-free-message", ("owner", component.Owner)));
_popup.PopupCursor(Loc.GetString("strippable-component-item-slot-free-message", ("owner", target)), user);
return false;
}
if (!_inventorySystem.CanUnequip(user, component.Owner, slot, out var reason))
if (!_inventorySystem.CanUnequip(user, target, slot, out var reason))
{
user.PopupMessageCursor(reason);
_popup.PopupCursor(reason, user);
return false;
}
return true;
}
if (!_inventorySystem.TryGetSlot(component.Owner, slot, out var slotDef))
if (!_inventorySystem.TryGetSlot(target, slot, out var slotDef))
{
Logger.Error($"{ToPrettyString(user)} attempted to take an item from a non-existent inventory slot ({slot}) on {ToPrettyString(component.Owner)}");
Logger.Error($"{ToPrettyString(user)} attempted to take an item from a non-existent inventory slot ({slot}) on {ToPrettyString(target)}");
return;
}
var (time, stealth) = GetStripTimeModifiers(user, component.Owner, slotDef.StripTime);
var userEv = new BeforeStripEvent(slotDef.StripTime);
RaiseLocalEvent(user, userEv);
var ev = new BeforeGettingStrippedEvent(userEv.Time, userEv.Stealth);
RaiseLocalEvent(target, ev);
var doAfterArgs = new DoAfterEventArgs(user, time, CancellationToken.None, component.Owner)
var doAfterArgs = new DoAfterArgs(user, ev.Time, new AwaitedDoAfterEvent(), null, target: target, used: item)
{
ExtraCheck = Check,
BreakOnStun = true,
AttemptFrequency = AttemptFrequency.EveryTick,
BreakOnDamage = true,
BreakOnTargetMove = true,
BreakOnUserMove = true,
NeedHand = true,
BreakOnHandChange = false, // allow simultaneously removing multiple items.
DuplicateCondition = DuplicateConditions.SameTool
};
if (!stealth && Check())
if (!ev.Stealth && Check())
{
if (slotDef.StripHidden)
{
_popupSystem.PopupEntity(Loc.GetString("strippable-component-alert-owner-hidden", ("slot", slot)), component.Owner,
component.Owner, PopupType.Large);
_popup.PopupEntity(Loc.GetString("strippable-component-alert-owner-hidden", ("slot", slot)), target,
target, PopupType.Large);
}
else if (_inventorySystem.TryGetSlotEntity(component.Owner, slot, out var slotItem))
{
_popupSystem.PopupEntity(Loc.GetString("strippable-component-alert-owner", ("user", Identity.Entity(user, EntityManager)), ("item", slotItem)), component.Owner,
component.Owner, PopupType.Large);
_popup.PopupEntity(Loc.GetString("strippable-component-alert-owner", ("user", Identity.Entity(user, EntityManager)), ("item", slotItem)), target,
target, PopupType.Large);
}
}
var result = await _doAfterSystem.WaitDoAfter(doAfterArgs);
var result = await _doAfter.WaitDoAfter(doAfterArgs);
if (result != DoAfterStatus.Finished) return;
if (_inventorySystem.TryGetSlotEntity(component.Owner, slot, out var item) && _inventorySystem.TryUnequip(user, component.Owner, slot))
{
// Raise a dropped event, so that things like gas tank internals properly deactivate when stripping
RaiseLocalEvent(item.Value, new DroppedEvent(user), true);
if (!_inventorySystem.TryUnequip(user, component.Owner, slot))
return;
// Raise a dropped event, so that things like gas tank internals properly deactivate when stripping
RaiseLocalEvent(item, new DroppedEvent(user), true);
_handsSystem.PickupOrDrop(user, item);
_adminLogger.Add(LogType.Stripping, LogImpact.Medium, $"{ToPrettyString(user):user} has stripped the item {ToPrettyString(item):item} from {ToPrettyString(target):target}");
_handsSystem.PickupOrDrop(user, item.Value, animate: !stealth);
_adminLogger.Add(LogType.Stripping, LogImpact.Medium, $"{ToPrettyString(user):user} has stripped the item {ToPrettyString(item.Value):item} from {ToPrettyString(component.Owner):target}");
}
}
/// <summary>
/// Takes an item from a hand and places it in the user's active hand.
/// </summary>
private async void TakeItemFromHands(EntityUid user, string handName, StrippableComponent component)
private async void TakeItemFromHands(EntityUid user, EntityUid target, EntityUid item, string handName, StrippableComponent component)
{
var hands = Comp<HandsComponent>(component.Owner);
var hands = Comp<HandsComponent>(target);
var userHands = Comp<HandsComponent>(user);
bool Check()
{
if (!hands.Hands.TryGetValue(handName, out var hand) || hand.HeldEntity == null)
if (!hands.Hands.TryGetValue(handName, out var hand) || hand.HeldEntity != item)
{
user.PopupMessageCursor(Loc.GetString("strippable-component-item-slot-free-message",("owner", component.Owner)));
_popup.PopupCursor(Loc.GetString("strippable-component-item-slot-free-message",("owner", target)), user);
return false;
}
if (HasComp<HandVirtualItemComponent>(hand.HeldEntity))
return false;
if (!_handsSystem.CanDropHeld(component.Owner, hand, false))
if (!_handsSystem.CanDropHeld(target, hand, false))
{
user.PopupMessageCursor(Loc.GetString("strippable-component-cannot-drop-message",("owner", component.Owner)));
_popup.PopupCursor(Loc.GetString("strippable-component-cannot-drop-message",("owner", target)), user);
return false;
}
return true;
}
var (time, stealth) = GetStripTimeModifiers(user, component.Owner, component.HandStripDelay);
var userEv = new BeforeStripEvent(component.HandStripDelay);
RaiseLocalEvent(user, userEv);
var ev = new BeforeGettingStrippedEvent(userEv.Time, userEv.Stealth);
RaiseLocalEvent(target, ev);
var doAfterArgs = new DoAfterEventArgs(user, time, CancellationToken.None, component.Owner)
var doAfterArgs = new DoAfterArgs(user, ev.Time, new AwaitedDoAfterEvent(), null, target: target, used: item)
{
ExtraCheck = Check,
BreakOnStun = true,
AttemptFrequency = AttemptFrequency.EveryTick,
BreakOnDamage = true,
BreakOnTargetMove = true,
BreakOnUserMove = true,
NeedHand = true,
BreakOnHandChange = false, // allow simultaneously removing multiple items.
DuplicateCondition = DuplicateConditions.SameTool
};
if (!stealth
&& Check()
&& hands.Hands.TryGetValue(handName, out var handSlot)
&& handSlot.HeldEntity != null)
if (Check() && hands.Hands.TryGetValue(handName, out var handSlot) && handSlot.HeldEntity != null)
{
_popupSystem.PopupEntity(
_popup.PopupEntity(
Loc.GetString("strippable-component-alert-owner",
("user", Identity.Entity(user, EntityManager)),
("item", handSlot.HeldEntity)),
component.Owner, component.Owner);
("user", Identity.Entity(user, EntityManager)), ("item", item)),
component.Owner,
component.Owner);
}
var result = await _doAfterSystem.WaitDoAfter(doAfterArgs);
var result = await _doAfter.WaitDoAfter(doAfterArgs);
if (result != DoAfterStatus.Finished) return;
if (!hands.Hands.TryGetValue(handName, out var hand) || hand.HeldEntity is not { } held)
return;
_handsSystem.TryDrop(component.Owner, hand, checkActionBlocker: false, handsComp: hands);
_handsSystem.PickupOrDrop(user, held, handsComp: userHands, animate: !stealth);
_handsSystem.TryDrop(target, item, checkActionBlocker: false, handsComp: hands);
_handsSystem.PickupOrDrop(user, item, handsComp: userHands);
// hand update will trigger strippable update
_adminLogger.Add(LogType.Stripping, LogImpact.Medium, $"{ToPrettyString(user):user} has stripped the item {ToPrettyString(held):item} from {ToPrettyString(component.Owner):target}");
_adminLogger.Add(LogType.Stripping, LogImpact.Medium,
$"{ToPrettyString(user):user} has stripped the item {ToPrettyString(item):item} from {ToPrettyString(target):target}");
}
}
}