Merge pull request #831 from FFXIV-CombatReborn/MCHxFieldOP

Small hotfix for MCH Rework, other misc fixes

Author: LTS-FFXIV

BasicRotations/Ranged/MCH_Rework.cs

@@ -92,19 +92,28 @@ protected override bool AttackAbility(IAction nextGCD, out IAction? act)
             }
         }
 
-        if (HyperchargePvE.CanUse(out act))
+        if (HyperchargePvE.EnoughLevel)
         {
             if (!WildfirePvE.EnoughLevel)
             {
-                return true;
+                if (HyperchargePvE.CanUse(out act))
+                {
+                    return true;
+                }
             }
-            if (HasWildfire && !FullMetalFieldPvE.EnoughLevel)
+            if ((HasWildfire || (WildfirePvE.Cooldown.IsCoolingDown && Battery == 100)) && !FullMetalFieldPvE.EnoughLevel)
             {
-                return true;
+                if (HyperchargePvE.CanUse(out act))
+                {
+                    return true;
+                }
             }
             if (HasWildfire && FullMetalFieldPvE.EnoughLevel && IsLastAction(false, FullMetalFieldPvE))
             {
-                return true;
+                if (HyperchargePvE.CanUse(out act))
+                {
+                    return true;
+                }
             }
         }
 
@@ -144,7 +153,7 @@ protected override bool AttackAbility(IAction nextGCD, out IAction? act)
         }
         if (!FullMetalFieldPvE.EnoughLevel)
         {
-            if (WildfirePvE.Cooldown.WillHaveOneChargeGCD(1) && (IsLastAbility(false, HyperchargePvE) || Heat >= 50 || HasHypercharged) && ToolChargeSoon(out _) && !LowLevelHyperCheck)
+            if ((Heat >= 50 || HasHypercharged) && ToolChargeSoon(out _) && !LowLevelHyperCheck)
             {
                 if (WeaponRemain < GCDTime(1) / 2 && WildfirePvE.CanUse(out act))
                 {
@@ -232,7 +241,7 @@ protected override bool GeneralGCD(out IAction? act)
         if (!SpreadShotPvE.CanUse(out _))
         {
             // use AirAnchor if possible
-            if (AirAnchorPvE.CanUse(out act))
+            if (HotShotMasteryTrait.EnoughLevel && AirAnchorPvE.CanUse(out act))
             {
                 return true;
             }
@@ -242,6 +251,11 @@ protected override bool GeneralGCD(out IAction? act)
             {
                 return true;
             }
+
+            if (!HotShotMasteryTrait.EnoughLevel && HotShotPvE.CanUse(out act))
+            {
+                return true;
+            }
         }
 
         // ChainSaw is always used after Drill

RotationSolver.Basic/Configuration/Configs.cs

@@ -712,7 +712,7 @@ public const string
     [JobConfig, Range(0.05f, 0.25f, ConfigUnitType.Percent)]
     [UI("Action Ahead (Percent of your GCD time remaining on a GCD cycle before RSR will try to queue the next GCD)", Filter = BasicTimer,
     Description = "This setting controls how many oGCDs RSR will try to fit in a single GCD window\nLower numbers mean more oGCDs, but potentially more GCD clipping")]
-    private readonly float _action5head = 0.20f;
+    private readonly float _action6head = 0.25f;
 
     [JobConfig, UI("The HP for using Guard.",
         Filter = PvPSpecificControls)]

RotationSolver.Basic/DataCenter.cs

@@ -328,7 +328,7 @@ public static unsafe ushort PlayerFateId
     /// <summary>
     /// Calculates the action ahead time based on the default GCD total and minimum animation lock.
     /// </summary>
-    public static float CalculatedActionAhead => DefaultGCDTotal * Service.Config.Action5Head;
+    public static float CalculatedActionAhead => DefaultGCDTotal * Service.Config.Action6Head;
 
     /// <summary>
     /// Calculates the total GCD time for a given number of GCDs and an optional offset.

RotationSolver.Basic/Helpers/ObjectHelper.cs

@@ -2,6 +2,7 @@
 using Dalamud.Game.ClientState.Objects.Enums;
 using Dalamud.Game.ClientState.Objects.SubKinds;
 using ECommons;
+using ECommons.Automation.UIInput;
 using ECommons.DalamudServices;
 using ECommons.ExcelServices;
 using ECommons.GameFunctions;
@@ -166,23 +167,45 @@ internal static bool IsAttackable(this IBattleChara battleChara)
             }
         }
 
-        if (Service.Config.BozjaCEmobtargeting
-            && DataCenter.IsInBozjanFieldOp
-            && !DataCenter.IsInDelubrumNormal
-            && !DataCenter.IsInDelubrumSavage)
+        if (DataCenter.IsInBozjanFieldOp)
         {
             bool isInCE = DataCenter.IsInBozjanFieldOpCE;
 
-            // Prevent targeting mobs in Bozja CE if you are not in CE
-            if (battleChara.IsBozjanCEFateMob() && !isInCE)
+            if (isInCE)
             {
-                return false;
+                if (!battleChara.IsBozjanCEMob())
+                {
+                    return false;
+                }
             }
 
-            // Prevent targeting mobs out of Bozja CE if you are in CE
-            if (!battleChara.IsBozjanCEFateMob() && isInCE)
+            if (!isInCE)
             {
-                return false;
+                if (battleChara.IsBozjanCEMob())
+                {
+                    return false;
+                }
+            }
+        }
+
+        if (DataCenter.IsInOccultCrescentOp)
+        {
+            bool isInCE = Player.Object.GetEventType() == EventHandlerContent.PublicContentDirector;
+
+            if (isInCE)
+            {
+                if (!battleChara.IsOccultCEMob())
+                {
+                    return false;
+                }
+            }
+
+            if (!isInCE)
+            {
+                if (battleChara.IsOccultCEMob())
+                {
+                    return false;
+                }
             }
         }
 
@@ -225,14 +248,14 @@ internal static bool IsAttackable(this IBattleChara battleChara)
             };
     }
 
