revert config changes

RotationSolver.Basic/Actions/BaseAction_Target.cs

@@ -95,10 +95,9 @@ internal static bool TankDefenseSelf(BattleChara _, bool mustUse)
     {
         return (DataCenter.TarOnMeTargets.Any() || mustUse) && DataCenter.AverageTimeToKill > 8;
     }
-
-    internal static bool CanTankBurst()
+    internal static bool TankBreakOtherCheck(Job id)
     {
-        var tankHealth = Service.Config.GetValue(JobConfigFloat.HealthForDyingTanks);
+        var tankHealth = id.GetHealthForDyingTank();
 
         return DataCenter.HasHostilesInRange
             && Player.Object.GetHealthRatio() < tankHealth
@@ -653,7 +652,7 @@ bool CheckStatus(BattleChara tar)
 
         if (TargetStatus == null) return true;
 
-        return tar.WillStatusEndGCD(GetDotGcdCount?.Invoke() ?? (uint)Service.Config.GetValue(JobConfigInt.AddDotGCDCount),
+        return tar.WillStatusEndGCD(GetDotGcdCount?.Invoke() ?? (uint)Service.Config.GetValue(DataCenter.Job, JobConfigInt.AddDotGCDCount),
             0, true, TargetStatus);
     }
 

RotationSolver.Basic/Actions/HealPotionItem.cs

@@ -1,7 +1,6 @@
 using ECommons.ExcelServices;
 using ECommons.GameHelpers;
 using Lumina.Excel.GeneratedSheets;
-using RotationSolver.Basic.Configuration;
 
 namespace RotationSolver.Basic.Actions;
 
@@ -32,7 +31,8 @@ public override bool CanUse(out IAction item, bool clippingCheck)
     {
         item = null;
         if (!Player.Available) return false;
-        if (Player.Object.GetHealthRatio() > Service.Config.GetValue(JobConfigFloat.HealthSingleAbilityHot)) return false;
+        var job = (Job)Player.Object.ClassJob.Id;
+        if (Player.Object.GetHealthRatio() > job.GetHealthSingleAbilityHot()) return false;
         if (Player.Object.MaxHp - Player.Object.CurrentHp < MaxHealHp) return false;
         return base.CanUse(out item, clippingCheck);
     }

RotationSolver.Basic/Configuration/Configs.cs

@@ -24,11 +24,11 @@ public static PluginConfig Create()
     public GlobalConfig GlobalConfig { get; private set; } = new();
     public int Version { get; set; } = 7;
 
-    public int GetValue(JobConfigInt config)
-        => GetJobConfig(DataCenter.Job).Ints.GetValue(config);
+    public int GetValue(Job job, JobConfigInt config)
+        => GetJobConfig(job).Ints.GetValue(config);
 
-    public float GetValue(JobConfigFloat config)
-        => GetJobConfig(DataCenter.Job).Floats.GetValue(config);
+    public float GetValue(Job job, JobConfigFloat config)
+        => GetJobConfig(job).Floats.GetValue(config);
 
     public int GetValue(PluginConfigInt config)
         => GlobalConfig.Ints.GetValue(config);
@@ -64,11 +64,11 @@ public float GetValue(PluginConfigFloat config)
     public Vector4 GetValue(PluginConfigVector4 config)
         => GlobalConfig.Vectors.GetValue(config);
 
-    public int GetDefault(JobConfigInt config)
-        => GetJobConfig(DataCenter.Job).Ints.GetDefault(config);
+    public int GetDefault(Job job, JobConfigInt config)
+        => GetJobConfig(job).Ints.GetDefault(config);
 
-    public float GetDefault(JobConfigFloat config)
-        => GetJobConfig(DataCenter.Job).Floats.GetDefault(config);
+    public float GetDefault(Job job, JobConfigFloat config)
+        => GetJobConfig(job).Floats.GetDefault(config);
 
     public int GetDefault(PluginConfigInt config)
         => GlobalConfig.Ints.GetDefault(config);
@@ -82,10 +82,7 @@ public float GetDefault(PluginConfigFloat config)
     public Vector4 GetDefault(PluginConfigVector4 config)
         => GlobalConfig.Vectors.GetDefault(config);
 
-    public void SetValue(JobConfigInt config, int value)
-        => SetValue(DataCenter.Job, config, value);
-
-    private void SetValue(Job job, JobConfigInt config, int value)
+    public void SetValue(Job job, JobConfigInt config, int value)
     {
         var attr = config.GetAttribute<DefaultAttribute>();
         if (attr != null)
@@ -99,10 +96,7 @@ private void SetValue(Job job, JobConfigInt config, int value)
         GetJobConfig(job).Ints.SetValue(config, value);
     }
 
-    public void SetValue(JobConfigFloat config, float value)
-        => SetValue(DataCenter.Job, config, value);
-
-    private void SetValue(Job job, JobConfigFloat config, float value)
+    public void SetValue(Job job, JobConfigFloat config, float value)
     {
         var attr = config.GetAttribute<DefaultAttribute>();
         if (attr != null)

RotationSolver.Basic/DataCenter.cs

@@ -153,7 +153,7 @@ internal static void AddCommandAction(IAction act, double time)
     }
 
     public static TargetHostileType RightNowTargetToHostileType
-        => (TargetHostileType)Service.Config.GetValue(JobConfigInt.HostileType);
+        => (TargetHostileType)Service.Config.GetValue(Job, Configuration.JobConfigInt.HostileType);
 
     public static unsafe ActionID LastComboAction => (ActionID)ActionManager.Instance()->Combo.Action;
     public static unsafe float ComboTime => ActionManager.Instance()->Combo.Timer;

RotationSolver.Basic/Helpers/ConfigurationHelper.cs

@@ -1,4 +1,5 @@
 using Dalamud.Game.ClientState.Keys;
+using ECommons.ExcelServices;
 
 namespace RotationSolver.Basic.Helpers;
 
@@ -31,4 +32,31 @@ internal static class ConfigurationHelper
     };
 
     public static readonly VirtualKey[] Keys = new VirtualKey[] { VirtualKey.CONTROL, VirtualKey.SHIFT, VirtualKey.MENU };
