From 0bbfa9e5d6df3ed99591b1c7b2abd1660ed8ceae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=8B=E6=B0=B4?= <1123993881@qq.com> Date: Wed, 22 Feb 2023 10:34:24 +0800 Subject: [PATCH] fix: add a action flag option for debug. --- RotationSolver/Configuration/PluginConfiguration.cs | 4 +++- RotationSolver/Localization/Strings_Major.cs | 1 + RotationSolver/SigReplacers/Watcher.cs | 4 +--- RotationSolver/Windows/RotationConfigWindow_Param.cs | 3 +++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/RotationSolver/Configuration/PluginConfiguration.cs b/RotationSolver/Configuration/PluginConfiguration.cs index e73cd80d5..e7c34ebef 100644 --- a/RotationSolver/Configuration/PluginConfiguration.cs +++ b/RotationSolver/Configuration/PluginConfiguration.cs @@ -132,7 +132,9 @@ public class PluginConfiguration : IPluginConfiguration public string PositionalErrorText = string.Empty; public float CountDownAhead = 0.6f; - public int NamePlateIconId = 71204; //61417 + public int NamePlateIconId = 61417; // 71204 + public bool ShowMeleeActionFlag = false; + public int MoveTargetAngle = 24; public float HealthRatioBoss = 1.85f; diff --git a/RotationSolver/Localization/Strings_Major.cs b/RotationSolver/Localization/Strings_Major.cs index 85be41d5b..6fe2881f5 100644 --- a/RotationSolver/Localization/Strings_Major.cs +++ b/RotationSolver/Localization/Strings_Major.cs @@ -123,6 +123,7 @@ internal partial class Strings public string Configwindow_Param_Advanced { get; set; } = "Advanced"; public string Configwindow_Param_PoslockCasting { get; set; } = "Lock the movement when casting."; public string Configwindow_Param_UseStopCasting { get; set; } = "Use stopping casting when target is dead."; + public string Configwindow_Param_ShowMeleeActionFlag { get; set; } = "Show action flag when melee."; public string Configwindow_Param_ShowHealthRatio { get; set; } = "Show the health ratio for the check of Boss, Dying, Dot."; public string Configwindow_Param_HealthRatioBoss { get; set; } = "If target's max health ratio is higher than this, regard it as Boss."; diff --git a/RotationSolver/SigReplacers/Watcher.cs b/RotationSolver/SigReplacers/Watcher.cs index a6c2df87c..82ecafe51 100644 --- a/RotationSolver/SigReplacers/Watcher.cs +++ b/RotationSolver/SigReplacers/Watcher.cs @@ -108,13 +108,11 @@ private static unsafe void RecordAction(GameObject tar, Action action, byte flag if (item.AddMacro(tar)) break; } -#if DEBUG - if (flag != 0) + if (flag != 0 && Service.Configuration.ShowMeleeActionFlag) { Service.FlyTextGui.AddFlyText(Dalamud.Game.Gui.FlyText.FlyTextKind.NamedIcon, 0, 0, 0, "Flag:" + flag.ToString(), "", ImGui.GetColorU32(new Vector4(0.4f, 0, 0, 1)), 0, action.Icon); } -#endif //事后骂人！ if (Service.Configuration.PositionalFeedback diff --git a/RotationSolver/Windows/RotationConfigWindow_Param.cs b/RotationSolver/Windows/RotationConfigWindow_Param.cs index 81d74326b..c39304e3f 100644 --- a/RotationSolver/Windows/RotationConfigWindow_Param.cs +++ b/RotationSolver/Windows/RotationConfigWindow_Param.cs @@ -161,6 +161,9 @@ private void DrawParamAdvanced() DrawFloatNumber(LocalizationManager.RightLang.Configwindow_Param_HealthRatioDot, ref Service.Configuration.HealthRatioDot, speed: 0.02f, min: 0, max: 10); + + DrawCheckBox(LocalizationManager.RightLang.Configwindow_Param_ShowMeleeActionFlag, + ref Service.Configuration.ShowMeleeActionFlag); } private void DrawParamDisplay()