Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Moves spike to ECS (#5706)

Browse Source
This commit is contained in:
FoLoKe
2021-12-26 05:32:01 +03:00
committed by GitHub
parent fdf7aae744
commit 83114de0e4
13 changed files with 338 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Shared/DragDrop/IDraggable.cs
View File

@@ -56,7 +56,7 @@ namespace Content.Shared.DragDrop
}
}
public class StartDragDropEvent : EntityEventArgs
public class StartDragDropEvent : HandledEntityEventArgs
{
/// <summary>
/// Entity doing the drag and drop.

4
Content.Shared/Kitchen/Components/SharedKitchenSpikeComponent.cs
View File

@@ -16,11 +16,11 @@ namespace Content.Shared.Kitchen.Components
[ViewVariables]
[DataField("delay")]
protected float SpikeDelay = 12.0f;
public float SpikeDelay = 12.0f;
[ViewVariables(VVAccess.ReadWrite)]
[DataField("sound")]
protected SoundSpecifier SpikeSound = new SoundPathSpecifier("/Audio/Effects/Fluids/splat.ogg");
public SoundSpecifier SpikeSound = new SoundPathSpecifier("/Audio/Effects/Fluids/splat.ogg");
bool IDragDropOn.CanDragDropOn(DragDropEvent eventArgs)
{

18
Content.Shared/Nutrition/Components/SharedButcherableComponent.cs
View File

@@ -1,6 +1,8 @@
using Content.Shared.DragDrop;
using Robust.Shared.GameObjects;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
using Robust.Shared.ViewVariables;
namespace Content.Shared.Nutrition.Components
@@ -13,13 +15,23 @@ namespace Content.Shared.Nutrition.Components
{
public override string Name => "Butcherable";
//TODO: List for sub-products like animal-hides, organs and etc?
[ViewVariables]
public string? MeatPrototype => _meatPrototype;
[DataField("meat", customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))]
public string MeatPrototype = "FoodMeat";
[ViewVariables]
[DataField("meat")]
private string? _meatPrototype;
[DataField("pieces")]
public int Pieces = 5;
/// <summary>
/// Prevents butchering same entity on two and more spikes simultaneously and multiple doAfters on the same Spike
/// </summary>
public bool BeingButchered;
// TODO: ECS this out!, my guess CanDropEvent should be client side only and then "ValidDragDrop" in the DragDropSystem needs a little touch
// But this may lead to creating client-side systems for every Draggable component subbed to CanDrop. Actually those systems could control
// CanDropOn behaviors as well (IDragDropOn)
bool IDraggable.CanDrop(CanDropEvent args)
{
return true;