]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Trigger On Hitscan (#40964)
authorScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Sat, 18 Oct 2025 19:23:45 +0000 (21:23 +0200)
committerGitHub <noreply@github.com>
Sat, 18 Oct 2025 19:23:45 +0000 (19:23 +0000)
* init

* doc

* merge systems

* review

Content.Shared/Trigger/Components/Triggers/TriggerOnHitscanFiredComponent.cs [new file with mode: 0644]
Content.Shared/Trigger/Components/Triggers/TriggerOnHitscanHitComponent.cs [new file with mode: 0644]
Content.Shared/Trigger/Systems/TriggerOnHitscanSystem.cs [new file with mode: 0644]

diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnHitscanFiredComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnHitscanFiredComponent.cs
new file mode 100644 (file)
index 0000000..f7a86c0
--- /dev/null
@@ -0,0 +1,11 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Component put on the hitscan entity.
+/// Triggers when a hitscan raycast is fired.
+/// The user is the player shooting it.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TriggerOnHitscanFiredComponent : BaseTriggerOnXComponent;
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnHitscanHitComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnHitscanHitComponent.cs
new file mode 100644 (file)
index 0000000..4520578
--- /dev/null
@@ -0,0 +1,11 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Component put on the hitscan entity.
+/// Triggers when a hitscan raycast is fired, but only if an entity got hit.
+/// The user is the entity that got hit.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TriggerOnHitscanHitComponent : BaseTriggerOnXComponent;
diff --git a/Content.Shared/Trigger/Systems/TriggerOnHitscanSystem.cs b/Content.Shared/Trigger/Systems/TriggerOnHitscanSystem.cs
new file mode 100644 (file)
index 0000000..069b586
--- /dev/null
@@ -0,0 +1,30 @@
+using Content.Shared.Trigger.Components.Triggers;
+using Content.Shared.Weapons.Hitscan.Events;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed class TriggerOnHitscanSystem : EntitySystem
+{
+    [Dependency] private readonly TriggerSystem _trigger = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<TriggerOnHitscanHitComponent, HitscanRaycastFiredEvent>(OnHit);
+        SubscribeLocalEvent<TriggerOnHitscanFiredComponent, HitscanRaycastFiredEvent>(OnFired);
+    }
+
+    private void OnHit(Entity<TriggerOnHitscanHitComponent> ent, ref HitscanRaycastFiredEvent args)
+    {
+        if (args.Data.HitEntity == null)
+            return;
+
+        _trigger.Trigger(ent.Owner, args.Data.HitEntity, ent.Comp.KeyOut);
+    }
+
+    private void OnFired(Entity<TriggerOnHitscanFiredComponent> ent, ref HitscanRaycastFiredEvent args)
+    {
+        _trigger.Trigger(ent.Owner, args.Data.Shooter, ent.Comp.KeyOut);
+    }
+}