Merge pull request #532 from FFXIV-CombatReborn/DancerCards

Update target priorities and add check in DancerRotation
FFXIV-CombatReborn · Jan 5, 2025 · 03fad28 · 03fad28
2 parents 0499a74 + 92ac091
commit 03fad28
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/RotationSolver.Basic/Actions/ActionTargetInfo.cs b/RotationSolver.Basic/Actions/ActionTargetInfo.cs
@@ -813,7 +813,7 @@ private readonly bool CanGetTarget(IGameObject target, IGameObject subTarget)
         IBattleChara? FindTheSpear()
         {
             // The Spear priority based on the info from The Balance Discord for Level 100 Dance Partner
-            Job[] TheSpearpriority = { Job.PCT, Job.SAM, Job.RPR, Job.VPR, Job.MNK, Job.NIN, Job.DRG, Job.PCT, Job.SAM, Job.BLM, Job.RDM, Job.SMN, Job.MCH, Job.BRD, Job.DNC };
+            Job[] TheSpearpriority = { Job.PCT, Job.SAM, Job.BLM, Job.RDM, Job.SMN, Job.MCH, Job.BRD, Job.DNC, Job.RPR, Job.VPR, Job.MNK, Job.NIN, Job.DRG };
 
             if (IGameObjects == null) return null;
 
@@ -847,7 +847,7 @@ private readonly bool CanGetTarget(IGameObject target, IGameObject subTarget)
         IBattleChara? FindTheBalance()
         {
             // The Balance priority based on the info from The Balance Discord for Level 100 Dance Partner
-            Job[] TheBalancepriority = { Job.PCT, Job.SAM, Job.BLM, Job.RDM, Job.SMN, Job.MCH, Job.BRD, Job.DNC, Job.RPR, Job.VPR, Job.MNK, Job.NIN, Job.DRG };
+            Job[] TheBalancepriority = { Job.RPR, Job.VPR, Job.MNK, Job.NIN, Job.DRG, Job.PCT, Job.SAM, Job.BLM, Job.RDM, Job.SMN, Job.MCH, Job.BRD, Job.DNC };
 
             if (IGameObjects == null) return null;
 

diff --git a/RotationSolver.Basic/Rotations/Basic/DancerRotation.cs b/RotationSolver.Basic/Rotations/Basic/DancerRotation.cs
@@ -204,7 +204,7 @@ static partial void ModifyClosedPositionPvE(ref ActionSetting setting)
     {
         setting.IsFriendly = true;
         setting.TargetType = TargetType.DancePartner;
-        setting.ActionCheck = () => !AllianceMembers.Any(b => b.HasStatus(true, StatusID.ClosedPosition_2026));
+        setting.ActionCheck = () => !IsDancing && !AllianceMembers.Any(b => b.HasStatus(true, StatusID.ClosedPosition_2026));
     }
 
     static partial void ModifyDevilmentPvE(ref ActionSetting setting)