Merge pull request #843 from FFXIV-CombatReborn/FFhotfixUpdate

MNK and VPR update, update for FFXIV hotfix

Author: LTS-FFXIV

BasicRotations/Melee/MNK_Default.cs

@@ -525,7 +525,7 @@ protected override bool GeneralGCD(out IAction? act)
         //if (Player.StatusStack(true, StatusID.PerfectBalance) == 3 && OpoOpoForm(out act)) return true;
 
         // Gain Solar Nadi through 3 different forms
-        if (HasPerfectBalance && !HasSolar)
+        if (HasPerfectBalance && !HasSolar && EnhancedPerfectBalanceTrait.EnoughLevel)
         {
             if (!BeastChakras.Contains(BeastChakra.Raptor) && RaptorForm(out act))
             {
@@ -544,7 +544,7 @@ protected override bool GeneralGCD(out IAction? act)
         }
 
         // Gain Lunar Nadi through 3 opopo form actions
-        if (HasPerfectBalance && HasSolar)
+        if (HasPerfectBalance && HasSolar && EnhancedPerfectBalanceTrait.EnoughLevel)
         {
             if (OpoOpoForm(out act))
             {
@@ -553,7 +553,7 @@ protected override bool GeneralGCD(out IAction? act)
         }
 
         // only allow free usage of forms if you dont have perfect balance/it was not the last ability used
-        if (!HasPerfectBalance && !IsLastAbility(true, PerfectBalancePvE))
+        if ((!HasPerfectBalance && !IsLastAbility(true, PerfectBalancePvE)) || !EnhancedPerfectBalanceTrait.EnoughLevel)
         {
             // whatever you have, press it from left to right
             if (CoerlForm(out act))

BasicRotations/Melee/VPR_Default.cs

@@ -391,6 +391,97 @@ protected override bool GeneralGCD(out IAction? act)
             }
         }
 
+        //AOE Serpent Combo
+        // aoe 3
+        switch ((HasGrimHunter, HasGrimSkin))
+        {
+            case (true, _):
+                if (JaggedMawPvE.CanUse(out act, skipAoeCheck: true, skipStatusProvideCheck: true, skipComboCheck: true))
+                    return true;
+                break;
+            case (_, true):
+                if (BloodiedMawPvE.CanUse(out act, skipAoeCheck: true, skipStatusProvideCheck: true, skipComboCheck: true))
+                    return true;
+                break;
+            case (false, false):
+                if (JaggedMawPvE.CanUse(out act, skipAoeCheck: true, skipStatusProvideCheck: true, skipComboCheck: true))
+                    return true;
+                if (BloodiedMawPvE.CanUse(out act, skipAoeCheck: true, skipStatusProvideCheck: true, skipComboCheck: true))
+                    return true;
+                break;
+        }
+
+        // aoe 2
+        if (SwiftskinsBitePvE.EnoughLevel)
+        {
+            if (HasHunterAndSwift)
+            {
+                switch (HunterOrSwiftEndsFirst)
+                {
+                    case "Hunter":
+                        if (HuntersBitePvE.CanUse(out act, skipStatusProvideCheck: true, skipComboCheck: true))
+                            return true;
+                        break;
+                    case "Swift":
+                        if (SwiftskinsBitePvE.CanUse(out act, skipStatusProvideCheck: true, skipComboCheck: true))
+                            return true;
+                        break;
+                    case "Equal":
+                        if (SwiftskinsBitePvE.CanUse(out act, skipStatusProvideCheck: true, skipComboCheck: true))
+                            return true;
+                        break;
+                }
+            }
+
+            if (!HasHunterAndSwift)
+            {
+                if (!IsHunter && !IsSwift)
+                {
+                    if (SwiftskinsBitePvE.CanUse(out act, skipStatusProvideCheck: true, skipComboCheck: true))
+                    {
+                        return true;
+                    }
+                }
+
+                if (!IsSwift)
+                {
+                    if (SwiftskinsBitePvE.CanUse(out act, skipStatusProvideCheck: true, skipComboCheck: true))
+                    {
+                        return true;
+                    }
+                }
+
+                if (!IsHunter)
+                {
+                    if (HuntersBitePvE.CanUse(out act, skipStatusProvideCheck: true, skipComboCheck: true))
+                        return true;
+                }
+            }
+        }
+        if (!SwiftskinsBitePvE.EnoughLevel)
+        {
+            if (HuntersBitePvE.CanUse(out act, skipStatusProvideCheck: true, skipComboCheck: true))
+                return true;
+        }
+        // aoe 1
+        switch ((HasSteel, HasReavers))
+        {
+            case (true, _):
+                if (SteelMawPvE.CanUse(out act))
+                    return true;
+                break;
+            case (_, true):
+                if (ReavingMawPvE.CanUse(out act))
+                    return true;
+                break;
+            case (false, false):
+                if (ReavingMawPvE.CanUse(out act))
+                    return true;
+                if (SteelMawPvE.CanUse(out act))
+                    return true;
+                break;
+        }
+
         ////Single Target Dread Combo
         // Try using Coil thats buff provided will end soon
         // then try using Coil that you can hit positional on
@@ -501,63 +592,6 @@ protected override bool GeneralGCD(out IAction? act)
             }
         }
 
-        //AOE Serpent Combo
-        // aoe 3
-        switch ((HasGrimHunter, HasGrimSkin))
-        {
-            case (true, _):
-                if (JaggedMawPvE.CanUse(out act, skipAoeCheck: true))
-                    return true;
-                break;
-            case (_, true):
-                if (BloodiedMawPvE.CanUse(out act, skipAoeCheck: true))
-                    return true;
-                break;
-            case (false, false):
-                if (JaggedMawPvE.CanUse(out act, skipAoeCheck: true))
-                    return true;
-                if (BloodiedMawPvE.CanUse(out act, skipAoeCheck: true))
-                    return true;
-                break;
-        }
-        // aoe 2
-        switch (HunterOrSwiftEndsFirst)
-        {
-            case "Hunter":
-                if (HuntersBitePvE.CanUse(out act, skipStatusProvideCheck: true))
-                    return true;
-                break;
-            case "Swift":
-                if (SwiftskinsBitePvE.CanUse(out act, skipStatusProvideCheck: true))
-                    return true;
-                break;
-            case "Equal":
-            case null:
-                if (HuntersBitePvE.CanUse(out act, skipStatusProvideCheck: true))
-                    return true;
-                if (SwiftskinsBitePvE.CanUse(out act, skipStatusProvideCheck: true))
-                    return true;
-                break;
-        }
-        // aoe 1
-        switch ((HasSteel, HasReavers))
-        {
-            case (true, _):
-                if (SteelMawPvE.CanUse(out act))
-                    return true;
-                break;
-            case (_, true):
-                if (ReavingMawPvE.CanUse(out act))
-                    return true;
-                break;
-            case (false, false):
-                if (ReavingMawPvE.CanUse(out act))
-                    return true;
-                if (SteelMawPvE.CanUse(out act))
-                    return true;
-                break;
-        }
-
         //Single Target Serpent Combo
         // st 3
         switch ((HasHindstung, HasHindsbane, HasFlankstung, HasFlanksbane))