fix: add more variant actions.

ArchiDog1998 · Aug 8, 2023 · fc9f02f · fc9f02f
1 parent 793df6b
commit fc9f02f
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 0 deletions.
diff --git a/RotationSolver.Basic/Data/ActionID.cs b/RotationSolver.Basic/Data/ActionID.cs
@@ -3592,5 +3592,20 @@ public enum ActionID : uint
     /// 
     /// </summary>
     VariantRaise2 = 29734,
+
+    /// <summary>
+    /// 
+    /// </summary>
+    VariantCure2 = 33862,
+
+    /// <summary>
+    /// 
+    /// </summary>
+    VariantSpiritDart2 = 33863,
+
+    /// <summary>
+    /// 
+    /// </summary>
+    VariantRampart2 = 33864,
     #endregion
 }
diff --git a/RotationSolver.Basic/Rotations/CustomRotation_Ability.cs b/RotationSolver.Basic/Rotations/CustomRotation_Ability.cs
@@ -396,7 +396,9 @@ protected virtual bool GeneralAbility(out IAction act)
     protected virtual bool AttackAbility(out IAction act)
     {
         if (VariantSpiritDart.CanUse(out act)) return true;
+        if (VariantSpiritDart2.CanUse(out act)) return true;
         if (VariantRampart.CanUse(out act)) return true;
+        if (VariantRampart2.CanUse(out act)) return true;
         return false;
     }
 }
diff --git a/RotationSolver.Basic/Rotations/CustomRotation_Actions.cs b/RotationSolver.Basic/Rotations/CustomRotation_Actions.cs
@@ -235,6 +235,12 @@ internal RoleAction(ActionID actionID, JobRole[] roles, ActionOption option = Ac
     public static IBaseAction VariantCure { get; } = new RoleAction(ActionID.VariantCure,
         new JobRole[] { JobRole.Melee, JobRole.Tank, JobRole.Ranged }, ActionOption.Heal | ActionOption.DutyAction);
 
+    /// <summary>
+    /// 
+    /// </summary>
+    public static IBaseAction VariantCure2 { get; } = new RoleAction(ActionID.VariantCure2,
+        new JobRole[] { JobRole.Melee, JobRole.Tank, JobRole.Ranged }, ActionOption.Heal | ActionOption.DutyAction);
+
     /// <summary>
     /// 
     /// </summary>
@@ -244,11 +250,26 @@ internal RoleAction(ActionID actionID, JobRole[] roles, ActionOption option = Ac
         TargetStatus = new StatusID[] { StatusID.VariantSpiritDart },
     };
 
+    /// <summary>
+    /// 
+    /// </summary>
+    public static IBaseAction VariantSpiritDart2 { get; } = new RoleAction(ActionID.VariantSpiritDart2,
+        new JobRole[] { JobRole.Healer, JobRole.Tank }, ActionOption.Dot | ActionOption.DutyAction)
+    {
+        TargetStatus = new StatusID[] { StatusID.VariantSpiritDart },
+    };
+
     /// <summary>
     /// 
     /// </summary>
     public static IBaseAction VariantRampart { get; } = new RoleAction(ActionID.VariantRampart,
         new JobRole[] { JobRole.Melee, JobRole.Healer, JobRole.Ranged }, ActionOption.Buff | ActionOption.DutyAction);
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public static IBaseAction VariantRampart2 { get; } = new RoleAction(ActionID.VariantRampart2,
+        new JobRole[] { JobRole.Melee, JobRole.Healer, JobRole.Ranged }, ActionOption.Buff | ActionOption.DutyAction);
     #endregion
 
     IBaseAction[] _allBaseActions;

diff --git a/RotationSolver.Basic/Rotations/CustomRotation_GCD.cs b/RotationSolver.Basic/Rotations/CustomRotation_GCD.cs
@@ -131,6 +131,7 @@ protected virtual bool MoveForwardGCD(out IAction act)
     protected virtual bool HealSingleGCD(out IAction act)
     {
         if (VariantCure.CanUse(out act)) return true;
+        if (VariantCure2.CanUse(out act)) return true;
         return false;
     }