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

make pyroclastic anomaly ignition ignore line of sight checks. (#17798)

Browse Source
This commit is contained in:
Nemanja
2023-07-03 17:35:57 -04:00
committed by GitHub
parent b6643bec7f
commit 85f5507ce9
2 changed files with 3 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Server/Anomaly/Effects/PyroclasticAnomalySystem.cs
View File

@@ -1,6 +1,5 @@
using Content.Server.Atmos.Components; using Content.Server.Atmos.Components;
using Content.Server.Atmos.EntitySystems; using Content.Server.Atmos.EntitySystems;
using Content.Server.Interaction;
using Content.Shared.Anomaly.Components; using Content.Shared.Anomaly.Components;
using Content.Shared.Anomaly.Effects.Components; using Content.Shared.Anomaly.Effects.Components;
using Robust.Shared.Map; using Robust.Shared.Map;
@@ -14,7 +13,6 @@ public sealed class PyroclasticAnomalySystem : EntitySystem
{ {
[Dependency] private readonly EntityLookupSystem _lookup = default!; [Dependency] private readonly EntityLookupSystem _lookup = default!;
[Dependency] private readonly FlammableSystem _flammable = default!; [Dependency] private readonly FlammableSystem _flammable = default!;
[Dependency] private readonly InteractionSystem _interaction = default!;
/// <inheritdoc/> /// <inheritdoc/>
public override void Initialize() public override void Initialize()
@@ -41,10 +39,7 @@ public sealed class PyroclasticAnomalySystem : EntitySystem
foreach (var flammable in _lookup.GetComponentsInRange<FlammableComponent>(coordinates, radius)) foreach (var flammable in _lookup.GetComponentsInRange<FlammableComponent>(coordinates, radius))
{ {
var ent = flammable.Owner; var ent = flammable.Owner;
if (!_interaction.InRangeUnobstructed(coordinates.ToMap(EntityManager), ent, -1)) var stackAmount = 1 + (int) (severity / 0.15f);
continue;
var stackAmount = 1 + (int) (severity / 0.25f);
_flammable.AdjustFireStacks(ent, stackAmount, flammable); _flammable.AdjustFireStacks(ent, stackAmount, flammable);
_flammable.Ignite(ent, flammable); _flammable.Ignite(ent, flammable);
} }

31
Content.Shared/Anomaly/Effects/Components/PyroclasticAnomalyComponent.cs
View File

@@ -1,38 +1,11 @@
using Content.Shared.Atmos; namespace Content.Shared.Anomaly.Effects.Components;
namespace Content.Shared.Anomaly.Effects.Components;
[RegisterComponent] [RegisterComponent]
public sealed class PyroclasticAnomalyComponent : Component public sealed class PyroclasticAnomalyComponent : Component
{ {
/// <summary> /// <summary>
/// The maximum distance from which you can be ignited by the anomaly. /// The maximum distance from which you can be ignited by the anomaly.
/// </summary> /// </summary>
[DataField("maximumIgnitionRadius")] [DataField("maximumIgnitionRadius")]
public float MaximumIgnitionRadius = 8f; public float MaximumIgnitionRadius = 5f;
/// <summary>
/// The temperature of the hotspot where the anomaly is
/// </summary>
[DataField("hotspotExposeTemperature")]
public float HotspotExposeTemperature = 1000;
/// <summary>
/// The volume of the hotspot where the anomaly is.
/// </summary>
[DataField("hotspotExposeVolume")]
public float HotspotExposeVolume = 50;
/// <summary>
/// Gas released when the anomaly goes supercritical.
/// </summary>
[DataField("supercriticalGas")]
public Gas SupercriticalGas = Gas.Plasma;
/// <summary>
/// The amount of gas released when the anomaly goes supercritical
/// </summary>
[DataField("supercriticalMoleAmount")]
public float SupercriticalMoleAmount = 75f;
} }