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>
2021-12-30 22:56:10 +01:00
parent 7a5adb47a1
commit 512d6a38c3
199 changed files with 2493 additions and 3300 deletions
--- a/Content.Client/Inventory/StrippableBoundUserInterface.cs
+++ b/Content.Client/Inventory/StrippableBoundUserInterface.cs
@@ -7,14 +7,13 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.ViewVariables;
-using static Content.Shared.Inventory.EquipmentSlotDefines;

 namespace Content.Client.Inventory
 {
    [UsedImplicitly]
    public class StrippableBoundUserInterface : BoundUserInterface
    {
-        public Dictionary<Slots, string>? Inventory { get; private set; }
+        public Dictionary<(string ID, string Name), string>? Inventory { get; private set; }
        public Dictionary<string, string>? Hands { get; private set; }
        public Dictionary<EntityUid, string>? Handcuffs { get; private set; }

@@ -55,9 +54,9 @@ namespace Content.Client.Inventory
            {
                foreach (var (slot, name) in Inventory)
                {
-                    _strippingMenu.AddButton(SlotNames[slot], name, (ev) =>
+                    _strippingMenu.AddButton(slot.Name, name, (ev) =>
                    {
-                        SendMessage(new StrippingInventoryButtonPressed(slot));
+                        SendMessage(new StrippingInventoryButtonPressed(slot.ID));
                    });
                }
            }