RNG timers for IEDs + small tweaks (#22099)

diff --git a/Content.Server/Explosion/Components/RandomTimerTriggerComponent.cs b/Content.Server/Explosion/Components/RandomTimerTriggerComponent.cs
new file mode 100644 (file)
index 0000000..3863b9c
--- /dev/null
+++ b/Content.Server/Explosion/Components/RandomTimerTriggerComponent.cs
@@ -0,0 +1,22 @@
+using Content.Server.Explosion.EntitySystems;
+
+namespace Content.Server.Explosion.Components;
+
+/// <summary>
+/// This is used for randomizing a <see cref="RandomTimerTriggerComponent"/> on MapInit
+/// </summary>
+[RegisterComponent, Access(typeof(TriggerSystem))]
+public sealed partial class RandomTimerTriggerComponent : Component
+{
+    /// <summary>
+    /// The minimum random trigger time.
+    /// </summary>
+    [DataField]
+    public float Min;
+
+    /// <summary>
+    /// The maximum random trigger time.
+    /// </summary>
+    [DataField]
+    public float Max;
+}

diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs
index fb1f72eb445be10feeb8b4509ea710531652a675..c4b0d9c9ba1b87f42df45f02a30e74fb3ae236aa 100644 (file)
--- a/Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs
+++ b/Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs
@@ -4,7 +4,6 @@ using Content.Shared.Examine;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Popups;
 using Content.Shared.Verbs;
-using Robust.Shared.Player;
 
 namespace Content.Server.Explosion.EntitySystems;
 
@@ -18,6 +17,7 @@ public sealed partial class TriggerSystem
         SubscribeLocalEvent<OnUseTimerTriggerComponent, ExaminedEvent>(OnExamined);
         SubscribeLocalEvent<OnUseTimerTriggerComponent, GetVerbsEvent<AlternativeVerb>>(OnGetAltVerbs);
         SubscribeLocalEvent<OnUseTimerTriggerComponent, EntityStuckEvent>(OnStuck);
+        SubscribeLocalEvent<RandomTimerTriggerComponent, MapInitEvent>(OnRandomTimerTriggerMapInit);
     }
 
     private void OnStuck(EntityUid uid, OnUseTimerTriggerComponent component, EntityStuckEvent args)
@@ -114,6 +114,16 @@ public sealed partial class TriggerSystem
         }
     }
 
+    private void OnRandomTimerTriggerMapInit(Entity<RandomTimerTriggerComponent> ent, ref MapInitEvent args)
+    {
+        var (_, comp) = ent;
+
+        if (!TryComp<OnUseTimerTriggerComponent>(ent, out var timerTriggerComp))
+            return;
+
+        timerTriggerComp.Delay = _random.NextFloat(comp.Min, comp.Max);
+    }
+
     private void CycleDelay(OnUseTimerTriggerComponent component, EntityUid user)
     {
         if (component.DelayOptions == null || component.DelayOptions.Count == 1)

diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
index 854fa7f661e099fef8aec581bdc4b52c59951903..323dae493aa748e429a5db7cf2da4f7c47f7da10 100644 (file)
--- a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
@@ -25,6 +25,7 @@ using Content.Shared.Mobs;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Weapons.Ranged.Events;
 using Robust.Shared.Audio.Systems;
+using Robust.Shared.Random;
 
 namespace Content.Server.Explosion.EntitySystems
 {
@@ -62,6 +63,7 @@ namespace Content.Server.Explosion.EntitySystems
         [Dependency] private readonly SharedAudioSystem _audio = default!;
         [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
         [Dependency] private readonly RadioSystem _radioSystem = default!;
+        [Dependency] private readonly IRobustRandom _random = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
         public override void Initialize()

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/ied.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/ied.yml
index 9e66a06971276eb1409ffb3d3067c6783f9fdf51..14906c7c2d5c5e8368e319f916114eab20f50548 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/ied.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/ied.yml
@@ -11,6 +11,7 @@
     sprite: Objects/Weapons/Bombs/ied.rsi
     layers:
     - state: base
+      map: ["enum.TriggerVisualLayers.Base"]
     - state: fuel
     - state: wires
   - type: Item
@@ -19,8 +20,12 @@
     delay: 5
     examinable: false
     initialBeepDelay: 0
-    beepSound: /Audio/Effects/lightburn.ogg
-  # TODO: random timer when crafted
+    beepSound:
+      path: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg
+      volume: 1
+  - type: RandomTimerTrigger
+    min: 0
+    max: 60
   - type: Explosive # Weak explosion in a very small radius. Doesn't break underplating.
     explosionType: Default
     totalIntensity: 20
@@ -28,6 +33,10 @@
     maxIntensity: 3
     canCreateVacuum: false
   - type: ExplodeOnTrigger
+  - type: Appearance
+  - type: AnimationPlayer
+  - type: TimerTriggerVisuals
+    unprimedSprite: base
   - type: Damageable
     damageContainer: Inorganic
   - type: Destructible

diff --git a/Resources/Textures/Objects/Weapons/Bombs/ied.rsi/base.png b/Resources/Textures/Objects/Weapons/Bombs/ied.rsi/base.png
index dda9a11195bce3c9ddcf372ec5e9e012d25759cd..300ee5552aeff5bec0c994201f10adc9cdc8ce11 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Bombs/ied.rsi/base.png and b/Resources/Textures/Objects/Weapons/Bombs/ied.rsi/base.png differ

diff --git a/Resources/Textures/Objects/Weapons/Bombs/ied.rsi/meta.json b/Resources/Textures/Objects/Weapons/Bombs/ied.rsi/meta.json
index 6ec234fecd499b96fe904788f7dd8656654e0df9..bf1554bef9041e91e409886cbf17b6dd231dceb2 100644 (file)
--- a/Resources/Textures/Objects/Weapons/Bombs/ied.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Bombs/ied.rsi/meta.json
@@ -18,6 +18,15 @@
     },
     {
       "name": "wires"
+    },
+    {
+      "name": "primed",
+      "delays": [
+        [
+          0.5,
+          0.5
+        ]
+      ]
     }
   ]
 }

diff --git a/Resources/Textures/Objects/Weapons/Bombs/ied.rsi/primed.png b/Resources/Textures/Objects/Weapons/Bombs/ied.rsi/primed.png
new file mode 100644 (file)
index 0000000..4882677
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Bombs/ied.rsi/primed.png differ