fix: make all tank stance can end the special duration.

ArchiDog1998 · May 14, 2023 · 5e11739 · 5e11739
1 parent e5613f5
commit 5e11739
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 11 deletions.
diff --git a/Resources/AnimationLockTime.json b/Resources/AnimationLockTime.json
@@ -218,6 +218,9 @@
   "17209": 0.6,
   "17215": 0.1,
   "17527": 2.1,
+  "17841": 2.1,
+  "17842": 2.1,
+  "17843": 2.1,
   "19002": 0.6,
   "19004": 0.6,
   "19010": 0.6,
@@ -226,7 +229,10 @@
   "20243": 0.1,
   "20542": 2.1,
   "21054": 2.1,
+  "21206": 0.6,
   "21910": 2.1,
+  "22185": 0.6,
+  "22189": 0.6,
   "22411": 1.1,
   "22605": 2.1,
   "24222": 2.1,
@@ -265,6 +271,7 @@
   "24387": 0.6,
   "24393": 0.6,
   "24405": 0.6,
+  "24628": 2.1,
   "25751": 0.6,
   "25752": 0.6,
   "25753": 1.15,
@@ -301,6 +308,7 @@
   "25870": 0.6,
   "25885": 0.6,
   "26798": 2.1,
+  "26802": 2.1,
   "31323": 2.1,
   "33041": 2.1
 }
diff --git a/Resources/HostileCastingArea.json b/Resources/HostileCastingArea.json
@@ -56,6 +56,15 @@
   28512,
   28527,
   28528,
+  28825,
+  28827,
+  28833,
+  28837,
+  28854,
+  28904,
+  28905,
+  29046,
+  29561,
   29818,
   30134,
   30140,

diff --git a/RotationSolver.Basic/Rotations/Basic/DRK_Base.cs b/RotationSolver.Basic/Rotations/Basic/DRK_Base.cs
@@ -115,12 +115,7 @@ protected static bool ShadowTimeEndAfterGCD(uint gctCount = 0, float offset = 0)
 
     #region Heal Single
     private sealed protected override IBaseAction TankStance => Grit;
-    public static IBaseAction Grit { get; } = new BaseAction(ActionID.Grit, ActionOption.EndSpecial);
-    #endregion
-
-    #region Support
-    public static IBaseAction BloodWeapon { get; } = new BaseAction(ActionID.BloodWeapon);
-
+    public static IBaseAction Grit { get; } = new BaseAction(ActionID.Grit, ActionOption.Defense | ActionOption.EndSpecial);
     #endregion
 
     #region Defense Single
@@ -155,6 +150,8 @@ protected static bool ShadowTimeEndAfterGCD(uint gctCount = 0, float offset = 0)
     #endregion
 
     #region Support
+    public static IBaseAction BloodWeapon { get; } = new BaseAction(ActionID.BloodWeapon);
+
     public static IBaseAction Delirium { get; } = new BaseAction(ActionID.Delirium);
     #endregion
 

diff --git a/RotationSolver.Basic/Rotations/Basic/GNB_Base.cs b/RotationSolver.Basic/Rotations/Basic/GNB_Base.cs
@@ -116,9 +116,6 @@ public abstract class GNB_Base : CustomRotation
     #endregion
 
     #region Heal
-    private sealed protected override IBaseAction TankStance => RoyalGuard;
-    public static IBaseAction RoyalGuard { get; } = new BaseAction(ActionID.RoyalGuard, ActionOption.EndSpecial);
-
     public static IBaseAction Aurora { get; } = new BaseAction(ActionID.Aurora, ActionOption.Heal)
     {
         TargetStatus = new StatusID[] { StatusID.Aurora },
@@ -148,6 +145,9 @@ public abstract class GNB_Base : CustomRotation
     #endregion
 
     #region Support
+    private sealed protected override IBaseAction TankStance => RoyalGuard;
+    public static IBaseAction RoyalGuard { get; } = new BaseAction(ActionID.RoyalGuard, ActionOption.Defense | ActionOption.EndSpecial);
+
     public static IBaseAction NoMercy { get; } = new BaseAction(ActionID.NoMercy);
 
     public static IBaseAction BloodFest { get; } = new BaseAction(ActionID.BloodFest, ActionOption.Buff)

diff --git a/RotationSolver.Basic/Rotations/Basic/PLD_Base.cs b/RotationSolver.Basic/Rotations/Basic/PLD_Base.cs
@@ -99,7 +99,7 @@ public abstract class PLD_Base : CustomRotation
 
     public static IBaseAction FightOrFlight { get; } = new BaseAction(ActionID.FightOrFlight, ActionOption.Buff);
 
-    public static IBaseAction HallowedGround { get; } = new BaseAction(ActionID.HallowedGround, ActionOption.Defense);
+    public static IBaseAction HallowedGround { get; } = new BaseAction(ActionID.HallowedGround, ActionOption.Defense | ActionOption.EndSpecial);
 
     public static IBaseAction DivineVeil { get; } = new BaseAction(ActionID.DivineVeil, ActionOption.Defense);
 

diff --git a/RotationSolver.Basic/Rotations/Basic/WAR_Base.cs b/RotationSolver.Basic/Rotations/Basic/WAR_Base.cs
@@ -85,7 +85,7 @@ public abstract class WAR_Base : CustomRotation
     #region Heal
     private sealed protected override IBaseAction TankStance => Defiance;
 
-    public static IBaseAction Defiance { get; } = new BaseAction(ActionID.Defiance, ActionOption.Defense);
+    public static IBaseAction Defiance { get; } = new BaseAction(ActionID.Defiance, ActionOption.Defense | ActionOption.EndSpecial);
     #endregion
-Original file line number
+Diff line change
@@ Expand Up / @@ -56,6 +56,15 @@ @@
 ,
 ,
 ,
+,
+,
+,
+,
+,
+,
+,
+,
+,
 ,
 ,
 ,
@@ Expand Down @@