Merge pull request #482 from FFXIV-CombatReborn/BRDMNK

Changes to MNK, BRD, and chat feedback
FFXIV-CombatReborn · Dec 19, 2024 · 14bce82 · 14bce82
2 parents de3bc14 + dff919c
commit 14bce82
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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;
+                }
             }
         }