+
+    public static float GetHealthAreaAbility(this Job job)
+        => Service.Config.GetValue(job, Configuration.JobConfigFloat.HealthAreaAbility);
+
+    public static float GetHealthAreaSpell(this Job job)
+        => Service.Config.GetValue(job, Configuration.JobConfigFloat.HealthAreaSpell);
+
+    public static float GetHealthAreaAbilityHot(this Job job)
+        => Service.Config.GetValue(job, Configuration.JobConfigFloat.HealthAreaAbilityHot);
+
+    public static float GetHealthAreaSpellHot(this Job job)
+    => Service.Config.GetValue(job, Configuration.JobConfigFloat.HealthAreaSpellHot);
+
+    public static float GetHealthSingleAbility(this Job job)
+        => Service.Config.GetValue(job, Configuration.JobConfigFloat.HealthSingleAbility);
+
+    public static float GetHealthSingleSpell(this Job job)
+        => Service.Config.GetValue(job, Configuration.JobConfigFloat.HealthSingleSpell);
+
+    public static float GetHealthSingleAbilityHot(this Job job)
+    => Service.Config.GetValue(job, Configuration.JobConfigFloat.HealthSingleAbilityHot);
+
+    public static float GetHealthSingleSpellHot(this Job job)
+    => Service.Config.GetValue(job, Configuration.JobConfigFloat.HealthSingleSpellHot);
+
+    public static float GetHealthForDyingTank(this Job job)
+        => Service.Config.GetValue(job, Configuration.JobConfigFloat.HealthForDyingTanks);
 }

RotationSolver.Basic/Rotations/Basic/DRK_Base.cs

@@ -332,7 +332,7 @@ protected static bool ShadowTimeEndAfterGCD(uint gctCount = 0, float offset = 0)
     /// <returns></returns>
     protected override bool EmergencyAbility(IAction nextGCD, out IAction act)
     {
-        if (LivingDead.CanUse(out act) && BaseAction.CanTankBurst()) return true;
+        if (LivingDead.CanUse(out act) && BaseAction.TankBreakOtherCheck(Jobs[0])) return true;
         return base.EmergencyAbility(nextGCD, out act);
     }
 

