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

Flashbang tweaks. (#478)

Browse Source 
* - tweak: Flashbang tweaks.

* - add: More flashbang stuff.
This commit is contained in:
Aviu00
2024-07-22 17:06:02 +00:00
committed by GitHub
parent 96c7a3c4c3
commit f65c2e5c84
7 changed files with 47 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Shared/Standing/StandingStateComponent.cs
View File

@@ -23,11 +23,11 @@ namespace Content.Shared.Standing
// WD EDIT
[DataField, AutoNetworkedField, ViewVariables(VVAccess.ReadWrite)]
public bool CanLieDown = false;
public bool CanLieDown;
// WD EDIT
[DataField, AutoNetworkedField, ViewVariables(VVAccess.ReadWrite)]
public bool AutoGetUp = false;
public bool AutoGetUp = true;
/// <summary>
/// List of fixtures that had their collision mask changed when the entity was downed.

3
Content.Shared/_White/BuffedFlashGrenade/FlashSoundSuppressionComponent.cs
View File

@@ -5,5 +5,6 @@ namespace Content.Shared._White.BuffedFlashGrenade;
[RegisterComponent, NetworkedComponent]
public sealed partial class FlashSoundSuppressionComponent : Component
{
[DataField, ViewVariables(VVAccess.ReadWrite)]
public float MaxRange = 3f;
}

25
Content.Shared/_White/BuffedFlashGrenade/FlashSoundSuppressionSystem.cs
View File

@@ -18,26 +18,37 @@ public sealed class FlashSoundSuppressionSystem : EntitySystem
private void OnGetFlashbanged(Entity<FlashSoundSuppressionComponent> ent,
ref InventoryRelayedEvent<GetFlashbangedEvent> args)
{
args.Args.Protected = true;
args.Args.MaxRange = MathF.Min(args.Args.MaxRange, ent.Comp.MaxRange);
}
public void Stun(EntityUid target, float duration)
public void Stun(EntityUid target, float duration, float distance, float range)
{
if (HasComp<FlashSoundSuppressionComponent>(target))
return;
if (TryComp<FlashSoundSuppressionComponent>(target, out var suppression))
range = MathF.Min(range, suppression.MaxRange);
var ev = new GetFlashbangedEvent();
ev.MaxRange = range;
RaiseLocalEvent(target, ev);
if (ev.Protected)
range = MathF.Min(range, ev.MaxRange);
if (range <= 0f)
return;
if (distance < 0f)
distance = 0f;
if (distance > range)
return;
_stunSystem.TryParalyze(target, TimeSpan.FromSeconds(duration / 1000f), true);
var stunTime = float.Lerp(duration, 0f, distance / range);
if (stunTime <= 0f)
return;
_stunSystem.TryParalyze(target, TimeSpan.FromSeconds(stunTime / 1000f), true);
}
}
public sealed class GetFlashbangedEvent : EntityEventArgs, IInventoryRelayEvent
{
public bool Protected;
public float MaxRange = 7f;
public SlotFlags TargetSlots => SlotFlags.EARS | SlotFlags.HEAD;
}