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

Fix monkey kitchen spike dragdrop (#3450)

Browse Source 
* Fix monkey kitchen spike dragdrop

I also aligned the behavior with tg (need combat mode on + mob alive).
It still needs to do damage over time and buckle the target but baby steps.

* Cleanup

* Fix kitchenspike layers

Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
This commit is contained in:
metalgearsloth
2021-03-08 21:24:34 +11:00
committed by GitHub
parent 0a6a23b86f
commit 362c6de742
7 changed files with 72 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Content.Shared/GameObjects/Components/Nutrition/SharedButcherableComponent.cs Normal file
View File

@@ -0,0 +1,31 @@
#nullable enable
using Content.Shared.Interfaces.GameObjects.Components;
using Robust.Shared.GameObjects;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.ViewVariables;
namespace Content.Shared.GameObjects.Components.Nutrition
{
/// <summary>
/// Indicates that the entity can be thrown on a kitchen spike for butchering.
/// </summary>
[RegisterComponent]
public class SharedButcherableComponent : Component, IDraggable
{
public override string Name => "Butcherable";
[ViewVariables]
public string? MeatPrototype => _meatPrototype;
[ViewVariables]
[DataField("meat")]
private string? _meatPrototype;
public bool CanDrop(CanDropEventArgs args)
{
return true;
}
}
}

22
Content.Shared/Kitchen/SharedKitchenSpikeComponent.cs
View File

@@ -1,4 +1,5 @@
#nullable enable
using Content.Shared.GameObjects.Components.Mobs;
using Content.Shared.GameObjects.Components.Mobs.State;
using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
using Content.Shared.Interfaces.GameObjects.Components;
@@ -12,22 +13,25 @@ namespace Content.Shared.Kitchen
{
public override string Name => "KitchenSpike";
[ViewVariables] [DataField("delay")] protected float SpikeDelay = 10;
[ViewVariables]
[DataField("delay")]
protected float SpikeDelay = 12.0f;
[ViewVariables(VVAccess.ReadWrite)]
[DataField("sound")]
protected string? SpikeSound = "/Audio/Effects/Fluids/splat.ogg";
bool IDragDropOn.CanDragDropOn(DragDropEventArgs eventArgs)
{
if (!eventArgs.Dragged.TryGetComponent<IMobStateComponent>(out var state))
if (eventArgs.User == eventArgs.Dragged ||
!eventArgs.Dragged.TryGetComponent<IMobStateComponent>(out var state) ||
(eventArgs.User.TryGetComponent(out SharedCombatModeComponent? combatMode) && !combatMode.IsInCombatMode))
{
return false;
}
// TODO: Wouldn't we just need the CanMove check?
if (state.IsDead() || state.IsCritical() || state.IsIncapacitated() || !ActionBlockerSystem.CanMove(eventArgs.Dragged))
{
return true;
}
return false;
// TODO: Once we get silicons need to check organic
return !state.IsDead();
}
public abstract bool DragDropOn(DragDropEventArgs eventArgs);