-    internal static bool IsBozjanCEFateMob(this IBattleChara battleChara)
+    internal static bool IsBozjanCEMob(this IBattleChara battleChara)
     {
         if (battleChara == null)
         {
             return false;
         }
 
-        if (battleChara.IsEnemy() == false)
+        if (!battleChara.IsEnemy())
         {
             return false;
         }
@@ -246,15 +269,14 @@ internal static bool IsBozjanCEFateMob(this IBattleChara battleChara)
         return battleChara.GetEventType() == EventHandlerContent.PublicContentDirector;
     }
 
-    // This exists because OC CEs can often have a large amount of players in them, and if you are not on AllTargetsCanAttack the mobs target may despawn due to object limit
     internal static bool IsOccultCEMob(this IBattleChara battleChara)
     {
         if (battleChara == null)
         {
             return false;
         }
 
-        if (battleChara.IsEnemy() == false)
+        if (!battleChara.IsEnemy())
         {
             return false;
         }

RotationSolver.Basic/Rotations/Basic/ViperRotation.cs

@@ -4,6 +4,17 @@ public partial class ViperRotation
 {
     /// <inheritdoc/>
     public override MedicineType MedicineType => MedicineType.Dexterity;
+
+    /// <inheritdoc/>
+    public override bool IsBursting()
+    {
+        if (HasHunterAndSwift)
+        {
+            return true;
+        }
+        return false;
+    }
+
     #region JobGauge
     /// <summary>
     /// Gets how many uses of uncoiled fury the player has.

RotationSolver/UI/RotationConfigWindow.cs

@@ -3814,7 +3814,7 @@ private static unsafe void DrawTargetData()
             ImGui.Spacing();
             ImGui.Text($"FateID: {battleChara.FateId().ToString() ?? string.Empty}");
             ImGui.Text($"EventType: {battleChara.GetEventType().ToString() ?? string.Empty}");
-            ImGui.Text($"IsBozjanCEFateMob: {battleChara.IsBozjanCEFateMob()}");
+            ImGui.Text($"IsBozjanCEFateMob: {battleChara.IsBozjanCEMob()}");
             ImGui.Spacing();
             ImGui.Text($"IsOccultCEMob: {battleChara.IsOccultCEMob()}");
             ImGui.Text($"IsOccultFateMob: {battleChara.IsOccultFateMob()}");