use tags per item instead of var per component

Simple-Station · Aug 25, 2023 · 4ff20a4 · 4ff20a4
1 parent 58aca28
commit 4ff20a4
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 26 deletions.
diff --git a/Content.Server/Nyanotrasen/Borgs/InnateItemComponent.cs b/Content.Server/Nyanotrasen/Borgs/InnateItemComponent.cs
@@ -5,9 +5,6 @@ public sealed class InnateItemComponent : Component
     {
         public bool AlreadyInitialized = false;
 
-        [DataField("afterInteract")]
-        public bool AfterInteract = true;
-
         [DataField("startingPriority")]
         public int? StartingPriority = null;
     }

diff --git a/Content.Server/Nyanotrasen/Borgs/InnateItemSystem.cs b/Content.Server/Nyanotrasen/Borgs/InnateItemSystem.cs
@@ -23,7 +23,6 @@ public override void Initialize()
 
         private void OnMindAdded(EntityUid uid, InnateItemComponent component, MindAddedMessage args)
         {
-            Logger.ErrorS("innate", $"OnMindAdded: {uid}");
             if (!component.AlreadyInitialized)
                 RefreshItems(uid, component);
 
@@ -42,41 +41,25 @@ private void RefreshItems(EntityUid uid, InnateItemComponent component)
                     _tagSystem.HasTag(sourceItem, "NoAction"))
                     continue;
 
-                _actionsSystem.AddAction(uid, component.AfterInteract
-                    ? CreateAfterInteractAction(sourceItem, priority)
-                    : CreateBeforeInteractAction(sourceItem, priority),
-                    uid
-                );
+                _actionsSystem.AddAction(uid, CreateInteractAction(sourceItem, priority), null);
 
                 priority--;
             }
         }
 
-        private EntityTargetAction CreateAfterInteractAction(EntityUid uid, int priority)
-        {
-            EntityTargetAction action = new()
-            {
-                DisplayName = MetaData(uid).EntityName,
-                Description = MetaData(uid).EntityDescription,
-                EntityIcon = uid,
-                Event = new InnateAfterInteractActionEvent(uid),
-                Priority = priority,
-            };
-
-            return action;
-        }
 
-        private EntityTargetAction CreateBeforeInteractAction(EntityUid uid, int priority)
+        private EntityTargetAction CreateInteractAction(EntityUid uid, int priority)
         {
             EntityTargetAction action = new()
             {
                 DisplayName = MetaData(uid).EntityName,
                 Description = MetaData(uid).EntityDescription,
                 EntityIcon = uid,
-                Event = new InnateBeforeInteractActionEvent(uid),
+                Event = _tagSystem.HasTag(uid, "InnateItemBeforeInteract") ? new InnateBeforeInteractActionEvent(uid) : new InnateAfterInteractActionEvent(uid),
                 Priority = priority,
                 CheckCanAccess = false,
                 Range = 25f,
+                Repeat = _tagSystem.HasTag(uid, "InnateItemRepeat"),
             };
 
             return action;

diff --git a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
@@ -55,7 +55,6 @@
   - type: Inventory
     templateId: aghost
   - type: InnateItem
-    afterInteract: false
     startingPriority: 15
   - type: ItemSlots
     slots:

diff --git a/Resources/Prototypes/SimpleStation14/Entities/Mobs/Player/stationai.yml b/Resources/Prototypes/SimpleStation14/Entities/Mobs/Player/stationai.yml
@@ -41,7 +41,6 @@
       showAuthor: false
     # Innate door remotes (bolting, emergency access, etc)
     - type: InnateItem
-      afterInteract: false
       startingPriority: 25
     - type: ItemSlots
       slots:

diff --git a/Resources/Prototypes/SimpleStation14/Entities/Objects/Devices/door_remote.yml b/Resources/Prototypes/SimpleStation14/Entities/Objects/Devices/door_remote.yml
@@ -17,6 +17,10 @@
         - AllAccess
     - type: DoorRemote
       defaultMode: enum.OperatingMode.OpenClose
+    - type: Tag
+      tags:
+        - InnateItemBeforeInteract
+        - InnateItemRepeat
 
 # Innate items, not meant to be spawned as there isn't any functional difference between them and the parent
 - type: entity

diff --git a/Resources/Prototypes/SimpleStation14/tags.yml b/Resources/Prototypes/SimpleStation14/tags.yml
@@ -1,6 +1,12 @@
 - type: Tag
   id: GlassesNearsight
 
+- type: Tag
+  id: InnateItemBeforeInteract
+
+- type: Tag
+  id: InnateItemRepeat
+
 - type: Tag
   id: Plushie