Merge pull request #178 from FFXIV-CombatReborn/DT-RPR-Base-Changes

Base Class Changes RPR n MCH
FFXIV-CombatReborn · Jul 1, 2024 · ca66b7d · ca66b7d
2 parents 74b916c + b1ecad0
commit ca66b7d
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 5 deletions.
diff --git a/RotationSolver.Basic/Rotations/Basic/MachinistRotation.cs b/RotationSolver.Basic/Rotations/Basic/MachinistRotation.cs
@@ -103,7 +103,7 @@ static partial void ModifyChainSawPvE(ref ActionSetting setting)
 
     static partial void ModifyHyperchargePvE(ref ActionSetting setting)
     {
-        setting.ActionCheck = () => !IsOverheated && Heat >= 50 || Player.HasStatus(true, StatusID.Hypercharged);        
+        setting.ActionCheck = () => !IsOverheated && (Heat >= 50 || Player.HasStatus(true, StatusID.Hypercharged));        
         setting.CreateConfig = () => new()
         {
             TimeToKill = 10,
@@ -152,7 +152,7 @@ static partial void ModifyBarrelStabilizerPvE(ref ActionSetting setting)
 
     static partial void ModifyExcavatorPvE(ref ActionSetting setting)
     {
-        setting.StatusNeed = [StatusID.ExcavatorReady];
+        setting.ActionCheck = () => Player.HasStatus(true, StatusID.ExcavatorReady);
         setting.CreateConfig = () => new ActionConfig()
         {
             AoeCount = 1,
@@ -161,7 +161,7 @@ static partial void ModifyExcavatorPvE(ref ActionSetting setting)
 
     static partial void ModifyFullMetalFieldPvE(ref ActionSetting setting)
     {
-        setting.StatusNeed = [StatusID.FullMetalMachinist];
+        setting.ActionCheck = () => Player.HasStatus(true, StatusID.FullMetalMachinist);
         setting.CreateConfig = () => new ActionConfig()
         {
             AoeCount = 1,

diff --git a/RotationSolver.Basic/Rotations/Basic/ReaperRotation.cs b/RotationSolver.Basic/Rotations/Basic/ReaperRotation.cs
@@ -15,6 +15,21 @@ partial class ReaperRotation
     /// </summary>
     public static bool HasSoulReaver => Player.HasStatus(true, StatusID.SoulReaver);
 
+    /// <summary>
+    /// 
+    /// </summary>
+    public static bool HasIdealHost => Player.HasStatus(true, StatusID.IdealHost);
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public static bool HasOblatio => Player.HasStatus(true, StatusID.Oblatio);
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public static bool HasPerfectioParata => Player.HasStatus(true, StatusID.PerfectioParata);
+
     #region JobGauge
     /// <summary>
     /// 
@@ -145,8 +160,7 @@ static partial void ModifyEnshroudPvE(ref ActionSetting setting)
 
     static partial void ModifySacrificiumPvE(ref ActionSetting setting)
     {
-        setting.StatusNeed = [StatusID.Enshrouded, StatusID.Oblatio];
-
+        setting.ActionCheck = () => HasEnshrouded && HasOblatio;
     }
 
     static partial void ModifyCommunioPvE(ref ActionSetting setting)
@@ -156,6 +170,11 @@ static partial void ModifyCommunioPvE(ref ActionSetting setting)
         setting.ActionCheck = () => LemureShroud == 1;
     }
 
+    static partial void ModifyPerfectioPvE(ref ActionSetting setting)
+    {
+        setting.ActionCheck = () => HasPerfectioParata;
+    }
+
     static partial void ModifyLemuresSlicePvE(ref ActionSetting setting)
     {
         setting.StatusNeed = [StatusID.Enshrouded];