Moves HumanoidAppearanceComponent to ECS (#4855)

* Moves HumanoidCharacterAppearance to ECS * Makes HumanoidAppearanceSystem work over networks * Makes HumanoidAppearanceSystem more efficient * Cleans up the files * Updates privacy on a couple of functions * Fixes a few using references, renames a file * Makes HumanoidAppearanceSystem more cleaner * Fixes Magic Mirror * Cleanup * HumanoidAppearanceComponent now has a friend SharedHumanoidAppearanceSystem is only allowed to act on this, now * Fixes the Body-HumanoidAppearance ECS scaffolding * a little cleanup never hurt anybody * quick fix for magic mirror appearance access * Replaces a networked event with a local one This one was... causing bugs
2021-10-16 15:28:02 -07:00
parent f69575e15a
commit 7dc6b95a10
17 changed files with 275 additions and 240 deletions
--- a/Content.Client/CharacterAppearance/Systems/HumanoidAppearanceSystem.cs
+++ b/Content.Client/CharacterAppearance/Systems/HumanoidAppearanceSystem.cs
@@ -0,0 +1,127 @@
+using Content.Client.Cuffs.Components;
+using Content.Shared.Body.Components;
+using Content.Shared.CharacterAppearance;
+using Content.Shared.CharacterAppearance.Components;
+using Content.Shared.CharacterAppearance.Systems;
+using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
+using Robust.Shared.Maths;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client.CharacterAppearance.Systems
+{
+    public class HumanoidAppearanceSystem : SharedHumanoidAppearanceSystem
+    {
+        [Dependency] private readonly SpriteAccessoryManager _accessoryManager = default!;
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+
+        public override void Initialize()
+        {
+            base.Initialize();
+
+            SubscribeLocalEvent<HumanoidAppearanceComponent, ChangedHumanoidAppearanceEvent>(UpdateLooks);
+            SubscribeLocalEvent<HumanoidAppearanceBodyPartAddedEvent>(BodyPartAdded);
+            SubscribeLocalEvent<HumanoidAppearanceBodyPartRemovedEvent>(BodyPartRemoved);
+        }
+
+        private void UpdateLooks(EntityUid uid, HumanoidAppearanceComponent component, ChangedHumanoidAppearanceEvent args)
+        {
+            if(!EntityManager.TryGetComponent(uid, out SpriteComponent? sprite))
+                return;
+
+            if (EntityManager.TryGetComponent(uid, out SharedBodyComponent? body))
+            {
+                foreach (var (part, _) in body.Parts)
+                {
+                    if (part.Owner.TryGetComponent(out SpriteComponent? partSprite))
+                    {
+                        partSprite!.Color = component.Appearance.SkinColor;
+                    }
+
+                }
+            }
+
+            sprite.LayerSetColor(HumanoidVisualLayers.Hair,
+                component.CanColorHair ? component.Appearance.HairColor : Color.White);
+            sprite.LayerSetColor(HumanoidVisualLayers.FacialHair,
+                component.CanColorFacialHair ? component.Appearance.FacialHairColor : Color.White);
+
+            sprite.LayerSetColor(HumanoidVisualLayers.Eyes, component.Appearance.EyeColor);
+
+            sprite.LayerSetState(HumanoidVisualLayers.Chest, component.Sex == Sex.Male ? "torso_m" : "torso_f");
+            sprite.LayerSetState(HumanoidVisualLayers.Head, component.Sex == Sex.Male ? "head_m" : "head_f");
+
+            if (sprite.LayerMapTryGet(HumanoidVisualLayers.StencilMask, out _))
+                sprite.LayerSetVisible(HumanoidVisualLayers.StencilMask, component.Sex == Sex.Female);
+
+            if (EntityManager.TryGetComponent<CuffableComponent>(uid, out var cuffed))
+            {
+                sprite.LayerSetVisible(HumanoidVisualLayers.Handcuffs, !cuffed.CanStillInteract);
+            }
+            else
+            {
+                sprite.LayerSetVisible(HumanoidVisualLayers.Handcuffs, false);
+            }
+
+            var hairStyle = component.Appearance.HairStyleId;
+            if (string.IsNullOrWhiteSpace(hairStyle) ||
+                !_accessoryManager.IsValidAccessoryInCategory(hairStyle, component.CategoriesHair))
+            {
+                hairStyle = HairStyles.DefaultHairStyle;
+            }
+
+            var facialHairStyle = component.Appearance.FacialHairStyleId;
+            if (string.IsNullOrWhiteSpace(facialHairStyle) ||
+                !_accessoryManager.IsValidAccessoryInCategory(facialHairStyle, component.CategoriesFacialHair))
+            {
+                facialHairStyle = HairStyles.DefaultFacialHairStyle;
+            }
+
+            var hairPrototype = _prototypeManager.Index<SpriteAccessoryPrototype>(hairStyle);
+            var facialHairPrototype = _prototypeManager.Index<SpriteAccessoryPrototype>(facialHairStyle);
+
+            sprite.LayerSetSprite(HumanoidVisualLayers.Hair, hairPrototype.Sprite);
+            sprite.LayerSetSprite(HumanoidVisualLayers.FacialHair, facialHairPrototype.Sprite);
+        }
+
+        // Scaffolding until Body is moved to ECS.
+        private void BodyPartAdded(HumanoidAppearanceBodyPartAddedEvent args)
+        {
+            if(!EntityManager.TryGetEntity(args.Uid, out var owner)) return;
+            if (!owner.TryGetComponent(out SpriteComponent? sprite))
+            {
+                return;
+            }
+
+            if (!args.Args.Part.Owner.HasComponent<SpriteComponent>())
+            {
+                return;
+            }
+
+            var layers = args.Args.Part.ToHumanoidLayers();
+            // TODO BODY Layer color, sprite and state
+            foreach (var layer in layers)
+                sprite.LayerSetVisible(layer, true);
+        }
+
+        private void BodyPartRemoved(HumanoidAppearanceBodyPartRemovedEvent args)
+        {
+            if(!EntityManager.TryGetEntity(args.Uid, out var owner)) return;
+            if (!owner.TryGetComponent(out SpriteComponent? sprite))
+            {
+                return;
+            }
+
+            if (!args.Args.Part.Owner.HasComponent<SpriteComponent>())
+            {
+                return;
+            }
+
+            var layers = args.Args.Part.ToHumanoidLayers();
+            // TODO BODY Layer color, sprite and state
+            foreach (var layer in layers)
+                sprite.LayerSetVisible(layer, false);
+        }
+    }
+}