Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Clothing/item ECS & cleanup (#9706)

Browse Source
This commit is contained in:
Kara
2022-07-27 03:53:47 -07:00
committed by GitHub
parent 0f0420eca9
commit 258ec0cac1
164 changed files with 938 additions and 918 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Storage/EntitySystems/EntityStorageSystem.cs
View File

@@ -305,10 +305,10 @@ public sealed class EntityStorageSystem : EntitySystem
return false;
var targetIsMob = HasComp<SharedBodyComponent>(toInsert);
var storageIsItem = HasComp<SharedItemComponent>(container);
var storageIsItem = HasComp<ItemComponent>(container);
var allowedToEat = whitelist == null
? HasComp<SharedItemComponent>(toInsert)
? HasComp<ItemComponent>(toInsert)
: whitelist.IsValid(toInsert);
// BEFORE REPLACING THIS WITH, I.E. A PROPERTY:

2
Content.Server/Storage/EntitySystems/SecretStashSystem.cs
View File

@@ -54,7 +54,7 @@ namespace Content.Server.Storage.EntitySystems
/// </summary>
/// <returns>True if item was hidden inside stash</returns>
public bool TryHideItem(EntityUid uid, EntityUid userUid, EntityUid itemToHideUid,
SecretStashComponent? component = null, SharedItemComponent? item = null,
SecretStashComponent? component = null, ItemComponent? item = null,
MetaDataComponent? itemMeta = null, SharedHandsComponent? hands = null)
{
if (!Resolve(uid, ref component))

12
Content.Server/Storage/EntitySystems/StorageSystem.cs
View File

@@ -236,13 +236,13 @@ namespace Content.Server.Storage.EntitySystems
// Pick up all entities in a radius around the clicked location.
// The last half of the if is because carpets exist and this is terrible
if (storageComp.AreaInsert && (eventArgs.Target == null || !HasComp<SharedItemComponent>(eventArgs.Target.Value)))
if (storageComp.AreaInsert && (eventArgs.Target == null || !HasComp<ItemComponent>(eventArgs.Target.Value)))
{
var validStorables = new List<EntityUid>();
foreach (var entity in _entityLookupSystem.GetEntitiesInRange(eventArgs.ClickLocation, storageComp.AreaInsertRadius, LookupFlags.None))
{
if (entity == eventArgs.User
|| !HasComp<SharedItemComponent>(entity)
|| !HasComp<ItemComponent>(entity)
|| !_interactionSystem.InRangeUnobstructed(eventArgs.User, entity))
continue;
@@ -272,7 +272,7 @@ namespace Content.Server.Storage.EntitySystems
// Check again, situation may have changed for some entities, but we'll still pick up any that are valid
if (_containerSystem.IsEntityInContainer(entity)
|| entity == eventArgs.User
|| !HasComp<SharedItemComponent>(entity))
|| !HasComp<ItemComponent>(entity))
continue;
if (TryComp<TransformComponent>(uid, out var transformOwner) && TryComp<TransformComponent>(entity, out var transformEnt))
@@ -304,7 +304,7 @@ namespace Content.Server.Storage.EntitySystems
if (_containerSystem.IsEntityInContainer(target)
|| target == eventArgs.User
|| !HasComp<SharedItemComponent>(target))
|| !HasComp<ItemComponent>(target))
return;
if (TryComp<TransformComponent>(uid, out var transformOwner) && TryComp<TransformComponent>(target, out var transformEnt))
@@ -432,7 +432,7 @@ namespace Content.Server.Storage.EntitySystems
if (storageComp.Storage == null)
return;
var itemQuery = GetEntityQuery<SharedItemComponent>();
var itemQuery = GetEntityQuery<ItemComponent>();
foreach (var entity in storageComp.Storage.ContainedEntities)
{
@@ -491,7 +491,7 @@ namespace Content.Server.Storage.EntitySystems
return false;
}
if (TryComp(insertEnt, out SharedItemComponent? itemComp) &&
if (TryComp(insertEnt, out ItemComponent? itemComp) &&
itemComp.Size > storageComp.StorageCapacityMax - storageComp.StorageUsed)
{
reason = "comp-storage-insufficient-capacity";