tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Shuffle body container subs slightly (#21084)" (#22339)

Browse Source 
This reverts commit eb49ad11ba.
This commit is contained in:
metalgearsloth
2023-12-11 23:06:56 +11:00
committed by GitHub
parent 000c776f47
commit 1cea5240c0
4 changed files with 130 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
Content.Shared/Body/Systems/SharedBodySystem.Body.cs
View File

@@ -25,11 +25,63 @@ public partial class SharedBodySystem
private void InitializeBody()
{
// Body here to handle root body parts.
SubscribeLocalEvent<BodyComponent, EntInsertedIntoContainerMessage>(OnBodyInserted);
SubscribeLocalEvent<BodyComponent, EntRemovedFromContainerMessage>(OnBodyRemoved);
SubscribeLocalEvent<BodyComponent, ComponentInit>(OnBodyInit);
SubscribeLocalEvent<BodyComponent, MapInitEvent>(OnBodyMapInit);
SubscribeLocalEvent<BodyComponent, CanDragEvent>(OnBodyCanDrag);
}
private void OnBodyInserted(EntityUid uid, BodyComponent component, EntInsertedIntoContainerMessage args)
{
// Root body part?
var slotId = args.Container.ID;
if (slotId != BodyRootContainerId)
return;
var entity = args.Entity;
if (TryComp(entity, out BodyPartComponent? childPart))
{
AddPart(uid, entity, slotId, childPart);
RecursiveBodyUpdate(entity, uid, childPart);
}
if (TryComp(entity, out OrganComponent? organ))
{
AddOrgan(entity, uid, uid, organ);
}
}
private void OnBodyRemoved(EntityUid uid, BodyComponent component, EntRemovedFromContainerMessage args)
{
// TODO: lifestage shenanigans
if (TerminatingOrDeleted(uid))
return;
// Root body part?
var slotId = args.Container.ID;
if (slotId != BodyRootContainerId)
return;
var entity = args.Entity;
if (TryComp(entity, out BodyPartComponent? childPart))
{
RemovePart(uid, entity, slotId, childPart);
RecursiveBodyUpdate(entity, null, childPart);
}
if (TryComp(entity, out OrganComponent? organ))
{
RemoveOrgan(entity, uid, organ);
}
}
private void OnBodyInit(EntityUid bodyId, BodyComponent body, ComponentInit args)
{
// Setup the initial container.
@@ -177,8 +229,6 @@ public partial class SharedBodySystem
yield break;
}
yield return (body.RootContainer.ContainedEntity.Value, rootPart);
foreach (var child in GetBodyPartChildren(body.RootContainer.ContainedEntity.Value, rootPart))
{
yield return child;

42
Content.Shared/Body/Systems/SharedBodySystem.Organs.cs
View File

@@ -9,50 +9,26 @@ namespace Content.Shared.Body.Systems;
public partial class SharedBodySystem
{
private void InitializeOrgans()
private void AddOrgan(EntityUid uid, EntityUid bodyUid, EntityUid parentPartUid, OrganComponent component)
{
SubscribeLocalEvent<OrganComponent, EntGotInsertedIntoContainerMessage>(OnOrganInserted);
SubscribeLocalEvent<OrganComponent, EntGotRemovedFromContainerMessage>(OnOrganRemoved);
}
component.Body = bodyUid;
RaiseLocalEvent(uid, new AddedToPartEvent(parentPartUid));
private void OnOrganInserted(EntityUid uid, OrganComponent component, EntGotInsertedIntoContainerMessage args)
{
// No recursive updates for these as you can't insert organs into organsTM.
var parentUid = args.Container.Owner;
if (component.Body != null)
RaiseLocalEvent(uid, new AddedToPartInBodyEvent(component.Body.Value, parentPartUid));
if (HasComp<BodyComponent>(parentUid))
{
component.Body = parentUid;
Dirty(uid, component);
}
// Organ inserted into body part.
if (TryComp(parentUid, out BodyPartComponent? partComp))
private void RemoveOrgan(EntityUid uid, EntityUid parentPartUid, OrganComponent component)
{
RaiseLocalEvent(uid, new AddedToPartEvent(parentUid));
RaiseLocalEvent(uid, new RemovedFromPartEvent(parentPartUid));
if (partComp.Body != null)
if (component.Body != null)
{
component.Body = partComp.Body;
RaiseLocalEvent(uid, new AddedToPartInBodyEvent(partComp.Body.Value, parentUid));
Dirty(uid, component);
}
}
RaiseLocalEvent(uid, new RemovedFromPartInBodyEvent(component.Body.Value, parentPartUid));
}
private void OnOrganRemoved(EntityUid uid, OrganComponent component, EntGotRemovedFromContainerMessage args)
{
// Lifestage shenanigans.
if (component.Body != null && TerminatingOrDeleted(component.Body.Value))
return;
if (HasComp<BodyPartComponent>(args.Container.Owner))
RaiseLocalEvent(uid, new RemovedFromPartEvent(args.Container.Owner));
if (component.Body == null)
return;
RaiseLocalEvent(uid, new RemovedFromPartInBodyEvent(component.Body.Value, args.Container.Owner));
component.Body = null;
Dirty(uid, component);
}

98
Content.Shared/Body/Systems/SharedBodySystem.Parts.cs
View File

@@ -19,70 +19,59 @@ public partial class SharedBodySystem
// TODO: This doesn't handle comp removal on child ents.
// If you modify this also see the Body partial for root parts.
SubscribeLocalEvent<BodyPartComponent, EntGotInsertedIntoContainerMessage>(OnBodyPartInserted);
SubscribeLocalEvent<BodyPartComponent, EntGotRemovedFromContainerMessage>(OnBodyPartRemoved);
SubscribeLocalEvent<BodyPartComponent, EntInsertedIntoContainerMessage>(OnBodyPartInserted);
SubscribeLocalEvent<BodyPartComponent, EntRemovedFromContainerMessage>(OnBodyPartRemoved);
}
private void OnBodyPartInserted(EntityUid uid, BodyPartComponent component, EntGotInsertedIntoContainerMessage args)
private void OnBodyPartInserted(EntityUid uid, BodyPartComponent component, EntInsertedIntoContainerMessage args)
{
var parentUid = args.Container.Owner;
if (HasComp<BodyComponent>(parentUid))
{
AddPart(parentUid, uid, GetPartSlotContainerId(args.Container.ID), component);
RecursiveBodyUpdate(uid, parentUid, component);
}
// Body part inserted into another body part.
if (TryComp(parentUid, out BodyPartComponent? partComp))
{
if (partComp.Body == null)
return;
var entity = args.Entity;
var slotId = args.Container.ID;
AddPart(partComp.Body.Value, uid, GetPartSlotContainerId(args.Container.ID), component);
RecursiveBodyUpdate(uid, partComp.Body, component);
}
}
private void OnBodyPartRemoved(EntityUid uid, BodyPartComponent component, EntGotRemovedFromContainerMessage args)
{
if (component.Body != null)
{
// Lifestage shenanigans.
if (TerminatingOrDeleted(component.Body.Value))
if (TryComp(entity, out BodyPartComponent? childPart))
{
AddPart(component.Body.Value, entity, slotId, childPart);
RecursiveBodyUpdate(entity, component.Body.Value, childPart);
}
if (TryComp(entity, out OrganComponent? organ))
{
AddOrgan(entity, component.Body.Value, uid, organ);
}
}
}
private void OnBodyPartRemoved(EntityUid uid, BodyPartComponent component, EntRemovedFromContainerMessage args)
{
// TODO: lifestage shenanigans
if (TerminatingOrDeleted(uid))
return;
RemovePart(component.Body.Value, uid, GetPartSlotContainerId(args.Container.ID), component);
RecursiveBodyUpdate(uid, null, component);
// Body part removed from another body part.
var entity = args.Entity;
var slotId = args.Container.ID;
if (TryComp(entity, out BodyPartComponent? childPart) && childPart.Body != null)
{
RemovePart(childPart.Body.Value, entity, slotId, childPart);
RecursiveBodyUpdate(entity, null, childPart);
}
if (TryComp(entity, out OrganComponent? organ))
{
RemoveOrgan(entity, uid, organ);
}
}
/// <summary>
/// Updates body parts recursively for a particular entity, including itself.
/// </summary>
private void RecursiveBodyUpdate(EntityUid uid, EntityUid? bodyUid, BodyPartComponent component)
{
// Recursively iterate all child parts and organs and ensure their body refs are updated.
foreach (var children in GetBodyPartChildren(uid, component))
{
if (children.Component.Body == bodyUid)
continue;
// Raise the body part change event if relevant.
if (Containers.TryGetContainingContainer(children.Id, out var childContainer))
if (children.Component.Body != bodyUid)
{
var slotId = GetPartSlotContainerId(childContainer.ID);
if (bodyUid != null)
{
AddPart(bodyUid.Value, children.Id, slotId, children.Component);
}
else if (component.Body != null)
{
RemovePart(component.Body.Value, children.Id, slotId, children.Component);
}
}
children.Component.Body = bodyUid;
Dirty(children.Id, children.Component);
@@ -117,6 +106,7 @@ public partial class SharedBodySystem
}
}
}
}
protected virtual void AddPart(
EntityUid bodyUid,
@@ -126,8 +116,9 @@ public partial class SharedBodySystem
BodyComponent? bodyComp = null)
{
DebugTools.AssertOwner(partUid, component);
component.Body = bodyUid;
Dirty(partUid, component);
component.Body = bodyUid;
var ev = new BodyPartAddedEvent(slotId, component);
RaiseLocalEvent(bodyUid, ref ev);
@@ -143,8 +134,8 @@ public partial class SharedBodySystem
{
DebugTools.AssertOwner(partUid, component);
Resolve(bodyUid, ref bodyComp, false);
component.Body = null;
Dirty(partUid, component);
component.Body = null;
var ev = new BodyPartRemovedEvent(slotId, component);
RaiseLocalEvent(bodyUid, ref ev);
@@ -556,13 +547,15 @@ public partial class SharedBodySystem
}
/// <summary>
/// Returns all body part components for this entity not including itself.
/// Returns all body part components for this entity including itself.
/// </summary>
public IEnumerable<(EntityUid Id, BodyPartComponent Component)> GetBodyPartChildren(EntityUid partId, BodyPartComponent? part = null)
{
if (!Resolve(partId, ref part, false))
yield break;
yield return (partId, part);
foreach (var slotId in part.Children.Keys)
{
var containerSlotId = GetPartSlotContainerId(slotId);
@@ -574,8 +567,6 @@ public partial class SharedBodySystem
if (!TryComp(containedEnt, out BodyPartComponent? childPart))
continue;
yield return (containedEnt, childPart);
foreach (var value in GetBodyPartChildren(containedEnt, childPart))
{
yield return value;
@@ -638,9 +629,6 @@ public partial class SharedBodySystem
return false;
}
if (childId == parentId)
return true;
foreach (var (foundId, _) in GetBodyPartChildren(parentId, parent))
{
if (foundId == childId)

1
Content.Shared/Body/Systems/SharedBodySystem.cs
View File

@@ -39,7 +39,6 @@ public abstract partial class SharedBodySystem : EntitySystem
base.Initialize();
InitializeBody();
InitializeOrgans();
InitializeParts();
}