The Lightning-Factor

Content.Server/Anomaly/Effects/ElectricityAnomalySystem.cs

@@ -32,15 +32,17 @@ private void OnPulse(Entity<ElectricityAnomalyComponent> anomaly, ref AnomalyPul
 
         int boltCount = (int)MathF.Floor(MathHelper.Lerp((float)anomaly.Comp.MinBoltCount, (float)anomaly.Comp.MaxBoltCount, args.Severity));
 
-        _lightning.ShootRandomLightnings(anomaly, range, boltCount);
+        _lightning.ShootRandomLightnings(anomaly, range, boltCount, 50000f);
     }
 
     private void OnSupercritical(Entity<ElectricityAnomalyComponent> anomaly, ref AnomalySupercriticalEvent args)
     {
         var range = anomaly.Comp.MaxElectrocuteRange * 3;
 
         _emp.EmpPulse(_transform.GetMapCoordinates(anomaly), range, anomaly.Comp.EmpEnergyConsumption, anomaly.Comp.EmpDisabledDuration);
-        _lightning.ShootRandomLightnings(anomaly, range, anomaly.Comp.MaxBoltCount * 3, arcDepth: 3);
+        _lightning.ShootRandomLightnings(anomaly, range, anomaly.Comp.MaxBoltCount * 3, 100000f,
+            maxArcs: 3
+        );
     }
 
     public override void Update(float frameTime)

Content.Server/Electrocution/ElectrocutionSystem.cs

@@ -12,6 +12,7 @@
 using Content.Shared.Damage.Prototypes;
 using Content.Shared.Database;
 using Content.Shared.Electrocution;
+using Content.Shared.FixedPoint;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
 using Content.Shared.Inventory;
@@ -213,7 +214,7 @@ private void OnElectrifiedInteractUsing(EntityUid uid, ElectrifiedComponent elec
         TryDoElectrifiedAct(uid, args.User, siemens, electrified);
     }
 
-    private float CalculateElectrifiedDamageScale(float power)
+    public float CalculateElectrifiedDamageScale(float power)
     {
         // A logarithm allows a curve of damage that grows quickly, but slows down dramatically past a value. This keeps the damage to a reasonable range.
         const float DamageShift = 1.67f; // Shifts the curve for an overall higher or lower damage baseline
@@ -314,13 +315,26 @@ public bool TryDoElectrifiedAct(EntityUid uid, EntityUid targetUid,
         }
     }
 
+    public bool TryDoElectrocution(
+        EntityUid uid, EntityUid? sourceUid, FixedPoint2 shockDamage, TimeSpan time, bool refresh, float siemensCoefficient = 1f,
+        StatusEffectsComponent? statusEffects = null, bool ignoreInsulation = false)
+    {
+        var damage = new DamageSpecifier();
+        damage.DamageDict.Add("Shock", shockDamage.Value);
+
+        return TryDoElectrocution(
+            uid, sourceUid, damage, time, refresh, siemensCoefficient,
+            statusEffects, ignoreInsulation
+        );
+    }
+
     /// <inheritdoc/>
     public override bool TryDoElectrocution(
-        EntityUid uid, EntityUid? sourceUid, int shockDamage, TimeSpan time, bool refresh, float siemensCoefficient = 1f,
+        EntityUid uid, EntityUid? sourceUid, DamageSpecifier damageSpecifier, TimeSpan time, bool refresh, float siemensCoefficient = 1f,
         StatusEffectsComponent? statusEffects = null, bool ignoreInsulation = false)
     {
         if (!DoCommonElectrocutionAttempt(uid, sourceUid, ref siemensCoefficient, ignoreInsulation)
-            || !DoCommonElectrocution(uid, sourceUid, shockDamage, time, refresh, siemensCoefficient, statusEffects))
+            || !DoCommonElectrocution(uid, sourceUid, damageSpecifier, time, refresh, siemensCoefficient, statusEffects))
             return false;
 
         RaiseLocalEvent(uid, new ElectrocutedEvent(uid, sourceUid, siemensCoefficient), true);
