From 85f5507ce9da2a51b32438a9c9d669e5d5825811 Mon Sep 17 00:00:00 2001 From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Date: Mon, 3 Jul 2023 17:35:57 -0400 Subject: [PATCH] make pyroclastic anomaly ignition ignore line of sight checks. (#17798) --- .../Effects/PyroclasticAnomalySystem.cs | 7 +---- .../Components/PyroclasticAnomalyComponent.cs | 31 ++----------------- 2 files changed, 3 insertions(+), 35 deletions(-) diff --git a/Content.Server/Anomaly/Effects/PyroclasticAnomalySystem.cs b/Content.Server/Anomaly/Effects/PyroclasticAnomalySystem.cs index 7051dfb00f..3cb5ee3fae 100644 --- a/Content.Server/Anomaly/Effects/PyroclasticAnomalySystem.cs +++ b/Content.Server/Anomaly/Effects/PyroclasticAnomalySystem.cs @@ -1,6 +1,5 @@ using Content.Server.Atmos.Components; using Content.Server.Atmos.EntitySystems; -using Content.Server.Interaction; using Content.Shared.Anomaly.Components; using Content.Shared.Anomaly.Effects.Components; using Robust.Shared.Map; @@ -14,7 +13,6 @@ public sealed class PyroclasticAnomalySystem : EntitySystem { [Dependency] private readonly EntityLookupSystem _lookup = default!; [Dependency] private readonly FlammableSystem _flammable = default!; - [Dependency] private readonly InteractionSystem _interaction = default!; /// public override void Initialize() @@ -41,10 +39,7 @@ public sealed class PyroclasticAnomalySystem : EntitySystem foreach (var flammable in _lookup.GetComponentsInRange(coordinates, radius)) { var ent = flammable.Owner; - if (!_interaction.InRangeUnobstructed(coordinates.ToMap(EntityManager), ent, -1)) - continue; - - var stackAmount = 1 + (int) (severity / 0.25f); + var stackAmount = 1 + (int) (severity / 0.15f); _flammable.AdjustFireStacks(ent, stackAmount, flammable); _flammable.Ignite(ent, flammable); } diff --git a/Content.Shared/Anomaly/Effects/Components/PyroclasticAnomalyComponent.cs b/Content.Shared/Anomaly/Effects/Components/PyroclasticAnomalyComponent.cs index b474c8f090..35905c37b5 100644 --- a/Content.Shared/Anomaly/Effects/Components/PyroclasticAnomalyComponent.cs +++ b/Content.Shared/Anomaly/Effects/Components/PyroclasticAnomalyComponent.cs @@ -1,38 +1,11 @@ -using Content.Shared.Atmos; - -namespace Content.Shared.Anomaly.Effects.Components; +namespace Content.Shared.Anomaly.Effects.Components; [RegisterComponent] public sealed class PyroclasticAnomalyComponent : Component { - /// /// The maximum distance from which you can be ignited by the anomaly. /// [DataField("maximumIgnitionRadius")] - public float MaximumIgnitionRadius = 8f; - - /// - /// The temperature of the hotspot where the anomaly is - /// - [DataField("hotspotExposeTemperature")] - public float HotspotExposeTemperature = 1000; - - /// - /// The volume of the hotspot where the anomaly is. - /// - [DataField("hotspotExposeVolume")] - public float HotspotExposeVolume = 50; - - /// - /// Gas released when the anomaly goes supercritical. - /// - [DataField("supercriticalGas")] - public Gas SupercriticalGas = Gas.Plasma; - - /// - /// The amount of gas released when the anomaly goes supercritical - /// - [DataField("supercriticalMoleAmount")] - public float SupercriticalMoleAmount = 75f; + public float MaximumIgnitionRadius = 5f; }