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

Spikes fix reopened (#3203)

Browse Source 
* DoAfter, dead and stun check, DragDropOn

* Not ignored anymore

* Copied comment deleted

* Herbert's an ass

* Woops

Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
This commit is contained in:
komunre
2021-02-18 14:49:50 +07:00
committed by GitHub
parent eadcb3a296
commit 77c8fc5b42
4 changed files with 157 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

141
Content.Server/GameObjects/Components/Kitchen/KitchenSpikeComponent.cs
View File

@@ -1,79 +1,134 @@
#nullable enable
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using Content.Server.GameObjects.EntitySystems.DoAfter;
using Content.Server.Interfaces.Chat;
using Content.Server.Interfaces.GameObjects;
using Content.Server.Utility;
using Content.Shared.GameObjects.EntitySystems;
using Content.Shared.Interfaces;
using Content.Shared.Interfaces.GameObjects.Components;
using Robust.Server.GameObjects;
using Robust.Shared.GameObjects;
using Robust.Shared.Localization;
using Content.Shared.GameObjects.Components.Kitchen;
namespace Content.Server.GameObjects.Components.Kitchen
{
[RegisterComponent]
[ComponentReference(typeof(IActivate))]
public class KitchenSpikeComponent : Component, IActivate, ISuicideAct
public class KitchenSpikeComponent : SharedKitchenSpikeComponent, IActivate, ISuicideAct
{
public override string Name => "KitchenSpike";
private int _meatParts;
private string? _meatPrototype;
private string _meatSource1p = "?";
private string _meatSource0 = "?";
private string _meatName = "?";
private List<EntityUid> _beingButchered = new();
void IActivate.Activate(ActivateEventArgs eventArgs)
{
SpriteComponent? sprite;
if (!EntitySystem.Get<SharedPullingSystem>().TryGetPulled(eventArgs.User, out var victim))
if (_meatParts == 0)
{
if (_meatParts == 0)
{
return;
}
_meatParts--;
if (!string.IsNullOrEmpty(_meatPrototype))
{
var meat = Owner.EntityManager.SpawnEntity(_meatPrototype, Owner.Transform.Coordinates);
if (meat != null)
{
meat.Name = _meatName;
}
}
if (_meatParts != 0)
{
eventArgs.User.PopupMessage(_meatSource1p);
}
else
{
if (Owner.TryGetComponent(out sprite))
{
sprite.LayerSetState(0, "spike");
}
eventArgs.User.PopupMessage(_meatSource0);
}
return;
}
_meatParts--;
if (!string.IsNullOrEmpty(_meatPrototype))
{
var meat = Owner.EntityManager.SpawnEntity(_meatPrototype, Owner.Transform.Coordinates);
if (meat != null)
{
meat.Name = _meatName;
}
}
if (_meatParts != 0)
{
eventArgs.User.PopupMessage(_meatSource1p);
}
else
{
if (Owner.TryGetComponent(out sprite))
{
sprite.LayerSetState(0, "spike");
}
eventArgs.User.PopupMessage(_meatSource0);
}
return;
}
public override bool DragDropOn(DragDropEventArgs eventArgs)
{
TrySpike(eventArgs.Dragged, eventArgs.User);
return true;
}
private bool Spikeable(IEntity user, IEntity victim, [NotNullWhen(true)] out ButcherableComponent? butcherable)
{
butcherable = null;
if (_meatParts > 0)
{
Owner.PopupMessage(eventArgs.User, Loc.GetString("The spike already has something on it, finish collecting its meat first!"));
return;
Owner.PopupMessage(user, Loc.GetString("The spike already has something on it, finish collecting its meat first!"));
return false;
}
if (!victim.TryGetComponent<ButcherableComponent>(out var food))
if (!victim.TryGetComponent(out butcherable))
{
Owner.PopupMessage(eventArgs.User, Loc.GetString("{0:theName} can't be butchered on the spike.", victim));
return;
Owner.PopupMessage(user, Loc.GetString("{0:theName} can't be butchered on the spike.", victim));
return false;
}
_meatPrototype = food.MeatPrototype;
return true;
}
public async void TrySpike(IEntity victim, IEntity user)
{
var victimUid = victim.Uid;
if (_beingButchered.Contains(victimUid)) return;
ButcherableComponent? butcherable;
if (!Spikeable(user, victim, out butcherable)) return;
if (user != victim)
{
Owner.PopupMessage(victim, Loc.GetString("{0:theName} begins dragging you onto {1:theName}!", user, Owner));
}
else
{
Owner.PopupMessage(user, Loc.GetString("You begin dragging yourself onto {0:theName}!", Owner));
}
var doAfterSystem = EntitySystem.Get<DoAfterSystem>();
var doAfterArgs = new DoAfterEventArgs(user, SpikeDelay, default, victim)
{
BreakOnTargetMove = true,
BreakOnUserMove = true,
BreakOnDamage = true,
BreakOnStun = true,
NeedHand = true,
};
_beingButchered.Add(victimUid);
var result = await doAfterSystem.DoAfter(doAfterArgs);
_beingButchered.Remove(victimUid);
if (result == DoAfterStatus.Cancelled)
return;
if (!Spikeable(user, victim, out butcherable)) return;
_meatPrototype = butcherable.MeatPrototype;
_meatParts = 5;
_meatSource1p = Loc.GetString("You remove some meat from {0:theName}.", victim);
_meatSource0 = Loc.GetString("You remove the last piece of meat from {0:theName}!", victim);
@@ -81,13 +136,15 @@ namespace Content.Server.GameObjects.Components.Kitchen
// But Name is RobustToolbox-level, so presumably it'd have to be done in some other way (interface???)
_meatName = Loc.GetString("{0:name} meat", victim);
if (Owner.TryGetComponent(out sprite))
// TODO: Visualizer
if (Owner.TryGetComponent<SpriteComponent>(out var sprite))
{
sprite.LayerSetState(0, "spikebloody");
}
Owner.PopupMessageEveryone(Loc.GetString("{0:theName} has forced {1:theName} onto the spike, killing them instantly!", eventArgs.User, victim));
Owner.PopupMessageEveryone(Loc.GetString("{0:theName} has forced {1:theName} onto the spike, killing them instantly!", user, victim));
victim.Delete();
return;
}
SuicideKind ISuicideAct.Suicide(IEntity victim, IChatManager chat)