cmdrunematti/Delta-v
1
0
Fork 0
mirror of https://github.com/DeltaV-Station/Delta-v.git synced 2026-10-10 08:17:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reduce Triggers Boilerplate. (#41086)

Browse Source 
* Push 1

* cleanup + master merge

* launchontrigger

* A crumb of cleanup

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
This commit is contained in:
Princess Cheeseballs
2025-12-29 11:39:31 -06:00
committed by Vanessa
co-authored by Princess Cheeseballs
parent 460bcebc2e
commit e59a873ae6
38 changed files with 219 additions and 509 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Content.Shared/Trigger/Systems/ExplodeOnTriggerSystem.cs
+18 -38
View File
@@ -3,52 +3,32 @@ using Content.Shared.Trigger.Components.Effects;
namespace Content.Shared.Trigger.Systems;
public sealed class ExplodeOnTriggerSystem : EntitySystem
public sealed class ExplodeOnTriggerSystem : XOnTriggerSystem<ExplodeOnTriggerComponent>
{
[Dependency] private readonly SharedExplosionSystem _explosion = default!;
public override void Initialize()
protected override void OnTrigger(Entity<ExplodeOnTriggerComponent> ent, EntityUid target, ref TriggerEvent args)
{
base.Initialize();
SubscribeLocalEvent<ExplodeOnTriggerComponent, TriggerEvent>(OnExplodeTrigger);
SubscribeLocalEvent<ExplosionOnTriggerComponent, TriggerEvent>(OnQueueExplosionTrigger);
_explosion.TriggerExplosive(target, user: args.User);
args.Handled = true;
}
private void OnExplodeTrigger(Entity<ExplodeOnTriggerComponent> 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;
public sealed class ExplosionOnTriggerSystem : XOnTriggerSystem<ExplosionOnTriggerComponent>
{
[Dependency] private readonly SharedExplosionSystem _explosion = default!;
_explosion.TriggerExplosive(target.Value, user: args.User);
args.Handled = true;
}
private void OnQueueExplosionTrigger(Entity<ExplosionOnTriggerComponent> ent, ref TriggerEvent args)
protected override void OnTrigger(Entity<ExplosionOnTriggerComponent> ent, EntityUid target, ref TriggerEvent args)
{
var (uid, comp) = ent;
if (args.Key != null && !comp.KeysIn.Contains(args.Key))
return;
var target = comp.TargetUser ? args.User : uid;
if (target == null)
return;
_explosion.QueueExplosion(target.Value,
comp.ExplosionType,
comp.TotalIntensity,
comp.IntensitySlope,
comp.MaxTileIntensity,
comp.TileBreakScale,
comp.MaxTileBreak,
comp.CanCreateVacuum,
args.User);
_explosion.QueueExplosion(target,
ent.Comp.ExplosionType,
ent.Comp.TotalIntensity,
ent.Comp.IntensitySlope,
ent.Comp.MaxTileIntensity,
ent.Comp.TileBreakScale,
ent.Comp.MaxTileBreak,
ent.Comp.CanCreateVacuum,
args.User);
args.Handled = true;
}
}