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,10 +1,11 @@
|
||||
#nullable enable annotations
|
||||
using System.Threading.Tasks;
|
||||
using Content.Client.Items.Components;
|
||||
using Content.Server.Hands.Components;
|
||||
using Content.Server.Interaction;
|
||||
using Content.Server.Items;
|
||||
using Content.Shared.Hands.Components;
|
||||
using Content.Shared.Interaction;
|
||||
using Content.Shared.Item;
|
||||
using Content.Shared.Weapons.Melee;
|
||||
using NUnit.Framework;
|
||||
using Robust.Shared.Containers;
|
||||
@@ -13,6 +14,7 @@ using Robust.Shared.IoC;
|
||||
using Robust.Shared.Map;
|
||||
using Robust.Shared.Maths;
|
||||
using Robust.Shared.Reflection;
|
||||
using ItemComponent = Content.Server.Clothing.Components.ItemComponent;
|
||||
|
||||
namespace Content.IntegrationTests.Tests.Interaction.Click
|
||||
{
|
||||
@@ -97,7 +99,7 @@ namespace Content.IntegrationTests.Tests.Interaction.Click
|
||||
Assert.That(interactHand);
|
||||
|
||||
Assert.That(sEntities.TryGetComponent<HandsComponent>(user, out var hands));
|
||||
Assert.That(hands.PutInHand(sEntities.GetComponent<ItemComponent>(item)));
|
||||
Assert.That(hands.PutInHand(sEntities.GetComponent<SharedItemComponent>(item)));
|
||||
|
||||
interactionSystem.UserInteraction(user, sEntities.GetComponent<TransformComponent>(target).Coordinates, target);
|
||||
Assert.That(interactUsing);
|
||||
@@ -169,7 +171,7 @@ namespace Content.IntegrationTests.Tests.Interaction.Click
|
||||
Assert.That(interactHand, Is.False);
|
||||
|
||||
Assert.That(sEntities.TryGetComponent<HandsComponent?>(user, out var hands));
|
||||
Assert.That(hands.PutInHand(sEntities.GetComponent<ItemComponent>(item)));
|
||||
Assert.That(hands.PutInHand(sEntities.GetComponent<SharedItemComponent>(item)));
|
||||
|
||||
interactionSystem.UserInteraction(user, sEntities.GetComponent<TransformComponent>(target).Coordinates, target);
|
||||
Assert.That(interactUsing, Is.False);
|
||||
@@ -238,7 +240,7 @@ namespace Content.IntegrationTests.Tests.Interaction.Click
|
||||
Assert.That(interactHand);
|
||||
|
||||
Assert.That(sEntities.TryGetComponent<HandsComponent>(user, out var hands));
|
||||
Assert.That(hands.PutInHand(sEntities.GetComponent<ItemComponent>(item)));
|
||||
Assert.That(hands.PutInHand(sEntities.GetComponent<SharedItemComponent>(item)));
|
||||
|
||||
interactionSystem.UserInteraction(user, sEntities.GetComponent<TransformComponent>(target).Coordinates, target);
|
||||
Assert.That(interactUsing);
|
||||
@@ -308,7 +310,7 @@ namespace Content.IntegrationTests.Tests.Interaction.Click
|
||||
Assert.That(interactHand, Is.False);
|
||||
|
||||
Assert.That(sEntities.TryGetComponent<HandsComponent?>(user, out var hands));
|
||||
Assert.That(hands.PutInHand(sEntities.GetComponent<ItemComponent>(item)));
|
||||
Assert.That(hands.PutInHand(sEntities.GetComponent<SharedItemComponent>(item)));
|
||||
|
||||
interactionSystem.UserInteraction(user, sEntities.GetComponent<TransformComponent>(target).Coordinates, target);
|
||||
Assert.That(interactUsing, Is.False);
|
||||
@@ -393,7 +395,7 @@ namespace Content.IntegrationTests.Tests.Interaction.Click
|
||||
Assert.That(interactHand);
|
||||
|
||||
Assert.That(sEntities.TryGetComponent<HandsComponent?>(user, out var hands));
|
||||
Assert.That(hands.PutInHand(sEntities.GetComponent<ItemComponent>(item)));
|
||||
Assert.That(hands.PutInHand(sEntities.GetComponent<SharedItemComponent>(item)));
|
||||
|
||||
interactionSystem.UserInteraction(user, sEntities.GetComponent<TransformComponent>(target).Coordinates, target);
|
||||
Assert.That(interactUsing, Is.False);
|
||||
|
||||
Reference in New Issue
Block a user