Merge pull request #52 from FFXIV-CombatReborn/Smol-RDM-Fixes

RDM Changes to use mana things
FFXIV-CombatReborn · Jul 7, 2024 · 196e606 · 196e606
2 parents 4e13154 + d16860c
commit 196e606
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/BasicRotations/Magical/RDM_Default.cs b/BasicRotations/Magical/RDM_Default.cs
@@ -10,6 +10,9 @@ public sealed class RDM_Default : RedMageRotation
 
     [RotationConfig(CombatType.PvE, Name = "Use Vercure for Dualcast when out of combat.")]
     public bool UseVercure { get; set; }
+
+    [RotationConfig(CombatType.PvE, Name = "Cast Reprise when moving with no instacast.")]
+    public bool RangedSwordplay { get; set; } = false;
     #endregion
 
     #region Countdown Logic
@@ -92,11 +95,11 @@ protected override bool EmergencyGCD(out IAction? act)
 
         if (MoulinetPvE.CanUse(out act))
         {
-            if (BlackMana >= 60 && WhiteMana >= 60) return true;
+            if (BlackMana >= 60 && WhiteMana >= 60 || Player.HasStatus(true, StatusID.MagickedSwordplay)) return true;
         }
         else
         {
-            if (BlackMana >= 50 && WhiteMana >= 50 && RipostePvE.CanUse(out act)) return true;
+            if ((BlackMana >= 50 && WhiteMana >= 50 || Player.HasStatus(true, StatusID.MagickedSwordplay)) && RipostePvE.CanUse(out act)) return true;
         }
         if (ManaStacks > 0 && RipostePvE.CanUse(out act)) return true;
 
@@ -125,6 +128,8 @@ protected override bool GeneralGCD(out IAction? act)
 
         if (JoltPvE.CanUse(out act)) return true;
 
+        if (IsMoving && RangedSwordplay && ReprisePvE.CanUse(out act)) return true;
+
         if (UseVercure && NotInCombatDelay && VercurePvE.CanUse(out act)) return true;
 
         return base.GeneralGCD(out act);
@@ -136,7 +141,7 @@ private bool CanStartMeleeCombo
     {
         get
         {
-            if (Player.HasStatus(true, StatusID.Manafication, StatusID.Embolden) ||
+            if (Player.HasStatus(true, StatusID.Manafication, StatusID.Embolden, StatusID.MagickedSwordplay) ||
                              BlackMana == 100 || WhiteMana == 100) return true;
 
             if (BlackMana == WhiteMana) return false;

diff --git a/BasicRotations/RebornRotations.csproj b/BasicRotations/RebornRotations.csproj
@@ -9,7 +9,7 @@
     <None Remove="Duty\PVPRotations\**" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="RotationSolverReborn.Basic" Version="7.0.0.16" />
+    <PackageReference Include="RotationSolverReborn.Basic" Version="7.0.1.1" />
   </ItemGroup>
   <ItemGroup>
 	  <Reference Include="Dalamud">