Stripping ECS + window do_after (#8111)
* Stripping ECS + window do_after * stuff * workies * Delays
This commit is contained in:
metalgearsloth
@@ -1,21 +1,29 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Threading;
|
||||
using Content.Server.Cuffs.Components;
|
||||
using Content.Server.DoAfter;
|
||||
using Content.Server.Hands.Components;
|
||||
using Content.Server.Inventory;
|
||||
using Content.Server.UserInterface;
|
||||
using Content.Shared.Hands.Components;
|
||||
using Content.Shared.Hands.EntitySystems;
|
||||
using Content.Shared.Interaction.Events;
|
||||
using Content.Shared.Inventory;
|
||||
using Content.Shared.Inventory.Events;
|
||||
using Content.Shared.Popups;
|
||||
using Content.Shared.Strip.Components;
|
||||
using Content.Shared.Verbs;
|
||||
using Robust.Server.GameObjects;
|
||||
using Robust.Shared.GameObjects;
|
||||
using Robust.Shared.IoC;
|
||||
using Robust.Shared.Localization;
|
||||
|
||||
namespace Content.Server.Strip
|
||||
{
|
||||
public sealed class StrippableSystem : EntitySystem
|
||||
{
|
||||
[Dependency] private readonly SharedHandsSystem _handsSystem = default!;
|
||||
[Dependency] private readonly InventorySystem _inventorySystem = default!;
|
||||
[Dependency] private readonly DoAfterSystem _doAfterSystem = default!;
|
||||
|
||||
// TODO: ECS popups. Not all of these have ECS equivalents yet.
|
||||
|
||||
public override void Initialize()
|
||||
{
|
||||
base.Initialize();
|
||||
@@ -24,13 +32,125 @@ namespace Content.Server.Strip
|
||||
SubscribeLocalEvent<StrippableComponent, DidEquipEvent>(OnDidEquip);
|
||||
SubscribeLocalEvent<StrippableComponent, DidUnequipEvent>(OnDidUnequip);
|
||||
SubscribeLocalEvent<StrippableComponent, ComponentInit>(OnCompInit);
|
||||
SubscribeLocalEvent<StrippableComponent, CuffedStateChangeEvent>(OnCuffStateChange);
|
||||
|
||||
// BUI
|
||||
SubscribeLocalEvent<StrippableComponent, StrippingInventoryButtonPressed>(OnStripInvButtonMessage);
|
||||
SubscribeLocalEvent<StrippableComponent, StrippingHandButtonPressed>(OnStripHandMessage);
|
||||
SubscribeLocalEvent<StrippableComponent, StrippingHandcuffButtonPressed>(OnStripHandcuffMessage);
|
||||
|
||||
SubscribeLocalEvent<StrippableComponent, OpenStrippingCompleteEvent>(OnOpenStripComplete);
|
||||
SubscribeLocalEvent<StrippableComponent, OpenStrippingCancelledEvent>(OnOpenStripCancelled);
|
||||
}
|
||||
|
||||
private void OnOpenStripCancelled(EntityUid uid, StrippableComponent component, OpenStrippingCancelledEvent args)
|
||||
{
|
||||
component.CancelTokens.Remove(args.User);
|
||||
}
|
||||
|
||||
private void OnOpenStripComplete(EntityUid uid, StrippableComponent component, OpenStrippingCompleteEvent args)
|
||||
{
|
||||
component.CancelTokens.Remove(args.User);
|
||||
|
||||
if (!TryComp<ActorComponent>(args.User, out var actor)) return;
|
||||
|
||||
uid.GetUIOrNull(StrippingUiKey.Key)?.Open(actor.PlayerSession);
|
||||
}
|
||||
|
||||
private void OnStripHandcuffMessage(EntityUid uid, StrippableComponent component, StrippingHandcuffButtonPressed args)
|
||||
{
|
||||
if (args.Session.AttachedEntity is not {Valid: true} user)
|
||||
return;
|
||||
|
||||
if (TryComp<CuffableComponent>(component.Owner, out var cuffed))
|
||||
{
|
||||
foreach (var entity in cuffed.StoredEntities)
|
||||
{
|
||||
if (entity != args.Handcuff) continue;
|
||||
cuffed.TryUncuff(user, entity);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void OnStripHandMessage(EntityUid uid, StrippableComponent component, StrippingHandButtonPressed args)
|
||||
{
|
||||
if (args.Session.AttachedEntity is not {Valid: true} user ||
|
||||
!TryComp<HandsComponent>(user, out var userHands))
|
||||
return;
|
||||
|
||||
var placingItem = userHands.ActiveHandEntity != null;
|
||||
|
||||
if (TryComp<HandsComponent>(component.Owner, out var hands))
|
||||
{
|
||||
if (hands.Hands.TryGetValue(args.Hand, out var hand) && !hand.IsEmpty)
|
||||
placingItem = false;
|
||||
|
||||
if (placingItem)
|
||||
PlaceActiveHandItemInHands(user, args.Hand, component);
|
||||
else
|
||||
TakeItemFromHands(user, args.Hand, component);
|
||||
}
|
||||
}
|
||||
|
||||
private void OnStripInvButtonMessage(EntityUid uid, StrippableComponent component, StrippingInventoryButtonPressed args)
|
||||
{
|
||||
if (args.Session.AttachedEntity is not {Valid: true} user ||
|
||||
!TryComp<HandsComponent>(user, out var userHands))
|
||||
return;
|
||||
|
||||
var placingItem = userHands.ActiveHandEntity != null;
|
||||
|
||||
if (TryComp<InventoryComponent>(component.Owner, out var inventory))
|
||||
{
|
||||
if (_inventorySystem.TryGetSlotEntity(component.Owner, args.Slot, out _, inventory))
|
||||
placingItem = false;
|
||||
|
||||
if (placingItem)
|
||||
PlaceActiveHandItemInInventory(user, args.Slot, component);
|
||||
else
|
||||
TakeItemFromInventory(user, args.Slot, component);
|
||||
}
|
||||
}
|
||||
|
||||
public void StartOpeningStripper(EntityUid user, StrippableComponent component)
|
||||
{
|
||||
if (component.CancelTokens.ContainsKey(user)) return;
|
||||
|
||||
if (TryComp<ActorComponent>(user, out var actor))
|
||||
{
|
||||
if (component.Owner.GetUIOrNull(StrippingUiKey.Key)?.SessionHasOpen(actor.PlayerSession) == true)
|
||||
return;
|
||||
}
|
||||
|
||||
var token = new CancellationTokenSource();
|
||||
|
||||
var doAfterArgs = new DoAfterEventArgs(user, component.OpenDelay, token.Token, component.Owner)
|
||||
{
|
||||
BreakOnStun = true,
|
||||
BreakOnDamage = true,
|
||||
BreakOnTargetMove = true,
|
||||
BreakOnUserMove = true,
|
||||
NeedHand = true,
|
||||
TargetCancelledEvent = new OpenStrippingCancelledEvent(user),
|
||||
TargetFinishedEvent = new OpenStrippingCompleteEvent(user),
|
||||
};
|
||||
|
||||
component.CancelTokens[user] = token;
|
||||
_doAfterSystem.DoAfter(doAfterArgs);
|
||||
}
|
||||
|
||||
private void OnCompInit(EntityUid uid, StrippableComponent component, ComponentInit args)
|
||||
{
|
||||
EnsureComp<ServerInventoryComponent>(uid);
|
||||
SendUpdate(uid, component);
|
||||
}
|
||||
|
||||
private void OnCuffStateChange(EntityUid uid, StrippableComponent component, ref CuffedStateChangeEvent args)
|
||||
{
|
||||
UpdateState(uid, component);
|
||||
}
|
||||
|
||||
private void OnDidUnequip(EntityUid uid, StrippableComponent component, DidUnequipEvent args)
|
||||
{
|
||||
SendUpdate(uid, component);
|
||||
@@ -43,7 +163,9 @@ namespace Content.Server.Strip
|
||||
|
||||
public void SendUpdate(EntityUid uid, StrippableComponent? strippableComponent = null)
|
||||
{
|
||||
if (!Resolve(uid, ref strippableComponent, false) || strippableComponent.UserInterface == null)
|
||||
var bui = uid.GetUIOrNull(StrippingUiKey.Key);
|
||||
|
||||
if (!Resolve(uid, ref strippableComponent, false) || bui == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
@@ -88,7 +210,7 @@ namespace Content.Server.Strip
|
||||
}
|
||||
}
|
||||
|
||||
strippableComponent.UserInterface.SetState(new StrippingBoundUserInterfaceState(inventory, hands, cuffs));
|
||||
bui.SetState(new StrippingBoundUserInterfaceState(inventory, hands, cuffs));
|
||||
}
|
||||
|
||||
private void AddStripVerb(EntityUid uid, StrippableComponent component, GetVerbsEvent<Verb> args)
|
||||
@@ -99,11 +221,248 @@ namespace Content.Server.Strip
|
||||
if (!EntityManager.TryGetComponent(args.User, out ActorComponent? actor))
|
||||
return;
|
||||
|
||||
Verb verb = new();
|
||||
verb.Text = Loc.GetString("strip-verb-get-data-text");
|
||||
verb.IconTexture = "/Textures/Interface/VerbIcons/outfit.svg.192dpi.png";
|
||||
verb.Act = () => component.OpenUserInterface(actor.PlayerSession);
|
||||
Verb verb = new()
|
||||
{
|
||||
Text = Loc.GetString("strip-verb-get-data-text"),
|
||||
IconTexture = "/Textures/Interface/VerbIcons/outfit.svg.192dpi.png",
|
||||
Act = () => StartOpeningStripper(args.User, component),
|
||||
};
|
||||
args.Verbs.Add(verb);
|
||||
}
|
||||
|
||||
private void UpdateState(EntityUid uid, StrippableComponent component)
|
||||
{
|
||||
SendUpdate(uid, component);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Places item in user's active hand to an inventory slot.
|
||||
/// </summary>
|
||||
private async void PlaceActiveHandItemInInventory(EntityUid user, string slot, StrippableComponent component)
|
||||
{
|
||||
var userHands = Comp<HandsComponent>(user);
|
||||
|
||||
bool Check()
|
||||
{
|
||||
if (userHands.ActiveHand?.HeldEntity is not { } held)
|
||||
{
|
||||
user.PopupMessageCursor(Loc.GetString("strippable-component-not-holding-anything"));
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!_handsSystem.CanDropHeld(user, userHands.ActiveHand))
|
||||
{
|
||||
user.PopupMessageCursor(Loc.GetString("strippable-component-cannot-drop"));
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!_inventorySystem.HasSlot(component.Owner, slot))
|
||||
return false;
|
||||
|
||||
if (_inventorySystem.TryGetSlotEntity(component.Owner, slot, out _))
|
||||
{
|
||||
user.PopupMessageCursor(Loc.GetString("strippable-component-item-slot-occupied",("uid", component.Owner)));
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!_inventorySystem.CanEquip(user, component.Owner, held, slot, out _))
|
||||
{
|
||||
user.PopupMessageCursor(Loc.GetString("strippable-component-cannot-equip-message",("uid", component.Owner)));
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
var doAfterArgs = new DoAfterEventArgs(user, component.StripDelay, CancellationToken.None, component.Owner)
|
||||
{
|
||||
ExtraCheck = Check,
|
||||
BreakOnStun = true,
|
||||
BreakOnDamage = true,
|
||||
BreakOnTargetMove = true,
|
||||
BreakOnUserMove = true,
|
||||
NeedHand = true,
|
||||
};
|
||||
|
||||
var result = await _doAfterSystem.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);
|
||||
}
|
||||
|
||||
UpdateState(component.Owner, component);
|
||||
}
|
||||
|
||||
/// <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)
|
||||
{
|
||||
var hands = Comp<HandsComponent>(component.Owner);
|
||||
var userHands = Comp<HandsComponent>(user);
|
||||
|
||||
bool Check()
|
||||
{
|
||||
if (userHands.ActiveHandEntity == null)
|
||||
{
|
||||
user.PopupMessageCursor(Loc.GetString("strippable-component-not-holding-anything"));
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!_handsSystem.CanDropHeld(user, userHands.ActiveHand!))
|
||||
{
|
||||
user.PopupMessageCursor(Loc.GetString("strippable-component-cannot-drop"));
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!hands.Hands.TryGetValue(handName, out var hand)
|
||||
|| !_handsSystem.CanPickupToHand(component.Owner, userHands.ActiveHandEntity.Value, hand, checkActionBlocker: false, hands))
|
||||
{
|
||||
user.PopupMessageCursor(Loc.GetString("strippable-component-cannot-put-message",("uid", component.Owner)));
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
var doAfterArgs = new DoAfterEventArgs(user, component.StripDelay, CancellationToken.None, component.Owner)
|
||||
{
|
||||
ExtraCheck = Check,
|
||||
BreakOnStun = true,
|
||||
BreakOnDamage = true,
|
||||
BreakOnTargetMove = true,
|
||||
BreakOnUserMove = true,
|
||||
NeedHand = true,
|
||||
};
|
||||
|
||||
var result = await _doAfterSystem.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, handsComp: 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)
|
||||
{
|
||||
bool Check()
|
||||
{
|
||||
if (!_inventorySystem.HasSlot(component.Owner, slot))
|
||||
return false;
|
||||
|
||||
if (!_inventorySystem.TryGetSlotEntity(component.Owner, slot, out _))
|
||||
{
|
||||
user.PopupMessageCursor(Loc.GetString("strippable-component-item-slot-free-message", ("uid", component.Owner)));
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!_inventorySystem.CanUnequip(user, component.Owner, slot, out _))
|
||||
{
|
||||
user.PopupMessageCursor(Loc.GetString("strippable-component-cannot-unequip-message", ("uid", component.Owner)));
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
var doAfterArgs = new DoAfterEventArgs(user, component.StripDelay, CancellationToken.None, component.Owner)
|
||||
{
|
||||
ExtraCheck = Check,
|
||||
BreakOnStun = true,
|
||||
BreakOnDamage = true,
|
||||
BreakOnTargetMove = true,
|
||||
BreakOnUserMove = true,
|
||||
};
|
||||
|
||||
var result = await _doAfterSystem.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));
|
||||
|
||||
_handsSystem.PickupOrDrop(user, item.Value);
|
||||
}
|
||||
|
||||
UpdateState(component.Owner, component);
|
||||
}
|
||||
|
||||
/// <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)
|
||||
{
|
||||
var hands = Comp<HandsComponent>(component.Owner);
|
||||
var userHands = Comp<HandsComponent>(user);
|
||||
|
||||
bool Check()
|
||||
{
|
||||
if (!hands.Hands.TryGetValue(handName, out var hand) || hand.HeldEntity == null)
|
||||
{
|
||||
user.PopupMessageCursor(Loc.GetString("strippable-component-item-slot-free-message",("uid", component.Owner)));
|
||||
return false;
|
||||
}
|
||||
|
||||
if (HasComp<HandVirtualItemComponent>(hand.HeldEntity))
|
||||
return false;
|
||||
|
||||
if (!_handsSystem.CanDropHeld(component.Owner, hand, false))
|
||||
{
|
||||
user.PopupMessageCursor(Loc.GetString("strippable-component-cannot-drop-message",("uid", component.Owner)));
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
var doAfterArgs = new DoAfterEventArgs(user, component.StripDelay, CancellationToken.None, component.Owner)
|
||||
{
|
||||
ExtraCheck = Check,
|
||||
BreakOnStun = true,
|
||||
BreakOnDamage = true,
|
||||
BreakOnTargetMove = true,
|
||||
BreakOnUserMove = true,
|
||||
};
|
||||
|
||||
var result = await _doAfterSystem.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);
|
||||
// hand update will trigger strippable update
|
||||
}
|
||||
|
||||
private sealed class OpenStrippingCompleteEvent
|
||||
{
|
||||
public readonly EntityUid User;
|
||||
|
||||
public OpenStrippingCompleteEvent(EntityUid user)
|
||||
{
|
||||
User = user;
|
||||
}
|
||||
}
|
||||
|
||||
private sealed class OpenStrippingCancelledEvent
|
||||
{
|
||||
public readonly EntityUid User;
|
||||
|
||||
public OpenStrippingCancelledEvent(EntityUid user)
|
||||
{
|
||||
User = user;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user