fix: (Day) Fixes issue where shields did not scale with equipment stats' (AscensionGameDev#2144)

* fix: (Day) Fixes issue where shields did not scale with equipment stats'

* code review

Author: AlexVild

Intersect.Server.Core/Entities/Combat/Status.cs

@@ -106,12 +106,21 @@ public Status(Entity en, Entity attacker, SpellBase spell, SpellEffect type, int
             // If we're adding a shield, actually add that according to the settings.
             if (type == SpellEffect.Shield)
             {
-                for (var i = (int)Vital.Health; i < Enum.GetValues<Vital>().Length; i++)
+                foreach (var vital in Enum.GetValues<Vital>())
                 {
-                    var vitalDiff = spell.Combat.VitalDiff[i];
+                    var vitalDiff = Math.Abs(spell.Combat.VitalDiff[(int)vital]);
+
+                    // If the user did not configure for this vital to have a mana shield, ignore it
+                    if (vitalDiff == 0 && vital == Vital.Mana)
+                    {
+                        continue;
+                    }
+
+                    var shieldAmount = Formulas.CalculateDamage(
+                        vitalDiff, (DamageType)spell.Combat.DamageType, (Enums.Stat)spell.Combat.ScalingStat, spell.Combat.Scaling, 1.0, attacker, en
+                    );
 
-                    shield[i] = Math.Abs(vitalDiff) +
-                                (int)(spell.Combat.Scaling * en.Stat[spell.Combat.ScalingStat].BaseStat / 100f);
+                    Shield[(int)vital] = Math.Abs(shieldAmount);
                 }
             }
 
@@ -204,7 +213,7 @@ public Status(Entity en, Entity attacker, SpellBase spell, SpellEffect type, int
             }
         }
 
-        public int[] shield { get; set; } = new int[Enum.GetValues<Vital>().Length];
+        public int[] Shield { get; set; } = new int[Enum.GetValues<Vital>().Length];
 
         public void TryRemoveStatus()
         {
@@ -218,7 +227,7 @@ public void TryRemoveStatus()
             {
                 for (var i = (int)Vital.Health; i < Enum.GetValues<Vital>().Length; i++)
                 {
-                    if (shield[i] > 0)
+                    if (Shield[i] > 0)
                     {
                         return;
                     }
@@ -244,11 +253,11 @@ public void DamageShield(Vital vital, ref int amount)
         {
             if (Type == SpellEffect.Shield)
             {
-                shield[(int)vital] -= amount;
-                if (shield[(int)vital] <= 0)
+                Shield[(int)vital] -= amount;
+                if (Shield[(int)vital] <= 0)
                 {
-                    amount = -shield[(int)vital]; //Return piercing damage.
-                    shield[(int)vital] = 0;
+                    amount = -Shield[(int)vital]; //Return piercing damage.
+                    Shield[(int)vital] = 0;
                     TryRemoveStatus();
                 }
                 else

Intersect.Server.Core/Entities/Entity.cs

@@ -3069,7 +3069,7 @@ public StatusPacket[] StatusPackets()
                     vitalShields = new int[Enum.GetValues<Vital>().Length];
                     for (var x = 0; x < Enum.GetValues<Vital>().Length; x++)
                     {
-                        vitalShields[x] = status.shield[x];
+                        vitalShields[x] = status.Shield[x];
                     }
                 }