Reduce Triggers Boilerplate. (#41086)

* 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-10-24 17:00:55 -07:00
committed by GitHub
parent 891f5a8f6b
commit c01ec294d0
38 changed files with 223 additions and 513 deletions

View File

@@ -3,28 +3,13 @@ using Content.Shared.Trigger.Components.Effects;
namespace Content.Shared.Trigger.Systems;
public sealed class FlashOnTriggerSystem : EntitySystem
public sealed class FlashOnTriggerSystem : XOnTriggerSystem<FlashOnTriggerComponent>
{
[Dependency] private readonly SharedFlashSystem _flash = default!;
public override void Initialize()
protected override void OnTrigger(Entity<FlashOnTriggerComponent> ent, EntityUid target, ref TriggerEvent args)
{
base.Initialize();
SubscribeLocalEvent<FlashOnTriggerComponent, TriggerEvent>(OnTrigger);
}
private void OnTrigger(Entity<FlashOnTriggerComponent> 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;
_flash.FlashArea(target.Value, args.User, ent.Comp.Range, ent.Comp.Duration, probability: ent.Comp.Probability);
_flash.FlashArea(target, args.User, ent.Comp.Range, ent.Comp.Duration, probability: ent.Comp.Probability);
args.Handled = true;
}
}