Turn brain behavior into a component/system (#5281)

Content.Client/Entry/IgnoredComponents.cs

@@ -79,6 +79,7 @@ namespace Content.Client.Entry
             "Hitscan",
             "StunOnCollide",
             "RandomPottedPlant",
+            "Brain",
             "CommunicationsConsole",
             "BarSign",
             "DroppedBodyPart",

Content.Server/Body/Behavior/BrainBehavior.cs

@@ -1,70 +0,0 @@
-using Content.Server.Ghost;
-using Content.Server.Ghost.Components;
-using Content.Server.Mind.Components;
-using Content.Shared.Body.Components;
-using Content.Shared.Body.Part;
-using Content.Shared.Movement.Components;
-using Robust.Shared.GameObjects;
-
-namespace Content.Server.Body.Behavior
-{
-    public class BrainBehavior : MechanismBehavior
-    {
-        protected override void OnAddedToBody(SharedBodyComponent body)
-        {
-            base.OnAddedToBody(body);
-
-            HandleMind(body.Owner, Owner);
-        }
-
-        protected override void OnAddedToPart(SharedBodyPartComponent part)
-        {
-            base.OnAddedToPart(part);
-
-            HandleMind(part.Owner, Owner);
-        }
-
-        protected override void OnAddedToPartInBody(SharedBodyComponent body, SharedBodyPartComponent part)
-        {
-            base.OnAddedToPartInBody(body, part);
-
-            HandleMind(body.Owner, Owner);
-        }
-
-        protected override void OnRemovedFromBody(SharedBodyComponent old)
-        {
-            base.OnRemovedFromBody(old);
-
-            HandleMind(Part!.Owner, old.Owner);
-        }
-
-        protected override void OnRemovedFromPart(SharedBodyPartComponent old)
-        {
-            base.OnRemovedFromPart(old);
-
-            HandleMind(Owner, old.Owner);
-        }
-
-        protected override void OnRemovedFromPartInBody(SharedBodyComponent oldBody, SharedBodyPartComponent oldPart)
-        {
-            base.OnRemovedFromPartInBody(oldBody, oldPart);
-
-            HandleMind(oldBody.Owner, Owner);
-        }
-
-        private void HandleMind(IEntity newEntity, IEntity oldEntity)
-        {
-            newEntity.EnsureComponent<MindComponent>();
-            var oldMind = oldEntity.EnsureComponent<MindComponent>();
-
-            if (!newEntity.HasComponent<IGhostOnMove>())
-                newEntity.AddComponent<GhostOnMoveComponent>();
-
-            // TODO: This is an awful solution.
-            if (!newEntity.HasComponent<IMoverComponent>())
-                newEntity.AddComponent<SharedDummyInputMoverComponent>();
-
-            oldMind.Mind?.TransferTo(newEntity);
-        }
-    }
-}

Content.Server/Body/Components/BrainComponent.cs

@@ -0,0 +1,12 @@
+using Content.Server.Body.Systems;
+using Robust.Shared.Analyzers;
+using Robust.Shared.GameObjects;
+
+namespace Content.Server.Body.Components
+{
+    [RegisterComponent, Friend(typeof(BrainSystem))]
+    public class BrainComponent : Component
+    {
+        public override string Name => "Brain";
+    }
+}

Content.Server/Body/Systems/BrainSystem.cs

@@ -0,0 +1,49 @@
+using Content.Server.Body.Components;
+using Content.Server.Ghost;
+using Content.Server.Ghost.Components;
+using Content.Server.Mind.Components;
+using Content.Shared.Body.Events;
+using Content.Shared.Movement.Components;
+using Robust.Shared.GameObjects;
+
+namespace Content.Server.Body.Systems
+{
+    public class BrainSystem : EntitySystem
+    {
+        public override void Initialize()
+        {
+            base.Initialize();
+
+            SubscribeLocalEvent<BrainComponent, AddedToBodyEvent>((uid, component, args) => HandleMind(args.Body.OwnerUid, uid));
+            SubscribeLocalEvent<BrainComponent, AddedToPartEvent>((uid, component, args) => HandleMind(args.Part.OwnerUid, uid));
+            SubscribeLocalEvent<BrainComponent, AddedToPartInBodyEvent>((uid, component, args) => HandleMind(args.Body.OwnerUid, uid));
+            SubscribeLocalEvent<BrainComponent, RemovedFromBodyEvent>(OnRemovedFromBody);
+            SubscribeLocalEvent<BrainComponent, RemovedFromPartEvent>((uid, component, args) => HandleMind(uid, args.Old.OwnerUid));
+            SubscribeLocalEvent<BrainComponent, RemovedFromPartInBodyEvent>((uid, component, args) => HandleMind(args.OldBody.OwnerUid, uid));
+        }
+
+        private void OnRemovedFromBody(EntityUid uid, BrainComponent component, RemovedFromBodyEvent args)
+        {
+            // This one needs to be special, okay?
+            if (!EntityManager.TryGetComponent(uid, out MechanismComponent mech))
+                return;
+
+            HandleMind(mech.Part!.OwnerUid, args.Old.OwnerUid);
+        }
+
+        private void HandleMind(EntityUid newEntity, EntityUid oldEntity)
+        {
+            EntityManager.EnsureComponent<MindComponent>(newEntity);
+            var oldMind = EntityManager.EnsureComponent<MindComponent>(oldEntity);
+
+            if (!EntityManager.HasComponent<IGhostOnMove>(newEntity))
+                EntityManager.AddComponent<GhostOnMoveComponent>(newEntity);
+
+            // TODO: This is an awful solution.
+            if (!EntityManager.HasComponent<IMoverComponent>(newEntity))
+                EntityManager.AddComponent<SharedDummyInputMoverComponent>(newEntity);
+
+            oldMind.Mind?.TransferTo(EntityManager.GetEntity(newEntity));
+        }
+    }
+}

Content.Shared/Body/Components/SharedMechanismComponent.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Content.Shared.Body.Behavior;
+using Content.Shared.Body.Events;
 using Content.Shared.Body.Part;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
@@ -168,12 +169,14 @@ namespace Content.Shared.Body.Components
             }
         }
 
