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

Commit

Permalink
Merge pull request #54 from FFXIV-CombatReborn/Anyones-RDM-request
Browse files Browse the repository at this point in the history
Add melee config to RDM and fixed paladin level check
  • Loading branch information
Tykku authored Jul 7, 2024
2 parents 196e606 + 6ec86bb commit 84d70bf
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
9 changes: 9 additions & 0 deletions BasicRotations/Magical/RDM_Default.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ public sealed class RDM_Default : RedMageRotation

[RotationConfig(CombatType.PvE, Name = "Cast Reprise when moving with no instacast.")]
public bool RangedSwordplay { get; set; } = false;

[RotationConfig(CombatType.PvE, Name = "DO NOT CAST EMBOLDEN/MANAFICATION OUTSIDE OF MELEE RANGE, I'M SERIOUS YOU HAVE TO MOVE UP FOR IT TO WORK IF THIS IS ON.")]
public bool AnyonesMeleeRule { get; set; } = false;
#endregion

#region Countdown Logic
Expand All @@ -33,9 +36,15 @@ public sealed class RDM_Default : RedMageRotation
#region oGCD Logic
protected override bool EmergencyAbility(IAction nextGCD, out IAction? act)
{
bool AnyoneInRange = AllHostileTargets.Any(hostile => hostile.DistanceToPlayer() <= 4);

act = null;
if (CombatElapsedLess(4)) return false;
if (AnyonesMeleeRule)
{
if (IsBurst && AnyoneInRange && HasHostilesInRange && EmboldenPvE.CanUse(out act, skipAoeCheck: true)) return true;

}
if (IsBurst && HasHostilesInRange && EmboldenPvE.CanUse(out act, skipAoeCheck: true)) return true;

//Use Manafication after embolden.
Expand Down
6 changes: 3 additions & 3 deletions BasicRotations/Tank/PLD_Default.cs
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,9 @@ protected override bool GeneralGCD(out IAction? act)

if (Player.HasStatus(true, StatusID.Requiescat))
{
if (BladeOfValorPvE.CanUse(out act, skipAoeCheck: true)) return true;
if (BladeOfTruthPvE.CanUse(out act, skipAoeCheck: true)) return true;
if (BladeOfFaithPvE.CanUse(out act, skipAoeCheck: true)) return true;
if (BladeOfFaithPvE.EnoughLevel && BladeOfValorPvE.CanUse(out act, skipAoeCheck: true)) return true;
if (BladeOfFaithPvE.EnoughLevel && BladeOfTruthPvE.CanUse(out act, skipAoeCheck: true)) return true;
if (BladeOfFaithPvE.EnoughLevel && BladeOfFaithPvE.CanUse(out act, skipAoeCheck: true)) return true;
if (ConfiPvE.CanUse(out act, skipAoeCheck: true)) return true;
if (HolyCirclePvE.CanUse(out act)) return true;
if (HolySpiritPvE.CanUse(out act)) return true;
Expand Down

0 comments on commit 84d70bf

Please sign in to comment.