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.Server/Chemistry/Components/FoamSolutionAreaEffectComponent.cs
+++ b/Content.Server/Chemistry/Components/FoamSolutionAreaEffectComponent.cs
@@ -1,8 +1,6 @@
 using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
 using Content.Server.Chemistry.EntitySystems;
-using Content.Server.Inventory.Components;
-using Content.Server.Items;
 using Content.Shared.FixedPoint;
 using Content.Shared.Foam;
 using Content.Shared.Inventory;
@@ -40,20 +38,22 @@ namespace Content.Server.Chemistry.Components
            if (!_entMan.TryGetComponent(entity, out BloodstreamComponent? bloodstream))
                return;

+            var invSystem = EntitySystem.Get<InventorySystem>();
+
            // TODO: Add a permeability property to clothing
            // For now it just adds to protection for each clothing equipped
            var protection = 0f;
-            if (_entMan.TryGetComponent(entity, out InventoryComponent? inventory))
+            if (invSystem.TryGetSlots(entity, out var slotDefinitions))
            {
-                foreach (var slot in inventory.Slots)
+                foreach (var slot in slotDefinitions)
                {
-                    if (slot == EquipmentSlotDefines.Slots.BACKPACK ||
-                        slot == EquipmentSlotDefines.Slots.POCKET1 ||
-                        slot == EquipmentSlotDefines.Slots.POCKET2 ||
-                        slot == EquipmentSlotDefines.Slots.IDCARD)
+                    if (slot.Name == "back" ||
+                        slot.Name == "pocket1" ||
+                        slot.Name == "pocket2" ||
+                        slot.Name == "id")
                        continue;

-                    if (inventory.TryGetSlotItem(slot, out ItemComponent? _))
+                    if (invSystem.TryGetSlotEntity(entity, slot.Name, out _))
                        protection += 0.025f;
                }
            }