RotationSolver.Basic/Rotations/Basic/GNB_Base.cs

@@ -325,7 +325,7 @@ public abstract class GNB_Base : CustomRotation
     /// <returns></returns>
     protected override bool EmergencyAbility(IAction nextGCD, out IAction act)
     {
-        if (SuperBolide.CanUse(out act) && BaseAction.CanTankBurst()) return true;
+        if (SuperBolide.CanUse(out act) && BaseAction.TankBreakOtherCheck(Jobs[0])) return true;
         return base.EmergencyAbility(nextGCD, out act);
     }
 

RotationSolver.Basic/Rotations/Basic/PLD_Base.cs

@@ -321,22 +321,22 @@ public abstract class PLD_Base : CustomRotation
         ActionCheck = (b, m) => LimitBreakLevel == 3,
     };
 
-    /// <inheritdoc/>
+    /// <inheritdoc//>
     protected override bool EmergencyAbility(IAction nextGCD, out IAction act)
     {
-        if (HallowedGround.CanUse(out act) && BaseAction.CanTankBurst()) return true;
+        if (HallowedGround.CanUse(out act) && BaseAction.TankBreakOtherCheck(Jobs[0])) return true;
         return base.EmergencyAbility(nextGCD, out act);
     }
 
-    /// <inheritdoc/>
+    /// <inheritdoc//>
     [RotationDesc(ActionID.Intervene)]
     protected sealed override bool MoveForwardAbility(out IAction act)
     {
         if (Intervene.CanUse(out act)) return true;
         return base.MoveForwardAbility(out act);
     }
 
-    /// <inheritdoc/>
+    /// <inheritdoc//>
     [RotationDesc(ActionID.Clemency)]
     protected sealed override bool HealSingleGCD(out IAction act)
     {

RotationSolver.Basic/Rotations/Basic/WAR_Base.cs

@@ -375,7 +375,7 @@ public abstract class WAR_Base : CustomRotation
     /// <inheritdoc/>
     protected override bool EmergencyAbility(IAction nextGCD, out IAction act)
     {
-        if (Holmgang.CanUse(out act) && BaseAction.CanTankBurst()) return true;
+        if (Holmgang.CanUse(out act) && BaseAction.TankBreakOtherCheck(Jobs[0])) return true;
         return base.EmergencyAbility(nextGCD, out act);
     }
 

RotationSolver.Basic/Rotations/CustomRotation_Ability.cs

@@ -212,7 +212,7 @@ private bool AutoDefense(JobRole role, bool helpDefenseAOE, bool helpDefenseSing
 
             //A lot targets are targeting on me.
             if (tarOnMeCount >= Service.Config.GetValue(PluginConfigInt.AutoDefenseNumber)
-                && Player.GetHealthRatio() <= Service.Config.GetValue(JobConfigFloat.HealthForAutoDefense)
+                && Player.GetHealthRatio() <= Service.Config.GetValue(DataCenter.Job, JobConfigFloat.HealthForAutoDefense)
                 && movingHere && attacked)
             {
                 if (DefenseSingleAbility(out act)) return true;

RotationSolver.Basic/Rotations/CustomRotation_Actions.cs

@@ -89,7 +89,7 @@ public override bool CanUse(out IAction act, CanUseOption option = CanUseOption.
     public static IBaseAction SecondWind { get; } = new RoleAction(ActionID.SecondWind,
         new JobRole[] { JobRole.RangedPhysical, JobRole.Melee }, ActionOption.Heal)
     {
-        ActionCheck = (b, m) => Player?.GetHealthRatio() < Service.Config.GetValue(Configuration.JobConfigFloat.HealthSingleAbility) && InCombat,
+        ActionCheck = (b, m) => Player?.GetHealthRatio() < Service.Config.GetValue(DataCenter.Job, Configuration.JobConfigFloat.HealthSingleAbility) && InCombat,
     };
 
     /// <summary>