Improve stripping UI (#9768)
This commit is contained in:
Leon Friedrich
@@ -1,24 +1,20 @@
|
||||
using System.Threading;
|
||||
using Content.Server.Cuffs.Components;
|
||||
using Content.Server.DoAfter;
|
||||
using Content.Server.Ensnaring;
|
||||
using Content.Server.Ensnaring.Components;
|
||||
using Content.Server.Hands.Components;
|
||||
using Content.Server.Inventory;
|
||||
using Content.Server.UserInterface;
|
||||
using Content.Shared.Ensnaring.Components;
|
||||
using Content.Shared.CombatMode;
|
||||
using Content.Shared.Hands.Components;
|
||||
using Content.Shared.Hands.EntitySystems;
|
||||
using Content.Shared.IdentityManagement;
|
||||
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 Content.Shared.CombatMode;
|
||||
using Robust.Server.GameObjects;
|
||||
using Robust.Shared.Player;
|
||||
using System.Threading;
|
||||
|
||||
namespace Content.Server.Strip
|
||||
{
|
||||
@@ -38,93 +34,69 @@ namespace Content.Server.Strip
|
||||
base.Initialize();
|
||||
|
||||
SubscribeLocalEvent<StrippableComponent, GetVerbsEvent<Verb>>(AddStripVerb);
|
||||
SubscribeLocalEvent<StrippableComponent, GetVerbsEvent<ExamineVerb>>(AddExamineVerb);
|
||||
SubscribeLocalEvent<StrippableComponent, DidEquipEvent>(OnDidEquip);
|
||||
SubscribeLocalEvent<StrippableComponent, DidUnequipEvent>(OnDidUnequip);
|
||||
SubscribeLocalEvent<StrippableComponent, ComponentInit>(OnCompInit);
|
||||
SubscribeLocalEvent<StrippableComponent, CuffedStateChangeEvent>(OnCuffStateChange);
|
||||
SubscribeLocalEvent<StrippableComponent, EnsnaredChangedEvent>(OnEnsnareChange);
|
||||
|
||||
// BUI
|
||||
SubscribeLocalEvent<StrippableComponent, StrippingInventoryButtonPressed>(OnStripInvButtonMessage);
|
||||
SubscribeLocalEvent<StrippableComponent, StrippingHandButtonPressed>(OnStripHandMessage);
|
||||
SubscribeLocalEvent<StrippableComponent, StrippingHandcuffButtonPressed>(OnStripHandcuffMessage);
|
||||
SubscribeLocalEvent<StrippableComponent, StrippingEnsnareButtonPressed>(OnStripEnsnareMessage);
|
||||
SubscribeLocalEvent<StrippableComponent, StrippingSlotButtonPressed>(OnStripButtonPressed);
|
||||
SubscribeLocalEvent<EnsnareableComponent, StrippingEnsnareButtonPressed>(OnStripEnsnareMessage);
|
||||
}
|
||||
private void OnStripHandcuffMessage(EntityUid uid, StrippableComponent component, StrippingHandcuffButtonPressed args)
|
||||
|
||||
private void OnStripEnsnareMessage(EntityUid uid, EnsnareableComponent component, StrippingEnsnareButtonPressed 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 OnStripEnsnareMessage(EntityUid uid, StrippableComponent component, StrippingEnsnareButtonPressed args)
|
||||
{
|
||||
if (args.Session.AttachedEntity is not {Valid: true} user)
|
||||
return;
|
||||
|
||||
var ensnareQuery = GetEntityQuery<EnsnareableComponent>();
|
||||
|
||||
foreach (var entity in ensnareQuery.GetComponent(uid).Container.ContainedEntities)
|
||||
foreach (var entity in component.Container.ContainedEntities)
|
||||
{
|
||||
if (!TryComp<EnsnaringComponent>(entity, out var ensnaring))
|
||||
continue;
|
||||
|
||||
if (entity != args.Ensnare)
|
||||
continue;
|
||||
|
||||
_ensnaring.TryFree(component.Owner, ensnaring, user);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
private void OnStripHandMessage(EntityUid uid, StrippableComponent component, StrippingHandButtonPressed args)
|
||||
private void OnStripButtonPressed(EntityUid uid, StrippableComponent component, StrippingSlotButtonPressed 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 (args.IsHand)
|
||||
{
|
||||
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);
|
||||
StripHand(uid, user, args.Slot, component, userHands);
|
||||
return;
|
||||
}
|
||||
|
||||
if (!TryComp<InventoryComponent>(component.Owner, out var inventory))
|
||||
return;
|
||||
|
||||
var hasEnt = _inventorySystem.TryGetSlotEntity(component.Owner, args.Slot, out _, inventory);
|
||||
|
||||
if (userHands.ActiveHandEntity != null && !hasEnt)
|
||||
PlaceActiveHandItemInInventory(user, args.Slot, component);
|
||||
else if (userHands.ActiveHandEntity == null && hasEnt)
|
||||
TakeItemFromInventory(user, args.Slot, component);
|
||||
}
|
||||
|
||||
private void OnStripInvButtonMessage(EntityUid uid, StrippableComponent component, StrippingInventoryButtonPressed args)
|
||||
private void StripHand(EntityUid target, EntityUid user, string handId, StrippableComponent component, HandsComponent userHands)
|
||||
{
|
||||
if (args.Session.AttachedEntity is not {Valid: true} user ||
|
||||
!TryComp<HandsComponent>(user, out var userHands))
|
||||
if (!TryComp<HandsComponent>(target, out var targetHands)
|
||||
|| !targetHands.Hands.TryGetValue(handId, out var hand))
|
||||
return;
|
||||
|
||||
var placingItem = userHands.ActiveHandEntity != null;
|
||||
|
||||
if (TryComp<InventoryComponent>(component.Owner, out var inventory))
|
||||
// is the target a handcuff?
|
||||
if (TryComp(hand.HeldEntity, out HandVirtualItemComponent? virt)
|
||||
&& TryComp(target, out CuffableComponent? cuff)
|
||||
&& cuff.Container.Contains(virt.BlockingEntity))
|
||||
{
|
||||
if (_inventorySystem.TryGetSlotEntity(component.Owner, args.Slot, out _, inventory))
|
||||
placingItem = false;
|
||||
|
||||
if (placingItem)
|
||||
PlaceActiveHandItemInInventory(user, args.Slot, component);
|
||||
else
|
||||
TakeItemFromInventory(user, args.Slot, component);
|
||||
cuff.TryUncuff(user, virt.BlockingEntity);
|
||||
return;
|
||||
}
|
||||
|
||||
if (hand.IsEmpty && userHands.ActiveHandEntity != null)
|
||||
PlaceActiveHandItemInHands(user, handId, component);
|
||||
else if (!hand.IsEmpty && userHands.ActiveHandEntity == null)
|
||||
TakeItemFromHands(user, handId, component);
|
||||
}
|
||||
|
||||
public void StartOpeningStripper(EntityUid user, StrippableComponent component, bool openInCombat = false)
|
||||
@@ -140,124 +112,6 @@ namespace Content.Server.Strip
|
||||
}
|
||||
}
|
||||
|
||||
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 OnEnsnareChange(EntityUid uid, StrippableComponent component, EnsnaredChangedEvent args)
|
||||
{
|
||||
SendUpdate(uid, component);
|
||||
}
|
||||
|
||||
private void OnDidUnequip(EntityUid uid, StrippableComponent component, DidUnequipEvent args)
|
||||
{
|
||||
SendUpdate(uid, component);
|
||||
}
|
||||
|
||||
private void OnDidEquip(EntityUid uid, StrippableComponent component, DidEquipEvent args)
|
||||
{
|
||||
SendUpdate(uid, component);
|
||||
}
|
||||
|
||||
public void SendUpdate(EntityUid uid, StrippableComponent? strippableComponent = null)
|
||||
{
|
||||
var bui = uid.GetUIOrNull(StrippingUiKey.Key);
|
||||
|
||||
if (!Resolve(uid, ref strippableComponent, false) || bui == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
var cuffs = new Dictionary<EntityUid, string>();
|
||||
var ensnare = new Dictionary<EntityUid, string>();
|
||||
var inventory = new Dictionary<(string ID, string Name), string>();
|
||||
var hands = new Dictionary<string, string>();
|
||||
|
||||
if (TryComp(uid, out CuffableComponent? cuffed))
|
||||
{
|
||||
foreach (var entity in cuffed.StoredEntities)
|
||||
{
|
||||
var name = Name(entity);
|
||||
cuffs.Add(entity, name);
|
||||
}
|
||||
}
|
||||
|
||||
var ensnareQuery = GetEntityQuery<EnsnareableComponent>();
|
||||
|
||||
if (ensnareQuery.TryGetComponent(uid, out var _))
|
||||
{
|
||||
foreach (var entity in ensnareQuery.GetComponent(uid).Container.ContainedEntities)
|
||||
{
|
||||
var name = Name(entity);
|
||||
ensnare.Add(entity, name);
|
||||
}
|
||||
}
|
||||
|
||||
if (_inventorySystem.TryGetSlots(uid, out var slots))
|
||||
{
|
||||
foreach (var slot in slots)
|
||||
{
|
||||
var name = "None";
|
||||
|
||||
if (_inventorySystem.TryGetSlotEntity(uid, slot.Name, out var item))
|
||||
{
|
||||
if (!slot.StripHidden)
|
||||
{
|
||||
name = Name(item.Value);
|
||||
}
|
||||
|
||||
else
|
||||
{
|
||||
name = Loc.GetString("strippable-bound-user-interface-stripping-menu-obfuscate");
|
||||
}
|
||||
}
|
||||
|
||||
inventory[(slot.Name, slot.DisplayName)] = name;
|
||||
}
|
||||
}
|
||||
|
||||
if (TryComp(uid, out HandsComponent? handsComp))
|
||||
{
|
||||
foreach (var hand in handsComp.Hands.Values)
|
||||
{
|
||||
if (hand.HeldEntity == null || HasComp<HandVirtualItemComponent>(hand.HeldEntity))
|
||||
{
|
||||
hands[hand.Name] = "None";
|
||||
continue;
|
||||
}
|
||||
|
||||
hands[hand.Name] = Name(hand.HeldEntity.Value);
|
||||
}
|
||||
}
|
||||
|
||||
bui.SetState(new StrippingBoundUserInterfaceState(inventory, hands, cuffs, ensnare));
|
||||
}
|
||||
|
||||
private void AddExamineVerb(EntityUid uid, StrippableComponent component, GetVerbsEvent<ExamineVerb> args)
|
||||
{
|
||||
if (args.Hands == null || !args.CanAccess || !args.CanInteract || args.Target == args.User)
|
||||
return;
|
||||
|
||||
if (!EntityManager.TryGetComponent(args.User, out ActorComponent? actor))
|
||||
return;
|
||||
|
||||
ExamineVerb verb = new()
|
||||
{
|
||||
Text = Loc.GetString("strip-verb-get-data-text"),
|
||||
IconTexture = "/Textures/Interface/VerbIcons/outfit.svg.192dpi.png",
|
||||
Act = () => StartOpeningStripper(args.User, component, true),
|
||||
Category = VerbCategory.Examine,
|
||||
};
|
||||
args.Verbs.Add(verb);
|
||||
}
|
||||
|
||||
private void AddStripVerb(EntityUid uid, StrippableComponent component, GetVerbsEvent<Verb> args)
|
||||
{
|
||||
if (args.Hands == null || !args.CanAccess || !args.CanInteract || args.Target == args.User)
|
||||
@@ -275,11 +129,6 @@ namespace Content.Server.Strip
|
||||
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>
|
||||
@@ -354,8 +203,6 @@ namespace Content.Server.Strip
|
||||
{
|
||||
_inventorySystem.TryEquip(user, component.Owner, held, slot);
|
||||
}
|
||||
|
||||
UpdateState(component.Owner, component);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -488,8 +335,6 @@ namespace Content.Server.Strip
|
||||
|
||||
_handsSystem.PickupOrDrop(user, item.Value);
|
||||
}
|
||||
|
||||
UpdateState(component.Owner, component);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
Reference in New Issue
Block a user