cmdrunematti
/
Delta-v
mirror of https://github.com/DeltaV-Station/Delta-v.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix Felinid system (again)

This commit is contained in:
Debug 2023-09-27 20:42:22 +02:00 committed by Debug
parent bc7b728b98
commit 6e0b6b23ac
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Content.Server/Nyanotrasen/Abilities/Felinid/FelinidComponent.cs
View File

@ -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;
[DataField("eatActionId",
customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
public string? EatActionId = "ActionEatMouse";
[DataField("eatAction")]
public EntityUid? EatAction;
[DataField("eatActionTarget")]
public EntityUid? EatActionTarget = null;
public EntityUid? EatAction = null;
}

8
Content.Server/Nyanotrasen/Abilities/Felinid/FelinidSystem.cs
View File

@ -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)