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

hands ECS (#7081)

Browse Source
This commit is contained in:
Leon Friedrich
2022-03-17 20:13:31 +13:00
committed by GitHub
parent 7b84362901
commit bfd95c493b
94 changed files with 1454 additions and 2185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Content.Server/AI/WorldState/States/Hands/AnyFreeHandState.cs
View File

@@ -1,4 +1,5 @@
using Content.Server.Hands.Components;
using Content.Shared.Hands.EntitySystems;
using JetBrains.Annotations;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
@@ -11,20 +12,7 @@ namespace Content.Server.AI.WorldState.States.Hands
public override string Name => "AnyFreeHand";
public override bool GetValue()
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(Owner, out HandsComponent? handsComponent))
{
return false;
}
foreach (var hand in handsComponent.ActivePriorityEnumerable())
{
if (handsComponent.GetItem(hand) == null)
{
return true;
}
}
return false;
return IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<SharedHandsSystem>().TryGetEmptyHand(Owner, out _);
}
}
}

17
Content.Server/AI/WorldState/States/Hands/FreeHands.cs
View File

@@ -1,8 +1,7 @@
using System.Collections.Generic;
using System.Linq;
using Content.Server.Hands.Components;
using Content.Shared.Hands.Components;
using JetBrains.Annotations;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
namespace Content.Server.AI.WorldState.States.Hands
{
@@ -17,18 +16,10 @@ namespace Content.Server.AI.WorldState.States.Hands
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(Owner, out HandsComponent? handsComponent))
{
return result;
return new List<string>();
}
foreach (var hand in handsComponent.ActivePriorityEnumerable())
{
if (handsComponent.GetItem(hand) == null)
{
result.Add(hand);
}
}
return result;
return handsComponent.GetFreeHandNames().ToList();
}
}
}

24
Content.Server/AI/WorldState/States/Hands/HandItemsState.cs
View File

@@ -1,8 +1,6 @@
using System.Collections.Generic;
using Content.Server.Hands.Components;
using System.Linq;
using Content.Shared.Hands.EntitySystems;
using JetBrains.Annotations;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
namespace Content.Server.AI.WorldState.States.Hands
{
@@ -12,23 +10,7 @@ namespace Content.Server.AI.WorldState.States.Hands
public override string Name => "HandItems";
public override List<EntityUid> GetValue()
{
var result = new List<EntityUid>();
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(Owner, out HandsComponent? handsComponent))
{
return result;
}
foreach (var hand in handsComponent.ActivePriorityEnumerable())
{
var item = handsComponent.GetItem(hand);
if (item != null)
{
result.Add(item.Owner);
}
}
return result;
return IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<SharedHandsSystem>().EnumerateHeld(Owner).ToList();
}
}
}

2
Content.Server/AI/WorldState/States/Inventory/EquippedEntityState.cs
View File

@@ -15,7 +15,7 @@ namespace Content.Server.AI.WorldState.States.Inventory
public override EntityUid? GetValue()
{
return IoCManager.Resolve<IEntityManager>().GetComponentOrNull<HandsComponent>(Owner)?.GetActiveHandItem?.Owner;
return IoCManager.Resolve<IEntityManager>().GetComponentOrNull<HandsComponent>(Owner)?.ActiveHandEntity;
}
}
}

17
Content.Server/AI/WorldState/States/Inventory/InventoryState.cs
View File

@@ -1,8 +1,5 @@
using System.Collections.Generic;
using Content.Server.Hands.Components;
using Content.Shared.Hands.EntitySystems;
using JetBrains.Annotations;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
namespace Content.Server.AI.WorldState.States.Inventory
{
@@ -13,17 +10,7 @@ namespace Content.Server.AI.WorldState.States.Inventory
public override IEnumerable<EntityUid> GetValue()
{
var entMan = IoCManager.Resolve<IEntityManager>();
if (entMan.TryGetComponent(Owner, out HandsComponent? handsComponent))
{
foreach (var item in handsComponent.GetAllHeldItems())
{
if (entMan.Deleted(item.Owner))
continue;
yield return item.Owner;
}
}
return IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<SharedHandsSystem>().EnumerateHeld(Owner);
}
}
}