diff --git a/RotationSolver.Basic/Configuration/PluginConfiguration.cs b/RotationSolver.Basic/Configuration/PluginConfiguration.cs index f961c6741..5740ba226 100644 --- a/RotationSolver.Basic/Configuration/PluginConfiguration.cs +++ b/RotationSolver.Basic/Configuration/PluginConfiguration.cs @@ -73,6 +73,7 @@ public class PluginConfiguration : IPluginConfiguration public Vector4 TargetColor = new(1f, 0.2f, 0f, 0.8f); public Vector4 SubTargetColor = new(1f, 0.9f, 0f, 0.8f); public bool DrawMeleeRange = false; + public bool UseOverlayWindow = true; public float DrawingHeight = 3; public float SampleLength = 0.2f; @@ -90,7 +91,6 @@ public class PluginConfiguration : IPluginConfiguration public float HealthDifference = 0.25f; public float MeleeRangeOffset = 1; public bool TargetFriendly = false; - public float AlphaInFill = 0.15f; public float MinLastAbilityAdvanced = 0.1f; public float HealWhenNothingTodoBelow = 0.8f; diff --git a/RotationSolver/Localization/Strings.cs b/RotationSolver/Localization/Strings.cs index 749877038..570a9c9a5 100644 --- a/RotationSolver/Localization/Strings.cs +++ b/RotationSolver/Localization/Strings.cs @@ -90,6 +90,9 @@ internal partial class Strings public string ConfigWindow_Events_DutyStart { get; set; } = "Duty Start: "; public string ConfigWindow_Events_DutyEnd{ get; set; } = "Duty End: "; public string ConfigWindow_Params_Description { get; set; } = "In this window, you can set the parameters about the using way of actions."; + + public string ConfigWindow_Param_UseOverlayWindow { get; set; } = "Display Top Overlay"; + public string ConfigWindow_Param_UseOverlayWindowDesc { get; set; } = "This top window is used to display some extra information on your game window, such as target's positional, target and sub-target, etc."; public string ConfigWindow_Param_Basic { get; set; } = "Basic"; public string ConfigWindow_Param_ActionAhead { get; set; } = "Set the time advance of using actions"; @@ -154,7 +157,6 @@ internal partial class Strings public string ConfigWindow_Param_DrawPositional { get; set; } = "Draw Positional on the screen"; public string ConfigWindow_Param_DrawMeleeRange { get; set; } = "Draw the range of melee on the screen"; public string ConfigWindow_Param_DrawMeleeOffset { get; set; } = "Draw the offset of melee on the screen"; - public string ConfigWindow_Param_AlphaInFill { get; set; } = "The alpha value in fill."; public string ConfigWindow_Param_ShowMoveTarget { get; set; } = "Show the target of the move action"; public string ConfigWindow_Param_ShowTarget { get; set; } = "Show Target"; public string ConfigWindow_Param_SayOutStateChanged { get; set; } = "Saying the state changes out"; diff --git a/RotationSolver/UI/RotationConfigWindow_Param.cs b/RotationSolver/UI/RotationConfigWindow_Param.cs index 521f04e5c..da8a16bcb 100644 --- a/RotationSolver/UI/RotationConfigWindow_Param.cs +++ b/RotationSolver/UI/RotationConfigWindow_Param.cs @@ -166,7 +166,6 @@ private void DrawParamAdvanced() private void DrawParamDisplay() { - DrawCheckBox(LocalizationManager.RightLang.ConfigWindow_Param_TeachingMode, ref Service.Config.TeachingMode, Service.Default.TeachingMode); @@ -180,48 +179,68 @@ private void DrawParamDisplay() ImGui.Separator(); - DrawCheckBox(LocalizationManager.RightLang.ConfigWindow_Param_ShowMoveTarget, - ref Service.Config.ShowMoveTarget, Service.Default.ShowMoveTarget); + DrawCheckBox(LocalizationManager.RightLang.ConfigWindow_Param_UseOverlayWindow, + ref Service.Config.UseOverlayWindow, Service.Default.UseOverlayWindow, + LocalizationManager.RightLang.ConfigWindow_Param_UseOverlayWindowDesc, otherThing: () => + { + PainterManager._painter.Enable = Service.Config.UseOverlayWindow; + }); - if (Service.Config.ShowMoveTarget) + if (Service.Config.UseOverlayWindow) { - ImGuiHelper.Spacing(); - DrawColor4(LocalizationManager.RightLang.ConfigWindow_Param_MovingTargetColor, - ref Service.Config.MovingTargetColor, Service.Default.MovingTargetColor); - } + DrawCheckBox(LocalizationManager.RightLang.ConfigWindow_Param_ShowMoveTarget, + ref Service.Config.ShowMoveTarget, Service.Default.ShowMoveTarget); - DrawCheckBox(LocalizationManager.RightLang.ConfigWindow_Param_ShowTarget, - ref Service.Config.ShowTarget, Service.Default.ShowTarget); + if (Service.Config.ShowMoveTarget) + { + ImGuiHelper.Spacing(); - if (Service.Config.ShowTarget) - { - ImGuiHelper.Spacing(); + DrawColor4(LocalizationManager.RightLang.ConfigWindow_Param_MovingTargetColor, + ref Service.Config.MovingTargetColor, Service.Default.MovingTargetColor); + } - DrawColor4(LocalizationManager.RightLang.ConfigWindow_Param_TargetColor, - ref Service.Config.TargetColor, Service.Default.TargetColor); + DrawCheckBox(LocalizationManager.RightLang.ConfigWindow_Param_ShowTarget, + ref Service.Config.ShowTarget, Service.Default.ShowTarget); - ImGuiHelper.Spacing(); + if (Service.Config.ShowTarget) + { + ImGuiHelper.Spacing(); - DrawColor4(LocalizationManager.RightLang.ConfigWindow_Param_SubTargetColor, - ref Service.Config.SubTargetColor, Service.Default.SubTargetColor); - } + DrawColor4(LocalizationManager.RightLang.ConfigWindow_Param_TargetColor, + ref Service.Config.TargetColor, Service.Default.TargetColor); - DrawFloatNumber(LocalizationManager.RightLang.ConfigWindow_Param_DrawingHeight, ref Service.Config.DrawingHeight, Service.Default.DrawingHeight, 0.02f, 0, 8, otherThing: () => - { - PainterManager._painter.DrawingHeight = Service.Config.DrawingHeight; - }); + ImGuiHelper.Spacing(); - DrawFloatNumber(LocalizationManager.RightLang.ConfigWindow_Param_SampleLength, ref Service.Config.SampleLength, Service.Default.SampleLength, 0.005f, 0.05f, 3, otherThing: () => - { - PainterManager._painter.SampleLength = Math.Max(0.05f, Service.Config.SampleLength); - }); + DrawColor4(LocalizationManager.RightLang.ConfigWindow_Param_SubTargetColor, + ref Service.Config.SubTargetColor, Service.Default.SubTargetColor); + } - DrawCheckBox(LocalizationManager.RightLang.ConfigWindow_Param_UseTaskToDrawing, - ref Service.Config.UseTaskToDrawing, Service.Default.UseTaskToDrawing, otherThing: () => - { - PainterManager._painter.UseTaskForAccelerate = Service.Config.UseTaskToDrawing; - }); + DrawCheckBox(LocalizationManager.RightLang.ConfigWindow_Param_DrawPositional, + ref Service.Config.DrawPositional, Service.Default.DrawPositional); + + DrawCheckBox(LocalizationManager.RightLang.ConfigWindow_Param_DrawMeleeRange, + ref Service.Config.DrawMeleeRange, Service.Default.DrawMeleeRange); + + DrawCheckBox(LocalizationManager.RightLang.ConfigWindow_Param_DrawMeleeOffset, + ref Service.Config.DrawMeleeOffset, Service.Default.DrawMeleeOffset); + + DrawFloatNumber(LocalizationManager.RightLang.ConfigWindow_Param_DrawingHeight, ref Service.Config.DrawingHeight, Service.Default.DrawingHeight, 0.02f, 0, 8, otherThing: () => + { + PainterManager._painter.DrawingHeight = Service.Config.DrawingHeight; + }); + + DrawFloatNumber(LocalizationManager.RightLang.ConfigWindow_Param_SampleLength, ref Service.Config.SampleLength, Service.Default.SampleLength, 0.005f, 0.05f, 3, otherThing: () => + { + PainterManager._painter.SampleLength = Math.Max(0.05f, Service.Config.SampleLength); + }); + + DrawCheckBox(LocalizationManager.RightLang.ConfigWindow_Param_UseTaskToDrawing, + ref Service.Config.UseTaskToDrawing, Service.Default.UseTaskToDrawing, otherThing: () => + { + PainterManager._painter.UseTaskForAccelerate = Service.Config.UseTaskToDrawing; + }); + } ImGui.Separator(); @@ -255,18 +274,6 @@ private void DrawParamDisplay() DrawCheckBox(LocalizationManager.RightLang.ConfigWindow_Param_ToastPositional, ref Service.Config.ToastPositional, Service.Default.ToastPositional); - - DrawCheckBox(LocalizationManager.RightLang.ConfigWindow_Param_DrawPositional, - ref Service.Config.DrawPositional, Service.Default.DrawPositional); - - DrawCheckBox(LocalizationManager.RightLang.ConfigWindow_Param_DrawMeleeRange, - ref Service.Config.DrawMeleeRange, Service.Default.DrawMeleeRange); - - DrawCheckBox(LocalizationManager.RightLang.ConfigWindow_Param_DrawMeleeOffset, - ref Service.Config.DrawMeleeOffset, Service.Default.DrawMeleeOffset); - - DrawFloatNumber(LocalizationManager.RightLang.ConfigWindow_Param_AlphaInFill, - ref Service.Config.AlphaInFill, Service.Default.AlphaInFill); } private void DrawParamAction() diff --git a/XIVPainter b/XIVPainter index 150c2af89..49a8d6a84 160000 --- a/XIVPainter +++ b/XIVPainter @@ -1 +1 @@ -Subproject commit 150c2af8904ca7c729fa830add484791d89e7a4d +Subproject commit 49a8d6a84bce5e356da90ac8035979bababcedfd