tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ignition source refactor (#21044)

Browse Source 
Co-authored-by: deltanedas <@deltanedas:kde.org>
This commit is contained in:
deltanedas
2023-10-22 07:05:48 +01:00
committed by GitHub
parent c1bc177d1e
commit dc9f9b55ee
3 changed files with 27 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Content.Server/IgnitionSource/IgniteOnTriggerSystem.cs
View File

@@ -35,21 +35,21 @@ public sealed class IgniteOnTriggerSystem : EntitySystem
if (_timing.CurTime < comp.IgnitedUntil)
continue;
_source.SetIgnited(uid, false, source);
_source.SetIgnited((uid, source), false);
}
}
private void OnTrigger(EntityUid uid, IgniteOnTriggerComponent comp, TriggerEvent args)
private void OnTrigger(Entity<IgniteOnTriggerComponent> ent, ref TriggerEvent args)
{
// prevent spamming sound and ignition
TryComp<UseDelayComponent>(uid, out var delay);
if (_useDelay.ActiveDelay(uid, delay))
TryComp<UseDelayComponent>(ent, out var delay);
if (_useDelay.ActiveDelay(ent, delay))
return;
_source.SetIgnited(uid);
_audio.PlayPvs(comp.IgniteSound, uid);
_source.SetIgnited(ent.Owner);
_audio.PlayPvs(ent.Comp.IgniteSound, ent);
_useDelay.BeginDelay(uid, delay);
comp.IgnitedUntil = _timing.CurTime + comp.IgnitedTime;
_useDelay.BeginDelay(ent, delay);
ent.Comp.IgnitedUntil = _timing.CurTime + ent.Comp.IgnitedTime;
}
}

11
Content.Server/IgnitionSource/IgnitionSourceComponent.cs
View File

@@ -1,15 +1,14 @@
namespace Content.Server.IgnitionSource;
/// <summary>
/// This is used for...
/// This is used for creating atmosphere hotspots while ignited to start reactions such as fire.
/// </summary>
[RegisterComponent]
[Access(typeof(IgnitionSourceSystem))]
[RegisterComponent, Access(typeof(IgnitionSourceSystem))]
public sealed partial class IgnitionSourceComponent : Component
{
[DataField("ignited")]
public bool Ignited = false;
[DataField, ViewVariables(VVAccess.ReadWrite)]
public bool Ignited;
[DataField("temperature", required: true)]
[DataField(required: true), ViewVariables(VVAccess.ReadWrite)]
public int Temperature;
}

29
Content.Server/IgnitionSource/IgnitionSourceSystem.cs
View File

@@ -7,34 +7,32 @@ namespace Content.Server.IgnitionSource;
/// <summary>
/// This handles ignition, Jez basically coded this.
/// </summary>
///
public sealed class IgnitionSourceSystem : EntitySystem
{
/// <inheritdoc/>
///
[Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
[Dependency] private readonly TransformSystem _transformSystem = default!;
[Dependency] private readonly AtmosphereSystem _atmosphere = default!;
[Dependency] private readonly TransformSystem _transform = default!;
public override void Initialize()
{
base.Initialize();
SubscribeLocalEvent<IgnitionSourceComponent, IsHotEvent>(OnIsHot);
}
private void OnIsHot(EntityUid uid, IgnitionSourceComponent component, IsHotEvent args)
private void OnIsHot(Entity<IgnitionSourceComponent> ent, ref IsHotEvent args)
{
SetIgnited(uid, args.IsHot, component);
SetIgnited((ent.Owner, ent.Comp), args.IsHot);
}
/// <summary>
/// Simply sets the ignited field to the ignited param.
/// </summary>
public void SetIgnited(EntityUid uid, bool ignited = true, IgnitionSourceComponent? comp = null)
public void SetIgnited(Entity<IgnitionSourceComponent?> ent, bool ignited = true)
{
if (!Resolve(uid, ref comp))
if (!Resolve(ent, ref ent.Comp))
return;
comp.Ignited = ignited;
ent.Comp.Ignited = ignited;
}
public override void Update(float frameTime)
@@ -42,17 +40,16 @@ public sealed class IgnitionSourceSystem : EntitySystem
base.Update(frameTime);
var query = EntityQueryEnumerator<IgnitionSourceComponent, TransformComponent>();
while (query.MoveNext(out var source, out var component, out var transform))
while (query.MoveNext(out var uid, out var comp, out var xform))
{
if (!component.Ignited)
if (!comp.Ignited)
continue;
if (transform.GridUid is { } gridUid)
if (xform.GridUid is { } gridUid)
{
var position = _transformSystem.GetGridOrMapTilePosition(source, transform);
_atmosphereSystem.HotspotExpose(gridUid, position, component.Temperature, 50, source, true);
var position = _transform.GetGridOrMapTilePosition(uid, xform);
_atmosphere.HotspotExpose(gridUid, position, comp.Temperature, 50, uid, true);
}
}
}
}