Skip to content
This repository has been archived by the owner on Aug 28, 2024. It is now read-only.

Commit

Permalink
fix: simplify code.
Browse files Browse the repository at this point in the history
  • Loading branch information
ArchiDog1998 committed Jul 25, 2023
1 parent ee12f37 commit 926381c
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 18 deletions.
11 changes: 10 additions & 1 deletion Resources/HostileCastingArea.json
Original file line number Diff line number Diff line change
Expand Up @@ -296,5 +296,14 @@
8167,
6893,
6124,
6137
6137,
6195,
6181,
6088,
6090,
6085,
6091,
6229,
6453,
6178
]
5 changes: 0 additions & 5 deletions RotationSolver.Basic/Actions/BaseAction_BasicInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,6 @@ public partial class BaseAction : IBaseAction
/// </summary>
public bool ShouldEndSpecial => _option.HasFlag(ActionOption.EndSpecial);

/// <summary>
/// Can be used in the Action Sequencer.
/// </summary>
public bool IsActionSequencer => _option.HasFlag(ActionOption.ActionSequencer) && IsFriendly;

/// <summary>
/// Has a normal gcd action.
/// </summary>
Expand Down
11 changes: 3 additions & 8 deletions RotationSolver.Basic/Data/ActionOption.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,20 +26,15 @@ public enum ActionOption : byte
/// </summary>
EndSpecial = 1 << 2,

/// <summary>
/// should I put it to the Action Sequencer (Doesn't affect dps much)
/// </summary>
ActionSequencer = 1 << 3,

/// <summary>
/// Is a GCD action.
/// </summary>
GeneralGCD = 1 << 4,
GeneralGCD = 1 << 3,

/// <summary>
/// Is a simple gcd action, without other cooldown.
/// </summary>
RealGCD = 1 << 5,
RealGCD = 1 << 4,

/// <summary>
/// Dot action
Expand All @@ -54,7 +49,7 @@ public enum ActionOption : byte
/// <summary>
/// Heal action
/// </summary>
Heal = Friendly | ActionSequencer,
Heal = Friendly,

/// <summary>
/// Defense action (you need to change the targeting strategy.
Expand Down
2 changes: 1 addition & 1 deletion RotationSolver.Basic/Rotations/Basic/PLD_Base.cs
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public abstract class PLD_Base : CustomRotation
/// <summary>
///
/// </summary>
public static IBaseAction ShieldBash { get; } = new BaseAction(ActionID.ShieldBash, ActionOption.ActionSequencer)
public static IBaseAction ShieldBash { get; } = new BaseAction(ActionID.ShieldBash)
{
FilterForHostiles = LowBlow.FilterForHostiles,
ActionCheck = (b, m) => LowBlow.IsCoolingDown,
Expand Down
6 changes: 3 additions & 3 deletions RotationSolver.Basic/Rotations/CustomRotation_Actions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -110,20 +110,20 @@ internal RoleAction(ActionID actionID, JobRole[] roles, ActionOption option = Ac
/// <summary>
///
/// </summary>
public static IBaseAction Provoke { get; } = new RoleAction(ActionID.Provoke, new JobRole[] { JobRole.Tank }, ActionOption.ActionSequencer)
public static IBaseAction Provoke { get; } = new RoleAction(ActionID.Provoke, new JobRole[] { JobRole.Tank })
{
FilterForHostiles = b => TargetFilter.ProvokeTarget(b),
};

/// <summary>
///
/// </summary>
public static IBaseAction Reprisal { get; } = new RoleAction(ActionID.Reprisal, new JobRole[] { JobRole.Tank }, ActionOption.ActionSequencer);
public static IBaseAction Reprisal { get; } = new RoleAction(ActionID.Reprisal, new JobRole[] { JobRole.Tank });

/// <summary>
///
/// </summary>
public static IBaseAction Shirk { get; } = new RoleAction(ActionID.Shirk, new JobRole[] { JobRole.Tank }, ActionOption.Friendly | ActionOption.ActionSequencer)
public static IBaseAction Shirk { get; } = new RoleAction(ActionID.Shirk, new JobRole[] { JobRole.Tank }, ActionOption.Friendly)
{
ChoiceTarget = (friends, mustUse) => TargetFilter.GetJobCategory(friends, JobRole.Tank)?.FirstOrDefault(),
};
Expand Down

0 comments on commit 926381c

Please sign in to comment.