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

Фиксы (#439)

Browse Source 
* - fix: Ebow.

* - fix: Cult deconversion.

* - add: Bola update.

* - fix: Error.

* - fix: Holoprojectors.

* - fix: Clumsy.
This commit is contained in:
Aviu00
2024-07-14 12:27:20 +00:00
committed by GitHub
parent e56340dd39
commit 9950864b8b
14 changed files with 104 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Shared/_White/Collision/BlurOnCollideComponent.cs Normal file
View File

@@ -0,0 +1,8 @@
namespace Content.Shared._White.Collision;
[RegisterComponent]
public sealed partial class BlurOnCollideComponent : Component
{
[DataField]
public float BlurTime = 20f;
}

38
Content.Shared/_White/Collision/BlurOnCollideSystem.cs Normal file
View File

@@ -0,0 +1,38 @@
using Content.Shared.Eye.Blinding.Components;
using Content.Shared.Projectiles;
using Content.Shared.Standing.Systems;
using Content.Shared.StatusEffect;
using Content.Shared.Throwing;
namespace Content.Shared._White.Collision;
public sealed class BlurOnCollideSystem : EntitySystem
{
[Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
public override void Initialize()
{
base.Initialize();
SubscribeLocalEvent<BlurOnCollideComponent, ProjectileHitEvent>(OnProjectileHit);
SubscribeLocalEvent<BlurOnCollideComponent, ThrowDoHitEvent>(OnEntityHit);
}
private void OnEntityHit(Entity<BlurOnCollideComponent> ent, ref ThrowDoHitEvent args)
{
ApplyEffects(args.Target, ent.Comp);
}
private void OnProjectileHit(Entity<BlurOnCollideComponent> ent, ref ProjectileHitEvent args)
{
ApplyEffects(args.Target, ent.Comp);
}
private void ApplyEffects(EntityUid target, BlurOnCollideComponent component)
{
_statusEffects.TryAddStatusEffect<BlurryVisionComponent>(target,
"BlurryVision",
TimeSpan.FromSeconds(component.BlurTime),
true);
}
}

11
Content.Shared/_White/Collision/KnockdownOnCollideComponent.cs Normal file
View File

@@ -0,0 +1,11 @@
using Content.Shared.Standing.Systems;
namespace Content.Shared._White.Collision;
[RegisterComponent]
public sealed partial class KnockdownOnCollideComponent : Component
{
[DataField]
public SharedStandingStateSystem.DropHeldItemsBehavior Behavior =
SharedStandingStateSystem.DropHeldItemsBehavior.NoDrop;
}

10
Content.Shared/_White/Knockdown/KnockdownOnCollideSystem.cs → Content.Shared/_White/Collision/KnockdownOnCollideSystem.cs
View File

@@ -1,15 +1,12 @@
using Content.Shared.Eye.Blinding.Components;
using Content.Shared.Projectiles;
using Content.Shared.Standing.Systems;
using Content.Shared.StatusEffect;
using Content.Shared.Throwing;
namespace Content.Shared._White.Knockdown;
namespace Content.Shared._White.Collision;
public sealed class KnockdownOnCollideSystem : EntitySystem
{
[Dependency] private readonly SharedStandingStateSystem _standing = default!;
[Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
public override void Initialize()
{
@@ -31,9 +28,6 @@ public sealed class KnockdownOnCollideSystem : EntitySystem
private void ApplyEffects(EntityUid target, KnockdownOnCollideComponent component)
{
_standing.TryLieDown(target, null, SharedStandingStateSystem.DropHeldItemsBehavior.AlwaysDrop);
if (component.UseBlur)
_statusEffects.TryAddStatusEffect<BlurryVisionComponent>(target, "BlurryVision", TimeSpan.FromSeconds(component.BlurTime), true);
_standing.TryLieDown(target, null, component.Behavior);
}
}

11
Content.Shared/_White/Knockdown/KnockdownOnCollideComponent.cs
View File

@@ -1,11 +0,0 @@
namespace Content.Shared._White.Knockdown;
[RegisterComponent]
public sealed partial class KnockdownOnCollideComponent : Component
{
[DataField]
public float BlurTime = 20f;
[DataField]
public bool UseBlur;
}