Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes to MNK, BRD, and chat feedback #482

Merged
merged 1 commit into from
Dec 19, 2024
+17 −8
Merged

Changes to MNK, BRD, and chat feedback #482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions BasicRotations/Melee/MNK_Default.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)]

Expand All @@ -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
Expand Down Expand Up @@ -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);
}
Expand Down
4 changes: 2 additions & 2 deletions BasicRotations/Ranged/BRD_Default.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)]
Expand Down Expand Up @@ -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))
{
Expand Down
2 changes: 1 addition & 1 deletion RotationSolver.Basic/Configuration/Configs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
12 changes: 9 additions & 3 deletions RotationSolver/Commands/RSCommands_OtherCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
}
}
}

Expand Down