-        // TODO BODY Turn these into event listeners so they dont need to be exposed
         public void AddedToBody(SharedBodyComponent body)
         {
             DebugTools.AssertNotNull(Body);
             DebugTools.AssertNotNull(body);
 
+            var ev = new AddedToBodyEvent(body);
+            Owner.EntityManager.EventBus.RaiseLocalEvent(OwnerUid, ev, false);
+
             foreach (var behavior in _behaviors.Values)
             {
                 behavior.AddedToBody(body);
@@ -187,6 +190,9 @@ namespace Content.Shared.Body.Components
 
             Owner.Transform.AttachParent(part.Owner);
 
+            var ev = new AddedToPartEvent(part);
+            Owner.EntityManager.EventBus.RaiseLocalEvent(OwnerUid, ev, false);
+
             foreach (var behavior in _behaviors.Values)
             {
                 behavior.AddedToPart(part);
@@ -202,6 +208,9 @@ namespace Content.Shared.Body.Components
 
             Owner.Transform.AttachParent(part.Owner);
 
+            var ev = new AddedToPartInBodyEvent(body, part);
+            Owner.EntityManager.EventBus.RaiseLocalEvent(OwnerUid, ev, false);
+
             foreach (var behavior in _behaviors.Values)
             {
                 behavior.AddedToPartInBody(body, part);
@@ -213,6 +222,9 @@ namespace Content.Shared.Body.Components
             DebugTools.AssertNull(Body);
             DebugTools.AssertNotNull(old);
 
+            var ev = new RemovedFromBodyEvent(old);
+            Owner.EntityManager.EventBus.RaiseLocalEvent(OwnerUid, ev, false);
+
             foreach (var behavior in _behaviors.Values)
             {
                 behavior.RemovedFromBody(old);
@@ -226,6 +238,9 @@ namespace Content.Shared.Body.Components
 
             Owner.Transform.AttachToGridOrMap();
 
+            var ev = new RemovedFromPartEvent(old);
+            Owner.EntityManager.EventBus.RaiseLocalEvent(OwnerUid, ev, false);
+
             foreach (var behavior in _behaviors.Values)
             {
                 behavior.RemovedFromPart(old);
@@ -241,6 +256,9 @@ namespace Content.Shared.Body.Components
 
             Owner.Transform.AttachToGridOrMap();
 
+            var ev = new RemovedFromPartInBodyEvent(oldBody, oldPart);
+            Owner.EntityManager.EventBus.RaiseLocalEvent(OwnerUid, ev, false);
+
             foreach (var behavior in _behaviors.Values)
             {
                 behavior.RemovedFromPartInBody(oldBody, oldPart);

Content.Shared/Body/Events/MechanismBodyEvents.cs

@@ -0,0 +1,90 @@
+using Content.Shared.Body.Components;
+using Robust.Shared.GameObjects;
+
+namespace Content.Shared.Body.Events
+{
+    // All of these events are raised on a mechanism entity when added/removed to a body in different
+    // ways.
+
+    /// <summary>
+    ///     Raised on a mechanism when it is added to a body.
+    /// </summary>
+    public class AddedToBodyEvent : EntityEventArgs
+    {
+        public SharedBodyComponent Body;
+
+        public AddedToBodyEvent(SharedBodyComponent body)
+        {
+            Body = body;
+        }
+    }
+
+    /// <summary>
+    ///     Raised on a mechanism when it is added to a body part.
+    /// </summary>
+    public class AddedToPartEvent : EntityEventArgs
+    {
+        public SharedBodyPartComponent Part;
+
+        public AddedToPartEvent(SharedBodyPartComponent part)
+        {
+            Part = part;
+        }
+    }
+
+    /// <summary>
+    ///     Raised on a mechanism when it is added to a body part within a body.
+    /// </summary>
+    public class AddedToPartInBodyEvent : EntityEventArgs
+    {
+        public SharedBodyComponent Body;
+        public SharedBodyPartComponent Part;
+
+        public AddedToPartInBodyEvent(SharedBodyComponent body, SharedBodyPartComponent part)
+        {
+            Body = body;
+            Part = part;
+        }
+    }
+
+    /// <summary>
+    ///     Raised on a mechanism when it is removed from a body.
+    /// </summary>
+    public class RemovedFromBodyEvent : EntityEventArgs
+    {
+        public SharedBodyComponent Old;
+
+        public RemovedFromBodyEvent(SharedBodyComponent old)
+        {
+            Old = old;
+        }
+    }
+
+    /// <summary>
+    ///     Raised on a mechanism when it is removed from a body part.
+    /// </summary>
+    public class RemovedFromPartEvent : EntityEventArgs
+    {
+        public SharedBodyPartComponent Old;
+
+        public RemovedFromPartEvent(SharedBodyPartComponent old)
+        {
+            Old = old;
+        }
+    }
+
+    /// <summary>
+    ///     Raised on a mechanism when it is removed from a body part within a body.
+    /// </summary>
+    public class RemovedFromPartInBodyEvent : EntityEventArgs
+    {
+        public SharedBodyComponent OldBody;
+        public SharedBodyPartComponent OldPart;
+
+        public RemovedFromPartInBodyEvent(SharedBodyComponent oldBody, SharedBodyPartComponent oldPart)
+        {
+            OldBody = oldBody;
+            OldPart = oldPart;
+        }
+    }
+}

Resources/Prototypes/Body/Mechanisms/human.yml

@@ -28,12 +28,11 @@
   - type: Mechanism
     size: 1
     compatibility: Biological
-    behaviors:
-    - !type:BrainBehavior {}
   - type: Input
     context: "ghost"
   - type: DummyInputMover
   - type: GhostOnMove
+  - type: Brain
 
 - type: entity
   id: OrganHumanEyes