Merge pull request #2 from SonicZeHedgehog/Update-MNK-Base-Rotation

Update Monk Base Rotation
FFXIV-CombatReborn · Jul 17, 2024 · ea8ab99 · ea8ab99
2 parents 348eed7 + a538ab9
commit ea8ab99
Showing 1 changed file with 61 additions and 16 deletions.
diff --git a/RotationSolver.Basic/Rotations/Basic/MonkRotation.cs b/RotationSolver.Basic/Rotations/Basic/MonkRotation.cs
@@ -1,5 +1,4 @@
-namespace RotationSolver.Basic.Rotations.Basic;
-
+namespace RotationSolver.Basic.Rotations.Basic;
 partial class MonkRotation
 {
     /// <inheritdoc/>
@@ -25,26 +24,49 @@ partial class MonkRotation
     /// 
     /// </summary>
     public static bool HasLunar => JobGauge.Nadi.HasFlag(Nadi.LUNAR);
+
+    /// <summary>
+    /// .
+    /// </summary>
+    public static bool NoNadi => JobGauge.Nadi.HasFlag(Nadi.NONE);
+
+    /// <summary>
+    /// Gets the amount of available Opo-opo Fury stacks.
+    /// </summary>
+    public static int OpoOpoFury => JobGauge.OpoOpoFury;
+
+    /// <summary>
+    /// Gets the amount of available Raptor Fury stacks.
+    /// </summary>
+    public static int RaptorFury => JobGauge.RaptorFury;
+
+    /// <summary>
+    /// Gets the amount of available Coeurl Fury stacks.
+    /// </summary>
+    public static int CoeurlFury => JobGauge.CoeurlFury;
     #endregion
 
-    static partial void ModifyDragonKickPvE(ref ActionSetting setting)
+    static partial void ModifyLeapingOpoPvE(ref ActionSetting setting)
     {
-        setting.StatusProvide = [StatusID.LeadenFist];
+        setting.ActionCheck = () => OpoOpoFury == 1;
+    }
+    static partial void ModifyRisingRaptorPvE(ref ActionSetting setting)
+    {
+        setting.ActionCheck = () => RaptorFury == 1;
+    }
+    static partial void ModifyPouncingCoeurlPvE(ref ActionSetting setting)
+    {
+        setting.ActionCheck = () => CoeurlFury >= 1;
     }
-
     static partial void ModifyDemolishPvE(ref ActionSetting setting)
     {
-        setting.TargetStatusProvide = [StatusID.Demolish];
-        setting.CreateConfig = () => new()
-        {
-            StatusGcdCount = 3,
-        };
         setting.UnlockedByQuestID = 66103;
     }
 
     static partial void ModifySteelPeakPvE(ref ActionSetting setting)
     {
         setting.ActionCheck = () => InCombat && Chakra == 5;
+        setting.UnlockedByQuestID = 66094;
     }
 
     static partial void ModifyHowlingFistPvE(ref ActionSetting setting)
@@ -64,16 +86,30 @@ static partial void ModifyMantraPvE(ref ActionSetting setting)
     static partial void ModifyRiddleOfEarthPvE(ref ActionSetting setting)
     {
         setting.StatusProvide = [StatusID.RiddleOfEarth];
+        setting.StatusProvide = [StatusID.EarthsRumination];
     }
 
     static partial void ModifyRiddleOfWindPvE(ref ActionSetting setting)
     {
+        setting.StatusProvide = [StatusID.WindsRumination];
         setting.CreateConfig = () => new()
         {
             TimeToKill = 10,
         };
     }
-
+    static partial void ModifyWindsReplyPvE(ref ActionSetting setting)
+    {
+        setting.StatusNeed = [StatusID.WindsRumination];
+    }
+    static partial void ModifyEarthsReplyPvE(ref ActionSetting setting)
+    {
+        setting.StatusNeed = [StatusID.EarthsRumination];
+    }
+    static partial void ModifyFiresReplyPvE(ref ActionSetting setting)
+    {
+        setting.StatusNeed = [StatusID.FiresRumination];
+        setting.StatusProvide = [StatusID.FormlessFist];
+    }
     static partial void ModifyPerfectBalancePvE(ref ActionSetting setting)
     {
         setting.ActionCheck = () => InCombat && IsLongerThan(5);
@@ -82,7 +118,7 @@ static partial void ModifyPerfectBalancePvE(ref ActionSetting setting)
 
     static partial void ModifyFormShiftPvE(ref ActionSetting setting)
     {
-        setting.StatusProvide = [StatusID.FormlessFist, StatusID.PerfectBalance];
+        setting.StatusProvide = [StatusID.FormlessFist];
         setting.UnlockedByQuestID = 67563;
     }
 
@@ -97,6 +133,7 @@ static partial void ModifyBrotherhoodPvE(ref ActionSetting setting)
 
     static partial void ModifyRiddleOfFirePvE(ref ActionSetting setting)
     {
+        setting.StatusProvide = [StatusID.FiresRumination];
         setting.CreateConfig = () => new()
         {
             TimeToKill = 10,
@@ -113,11 +150,19 @@ static partial void ModifyThunderclapPvP(ref ActionSetting setting)
     {
         setting.SpecialType = SpecialActionType.MovingForward;
     }
+    static partial void ModifyInspiritedMeditationPvE(ref ActionSetting setting)
+    {
+        setting.UnlockedByQuestID = 66599;
+    }
+    static partial void ModifySteeledMeditationPvE(ref ActionSetting setting)
+    {
+        setting.UnlockedByQuestID = 66094;
+    }
 
-    // static partial void ModifyMeditationPvE(ref ActionSetting setting)
-    // {
-    //     setting.UnlockedByQuestID = 66094;
-    // }
+    static partial void ModifyForbiddenMeditationPvE(ref ActionSetting setting)
+    {
+         setting.UnlockedByQuestID = 67564;
+    }
 
     static partial void ModifyRockbreakerPvE(ref ActionSetting setting)
     {