tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests 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

108
Content.Server/Hands/Components/HandsComponent.cs
View File

@@ -1,19 +1,6 @@
using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using Content.Server.Act;
using Content.Server.Popups;
using Content.Server.Pulling;
using Content.Shared.Audio;
using Content.Shared.Body.Part;
using Content.Shared.Hands.Components;
using Content.Shared.Item;
using Content.Shared.Popups;
using Content.Shared.Pulling.Components;
using Content.Shared.Sound;
using Robust.Shared.Audio;
using Robust.Shared.Player;
using Content.Shared.Hands.EntitySystems;
namespace Content.Server.Hands.Components
{
@@ -24,9 +11,6 @@ namespace Content.Server.Hands.Components
#pragma warning restore 618
{
[Dependency] private readonly IEntitySystemManager _entitySystemManager = default!;
[Dependency] private readonly IEntityManager _entities = default!;
#region Pull/Disarm
void IBodyPartAdded.BodyPartAdded(BodyPartAddedEventArgs args)
{
@@ -43,7 +27,7 @@ namespace Content.Server.Hands.Components
_ => throw new ArgumentOutOfRangeException()
};
AddHand(args.Slot, location);
_entitySystemManager.GetEntitySystem<SharedHandsSystem>().AddHand(Owner, args.Slot, location);
}
void IBodyPartRemoved.BodyPartRemoved(BodyPartRemovedEventArgs args)
@@ -51,94 +35,8 @@ namespace Content.Server.Hands.Components
if (args.Part.PartType != BodyPartType.Hand)
return;
RemoveHand(args.Slot);
_entitySystemManager.GetEntitySystem<SharedHandsSystem>().RemoveHand(Owner, args.Slot);
}
public bool BreakPulls()
{
// What is this API??
// I just wanted to do actions not deal with this shit...
if (!_entities.TryGetComponent(Owner, out SharedPullerComponent? puller)
|| puller.Pulling is not {Valid: true} pulling || !_entities.TryGetComponent(puller.Pulling.Value, out SharedPullableComponent? pullable))
return false;
return _entitySystemManager.GetEntitySystem<PullingSystem>().TryStopPull(pullable);
}
#endregion
#region Old public methods
public IEnumerable<string> HandNames => Hands.Select(h => h.Name);
public int Count => Hands.Count;
/// <summary>
/// Returns a list of all hand names, with the active hand being first.
/// </summary>
public IEnumerable<string> ActivePriorityEnumerable()
{
if (ActiveHand != null)
yield return ActiveHand;
foreach (var hand in Hands)
{
if (hand.Name == ActiveHand)
continue;
yield return hand.Name;
}
}
/// <summary>
/// Tries to get the ItemComponent on the entity held by a hand.
/// </summary>
public SharedItemComponent? GetItem(string handName)
{
if (!TryGetHeldEntity(handName, out var heldEntity))
return null;
_entities.TryGetComponent(heldEntity, out SharedItemComponent? item);
return item;
}
/// <summary>
/// Tries to get the ItemComponent on the entity held by a hand.
/// </summary>
public bool TryGetItem(string handName, [NotNullWhen(true)] out SharedItemComponent? item)
{
item = null;
if (!TryGetHeldEntity(handName, out var heldEntity))
return false;
return _entities.TryGetComponent(heldEntity, out item);
}
/// <summary>
/// Tries to get the ItemComponent off the entity in the active hand.
/// </summary>
public SharedItemComponent? GetActiveHandItem
{
get
{
if (!TryGetActiveHeldEntity(out var heldEntity))
return null;
_entities.TryGetComponent(heldEntity, out SharedItemComponent? item);
return item;
}
}
public IEnumerable<SharedItemComponent> GetAllHeldItems()
{
foreach (var entity in GetAllHeldEntities())
{
if (_entities.TryGetComponent(entity, out SharedItemComponent? item))
yield return item;
}
}
#endregion
}
}