get that crap outta here (completely rewrites inventorysystem) (#5807)
* some work * equip: done unequip: todo * unequipping done & refactored events * workin * movin * reee namespaces * stun * mobstate * fixes * some work on events * removes serverside itemcomp & misc fixes * work * smol merge fix * ports template to prototype & finishes ui * moves relay & adds containerenumerator * actions & cuffs * my god what is actioncode * more fixes * im loosing my grasp on reality * more fixes * more work * explosions * yes * more work * more fixes * merge master & misc fixed because i forgot to commit before merging master * more fixes * fixes * moar * more work * moar fixes * suffixmap * more work on client * motivation low * no. no containers * mirroring client to server * fixes * move serverinvcomp * serverinventorycomponent is dead * gaming * only strippable & ai left... * only ai and richtext left * fixes ai * fixes * fixes sprite layers * more fixes * resolves optional * yes * stable™️ * fixes * moar fixes * moar * fix some tests * lmao * no comment * good to merge™️ * fixes build but for real * adresses some reviews * adresses some more reviews * nullables, yo * fixes lobbyscreen * timid refactor to differentiate actor & target * adresses more reviews * more * my god what a mess * removed the rest of duplicates * removed duplicate slotflags and renamed shoes to feet * removes another unused one * yes * fixes lobby & makes tryunequip return unequipped item * fixes * some funny renames * fixes * misc improvements to attemptevents * fixes * merge fixes Co-authored-by: Paul Ritter <ritter.paul1@gmail.com>
This commit is contained in:
@@ -1,3 +1,10 @@
|
||||
using System.Collections.Generic;
|
||||
using Content.Server.Cuffs.Components;
|
||||
using Content.Server.Hands.Components;
|
||||
using Content.Shared.Hands.Components;
|
||||
using Content.Shared.Inventory;
|
||||
using Content.Shared.Inventory.Events;
|
||||
using Content.Shared.Strip.Components;
|
||||
using Content.Shared.Verbs;
|
||||
using Robust.Server.GameObjects;
|
||||
using Robust.Shared.GameObjects;
|
||||
@@ -8,11 +15,82 @@ namespace Content.Server.Strip
|
||||
{
|
||||
public sealed class StrippableSystem : EntitySystem
|
||||
{
|
||||
[Dependency] private readonly InventorySystem _inventorySystem = default!;
|
||||
public override void Initialize()
|
||||
{
|
||||
base.Initialize();
|
||||
|
||||
SubscribeLocalEvent<StrippableComponent, GetOtherVerbsEvent>(AddStripVerb);
|
||||
SubscribeLocalEvent<StrippableComponent, DidEquipEvent>(OnDidEquip);
|
||||
SubscribeLocalEvent<StrippableComponent, DidUnequipEvent>(OnDidUnequip);
|
||||
SubscribeLocalEvent<StrippableComponent, ComponentInit>(OnCompInit);
|
||||
}
|
||||
|
||||
private void OnCompInit(EntityUid uid, StrippableComponent component, ComponentInit 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)
|
||||
{
|
||||
if (!Resolve(uid, ref strippableComponent) || strippableComponent.UserInterface == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
var cuffs = 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);
|
||||
}
|
||||
}
|
||||
|
||||
if (_inventorySystem.TryGetSlots(uid, out var slots))
|
||||
{
|
||||
foreach (var slot in slots)
|
||||
{
|
||||
var name = "None";
|
||||
|
||||
if (_inventorySystem.TryGetSlotEntity(uid, slot.Name, out var item))
|
||||
name = Name(item.Value);
|
||||
|
||||
inventory[(slot.Name, slot.DisplayName)] = name;
|
||||
}
|
||||
}
|
||||
|
||||
if (TryComp(uid, out HandsComponent? handsComp))
|
||||
{
|
||||
foreach (var hand in handsComp.HandNames)
|
||||
{
|
||||
var owner = handsComp.GetItem(hand)?.Owner;
|
||||
|
||||
if (!owner.HasValue || HasComp<HandVirtualItemComponent>(owner.Value))
|
||||
{
|
||||
hands[hand] = "None";
|
||||
continue;
|
||||
}
|
||||
|
||||
hands[hand] = Name(owner.Value);
|
||||
}
|
||||
}
|
||||
|
||||
strippableComponent.UserInterface.SetState(new StrippingBoundUserInterfaceState(inventory, hands, cuffs));
|
||||
}
|
||||
|
||||
private void AddStripVerb(EntityUid uid, StrippableComponent component, GetOtherVerbsEvent args)
|
||||
|
||||
Reference in New Issue
Block a user