Merge pull request #1 from Tartarga/daemeous-healer

Minor tweaks
Nik-Potokar · Oct 3, 2022 · 74a6463 · 74a6463
2 parents 5bb0435 + 10fd883
commit 74a6463
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 25 deletions.
diff --git a/XIVSlothCombo/Combos/PvE/AST.cs b/XIVSlothCombo/Combos/PvE/AST.cs
@@ -335,14 +335,10 @@ Gauge.DrawnCard is CardType.NONE &&
                             //Grab current DoT via OriginalHook, grab it's fellow debuff ID from Dictionary, then check for the debuff
                             uint dot = OriginalHook(Combust);
                             Status? dotDebuff = FindTargetEffect(CombustList[dot]);
-                            if ((dotDebuff is null) || (dotDebuff.RemainingTime <= GetOptionFloat(Config.AST_ST_DPS_CombustUptime_Threshold) &&
-                                (GetTargetHPPercent() > GetOptionValue(Config.AST_DPS_CombustOption))))
+                            if (((dotDebuff is null) || (dotDebuff.RemainingTime <= GetOptionFloat(Config.AST_ST_DPS_CombustUptime_Threshold))) &&
+                                (GetTargetHPPercent() > GetOptionValue(Config.AST_DPS_CombustOption)))
                                 return dot;
 
-                            // DoT Uptime Timer
-                            if ((dotDebuff is null) || (dotDebuff.RemainingTime <= GetOptionFloat(Config.AST_ST_DPS_CombustUptime_Threshold)))
-                                return OriginalHook(dot);
-
                             //AlterateMode idles as Malefic
                             if (AlternateMode) return OriginalHook(Malefic);
                         }

diff --git a/XIVSlothCombo/Combos/PvE/SCH.cs b/XIVSlothCombo/Combos/PvE/SCH.cs
@@ -111,7 +111,7 @@ internal static class Config
             internal static bool SCH_FairyFeature => CustomComboFunctions.GetIntOptionAsBool(nameof(SCH_FairyFeature));
             internal static int SCH_Recitation_Mode => CustomComboFunctions.GetOptionValue(nameof(SCH_Recitation_Mode));
 
-            internal const string SCH_ST_DPS_Bio_Threshold = "SCH_ST_DPS_Bio_Threshold";
+            internal static float SCH_ST_DPS_Bio_Threshold = CustomComboFunctions.GetOptionFloat(nameof(SCH_ST_DPS_Bio_Threshold));
 
         }
 
@@ -349,13 +349,9 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
                             uint dot = OriginalHook(Bio); //Grab the appropriate DoT Action
                             Status? dotDebuff = FindTargetEffect(BioList[dot]); //Match it with it's Debuff ID, and check for the Debuff
 
-                            if (dotDebuff is null || (dotDebuff.RemainingTime <= GetOptionFloat(Config.SCH_ST_DPS_Bio_Threshold) &&
-                                (GetTargetHPPercent() > Config.SCH_ST_DPS_BioOption)))
+                            if ((dotDebuff is null || dotDebuff?.RemainingTime <= Config.SCH_ST_DPS_Bio_Threshold) &&
+                                (GetTargetHPPercent() > Config.SCH_ST_DPS_BioOption))
                                 return dot; //Use appropriate DoT Action
-
-                            // DoT Uptime Timer
-                            if ((dotDebuff is null) || (dotDebuff.RemainingTime <= GetOptionFloat(Config.SCH_ST_DPS_Bio_Threshold)))
-                                return OriginalHook(dot);
                         }
 
                         //Ruin 2 Movement 

diff --git a/XIVSlothCombo/Combos/PvE/SGE.cs b/XIVSlothCombo/Combos/PvE/SGE.cs
@@ -111,7 +111,7 @@ internal static class Config
             internal static int SGE_AoE_Phlegma_Lucid => CustomComboFunctions.GetOptionValue(nameof(SGE_AoE_Phlegma_Lucid));
             internal static int SGE_Eukrasia_Mode => CustomComboFunctions.GetOptionValue(nameof(SGE_Eukrasia_Mode));
 
-            internal const string SGE_ST_Dosis_Threshold = "SGE_ST_Dosis_Threshold";
+            internal static float SGE_ST_Dosis_Threshold = CustomComboFunctions.GetOptionFloat(nameof(SGE_ST_Dosis_Threshold));
 
         }
 
@@ -245,13 +245,9 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
                             if (DosisList.TryGetValue(OriginalHook(actionID), out ushort dotDebuffID))
                             {
                                 Status? dotDebuff = FindTargetEffect(dotDebuffID);
-                                if ((dotDebuff is null) || (dotDebuff.RemainingTime <= GetOptionFloat(Config.SGE_ST_Dosis_Threshold)) &&
+                                if (((dotDebuff is null) || (dotDebuff.RemainingTime <= Config.SGE_ST_Dosis_Threshold)) &&
                                     (GetTargetHPPercent() > Config.SGE_ST_Dosis_EDosisHPPer))
                                     return Eukrasia;
-
-                                // DoT Uptime Timer
-                                if ((dotDebuff is null) || (dotDebuff.RemainingTime <= GetOptionFloat(Config.SGE_ST_Dosis_Threshold)))
-                                    return Eukrasia;
                             }
                         }
 

diff --git a/XIVSlothCombo/Combos/PvE/WHM.cs b/XIVSlothCombo/Combos/PvE/WHM.cs
@@ -229,12 +229,8 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
                         else DoTDebuff = FindTargetEffect(Debuffs.Aero1);
 
                         // DoT Uptime & HP% threshold
-                        if ((DoTDebuff is null) || (DoTDebuff.RemainingTime <= GetOptionFloat(Config.WHM_ST_MainCombo_DoT_Threshold) &&
-                            (GetTargetHPPercent() > GetOptionValue(Config.WHM_ST_MainCombo_DoT))))
-                            return OriginalHook(Aero1);
-
-                        // DoT Uptime Timer
-                        if ((DoTDebuff is null) || (DoTDebuff.RemainingTime <= GetOptionFloat(Config.WHM_ST_MainCombo_DoT_Threshold)))
+                        if (((DoTDebuff is null) || (DoTDebuff.RemainingTime <= GetOptionFloat(Config.WHM_ST_MainCombo_DoT_Threshold))) &&
+                            (GetTargetHPPercent() > GetOptionValue(Config.WHM_ST_MainCombo_DoT)))
                             return OriginalHook(Aero1);
                     }