tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handcuffing in Harm mode (#12838)

Browse Source
This commit is contained in:
Errant
2022-12-10 22:55:18 +00:00
committed by GitHub
parent 1121cd3a84
commit b6e382fe82
2 changed files with 53 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
Content.Server/Cuffs/CuffableSystem.cs
View File

@@ -1,3 +1,4 @@
using System.Linq;
using Content.Server.Cuffs.Components;
using Content.Server.Hands.Components;
using Content.Shared.ActionBlocker;
@@ -5,6 +6,7 @@ using Content.Shared.Cuffs;
using Content.Shared.Hands;
using Content.Shared.Popups;
using Content.Shared.Verbs;
using Content.Shared.Weapons.Melee.Events;
using JetBrains.Annotations;
using Robust.Shared.Player;
using Content.Shared.Interaction;
@@ -32,6 +34,7 @@ namespace Content.Server.Cuffs
SubscribeLocalEvent<UncuffAttemptEvent>(OnUncuffAttempt);
SubscribeLocalEvent<CuffableComponent, GetVerbsEvent<Verb>>(AddUncuffVerb);
SubscribeLocalEvent<HandcuffComponent, AfterInteractEvent>(OnCuffAfterInteract);
SubscribeLocalEvent<HandcuffComponent, MeleeHitEvent>(OnCuffMeleeHit);
SubscribeLocalEvent<CuffableComponent, EntRemovedFromContainerMessage>(OnCuffsRemoved);
}
@@ -65,57 +68,68 @@ namespace Content.Server.Cuffs
private void OnCuffAfterInteract(EntityUid uid, HandcuffComponent component, AfterInteractEvent args)
{
if (component.Cuffing)
if (args.Target is not {Valid: true} target)
return;
if (args.Target is not {Valid: true} target ||
!EntityManager.TryGetComponent<CuffableComponent>(args.Target.Value, out var cuffed))
{
return;
}
// TODO these messages really need third-party variants. I.e., "{$user} starts cuffing {$target}!"
if (component.Broken)
{
_popup.PopupEntity(Loc.GetString("handcuff-component-cuffs-broken-error"), args.User, Filter.Entities(args.User));
return;
}
if (!EntityManager.TryGetComponent<HandsComponent?>(target, out var hands))
{
_popup.PopupEntity(Loc.GetString("handcuff-component-target-has-no-hands-error",("targetName", args.Target)), args.User, Filter.Entities(args.User));
return;
}
if (cuffed.CuffedHandCount >= hands.Count)
{
_popup.PopupEntity(Loc.GetString("handcuff-component-target-has-no-free-hands-error",("targetName", args.Target)), args.User, Filter.Entities(args.User));
return;
}
if (!args.CanReach)
{
_popup.PopupEntity(Loc.GetString("handcuff-component-too-far-away-error"), args.User, Filter.Entities(args.User));
return;
}
if (args.Target == args.User)
TryCuffing(uid, args.User, args.Target.Value, component);
args.Handled = true;
}
private void TryCuffing(EntityUid handcuff, EntityUid user, EntityUid target, HandcuffComponent component)
{
if (component.Cuffing || !EntityManager.TryGetComponent<CuffableComponent>(target, out var cuffed))
return;
if (component.Broken)
{
_popup.PopupEntity(Loc.GetString("handcuff-component-target-self"), args.User, Filter.Entities(args.User));
_popup.PopupEntity(Loc.GetString("handcuff-component-cuffs-broken-error"), user, Filter.Entities(user));
return;
}
if (!EntityManager.TryGetComponent<HandsComponent?>(target, out var hands))
{
_popup.PopupEntity(Loc.GetString("handcuff-component-target-has-no-hands-error",("targetName", target)), user, Filter.Entities(user));
return;
}
if (cuffed.CuffedHandCount >= hands.Count)
{
_popup.PopupEntity(Loc.GetString("handcuff-component-target-has-no-free-hands-error",("targetName", target)), user, Filter.Entities(user));
return;
}
// TODO these messages really need third-party variants. I.e., "{$user} starts cuffing {$target}!"
if (target == user)
{
_popup.PopupEntity(Loc.GetString("handcuff-component-target-self"), user, Filter.Entities(user));
}
else
{
_popup.PopupEntity(Loc.GetString("handcuff-component-start-cuffing-target-message",("targetName", args.Target)), args.User, Filter.Entities(args.User));
_popup.PopupEntity(Loc.GetString("handcuff-component-start-cuffing-by-other-message",("otherName", args.User)), target, Filter.Entities(args.Target.Value));
_popup.PopupEntity(Loc.GetString("handcuff-component-start-cuffing-target-message",("targetName", target)), user, Filter.Entities(user));
_popup.PopupEntity(Loc.GetString("handcuff-component-start-cuffing-by-other-message",("otherName", user)), target, Filter.Entities(target));
}
_audio.PlayPvs(component.StartCuffSound, uid);
_audio.PlayPvs(component.StartCuffSound, handcuff);
component.TryUpdateCuff(args.User, target, cuffed);
component.TryUpdateCuff(user, target, cuffed);
}
private void OnCuffMeleeHit(EntityUid uid, HandcuffComponent component, MeleeHitEvent args)
{
if (!args.HitEntities.Any())
return;
TryCuffing(uid, args.User, args.HitEntities.First(), component);
args.Handled = true;
}
private void OnUncuffAttempt(UncuffAttemptEvent args)
{
if (args.Cancelled)