fix: add Shield Bash for PLD.

ArchiDog1998 · Apr 20, 2023 · 3aab72c · 3aab72c
1 parent 9fd333d
commit 3aab72c
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 23 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -3,7 +3,7 @@
 		<TargetFramework>net7.0-windows</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Authors>ArchiTed</Authors>
-		<Version>2.3.3</Version>
+		<Version>2.3.3.1</Version>
 		<PlatformTarget>x64</PlatformTarget>
 		<Platforms>AnyCPU</Platforms>
 

diff --git a/RotationSolver.Basic/Actions/BaseAction_Target.cs b/RotationSolver.Basic/Actions/BaseAction_Target.cs
@@ -34,7 +34,7 @@ private get
         init => _choiceTarget = value;
     }
 
-    public Func<IEnumerable<BattleChara>, IEnumerable<BattleChara>> FilterForHostiles { private get; init; } = null;
+    public Func<IEnumerable<BattleChara>, IEnumerable<BattleChara>> FilterForHostiles { get; init; } = null;
 
     public StatusID[] TargetStatus { get; init; } = null;
 

diff --git a/RotationSolver.Basic/Actions/IBaseAction.cs b/RotationSolver.Basic/Actions/IBaseAction.cs
@@ -51,6 +51,11 @@ public interface IBaseAction : IAction
         /// </summary>
         bool IsGeneralGCD { get; }
 
+        /// <summary>
+        /// The filter for hostiles.
+        /// </summary>
+        Func<IEnumerable<BattleChara>, IEnumerable<BattleChara>> FilterForHostiles { get; }
+
         /// <summary>
         /// Can I use this action at this time. It will check a lot of things.
         /// Level, Enabled, Action Status, MP, Player Status, Coll down, Combo, Moving (for casting), Charges, Target, etc.

diff --git a/RotationSolver.Basic/Data/ActionID.cs b/RotationSolver.Basic/Data/ActionID.cs
@@ -846,6 +846,8 @@ public enum ActionID : uint
 
     ShieldLob = 24,
 
+    ShieldBash = 16,
+
     FightOrFlight = 20,
 
     TotalEclipse = 7381,

diff --git a/RotationSolver.Basic/Rotations/Basic/PLD_Base.cs b/RotationSolver.Basic/Rotations/Basic/PLD_Base.cs
@@ -34,6 +34,12 @@ public abstract class PLD_Base : CustomRotation
         ActionCheck = b => !IsLastAction(IActionHelper.MovingActions),
     };
 
+    public static IBaseAction ShieldBash { get; } = new BaseAction(ActionID.ShieldBash, ActionOption.Timeline)
+    {
+        FilterForHostiles = LowBlow.FilterForHostiles,
+        ActionCheck = b => LowBlow.IsCoolingDown,
+    };
+
     public static IBaseAction FightOrFlight { get; } = new BaseAction(ActionID.FightOrFlight, ActionOption.Buff);
 
     public static IBaseAction TotalEclipse { get; } = new BaseAction(ActionID.TotalEclipse);

diff --git a/RotationSolver.Basic/Rotations/CustomRotation_Actions.cs b/RotationSolver.Basic/Rotations/CustomRotation_Actions.cs
@@ -107,54 +107,33 @@ internal RoleAction(ActionID actionID, JobRole[] roles, ActionOption option = Ac
         ActionCheck = BaseAction.TankDefenseSelf,
     };
 
-    /// <summary>
-    /// 挑衅
-    /// </summary>
     public static IBaseAction Provoke { get; } = new RoleAction(ActionID.Provoke, new JobRole[] { JobRole.Tank }, ActionOption.Timeline)
     {
         FilterForHostiles = b => TargetFilter.ProvokeTarget(b),
     };
 
-    /// <summary>
-    /// 雪仇
-    /// </summary>
     public static IBaseAction Reprisal { get; } = new RoleAction(ActionID.Reprisal, new JobRole[] { JobRole.Tank }, ActionOption.Defense);
 
-    /// <summary>
-    /// 退避
-    /// </summary>
     public static IBaseAction Shirk { get; } = new RoleAction(ActionID.Shirk, new JobRole[] { JobRole.Tank }, ActionOption.Friendly | ActionOption.Timeline)
     {
         ChoiceTarget = (friends, mustUse) => TargetFilter.GetJobCategory(friends, JobRole.Tank)?.FirstOrDefault(),
     };
 
-    /// <summary>
-    /// 浴血
-    /// </summary>
     public static IBaseAction Bloodbath { get; } = new RoleAction(ActionID.Bloodbath, new JobRole[] { JobRole.Melee }, ActionOption.Heal)
     {
         ActionCheck = SecondWind.ActionCheck,
     };
 
-    /// <summary>
-    /// 牵制
-    /// </summary>
     public static IBaseAction Feint { get; } = new RoleAction(ActionID.Feint, new JobRole[] { JobRole.Melee }, ActionOption.Defense)
     {
         ActionCheck = b => !b.HasStatus(false, StatusID.Feint),
     };
 
-    /// <summary>
-    /// 插言
-    /// </summary>
     public static IBaseAction Interject { get; } = new RoleAction(ActionID.Interject, new JobRole[] { JobRole.Tank })
     {
         FilterForHostiles = b => b.Where(ObjectHelper.CanInterrupt),
     };
 
-    /// <summary>
-    /// 下踢
-    /// </summary>
     public static IBaseAction LowBlow { get; } = new RoleAction(ActionID.LowBlow, new JobRole[] { JobRole.Tank })
     {
         FilterForHostiles = bs => bs.Where(b =>