Revert "Revert "Electric anomaly rework"" (#23549)

Revert "Revert "Electric anomaly rework" (#23546)"

This reverts commit 9acbe38e5348c36e1f61287e9e489ac7dcaeacf6.

diff --git a/Content.Server/Anomaly/Effects/ElectricityAnomalySystem.cs b/Content.Server/Anomaly/Effects/ElectricityAnomalySystem.cs
index bc6aa3bb1fb5b50f395e4a3d2e9a7dca3a50c049..8b5a72449f348d2027ab86bb8ed7fb91ac748ac7 100644 (file)
--- a/Content.Server/Anomaly/Effects/ElectricityAnomalySystem.cs
+++ b/Content.Server/Anomaly/Effects/ElectricityAnomalySystem.cs
@@ -1,10 +1,8 @@
-using Content.Server.Electrocution;
+using Content.Server.Electrocution;
 using Content.Server.Emp;
 using Content.Server.Lightning;
-using Content.Server.Power.Components;
 using Content.Shared.Anomaly.Components;
 using Content.Shared.Anomaly.Effects.Components;
-using Content.Shared.Mobs.Components;
 using Content.Shared.StatusEffect;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
@@ -14,6 +12,7 @@ namespace Content.Server.Anomaly.Effects;
 public sealed class ElectricityAnomalySystem : EntitySystem
 {
     [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly LightningSystem _lightning = default!;
     [Dependency] private readonly ElectrocutionSystem _electrocution = default!;
@@ -27,38 +26,21 @@ public sealed class ElectricityAnomalySystem : EntitySystem
         SubscribeLocalEvent<ElectricityAnomalyComponent, AnomalySupercriticalEvent>(OnSupercritical);
     }
 
-    private void OnPulse(EntityUid uid, ElectricityAnomalyComponent component, ref AnomalyPulseEvent args)
+    private void OnPulse(Entity<ElectricityAnomalyComponent> anomaly, ref AnomalyPulseEvent args)
     {
-        var range = component.MaxElectrocuteRange * args.Stability;
-        var xform = Transform(uid);
-        foreach (var (ent, comp) in _lookup.GetEntitiesInRange<MobStateComponent>(xform.MapPosition, range))
-        {
-            _lightning.ShootLightning(uid, ent);
-        }
-    }
+        var range = anomaly.Comp.MaxElectrocuteRange * args.Stability;
 
-    private void OnSupercritical(EntityUid uid, ElectricityAnomalyComponent component, ref AnomalySupercriticalEvent args)
-    {
-        var poweredQuery = GetEntityQuery<ApcPowerReceiverComponent>();
-        var mobQuery = GetEntityQuery<MobThresholdsComponent>();
-        var validEnts = new HashSet<EntityUid>();
-        foreach (var ent in _lookup.GetEntitiesInRange(uid, component.MaxElectrocuteRange * 2))
-        {
-            if (mobQuery.HasComponent(ent))
-                validEnts.Add(ent);
+        int boltCount = (int)MathF.Floor(MathHelper.Lerp((float)anomaly.Comp.MinBoltCount, (float)anomaly.Comp.MaxBoltCount, args.Severity));
 
-            if (_random.Prob(0.01f) && poweredQuery.HasComponent(ent))
-                validEnts.Add(ent);
-        }
+        _lightning.ShootRandomLightnings(anomaly, range, boltCount);
+    }
 
-        // goodbye, sweet perf
-        foreach (var ent in validEnts)
-        {
-            _lightning.ShootLightning(uid, ent);
-        }
+    private void OnSupercritical(Entity<ElectricityAnomalyComponent> anomaly, ref AnomalySupercriticalEvent args)
+    {
+        var range = anomaly.Comp.MaxElectrocuteRange * 3;
 
-        var empRange = component.MaxElectrocuteRange * 3;
-        _emp.EmpPulse(Transform(uid).MapPosition, empRange, component.EmpEnergyConsumption, component.EmpDisabledDuration);
+        _emp.EmpPulse(_transform.GetMapCoordinates(anomaly), range, anomaly.Comp.EmpEnergyConsumption, anomaly.Comp.EmpDisabledDuration);
+        _lightning.ShootRandomLightnings(anomaly, range, anomaly.Comp.MaxBoltCount * 3, arcDepth: 3);
     }
 
     public override void Update(float frameTime)

diff --git a/Content.Server/Lightning/LightningSystem.cs b/Content.Server/Lightning/LightningSystem.cs
index ae95a2a491d819ce6636e294b0abd31be30e933a..5e975f317935a82b2d04d455a2187c6edc283a73 100644 (file)
--- a/Content.Server/Lightning/LightningSystem.cs
+++ b/Content.Server/Lightning/LightningSystem.cs
@@ -75,7 +75,6 @@ public sealed class LightningSystem : SharedLightningSystem
         var targets = _lookup.GetComponentsInRange<LightningTargetComponent>(Transform(user).MapPosition, range).ToList();
         _random.Shuffle(targets);
         targets.Sort((x, y) => y.Priority.CompareTo(x.Priority));
-        //var realCount = Math.Min(targets.Count, boltCount);
 
         int shootedCount = 0;
         int count = -1;

diff --git a/Content.Shared/Anomaly/Effects/Components/ElectricityAnomalyComponent.cs b/Content.Shared/Anomaly/Effects/Components/ElectricityAnomalyComponent.cs
index 5e4fc333e38bd01a53cb4e9d33d1d342627bf10a..e48e0ae6a73c32d59bad56a4d41f3f31219aff1b 100644 (file)
--- a/Content.Shared/Anomaly/Effects/Components/ElectricityAnomalyComponent.cs
+++ b/Content.Shared/Anomaly/Effects/Components/ElectricityAnomalyComponent.cs
@@ -1,53 +1,65 @@
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Shared.Anomaly.Effects.Components;
 
 [RegisterComponent]
 public sealed partial class ElectricityAnomalyComponent : Component
 {
+    /// <summary>
+    /// the minimum number of lightning strikes
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public int MinBoltCount = 2;
+
+    /// <summary>
+    /// the number of lightning strikes, at the maximum severity of the anomaly
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public int MaxBoltCount = 5;
+
     /// <summary>
     /// The maximum radius of the passive electrocution effect
     /// scales with stability
     /// </summary>
-    [DataField("maxElectrocutionRange"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
     public float MaxElectrocuteRange = 7f;
 
     /// <summary>
     /// The maximum amount of damage the electrocution can do
     /// scales with severity
     /// </summary>
-    [DataField("maxElectrocuteDamage"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
     public float MaxElectrocuteDamage = 20f;
 
     /// <summary>
     /// The maximum amount of time the electrocution lasts
     /// scales with severity
     /// </summary>
-    [DataField("maxElectrocuteDuration"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
     public TimeSpan MaxElectrocuteDuration = TimeSpan.FromSeconds(8);
 
     /// <summary>
     /// The maximum chance that each second, when in range of the anomaly, you will be electrocuted.
     /// scales with stability
     /// </summary>
-    [DataField("passiveElectrocutionChance"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
     public float PassiveElectrocutionChance = 0.05f;
 
     /// <summary>
     /// Used for tracking seconds, so that we can shock people in a non-tick-dependent way.
     /// </summary>
-    [DataField("nextSecond", customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite)]
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite)]
     public TimeSpan NextSecond = TimeSpan.Zero;
 
     /// <summary>
     /// Energy consumed from devices by the emp pulse upon going supercritical.
     /// <summary>
-    [DataField("empEnergyConsumption"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
     public float EmpEnergyConsumption = 100000f;
 
     /// <summary>
     /// Duration of devices being disabled by the emp pulse upon going supercritical.
     /// <summary>
-    [DataField("empDisabledDuration"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
     public float EmpDisabledDuration = 60f;
 }