diff --git a/Content.Server/Explosion/Components/RandomTimerTriggerComponent.cs b/Content.Server/Explosion/Components/RandomTimerTriggerComponent.cs new file mode 100644 index 0000000000..3863b9c313 --- /dev/null +++ b/Content.Server/Explosion/Components/RandomTimerTriggerComponent.cs @@ -0,0 +1,22 @@ +using Content.Server.Explosion.EntitySystems; + +namespace Content.Server.Explosion.Components; + +/// +/// This is used for randomizing a on MapInit +/// +[RegisterComponent, Access(typeof(TriggerSystem))] +public sealed partial class RandomTimerTriggerComponent : Component +{ + /// + /// The minimum random trigger time. + /// + [DataField] + public float Min; + + /// + /// The maximum random trigger time. + /// + [DataField] + public float Max; +} diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs index fb1f72eb44..c4b0d9c9ba 100644 --- 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(OnExamined); SubscribeLocalEvent>(OnGetAltVerbs); SubscribeLocalEvent(OnStuck); + SubscribeLocalEvent(OnRandomTimerTriggerMapInit); } private void OnStuck(EntityUid uid, OnUseTimerTriggerComponent component, EntityStuckEvent args) @@ -114,6 +114,16 @@ public sealed partial class TriggerSystem } } + private void OnRandomTimerTriggerMapInit(Entity ent, ref MapInitEvent args) + { + var (_, comp) = ent; + + if (!TryComp(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 854fa7f661..323dae493a 100644 --- 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 9e66a06971..14906c7c2d 100644 --- 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 dda9a11195..300ee5552a 100644 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 6ec234fecd..bf1554bef9 100644 --- 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 index 0000000000..48826776b1 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Bombs/ied.rsi/primed.png differ