@@ -394,48 +408,54 @@ private bool DoCommonElectrocutionAttempt(EntityUid uid, EntityUid? sourceUid, r
     }
 
     private bool DoCommonElectrocution(EntityUid uid, EntityUid? sourceUid,
-        int? shockDamage, TimeSpan time, bool refresh, float siemensCoefficient = 1f,
+        FixedPoint2? shockDamage, TimeSpan time, bool refresh, float siemensCoefficient = 1f,
+        StatusEffectsComponent? statusEffects = null)
+    {
+        var damage = new DamageSpecifier();
+        if (shockDamage.HasValue)
+            damage.DamageDict.Add("Shock", shockDamage.Value);
+
+        return DoCommonElectrocution(uid, sourceUid, damage, time, refresh, siemensCoefficient, statusEffects);
+    }
+
+    private bool DoCommonElectrocution(EntityUid uid, EntityUid? sourceUid,
+        DamageSpecifier? damageSpecifier, TimeSpan time, bool refresh, float siemensCoefficient = 1f,
         StatusEffectsComponent? statusEffects = null)
     {
         if (siemensCoefficient <= 0)
             return false;
 
-        if (shockDamage != null)
+        var checkDamage = false;
+        if (damageSpecifier != null)
         {
-            shockDamage = (int) (shockDamage * siemensCoefficient);
+            damageSpecifier *= siemensCoefficient;
+            var actual = _damageable.TryChangeDamage(uid, damageSpecifier, origin: sourceUid);
 
-            if (shockDamage.Value <= 0)
-                return false;
+            if (actual != null && actual.DamageDict.Values.Sum() > FixedPoint2.Zero)
+            {
+                _adminLogger.Add(LogType.Electrocution,
+                    $"{ToPrettyString(uid):entity} received {actual.GetTotal():damage} powered electrocution damage{(sourceUid != null ? " from " + ToPrettyString(sourceUid.Value) : ""):source}");
+
+                checkDamage = true;
+            }
         }
 
-        if (!Resolve(uid, ref statusEffects, false) ||
-            !_statusEffects.CanApplyEffect(uid, StatusEffectKey, statusEffects))
+        var checkStun = false;
+        if (siemensCoefficient > 0.5f
+            && Resolve(uid, ref statusEffects, false)
+            && _statusEffects.CanApplyEffect(uid, StatusEffectKey, statusEffects)
+            && _statusEffects.TryAddStatusEffect<ElectrocutedComponent>(uid, StatusEffectKey, time, refresh, statusEffects))
         {
-            return false;
+            _stun.TryParalyze(uid, time * ParalyzeTimeMultiplier, refresh, statusEffects);
+
+            checkStun = true;
         }
 
-        if (!_statusEffects.TryAddStatusEffect<ElectrocutedComponent>(uid, StatusEffectKey, time, refresh, statusEffects))
+        if (!checkDamage && !checkStun)
             return false;
 
-        var shouldStun = siemensCoefficient > 0.5f;
-
-        if (shouldStun)
-            _stun.TryParalyze(uid, time * ParalyzeTimeMultiplier, refresh, statusEffects);
-
         // TODO: Sparks here.
 
-        if (shockDamage is { } dmg)
-        {
-            var actual = _damageable.TryChangeDamage(uid,
-                new DamageSpecifier(_prototypeManager.Index<DamageTypePrototype>(DamageType), dmg), origin: sourceUid);
-
-            if (actual != null)
-            {
-                _adminLogger.Add(LogType.Electrocution,
-                    $"{ToPrettyString(uid):entity} received {actual.GetTotal():damage} powered electrocution damage{(sourceUid != null ? " from " + ToPrettyString(sourceUid.Value) : ""):source}");
-            }
-        }
-
         _stuttering.DoStutter(uid, time * StutteringTimeMultiplier, refresh, statusEffects);
         _jittering.DoJitter(uid, time * JitterTimeMultiplier, refresh, JitterAmplitude, JitterFrequency, true, statusEffects);
 

Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs

@@ -403,7 +403,11 @@ private void RollMalfunction(Entity<ActiveMicrowaveComponent, MicrowaveComponent
             }
 
             if (_random.Prob(ent.Comp2.LightningChance))
-                _lightning.ShootRandomLightnings(ent, 1.0f, 2, MalfunctionSpark, triggerLightningEvents: false);
+                _lightning.ShootRandomLightnings(ent, 1.0f, 2, 5000f,
+                    lightningPrototype: MalfunctionSpark,
+                    electrocute: false,
+                    explode: false
+                );
         }
 
         /// <summary>

Content.Server/Lightning/Components/LightningTargetComponent.cs

@@ -13,60 +13,31 @@ namespace Content.Server.Lightning.Components;
 public sealed partial class LightningTargetComponent : Component
 {
     /// <summary>
-    /// The probability that this target will not be ignored by a lightning strike. This is necessary for Tesla's balance.
+    /// The probability weighting of being stuck by lightning, compared against other nearby lightning targets.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public float HitProbability = 1f;
-
-    /// <summary>
-    /// Priority level for selecting a lightning target. 
-    /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public int Priority;
+    [DataField]
+    public float Weighting = 1f;
 
     /// <summary>
     /// Lightning has a number of bounces into neighboring targets.
     /// This number controls how many bounces the lightning bolt has left after hitting that target.
     /// At high values, the lightning will not travel farther than that entity.
+    /// For the love of god, do not make this number negative.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public int LightningResistance = 1; //by default, reduces the number of bounces from this target by 1
-
-    // BOOM PART
-
-    /// <summary>
-    /// Will the entity explode after being struck by lightning?
-    /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public bool LightningExplode = true;
-
-    /// <summary>
-    /// The explosion prototype to spawn
-    /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public ProtoId<ExplosionPrototype> ExplosionPrototype = "Default";
-
-    /// <summary>
-    /// The total amount of intensity an explosion can achieve
-    /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public float TotalIntensity = 25f;
-
-    /// <summary>
-    /// How quickly does the explosion's power slope? Higher = smaller area and more concentrated damage, lower = larger area and more spread out damage
-    /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public float Dropoff = 2f;
+    [DataField]
+    public int LightningArcReduction = 0;
 
     /// <summary>
-    /// How much intensity can be applied per tile?
+    /// Lightning has a charge that gauges its energy.
+    /// This number subtracts residual charge after absorption.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public float MaxTileIntensity = 5f;
+    [DataField]
+    public float LightningChargeReduction = 0f;
 
     /// <summary>
-    /// how much structural damage the object takes from a lightning strike
+    /// Lightning has a charge that gauges its energy.
+    /// This number multiplies residual charge after absorption.
     /// </summary>
     [DataField]
-    public FixedPoint2 DamageFromLightning = 1;
+    public float LightningChargeMultiplier = 1f;
 }