diff --git a/BasicRotations/Ranged/MCH_Default.cs b/BasicRotations/Ranged/MCH_Default.cs index 343d8391..f221afdb 100644 --- a/BasicRotations/Ranged/MCH_Default.cs +++ b/BasicRotations/Ranged/MCH_Default.cs @@ -26,6 +26,9 @@ public sealed class MCH_Default : MachinistRotation [RotationConfig(CombatType.PvE, Name = "Prevent the use of defense abilties during hypercharge burst")] private bool BurstDefense { get; set; } = false; + + [RotationConfig(CombatType.PvE, Name = "Use Bioblaster while moving")] + private bool BioMove { get; set; } = true; #endregion #region Countdown logic @@ -131,7 +134,7 @@ protected override bool GeneralGCD(out IAction? act) if (HeatBlastPvE.CanUse(out act)) return true; // drill's aoe version - if (BioblasterPvE.CanUse(out act, usedUp: true)) return true; + if ((BioMove || (!IsMoving && !BioMove)) && BioblasterPvE.CanUse(out act, usedUp: true)) return true; // single target --- need to update this strange condition writing!!! if (!SpreadShotPvE.CanUse(out _)) diff --git a/BasicRotations/Ranged/MCH_HighEnd.cs b/BasicRotations/Ranged/MCH_HighEnd.cs index 15e5a142..db5e3e62 100644 --- a/BasicRotations/Ranged/MCH_HighEnd.cs +++ b/BasicRotations/Ranged/MCH_HighEnd.cs @@ -14,6 +14,9 @@ public sealed class MCH_HighEnd : MachinistRotation [RotationConfig(CombatType.PvE, Name = "Use burst medicine midfight when Air Anchor, Barrel Stabilizer, and Wildfire are about to come off cooldown")] private bool MidfightBurstMeds { get; set; } = false; + + [RotationConfig(CombatType.PvE, Name = "Use Bioblaster while moving")] + private bool BioMove { get; set; } = true; #endregion private const float HYPERCHARGE_DURATION = 8f; @@ -147,7 +150,7 @@ protected override bool GeneralGCD(out IAction? act) if (HeatBlastPvE.CanUse(out act)) return true; // drill's aoe version - if (BioblasterPvE.CanUse(out act, usedUp: true)) return true; + if ((BioMove || (!IsMoving && !BioMove)) && BioblasterPvE.CanUse(out act, usedUp: true)) return true; // single target --- need to update this strange condition writing!!! if (!SpreadShotPvE.CanUse(out _)) diff --git a/ECommons b/ECommons index 3d56bab9..a1df6434 160000 --- a/ECommons +++ b/ECommons @@ -1 +1 @@ -Subproject commit 3d56bab99a34e0af322015c74600a6e95fd68766 +Subproject commit a1df6434ddac33eab306b3f4f605f59f0d0a7279 diff --git a/RotationSolver/UI/RotationConfigWindow.cs b/RotationSolver/UI/RotationConfigWindow.cs index bc384386..f6216ad7 100644 --- a/RotationSolver/UI/RotationConfigWindow.cs +++ b/RotationSolver/UI/RotationConfigWindow.cs @@ -2814,7 +2814,9 @@ private static unsafe void DrawStatus() foreach (var status in Player.Object.StatusList) { var source = status.SourceId == Player.Object.GameObjectId ? "You" : Svc.Objects.SearchById(status.SourceId) == null ? "None" : "Others"; - ImGui.Text($"{status.GameData.Value.Name}: {status.StatusId} From: {source}"); + byte stacks = Player.Object.StatusStack(true, (StatusID)status.StatusId); + string stackDisplay = stacks == byte.MaxValue ? "N/A" : stacks.ToString(); // Convert 255 to "N/A" + ImGui.Text($"{status.GameData.Value.Name}: {status.StatusId} From: {source} Stacks: {stackDisplay}"); } }