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

Shards damage barefoot users + steptrigger-related general cleanup (#9585)

Browse Source
This commit is contained in:
Kara
2022-07-10 02:28:37 -07:00
committed by GitHub
parent 37bf333674
commit 459f8d23eb
22 changed files with 220 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Content.Server/Mousetrap/MousetrapSystem.cs
View File

@@ -5,6 +5,7 @@ using Content.Shared.Interaction.Events;
using Content.Shared.Inventory;
using Content.Shared.Mousetrap;
using Content.Shared.StepTrigger;
using Content.Shared.StepTrigger.Systems;
using Robust.Shared.Player;
namespace Content.Server.Mousetrap;
@@ -18,9 +19,9 @@ public sealed class MousetrapSystem : EntitySystem
public override void Initialize()
{
SubscribeLocalEvent<MousetrapComponent, UseInHandEvent>(OnUseInHand);
SubscribeLocalEvent<MousetrapComponent, BeforeDamageOnTriggerEvent>(BeforeDamageOnTrigger);
SubscribeLocalEvent<MousetrapComponent, BeforeDamageUserOnTriggerEvent>(BeforeDamageOnTrigger);
SubscribeLocalEvent<MousetrapComponent, StepTriggerAttemptEvent>(OnStepTriggerAttempt);
SubscribeLocalEvent<MousetrapComponent, StepTriggeredEvent>(OnStepTrigger);
SubscribeLocalEvent<MousetrapComponent, TriggerEvent>(OnTrigger);
}
private void OnUseInHand(EntityUid uid, MousetrapComponent component, UseInHandEvent args)
@@ -37,27 +38,11 @@ public sealed class MousetrapSystem : EntitySystem
private void OnStepTriggerAttempt(EntityUid uid, MousetrapComponent component, ref StepTriggerAttemptEvent args)
{
args.Continue = component.IsActive;
args.Continue |= component.IsActive;
}
private void BeforeDamageOnTrigger(EntityUid uid, MousetrapComponent component, BeforeDamageOnTriggerEvent args)
private void BeforeDamageOnTrigger(EntityUid uid, MousetrapComponent component, BeforeDamageUserOnTriggerEvent args)
{
foreach (var slot in component.IgnoreDamageIfSlotFilled)
{
if (!_inventorySystem.TryGetSlotContainer(args.Tripper, slot, out var container, out _))
{
continue;
}
// This also means that wearing slippers won't
// hurt the entity.
if (container.ContainedEntity != null)
{
args.Damage *= 0;
return;
}
}
if (TryComp(args.Tripper, out PhysicsComponent? physics) && physics.Mass != 0)
{
// The idea here is inverse,
@@ -69,11 +54,9 @@ public sealed class MousetrapSystem : EntitySystem
}
}
private void OnStepTrigger(EntityUid uid, MousetrapComponent component, ref StepTriggeredEvent args)
private void OnTrigger(EntityUid uid, MousetrapComponent component, TriggerEvent args)
{
component.IsActive = false;
_triggerSystem.Trigger(uid);
UpdateVisuals(uid);
}