Fire stacks trigger (#39530)

* Simple as

* whoops

* not gonna work

* chopped

* missed something

* Better name

* formatting

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

diff --git a/Content.Server/Trigger/Systems/FlameStackOnTriggerSystem.cs b/Content.Server/Trigger/Systems/FlameStackOnTriggerSystem.cs
new file mode 100644 (file)
index 0000000..879d57b
--- /dev/null
+++ b/Content.Server/Trigger/Systems/FlameStackOnTriggerSystem.cs
@@ -0,0 +1,37 @@
+using Content.Server.Atmos.EntitySystems;
+using Content.Shared.Trigger;
+using Content.Shared.Trigger.Components.Effects;
+
+namespace Content.Server.Trigger.Systems;
+
+/// <summary>
+/// Trigger system for setting something on fire.
+/// </summary>
+/// <seealso cref="IgniteOnTriggerSystem"/>
+public sealed class FlameStackOnTriggerSystem : EntitySystem
+{
+    [Dependency] private readonly FlammableSystem _flame = default!;
+
+    /// <inheritdoc/>
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<FlameStackOnTriggerComponent, TriggerEvent>(OnTrigger);
+    }
+
+    private void OnTrigger(Entity<FlameStackOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
+            return;
+
+        _flame.AdjustFireStacks(target.Value, ent.Comp.FireStacks, ignite: ent.Comp.DoIgnite);
+
+        args.Handled = true;
+    }
+}

diff --git a/Content.Server/Trigger/Systems/IgniteOnTriggerSystem.cs b/Content.Server/Trigger/Systems/IgniteOnTriggerSystem.cs
index f4d88b774a1aa31dfe1e2a6deddbb41da56532a1..b19f4738ca90889a277f51ea9258ff369b89ec77 100644 (file)
--- a/Content.Server/Trigger/Systems/IgniteOnTriggerSystem.cs
+++ b/Content.Server/Trigger/Systems/IgniteOnTriggerSystem.cs
@@ -8,6 +8,7 @@ namespace Content.Server.Trigger.Systems;
 /// <summary>
 /// Handles igniting when triggered and stopping ignition after the delay.
 /// </summary>
+/// <seealso cref="FlameStackOnTriggerSystem"/>
 public sealed class IgniteOnTriggerSystem : EntitySystem
 {
     [Dependency] private readonly IGameTiming _timing = default!;

diff --git a/Content.Shared/Trigger/Components/Effects/FlameStackOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/FlameStackOnTriggerComponent.cs
new file mode 100644 (file)
index 0000000..f7186ae
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/FlameStackOnTriggerComponent.cs
@@ -0,0 +1,26 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Adjusts fire stacks on trigger, optionally setting them on fire as well.
+/// Requires <see cref="FlammableComponent"/> to ignite the target.
+/// If TargetUser is true they will have their firestacks adjusted instead.
+/// </summary>
+/// <seealso cref="IgniteOnTriggerComponent"/>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class FlameStackOnTriggerComponent : BaseXOnTriggerComponent
+{
+    /// <summary>
+    /// How many fire stacks to add or remove.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float FireStacks;
+
+    /// <summary>
+    /// If true, the target will be set on fire if it isn't already.
+    /// If false does nothing.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool DoIgnite = true;
+}

diff --git a/Content.Shared/Trigger/Components/Effects/IgniteOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/IgniteOnTriggerComponent.cs
index 36273ef1b21677dd9e0c506c8036886a8f941fe5..e9f51cf4e78b8c200aabdf0d4353a194b45a633f 100644 (file)
--- a/Content.Shared/Trigger/Components/Effects/IgniteOnTriggerComponent.cs
+++ b/Content.Shared/Trigger/Components/Effects/IgniteOnTriggerComponent.cs
@@ -8,6 +8,7 @@ namespace Content.Shared.Trigger.Components.Effects;
 /// Requires <see cref="IgnitionSourceComponent"/> along with triggering components.
 /// The if TargetUser is true they will be ignited instead (they need IgnitionSourceComponent as well).
 /// </summary>
+/// <seealso cref="FlameStackOnTriggerComponent"/>
 [RegisterComponent, NetworkedComponent]
 [AutoGenerateComponentState, AutoGenerateComponentPause]
 public sealed partial class IgniteOnTriggerComponent : BaseXOnTriggerComponent