From 6e0b6b23ac332e4c270a82417b6c1e6ba6b4f9f3 Mon Sep 17 00:00:00 2001 From: Debug Date: Wed, 27 Sep 2023 20:42:22 +0200 Subject: [PATCH] Fix Felinid system (again) --- .../Abilities/Felinid/FelinidComponent.cs | 16 +++++++++++++--- .../Abilities/Felinid/FelinidSystem.cs | 8 ++++---- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/Content.Server/Nyanotrasen/Abilities/Felinid/FelinidComponent.cs b/Content.Server/Nyanotrasen/Abilities/Felinid/FelinidComponent.cs index a3e389409f..9165b90de0 100644 --- 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))] //public string HairballAction = "ActionHairball"; + [DataField("hairballActionId", + customTypeSerializer: typeof(PrototypeIdSerializer))] + public string? HairballActionId = "ActionHairball"; + [DataField("hairballAction")] - public EntityUid? HairballAction = null; + public EntityUid? HairballAction; + [DataField("eatActionId", + customTypeSerializer: typeof(PrototypeIdSerializer))] + public string? EatActionId = "ActionEatMouse"; + + [DataField("eatAction")] + public EntityUid? EatAction; + + [DataField("eatActionTarget")] public EntityUid? EatActionTarget = null; - - public EntityUid? EatAction = null; } diff --git a/Content.Server/Nyanotrasen/Abilities/Felinid/FelinidSystem.cs b/Content.Server/Nyanotrasen/Abilities/Felinid/FelinidSystem.cs index f3d869a023..c281d69d2f 100644 --- a/Content.Server/Nyanotrasen/Abilities/Felinid/FelinidSystem.cs +++ b/Content.Server/Nyanotrasen/Abilities/Felinid/FelinidSystem.cs @@ -74,8 +74,8 @@ public sealed partial class FelinidSystem : EntitySystem 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 @@ public sealed partial class FelinidSystem : EntitySystem 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)