Merge pull request #416 from kaedys/feature/reaper-iteration

[FEATURE] Reaper revamp
MKhayle · Aug 12, 2024 · 7439d65 · 7439d65
2 parents 1afaa72 + 1425c3d
commit 7439d65
Show file tree

Hide file tree

Showing 9 changed files with 457 additions and 405 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -10,3 +10,5 @@ dotnet_diagnostic.CA1822.severity=silent
 dotnet_diagnostic.SA1518.severity = none
 dotnet_diagnostic.SA1516.severity = none
 dotnet_diagnostic.SA1005.severity = none
+dotnet_diagnostic.SA1119.severity = none
+dotnet_diagnostic.IDE0047.severity = none
diff --git a/XIVComboExpanded/Combos/ADV.cs b/XIVComboExpanded/Combos/ADV.cs
@@ -181,7 +181,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
     {
         if (actionID == ADV.HeadGraze && (LocalPlayer?.ClassJob.Id == BRD.ClassID || LocalPlayer?.ClassJob.Id == BRD.JobID || LocalPlayer?.ClassJob.Id == MCH.JobID || LocalPlayer?.ClassJob.Id == DNC.JobID))
         {
-            if (!HasEffect(ADV.Buffs.Peloton) && OutOfCombat())
+            if (!HasEffect(ADV.Buffs.Peloton) && InCombat())
             {
                 return ADV.Peloton;
             }

diff --git a/XIVComboExpanded/Combos/BLM.cs b/XIVComboExpanded/Combos/BLM.cs
@@ -98,7 +98,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
 
             if (IsEnabled(CustomComboPreset.BlackSpellsUmbralSoulFeature))
             {
-                if (level >= BLM.Levels.UmbralSoul && gauge.InUmbralIce && !HasTarget())
+                if (level >= BLM.Levels.UmbralSoul && gauge.InUmbralIce && !TargetIsEnemy())
                     return BLM.UmbralSoul;
             }
         }
@@ -140,7 +140,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
                     if (IsEnabled(CustomComboPreset.BlackEnochianDespairFeature))
                     {
                         if (IsEnabled(CustomComboPreset.BlackEnochianDespairFlareStarFeature))
-                        {   
+                        {
                             // 2nd and 3rd checks for opener and post-manafont usage
                             if (level >= BLM.Levels.FlareStar && gauge.AstralSoulStacks >= 6 && (LocalPlayer?.CurrentMp <= 0 || LocalPlayer?.CurrentMp == 8400 || LocalPlayer?.CurrentMp == 10000))
                                 return BLM.FlareStar;
@@ -244,7 +244,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
                         return BLM.Fire3;
                 }
 
-                if (IsNotEnabled(CustomComboPreset.BlackFireOption2))
+                if (!IsEnabled(CustomComboPreset.BlackFireOption2))
                 {
                     if (!gauge.InAstralFire)
                         return BLM.Fire3;
@@ -271,7 +271,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
 
             if (IsEnabled(CustomComboPreset.BlackSpellsUmbralSoulFeature))
             {
-                if (level >= BLM.Levels.UmbralSoul && gauge.InUmbralIce && !HasTarget())
+                if (level >= BLM.Levels.UmbralSoul && gauge.InUmbralIce && !TargetIsEnemy())
                     return BLM.UmbralSoul;
             }
 
@@ -306,7 +306,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
 
             if (IsEnabled(CustomComboPreset.BlackSpellsUmbralSoulFeature))
             {
-                if (level >= BLM.Levels.UmbralSoul && gauge.InUmbralIce && !HasTarget())
+                if (level >= BLM.Levels.UmbralSoul && gauge.InUmbralIce && !TargetIsEnemy())
                     return BLM.UmbralSoul;
             }
         }
@@ -380,7 +380,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
 
             if (IsEnabled(CustomComboPreset.BlackSpellsUmbralSoulFeature))
             {
-                if (level >= BLM.Levels.UmbralSoul && gauge.InUmbralIce && !HasTarget())
+                if (level >= BLM.Levels.UmbralSoul && gauge.InUmbralIce && !TargetIsEnemy())
                     return BLM.UmbralSoul;
             }
 

diff --git a/XIVComboExpanded/Combos/MCH.cs b/XIVComboExpanded/Combos/MCH.cs
@@ -167,7 +167,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
     {
         if (actionID == MCH.Hypercharge)
         {
-            if (level >= MCH.Levels.Wildfire && IsCooldownUsable(MCH.Wildfire) && HasTarget())
+            if (level >= MCH.Levels.Wildfire && IsCooldownUsable(MCH.Wildfire) && TargetIsEnemy())
                 return MCH.Wildfire;
 
             if (level >= MCH.Levels.Wildfire && !IsCooldownUsable(MCH.Hypercharge) && !IsOriginal(MCH.Wildfire))
@@ -190,7 +190,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
 
             if (IsEnabled(CustomComboPreset.MachinistHyperfireFeature))
             {
-                if (level >= MCH.Levels.Wildfire && IsCooldownUsable(MCH.Wildfire) && HasTarget())
+                if (level >= MCH.Levels.Wildfire && IsCooldownUsable(MCH.Wildfire) && TargetIsEnemy())
                     return MCH.Wildfire;
             }