Fix Felinid system (again)

DeltaV-Station · Sep 27, 2023 · 3287931 · 3287931
1 parent 8d4df7e
commit 3287931
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/Content.Server/Nyanotrasen/Abilities/Felinid/FelinidComponent.cs b/Content.Server/Nyanotrasen/Abilities/Felinid/FelinidComponent.cs
@@ -17,10 +17,20 @@ public sealed partial class FelinidComponent : Component
     //[DataField("hairballAction", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
     //public string HairballAction = "ActionHairball";
 
+    [DataField("hairballActionId",
+        customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
+    public string? HairballActionId = "ActionHairball";
+
     [DataField("hairballAction")]
-    public EntityUid? HairballAction = null;
+    public EntityUid? HairballAction;
 
-    public EntityUid? EatActionTarget = null;
+    [DataField("eatActionId",
+        customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
+    public string? EatActionId = "ActionEatMouse";
 
-    public EntityUid? EatAction = null;
+    [DataField("eatAction")]
+    public EntityUid? EatAction;
+
+    [DataField("eatActionTarget")]
+    public EntityUid? EatActionTarget = null;
 }
diff --git a/Content.Server/Nyanotrasen/Abilities/Felinid/FelinidSystem.cs b/Content.Server/Nyanotrasen/Abilities/Felinid/FelinidSystem.cs
@@ -74,8 +74,8 @@ private void OnInit(EntityUid uid, FelinidComponent component, ComponentInit arg
         if (component.HairballAction != null)
             return;
 
-        component.HairballAction = Spawn("ActionHairball");
-        _actionsSystem.AddAction(uid, component.HairballAction.Value, uid);
+        //component.HairballAction = Spawn("ActionHairball");
+        _actionsSystem.AddAction(uid, ref component.HairballAction, component.HairballActionId);
     }
 
     private void OnEquipped(EntityUid uid, FelinidComponent component, DidEquipHandEvent args)
@@ -85,8 +85,8 @@ private void OnEquipped(EntityUid uid, FelinidComponent component, DidEquipHandE
 
         component.EatActionTarget = args.Equipped;
 
-        component.EatAction = Spawn("ActionEatMouse");
-        _actionsSystem.AddAction(uid, ref component.EatAction, null);
+        //component.EatAction = Spawn("ActionEatMouse");
+        _actionsSystem.AddAction(uid, ref component.EatAction, component.EatActionId);
     }
 
     private void OnUnequipped(EntityUid uid, FelinidComponent component, DidUnequipHandEvent args)