Merge pull request #471 from ShalolaAuthor/main

also include lady and crown
FFXIV-CombatReborn · Dec 14, 2024 · 2418910 · 2418910
2 parents e09ac2d + 92e8da4
commit 2418910
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/RotationSolver.Basic/Rotations/Basic/AstrologianRotation.cs b/RotationSolver.Basic/Rotations/Basic/AstrologianRotation.cs
@@ -43,6 +43,16 @@ partial class AstrologianRotation
     /// </summary>
     public static bool HasSpire => DrawnCard.Any(card => card == CardType.SPIRE);
 
+    /// <summary>
+    /// 
+    /// </summary>
+    public static bool HasLord => DrawnCard.Any(card => card == CardType.LORD);
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public static bool HasLady => DrawnCard.Any(card => card == CardType.LADY);
+
     /// <summary>
     /// Indicates the state of Minor Arcana and which card will be used next when activating Minor Arcana, LORD = 7, LADY = 8
     /// </summary>
@@ -302,7 +312,7 @@ static partial void ModifyMinorArcanaPvE(ref ActionSetting setting)
 
     static partial void ModifyLordOfCrownsPvE(ref ActionSetting setting)
     {
-        setting.ActionCheck = () => DrawnCrownCard == CardType.LORD;
+        setting.ActionCheck = () => HasLord;
         setting.IsFriendly = false;
         setting.CreateConfig = () => new ActionConfig()
         {
@@ -313,7 +323,7 @@ static partial void ModifyLordOfCrownsPvE(ref ActionSetting setting)
 
     static partial void ModifyLadyOfCrownsPvE(ref ActionSetting setting)
     {
-        setting.ActionCheck = () => DrawnCrownCard == CardType.LADY;
+        setting.ActionCheck = () => HasLady;
         setting.IsFriendly = true;
         setting.CreateConfig = () => new ActionConfig()
         {