From dff919c8485213dfe6285dd6919a52355a44f156 Mon Sep 17 00:00:00 2001 From: LTS-FFXIV <127939494+LTS-FFXIV@users.noreply.github.com> Date: Wed, 18 Dec 2024 21:44:19 -0600 Subject: [PATCH] Changes to MNK, BRD, and chat feedback --- BasicRotations/Melee/MNK_Default.cs | 7 +++++-- BasicRotations/Ranged/BRD_Default.cs | 4 ++-- RotationSolver.Basic/Configuration/Configs.cs | 2 +- RotationSolver/Commands/RSCommands_OtherCommand.cs | 12 +++++++++--- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/BasicRotations/Melee/MNK_Default.cs b/BasicRotations/Melee/MNK_Default.cs index dc38c930d..fa1c5e61c 100644 --- a/BasicRotations/Melee/MNK_Default.cs +++ b/BasicRotations/Melee/MNK_Default.cs @@ -1,6 +1,6 @@ namespace DefaultRotations.Melee; -[Rotation("Default", CombatType.PvE, GameVersion = "7.00", Description = "Uses Lunar Solar Opener from The Balance")] +[Rotation("Default", CombatType.PvE, GameVersion = "7.15", Description = "Uses Lunar Solar Opener from The Balance")] [SourceCode(Path = "main/BasicRotations/Melee/MNK_Default.cs")] [Api(4)] @@ -16,6 +16,9 @@ public sealed class MNK_Default : MonkRotation [RotationConfig(CombatType.PvE, Name = "Auto Use Perfect Balance (aoe aggressive PB dump, turn me off if you don't want to waste PB in boss fight)")] public bool AutoPB_AOE { get; set; } = true; + [RotationConfig(CombatType.PvE, Name = "Use Howling Fist as a ranged attack verses single target enemies")] + public bool HowlingSingle { get; set; } = false; + [RotationConfig(CombatType.PvE, Name = "Enable TEA Checker.")] public bool EnableTEAChecker { get; set; } = false; #endregion @@ -245,7 +248,7 @@ protected override bool GeneralGCD(out IAction? act) // i'm clever and i can do kame hame ha, so i won't stand still and keep refreshing form shift if (EnlightenmentPvE.CanUse(out act, skipAoeCheck: true)) return true; // Enlightment - if (HowlingFistPvE.CanUse(out act, skipAoeCheck: true)) return true; // Howling Fist + if (HowlingFistPvE.CanUse(out act, skipAoeCheck: HowlingSingle)) return true; // Howling Fist return base.GeneralGCD(out act); } diff --git a/BasicRotations/Ranged/BRD_Default.cs b/BasicRotations/Ranged/BRD_Default.cs index 71a92efef..3d6446b6b 100644 --- a/BasicRotations/Ranged/BRD_Default.cs +++ b/BasicRotations/Ranged/BRD_Default.cs @@ -1,6 +1,6 @@ namespace DefaultRotations.Ranged; -[Rotation("Default", CombatType.PvE, GameVersion = "7.11", +[Rotation("Default", CombatType.PvE, GameVersion = "7.15", Description = "Please make sure that the three song times add up to 120 seconds, Wanderers default first song for now.")] [SourceCode(Path = "main/BasicRotations/Ranged/BRD_Default.cs")] [Api(4)] @@ -153,7 +153,7 @@ protected override bool AttackAbility(IAction nextGCD, out IAction? act) if (RadiantFinalePvE.EnoughLevel && RadiantFinalePvE.Cooldown.IsCoolingDown && BattleVoicePvE.EnoughLevel && !BattleVoicePvE.Cooldown.IsCoolingDown) return false; - if (Song != Song.NONE && EmpyrealArrowPvE.CanUse(out act)) return true; + if ((RagingStrikesPvE.Cooldown.IsCoolingDown || !RagingStrikesPvE.Cooldown.WillHaveOneCharge(15)) && Song != Song.NONE && EmpyrealArrowPvE.CanUse(out act)) return true; if (PitchPerfectPvE.CanUse(out act, skipCastingCheck: true, skipAoeCheck: true, skipComboCheck: true)) { diff --git a/RotationSolver.Basic/Configuration/Configs.cs b/RotationSolver.Basic/Configuration/Configs.cs index 30413b6f9..2e04b229f 100644 --- a/RotationSolver.Basic/Configuration/Configs.cs +++ b/RotationSolver.Basic/Configuration/Configs.cs @@ -355,7 +355,7 @@ public const string PvPFilter = JobFilterType.NoHealer, PvEFilter = JobFilterType.NoHealer)] private static readonly bool _onlyHealSelfWhenNoHealer = false; - [ConditionBool, UI("Show action toggle feedback in chat.", + [ConditionBool, UI("Show action toggled action and state feedback in chat.", Filter = UiInformation)] private static readonly bool _showToggledActionInChat = false; diff --git a/RotationSolver/Commands/RSCommands_OtherCommand.cs b/RotationSolver/Commands/RSCommands_OtherCommand.cs index 1d3e0f30e..ab2726848 100644 --- a/RotationSolver/Commands/RSCommands_OtherCommand.cs +++ b/RotationSolver/Commands/RSCommands_OtherCommand.cs @@ -131,7 +131,10 @@ private static void DoSettingCommand(string str) property.SetValue(Service.Config, convertedValue); command = convertedValue.ToString(); - Svc.Chat.Print(string.Format(UiString.CommandsChangeSettingsValue.GetDescription(), property.Name, command)); + if (Service.Config.ShowToggledActionInChat) + { + Svc.Chat.Print(string.Format(UiString.CommandsChangeSettingsValue.GetDescription(), property.Name, command)); + } return; } @@ -283,10 +286,13 @@ private static void DoRotationCommand(ICustomRotation customCombo, string str) { if (config.DoCommand(configs, str)) { - Svc.Chat.Print(string.Format(UiString.CommandsChangeSettingsValue.GetDescription(), + if (Service.Config.ShowToggledActionInChat) + { + Svc.Chat.Print(string.Format(UiString.CommandsChangeSettingsValue.GetDescription(), config.DisplayName, config.Value)); - return; + return; + } } }