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

Action container rejig (#20260)

Browse Source 
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
This commit is contained in:
Leon Friedrich
2023-09-23 04:49:39 -04:00
committed by GitHub
parent c80c90ed65
commit 684b334806
50 changed files with 889 additions and 740 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Content.Shared/Clothing/EntitySystems/ToggleableClothingSystem.cs
View File

@@ -18,6 +18,7 @@ public sealed class ToggleableClothingSystem : EntitySystem
{
[Dependency] private readonly SharedContainerSystem _containerSystem = default!;
[Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
[Dependency] private readonly ActionContainerSystem _actionContainer = default!;
[Dependency] private readonly InventorySystem _inventorySystem = default!;
[Dependency] private readonly SharedPopupSystem _popupSystem = default!;
[Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
@@ -258,10 +259,12 @@ public sealed class ToggleableClothingSystem : EntitySystem
private void OnGetActions(EntityUid uid, ToggleableClothingComponent component, GetItemActionsEvent args)
{
if (component.ClothingUid == null || (args.SlotFlags & component.RequiredFlags) != component.RequiredFlags)
return;
args.AddAction(ref component.ActionEntity, component.Action);
if (component.ClothingUid != null
&& component.ActionEntity != null
&& (args.SlotFlags & component.RequiredFlags) == component.RequiredFlags)
{
args.AddAction(component.ActionEntity.Value);
}
}
private void OnInit(EntityUid uid, ToggleableClothingComponent component, ComponentInit args)
@@ -275,7 +278,7 @@ public sealed class ToggleableClothingSystem : EntitySystem
/// </summary>
private void OnMapInit(EntityUid uid, ToggleableClothingComponent component, MapInitEvent args)
{
if (component.Container!.ContainedEntity is EntityUid ent)
if (component.Container!.ContainedEntity is {} ent)
{
DebugTools.Assert(component.ClothingUid == ent, "Unexpected entity present inside of a toggleable clothing container.");
return;
@@ -295,11 +298,8 @@ public sealed class ToggleableClothingSystem : EntitySystem
component.Container.Insert(component.ClothingUid.Value, EntityManager, ownerTransform: xform);
}
if (_actionsSystem.TryGetActionData(component.ActionEntity, out var action))
{
action.EntityIcon = component.ClothingUid;
_actionsSystem.Dirty(component.ActionEntity);
}
if (_actionContainer.EnsureAction(uid, ref component.ActionEntity, out var action, component.Action))
_actionsSystem.SetEntityIcon(component.ActionEntity.Value, component.ClothingUid, action);
}
}

6
Content.Shared/Clothing/MagbootsComponent.cs
View File

@@ -8,10 +8,10 @@ namespace Content.Shared.Clothing;
[Access(typeof(SharedMagbootsSystem))]
public sealed partial class MagbootsComponent : Component
{
[DataField("toggleAction", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>), required: true)]
public string? ToggleAction;
[DataField]
public EntProtoId ToggleAction = "ActionToggleMagboots";
[DataField("toggleActionEntity")]
[DataField, AutoNetworkedField]
public EntityUid? ToggleActionEntity;
[DataField("on"), AutoNetworkedField]