Merge pull request #619 from FFXIV-CombatReborn/MCHhyper

Low level Hypercharge fix, engagement style removal
FFXIV-CombatReborn · Feb 27, 2025 · 9205b44 · 9205b44
2 parents 671a962 + 5f1a066
commit 9205b44
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 10 deletions.
diff --git a/BasicRotations/Ranged/MCH_Default.cs b/BasicRotations/Ranged/MCH_Default.cs
@@ -85,6 +85,9 @@ protected override bool AttackAbility(IAction nextGCD, out IAction? act)
         // If Wildfire is active, use Hypercharge.....Period
         if (Player.HasStatus(true, StatusID.Wildfire_1946) && HyperchargePvE.CanUse(out act)) return true;
 
+        // If you cant use Wildfire, use Hypercharge freely
+        if (!WildfirePvE.EnoughLevel && HyperchargePvE.CanUse(out act)) return true;
+
         // Start Ricochet/Gauss cooldowns rolling
         if (!RicochetPvE.Cooldown.IsCoolingDown && RicochetPvE.CanUse(out act)) return true;
         if (!GaussRoundPvE.Cooldown.IsCoolingDown && GaussRoundPvE.CanUse(out act)) return true;

diff --git a/BasicRotations/Ranged/MCH_HighEnd.cs b/BasicRotations/Ranged/MCH_HighEnd.cs
@@ -88,6 +88,9 @@ protected override bool AttackAbility(IAction nextGCD, out IAction? act)
         // If Wildfire is active, use Hypercharge.....Period
         if (Player.HasStatus(true, StatusID.Wildfire_1946) && HyperchargePvE.CanUse(out act)) return true;
 
+        // If you cant use Wildfire, use Hypercharge freely
+        if (!WildfirePvE.EnoughLevel && HyperchargePvE.CanUse(out act)) return true;
+
         // don't do anything that might fuck with burst timings at 100
         if (nextGCD.IsTheSameTo(true, FullMetalFieldPvE) || IsLastGCD(true, FullMetalFieldPvE))
         {

diff --git a/ECommons b/ECommons
diff --git a/RotationSolver.Basic/Helpers/ObjectHelper.cs b/RotationSolver.Basic/Helpers/ObjectHelper.cs
@@ -141,9 +141,10 @@ internal static bool IsAttackable(this IBattleChara battleChara)
             TargetHostileType.AllTargetsWhenSolo => DataCenter.PartyMembers.Count == 1 || battleChara.TargetObject is IBattleChara,
             TargetHostileType.AllTargetsWhenSoloInDuty => (DataCenter.PartyMembers.Count == 1 && (Svc.Condition[ConditionFlag.BoundByDuty] || Svc.Condition[ConditionFlag.BoundByDuty56]))
                                 || battleChara.TargetObject is IBattleChara,
-            TargetHostileType.TargetIsInEnemiesList => battleChara.TargetObject is IBattleChara target && target.IsInEnemiesList(),
-            TargetHostileType.AllTargetsWhenSoloTargetIsInEnemiesList => (DataCenter.PartyMembers.Count == 1 && (Svc.Condition[ConditionFlag.BoundByDuty] || Svc.Condition[ConditionFlag.BoundByDuty56])) || battleChara.TargetObject is IBattleChara target && target.IsInEnemiesList(),
-            TargetHostileType.AllTargetsWhenSoloInDutyTargetIsInEnemiesList => DataCenter.PartyMembers.Count == 1 || battleChara.TargetObject is IBattleChara target && target.IsInEnemiesList(),
+            //Below options do not work while in party, isAttackable will always return false
+            //TargetHostileType.TargetIsInEnemiesList => battleChara.TargetObject is IBattleChara target && target.IsInEnemiesList(),
+            //TargetHostileType.AllTargetsWhenSoloTargetIsInEnemiesList => (DataCenter.PartyMembers.Count == 1 && (Svc.Condition[ConditionFlag.BoundByDuty] || Svc.Condition[ConditionFlag.BoundByDuty56])) || battleChara.TargetObject is IBattleChara target && target.IsInEnemiesList(),
+            //TargetHostileType.AllTargetsWhenSoloInDutyTargetIsInEnemiesList => DataCenter.PartyMembers.Count == 1 || battleChara.TargetObject is IBattleChara target && target.IsInEnemiesList(),
             _ => true,
         };
     }
@@ -166,7 +167,6 @@ private static string RemoveControlCharacters(string input)
         return output.ToString();
     }
 
-    //Below never returns true
     internal static unsafe bool IsInEnemiesList(this IBattleChara battleChara)
     {
         var addons = Service.GetAddons<AddonEnemyList>();

diff --git a/RotationSolver/Updaters/TargetUpdater.cs b/RotationSolver/Updaters/TargetUpdater.cs
@@ -13,7 +13,7 @@ private static readonly ObjectListDelay<IBattleChara>
         _raiseAllTargets = new(() => Service.Config.RaiseDelay);
 
     private static DateTime _lastUpdateTimeToKill = DateTime.MinValue;
-    private static readonly TimeSpan TimeToKillUpdateInterval = TimeSpan.FromSeconds(0.5);
+    private static readonly TimeSpan TimeToKillUpdateInterval = TimeSpan.FromSeconds(0.1);
 
     internal static void UpdateTargets()
     {
@@ -187,10 +187,10 @@ private static List<IBattleChara> GetAllHostileTargets()
         {
             try
             {
-                var deathParty = DataCenter.PartyMembers?.GetDeath().ToList() ?? new List<IBattleChara>();
-                var deathAll = DataCenter.AllTargets?.GetDeath().ToList() ?? new List<IBattleChara>();
-                var deathNPC = DataCenter.FriendlyNPCMembers?.GetDeath().ToList() ?? new List<IBattleChara>();
-                var deathAllianceMembers = DataCenter.AllianceMembers?.GetDeath().ToList() ?? new List<IBattleChara>();
+                var deathParty = DataCenter.PartyMembers?.GetDeath().ToList() ?? [];
+                var deathAll = DataCenter.AllTargets?.GetDeath().ToList() ?? [];
+                var deathNPC = DataCenter.FriendlyNPCMembers?.GetDeath().ToList() ?? [];
+                var deathAllianceMembers = DataCenter.AllianceMembers?.GetDeath().ToList() ?? [];
                 var deathAllianceHealers = new List<IBattleChara>(deathParty);
                 var deathAllianceSupports = new List<IBattleChara>(deathParty);
+60 −0		ECommons/Automation/WindowsKeypress.cs
+3 −2		ECommons/EzCmd.cs
+8 −8		ECommons/EzIpcManager/EzIPC.cs
+2 −1		ECommons/GameFunctions/ObjectFunctions.cs
+96 −49		ECommons/ImGuiMethods/ImGuiEx/ImGuiEx.cs
+5 −4		ECommons/Interop/OpenFileDialog.cs
+15 −5		ECommons/Singletons/SingletonServiceManager.cs
+2 −2		ECommons/UIHelpers/AddonMasterImplementations/RelicNoteBook.cs
+10 −7		README.md