fix: fixed AST api.

ArchiDog1998 · Jun 24, 2023 · 50a502f · 50a502f
1 parent 4e27a7f
commit 50a502f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/Resources/HostileCastingArea.json b/Resources/HostileCastingArea.json
@@ -4,6 +4,7 @@
   1365,
   1688,
   2225,
+  2317,
   2375,
   2398,
   3282,
@@ -106,6 +107,7 @@
   26450,
   26451,
   27742,
+  28033,
   28446,
   28474,
   28476,
@@ -115,6 +117,7 @@
   28512,
   28527,
   28528,
+  28779,
   28825,
   28827,
   28833,
@@ -126,6 +129,8 @@
   29273,
   29281,
   29283,
+  29352,
+  29356,
   29561,
   29818,
   30134,

diff --git a/RotationSolver.Basic/Rotations/Basic/AST_Base.cs b/RotationSolver.Basic/Rotations/Basic/AST_Base.cs
@@ -102,8 +102,8 @@ public abstract class AST_Base : CustomRotation
     {
         ActionCheck = (b, m) =>
         {
-            if (JobGauge.Seals.Length != 3) return false;
-            if (JobGauge.Seals.Contains(SealType.NONE)) return false;
+            if (Seals.Length != 3) return false;
+            if (Seals.Contains(SealType.NONE)) return false;
             return true;
         },
     };
@@ -118,7 +118,8 @@ public abstract class AST_Base : CustomRotation
     public static IBaseAction Redraw { get; } = new BaseAction(ActionID.Redraw)
     {
         StatusNeed = new[] { StatusID.ClarifyingDraw },
-        ActionCheck = (b, m) => DrawnCard != CardType.NONE && Seals.Contains(GetCardSeal(DrawnCard)),
+        ActionCheck = (b, m) => DrawnCard != CardType.NONE && Seals.Contains(GetCardSeal(DrawnCard)) 
+        && !Astrodyne.ActionCheck(b, m),
     };
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ @@
 ,
 ,
 ,
+,
 ,
 ,
 ,
@@ Expand Down Expand Up / @@ -106,6 +107,7 @@ @@
 ,
 ,
 ,
+,
 ,
 ,
 ,
@@ Expand All / @@ -115,6 +117,7 @@ @@
 ,
 ,
 ,
+,
 ,
 ,
 ,
@@ Expand All / @@ -126,6 +129,8 @@ @@
 ,
 ,
 ,
+,
+,
 ,
 ,
 ,
@@ Expand Down @@