Revert "Merge pull request #24 from BadM0dder/NateDefenseTesting"

This reverts commit e0c3628, reversing changes made to 9e8c1e4.
StarCoreSE · Sep 28, 2024 · c8fe9da · c8fe9da
1 parent cb4eb99
commit c8fe9da
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/Data/Scripts/DefenseShields/API/TapiBackend.cs b/Data/Scripts/DefenseShields/API/TapiBackend.cs
@@ -379,7 +379,7 @@ private static MyTuple<bool, int, int, float, float, float> TAPI_GetFaceInfoAndP
             var shuntMod = !hitShuntedSide ? (float)(1 - ((shuntedFaces * 0.17f) - ((shuntedFaces * (shuntedFaces - 3)) * 0.025f))) : logic.DsSet.Settings.AutoManage ? 1 - Session.ShieldShuntBonus : 1f;
             var preventBypassMod = MathHelper.Clamp(shuntedFaces * Session.ShieldBypassBonus, 0f, 1f);
 
-            var reinforcedPercent = hitShuntedSide ? logic.DsState.State.ShieldPercent + (shuntedFaces * 18) : logic.DsState.State.ShieldPercent;
+            var reinforcedPercent = hitShuntedSide ? logic.DsState.State.ShieldPercent + (shuntedFaces * 12) : logic.DsState.State.ShieldPercent;
             var heatedEnforcedPercent = reinforcedPercent / (1 + (logic.DsState.State.Heat * 0.0005));
 
             if (heatedEnforcedPercent < penStartThreshold)

diff --git a/Data/Scripts/DefenseShields/ShieldLogic/ShieldHeat.cs b/Data/Scripts/DefenseShields/ShieldLogic/ShieldHeat.cs
@@ -17,7 +17,7 @@ private void UpdateHeatRate()
             var heat = DsState.State.Heat;
             heat /= 10;
 
-            if (heat >= 10) ShieldChargeRate = 0;
+            if (heat >= 8) ShieldChargeRate = 0;
             else
             {
                 ExpChargeReduction = ExpChargeReductions[heat];

diff --git a/Data/Scripts/DefenseShields/ShieldLogic/ShieldInit.cs b/Data/Scripts/DefenseShields/ShieldLogic/ShieldInit.cs
@@ -595,21 +595,21 @@ private void ComputeCap()
                     if (power != null)
                     {
                         var maxPower = power.MaxOutput;
-                        if (sub.GridSizeEnum == MyCubeSize.Large && slim.BlockDefinition != null && _nerfVanillaPower.ContainsKey(slim.BlockDefinition.Id.SubtypeId) && _nerfVanillaPower[slim.BlockDefinition.Id.SubtypeId] == (int) maxPower)
-                        {
-                            if (MyUtils.IsEqual(maxPower, 300f))
-                            {
-                                nerfScaler += (0.85f * value);
-                            }
-                            else
-                            {
-                                nerfScaler += (1.1f * value);
-                            }
-                        }
-                        else
-                        {
-                            nerfScaler += (1 * value);
-                        }
+                        //if (sub.GridSizeEnum == MyCubeSize.Large && slim.BlockDefinition != null && _nerfVanillaPower.ContainsKey(slim.BlockDefinition.Id.SubtypeId) && _nerfVanillaPower[slim.BlockDefinition.Id.SubtypeId] == (int) maxPower)
+                        //{
+                        //    if (MyUtils.IsEqual(maxPower, 300f))
+                        //    {
+                        //        nerfScaler += (0.6f * value);
+                        //    }
+                        //    else
+                        //    {
+                        //        nerfScaler += (1.25f * value);
+                        //    }
+                        //}
+                        //else
+                        //{
+                        //    nerfScaler += (1 * value);
+                        //}
 
                         nerfCount += value;