Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Slight trigger refactor (#4320)

Browse Source 
* Trigger tweaks

* Finish trigger refactor

* Clusterflash too
This commit is contained in:
metalgearsloth
2021-07-25 20:09:08 +10:00
committed by GitHub
parent 8cb5df2a56
commit ced39d4b2e
19 changed files with 211 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/Flash/Components/FlashAreaOnCollide.cs → Content.Server/Flash/Components/FlashOnTriggerComponent.cs
View File

@@ -4,12 +4,12 @@ using Robust.Shared.Serialization.Manager.Attributes;
namespace Content.Server.Flash.Components
{
/// <summary>
/// Upon colliding with an object this will flash in an area around it
/// Upon being triggered will flash in an area around it.
/// </summary>
[RegisterComponent]
internal sealed class FlashAreaOnCollide : Component
internal sealed class FlashOnTriggerComponent : Component
{
public override string Name => "FlashAreaOnCollide";
public override string Name => "FlashOnTrigger";
[DataField("range")] internal float Range = 1.0f;
[DataField("duration")] internal float Duration = 8.0f;

11
Content.Server/Flash/FlashSystem.cs
View File

@@ -3,14 +3,12 @@ using Content.Server.Stunnable.Components;
using Content.Server.Weapon.Melee;
using Content.Shared.Examine;
using Content.Shared.Interaction;
using Content.Shared.Notification;
using Content.Shared.Notification.Managers;
using Robust.Server.GameObjects;
using Robust.Shared.Audio;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Robust.Shared.Physics.Dynamics;
using Robust.Shared.Player;
namespace Content.Server.Flash
@@ -26,15 +24,6 @@ namespace Content.Server.Flash
SubscribeLocalEvent<FlashComponent, UseInHandEvent>(OnUseInHand);
SubscribeLocalEvent<FlashComponent, ExaminedEvent>(OnExamined);
SubscribeLocalEvent<FlashAreaOnCollide, StartCollideEvent>(HandleCollide);
}
private void HandleCollide(EntityUid uid, FlashAreaOnCollide component, StartCollideEvent args)
{
if (component.Flashed) return;
FlashableComponent.FlashAreaHelper(component.Owner, component.Range, component.Duration);
component.Flashed = true;
}
public void OnMeleeHit(EntityUid uid, FlashComponent comp, MeleeHitEvent args)